[ptxdist] [PATCH v2] blspec-entry: add linux-appendroot support
Add the option to add the 'linux-appendroot true' to blspec config file which is very useful in case of using barebox as bootlaoder. Signed-off-by: Marco Felsch --- Hi, the v1 of this patch can be found here: https://lore.ptxdist.org/ptxdist/20220901085941.2597793-1-m.fel...@pengutronix.de/ Changes: v2: - keep the @LINUXAPPENDROOT@ empty if not enabled platforms/blspec-entry.in | 8 projectroot/loader/entries/default.conf | 1 + rules/blspec-entry.make | 10 +- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in index aed65d4..c2aea36 100644 --- a/platforms/blspec-entry.in +++ b/platforms/blspec-entry.in @@ -16,4 +16,12 @@ config BLSPEC_ENTRY_CMDLINE string prompt "kernel command-line" +config BLSPEC_ENTRY_APPENDROOT + bool + prompt "Add 'linux-appendroot true'" + help + If enabled this options adds 'linux-appendroot true' to the blspec + entry. This is a barebox specific blspec option which tells barebox + to add the 'root=' kernel command line automatically if set. + endif diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf index 5650907..d281569 100644 --- a/projectroot/loader/entries/default.conf +++ b/projectroot/loader/entries/default.conf @@ -3,3 +3,4 @@ version @VERSION@ options@CMDLINE@ linux @KERNEL@ @DEVICETREE@ +@LINUXAPPENDROOT@ diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make index f393b1b..7523009 100644 --- a/rules/blspec-entry.make +++ b/rules/blspec-entry.make @@ -35,6 +35,12 @@ else BLSPEC_KERNEL_IMAGE= $(KERNEL_IMAGE) endif +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT +BLSPEC_APPENDROOT = linux-appendroot\ttrue +else +BLSPEC_APPENDROOT = +endif + $(STATEDIR)/blspec-entry.targetinstall: @$(call targetinfo) @@ -56,7 +62,9 @@ $(STATEDIR)/blspec-entry.targetinstall: $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ @KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \ $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ - @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl)) + @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl) \ + $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ + @LINUXAPPENDROOT@,'$(BLSPEC_APPENDROOT)')$(ptx/nl)) @$(call install_finish,blspec-entry) -- 2.30.2
Re: [ptxdist] Prepare Image for Raspberry Pi 4
On 22-11-15, Joshi, Pranay wrote: > Hi, > > Thanks to stepped in. > > We have clone Distrokit "next" branch and used that. > > - Which compiler you did used? > We are using OSELAS.Toolchain-2020.08.0 And you're using the arm-v7a version? > - You have no local changes? > Yes, no local changes, used default configuration. > > - Which RPI4 you're using (RPI4, CM4, ...)? > Raspberry Pi 4B Which platform did you select and which image did you flashed to the SD card? Regards, Marco > > > Pranay Joshi > Lead Engineer-Firmware Engineering > Drilling Services > Baker Hughes > > > -Original Message- > From: ptxdist On Behalf Of Marco Felsch > Sent: Tuesday, November 15, 2022 3:11 PM > To: ptxdist@pengutronix.de > Cc: Robert Schwebel ; Michael Olbrich > ; distro...@pengutronix.de; Ahmad Fatoum > > Subject: Re: [ptxdist] Prepare Image for Raspberry Pi 4 > > [You don't often get email from m.fel...@pengutronix.de. Learn why this is > important at https://aka.ms/LearnAboutSenderIdentification ] > > EXTERNAL EMAIL: This email originated outside of our organization. Do not > click on any links or open attachments from unexpected or unknown senders > unless you can verify the content is safe. > > > Hi, > > On 22-11-15, Joshi, Pranay wrote: > > Hi Marco, > > > > Thanks for response. > > > > Please find attached error logs for more detail. > > Thanks for the error log. > > > Read start_cd.elf bytes 685540 hnd 0x > > Read fixup_cd.dat bytes 2657 hnd 0x > > Firmware: 679ebca20dc08ca3f5392e02d772fed727debdae Sep 9 2019 > > 18:51:29 > > 0x00d03114 0x 0x > > start_cd.elf: is not compatible > > This board requires newer software > > Get the latest software from > > https://nam12.safelinks.protection.outlook.com/?url=https%3A%2F%2Fwww. > > raspberrypi.com%2Fsoftware%2Fdata=05%7C01%7Cpranay.joshi%40bakerh > > ughes.com%7Cd4294c5d564c40f57c4d08dac6ed93b5%7Cd584a4b7b1f24714a578fd4 > > d43c146a6%7C0%7C0%7C638041020940805444%7CUnknown%7CTWFpbGZsb3d8eyJWIjo > > iMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C3000%7C% > > 7C%7Csdata=R1RrE%2FMyBkeQleIquzTsdr4yrtGJs%2Ff3SJzJK5y3O4c%3D > > ;reserved=0 > > The version of the start_cd.elf seems a bit old since Ahmad updated it to > v1.20220331 and the loader says it is from 2019. > > To sum up a few things since I just stepped in into this conversation: > > - You're using DistoKit Git-Version: > 4dd74b5 v7a: barebox: enable of_diff command > - You have selected the platform-v7a platform > - Which compiler you did used? > - You have no local changes? > - Which RPI4 you're using (RPI4, CM4, ...)? > > Regards, > Marco > > >
Re: [ptxdist] Prepare Image for Raspberry Pi 4
Hi, On 22-11-15, Joshi, Pranay wrote: > Hi Marco, > > Thanks for response. > > Please find attached error logs for more detail. Thanks for the error log. > Read start_cd.elf bytes 685540 hnd 0x > Read fixup_cd.dat bytes 2657 hnd 0x > Firmware: 679ebca20dc08ca3f5392e02d772fed727debdae Sep 9 2019 18:51:29 > 0x00d03114 0x 0x > start_cd.elf: is not compatible > This board requires newer software > Get the latest software from https://www.raspberrypi.com/software/ The version of the start_cd.elf seems a bit old since Ahmad updated it to v1.20220331 and the loader says it is from 2019. To sum up a few things since I just stepped in into this conversation: - You're using DistoKit Git-Version: 4dd74b5 v7a: barebox: enable of_diff command - You have selected the platform-v7a platform - Which compiler you did used? - You have no local changes? - Which RPI4 you're using (RPI4, CM4, ...)? Regards, Marco
Re: [ptxdist] Prepare Image for Raspberry Pi 4
Hi Pranay, On 22-11-14, Joshi, Pranay wrote: > Any help on below query? I'm not aware of the DistroKit integration nor the Barebox integration, but maybe I can support you since Ahmad is on vacation. Please see my question below. > From: Joshi, Pranay > Sent: Monday, November 7, 2022 5:09 PM > To: Ahmad Fatoum ; ptxdist@pengutronix.de; Michael > Olbrich > Cc: Robert Schwebel ; distro...@pengutronix.de > Subject: Re: [ptxdist] Prepare Image for Raspberry Pi 4 > > Hi Ahmad, > > Thanks for your response. > > We prepared images for the platform-rpi and platform-v7a using > Distrokit "next" branch, as you mentioned it's having support of RPi > for 32-bit. When prepared image is loaded into SD card and powered > Raspberry Pi 4B, we are getting error "start_cd.elf: is not > compatible". Can you please provide the whole error string barebox is printing? > Is there any configuration needs to update? Or anything else needs to > do? If you can provide us the whole barebox log we can see a bit more what is going on. Regards, Marco
[ptxdist] [PATCH] pixman: version bump 0.42.0 -> 0.42.2
Version 0.42.0 forgot to include the new 'a64-neon-test.S' test file and so the prepare step will fail for aarch64 systems. The 0.42.2 will deliver this file apart other fixes. Signed-off-by: Marco Felsch --- rules/pixman.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/pixman.make b/rules/pixman.make index db1a014..3174895 100644 --- a/rules/pixman.make +++ b/rules/pixman.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIXMAN) += pixman # # Paths and names # -PIXMAN_VERSION := 0.42.0 -PIXMAN_MD5 := 7330a91505c123c09163d211cb285e88 +PIXMAN_VERSION := 0.42.2 +PIXMAN_MD5 := dec5dd93a3e95c80162515b7209ef0d5 PIXMAN := pixman-$(PIXMAN_VERSION) PIXMAN_SUFFIX := tar.xz PIXMAN_URL := $(call ptx/mirror, XORG, individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX)) -- 2.30.2
Re: [ptxdist] [PATCH v2 1/1] libcamera: new package
On 22-09-13, Michael Olbrich wrote: > On Tue, Sep 13, 2022 at 03:53:21PM +0200, Marco Felsch wrote: > > Hi Matthias, ... > > > + select QT5 if LIBCAMERA_QCAM > > > + select QT5_MODULE_QTBASEif LIBCAMERA_QCAM > > > + select QT5_MODULE_QTBASE_GUIif LIBCAMERA_QCAM > > > + select QT5_MODULE_QTBASE_WIDGETSif LIBCAMERA_QCAM > > > + help > > > + A complex camera support library for Linux, Android, and ChromeOS. > > > + > > > +if LIBCAMERA > > > > I would provide the user the choice of selecting/enabling the ipa module > > signing. > > Hmmm, what would be the benefit of making this optional? To leave the user the option to not enable it at all. Maybe your rootfs size is very limited and you can't pull any of crpytolibs, then you can turn it off. > And if the modules are not signed then they should be stripped. The IPAs running in a seperate process if they are not signed. So the user has the choice between runtime overhead <-> rootfs size. Regards, Marco
Re: [ptxdist] [PATCH v2 1/1] libcamera: new package
Hi Matthias,
On 22-09-14, Matthias Fend wrote:
> Hi Marco,
>
> Am 13.09.2022 um 15:53 schrieb Marco Felsch:
> > Hi Matthias,
> >
> > thanks for working on this, I also have a libcamera package here :) and
> > want to share a few findings.
> >
> > On 22-09-11, Matthias Fend wrote:
> > > libcamera is an open source camera stack and framework for Linux, Android,
> > > and ChromeOS.
> > >
> > > Signed-off-by: Matthias Fend
> > > ---
> > > ...t-information-for-version-generation.patch | 29
> > > .../libcamera-2022-08-30-g68683d3811a8/series | 4 +
> > > rules/libcamera.in| 90
> > > rules/libcamera.make | 133 ++
> > > 4 files changed, 256 insertions(+)
> > > create mode 100644
> > > patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> > > create mode 100644 patches/libcamera-2022-08-30-g68683d3811a8/series
> > > create mode 100644 rules/libcamera.in
> > > create mode 100644 rules/libcamera.make
> > >
> > > diff --git
> > > a/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> > >
> > > b/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> > > new file mode 100644
> > > index 0..3e5c5ce68
> > > --- /dev/null
> > > +++
> > > b/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> > > @@ -0,0 +1,29 @@
> > > +From: Matthias Fend
> > > +Date: Wed, 31 Aug 2022 16:54:20 +0200
> > > +Subject: [PATCH] do not use git information for version generation
> > > +
> > > +Since libcamera is checked out without a git repo, git version reports
> > > the
> > > +version of the BSP. Since this is obviously wrong, just use the project
> > > +version.
> > > +
> > > +Signed-off-by: Matthias Fend
> > > +---
> > > + meson.build | 5 ++---
> > > + 1 file changed, 2 insertions(+), 3 deletions(-)
> > > +
> > > +diff --git a/meson.build b/meson.build
> > > +index 72919102ad55..e333df59388d 100644
> > > +--- a/meson.build
> > > b/meson.build
> > > +@@ -20,9 +20,8 @@ libcamera_git_version =
> > > run_command('utils/gen-version.sh',
> > > + meson.project_build_root(),
> > > + meson.project_source_root(),
> > > + check: false).stdout().strip()
> > > +-if libcamera_git_version == ''
> > > +-libcamera_git_version = meson.project_version()
> > > +-endif
> > > ++
> > > ++libcamera_git_version = meson.project_version()
> > > +
> > > + libcamera_version = libcamera_git_version.split('+')[0]
> > > +
> > > diff --git a/patches/libcamera-2022-08-30-g68683d3811a8/series
> > > b/patches/libcamera-2022-08-30-g68683d3811a8/series
> > > new file mode 100644
> > > index 0..6ca42eafc
> > > --- /dev/null
> > > +++ b/patches/libcamera-2022-08-30-g68683d3811a8/series
> > > @@ -0,0 +1,4 @@
> > > +# generated by git-ptx-patches
> > > +#tag:base --start-number 1
> > > +0001-do-not-use-git-information-for-version-generation.patch
> > > +# c3a57143ea9764ab95b84a7fb79896f4 - git-ptx-patches magic
> > > diff --git a/rules/libcamera.in b/rules/libcamera.in
> > > new file mode 100644
> > > index 0..0a103fc51
> > > --- /dev/null
> > > +++ b/rules/libcamera.in
> > > @@ -0,0 +1,90 @@
> > > +## SECTION=multimedia_libs
> > > +
> > > +config LIBCAMERA
> > > + bool
> > > + prompt "libcamera"
> > > + select HOST_MESON
> > > + select HOST_SYSTEM_PYTHON3
> > > + select HOST_SYSTEM_PYTHON3_JINJA2
> > > + select HOST_SYSTEM_PYTHON3_PYYAML
> > > + select HOST_SYSTEM_PYTHON3_PLY
> > > + select GNUTLS
> >
> > Please see below about selecting the crypto lib. Than this would be
> > changed to:
> >
> > select GNUTLS if
> > LIBCAMERA_IPA_MODULE_SIGN_GNUTLS
> > select OPENSSL if
> > LIBCAMERA_IPA_MODULE_SIGN_OPENSSL
> >
> > > + select UDEV_LIBUDEV
> > > + select LIBYAML
> >
&g
Re: [ptxdist] [PATCH v2 1/1] libcamera: new package
Hi Matthias,
thanks for working on this, I also have a libcamera package here :) and
want to share a few findings.
On 22-09-11, Matthias Fend wrote:
> libcamera is an open source camera stack and framework for Linux, Android,
> and ChromeOS.
>
> Signed-off-by: Matthias Fend
> ---
> ...t-information-for-version-generation.patch | 29
> .../libcamera-2022-08-30-g68683d3811a8/series | 4 +
> rules/libcamera.in| 90
> rules/libcamera.make | 133 ++
> 4 files changed, 256 insertions(+)
> create mode 100644
> patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> create mode 100644 patches/libcamera-2022-08-30-g68683d3811a8/series
> create mode 100644 rules/libcamera.in
> create mode 100644 rules/libcamera.make
>
> diff --git
> a/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
>
> b/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> new file mode 100644
> index 0..3e5c5ce68
> --- /dev/null
> +++
> b/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> @@ -0,0 +1,29 @@
> +From: Matthias Fend
> +Date: Wed, 31 Aug 2022 16:54:20 +0200
> +Subject: [PATCH] do not use git information for version generation
> +
> +Since libcamera is checked out without a git repo, git version reports the
> +version of the BSP. Since this is obviously wrong, just use the project
> +version.
> +
> +Signed-off-by: Matthias Fend
> +---
> + meson.build | 5 ++---
> + 1 file changed, 2 insertions(+), 3 deletions(-)
> +
> +diff --git a/meson.build b/meson.build
> +index 72919102ad55..e333df59388d 100644
> +--- a/meson.build
> b/meson.build
> +@@ -20,9 +20,8 @@ libcamera_git_version = run_command('utils/gen-version.sh',
> + meson.project_build_root(),
> + meson.project_source_root(),
> + check: false).stdout().strip()
> +-if libcamera_git_version == ''
> +-libcamera_git_version = meson.project_version()
> +-endif
> ++
> ++libcamera_git_version = meson.project_version()
> +
> + libcamera_version = libcamera_git_version.split('+')[0]
> +
> diff --git a/patches/libcamera-2022-08-30-g68683d3811a8/series
> b/patches/libcamera-2022-08-30-g68683d3811a8/series
> new file mode 100644
> index 0..6ca42eafc
> --- /dev/null
> +++ b/patches/libcamera-2022-08-30-g68683d3811a8/series
> @@ -0,0 +1,4 @@
> +# generated by git-ptx-patches
> +#tag:base --start-number 1
> +0001-do-not-use-git-information-for-version-generation.patch
> +# c3a57143ea9764ab95b84a7fb79896f4 - git-ptx-patches magic
> diff --git a/rules/libcamera.in b/rules/libcamera.in
> new file mode 100644
> index 0..0a103fc51
> --- /dev/null
> +++ b/rules/libcamera.in
> @@ -0,0 +1,90 @@
> +## SECTION=multimedia_libs
> +
> +config LIBCAMERA
> + bool
> + prompt "libcamera"
> + select HOST_MESON
> + select HOST_SYSTEM_PYTHON3
> + select HOST_SYSTEM_PYTHON3_JINJA2
> + select HOST_SYSTEM_PYTHON3_PYYAML
> + select HOST_SYSTEM_PYTHON3_PLY
> + select GNUTLS
Please see below about selecting the crypto lib. Than this would be
changed to:
select GNUTLS if
LIBCAMERA_IPA_MODULE_SIGN_GNUTLS
select OPENSSL if
LIBCAMERA_IPA_MODULE_SIGN_OPENSSL
> + select UDEV_LIBUDEV
> + select LIBYAML
missing select BOOSTif
LIBCAMERA_PIPELINE_RASPBERRYPI
> + select LIBUNWINDif LIBCAMERA_BACKTRACE
> + select GSTREAMER1 if LIBCAMERA_GSTREAMER
> + select GST_PLUGINS_BASE1if LIBCAMERA_GSTREAMER
> + select LIBEVENT if LIBCAMERA_CAM
missing select LIBDRM if LIBCAMERA_CAM
> + select QT5 if LIBCAMERA_QCAM
> + select QT5_MODULE_QTBASEif LIBCAMERA_QCAM
> + select QT5_MODULE_QTBASE_GUIif LIBCAMERA_QCAM
> + select QT5_MODULE_QTBASE_WIDGETSif LIBCAMERA_QCAM
> + help
> + A complex camera support library for Linux, Android, and ChromeOS.
> +
> +if LIBCAMERA
I would provide the user the choice of selecting/enabling the ipa module
signing.
config LIBCAMERA_IPA_MODULE_SIGN
bool
default y
prompt "Enable IPA module signing"
help
Without IPA module signing, all IPA modules will be isolated in a
separate process. This adds an unnecessary extra overhead at runtime.
if LIBCAMERA_IPA_MODULE_SIGN
choice
prompt "Crypt provider"
default LIBCAMERA_IPA_MODULE_SIGN_GNUTLS
config LIBCAMERA_IPA_MODULE_SIGN_GNUTLS
bool "gnutls"
config LIBCAMERA_IPA_MODULE_SIGN_OPENSSL
Re: [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support
On 22-09-02, Michael Olbrich wrote: > On Fri, Sep 02, 2022 at 10:03:42AM +0200, Marco Felsch wrote: > > On 22-09-02, Michael Olbrich wrote: > > > On Thu, Sep 01, 2022 at 10:59:39AM +0200, Marco Felsch wrote: > > > > Add a Kconfig switch to set the linxu-appendroot option to true. This > > > > can be very useful for the Barebox bootloader. > > > > > > > > Signed-off-by: Marco Felsch > > > > --- > > > > platforms/blspec-entry.in | 10 ++ > > > > projectroot/loader/entries/default.conf | 1 + > > > > rules/blspec-entry.make | 10 +- > > > > 3 files changed, 20 insertions(+), 1 deletion(-) > > > > > > > > diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in > > > > index aed65d40a..1a4ecb26c 100644 > > > > --- a/platforms/blspec-entry.in > > > > +++ b/platforms/blspec-entry.in > > > > @@ -16,4 +16,14 @@ config BLSPEC_ENTRY_CMDLINE > > > > string > > > > prompt "kernel command-line" > > > > > > > > +config BLSPEC_ENTRY_APPENDROOT > > > > + bool > > > > + prompt "Set linux-appendroot to true" > > > > + help > > > > + If enabled this options adds 'linux-appendroot true' to the > > > > blspec > > > > + entry else 'linux-appendroot false' is added. This is a useful > > > > + Barebox specific option. Barebox will set the the 'root=' > > > > kernel > > > > + command line parameter to the source from which Barebox > > > > loaded the > > > > + kernel image if specified. > > > > + > > > > endif > > > > diff --git a/projectroot/loader/entries/default.conf > > > > b/projectroot/loader/entries/default.conf > > > > index 5650907ab..d28156975 100644 > > > > --- a/projectroot/loader/entries/default.conf > > > > +++ b/projectroot/loader/entries/default.conf > > > > @@ -3,3 +3,4 @@ version @VERSION@ > > > > options@CMDLINE@ > > > > linux @KERNEL@ > > > > @DEVICETREE@ > > > > +@LINUXAPPENDROOT@ > > > > diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make > > > > index f393b1bda..c0d2416cf 100644 > > > > --- a/rules/blspec-entry.make > > > > +++ b/rules/blspec-entry.make > > > > @@ -35,6 +35,12 @@ else > > > > BLSPEC_KERNEL_IMAGE= $(KERNEL_IMAGE) > > > > endif > > > > > > > > +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT > > > > +BLSPEC_APPENDROOT = linux-appendroot\ttrue > > > > +else > > > > +BLSPEC_APPENDROOT = linux-appendroot\tfalse > > > > > > Hmm, that's the default, right? So use an empty string here. It keeps the > > > file shorter and (mostly) unchanged for those that keep the option > > > disabled. It's a non-standard option so I'd prefer to not have it here > > > unless it is explicitly enabled. > > > > Okay, I will do that. Just one question will it add a blank line instead > > or is the line taken by @LINUXAPPENDROOT@ completely gone? > > It will be a blank line, but I think that's ok. Okay, so blank line it is :) I will send a v2. Regards, Marco > You could merge it with the @DEVICETREE@ line and add a '\n' at the > beginning of the substitution. But I'm not sure if it's worth it. > > Michael > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | >
Re: [ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support
Hi Michael, On 22-09-02, Michael Olbrich wrote: > On Thu, Sep 01, 2022 at 10:59:39AM +0200, Marco Felsch wrote: > > Add a Kconfig switch to set the linxu-appendroot option to true. This > > can be very useful for the Barebox bootloader. > > > > Signed-off-by: Marco Felsch > > --- > > platforms/blspec-entry.in | 10 ++ > > projectroot/loader/entries/default.conf | 1 + > > rules/blspec-entry.make | 10 +- > > 3 files changed, 20 insertions(+), 1 deletion(-) > > > > diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in > > index aed65d40a..1a4ecb26c 100644 > > --- a/platforms/blspec-entry.in > > +++ b/platforms/blspec-entry.in > > @@ -16,4 +16,14 @@ config BLSPEC_ENTRY_CMDLINE > > string > > prompt "kernel command-line" > > > > +config BLSPEC_ENTRY_APPENDROOT > > + bool > > + prompt "Set linux-appendroot to true" > > + help > > + If enabled this options adds 'linux-appendroot true' to the blspec > > + entry else 'linux-appendroot false' is added. This is a useful > > + Barebox specific option. Barebox will set the the 'root=' kernel > > + command line parameter to the source from which Barebox loaded the > > + kernel image if specified. > > + > > endif > > diff --git a/projectroot/loader/entries/default.conf > > b/projectroot/loader/entries/default.conf > > index 5650907ab..d28156975 100644 > > --- a/projectroot/loader/entries/default.conf > > +++ b/projectroot/loader/entries/default.conf > > @@ -3,3 +3,4 @@ version @VERSION@ > > options@CMDLINE@ > > linux @KERNEL@ > > @DEVICETREE@ > > +@LINUXAPPENDROOT@ > > diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make > > index f393b1bda..c0d2416cf 100644 > > --- a/rules/blspec-entry.make > > +++ b/rules/blspec-entry.make > > @@ -35,6 +35,12 @@ else > > BLSPEC_KERNEL_IMAGE= $(KERNEL_IMAGE) > > endif > > > > +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT > > +BLSPEC_APPENDROOT = linux-appendroot\ttrue > > +else > > +BLSPEC_APPENDROOT = linux-appendroot\tfalse > > Hmm, that's the default, right? So use an empty string here. It keeps the > file shorter and (mostly) unchanged for those that keep the option > disabled. It's a non-standard option so I'd prefer to not have it here > unless it is explicitly enabled. Okay, I will do that. Just one question will it add a blank line instead or is the line taken by @LINUXAPPENDROOT@ completely gone? Regards, Marco
[ptxdist] [PATCH 3/3] host-system-python3: order options alphabetical
No functional changes. Signed-off-by: Marco Felsch --- rules/host-system-python3.in | 6 +++--- rules/host-system-python3.make | 12 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in index 21d02e9e7..25201e93f 100644 --- a/rules/host-system-python3.in +++ b/rules/host-system-python3.in @@ -5,6 +5,9 @@ config HOST_SYSTEM_PYTHON3 if HOST_SYSTEM_PYTHON3 +config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY + bool + config HOST_SYSTEM_PYTHON3_DEV bool @@ -32,7 +35,4 @@ config HOST_SYSTEM_PYTHON3_PYELFTOOLS config HOST_SYSTEM_PYTHON3_PYYAML bool -config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY - bool - endif diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make index 217f1f56d..b03efd8bb 100644 --- a/rules/host-system-python3.make +++ b/rules/host-system-python3.make @@ -24,6 +24,12 @@ $(STATEDIR)/host-system-python3.prepare: @$(SYSTEMPYTHON3) -V >/dev/null 2>&1 || \ ptxd_bailout "'python3' not found! Please install."; @echo +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY + @echo "Checking for Python Cryptography ..." + @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \ + ptxd_bailout "Python cryptography module not found! \ + Please install python3-cryptography (debian)"; +endif ifdef PTXCONF_HOST_SYSTEM_PYTHON3_DEV @echo "Checking for Python development files ..." @$(SYSTEMPYTHON3)-config --includes &>/dev/null || \ @@ -77,12 +83,6 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYYAML @$(SYSTEMPYTHON3) -c 'import yaml' 2>/dev/null || \ ptxd_bailout "Python pyyaml module not found! \ Please install python3-yaml (debian)"; -endif -ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY - @echo "Checking for Python Cryptography ..." - @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \ - ptxd_bailout "Python cryptography module not found! \ - Please install python3-cryptography (debian)"; endif @$(call touch) -- 2.30.2
[ptxdist] [PATCH 2/3] host-system-python3: add ply and pyyaml option
Signed-off-by: Marco Felsch --- rules/host-system-python3.in | 6 ++ rules/host-system-python3.make | 12 2 files changed, 18 insertions(+) diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in index 4be968f43..21d02e9e7 100644 --- a/rules/host-system-python3.in +++ b/rules/host-system-python3.in @@ -23,9 +23,15 @@ config HOST_SYSTEM_PYTHON3_SETUPTOOLS config HOST_SYSTEM_PYTHON3_SIX bool +config HOST_SYSTEM_PYTHON3_PLY + bool + config HOST_SYSTEM_PYTHON3_PYELFTOOLS bool +config HOST_SYSTEM_PYTHON3_PYYAML + bool + config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY bool diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make index 02e9da141..217f1f56d 100644 --- a/rules/host-system-python3.make +++ b/rules/host-system-python3.make @@ -60,12 +60,24 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_SIX ptxd_bailout "Python six module not found! \ Please install python3-six (debian)"; endif +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PLY + @echo "Checking for Python ply ..." + @$(SYSTEMPYTHON3) -c 'import ply' 2>/dev/null || \ + ptxd_bailout "Python ply module not found! \ + Please install python3-ply (debian)"; +endif ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYELFTOOLS @echo "Checking for Python Pyelftools ..." @$(SYSTEMPYTHON3) -c 'import elftools' 2>/dev/null || \ ptxd_bailout "Python elftools module not found! \ Please install python3-pyelftools (debian)"; endif +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYYAML + @echo "Checking for Python pyyaml ..." + @$(SYSTEMPYTHON3) -c 'import yaml' 2>/dev/null || \ + ptxd_bailout "Python pyyaml module not found! \ + Please install python3-yaml (debian)"; +endif ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY @echo "Checking for Python Cryptography ..." @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \ -- 2.30.2
[ptxdist] [PATCH 1/3] blspec-entry: add linux-appendroot support
Add a Kconfig switch to set the linxu-appendroot option to true. This can be very useful for the Barebox bootloader. Signed-off-by: Marco Felsch --- platforms/blspec-entry.in | 10 ++ projectroot/loader/entries/default.conf | 1 + rules/blspec-entry.make | 10 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/platforms/blspec-entry.in b/platforms/blspec-entry.in index aed65d40a..1a4ecb26c 100644 --- a/platforms/blspec-entry.in +++ b/platforms/blspec-entry.in @@ -16,4 +16,14 @@ config BLSPEC_ENTRY_CMDLINE string prompt "kernel command-line" +config BLSPEC_ENTRY_APPENDROOT + bool + prompt "Set linux-appendroot to true" + help + If enabled this options adds 'linux-appendroot true' to the blspec + entry else 'linux-appendroot false' is added. This is a useful + Barebox specific option. Barebox will set the the 'root=' kernel + command line parameter to the source from which Barebox loaded the + kernel image if specified. + endif diff --git a/projectroot/loader/entries/default.conf b/projectroot/loader/entries/default.conf index 5650907ab..d28156975 100644 --- a/projectroot/loader/entries/default.conf +++ b/projectroot/loader/entries/default.conf @@ -3,3 +3,4 @@ version @VERSION@ options@CMDLINE@ linux @KERNEL@ @DEVICETREE@ +@LINUXAPPENDROOT@ diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make index f393b1bda..c0d2416cf 100644 --- a/rules/blspec-entry.make +++ b/rules/blspec-entry.make @@ -35,6 +35,12 @@ else BLSPEC_KERNEL_IMAGE= $(KERNEL_IMAGE) endif +ifdef PTXCONF_BLSPEC_ENTRY_APPENDROOT +BLSPEC_APPENDROOT = linux-appendroot\ttrue +else +BLSPEC_APPENDROOT = linux-appendroot\tfalse +endif + $(STATEDIR)/blspec-entry.targetinstall: @$(call targetinfo) @@ -56,7 +62,9 @@ $(STATEDIR)/blspec-entry.targetinstall: $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ @KERNEL@,'/boot/$(BLSPEC_KERNEL_IMAGE)')$(ptx/nl) \ $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ - @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl)) + @DEVICETREE@,'$(call blspec/devicetree,$(name))')$(ptx/nl) \ + $(call install_replace, blspec-entry, /loader/entries/$(name).conf, \ + @LINUXAPPENDROOT@,'$(BLSPEC_APPENDROOT)')$(ptx/nl)) @$(call install_finish,blspec-entry) -- 2.30.2
[ptxdist] [PATCH 2/2] util-linux-ng: add pivot_root option
Signed-off-by: Marco Felsch --- rules/util-linux-ng.in | 10 ++ rules/util-linux-ng.make | 5 - 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index e34d59a0d..df493d529 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -525,4 +525,14 @@ config UTIL_LINUX_NG_SWITCH_ROOT comment "BusyBox' switch_root is selected!" depends on BUSYBOX_SWITCH_ROOT +config UTIL_LINUX_NG_PIVOT_ROOT + bool + depends on !BUSYBOX_PIVOT_ROOT + prompt "pivot_root" + help + change the root filesystem. + +comment "BusyBox' pivot_root is selected!" + depends on BUSYBOX_PIVOT_ROOT + endif diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 25759f5e2..dd3eb0e01 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -98,7 +98,7 @@ UTIL_LINUX_NG_CONF_OPT:= \ --disable-cal \ --disable-logger \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT)-switch_root \ - --disable-pivot_root \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT)-pivot_root \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSMEM)-lsmem \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_IPCRM)-ipcrm \ @@ -342,6 +342,9 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/switch_root) endif +ifdef PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/pivot_root) +endif @$(call install_finish, util-linux-ng) -- 2.30.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/2] util-linux-ng: add switch_root option
Signed-off-by: Marco Felsch --- rules/util-linux-ng.in | 11 +++ rules/util-linux-ng.make | 5 - 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in index 9586ff60b..e34d59a0d 100644 --- a/rules/util-linux-ng.in +++ b/rules/util-linux-ng.in @@ -514,4 +514,15 @@ config UTIL_LINUX_NG_SULOGIN comment "BusyBox' sulogin is selected!" depends on BUSYBOX_SULOGIN +config UTIL_LINUX_NG_SWITCH_ROOT + bool + depends on !BUSYBOX_SWITCH_ROOT + prompt "switch_root" + help + switch to another filesystem as the root of the mount + tree. + +comment "BusyBox' switch_root is selected!" + depends on BUSYBOX_SWITCH_ROOT + endif diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make index 63d6f68fd..25759f5e2 100644 --- a/rules/util-linux-ng.make +++ b/rules/util-linux-ng.make @@ -97,7 +97,7 @@ UTIL_LINUX_NG_CONF_OPT:= \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_WDCTL)-wdctl \ --disable-cal \ --disable-logger \ - --disable-switch_root \ + --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT)-switch_root \ --disable-pivot_root \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_LSMEM)-lsmem \ --$(call ptx/endis, PTXCONF_UTIL_LINUX_NG_CHMEM)-chmem \ @@ -339,6 +339,9 @@ endif ifdef PTXCONF_UTIL_LINUX_NG_SULOGIN @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/sulogin) endif +ifdef PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT + @$(call install_copy, util-linux-ng, 0, 0, 0755, -, /usr/sbin/switch_root) +endif @$(call install_finish, util-linux-ng) -- 2.30.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] v4l-utils: drop libv4l2 dependency for v4l2-compliance/ctl
Since upstream commit bb28f870 ("v4l2-compliance/ctl: drop libv4l2
dependency if NO_LIBV4L2 is defined") both tools can be build without
libv4l2.
Signed-off-by: Marco Felsch
---
rules/v4l-utils.in | 2 --
1 file changed, 2 deletions(-)
diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
index b2254ea1e..de7cb374b 100644
--- a/rules/v4l-utils.in
+++ b/rules/v4l-utils.in
@@ -72,7 +72,6 @@ config V4L_UTILS_RDSCTL
config V4L_UTILS_V4L2COMPLIANCE
bool
- select V4L_UTILS_LIBV4L2
prompt "install v4l2-compliance"
config V4L_UTILS_V4L2DBG
@@ -82,7 +81,6 @@ config V4L_UTILS_V4L2DBG
config V4L_UTILS_V4L2CTL
bool
- select V4L_UTILS_LIBV4L2
prompt "install v4l2-ctl"
config V4L_UTILS_V4L2SYSFSPATH
--
2.29.2
___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to
ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] libcamera: Add package
On 21-05-03 12:27, Marco Felsch wrote: > Hi all, > > a few nits on this. > > On 21-03-22 14:48, Marian Cichy wrote: ... > > +config LIBCAMERA_TRACING > > + bool > > + prompt "Enable tracing" If enabled it causes an error, that 'lttng-ust' is not found. For the initial brinup we should remove the option and disable it within the makefile. Later on we can add the support for it. Regards, Marco ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] libcamera: Add package
Hi all, a few nits on this. On 21-03-22 14:48, Marian Cichy wrote: > libcamera is a new library to ease usage and configuration for > camera devices. > > Currently, libcamera has no release tags. This version is based on > commit 5154e14b from 2021-03-22. > > Signed-off-by: Marian Cichy > --- > rules/libcamera.in | 75 +++ > rules/libcamera.make | 117 +++ > 2 files changed, 192 insertions(+) > create mode 100644 rules/libcamera.in > create mode 100644 rules/libcamera.make > > diff --git a/rules/libcamera.in b/rules/libcamera.in > new file mode 100644 > index 0..886f716f6 > --- /dev/null > +++ b/rules/libcamera.in > @@ -0,0 +1,75 @@ > +## SECTION=multimedia_libs > + > +menuconfig LIBCAMERA > + tristate > + prompt "libcamera " > + select HOST_MESON > + select HOST_SYSTEM_PYTHON3 > + select HOST_SYSTEM_PYTHON3_PLY > + select HOST_SYSTEM_PYTHON3_PYYAML > + select HOST_SYSTEM_PYTHON3_JINJA2 > + select GNUTLS > + select OPENSSL > + select BOOSTif LIBCAMERA_PIPELINES_RASPBERRYPI > + select GSTREAMER1 if LIBCAMERA_GSTREAMER > + select GST_PLUGINS_BASE1if LIBCAMERA_GSTREAMER > + select LIBEVENT if LIBCAMERA_CAM > + select QT5 if LIBCAMERA_QCAM > + help > + libcamera is a library to ease configuration and usage of camera > devices/ > + > +if LIBCAMERA > + > +config LIBCAMERA_GSTREAMER > + bool > + prompt "libcamera GStreamer plugin" > + help > + Gstreamer libcamerasrc element > + > +config LIBCAMERA_CAM > + bool > + prompt "cam test application" > + help > + Demo application for libcamera > + > +config LIBCAMERA_QCAM > + bool > + prompt "qcam test application" > + help > + Qt demo application for libcamera > + > +config LIBCAMERA_TRACING > + bool > + prompt "Enable tracing" > + > +config LIBCAMERA_V4L2 > + bool > + prompt "V4L2 compatibility layer" > + > +comment "Pipelines" > + > +config LIBCAMERA_PIPELINES_IPU3 > + bool > + prompt "ipu3" > + > +config LIBCAMERA_PIPELINES_RASPBERRYPI > + bool > + prompt "raspberrypi" > + > +config LIBCAMERA_PIPELINES_RKISP1 > + bool > + prompt "rkisp1" > + > +config LIBCAMERA_PIPELINES_SIMPLE > + bool > + prompt "simple" > + > +config LIBCAMERA_PIPELINES_UVCVIDEO > + bool > + prompt "uvcvideo" > + > +config LIBCAMERA_PIPELINES_VIMC > + bool > + prompt "vimc" > + > +endif > diff --git a/rules/libcamera.make b/rules/libcamera.make > new file mode 100644 > index 0..7e1ab6ae7 > --- /dev/null > +++ b/rules/libcamera.make > @@ -0,0 +1,117 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2021 by Marian Cichy > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera > + > +# > +# Paths and names > +# > +LIBCAMERA_VERSION:= 2021-02-01-g5154e14b > +LIBCAMERA_MD5:= df003c77b6e6bda22d5ef72fed2540ad > +LIBCAMERA:= libcamera-$(LIBCAMERA_VERSION) > +LIBCAMERA_SUFFIX := tar.xz > +LIBCAMERA_URL:= > git://linuxtv.org/libcamera.git;tag=$(LIBCAMERA_VERSION) > +LIBCAMERA_SOURCE := $(SRCDIR)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX) > +LIBCAMERA_DIR:= $(BUILDDIR)/$(LIBCAMERA) > +LIBCAMERA_LICENSE:= unknown This project is a has multiple licenses: - core-lib: LGPL-2.1-or-later - IPA modules: - IPA API: LGPL-2.1-or-later - within libcamera: "The IPA modules, located in src/ipa/, are covered by free software licenses hosen by the module authors. The LGPL-2.1-or-later license is recommended. " - external: "Third-party closed-source IPA modules are thus permitted, provided they comply with the licensing requirements of any software they include or link to." - cam/qcam/test: GPL-2.0-or-later - 3rd party libs: their own licenses > +# > > +# Get > +# > > + > +#$(LIBCAMERA_SOURCE): > +#@$(call targetinfo) > +#@$(call get, LIBCAMERA) Default stage should be removed. > +# > > +# Prepare > +# > > + > +#LIBCAMERA_CONF_ENV := $(CROSS_ENV) > + > +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_IPU3) += ipu3 > +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_RASPBERRYPI) += > raspberrypi > +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_RKISP1)+= rkisp1 > +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINES_SIMPLE)+= simple >
[ptxdist] [PATCH 4/4] wpewebkit: add runtime logging support
To enable 'Release' builds with logging support we need to override the LOG_DISABLED define else logging is only enabled for 'Debug' builds. Signed-off-by: Marco Felsch --- rules/wpewebkit.in | 7 +++ rules/wpewebkit.make | 4 2 files changed, 11 insertions(+) diff --git a/rules/wpewebkit.in b/rules/wpewebkit.in index f123f4dad..1235e2502 100644 --- a/rules/wpewebkit.in +++ b/rules/wpewebkit.in @@ -90,4 +90,11 @@ config WPEWEBKIT_AUDIO bool prompt "audio support" +config WPEWEBKIT_ENABLE_LOGGING + bool + prompt "enable logging support" + help + Enable this option if you want to get some more logging information. For more + information check https://trac.webkit.org/wiki/WebKitGTK/Debugging. + endif diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make index 9e41e3222..141d83a71 100644 --- a/rules/wpewebkit.make +++ b/rules/wpewebkit.make @@ -76,6 +76,10 @@ WPEWEBKIT_CONF_OPT += \ -DENABLE_REMOTE_INSPECTOR=ON \ -DUSE_SYSTEM_MALLOC=$(WPEWEBKIT_SYSTEM_MALLOC) +ifdef PTXCONF_WPEWEBKIT_ENABLE_LOGGING +WPEWEBKIT_CXXFLAGS := -DLOG_DISABLED=0 +endif + # # Target-Install # -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 3/4] cog: version bump 0.8.0 -> 0.8.1
The upstream release note are: 8<- - core: Improved cog_web_view_connect_default_error_handlers() to avoid accidentally overriding already connected signal handlers. - drm: Fixed keyboard input when using modifier keys (e.g. Shift). - drm: Fixed crashes during deinitialization. - drm, fdo: Improved reliability for drivers which do not expose all their functionality via eglGetProcAddress(). - Improved behaviour of the CMake build system at configuration time. 8<- Signed-off-by: Marco Felsch --- rules/cog.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/cog.make b/rules/cog.make index 876909cc5..758b4f7f4 100644 --- a/rules/cog.make +++ b/rules/cog.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog # # Paths and names # -COG_VERSION:= 0.8.0 -COG_MD5:= f7aa8a425927cab247563411fc67c5a3 +COG_VERSION:= 0.8.1 +COG_MD5:= 21664fb04c9149dea6d68e13e6074276 COG:= cog-$(COG_VERSION) COG_SUFFIX := tar.xz COG_URL:= https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX) -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/4] wpewebkit: version bump 2.30.5 -> 2.30.6
The upstream release notes are: 8<-- - Update User-Agent quirks again for Google Docs and Google Drive. - Fix several crashes and rendering issues. 8<-- Signed-off-by: Marco Felsch --- rules/wpewebkit.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make index a61bce6e8..9e41e3222 100644 --- a/rules/wpewebkit.make +++ b/rules/wpewebkit.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit # # Paths and names # -WPEWEBKIT_VERSION := 2.30.5 -WPEWEBKIT_MD5 := 63a9a7b7f29862ec827a730ba6542e80 +WPEWEBKIT_VERSION := 2.30.6 +WPEWEBKIT_MD5 := e35b31932ad3da6c06736d8f2d347072 WPEWEBKIT := wpewebkit-$(WPEWEBKIT_VERSION) WPEWEBKIT_SUFFIX := tar.xz WPEWEBKIT_URL := https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX) -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 2/4] wpebackend-fdo: version bump 1.8.1 -> 1.8.2
The upstream release notes are: 8<--- - Fixed headers to include from the top-level API headers, as their consumers expect the public libwpe API to be defined as well. 8<--- Signed-off-by: Marco Felsch --- rules/wpebackend-fdo.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/wpebackend-fdo.make b/rules/wpebackend-fdo.make index 7038b2a75..339f44320 100644 --- a/rules/wpebackend-fdo.make +++ b/rules/wpebackend-fdo.make @@ -14,9 +14,9 @@ PACKAGES-$(PTXCONF_WPEBACKEND_FDO) += wpebackend-fdo # # Paths and names # -WPEBACKEND_FDO_VERSION := 1.8.1 +WPEBACKEND_FDO_VERSION := 1.8.2 WPEBACKEND_FDO_LIBRARY_VERSION := 1.0 -WPEBACKEND_FDO_MD5 := e7083e9fd325f289b23253b770d08d2e +WPEBACKEND_FDO_MD5 := 93ca185b5c0f539abbf7ab32cfdc96b2 WPEBACKEND_FDO := wpebackend-fdo-$(WPEBACKEND_FDO_VERSION) WPEBACKEND_FDO_SUFFIX := tar.xz WPEBACKEND_FDO_URL := https://wpewebkit.org/releases/$(WPEBACKEND_FDO).$(WPEBACKEND_FDO_SUFFIX) -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] systemd-netlogd: add new package
The systemd-netlogd can be used to stream the syslog to a remote device.
For more information see: https://github.com/systemd/systemd-netlogd.
Signed-off-by: Marco Felsch
---
.../0001-meson-fix-gettid-detection.patch | 29 +
...n-to-disable-the-documentation-build.patch | 38
.../0003-meson-fix-prefix-usage.patch | 52
.../systemd-netlogd-2021-02-24-g0b5a39/series | 6 ++
rules/systemd-netlogd.in | 12
rules/systemd-netlogd.make| 60 +++
6 files changed, 197 insertions(+)
create mode 100644
patches/systemd-netlogd-2021-02-24-g0b5a39/0001-meson-fix-gettid-detection.patch
create mode 100644
patches/systemd-netlogd-2021-02-24-g0b5a39/0002-meson-add-option-to-disable-the-documentation-build.patch
create mode 100644
patches/systemd-netlogd-2021-02-24-g0b5a39/0003-meson-fix-prefix-usage.patch
create mode 100644 patches/systemd-netlogd-2021-02-24-g0b5a39/series
create mode 100644 rules/systemd-netlogd.in
create mode 100644 rules/systemd-netlogd.make
diff --git
a/patches/systemd-netlogd-2021-02-24-g0b5a39/0001-meson-fix-gettid-detection.patch
b/patches/systemd-netlogd-2021-02-24-g0b5a39/0001-meson-fix-gettid-detection.patch
new file mode 100644
index 0..81828176a
--- /dev/null
+++
b/patches/systemd-netlogd-2021-02-24-g0b5a39/0001-meson-fix-gettid-detection.patch
@@ -0,0 +1,29 @@
+From: Marco Felsch
+Date: Thu, 25 Feb 2021 09:12:15 +0100
+Subject: [PATCH] meson: fix gettid detection
+
+The gettid() call is a linux specific syscall so we need to define it
+as _GNU_SOURCE else the test will fail which causes the later compile
+stage to fail. Since for the sources we define _GNU_SOURCE and gettid()
+is found but the code assumes that we don't have gettid() support
+(HAVE_GETTID is not defined) and redefines the function.
+
+Signed-off-by: Marco Felsch
+---
+ meson.build | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/meson.build b/meson.build
+index d07987f061fb..707322bcc95d 100644
+--- a/meson.build
b/meson.build
+@@ -84,7 +84,8 @@ conf.set('SIZEOF_TIME_T', cc.sizeof('time_t', prefix :
'#include '))
+ conf.set('SIZEOF_RLIM_T', cc.sizeof('rlim_t', prefix : '#include
'))
+
+ foreach ident : [
+-['gettid','''#include
++['gettid','''#define _GNU_SOURCE
++ #include
+ #include '''],
+ ]
+ have = cc.has_function(ident[0], prefix : ident[1])
diff --git
a/patches/systemd-netlogd-2021-02-24-g0b5a39/0002-meson-add-option-to-disable-the-documentation-build.patch
b/patches/systemd-netlogd-2021-02-24-g0b5a39/0002-meson-add-option-to-disable-the-documentation-build.patch
new file mode 100644
index 0..3dfd33ba6
--- /dev/null
+++
b/patches/systemd-netlogd-2021-02-24-g0b5a39/0002-meson-add-option-to-disable-the-documentation-build.patch
@@ -0,0 +1,38 @@
+From: Marco Felsch
+Date: Thu, 25 Feb 2021 09:20:03 +0100
+Subject: [PATCH] meson: add option to disable the documentation build
+
+On embedded devices docs are most the time not deployed. So the doc
+build only adds more build dependencies. Make the doc optional so the
+user can skip it.
+
+Signed-off-by: Marco Felsch
+---
+ meson.build | 5 -
+ meson_options.txt | 1 +
+ 2 files changed, 5 insertions(+), 1 deletion(-)
+ create mode 100644 meson_options.txt
+
+diff --git a/meson.build b/meson.build
+index 707322bcc95d..38dc7fdb2d7f 100644
+--- a/meson.build
b/meson.build
+@@ -138,7 +138,10 @@ includes = include_directories('src/share',
+'src/netlog')
+
+ subdir('units')
+-subdir('doc')
++
++if get_option('doc').enabled()
++subdir('doc')
++endif
+
+
+
+diff --git a/meson_options.txt b/meson_options.txt
+new file mode 100644
+index ..91489ab27970
+--- /dev/null
b/meson_options.txt
+@@ -0,0 +1 @@
++option('doc', type : 'feature', value : 'enabled')
diff --git
a/patches/systemd-netlogd-2021-02-24-g0b5a39/0003-meson-fix-prefix-usage.patch
b/patches/systemd-netlogd-2021-02-24-g0b5a39/0003-meson-fix-prefix-usage.patch
new file mode 100644
index 0..1d87b16f8
--- /dev/null
+++
b/patches/systemd-netlogd-2021-02-24-g0b5a39/0003-meson-fix-prefix-usage.patch
@@ -0,0 +1,52 @@
+From: Marco Felsch
+Date: Thu, 25 Feb 2021 10:03:04 +0100
+Subject: [PATCH] meson: fix prefix usage
+
+The GNU standard directory variables [1] defines prefix as /usr/local.
+Here prefix is a bit misused to build the systemd service path. Fix this
+by defining the correct prefix and introducing a systemdservicepath
+option which can be overriden by the application. By default we are
+installing the service now into: /usr/local/lib/systemd/system which is
+okay according systemd.unit(5). Now if the user space uses usrmerge we
+can specify the /usr prefix and everything should endup
[ptxdist] [PATCH] systemd: fix installation of 60-input-id.rules
This rule has a two lines: - one for the builtin "input_id" command and - one for the hwdb command. Only the second requires the hwdb. The first command can run without the hwdb and is necessary to tag the event devices correctly for the usage with libinput. Signed-off-by: Marco Felsch --- rules/systemd.make | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rules/systemd.make b/rules/systemd.make index 5d5354a52..b57b3953e 100644 --- a/rules/systemd.make +++ b/rules/systemd.make @@ -288,6 +288,7 @@ SYSTEMD_UDEV_RULES-y := \ 60-persistent-storage.rules \ 60-block.rules \ 60-drm.rules \ + 60-input-id.rules \ 60-serial.rules \ 64-btrfs.rules \ 75-net-description.rules \ @@ -298,7 +299,6 @@ SYSTEMD_UDEV_RULES-y := \ SYSTEMD_UDEV_RULES-$(PTXCONF_SYSTEMD_UDEV_HWDB) += \ 60-autosuspend.rules \ 60-evdev.rules \ - 60-input-id.rules \ 60-sensor.rules \ 70-joystick.rules \ 70-mouse.rules \ -- 2.29.2 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] cog: version bump 0.7.1 -> 0.8.0
Signed-off-by: Marco Felsch --- rules/cog.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/cog.make b/rules/cog.make index a0587a8d5..270fcd824 100644 --- a/rules/cog.make +++ b/rules/cog.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_COG) += cog # # Paths and names # -COG_VERSION:= 0.7.1 -COG_MD5:= f2c51cd444ca54d8042e99b3e8a3fa78 +COG_VERSION:= 0.8.0 +COG_MD5:= f7aa8a425927cab247563411fc67c5a3 COG:= cog-$(COG_VERSION) COG_SUFFIX := tar.xz COG_URL:= https://wpewebkit.org/releases/$(COG).$(COG_SUFFIX) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] zstd: remove libzstd targetinstall option
Drop useless ZSTD_LIBZSTD selection. The main purpose of the zstd package is to install the libzstd. Explicit selecting the zstdlib is not intuitive and causes errors if someone assumes that this lib gets installed just by selection the zstd package. Link the zstd helper against the shared libzstd while on it. Signed-off-by: Marco Felsch --- rules/mesalib.in| 1 - rules/squashfs-tools.in | 1 - rules/zstd.in | 7 --- rules/zstd.make | 5 ++--- 4 files changed, 2 insertions(+), 12 deletions(-) diff --git a/rules/mesalib.in b/rules/mesalib.in index 4d87d0e61..df0da381c 100644 --- a/rules/mesalib.in +++ b/rules/mesalib.in @@ -31,7 +31,6 @@ menuconfig MESALIB select EXPAT select ZLIB select ZSTD if MESALIB_ZSTD - select ZSTD_LIBZSTD if MESALIB_ZSTD help Mesa is a 3-D graphics library with an API which is very similar to that of OpenGL. See the project homepage for diff --git a/rules/squashfs-tools.in b/rules/squashfs-tools.in index 9e4f48550..cbd1f324b 100644 --- a/rules/squashfs-tools.in +++ b/rules/squashfs-tools.in @@ -7,7 +7,6 @@ menuconfig SQUASHFS_TOOLS select GCCLIBS_GCC_S select ZLIB select ZSTD if SQUASHFS_TOOLS_ZSTD_SUPPORT - select ZSTD_LIBZSTD if SQUASHFS_TOOLS_ZSTD_SUPPORT prompt "squashfs-tools" help Squashfs is a highly compressed read-only filesystem for Linux. diff --git a/rules/zstd.in b/rules/zstd.in index 3010ebda3..b855c4e3a 100644 --- a/rules/zstd.in +++ b/rules/zstd.in @@ -15,23 +15,16 @@ menuconfig ZSTD if ZSTD -config ZSTD_LIBZSTD - bool - prompt "install zstd library" - config ZSTD_ZSTD bool - select ZSTD_LIBZSTD prompt "install zstd tool" config ZSTD_ZSTDGREP bool - select ZSTD_LIBZSTD prompt "install zstdgrep" config ZSTD_ZSTDLESS bool - select ZSTD_LIBZSTD prompt "install zstdless" endif diff --git a/rules/zstd.make b/rules/zstd.make index 670fba739..3dfcf1d6d 100644 --- a/rules/zstd.make +++ b/rules/zstd.make @@ -39,7 +39,7 @@ ZSTD_CONF_OPT := \ -DZSTD_BUILD_CONTRIB=OFF \ -DZSTD_BUILD_TESTS=OFF \ -DZSTD_USE_STATIC_RUNTIME=OFF \ - -DZSTD_PROGRAMS_LINK_SHARED=OFF \ + -DZSTD_PROGRAMS_LINK_SHARED=ON \ -DZSTD_BUILD_STATIC=ON \ -DZSTD_BUILD_SHARED=ON \ -DZSTD_ZLIB_SUPPORT=OFF \ @@ -59,9 +59,8 @@ $(STATEDIR)/zstd.targetinstall: @$(call install_fixup, zstd, AUTHOR, "Florian Faber ") @$(call install_fixup, zstd, DESCRIPTION, missing) -ifdef PTXCONF_ZSTD_LIBZSTD @$(call install_lib, zstd, 0, 0, 0644, libzstd) -endif + ifdef PTXCONF_ZSTD_ZSTD @$(call install_copy, zstd, 0, 0, 0755, -, /usr/bin/zstd) @$(call install_link, zstd, zstd, /usr/bin/zstdcat) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] systemd: fix zstd deps
On 20-08-12 12:14, Marco Felsch wrote: > Our zstd package is a lot more fine granular only selecting the the zstd > package does nothing. Instead we need to tell ptxdist that the zstdlib > must be installed too else systemd fails with: > 'error while loading shared libraries: libzstd.so.1: cannot open shared > object file: No such file or directory' I don't know if we should install the zstdlib per default if the zstd package was selected to avoid this failures in further packages. Regards, Marco ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] systemd: fix zstd deps
Our zstd package is a lot more fine granular only selecting the the zstd package does nothing. Instead we need to tell ptxdist that the zstdlib must be installed too else systemd fails with: 'error while loading shared libraries: libzstd.so.1: cannot open shared object file: No such file or directory' Signed-off-by: Marco Felsch --- rules/systemd.in | 1 + 1 file changed, 1 insertion(+) diff --git a/rules/systemd.in b/rules/systemd.in index bd848b372..1206a30de 100644 --- a/rules/systemd.in +++ b/rules/systemd.in @@ -22,6 +22,7 @@ menuconfig SYSTEMD select XZ if SYSTEMD_XZ select LZ4 if SYSTEMD_LZ4 select ZSTD if SYSTEMD_ZSTD + select ZSTD_LIBZSTD if SYSTEMD_ZSTD select LIBMICROHTTPDif SYSTEMD_MICROHTTPD select LIBSECCOMP if SYSTEMD_SECCOMP select LIBSELINUX if GLOBAL_SELINUX -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] systemd: version bump 245.6 -> 246
On 20-07-31 07:45, Robert Schwebel wrote: > On Fri, Jul 31, 2020 at 07:26:31AM +0200, Marco Felsch wrote: > > On 20-07-30 22:58, Robert Schwebel wrote: > > > > ... > > > > > +config SYSTEMD_ZSTD > > > + bool > > > + prompt "ZSTD compressed journal support" > > > > Do we have a target zstd lib which should be selected here or does > > systemd have its own lib? > > Look further up in the .in file - there is a corresponding select in my > patch. Argh.. you're right. I had not enough coffee.. Regards, Marco ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] systemd: version bump 245.6 -> 246
Hi Robert, On 20-07-30 22:58, Robert Schwebel wrote: ... > +config SYSTEMD_ZSTD > + bool > + prompt "ZSTD compressed journal support" Do we have a target zstd lib which should be selected here or does systemd have its own lib? Regards, Marco ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH 1/2] cog: version bump to 0.7.1
The patch was merged upstream by commit: 30b13be ("cmake: Fix passing
-DWAYLAND_PROTOCOLS= on command line")
Signed-off-by: Marco Felsch
---
...g-DWAYLAND_PROTOCOLS-on-command-line.patch | 103 --
patches/cog-0.6.0/series | 4 -
rules/cog.make| 4 +-
3 files changed, 2 insertions(+), 109 deletions(-)
delete mode 100644
patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
delete mode 100644 patches/cog-0.6.0/series
diff --git
a/patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
b/patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
deleted file mode 100644
index b4686bd62..0
---
a/patches/cog-0.6.0/0001-cmake-Fix-passing-DWAYLAND_PROTOCOLS-on-command-line.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From: Joshua Watt
-Date: Mon, 30 Mar 2020 14:50:46 -0500
-Subject: [PATCH] cmake: Fix passing -DWAYLAND_PROTOCOLS= on command line
-
-The optimization to check if WAYLAND_PROTOCOLS was set on the cmake
-comamnd line was skipping the function implementations, making cmake
-fail if it was used. The simple fix is to define the functions, then
-bail of out WAYLAND_PROTOCOLS is already defined.
-
-Signed-off-by: Joshua Watt
- cmake/FindWaylandProtocols.cmake | 74
- 1 file changed, 37 insertions(+), 37 deletions(-)
-
-diff --git a/cmake/FindWaylandProtocols.cmake
b/cmake/FindWaylandProtocols.cmake
-index 49a3cd50f91b..31f429cb2732 100644
a/cmake/FindWaylandProtocols.cmake
-+++ b/cmake/FindWaylandProtocols.cmake
-@@ -34,43 +34,6 @@ find_package(WaylandScanner)
-
- set(WAYLAND_PROTOCOLS "" CACHE FILEPATH "Path to the wayland-protocols data
directory")
-
--# Already detected included and directory found?
--if (WAYLAND_PROTOCOLS AND IS_DIRECTORY "${WAYLAND_PROTOCOLS}")
--return ()
--endif ()
--
--#
--# Method 1: If -DWAYLAND_PROTOCOLS=... was passed in the command line,
--# check whether the "stable" and "unstable" subdirectories
--# exist.
--#
--if (WAYLAND_PROTOCOLS)
--get_filename_component(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS}" REALPATH)
--if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/stable")
--set(WAYLAND_PROTOCOLS "")
--endif ()
--if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/unstable")
--set(WAYLAND_PROTOCOLS "")
--endif ()
--endif ()
--
--#
--# Method 2: Try to find the directory using pkg-config.
--#
--if (NOT DEFINED WAYLAND_PROTOCOLS OR NOT WAYLAND_PROTOCOLS)
--find_package(PkgConfig)
--pkg_check_modules(WAYLAND_PROTOCOLS_PC wayland-protocols)
--if (WAYLAND_PROTOCOLS_PC_FOUND)
--pkg_get_variable(WAYLAND_PROTOCOLS_PC_DATADIR wayland-protocols
pkgdatadir)
--if (WAYLAND_PROTOCOLS_PC_DATADIR)
--set(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS_PC_DATADIR}")
--endif ()
--endif ()
--unset(WAYLAND_PROTOCOLS_PC)
--unset(WAYLAND_PROTOCOLS_PC_DATADIR)
--endif ()
--
--
- include(FindPackageHandleStandardArgs)
- FIND_PACKAGE_HANDLE_STANDARD_ARGS(
- WAYLAND_PROTOCOLS
-@@ -206,3 +169,40 @@ function(add_wayland_protocol _target _kind _protocol)
- target_sources(${_target} PRIVATE "${proto_server}")
- endif ()
- endfunction()
-+
-+# Already detected included and directory found?
-+if (WAYLAND_PROTOCOLS AND IS_DIRECTORY "${WAYLAND_PROTOCOLS}")
-+return ()
-+endif ()
-+
-+#
-+# Method 1: If -DWAYLAND_PROTOCOLS=... was passed in the command line,
-+# check whether the "stable" and "unstable" subdirectories
-+# exist.
-+#
-+if (WAYLAND_PROTOCOLS)
-+get_filename_component(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS}" REALPATH)
-+if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/stable")
-+set(WAYLAND_PROTOCOLS "")
-+endif ()
-+if (NOT IS_DIRECTORY "${WAYLAND_PROTOCOLS}/unstable")
-+set(WAYLAND_PROTOCOLS "")
-+endif ()
-+endif ()
-+
-+#
-+# Method 2: Try to find the directory using pkg-config.
-+#
-+if (NOT DEFINED WAYLAND_PROTOCOLS OR NOT WAYLAND_PROTOCOLS)
-+find_package(PkgConfig)
-+pkg_check_modules(WAYLAND_PROTOCOLS_PC wayland-protocols)
-+if (WAYLAND_PROTOCOLS_PC_FOUND)
-+pkg_get_variable(WAYLAND_PROTOCOLS_PC_DATADIR wayland-protocols
pkgdatadir)
-+if (WAYLAND_PROTOCOLS_PC_DATADIR)
-+set(WAYLAND_PROTOCOLS "${WAYLAND_PROTOCOLS_PC_DATADIR}")
-+endif ()
-+endif ()
-+unset(WAYLAND_PROTOCOLS_PC)
-+unset(WAYLAND_PROTOCOLS_PC_DATADIR)
-+endif ()
-+
diff --git a/patches/cog-0.6.0/series b/patches/cog-0.6.0/series
deleted file mode 100644
index 3c5f3e8d5..0
--- a/patches/cog-0.6.0/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-pa
[ptxdist] [PATCH 2/2] wpewebkit: version bump to 2.28.2
Signed-off-by: Marco Felsch --- rules/wpewebkit.make | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rules/wpewebkit.make b/rules/wpewebkit.make index 075e5cd6c..823b8b756 100644 --- a/rules/wpewebkit.make +++ b/rules/wpewebkit.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WPEWEBKIT) += wpewebkit # # Paths and names # -WPEWEBKIT_VERSION := 2.28.0 -WPEWEBKIT_MD5 := 4298b9d38b4f05f92995422ea9979893 +WPEWEBKIT_VERSION := 2.28.2 +WPEWEBKIT_MD5 := c1f17d4b031e9462692443e3c089789c WPEWEBKIT := wpewebkit-$(WPEWEBKIT_VERSION) WPEWEBKIT_SUFFIX := tar.xz WPEWEBKIT_URL := https://wpewebkit.org/releases/$(WPEWEBKIT).$(WPEWEBKIT_SUFFIX) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] barebox: add option to specify barebox image patterns
On 20-06-19 08:05, Michael Olbrich wrote: > On Tue, Jun 16, 2020 at 12:56:18AM +0200, Marco Felsch wrote: > > Allow users to specify other barebox image naming schemes. Now users can > > specify a list of: > > - unique image names and/or > > - matching name patterns using wildcards. > > > > While on it I fixed the leaking image-results upon a 'ptxdist clean > > barebox' command. Now all barebox artefacts are removed from the > > $(IMAGEDIR). > > > > Signed-off-by: Marco Felsch > > --- > > platforms/barebox.in | 9 + > > rules/barebox.make | 19 +-- > > 2 files changed, 22 insertions(+), 6 deletions(-) > > > > diff --git a/platforms/barebox.in b/platforms/barebox.in > > index 526d7ede4..b92cf485e 100644 > > --- a/platforms/barebox.in > > +++ b/platforms/barebox.in > > @@ -39,6 +39,15 @@ config BAREBOX_CONFIG > > This entry specifies the .config file used to compile > > barebox. > > > > +config BAREBOX_IMAGES > > + prompt "barebox images to install" > > + string > > + default "barebox-*.img" > > + help > > + A comma seperated list of images which should be installed > > + into the $(IMAGEDIR). The list can contain full image names > > + and/or wildcard pattern image names. > > Why comma seperated? Just use a space seperated list and avoid the > substitutions below. Good point, I tought the DTS are also comma seperated, but they are space seperated.. *Damn* I will change this and send a v2. Regards, Marco > Michael > > > + > > config BAREBOX_EXTRA_ENV > > prompt "extend the builtin barebox environment" > > bool > > diff --git a/rules/barebox.make b/rules/barebox.make > > index d1b5fc598..65bb8251e 100644 > > --- a/rules/barebox.make > > +++ b/rules/barebox.make > > @@ -148,6 +148,9 @@ $(STATEDIR)/barebox.install: > > # Target-Install > > # > > > > > > +BAREBOX_IMAGES_DIR := $(BAREBOX_BUILD_DIR)/images > > +BAREBOX_IMAGES := $(strip $(subst $(ptx/def/comma),$(ptx/def/space),$(call > > remove_quotes, $(PTXCONF_BAREBOX_IMAGES > > + > > $(STATEDIR)/barebox.targetinstall: > > @$(call targetinfo) > > > > @@ -166,14 +169,15 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),) > > endif > > > > @rm -f $(IMAGEDIR)/barebox-image > > - @if [ -d $(BAREBOX_BUILD_DIR)/images ]; then \ > > - find $(BAREBOX_BUILD_DIR)/images/ -name "barebox-*.img" | sort > > | while read image; do \ > > - install -D -m644 $$image $(IMAGEDIR)/`basename > > $$image`; \ > > + @$(foreach _image, $(BAREBOX_IMAGES), \ > > + $(foreach image, $(wildcard $(BAREBOX_IMAGES_DIR)/$(_image)), \ > > + install -D -m644 $(image) $(IMAGEDIR)/$(notdir > > $(image)); \ > > if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ > > - ln -sf `basename $$image` > > $(IMAGEDIR)/barebox-image; \ > > + ln -sf $(notdir $(image)) > > $(IMAGEDIR)/barebox-image; \ > > fi; \ > > - done; \ > > - fi > > + ) \ > > + ) > > + > > @if [ -e $(IMAGEDIR)/barebox-image ]; then \ > > :; \ > > elif [ -e $(BAREBOX_BUILD_DIR)/barebox-flash-image ]; then \ > > @@ -199,6 +203,9 @@ $(STATEDIR)/barebox.clean: > > @$(call clean_pkg, BAREBOX) > > @$(foreach prog, $(BAREBOX_PROGS_HOST), \ > > rm -vf $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) > > + @$(foreach _image, $(BAREBOX_IMAGES), \ > > + $(foreach image, $(wildcard $(IMAGEDIR)/$(_image)), \ > > + rm -vf $(image);)) > > @rm -vf $(IMAGEDIR)/barebox-image > > $(IMAGEDIR)/barebox-default-environment > > > > # > > > > -- > > 2.20.1 > > > > > > ___ > > ptxdist mailing list > > ptxdist@pengutronix.de > > To unsubscribe, send a mail with subject "unsubscribe" to > > ptxdist-requ...@pengutronix.de > > > > -- > Pengutronix e.K. | | > Steuerwalder Str. 21 | http://www.pengutronix.de/ | > 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| > Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- | ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
[ptxdist] [PATCH] barebox: install imx-usb-loader host-tool
Install the tool into the sysroot-host if it was enabled in the bareboxconfig. Signed-off-by: Marco Felsch --- rules/barebox.make | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rules/barebox.make b/rules/barebox.make index 65bb8251e..578cdac2f 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -121,7 +121,8 @@ BAREBOX_PROGS_HOST := \ kernel-install \ bareboxcrc32 \ bareboximd \ - setupmbr/setupmbr + setupmbr/setupmbr \ + imx/imx-usb-loader BAREBOX_PROGS_TARGET_y := BAREBOX_PROGS_TARGET_$(PTXCONF_BAREBOX_BAREBOXENV) += bareboxenv -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH] barebox: add option to specify barebox image patterns
Hi Bastian, Roland, thanks for the quick response and comments :) On 20-06-16 10:34, Bastian Krause wrote: > > On 6/16/20 10:02 AM, Roland Hieber wrote: > > On Tue, Jun 16, 2020 at 12:56:18AM +0200, Marco Felsch wrote: > >> Allow users to specify other barebox image naming schemes. Now users can > >> specify a list of: > >> - unique image names and/or > >> - matching name patterns using wildcards. > >> > >> While on it I fixed the leaking image-results upon a 'ptxdist clean > >> barebox' command. Now all barebox artefacts are removed from the > >> $(IMAGEDIR). > >> > >> Signed-off-by: Marco Felsch > >> --- > > > > LGTM on first glance, could you do the same for > > rules/templates/template-barebox-make too please? > > Is this really necessary? The idea of the barebox rule template is to > generate a BSP specific barebox rule, right? We already have.. > > BAREBOX_@PACKAGE@_IMAGES := @image@ > > ..in that template, so we don't really benefit from a config option here. My idea was to _hopefully_ remove the usage of this template and instead use ptxdist upstream mechanism: - layer -> different barebox configs - this patch -> different barebox images Regards, Marco > Regards, > Bastian > > > > > - Roland > > > >> platforms/barebox.in | 9 + > >> rules/barebox.make | 19 +-- > >> 2 files changed, 22 insertions(+), 6 deletions(-) > >> > >> diff --git a/platforms/barebox.in b/platforms/barebox.in > >> index 526d7ede4..b92cf485e 100644 > >> --- a/platforms/barebox.in > >> +++ b/platforms/barebox.in > >> @@ -39,6 +39,15 @@ config BAREBOX_CONFIG > >> This entry specifies the .config file used to compile > >> barebox. > >> > >> +config BAREBOX_IMAGES > >> + prompt "barebox images to install" > >> + string > >> + default "barebox-*.img" > >> + help > >> +A comma seperated list of images which should be installed > >> +into the $(IMAGEDIR). The list can contain full image names > >> +and/or wildcard pattern image names. > >> + > >> config BAREBOX_EXTRA_ENV > >>prompt "extend the builtin barebox environment" > >>bool > >> diff --git a/rules/barebox.make b/rules/barebox.make > >> index d1b5fc598..65bb8251e 100644 > >> --- a/rules/barebox.make > >> +++ b/rules/barebox.make > >> @@ -148,6 +148,9 @@ $(STATEDIR)/barebox.install: > >> # Target-Install > >> # > >> > >> > >> +BAREBOX_IMAGES_DIR := $(BAREBOX_BUILD_DIR)/images > >> +BAREBOX_IMAGES := $(strip $(subst > >> $(ptx/def/comma),$(ptx/def/space),$(call remove_quotes, > >> $(PTXCONF_BAREBOX_IMAGES > >> + > >> $(STATEDIR)/barebox.targetinstall: > >>@$(call targetinfo) > >> > >> @@ -166,14 +169,15 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),) > >> endif > >> > >>@rm -f $(IMAGEDIR)/barebox-image > >> - @if [ -d $(BAREBOX_BUILD_DIR)/images ]; then \ > >> - find $(BAREBOX_BUILD_DIR)/images/ -name "barebox-*.img" | sort > >> | while read image; do \ > >> - install -D -m644 $$image $(IMAGEDIR)/`basename > >> $$image`; \ > >> + @$(foreach _image, $(BAREBOX_IMAGES), \ > >> + $(foreach image, $(wildcard $(BAREBOX_IMAGES_DIR)/$(_image)), \ > >> + install -D -m644 $(image) $(IMAGEDIR)/$(notdir > >> $(image)); \ > >>if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ > >> - ln -sf `basename $$image` > >> $(IMAGEDIR)/barebox-image; \ > >> + ln -sf $(notdir $(image)) > >> $(IMAGEDIR)/barebox-image; \ > >>fi; \ > >> - done; \ > >> - fi > >> + ) \ > >> + ) > >> + > >>@if [ -e $(IMAGEDIR)/barebox-image ]; then \ > >>:; \ > >>elif [ -e $(BAREBOX_BUILD_DIR)/barebox-flash-image ]; then \ > >> @@ -199,6 +203,9 @@ $(STATEDIR)/barebox.clean: > >>@$(call clean_pkg, BAREBOX) > >>@$(foreach prog, $(BAREBOX_PROGS_HOST), \ > >>rm -vf $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) > >> + @$(foreach _image, $(BAR
[ptxdist] [PATCH] barebox: add option to specify barebox image patterns
Allow users to specify other barebox image naming schemes. Now users can specify a list of: - unique image names and/or - matching name patterns using wildcards. While on it I fixed the leaking image-results upon a 'ptxdist clean barebox' command. Now all barebox artefacts are removed from the $(IMAGEDIR). Signed-off-by: Marco Felsch --- platforms/barebox.in | 9 + rules/barebox.make | 19 +-- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/platforms/barebox.in b/platforms/barebox.in index 526d7ede4..b92cf485e 100644 --- a/platforms/barebox.in +++ b/platforms/barebox.in @@ -39,6 +39,15 @@ config BAREBOX_CONFIG This entry specifies the .config file used to compile barebox. +config BAREBOX_IMAGES + prompt "barebox images to install" + string + default "barebox-*.img" + help + A comma seperated list of images which should be installed + into the $(IMAGEDIR). The list can contain full image names + and/or wildcard pattern image names. + config BAREBOX_EXTRA_ENV prompt "extend the builtin barebox environment" bool diff --git a/rules/barebox.make b/rules/barebox.make index d1b5fc598..65bb8251e 100644 --- a/rules/barebox.make +++ b/rules/barebox.make @@ -148,6 +148,9 @@ $(STATEDIR)/barebox.install: # Target-Install # +BAREBOX_IMAGES_DIR := $(BAREBOX_BUILD_DIR)/images +BAREBOX_IMAGES := $(strip $(subst $(ptx/def/comma),$(ptx/def/space),$(call remove_quotes, $(PTXCONF_BAREBOX_IMAGES + $(STATEDIR)/barebox.targetinstall: @$(call targetinfo) @@ -166,14 +169,15 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),) endif @rm -f $(IMAGEDIR)/barebox-image - @if [ -d $(BAREBOX_BUILD_DIR)/images ]; then \ - find $(BAREBOX_BUILD_DIR)/images/ -name "barebox-*.img" | sort | while read image; do \ - install -D -m644 $$image $(IMAGEDIR)/`basename $$image`; \ + @$(foreach _image, $(BAREBOX_IMAGES), \ + $(foreach image, $(wildcard $(BAREBOX_IMAGES_DIR)/$(_image)), \ + install -D -m644 $(image) $(IMAGEDIR)/$(notdir $(image)); \ if [ ! -e $(IMAGEDIR)/barebox-image ]; then \ - ln -sf `basename $$image` $(IMAGEDIR)/barebox-image; \ + ln -sf $(notdir $(image)) $(IMAGEDIR)/barebox-image; \ fi; \ - done; \ - fi + ) \ + ) + @if [ -e $(IMAGEDIR)/barebox-image ]; then \ :; \ elif [ -e $(BAREBOX_BUILD_DIR)/barebox-flash-image ]; then \ @@ -199,6 +203,9 @@ $(STATEDIR)/barebox.clean: @$(call clean_pkg, BAREBOX) @$(foreach prog, $(BAREBOX_PROGS_HOST), \ rm -vf $(PTXDIST_SYSROOT_HOST)/bin/$(notdir $(prog))$(ptx/nl)) + @$(foreach _image, $(BAREBOX_IMAGES), \ + $(foreach image, $(wildcard $(IMAGEDIR)/$(_image)), \ + rm -vf $(image);)) @rm -vf $(IMAGEDIR)/barebox-image $(IMAGEDIR)/barebox-default-environment # -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-requ...@pengutronix.de
Re: [ptxdist] [PATCH 2/2] tslib: convert to install_tree
On 20-04-17 08:36, Michael Olbrich wrote: > On Fri, Apr 10, 2020 at 12:35:15PM +0200, Marco Felsch wrote: > > Convert manual plugin search function to install_tree call to clean up > > the recipe. > > > > Signed-off-by: Marco Felsch > > --- > > Hi Michael, > > > > this patch can be squashed with the 1st if you want. > > > > Regards, > > Marco > > > > rules/tslib.make | 5 + > > 1 file changed, 1 insertion(+), 4 deletions(-) > > > > diff --git a/rules/tslib.make b/rules/tslib.make > > index 5ee46aa4c..e52e62520 100644 > > --- a/rules/tslib.make > > +++ b/rules/tslib.make > > @@ -86,6 +86,7 @@ $(STATEDIR)/tslib.targetinstall: > > /etc/ts.conf) > > > > @$(call install_lib, tslib, 0, 0, 0644, libts) > > + @$(call install_tree, tslib, 0, 0, 0644, -, /usr/lib/ts) > > @$(call install_tree, tslib, 0, 0, 0644, /usr/lib/ts) Is that possible? According the docs [1] this shouldn't be possible. [1] https://ptxdist.org/doc/ref_manual.html?highlight=install_tree#install-tree Regards, Marco > Michael > > > > > ifdef PTXCONF_TSLIB_TS_CALIBRATE > > @$(call install_copy, tslib, 0, 0, 0755, -, /usr/bin/ts_calibrate) > > @@ -94,10 +95,6 @@ ifdef PTXCONF_TSLIB_TS_TEST > > @$(call install_copy, tslib, 0, 0, 0755, -, /usr/bin/ts_test) > > endif > > > > - @cd $(TSLIB_PKGDIR) && for plugin in `find usr/lib/ts -name "*.so"`; do > > \ > > - $(call install_copy, tslib, 0, 0, 0644, -, /$$plugin); \ > > - done > > - > > @$(call install_finish, tslib) > > > > @$(call touch) > > -- > > 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] tslib: convert to install_tree
On 20-04-10 12:51, Marco Felsch wrote: > On 20-04-10 12:35, Marco Felsch wrote: > > Convert manual plugin search function to install_tree call to clean up > > the recipe. > > > > Signed-off-by: Marco Felsch > > --- > > Hi Michael, > > > > this patch can be squashed with the 1st if you want. > > Damn didn't re-compiled it with this patch.. Fixup is comming. Also I didn't covered the permission change.. Please drop this patch. ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [PATCH 2/2] tslib: convert to install_tree
On 20-04-10 12:35, Marco Felsch wrote: > Convert manual plugin search function to install_tree call to clean up > the recipe. > > Signed-off-by: Marco Felsch > --- > Hi Michael, > > this patch can be squashed with the 1st if you want. Damn didn't re-compiled it with this patch.. Fixup is comming. Regards, Marco ___ ptxdist mailing list ptxdist@pengutronix.de
Re: [ptxdist] [RFC PATCH 1/3] qt5: version bump 5.12.6 -> 5.14.1
Hi Michael,
there was a build issue if we enable the tslib support which is fixed by
the tslib version bump patch. So can you give those patches here a new
try?
Regards,
Marco
On 20-03-12 12:35, Marco Felsch wrote:
> This patch ports qt5 from version 5.12.6 to 5.14.1.
>
> Patch "0107-HACK-don-t-resolv-library-paths.patch" is dropped due to
> upstream revert fix [1].
>
> QtDeclarative:
> - The qtdeclarative qml core got refactored
> - new modules: Qt5QmlModels and Qt5QmlWorkerScript
>
> QtWebengine:
> - Adds widgets support
>
> QtSpeech & Qt3DQuick:
> - both got new options which are disabled for now till they are needed.
>
> [1]
> https://github.com/qt/qtbase/commit/9864d2c6f3b628ca9f07a56b197e77bd43931cca#diff-ed4563d8a1bafa2ed47afdccc9035d72
>
> Signed-off-by: Marco Felsch
> ---
> ...0107-HACK-don-t-resolv-library-paths.patch | 30 ---
> ..._EGL_NO_X11-and-qt_egl_p.h-everywher.patch | 6 ++--
> ...egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch | 2 +-
> ...-qt3d-link-with-latomic-if-necessary.patch | 0
> ...eglfs_kms-device-ordering-robustness.patch | 0
> ...ebengine-allow-building-with-ptxdist.patch | 10 ---
> ...ebengine-let-ninja-use-the-jobserver.patch | 10 ---
> ...e-workaround-for-too-long-file-names.patch | 4 +--
> .../series| 3 +-
> rules/qt5.make| 22 +++---
> 10 files changed, 37 insertions(+), 50 deletions(-)
> delete mode 100644
> patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch
> rename patches/{qt-everywhere-src-5.12.6 =>
> qt-everywhere-src-5.14.1}/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
> (97%)
> rename patches/{qt-everywhere-src-5.12.6 =>
> qt-everywhere-src-5.14.1}/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
> (97%)
> rename patches/{qt-everywhere-src-5.12.6 =>
> qt-everywhere-src-5.14.1}/0102-qt3d-link-with-latomic-if-necessary.patch
> (100%)
> rename patches/{qt-everywhere-src-5.12.6 =>
> qt-everywhere-src-5.14.1}/0103-eglfs_kms-device-ordering-robustness.patch
> (100%)
> rename patches/{qt-everywhere-src-5.12.6 =>
> qt-everywhere-src-5.14.1}/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
> (62%)
> rename patches/{qt-everywhere-src-5.12.6 =>
> qt-everywhere-src-5.14.1}/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
> (62%)
> rename patches/{qt-everywhere-src-5.12.6 =>
> qt-everywhere-src-5.14.1}/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch
> (94%)
> rename patches/{qt-everywhere-src-5.12.6 => qt-everywhere-src-5.14.1}/series
> (83%)
>
> diff --git
> a/patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch
> b/patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch
> deleted file mode 100644
> index 594fb684e..0
> ---
> a/patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch
> +++ /dev/null
> @@ -1,30 +0,0 @@
> -From: Michael Olbrich
> -Date: Fri, 8 Feb 2019 15:56:46 +0100
> -Subject: [PATCH] HACK: don't resolv library paths
> -
> -qtConfResolveLibs turns '-lfoo' into the full path for libfoo.so and fails
> -if the library is not found.
> -
> -This break when the library is a ld scripts in a relocatable toolchain.
> -For example libm.so may contain 'GROUP ( /lib/libm.so.6 ...)' and this path
> -is not prefixed with the toolchain sysroot when the absolute path for
> -libm.so is used.
> -
> -Signed-off-by: Michael Olbrich
>
> - qtbase/mkspecs/features/qt_configure.prf | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/qtbase/mkspecs/features/qt_configure.prf
> b/qtbase/mkspecs/features/qt_configure.prf
> -index 95e54d72c9b0..3250187ba774 100644
> a/qtbase/mkspecs/features/qt_configure.prf
> -+++ b/qtbase/mkspecs/features/qt_configure.prf
> -@@ -593,7 +593,7 @@ defineTest(qtConfResolveLibs) {
> - out += $$l
> - }
> - }
> --$$1 = $$out
> -+$$1 = $$2
> - export($$1)
> - !isEmpty(4) {
> - $$4 = $$paths
> diff --git
> a/patches/qt-everywhere-src-5.12.6/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
>
> b/patches/qt-everywhere-src-5.14.1/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
> similarity index 97%
> rename from
> patches/qt-everywhere-src-5.12.6/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
> rename to
> patches/qt-everywhere-src-5.14.1/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
> index 1872c83ad..218dc7e79 100644
> ---
> a/patches/q
[ptxdist] [PATCH 2/2] tslib: convert to install_tree
Convert manual plugin search function to install_tree call to clean up the recipe. Signed-off-by: Marco Felsch --- Hi Michael, this patch can be squashed with the 1st if you want. Regards, Marco rules/tslib.make | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/rules/tslib.make b/rules/tslib.make index 5ee46aa4c..e52e62520 100644 --- a/rules/tslib.make +++ b/rules/tslib.make @@ -86,6 +86,7 @@ $(STATEDIR)/tslib.targetinstall: /etc/ts.conf) @$(call install_lib, tslib, 0, 0, 0644, libts) + @$(call install_tree, tslib, 0, 0, 0644, -, /usr/lib/ts) ifdef PTXCONF_TSLIB_TS_CALIBRATE @$(call install_copy, tslib, 0, 0, 0755, -, /usr/bin/ts_calibrate) @@ -94,10 +95,6 @@ ifdef PTXCONF_TSLIB_TS_TEST @$(call install_copy, tslib, 0, 0, 0755, -, /usr/bin/ts_test) endif - @cd $(TSLIB_PKGDIR) && for plugin in `find usr/lib/ts -name "*.so"`; do \ - $(call install_copy, tslib, 0, 0, 0644, -, /$$plugin); \ - done - @$(call install_finish, tslib) @$(call touch) -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH 1/2] tslib: version bump 1.1 -> 1.21
A new version of tslib is needed at least for QT 5.14 if build with
tslib support. The new version adds many new plugins since v1.1 was
quite old. All local ptxdist patches are mainlined.
0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch:
Commit 9623bbe ("Link plugins against libts") replaces this patch.
0002-ts_test-clear-screen-on-exit.patch:
Commit 7ed3eef ("tests: clear screen on exit") replaces this patch.
0003-input-raw-call-check_fd-only-once.patch:
Commit 2466d73 ("plugins: input-raw: check device properties only when
filedesc changes") replaces this patch.
Signed-off-by: Marco Felsch
---
...inst-main-library-to-allow-dynamic-l.patch | 23 ---
.../0002-ts_test-clear-screen-on-exit.patch | 36 --
...03-input-raw-call-check_fd-only-once.patch | 22 ---
patches/tslib-1.1/autogen.sh | 1 -
patches/tslib-1.1/series | 6 ---
rules/tslib.in| 8 +++-
rules/tslib.make | 38 ---
7 files changed, 38 insertions(+), 96 deletions(-)
delete mode 100644
patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
delete mode 100644 patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
delete mode 100644
patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
delete mode 12 patches/tslib-1.1/autogen.sh
delete mode 100644 patches/tslib-1.1/series
diff --git
a/patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
b/patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
deleted file mode 100644
index 941d36410..0
---
a/patches/tslib-1.1/0001-Link-plugins-against-main-library-to-allow-dynamic-l.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Denis Oliver Kropp
-Date: Mon, 3 Feb 2014 09:57:25 +0100
-Subject: [PATCH] Link plugins against main library to allow dynamic loading of
- libts without RTLD_GLOBAL
-
-Signed-off-by: Denis Oliver Kropp
- plugins/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/Makefile.am b/plugins/Makefile.am
-index e938e17..d8cbfd9 100644
a/plugins/Makefile.am
-+++ b/plugins/Makefile.am
-@@ -15,7 +15,7 @@ INCLUDES = -I$(top_srcdir)/src
- #LTVSN= -version-info
$(LT_CURRENT):$(LT_REVISION):$(LT_AGE) \
- #-release $(LT_RELEASE)
- LTVSN = -avoid-version
--LIBS =
-+LIBS = $(top_srcdir)/src/libts.la
- pluginexecdir = $(PLUGIN_DIR)
-
- if ENABLE_LINEAR_MODULE
diff --git a/patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
b/patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
deleted file mode 100644
index a1db4a147..0
--- a/patches/tslib-1.1/0002-ts_test-clear-screen-on-exit.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From: Wolfram Sang
-Date: Mon, 3 Feb 2014 09:57:25 +0100
-Subject: [PATCH] ts_test: clear screen on exit
-
-Make sure that ts_test clears the screen on exit.
-
-Signed-off-by: Wolfram Sang
- tests/ts_calibrate.c | 1 +
- tests/ts_test.c | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/tests/ts_calibrate.c b/tests/ts_calibrate.c
-index eb0aca3..ea503a4 100644
a/tests/ts_calibrate.c
-+++ b/tests/ts_calibrate.c
-@@ -268,6 +268,7 @@ int main()
- i = -1;
- }
-
-+ fillrect (0, 0, xres - 1, yres - 1, 0);
- close_framebuffer();
- return i;
- }
-diff --git a/tests/ts_test.c b/tests/ts_test.c
-index fbbc9b8..d47c6e0 100644
a/tests/ts_test.c
-+++ b/tests/ts_test.c
-@@ -213,6 +213,7 @@ int main()
- if (quit_pressed)
- break;
- }
-+ fillrect (0, 0, xres - 1, yres - 1, 0);
- close_framebuffer();
-
- return 0;
diff --git a/patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
b/patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
deleted file mode 100644
index d977c6365..0
--- a/patches/tslib-1.1/0003-input-raw-call-check_fd-only-once.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Michael Olbrich
-Date: Mon, 3 Feb 2014 10:55:42 +0100
-Subject: [PATCH] input-raw: call check_fd() only once
-
-Signed-off-by: Michael Olbrich
- plugins/input-raw.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/plugins/input-raw.c b/plugins/input-raw.c
-index 10454da..5ce0abb 100644
a/plugins/input-raw.c
-+++ b/plugins/input-raw.c
-@@ -129,7 +129,7 @@ static int check_fd(struct tslib_input *i)
- i->grab_events = GRAB_EVENTS_ACTIVE;
- }
-
-- return 0;
-+ return 1;
- }
-
- static int ts_input_read(struct tslib_module_info *inf,
diff --git a/patches/tslib-1.1/autogen.sh b/patches/tslib-1.1/autogen.sh
deleted file mode 12
index 9f8a4cb7d..0
--- a/patches/tslib-1.1/autogen.sh
+++ /dev/null
@@ -1 +0,0 @@
-
[ptxdist] [RFC PATCH 1/3] qt5: version bump 5.12.6 -> 5.14.1
This patch ports qt5 from version 5.12.6 to 5.14.1.
Patch "0107-HACK-don-t-resolv-library-paths.patch" is dropped due to
upstream revert fix [1].
QtDeclarative:
- The qtdeclarative qml core got refactored
- new modules: Qt5QmlModels and Qt5QmlWorkerScript
QtWebengine:
- Adds widgets support
QtSpeech & Qt3DQuick:
- both got new options which are disabled for now till they are needed.
[1]
https://github.com/qt/qtbase/commit/9864d2c6f3b628ca9f07a56b197e77bd43931cca#diff-ed4563d8a1bafa2ed47afdccc9035d72
Signed-off-by: Marco Felsch
---
...0107-HACK-don-t-resolv-library-paths.patch | 30 ---
..._EGL_NO_X11-and-qt_egl_p.h-everywher.patch | 6 ++--
...egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch | 2 +-
...-qt3d-link-with-latomic-if-necessary.patch | 0
...eglfs_kms-device-ordering-robustness.patch | 0
...ebengine-allow-building-with-ptxdist.patch | 10 ---
...ebengine-let-ninja-use-the-jobserver.patch | 10 ---
...e-workaround-for-too-long-file-names.patch | 4 +--
.../series| 3 +-
rules/qt5.make| 22 +++---
10 files changed, 37 insertions(+), 50 deletions(-)
delete mode 100644
patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch
rename patches/{qt-everywhere-src-5.12.6 =>
qt-everywhere-src-5.14.1}/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
(97%)
rename patches/{qt-everywhere-src-5.12.6 =>
qt-everywhere-src-5.14.1}/0101-videonode-egl-use-QT_EGL_NO_X11-and-qt_egl_p.h.patch
(97%)
rename patches/{qt-everywhere-src-5.12.6 =>
qt-everywhere-src-5.14.1}/0102-qt3d-link-with-latomic-if-necessary.patch (100%)
rename patches/{qt-everywhere-src-5.12.6 =>
qt-everywhere-src-5.14.1}/0103-eglfs_kms-device-ordering-robustness.patch (100%)
rename patches/{qt-everywhere-src-5.12.6 =>
qt-everywhere-src-5.14.1}/0104-ptxdist-qtwebengine-allow-building-with-ptxdist.patch
(62%)
rename patches/{qt-everywhere-src-5.12.6 =>
qt-everywhere-src-5.14.1}/0105-ptxdist-qtwebengine-let-ninja-use-the-jobserver.patch
(62%)
rename patches/{qt-everywhere-src-5.12.6 =>
qt-everywhere-src-5.14.1}/0106-HACK-qtwebengine-workaround-for-too-long-file-names.patch
(94%)
rename patches/{qt-everywhere-src-5.12.6 => qt-everywhere-src-5.14.1}/series
(83%)
diff --git
a/patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch
b/patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch
deleted file mode 100644
index 594fb684e..0
---
a/patches/qt-everywhere-src-5.12.6/0107-HACK-don-t-resolv-library-paths.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Michael Olbrich
-Date: Fri, 8 Feb 2019 15:56:46 +0100
-Subject: [PATCH] HACK: don't resolv library paths
-
-qtConfResolveLibs turns '-lfoo' into the full path for libfoo.so and fails
-if the library is not found.
-
-This break when the library is a ld scripts in a relocatable toolchain.
-For example libm.so may contain 'GROUP ( /lib/libm.so.6 ...)' and this path
-is not prefixed with the toolchain sysroot when the absolute path for
-libm.so is used.
-
-Signed-off-by: Michael Olbrich
- qtbase/mkspecs/features/qt_configure.prf | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/qtbase/mkspecs/features/qt_configure.prf
b/qtbase/mkspecs/features/qt_configure.prf
-index 95e54d72c9b0..3250187ba774 100644
a/qtbase/mkspecs/features/qt_configure.prf
-+++ b/qtbase/mkspecs/features/qt_configure.prf
-@@ -593,7 +593,7 @@ defineTest(qtConfResolveLibs) {
- out += $$l
- }
- }
--$$1 = $$out
-+$$1 = $$2
- export($$1)
- !isEmpty(4) {
- $$4 = $$paths
diff --git
a/patches/qt-everywhere-src-5.12.6/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
b/patches/qt-everywhere-src-5.14.1/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
similarity index 97%
rename from
patches/qt-everywhere-src-5.12.6/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
rename to
patches/qt-everywhere-src-5.14.1/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
index 1872c83ad..218dc7e79 100644
---
a/patches/qt-everywhere-src-5.12.6/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
+++
b/patches/qt-everywhere-src-5.14.1/0100-qtwayland-use-QT_EGL_NO_X11-and-qt_egl_p.h-everywher.patch
@@ -29,7 +29,7 @@ index 700e95e32df5..7667b5418261 100644
$$PWD/drmeglserverbufferintegration.cpp
diff --git
a/qtwayland/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
b/qtwayland/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
-index 2c65969f8488..e6387c37158b 100644
+index 64201476da10..a0a44611b476 100644
---
a/qtwayland/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration.h
+++
b/qtwayland/src/hardwareintegration/client/drm-egl-server/drmeglserverbufferintegration
[ptxdist] [RFC PATCH 2/3] qt5: drop qtdeclarative opengl dependency
Since 5.14 the qtdeclarative can be build with -no-opengl option so we can remove the dependency. Now all 3D modules need to add the opengl dependency by there own. We also must ensure that all 3D modules are skipped if -no-opengl is specified. The particles module depends on the opengl support and the module isn't build if the support is missing. So we need a way to handle this too. Signed-off-by: Marco Felsch --- rules/qt5.in | 7 ++- rules/qt5.make | 3 ++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/rules/qt5.in b/rules/qt5.in index 162ea8b9b..b5b6e2bfb 100644 --- a/rules/qt5.in +++ b/rules/qt5.in @@ -321,6 +321,7 @@ menu "Modules " config QT5_MODULE_QT3D bool + select QT5_OPENGL select QT5_MODULE_QTDECLARATIVE select QT5_MODULE_QTGRAPHICALEFFECTS prompt "Qt3D" @@ -379,6 +380,7 @@ endif config QT5_MODULE_QTCANVAS3D bool + select QT5_OPENGL select QT5_MODULE_QTDECLARATIVE prompt "QtCanvas3D" @@ -418,7 +420,6 @@ config QT5_MODULE_QTDATAVIS3D_QUICK config QT5_MODULE_QTDECLARATIVE bool - select QT5_OPENGL prompt "QtDeclarative" if QT5_MODULE_QTDECLARATIVE @@ -445,6 +446,10 @@ config QT5_MODULE_QTDECLARATIVE_QUICK_DEBUG bool default QT5_MODULE_QTDECLARATIVE_DEBUG +config QT5_MODULE_QTDECLARATIVE_QUICK_PARTICLES + bool + default QT5_OPENGL + endif config QT5_MODULE_QTDECLARATIVE_ACCESSIBILITY diff --git a/rules/qt5.make b/rules/qt5.make index 63e8e29a9..e70fefe25 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -148,6 +148,7 @@ QT5_CONF_OPT:= \ $(call ptx/qt5-module, QTMULTIMEDIA, qtmultimedia) \ $(call ptx/qt5-module, QTNETWORKAUTH, qtnetworkauth) \ $(call ptx/qt5-module, QTPURCHASING, qtpurchasing) \ + $(call ptx/qt5-module, QT3D_QUICK, qtquick3d) \ $(call ptx/qt5-module, QTQUICKCONTROLS, qtquickcontrols) \ $(call ptx/qt5-module, QTQUICKCONTROLS2, qtquickcontrols2) \ $(call ptx/qt5-module, QTREMOTEOBJECTS, qtremoteobjects) \ @@ -445,7 +446,7 @@ QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5QmlWorkerScript QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5Quick QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5QuickShapes QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK_WIDGETS) += Qt5QuickWidgets -QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5QuickParticles +QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK_PARTICLES) += Qt5QuickParticles ifdef PTXCONF_QT5_TEST QT5_LIBS-$(PTXCONF_QT5_MODULE_QTDECLARATIVE_QUICK) += Qt5QuickTest endif -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [RFC PATCH 3/3] qt5: add capability to build from git super project
This adds the capability to build qt from the git super project. I replaced the '-release' with '-developer-build' since building from git is only useful for developers which often need more debug information. The qtpim and qtdocgallery packages are only available on the qt5 git super project. The release tar doesn't contain those modules yet. Anyway, those modules can't be compiled yet so we need to skip those. Signed-off-by: Marco Felsch --- rules/qt5.in | 15 +++ rules/qt5.make | 4 +++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/rules/qt5.in b/rules/qt5.in index b5b6e2bfb..40380feaa 100644 --- a/rules/qt5.in +++ b/rules/qt5.in @@ -87,6 +87,11 @@ config QT5_LIBXKBCOMMON bool default QT5_PLATFORM_XCB || QT5_MODULE_QTWAYLAND || QT5_INPUT_LIBINPUT +config QT5_DEVEL_BUILD + bool + default n + prompt "Enable developer build" + if QT5_PLATFORM_XCB config QT5_X11 @@ -711,6 +716,16 @@ config QT5_MODULE_QTXMLPATTERNS bool prompt "QtXmlPatterns" +config QT5_MODULE_QTPIM + bool + depends on BROKEN + prompt "QtPim" + +config QT5_MODULE_QTDOCGALLERY + bool + depends on BROKEN + prompt "QtDocGallery" + endmenu endif diff --git a/rules/qt5.make b/rules/qt5.make index e70fefe25..5f8ccb9e3 100644 --- a/rules/qt5.make +++ b/rules/qt5.make @@ -112,7 +112,7 @@ QT5_CONF_OPT:= \ $(if $(filter 1,$(PTXDIST_VERBOSE)),-v) \ -opensource \ -confirm-license \ - -release \ + $(call ptx/ifdef, PTXCONF_QT5_DEVEL_BUILD, -developer-build, -release) \ --disable-optimized-tools \ --disable-separate-debug-info \ --disable-gdb-index \ @@ -140,6 +140,7 @@ QT5_CONF_OPT:= \ $(call ptx/qt5-module, QTDATAVIS3D, qtdatavis3d) \ $(call ptx/qt5-module, QTDECLARATIVE, qtdeclarative) \ -skip qtdoc \ + $(call ptx/qt5-module, QTDOCGALLERY, qtdocgallery) \ $(call ptx/qt5-module, QTGAMEPAD, qtgamepad) \ $(call ptx/qt5-module, QTGRAPHICALEFFECTS, qtgraphicaleffects) \ $(call ptx/qt5-module, QTIMAGEFORMATS, qtimageformats) \ @@ -147,6 +148,7 @@ QT5_CONF_OPT:= \ -skip qtmacextras \ $(call ptx/qt5-module, QTMULTIMEDIA, qtmultimedia) \ $(call ptx/qt5-module, QTNETWORKAUTH, qtnetworkauth) \ + $(call ptx/qt5-module, QTPIM, qtpim) \ $(call ptx/qt5-module, QTPURCHASING, qtpurchasing) \ $(call ptx/qt5-module, QT3D_QUICK, qtquick3d) \ $(call ptx/qt5-module, QTQUICKCONTROLS, qtquickcontrols) \ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
[ptxdist] [PATCH] doc: add ptx/truefalse macro description
Signed-off-by: Marco Felsch --- doc/ref_manual.rst | 27 +++ 1 file changed, 27 insertions(+) diff --git a/doc/ref_manual.rst b/doc/ref_manual.rst index e2be86060..e0192 100644 --- a/doc/ref_manual.rst +++ b/doc/ref_manual.rst @@ -1201,6 +1201,33 @@ Depending on the state of FOO_VARIABLE this line results into FOO_CONF_OPT += --with-something=/usr (if FOO_VARIABLE is set) FOO_CONF_OPT += --with-something=none (if FOO_VARIABLE is unset) +ptx/truefalse +~ + +To convert the state (set/unset) of a variable into a ``true/false`` +string use the ``ptx/truefalse`` macro. +If the given is set this macro expands to +the string ``true``, if unset to ``false`` instead. + +Usage: + +.. code-block:: none + + -Dwith-something=$(call ptx/truefalse,) + +An example: + +.. code-block:: make + + FOO_CONF_OPT += -Dwith-something=$(call ptx/truefalse,) + +Depending on the state of FOO_VARIABLE this line results into + +.. code-block:: make + + FOO_CONF_OPT += -Dwith-something=true (if FOO_VARIABLE is set) + FOO_CONF_OPT += -Dwith-something=false (if FOO_VARIABLE is unset) + ptx/get-alternative ~~~ -- 2.20.1 ___ ptxdist mailing list ptxdist@pengutronix.de
