[ptxdist] [PATCH] modemmanager: version bump 1.20.0 -> 1.20.2
From: Ladislav Michl First bugfix release of 1.20 series. Among other things building without tests is now fixed. Signed-off-by: Ladislav Michl --- rules/modemmanager.make | 8 +++- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/rules/modemmanager.make b/rules/modemmanager.make index 58427ff8a..94b327c43 100644 --- a/rules/modemmanager.make +++ b/rules/modemmanager.make @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager # # Paths and names # -MODEMMANAGER_VERSION := 1.20.0 -MODEMMANAGER_MD5 := 900b2e707a2095a4b476b68d1efb1c34 +MODEMMANAGER_VERSION := 1.20.2 +MODEMMANAGER_MD5 := 441b08c34136f3a28d79c7f110b6ee32 MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) MODEMMANAGER_SUFFIX:= tar.bz2 MODEMMANAGER_URL := https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEMMANAGER_VERSION)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) @@ -38,7 +38,7 @@ MODEMMANAGER_CONF_OPT := \ $(CROSS_MESON_USR) \ -Dudev=true \ -Dudevdir=/usr/lib/udev \ - -Dtests=true \ + -Dtests=false \ -Ddbus_policy_dir=/usr/share/dbus-1/system.d \ -Dsystemdsystemunitdir=/usr/lib/systemd/system \ -Dsystemd_suspend_resume=$(call ptx/truefalse, PTXCONF_INITMETHOD_SYSTEMD) \ @@ -55,8 +55,6 @@ MODEMMANAGER_CONF_OPT := \ -Dman=false \ -Dbash_completion=false -# sadly, ModemManager does not build with -Dtests=false - # # Target-Install # -- 2.32.0
Re: [ptxdist] [APPLIED] pipewire: version bump 0.3.59 -> 0.3.60
Thanks, applied as 78eb1f942010f99309c8e2a609eb54f5c4bda270. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 19:04:34 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221110142001.4058859-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/pipewire.make b/rules/pipewire.make > index 3b9e1b51a914..b8d04e8f8fd4 100644 > --- a/rules/pipewire.make > +++ b/rules/pipewire.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire > # > # Paths and names > # > -PIPEWIRE_VERSION := 0.3.59 > -PIPEWIRE_MD5 := d310bf1f3cc5b2b446aecfa97c2cde82 > +PIPEWIRE_VERSION := 0.3.60 > +PIPEWIRE_MD5 := 3b77c023fef647f848fb4189349bde80 > PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) > PIPEWIRE_SUFFIX := tar.bz2 > PIPEWIRE_URL := > https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX) > @@ -49,6 +49,7 @@ PIPEWIRE_CONF_OPT := \ > -Dbluez5-backend-hfp-native=disabled \ > -Dbluez5-backend-hsp-native=disabled \ > -Dbluez5-backend-hsphfpd=disabled \ > + -Dbluez5-backend-native-mm=disabled \ > -Dbluez5-backend-ofono=disabled \ > -Dbluez5-codec-aac=disabled \ > -Dbluez5-codec-aptx=disabled \ > @@ -84,6 +85,7 @@ PIPEWIRE_CONF_OPT := \ > -Dpipewire-v4l2=disabled \ > -Dpw-cat=enabled \ > -Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \ > + -Dreadline=$(call ptx/endis,PIPEWIRE_PW_CTL)d \ > -Droc=disabled \ > -Dsdl2=disabled \ > -Dsession-managers= \ > @@ -132,6 +134,8 @@ PIPEWIRE_MODULES-y := \ > protocol-simple \ > rt \ > session-manager \ > + rtp-source \ > + rtp-sink \ > spa-device \ > spa-device-factory \ > spa-node \
Re: [ptxdist] [APPLIED] wayland-protocols: version bump 1.27 -> 1.28
Thanks, applied as 3c8f0629b3bbc9dcd691bea012cbdde2bb2f0284. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 19:04:35 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221110142134.4059182-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make > index 131187d67e28..2e166bc2c9bb 100644 > --- a/rules/wayland-protocols.make > +++ b/rules/wayland-protocols.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WAYLAND_PROTOCOLS) += wayland-protocols > # > # Paths and names > # > -WAYLAND_PROTOCOLS_VERSION:= 1.27 > -WAYLAND_PROTOCOLS_MD5:= 883fa28a6094871421491086ba50f01a > +WAYLAND_PROTOCOLS_VERSION:= 1.28 > +WAYLAND_PROTOCOLS_MD5:= 391ac1ac30e96d2f5559e2cc40a4d924 > WAYLAND_PROTOCOLS:= > wayland-protocols-$(WAYLAND_PROTOCOLS_VERSION) > WAYLAND_PROTOCOLS_SUFFIX := tar.xz > WAYLAND_PROTOCOLS_URL:= > https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/$(WAYLAND_PROTOCOLS_VERSION)/downloads/$(WAYLAND_PROTOCOLS).$(WAYLAND_PROTOCOLS_SUFFIX)
Re: [ptxdist] [APPLIED] libxslt: version bump 1.1.35 -> 1.1.37
Thanks, applied as a0187e3e3ce7e11425bab2dd2bfebb14bf59bac4. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 19:04:33 +0100, Marc Kleine-Budde wrote: > Signed-off-by: Marc Kleine-Budde > Message-Id: <20221109165735.1193956-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/libxslt-1.1.35/0200-xslt-config-add-SYSROOT-support.patch > b/patches/libxslt-1.1.37/0200-xslt-config-add-SYSROOT-support.patch > similarity index 100% > rename from patches/libxslt-1.1.35/0200-xslt-config-add-SYSROOT-support.patch > rename to patches/libxslt-1.1.37/0200-xslt-config-add-SYSROOT-support.patch > diff --git a/patches/libxslt-1.1.35/series b/patches/libxslt-1.1.37/series > similarity index 100% > rename from patches/libxslt-1.1.35/series > rename to patches/libxslt-1.1.37/series > diff --git a/rules/libxslt.make b/rules/libxslt.make > index 4b5da2c4aa41..1921201178b7 100644 > --- a/rules/libxslt.make > +++ b/rules/libxslt.make > @@ -15,14 +15,13 @@ PACKAGES-$(PTXCONF_LIBXSLT) += libxslt > # > # Paths and names > # > -LIBXSLT_VERSION := 1.1.35 > -LIBXSLT_MD5 := 5b3a634b77effd8a6268c21173575053 > +LIBXSLT_VERSION := 1.1.37 > +LIBXSLT_MD5 := 84e86fc8a1b7495674016e05e4c5da44 > LIBXSLT := libxslt-$(LIBXSLT_VERSION) > LIBXSLT_SUFFIX := tar.xz > LIBXSLT_SOURCE := $(SRCDIR)/$(LIBXSLT).$(LIBXSLT_SUFFIX) > LIBXSLT_DIR := $(BUILDDIR)/$(LIBXSLT) > LIBXSLT_LICENSE := MIT > -# The file 'COPYING' is just a symlink on the file 'Copyright' > LIBXSLT_LICENSE_FILES := \ > file://Copyright;md5=0cd9a07afbeb24026c9b03aecfeba458 > > @@ -43,7 +42,6 @@ LIBXSLT_CONF_ENV := \ > LIBXSLT_CONF_TOOL := autoconf > LIBXSLT_CONF_OPT := \ >$(CROSS_AUTOCONF_USR) \ > - --disable-rebuild-docs \ > --disable-static \ > --without-python \ > --$(call ptx/wwo, PTXCONF_LIBXSLT_CRYPTO)-crypto \
Re: [ptxdist] [APPLIED] mesalib: version bump 22.2.2 -> 22.2.3
Thanks, applied as ceb07ea1f10d16f6e7517479a11cee4869b62573. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 19:04:32 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221109094149.1561802-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mesalib.make b/rules/mesalib.make > index 6395e1384261..933212479e83 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 22.2.2 > -MESALIB_MD5 := b696316674c2007cdcc25e67e192aba8 > +MESALIB_VERSION := 22.2.3 > +MESALIB_MD5 := 06c329323a60f6eb6d4adc0d3971b0f4 > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \
Re: [ptxdist] [APPLIED] clean: Fix a double whitespace
Thanks, applied as 8f8dbdd3530d7b63727013ad2e395e5d3e5b3c5b.
Michael
[sent from post-receive hook]
On Fri, 11 Nov 2022 19:04:31 +0100, Uwe Kleine-König
wrote:
> Fixes: c98e2ba9594c ("detect patch changes and reextract when needed")
> Message-Id: <20221108084030.113565-1-u.kleine-koe...@pengutronix.de>
> Signed-off-by: Michael Olbrich
>
> diff --git a/scripts/lib/ptxd_make_clean.sh b/scripts/lib/ptxd_make_clean.sh
> index a3a7cde797bc..4bfce603c94a 100644
> --- a/scripts/lib/ptxd_make_clean.sh
> +++ b/scripts/lib/ptxd_make_clean.sh
> @@ -18,7 +18,7 @@ ptxd_make_clean() {
> if [ -z "${PTXCONF_SETUP_AUTO_EXTRACT}" ]; then
> ptxd_bailout "Refusing to delete existing source" \
> "$(ptxd_print_path "${directory}")" \
> - "Delete anyways with --force or skip extract with --dirty."
> + "Delete anyways with --force or skip extract with --dirty."
> elif [ -z "${PTXDIST_FORCE}" -a -d "${directory}/.git" ]; then
> ptxd_bailout "Refusing to delete existing source with git" \
> "$(ptxd_print_path "${directory}")" \
Re: [ptxdist] [APPLIED] libcamera: version bump 2022-08-30-g68683d3811a8 -> 0.0.1
Thanks, applied as 94023de2a1e127d8c2d8fb215eb92232da003ec9.
Michael
[sent from post-receive hook]
On Fri, 11 Nov 2022 19:04:30 +0100, Matthias Fend
wrote:
> Apart from the other advances in libcamera, some version handling
> improvements have been implemented that make the previously required
> patches superfluous.
>
> Signed-off-by: Matthias Fend
> Message-Id: <20221107162755.321807-1-matthias.f...@emfend.at>
> Signed-off-by: Michael Olbrich
>
> 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
> deleted file mode 100644
> index 3e5c5ce68768..
> ---
> a/patches/libcamera-2022-08-30-g68683d3811a8/0001-do-not-use-git-information-for-version-generation.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -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
> deleted file mode 100644
> index 6ca42eafc0ac..
> --- a/patches/libcamera-2022-08-30-g68683d3811a8/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# 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.make b/rules/libcamera.make
> index a6560fb4835e..24b71ea7db73 100644
> --- a/rules/libcamera.make
> +++ b/rules/libcamera.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera
> #
> # Paths and names
> #
> -LIBCAMERA_VERSION:= 2022-08-30-g68683d3811a8
> -LIBCAMERA_MD5:= 2f5a985257a0797e0bd0b4182ef9bc9c
> +LIBCAMERA_VERSION:= 0.0.1
> +LIBCAMERA_MD5:= d428d7e7455e9cca763d313323043e7b
> LIBCAMERA:= libcamera-$(LIBCAMERA_VERSION)
> LIBCAMERA_SUFFIX := tar.gz
> -LIBCAMERA_URL:=
> https://git.libcamera.org/libcamera/libcamera.git;tag=$(LIBCAMERA_VERSION)
> +LIBCAMERA_URL:=
> https://git.libcamera.org/libcamera/libcamera.git;tag=v$(LIBCAMERA_VERSION)
> LIBCAMERA_SOURCE := $(SRCDIR)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX)
> LIBCAMERA_DIR:= $(BUILDDIR)/$(LIBCAMERA)
> LIBCAMERA_LICENSE:= Apache-2.0 AND \
Re: [ptxdist] Speed up targetinstall of certain packages
On 11/11/22 17:08, Michael Olbrich wrote:
> Hi,
>
> On Tue, Nov 08, 2022 at 01:10:32PM +0100, Christian Melki wrote:
>> So I did an experiment with bash loadables (builtins).
>> Turns out bash has a bunch of builtin examples.
>>
>> I had ptxdist build me a bash-5.2 for x86_64.
>> With the "loadables" make target.
>>
>> $ diff -urN ../lib/ptxdist-2022.11.0/rules/bash.make rules/bash.make
>> --- ../lib/ptxdist-2022.11.0/rules/bash.make 2022-10-21 16:54:50.0
>> +0200
>> +++ rules/bash.make 2022-11-08 12:51:38.609794625 +0100
>> @@ -77,6 +77,16 @@
>> --$(call ptx/wwo, PTXCONF_BASH_CURSES)-curses
>> #
>>
>> +# Compile
>> +#
>>
>> +
>> +$(STATEDIR)/bash.compile:
>> +@$(call targetinfo)
>> +@$(call world/compile, BASH)
>> +@$(call compile, BASH, loadables)
>> +@$(call touch)
>> +
>> +#
>>
>>
>> Since mkdir is slightly less than half of the external binary calls I had it
>> replaced.
>> I copied the scripts/lib/ptxd_make_xpkg_pkg.sh to my build path
>> and created a shell-loadables directory there.
>>
>> $ cp
>> platform-secplatform-x86_64/build-target/bash-5.2/examples/loadables/mkdir
>> scripts/lib/shell-loadables/
>>
>> $ ls -1 scripts/lib/shell-loadables/
>> mkdir
>>
>> $ diff -urN ../lib/ptxdist-2022.11.0/scripts/lib/ptxd_make_xpkg_pkg.sh
>> scripts/lib/ptxd_make_xpkg_pkg.sh
>> --- ../lib/ptxdist-2022.11.0/scripts/lib/ptxd_make_xpkg_pkg.sh
>> 2022-10-21 16:54:50.0 +0200
>> +++ scripts/lib/ptxd_make_xpkg_pkg.sh2022-11-08 13:08:18.074550829
>> +0100
>> @@ -682,6 +682,8 @@
>> ptxd_install_file() {
>> local cmd="file"
>> +#export PS4='+[${EPOCHREALTIME}][${BASH_SOURCE}:${LINENO}]:
>> ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'; set -x;
>> +enable -f scripts/lib/shell-loadables/mkdir mkdir
>> ptxd_install_file_impl "$@" ||
>> ptxd_install_error "install_file failed!"
>> }
>>
>> without mkdir builtin:
>> finished target timezone.targetinstall.post
>>
>> real 0m17,043s
>> user 0m13,522s
>> sys 0m4,138s
>>
>> with mkdir builtin:
>> finished target timezone.targetinstall.post
>>
>> real 0m12,345s
>> user 0m9,899s
>> sys 0m2,916s
>
> So loadable builtins in bash is interesting, but not something we can rely
> on at this time. But this whole thing got me thinking. Most mkdirs are
> don't actually do anything. They are just in case the directory does not
> exist yet. So we can do that:
>
> if [ ! -d "${dir}" ]; then
> mkdir -p "${dir}"
> fi
>
> That avoid most of the mkdirs and the speedup is considerably. Similar to
> the builtin I think. And I found some more things to improve:
>
> The 'flock' is only needed when building packages in parallel, so we can
> skip it for things like "ptxdist drop foo.compile; ptxdist targetinstall
> foo", and that's where the slow targetinstall hurts the moset.
>
> Do the chmod/chown with the 'install' when possible.
>
> And some stuff to improve the ptxdist startup time.
>
> For "time ptxdist targetinstall timezone" I get:
>
> Before:
> real0m29.167s
> user0m19.389s
> sys 0m9.903s
>
> After:
> real0m8.887s
> user0m5.954s
> sys 0m2.470s
>
> This stuff should hit master pretty soon.
>
> Thanks for the inspiration :-).
>
> Michael
>
Super!
The end goal was reached either way.
A faster ptxdist! Wee! :D
And thanks for the kind words,
Christian
>> On 11/8/22 11:13 AM, Christian Melki wrote:
>>>
>>>
>>> On 11/4/22 8:12 PM, Alexander Dahl wrote:
Hello Christian,
Am Fri, Nov 04, 2022 at 03:37:02PM + schrieb Gieseler, Christian:
> Hello,
>
> I have question regarding the speedup of daily work.
>
> We have frontend and backend of our webgui deployed with separate
> packages. Only task of these package is to deploy the files with
>
> @$(call install_tree, web-frontend, -, -, $(WEB_FRONTEND_DIR)/var-www/,
> /var/www/,no)
>
> Compile and install stages are empty. The just call targetinfo and touch
> to skip the stages.
>
> The frontend depends on the backend and the backend obviously depends on
> our application which is called by the backend.
> So our web-frontend.in file looks like this:
> ## SECTION=project_specific
>
> config WEB_FRONTEND
> bool
> select APP_LAYER
> select WEB_BACKEND
> prompt "e-mode Web Frontend"
> help
>
> As expected if i clean and compile APP_LAYER the targetinstallstage of
> Backend and Frontend are executed again. However this is only a Run-Time
> only dependency. It is a third-party archive and install_tree takes quite
> some time even on fast build hosts. Even it if is just a minute it is
> annoying to spend the time waiting during image creation.
Re: [ptxdist] Speed up targetinstall of certain packages
Hi,
On Tue, Nov 08, 2022 at 01:10:32PM +0100, Christian Melki wrote:
> So I did an experiment with bash loadables (builtins).
> Turns out bash has a bunch of builtin examples.
>
> I had ptxdist build me a bash-5.2 for x86_64.
> With the "loadables" make target.
>
> $ diff -urN ../lib/ptxdist-2022.11.0/rules/bash.make rules/bash.make
> --- ../lib/ptxdist-2022.11.0/rules/bash.make 2022-10-21 16:54:50.0
> +0200
> +++ rules/bash.make 2022-11-08 12:51:38.609794625 +0100
> @@ -77,6 +77,16 @@
> --$(call ptx/wwo, PTXCONF_BASH_CURSES)-curses
> #
>
> +# Compile
> +#
>
> +
> +$(STATEDIR)/bash.compile:
> + @$(call targetinfo)
> + @$(call world/compile, BASH)
> + @$(call compile, BASH, loadables)
> + @$(call touch)
> +
> +#
>
>
> Since mkdir is slightly less than half of the external binary calls I had it
> replaced.
> I copied the scripts/lib/ptxd_make_xpkg_pkg.sh to my build path
> and created a shell-loadables directory there.
>
> $ cp
> platform-secplatform-x86_64/build-target/bash-5.2/examples/loadables/mkdir
> scripts/lib/shell-loadables/
>
> $ ls -1 scripts/lib/shell-loadables/
> mkdir
>
> $ diff -urN ../lib/ptxdist-2022.11.0/scripts/lib/ptxd_make_xpkg_pkg.sh
> scripts/lib/ptxd_make_xpkg_pkg.sh
> --- ../lib/ptxdist-2022.11.0/scripts/lib/ptxd_make_xpkg_pkg.sh
> 2022-10-21 16:54:50.0 +0200
> +++ scripts/lib/ptxd_make_xpkg_pkg.sh 2022-11-08 13:08:18.074550829 +0100
> @@ -682,6 +682,8 @@
> ptxd_install_file() {
> local cmd="file"
> +#export PS4='+[${EPOCHREALTIME}][${BASH_SOURCE}:${LINENO}]:
> ${FUNCNAME[0]:+${FUNCNAME[0]}(): }'; set -x;
> +enable -f scripts/lib/shell-loadables/mkdir mkdir
> ptxd_install_file_impl "$@" ||
> ptxd_install_error "install_file failed!"
> }
>
> without mkdir builtin:
> finished target timezone.targetinstall.post
>
> real 0m17,043s
> user 0m13,522s
> sys 0m4,138s
>
> with mkdir builtin:
> finished target timezone.targetinstall.post
>
> real 0m12,345s
> user 0m9,899s
> sys 0m2,916s
So loadable builtins in bash is interesting, but not something we can rely
on at this time. But this whole thing got me thinking. Most mkdirs are
don't actually do anything. They are just in case the directory does not
exist yet. So we can do that:
if [ ! -d "${dir}" ]; then
mkdir -p "${dir}"
fi
That avoid most of the mkdirs and the speedup is considerably. Similar to
the builtin I think. And I found some more things to improve:
The 'flock' is only needed when building packages in parallel, so we can
skip it for things like "ptxdist drop foo.compile; ptxdist targetinstall
foo", and that's where the slow targetinstall hurts the moset.
Do the chmod/chown with the 'install' when possible.
And some stuff to improve the ptxdist startup time.
For "time ptxdist targetinstall timezone" I get:
Before:
real0m29.167s
user0m19.389s
sys 0m9.903s
After:
real0m8.887s
user0m5.954s
sys 0m2.470s
This stuff should hit master pretty soon.
Thanks for the inspiration :-).
Michael
> On 11/8/22 11:13 AM, Christian Melki wrote:
> >
> >
> > On 11/4/22 8:12 PM, Alexander Dahl wrote:
> > > Hello Christian,
> > >
> > > Am Fri, Nov 04, 2022 at 03:37:02PM + schrieb Gieseler, Christian:
> > > > Hello,
> > > >
> > > > I have question regarding the speedup of daily work.
> > > >
> > > > We have frontend and backend of our webgui deployed with separate
> > > > packages. Only task of these package is to deploy the files with
> > > >
> > > > @$(call install_tree, web-frontend, -, -, $(WEB_FRONTEND_DIR)/var-www/,
> > > > /var/www/,no)
> > > >
> > > > Compile and install stages are empty. The just call targetinfo and
> > > > touch to skip the stages.
> > > >
> > > > The frontend depends on the backend and the backend obviously depends
> > > > on our application which is called by the backend.
> > > > So our web-frontend.in file looks like this:
> > > > ## SECTION=project_specific
> > > >
> > > > config WEB_FRONTEND
> > > > bool
> > > > select APP_LAYER
> > > > select WEB_BACKEND
> > > > prompt "e-mode Web Frontend"
> > > > help
> > > >
> > > > As expected if i clean and compile APP_LAYER the targetinstallstage of
> > > > Backend and Frontend are executed again. However this is only a
> > > > Run-Time only dependency. It is a third-party archive and install_tree
> > > > takes quite some time even on fast build hosts. Even it if is just a
> > > > minute it is annoying to spend the time waiting during image creation.
> > > > Trying to solve that i found "if RUNTIME" für Run-Time only
> > > > Dependencys in the documentation here:
> > > >
> > > >
Re: [ptxdist] [APPLIED] shaderc: version bump v2022.1 -> v2022.3
Thanks, applied as 378a6705464773280b38e7d06a218c9ecff42e53. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:34 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221104113404.2928204-7-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/shaderc.make b/rules/shaderc.make > index 71a2454a9c21..c924ebc256fe 100644 > --- a/rules/shaderc.make > +++ b/rules/shaderc.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc > # > # Paths and names > # > -SHADERC_VERSION := v2022.1 > -SHADERC_MD5 := dc104cea7c6dee347e326031bdb77593 > +SHADERC_VERSION := v2022.3 > +SHADERC_MD5 := 5cb762af57637caf997d5f46baa4e8a4 > SHADERC := shaderc-$(SHADERC_VERSION) > SHADERC_SUFFIX := tar.gz > SHADERC_URL := \
Re: [ptxdist] [APPLIED] vulkan-tools: version bump 1.3.224.1 -> 1.3.231.1
Thanks, applied as 98b29f4641f408eb68d184dcc8866780468592a3. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:32 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221104113404.2928204-5-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-tools.in b/rules/vulkan-tools.in > index 76b312d71bbf..ce40987f594e 100644 > --- a/rules/vulkan-tools.in > +++ b/rules/vulkan-tools.in > @@ -6,9 +6,10 @@ config VULKAN_TOOLS > select HOST_CMAKE > select HOST_GLSLANG > select VULKAN_LOADER > - select LIBXCB if VULKAN_TOOLS_XCB > - select XORG_LIB_X11 if VULKAN_TOOLS_XCB > - select WAYLAND if VULKAN_TOOLS_WAYLAND > + select LIBXCB if VULKAN_TOOLS_XCB > + select XORG_LIB_X11 if VULKAN_TOOLS_XCB > + select WAYLAND if VULKAN_TOOLS_WAYLAND > + select WAYLAND_PROTOCOLSif VULKAN_TOOLS_WAYLAND > help > Vulkan Utilities and Tools > > diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make > index 293c2486aba2..a7ed9b947177 100644 > --- a/rules/vulkan-tools.make > +++ b/rules/vulkan-tools.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_TOOLS) += vulkan-tools > # > # Paths and names > # > -VULKAN_TOOLS_VERSION := 1.3.224.1 > -VULKAN_TOOLS_MD5 := 1e0751827d92fbd715687bdce6d374f4 > +VULKAN_TOOLS_VERSION := 1.3.231.1 > +VULKAN_TOOLS_MD5 := 927ccb38f18bc0af35742e81ba68b9d3 > VULKAN_TOOLS := vulkan-tools-$(VULKAN_TOOLS_VERSION) > VULKAN_TOOLS_SUFFIX := tar.gz > VULKAN_TOOLS_URL := > https://github.com/KhronosGroup/Vulkan-Tools/archive/sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX) > @@ -43,7 +43,7 @@ VULKAN_TOOLS_CONF_OPT := \ > -DUSE_CCACHE=OFF \ > -DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan > > -ifdef VULKAN_TOOLS_CUBE > +ifdef PTXCONF_VULKAN_TOOLS_CUBE > VULKAN_TOOLS_CONF_OPT+= \ > -DCUBE_WSI_SELECTION=$(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_WAYLAND, > WAYLAND, \ > $(call ptx/ifdef, PTXCONF_VULKAN_TOOLS_XCB, XCB, > DISPLAY)) \ > @@ -63,7 +63,7 @@ $(STATEDIR)/vulkan-tools.targetinstall: > @$(call install_fixup, vulkan-tools, AUTHOR, "Philipp Zabel > ") > @$(call install_fixup, vulkan-tools, DESCRIPTION, Vulkan Utilities and > Tools) > > -ifdef VULKAN_TOOLS_CUBE > +ifdef PTXCONF_VULKAN_TOOLS_CUBE > @$(call install_copy, vulkan-tools, 0, 0, 0755, -, /usr/bin/vkcube) > @$(call install_copy, vulkan-tools, 0, 0, 0755, -, /usr/bin/vkcubepp) > endif
Re: [ptxdist] [APPLIED] spirv-headers: version bump 1.3.224.1 -> 1.3.231.1
Thanks, applied as 3ea7760463b2cf9c611043e5e6d520f6ca4d263c. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:29 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221104113404.2928204-2-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make > index 3e9b59929cf1..ddf8b26049ea 100644 > --- a/rules/spirv-headers.make > +++ b/rules/spirv-headers.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers > # > # Paths and names > # > -SPIRV_HEADERS_VERSION:= 1.3.224.1 > -SPIRV_HEADERS_MD5:= 295b55773166d3ccfade522b9b80805f > +SPIRV_HEADERS_VERSION:= 1.3.231.1 > +SPIRV_HEADERS_MD5:= 2eac8853ab6ad09a31c6464ca3051407 > SPIRV_HEADERS:= spirv-headers-$(SPIRV_HEADERS_VERSION) > SPIRV_HEADERS_SUFFIX := tar.gz > SPIRV_HEADERS_URL:= > https://github.com/KhronosGroup/SPIRV-Headers/archive/sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX) > @@ -30,6 +30,8 @@ SPIRV_HEADERS_LICENSE_FILES := > file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae > > SPIRV_HEADERS_CONF_TOOL := cmake > SPIRV_HEADERS_CONF_OPT := \ > - $(CROSS_CMAKE_USR) > + $(CROSS_CMAKE_USR) \ > + -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ > + -DSPIRV_HEADERS_SKIP_INSTALL=OFF > > # vim: syntax=make
Re: [ptxdist] [APPLIED] vulkan-validationlayers: version bump 1.3.224.1 -> 1.3.231.1
Thanks, applied as b5f9978a75c01aaf9c25b774267a86053b0c3c9e. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:33 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221104113404.2928204-6-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-validationlayers.make > b/rules/vulkan-validationlayers.make > index 142df7157029..08648e01007f 100644 > --- a/rules/vulkan-validationlayers.make > +++ b/rules/vulkan-validationlayers.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_VALIDATIONLAYERS) += > vulkan-validationlayers > # > # Paths and names > # > -VULKAN_VALIDATIONLAYERS_VERSION := 1.3.224.1 > -VULKAN_VALIDATIONLAYERS_MD5 := 6c015ae4e1e0f4cc82f4670fc9042e0b > +VULKAN_VALIDATIONLAYERS_VERSION := 1.3.231.1 > +VULKAN_VALIDATIONLAYERS_MD5 := cd1c2e8df889c392a0e41cec12b8eb00 > VULKAN_VALIDATIONLAYERS := > vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION) > VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz > VULKAN_VALIDATIONLAYERS_URL := > https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX) > @@ -32,21 +32,21 @@ VULKAN_VALIDATIONLAYERS_CONF_TOOL := cmake > VULKAN_VALIDATIONLAYERS_CONF_OPT := \ > $(CROSS_CMAKE_USR) \ > -DCMAKE_BUILD_TYPE=Release \ > - -DAPI_NAME=Vulkan \ > -DBUILD_LAYERS=ON \ > -DBUILD_LAYER_SUPPORT_FILES=OFF \ > -DBUILD_TESTS=OFF \ > - -DBUILD_WERROR=ON \ > + -DBUILD_WERROR=OFF \ > -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, > PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \ > -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, > PTXCONF_VULKAN_VALIDATIONLAYERS_XCB) \ > -DBUILD_WSI_XLIB_SUPPORT=OFF \ > -DDEMOS_WSI_SELECTION=$(call ptx/ifdef, > PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND, WAYLAND, \ > $(call ptx/ifdef, PTXCONF_VULKAN_VALIDATIONLAYERS_XCB, > XCB, DISPLAY)) \ > -DINSTALL_TESTS=OFF \ > - -DUSE_CCACHE=OFF \ > + -DSPIRV_HEADERS_INSTALL_DIR=$(SYSROOT)/usr \ > -DUSE_ROBIN_HOOD_HASHING=OFF \ > -DVVL_CPP_STANDARD=14 \ > - -DVVL_ENABLE_ASAN=OFF > + -DVVL_ENABLE_ASAN=OFF \ > + -DVulkanRegistry_DIR=$(SYSROOT)/usr/share/vulkan > > # > > # Target-Install
Re: [ptxdist] [APPLIED] spirv-tools: version bump 1.3.224.1 -> 1.3.231.1
Thanks, applied as bfa9acf7869e0239a705100f681a6ecbcee89f6a. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:30 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221104113404.2928204-3-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make > index ce7ec569c769..6a9b3cb12fa4 100644 > --- a/rules/spirv-tools.make > +++ b/rules/spirv-tools.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SPIRV_TOOLS) += spirv-tools > # > # Paths and names > # > -SPIRV_TOOLS_VERSION := 1.3.224.1 > -SPIRV_TOOLS_MD5 := 16d8c78da2c4f17dc69aef137a94fc2a > +SPIRV_TOOLS_VERSION := 1.3.231.1 > +SPIRV_TOOLS_MD5 := 400b8ea1c96b1662cbe5668d81548a52 > SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION) > SPIRV_TOOLS_SUFFIX := tar.gz > SPIRV_TOOLS_URL := > https://github.com/KhronosGroup/SPIRV-Tools/archive/sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX) > @@ -64,6 +64,7 @@ SPIRV_TOOLS_CONF_OPT:= \ > -DSPIRV_COLOR_TERMINAL=ON \ > -DSPIRV_HEADERS_SKIP_EXAMPLES=ON \ > -DSPIRV_HEADERS_SKIP_INSTALL=ON \ > + -DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \ > -DSPIRV_LOG_DEBUG=OFF \ > -DSPIRV_SKIP_EXECUTABLES=ON \ > -DSPIRV_SKIP_TESTS=ON \
Re: [ptxdist] [APPLIED] glslang: version bump 1.3.224.1 -> 1.3.231.1
Thanks, applied as c2187d05f6c50e81c332c05df39f47c5751c1c7c. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:28 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221104113404.2928204-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/glslang.make b/rules/glslang.make > index eb35458eb2d7..7af639b9db41 100644 > --- a/rules/glslang.make > +++ b/rules/glslang.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang > # > # Paths and names > # > -GLSLANG_VERSION := 1.3.224.1 > -GLSLANG_MD5 := b91c9fbaad20e3a6415d8f236284efe9 > +GLSLANG_VERSION := 1.3.231.1 > +GLSLANG_MD5 := b6308880c655a50d50e0dd0e049ba5d5 > GLSLANG := glslang-$(GLSLANG_VERSION) > GLSLANG_SUFFIX := tar.gz > GLSLANG_URL := > https://github.com/KhronosGroup/glslang/archive/sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX) > diff --git a/rules/host-glslang.make b/rules/host-glslang.make > index 1718562d110b..dcdaa0ee27ab 100644 > --- a/rules/host-glslang.make > +++ b/rules/host-glslang.make > @@ -23,7 +23,6 @@ HOST_GLSLANG_CONF_OPT := \ > -DBUILD_SHARED_LIBS=OFF \ > -DENABLE_CTEST=OFF \ > -DENABLE_EXCEPTIONS=OFF \ > - -DCMAKE_INSTALL_LIBDIR=/usr/lib \ > -DENABLE_GLSLANG_BINARIES=ON \ > -DENABLE_GLSLANG_JS=OFF \ > -DENABLE_HLSL=OFF \
Re: [ptxdist] [APPLIED] vulkan-loader: version bump 1.3.224.1 -> 1.3.231.1
Thanks, applied as 23683fe343208a422894bd4e437959a84b3c7f6a. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:31 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221104113404.2928204-4-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make > index 355d2edfd0fe..9d537da6b7b9 100644 > --- a/rules/vulkan-loader.make > +++ b/rules/vulkan-loader.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_LOADER) += vulkan-loader > # > # Paths and names > # > -VULKAN_LOADER_VERSION:= 1.3.224.1 > -VULKAN_LOADER_MD5:= 54b7498c122e2ec8eb3d1dc80c654456 > +VULKAN_LOADER_VERSION:= 1.3.231.1 > +VULKAN_LOADER_MD5:= 1b7da12f3339204c48eafef259aad635 > VULKAN_LOADER:= vulkan-loader-$(VULKAN_LOADER_VERSION) > VULKAN_LOADER_SUFFIX := tar.gz > VULKAN_LOADER_URL:= > https://github.com/KhronosGroup/Vulkan-Loader/archive/sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX) > @@ -24,8 +24,8 @@ VULKAN_LOADER_DIR := $(BUILDDIR)/$(VULKAN_LOADER) > VULKAN_LOADER_LICENSE:= Apache-2.0 > VULKAN_LOADER_LICENSE_FILES := > file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac > > -VULKAN_HEADERS_VERSION := 1.3.224.1 > -VULKAN_HEADERS_MD5 := 8c5bce593727609fdbf574b98ed7f38e > +VULKAN_HEADERS_VERSION := 1.3.231.1 > +VULKAN_HEADERS_MD5 := 2b622628ff998288b3dd6778f63c9e2b > VULKAN_HEADERS_SUFFIX:= tar.gz > VULKAN_HEADERS_URL := > https://github.com/KhronosGroup/Vulkan-Headers/archive/sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) > VULKAN_HEADERS_SOURCE:= > $(SRCDIR)/vulkan-headers-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX) > @@ -54,13 +54,13 @@ VULKAN_LOADER_CONF_TOOL := cmake > VULKAN_LOADER_CONF_OPT := \ > $(CROSS_CMAKE_USR) \ > -DCMAKE_BUILD_TYPE=Release \ > - -DCMAKE_CROSSCOMPILING_EMULATOR=$(PTXDIST_SYSROOT_CROSS)/bin/qemu-cross > \ > -DBUILD_TESTS=OFF \ > -DBUILD_WSI_DIRECTFB_SUPPORT=OFF \ > -DBUILD_WSI_SCREEN_QNX_SUPPORT=OFF \ > -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, > PTXCONF_VULKAN_LOADER_WAYLAND) \ > -DBUILD_WSI_XCB_SUPPORT=$(call ptx/onoff, PTXCONF_VULKAN_LOADER_XCB) \ > -DBUILD_WSI_XLIB_SUPPORT=OFF \ > + -DENABLE_WERROR=ON \ > -DFALLBACK_CONFIG_DIRS=/etc/xdg \ > -DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \ > -DSYSCONFDIR= \
Re: [ptxdist] [APPLIED] stress-ng: version bump 0.11.15 -> 0.14.06
Thanks, applied as f0901f51088189b1006b339977c74003f91042df. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:27 +0100, Michael Tretter wrote: > Fix the build with glibc 2.36: > > stress-context.c:38:16: error: variably modified 'stack_sig' at file > scope > make[1]: *** [Makefile:360: stress-context.o] Error 1 > > Signed-off-by: Michael Tretter > Message-Id: <20221104111313.1666403-1-m.tret...@pengutronix.de> > [mol: select or disable additional dependencies] > Signed-off-by: Michael Olbrich > > diff --git a/rules/stress-ng.in b/rules/stress-ng.in > index d5c71196ae5d..1450dd7b3b1d 100644 > --- a/rules/stress-ng.in > +++ b/rules/stress-ng.in > @@ -6,6 +6,8 @@ config STRESS_NG > select GCCLIBS_ATOMIC > select LIBAIO > select LIBBSD > + select LIBJPEG > + select XXHASH > select ZLIB > help > stress-ng will stress test a computer system in various selectable > diff --git a/rules/stress-ng.make b/rules/stress-ng.make > index 1a6377b9bdc9..610a82b551f0 100644 > --- a/rules/stress-ng.make > +++ b/rules/stress-ng.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_STRESS_NG) += stress-ng > # > # Paths and names > # > -STRESS_NG_VERSION:= 0.11.15 > -STRESS_NG_MD5:= 1a716cde5a5a063fa3caa9b7d8aa1e70 > +STRESS_NG_VERSION:= 0.14.06 > +STRESS_NG_MD5:= 641d3be771a0350d0234d89cbab8834d > STRESS_NG:= stress-ng-$(STRESS_NG_VERSION) > STRESS_NG_SUFFIX := tar.gz > STRESS_NG_URL:= > https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V$(STRESS_NG_VERSION).$(STRESS_NG_SUFFIX) > @@ -29,6 +29,14 @@ STRESS_NG_LICENSE := GPL-2.0-or-later > > STRESS_NG_CONF_TOOL := NO > > +$(STATEDIR)/stress-ng.prepare: > + @$(call targetinfo) > + @mkdir -p $(STRESS_NG_DIR)/configs > + @: > $(STRESS_NG_DIR)/configs/HAVE_LIB_KMOD > + @: > $(STRESS_NG_DIR)/configs/HAVE_LIB_EGL > + @$(call touch) > + > + > # > > # Compile > # >
Re: [ptxdist] [APPLIED] pipewire: allow to enable libcamera plugin
Thanks, applied as 1be36f8658df38148553a079efe4a77f4a1430b2. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:21 +0100, Michael Tretter wrote: > Add a configuration item to enable libcamera support. Make it > configurable to avoid always pulling libcamera as a dependency. > > Signed-off-by: Michael Tretter > Message-Id: <20221101132352.3729560-1-m.tret...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/pipewire.in b/rules/pipewire.in > index e9032674c21a..9d1b920b429e 100644 > --- a/rules/pipewire.in > +++ b/rules/pipewire.in > @@ -11,6 +11,7 @@ menuconfig PIPEWIRE > select GLIB if PIPEWIRE_GSTREAMER > select GSTREAMER1 if PIPEWIRE_GSTREAMER > select GST_PLUGINS_BASE1if PIPEWIRE_GSTREAMER > + select LIBCAMERAif PIPEWIRE_LIBCAMERA > select LIBSNDFILE > select READLINE if PIPEWIRE_PW_CTL > select NCURSES if PIPEWIRE_PW_TOP > @@ -49,6 +50,10 @@ config PIPEWIRE_PULSEAUDIO > bool > prompt "install pulseaudio compatibility service" > > +config PIPEWIRE_LIBCAMERA > + bool > + prompt "build and install libcamera plugin" > + > config PIPEWIRE_RAOP > bool > prompt "enable Remote Audio Output Protocol module" > diff --git a/rules/pipewire.make b/rules/pipewire.make > index 838ddc660fc0..3b9e1b51a914 100644 > --- a/rules/pipewire.make > +++ b/rules/pipewire.make > @@ -71,7 +71,7 @@ PIPEWIRE_CONF_OPT := \ > -Djack=disabled \ > -Djack-devel=false \ > -Dlegacy-rtkit=false \ > - -Dlibcamera=disabled \ > + -Dlibcamera=$(call ptx/endis,PTXCONF_PIPEWIRE_LIBCAMERA)d \ > -Dlibcanberra=disabled \ > -Dlibjack-path= \ > -Dlibpulse=disabled \ > @@ -145,6 +145,7 @@ PIPEWIRE_SPA_MODULES := \ > audiomixer/libspa-audiomixer \ > audiotestsrc/libspa-audiotestsrc \ > control/libspa-control \ > + $(call ptx/ifdef,PTXCONF_PIPEWIRE_LIBCAMERA,libcamera/libspa-libcamera) > \ > support/libspa-dbus \ > $(call ptx/ifdef,PTXCONF_PIPEWIRE_SYSTEMD,support/libspa-journal) \ > support/libspa-support \
Re: [ptxdist] [APPLIED] modemmanager: version bump 1.18.12 -> 1.20.0
Thanks, applied as 624008063d1185a2fcf7e543c3050ead4c46073d. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:20 +0100, Ladislav Michl wrote: > There is no longer an upstream-provided source tarball. > This is the last stable release with autoconf support > which is considered deprecated and will be removed in > future releases in favour of meson, so do the change now. > > dbus-1 is now mandatory dependency. > > This release comes with lots of new features, see announcement: > https://lists.freedesktop.org/archives/modemmanager-devel/2022-October/009481.html > > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/modemmanager.in b/rules/modemmanager.in > index 5b8d03016506..bac104699943 100644 > --- a/rules/modemmanager.in > +++ b/rules/modemmanager.in > @@ -2,7 +2,8 @@ > > menuconfig MODEMMANAGER > tristate > - select DBUS if MODEMMANAGER_ALLOW_DBUS_AT_CMDS && RUNTIME > + select HOST_MESON > + select DBUS > select GLIB > select UDEV > select LIBGUDEV > diff --git a/rules/modemmanager.make b/rules/modemmanager.make > index f942b5a65b6c..58427ff8a326 100644 > --- a/rules/modemmanager.make > +++ b/rules/modemmanager.make > @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager > # > # Paths and names > # > -MODEMMANAGER_VERSION := 1.18.12 > -MODEMMANAGER_MD5 := 9f014dfc59f1bd8bc230bb2c2974d104 > +MODEMMANAGER_VERSION := 1.20.0 > +MODEMMANAGER_MD5 := 900b2e707a2095a4b476b68d1efb1c34 > MODEMMANAGER := ModemManager-$(MODEMMANAGER_VERSION) > -MODEMMANAGER_SUFFIX := tar.xz > -MODEMMANAGER_URL := > https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) > +MODEMMANAGER_SUFFIX := tar.bz2 > +MODEMMANAGER_URL := > https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEMMANAGER_VERSION)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) > MODEMMANAGER_SOURCE := $(SRCDIR)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX) > MODEMMANAGER_DIR := $(BUILDDIR)/$(MODEMMANAGER) > MODEMMANAGER_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later > @@ -30,38 +30,32 @@ MODEMMANAGER_LICENSE_FILES := \ > # Prepare > # > > > -#MODEMMANAGER_CONF_ENV := $(CROSS_ENV) > - > # > -# autoconf > +# meson > # > -MODEMMANAGER_CONF_TOOL := autoconf > +MODEMMANAGER_CONF_TOOL := meson > MODEMMANAGER_CONF_OPT:= \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-compile-warnings \ > - --disable-Werror \ > - --disable-gtk-doc \ > - --disable-gtk-doc-html \ > - --disable-gtk-doc-pdf \ > - --disable-nls \ > - --disable-rpath \ > - --disable-code-coverage \ > - --disable-introspection \ > - --disable-vala \ > - --enable-all-plugins \ > - --with-gnu-ld \ > - --without-gcov \ > - --without-qrtr \ > - --with-dbus-sys-dir=/usr/share/dbus-1/system.d \ > - --with-udev-base-dir=/usr/lib/udev \ > - --with-systemdsystemunitdir=/usr/lib/systemd/system \ > - --with-udev \ > - --$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-suspend-resume \ > - --$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-journal \ > - --without-polkit \ > - --$(call ptx/wwo, > PTXCONF_MODEMMANAGER_ALLOW_DBUS_AT_CMDS)-at-command-via-dbus \ > - --with-mbim \ > - --with-qmi > + $(CROSS_MESON_USR) \ > + -Dudev=true \ > + -Dudevdir=/usr/lib/udev \ > + -Dtests=true \ > + -Ddbus_policy_dir=/usr/share/dbus-1/system.d \ > + -Dsystemdsystemunitdir=/usr/lib/systemd/system \ > + -Dsystemd_suspend_resume=$(call ptx/truefalse, > PTXCONF_INITMETHOD_SYSTEMD) \ > + -Dpowerd_suspend_resume=false \ > + -Dsystemd_journal=$(call ptx/truefalse, PTXCONF_INITMETHOD_SYSTEMD) \ > + -Dpolkit=no \ > + -Dat_command_via_dbus=$(call ptx/truefalse, > PTXCONF_MODEMMANAGER_ALLOW_DBUS_AT_CMDS) \ > + -Dmbim=true \ > + -Dqmi=true \ > + -Dqrtr=false \ > + -Dintrospection=false \ > + -Dvapi=false \ > + -Dgtk_doc=false \ > + -Dman=false \ > + -Dbash_completion=false > + > +# sadly, ModemManager does not build with -Dtests=false > > # > > # Target-Install
Re: [ptxdist] [APPLIED] libqmi: version bump 1.30.8 -> 1.32.0
Thanks, applied as 4e1125737bce586c01afe6bde411a1dcab9afe87. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:19 +0100, Ladislav Michl wrote: > There is no longer an upstream-provided source tarball. > Autoconf support was dropped and package uses meson. > > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/libqmi.in b/rules/libqmi.in > index 9fe39036ab2a..571bfa3a0aa6 100644 > --- a/rules/libqmi.in > +++ b/rules/libqmi.in > @@ -2,7 +2,7 @@ > > menuconfig LIBQMI > tristate > - select HOST_SYSTEM_PYTHON3 > + select HOST_MESON > select GLIB > select LIBMBIM if LIBQMI_MBIM_QMUX > prompt "libqmi" > diff --git a/rules/libqmi.make b/rules/libqmi.make > index 4607cf7785a9..cfdfb65b189c 100644 > --- a/rules/libqmi.make > +++ b/rules/libqmi.make > @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi > # > # Paths and names > # > -LIBQMI_VERSION := 1.30.8 > -LIBQMI_MD5 := 5ec8838914f80e1dfa4d2fa8cc2f186d > +LIBQMI_VERSION := 1.32.0 > +LIBQMI_MD5 := c3a279461dc71ebc596c1cbae4bad19c > LIBQMI := libqmi-$(LIBQMI_VERSION) > -LIBQMI_SUFFIX:= tar.xz > -LIBQMI_URL := > http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX) > +LIBQMI_SUFFIX:= tar.bz2 > +LIBQMI_URL := > https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)/$(LIBQMI).$(LIBQMI_SUFFIX) > LIBQMI_SOURCE:= $(SRCDIR)/$(LIBQMI).$(LIBQMI_SUFFIX) > LIBQMI_DIR := $(BUILDDIR)/$(LIBQMI) > LIBQMI_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later > @@ -31,25 +31,23 @@ LIBQMI_LICENSE_FILES := \ > # > > > # > -# autoconf > +# meson > # > -LIBQMI_CONF_TOOL := autoconf > +LIBQMI_CONF_TOOL := meson > LIBQMI_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-compile-warnings \ > - --disable-Werror \ > - --disable-introspection \ > - --enable-collection=full \ > - --disable-firmware-update \ > - --disable-mm-runtime-check \ > - --disable-gtk-doc \ > - --disable-gtk-doc-html \ > - --disable-gtk-doc-pdf \ > - --disable-qmi-username \ > - --$(call ptx/endis, PTXCONF_LIBQMI_MBIM_QMUX)-mbim-qmux \ > - --disable-qrtr \ > - --without-udev \ > - --with-udev-base-dir=/usr/lib/udev > + $(CROSS_MESON_USR) \ > + -Dfirmware_update=false \ > + -Dcollection=full \ > + -Dmbim_qmux=$(call ptx/truefalse, PTXCONF_LIBQMI_MBIM_QMUX) \ > + -Dmm_runtime_check=false \ > + -Dqrtr=false \ > + -Drmnet=false \ > + -Dudev=false \ > + -Dudevdir=/usr/lib/udev \ > + -Dintrospection=false \ > + -Dgtk_doc=false \ > + -Dman=false \ > + -Dbash_completion=false > > # > > # Target-Install
Re: [ptxdist] [APPLIED] gdb: add option for 11.1 and later
Thanks, applied as 09e0190646c7f46c15c8e084dd6810c1246db46e.
Michael
[sent from post-receive hook]
On Fri, 11 Nov 2022 15:31:22 +0100, Philipp Zabel
wrote:
> GDB requires GMP since version 11.1. Add an option to allow selecting
> LIBGMP for newer toolchains. This is somewhat analogous to commit
> bc5cac5c54d2 ("glibc: add option for 2.34 and later").
>
> Signed-off-by: Philipp Zabel
> Message-Id: <20221103165542.469895-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich
>
> diff --git a/rules/gdb.in b/rules/gdb.in
> index 1dd2213abc8a..3014271de9c1 100644
> --- a/rules/gdb.in
> +++ b/rules/gdb.in
> @@ -7,6 +7,7 @@ menuconfig GDB
> select LIBC_DL
> select GCCLIBS_GCC_S
> select NCURSES
> + select LIBGMP if GDB_11_1
> help
> The GNU Debugger
>
> @@ -25,5 +26,12 @@ config GDB_SHARED
> If not set, the build option
> LDFLAGS=-static will be activated.
>
> +config GDB_11_1
> + bool
> + prompt "gdb-11.1 or later"
> + help
> + Since gdb-11.1, GMP is a required dependency. Enable this option
> + if your toolchain gdb version is 11.1 or later.
> +
> endif
>
Re: [ptxdist] [APPLIED] libmbim: version bump 1.26.4 -> 1.28.0
Thanks, applied as c5ea24736ff513303c2bbb68123ab5bfa87c2065. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:18 +0100, Ladislav Michl wrote: > There is no longer an upstream-provided source tarball. > Autoconf support was dropped and package uses meson. > > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/libmbim.in b/rules/libmbim.in > index 2f5e21f02dbf..01e222533580 100644 > --- a/rules/libmbim.in > +++ b/rules/libmbim.in > @@ -2,7 +2,7 @@ > > config LIBMBIM > tristate > - select HOST_SYSTEM_PYTHON3 > + select HOST_MESON > select GLIB > select UDEV > select LIBGUDEV > diff --git a/rules/libmbim.make b/rules/libmbim.make > index f2f8e5801e9a..095b16e3622e 100644 > --- a/rules/libmbim.make > +++ b/rules/libmbim.make > @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBMBIM) += libmbim > # > # Paths and names > # > -LIBMBIM_VERSION := 1.26.4 > -LIBMBIM_MD5 := 58dea20cad346f31d2873b68385a9973 > +LIBMBIM_VERSION := 1.28.0 > +LIBMBIM_MD5 := c3ffcb573b7de1a5509b2d222303f1ec > LIBMBIM := libmbim-$(LIBMBIM_VERSION) > -LIBMBIM_SUFFIX := tar.xz > -LIBMBIM_URL := > https://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX) > +LIBMBIM_SUFFIX := tar.bz2 > +LIBMBIM_URL := > https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION)/$(LIBMBIM).$(LIBMBIM_SUFFIX) > LIBMBIM_SOURCE := $(SRCDIR)/$(LIBMBIM).$(LIBMBIM_SUFFIX) > LIBMBIM_DIR := $(BUILDDIR)/$(LIBMBIM) > LIBMBIM_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later > @@ -27,22 +27,17 @@ LIBMBIM_LICENSE := GPL-2.0-or-later AND > LGPL-2.1-or-later > # Prepare > # > > > -LIBMBIM_CONF_ENV := \ > - $(CROSS_ENV) \ > - ac_cv_path_PYTHON=$(SYSTEMPYTHON3) > # > -# autoconf > +# meson > # > -LIBMBIM_CONF_TOOL:= autoconf > +LIBMBIM_CONF_TOOL:= meson > LIBMBIM_CONF_OPT := \ > - $(CROSS_AUTOCONF_USR) \ > - --disable-compile-warnings \ > - --disable-Werror \ > - --disable-gtk-doc \ > - --disable-gtk-doc-html \ > - --disable-gtk-doc-pdf \ > - --disable-introspection \ > - --with-udev-base-dir=/usr/lib/udev > + $(CROSS_MESON_USR) \ > + -Dudevdir=/usr/lib/udev \ > + -Dintrospection=false \ > + -Dgtk_doc=false \ > + -Dman=false \ > + -Dbash_completion=false > > # > > # Target-Install
Re: [ptxdist] [APPLIED] libffi: Version bump. 3.4.3 -> 3.4.4
Thanks, applied as 1dc8c83fdbfb459cab5124f138d22ff6173c0919. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:17 +0100, Christian Melki wrote: > Some fixes, mostly aarch64. > https://github.com/libffi/libffi/releases/tag/v3.4.4 > > * Forward patches and regenerate them so they apply without whine. > > Signed-off-by: Christian Melki > Message-Id: <20221027195505.3962895-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/libffi-3.4.3/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > > b/patches/libffi-3.4.4/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > similarity index 100% > rename from > patches/libffi-3.4.3/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > rename to > patches/libffi-3.4.4/0001-libffi-Fix-location-of-libraries-for-multilib-toolch.patch > diff --git > a/patches/libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > > b/patches/libffi-3.4.4/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > similarity index 92% > rename from > patches/libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > rename to > patches/libffi-3.4.4/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > index 686b9ad6b746..7606955f37a5 100644 > --- > a/patches/libffi-3.4.3/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > +++ > b/patches/libffi-3.4.4/0002-libffi-ensure-sysroot-paths-are-not-in-libffi.pc.patch > @@ -19,10 +19,10 @@ Signed-off-by: Ross Burton > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/configure.ac b/configure.ac > -index ed394c9f9145..a3006b342c58 100644 > +index 7e8cd98a4ce8..cf37e88bf5f6 100644 > --- a/configure.ac > +++ b/configure.ac > -@@ -418,7 +418,7 @@ AC_ARG_ENABLE(multi-os-directory, > +@@ -405,7 +405,7 @@ AC_ARG_ENABLE(multi-os-directory, > > # These variables are only ever used when we cross-build to X86_WIN32. > # And we only support this with GCC, so... > diff --git a/patches/libffi-3.4.3/autogen.sh b/patches/libffi-3.4.4/autogen.sh > similarity index 100% > rename from patches/libffi-3.4.3/autogen.sh > rename to patches/libffi-3.4.4/autogen.sh > diff --git a/patches/libffi-3.4.3/series b/patches/libffi-3.4.4/series > similarity index 100% > rename from patches/libffi-3.4.3/series > rename to patches/libffi-3.4.4/series > diff --git a/rules/libffi.make b/rules/libffi.make > index fe8ea11b6344..af8d6226131e 100644 > --- a/rules/libffi.make > +++ b/rules/libffi.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBFFI) += libffi > # > # Paths and names > # > -LIBFFI_VERSION := 3.4.3 > -LIBFFI_MD5 := b57b0ac1d1072681cee9148a417bd2ec > +LIBFFI_VERSION := 3.4.4 > +LIBFFI_MD5 := 0da1a5ed7786ac12dcbaf0d499d8a049 > LIBFFI := libffi-$(LIBFFI_VERSION) > LIBFFI_SUFFIX:= tar.gz > LIBFFI_SOURCE:= $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX)
Re: [ptxdist] [APPLIED] host-zip: new package
Thanks, applied as 21c1718ea7ea693f6b9d4a78fa58bd8de5dabb1d. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:16 +0100, Thorsten Scherer wrote: > Message-Id: <20221027091008.i5dudwp6s3onxraw@NB142.eckelmann.group> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-zip.in b/rules/host-zip.in > new file mode 100644 > index ..968ef1279545 > --- /dev/null > +++ b/rules/host-zip.in > @@ -0,0 +1,12 @@ > +## SECTION=hosttools_noprompt > +## SECTION=hosttools_platform > + > +config HOST_ZIP > + tristate > + help > + zip is a compression and file packaging utility for Unix, VMS, MSDOS, > + OS/2, Windows NT, Minix, Atari and Macintosh, Amiga and Acorn RISC OS. > + > + It is analogous to a combination of the UNIX commands tar(1) and com- > + press(1) and is compatible with PKHOST_ZIP (Phil Katz's ZIP for MSDOS > sys- > + tems). > diff --git a/rules/host-zip.make b/rules/host-zip.make > new file mode 100644 > index ..401d9565bb62 > --- /dev/null > +++ b/rules/host-zip.make > @@ -0,0 +1,37 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2022 by Thorsten Scherer > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +HOST_PACKAGES-$(PTXCONF_HOST_ZIP) += host-zip > + > +# > > +# Prepare > +# > > + > +HOST_ZIP_CONF_TOOL := NO > + > +# > > +# Compile > +# > > + > +HOST_ZIP_MAKE_OPT:= \ > +-f unix/Makefile generic > + > +# > > +# Install > +# > > + > +# Use = instead of := because host-zip.make being included before zip.make > +HOST_ZIP_INSTALL_OPT = \ > +$(HOST_ENV) \ > +prefix=$(HOST_ZIP_PKGDIR)/usr \ > +-f unix/Makefile install > + > +# vim: syntax=make
Re: [ptxdist] [APPLIED] libpciaccess: Version bump. 0.16 -> 0.17.
Thanks, applied as c9a8f2184cf8c60d7300eadd10f4d24028cfd50b. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:15 +0100, Christian Melki wrote: > Mostly build related. Some bugfixes. > A new meson build mechanism was added. > > * Project moved to xz from bz2 as dist tarballs. > > Signed-off-by: Christian Melki > Message-Id: <20221026190124.789574-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make > index 447236d7fa41..fb0b46a8eb4a 100644 > --- a/rules/libpciaccess.make > +++ b/rules/libpciaccess.make > @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_LIBPCIACCESS) += libpciaccess > # > # Paths and names > # > -LIBPCIACCESS_VERSION := 0.16 > -LIBPCIACCESS_MD5 := b34e2cbdd6aa8f9cc3fa613fd401a6d6 > +LIBPCIACCESS_VERSION := 0.17 > +LIBPCIACCESS_MD5 := 1466cf950c914ad2db1dbb76c9a724db > LIBPCIACCESS := libpciaccess-$(LIBPCIACCESS_VERSION) > -LIBPCIACCESS_SUFFIX := tar.bz2 > +LIBPCIACCESS_SUFFIX := tar.xz > LIBPCIACCESS_URL := $(call ptx/mirror, XORG, > individual/lib/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX)) > LIBPCIACCESS_SOURCE := $(SRCDIR)/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX) > LIBPCIACCESS_DIR := $(BUILDDIR)/$(LIBPCIACCESS)
Re: [ptxdist] [APPLIED] expat: Version bump. 2.4.9 -> 2.5.0
Thanks, applied as 6f6adcbc46e96068ebe160b1602dd722001514a2. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:14 +0100, Christian Melki wrote: > Various fixes. > https://github.com/libexpat/libexpat/blob/R_2_5_0/expat/Changes > > Plugs CVE: CVE-2022-43680 > > Signed-off-by: Christian Melki > Message-Id: <20221026185319.780159-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/expat.make b/rules/expat.make > index cea10d7cb6fe..ad873a2609b8 100644 > --- a/rules/expat.make > +++ b/rules/expat.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_EXPAT) += expat > # > # Paths and names > # > -EXPAT_VERSION:= 2.4.9 > -EXPAT_MD5:= 230455a6bb417c3c5d00806554ea34df > +EXPAT_VERSION:= 2.5.0 > +EXPAT_MD5:= 5e9974d422dc4b157f300568ad28ebf6 > EXPAT:= expat-$(EXPAT_VERSION) > EXPAT_SUFFIX := tar.bz2 > EXPAT_URL:= $(call ptx/mirror, SF, expat/$(EXPAT).$(EXPAT_SUFFIX))
Re: [ptxdist] [APPLIED] libcurl: Version bump. 7.85.0 -> 7.86.0
Thanks, applied as 0003443832618110b4159628975d154fca64f12b. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:12 +0100, Christian Melki wrote: > Usual churn of new options and fixes. > https://curl.se/changes.html#7_86_0 > > Notable changes is the addition of the websockets API. > https://curl.se/docs/security.html > This release plugs CVEs: > CVE-2022-42916: HSTS bypass via IDN > CVE-2022-42915: HTTP proxy double-free > CVE-2022-35260: .netrc parser out-of-bounds access > CVE-2022-32221: POST following PUT confusion > > * Explicitly disable the websockets API for now. > > Signed-off-by: Christian Melki > Message-Id: <20221026094309.767626-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcurl.make b/rules/libcurl.make > index 4097462c5721..c4f528f69333 100644 > --- a/rules/libcurl.make > +++ b/rules/libcurl.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBCURL) += libcurl > # > # Paths and names > # > -LIBCURL_VERSION := 7.85.0 > -LIBCURL_MD5 := 131f76c84016c45806b902330a74164f > +LIBCURL_VERSION := 7.86.0 > +LIBCURL_MD5 := 19a2165f37941a6f412afc924e750568 > LIBCURL := curl-$(LIBCURL_VERSION) > LIBCURL_SUFFIX := tar.xz > LIBCURL_URL := https://curl.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) > @@ -90,6 +90,7 @@ LIBCURL_CONF_OPT:= \ > --enable-get-easy-options \ > --disable-alt-svc \ > --enable-hsts \ > + --disable-websockets \ > --without-schannel \ > --without-secure-transport \ > --without-amissl \
Re: [ptxdist] [APPLIED] module-init-tools: Remove after one year in staging
Thanks, applied as 9929e0b7dc2bc735a40c989e7fb29f2e029503e4. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:09 +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/module-init-tools.in b/rules/module-init-tools.in > deleted file mode 100644 > index 9eba00ababac.. > --- a/rules/module-init-tools.in > +++ /dev/null > @@ -1,90 +0,0 @@ > -## SECTION=staging > -## old section: > -### SECTION=shell_and_console > -# module-init-tools configuration > - > -menuconfig MODULE_INIT_TOOLS > - tristate > - prompt "module-init-tools " > - help > - This package contains a set of programs for loading, inserting > - and removing kernel modules for Linux (versions 2.5.48 and > - above). > - > - STAGING: this package is obsolete and has been replaced by libkmod. > - > -if MODULE_INIT_TOOLS > - > -config MODULE_INIT_TOOLS_INSMOD > - bool > - prompt "Install insmod on target" > - depends on (!BUSYBOX_INSMOD && !LIBKMOD_INSMOD) || ALLYES > - help > - simple program to insert a module into the Linux Kernel > - > -comment "BusyBox' insmod is selected!" > - depends on BUSYBOX_INSMOD > - > -comment "kmod insmod is selected!" > - depends on LIBKMOD_INSMOD > - > -config MODULE_INIT_TOOLS_RMMOD > - bool > - prompt "Install rmmod on target" > - depends on (!BUSYBOX_RMMOD && !LIBKMOD_RMMOD) || ALLYES > - help > - simple program to remove a module from the Linux Kernel > - > -comment "BusyBox' rmmod is selected!" > - depends on BUSYBOX_RMMOD > - > -comment "kmod rmmod is selected!" > - depends on LIBKMOD_RMMOD > - > -config MODULE_INIT_TOOLS_LSMOD > - bool > - prompt "Install lsmod on target" > - depends on (!BUSYBOX_LSMOD && !LIBKMOD_LSMOD) || ALLYES > - help > - program to show the status of modules in the Linux Kernel > - > -comment "BusyBox' lsmod is selected!" > - depends on BUSYBOX_LSMOD > - > -comment "kmod lsmod is selected!" > - depends on LIBKMOD_LSMOD > - > -config MODULE_INIT_TOOLS_MODINFO > - bool > - prompt "Install modinfo on target" > - depends on (!BUSYBOX_MODINFO && !LIBKMOD_MODINFO) || ALLYES > - help > - program to show information about a Linux Kernel module > - > -comment "BusyBox' modinfo is selected!" > - depends on BUSYBOX_MODINFO > - > -comment "kmod modinfo is selected!" > - depends on LIBKMOD_MODINFO > - > -config MODULE_INIT_TOOLS_MODPROBE > - bool > - prompt "Install modprobe on target" > - depends on (!BUSYBOX_MODPROBE && !LIBKMOD_MODPROBE) || ALLYES > - help > - program to add and remove modules from the Linux Kernel > - > -comment "BusyBox' modprobe is selected!" > - depends on BUSYBOX_MODPROBE > - > -comment "kmod modprobe is selected!" > - depends on LIBKMOD_MODPROBE > - > -config MODULE_INIT_TOOLS_DEPMOD > - bool > - prompt "Install depmod on target" > - depends on (!BUSYBOX_DEPMOD && !LIBKMOD_DEPMOD) || ALLYES > - help > - program to generate modules.dep and map files > - > -endif > diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make > deleted file mode 100644 > index eb8811b24491.. > --- a/rules/module-init-tools.make > +++ /dev/null > @@ -1,75 +0,0 @@ > -# -*-makefile-*- > -# > -# Copyright (C) 2005 Ladislav Michl > -# 2006, 2008, 2009 by Marc Kleine-Budde > -# > -# For further information about the PTXdist project and license conditions > -# see the README file. > -# > - > -# > -# We provide this package > -# > -PACKAGES-$(PTXCONF_MODULE_INIT_TOOLS) += module-init-tools > - > -# > -# Paths and names > -# > -MODULE_INIT_TOOLS_VERSION:= 3.16 > -MODULE_INIT_TOOLS_MD5:= bc44832c6e41707b8447e2847d2019f5 > -MODULE_INIT_TOOLS:= > module-init-tools-$(MODULE_INIT_TOOLS_VERSION) > -MODULE_INIT_TOOLS_SUFFIX := tar.bz2 > -MODULE_INIT_TOOLS_URL:= $(call ptx/mirror, KERNEL, > utils/kernel/module-init-tools/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX)) > -MODULE_INIT_TOOLS_SOURCE := > $(SRCDIR)/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX) > -MODULE_INIT_TOOLS_DIR:= $(BUILDDIR)/$(MODULE_INIT_TOOLS) > -MODULE_INIT_TOOLS_LICENSE:= GPL-2.0-only > - > -# > > -# Prepare > -# > > - > -MODULE_INIT_TOOLS_MAKEVARS := MAN5="" MAN8="" > - > -# > -# autoconf > -# > -MODULE_INIT_TOOLS_CONF_TOOL := autoconf > -MODULE_INIT_TOOLS_CONF_OPT := $(CROSS_AUTOCONF_USR) > - > -# > > -# Target-Install > -# > > - > -$(STATEDIR)/module-init-tools.targetinstall: > -
Re: [ptxdist] [APPLIED] rules: Replace deprecated _MAKEVARS
Thanks, applied as 5878816ad51c7914d84f856254fbabbd9b2ba896. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:10 +0100, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/ckermit.make b/rules/ckermit.make > index e983803c13d0..5a6373938b5d 100644 > --- a/rules/ckermit.make > +++ b/rules/ckermit.make > @@ -35,7 +35,7 @@ CKERMIT_CONF_TOOL := NO > # Compile > # > > > -CKERMIT_MAKEVARS := \ > +CKERMIT_MAKE_OPT := \ > xermit \ > KTARGET=linuxa \ > prefix=/usr \ > @@ -46,6 +46,14 @@ CKERMIT_MAKEVARS := \ > LNKFLAGS='$(CROSS_LDFLAGS)' \ > LIBS='-lncurses -lutil -lresolv -lcrypt -lm' > > +# > > +# Install > +# > > + > +CKERMIT_INSTALL_OPT := \ > + prefix=/usr \ > + install > + > # > > # Target-Install > # > > diff --git a/rules/etherwake.make b/rules/etherwake.make > index 8ae6fd7341da..70285310beee 100644 > --- a/rules/etherwake.make > +++ b/rules/etherwake.make > @@ -29,7 +29,13 @@ ETHERWAKE_LICENSE := GPL > # Prepare > # > > > -ETHERWAKE_MAKEVARS := CC=$(CROSS_CC) > +ETHERWAKE_CONF_TOOL := NO > + > +# > > +# Compile > +# > > + > +ETHERWAKE_MAKE_OPT := CC=$(CROSS_CC) > > # > > # Target-Install > diff --git a/rules/gdb.make b/rules/gdb.make > index 8d2c7ffdb612..d8c0c1dc6f74 100644 > --- a/rules/gdb.make > +++ b/rules/gdb.make > @@ -54,12 +54,13 @@ GDB_CONF_ENV := \ > host_configargs='$(GDB_CONF_OPT_HOST)' > > ifndef PTXCONF_GDB_SHARED > -GDB_MAKEVARS := LDFLAGS=-static > +GDB_MAKE_OPT := LDFLAGS=-static > endif > > # > # autoconf > # > +GDB_CONF_TOOL:= autoconf > GDB_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --target=$(PTXCONF_GNU_TARGET) \ > diff --git a/rules/killproc.make b/rules/killproc.make > index 196d2a45cbd8..fc830dd1f1c7 100644 > --- a/rules/killproc.make > +++ b/rules/killproc.make > @@ -25,14 +25,17 @@ KILLPROC_DIR := $(BUILDDIR)/$(KILLPROC) > KILLPROC_LICENSE := GPL-2.0-only > > # > > -# Prepare > +# Prepare + Compile + Install > # > > > -KILLPROC_MAKEVARS := \ > - CC=$(CROSS_CC) \ > +KILLPROC_CONF_TOOL := NO > +KILLPROC_MAKE_OPT:= \ > + CC=$(CROSS_CC) > +KILLPROC_INSTALL_OPT := \ > SBINDIR=$(KILLPROC_PKGDIR)/usr/sbin \ > UBINDIR=$(KILLPROC_PKGDIR)/usr/bin \ > - INSTBINFLAGS="-m 0755" > + INSTBINFLAGS="-m 0755" \ > + install > > # > > # Target-Install > diff --git a/rules/libcgi.make b/rules/libcgi.make > index eb9d704d2675..f761ebaed0dc 100644 > --- a/rules/libcgi.make > +++ b/rules/libcgi.make > @@ -34,7 +34,7 @@ LIBCGI_LICENSE := LGPL-2.1-only > LIBCGI_CONF_TOOL := autoconf > LIBCGI_CONF_OPT := $(CROSS_AUTOCONF_USR) > > -LIBCGI_MAKEVARS := $(CROSS_ENV_CC) $(CROSS_ENV_AR) > +LIBCGI_MAKE_OPT := $(CROSS_ENV_CC) $(CROSS_ENV_AR) > > # > > # Target-Install > diff --git a/rules/liblockfile.make b/rules/liblockfile.make > index 162ec491b0fe..06f3c8bd1850 100644 > --- a/rules/liblockfile.make > +++ b/rules/liblockfile.make > @@ -30,7 +30,8 @@ LIBLOCKFILE_LICENSE_FILES := > file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868 > # Prepare > # > > > -LIBLOCKFILE_MAKEVARS := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR) > +LIBLOCKFILE_MAKE_OPT := $(CROSS_ENV_AR) > +LIBLOCKFILE_INSTALL_OPT := ROOT=$(PKGDIR)/$(LIBLOCKFILE) install > > # > # autoconf > diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make > index f18ad84ee518..e6a9fb051bec 100644 > --- a/rules/lpc21isp.make > +++ b/rules/lpc21isp.make > @@ -30,7 +30,7 @@ LPC21ISP_LICENSE:= GPL-3.0-or-later > > LPC21ISP_CONF_TOOL := NO > LPC21ISP_MAKE_ENV:= $(CROSS_ENV) > -LPC21ISP_MAKEVARS:= $(CROSS_ENV) > +LPC21ISP_MAKE_OPT:= CC=$(CROSS_CC) > > # > > # Install > diff
Re: [ptxdist] [APPLIED] ptxd_lib_code_signing: Check for errors in cs_import_cert_from_pem()
Thanks, applied as cdb645fbca7ac4b4752a2eb1223ba9baf29cb969.
Michael
[sent from post-receive hook]
On Fri, 11 Nov 2022 15:31:11 +0100, Uwe Kleine-König
wrote:
> cs_import_cert_from_pem() uses a pipe command to do the necessary
> things. If the first command in that pipe fails the whole command should
> be considered failing. So add a call to check_pipe_status as is done in
> cs_import_privkey_from_pem().
>
> Fixes: 8f41183e0afe ("Add initial code signing support")
> Signed-off-by: Uwe Kleine-König
> Message-Id: <20221025085921.986289-1-u.kleine-koe...@pengutronix.de>
> Signed-off-by: Michael Olbrich
>
> diff --git a/scripts/lib/ptxd_lib_code_signing.sh
> b/scripts/lib/ptxd_lib_code_signing.sh
> index 5ba1a4666af4..bafdc16544d3 100644
> --- a/scripts/lib/ptxd_lib_code_signing.sh
> +++ b/scripts/lib/ptxd_lib_code_signing.sh
> @@ -213,6 +213,7 @@ cs_import_cert_from_pem() {
> "${openssl_keyopt[@]}" \
> -in "${pem}" -inform pem -outform der |
> softhsm_pkcs11_tool --type cert --write-object /dev/stdin --label
> "${role}"
> +check_pipe_status
> }
> export -f cs_import_cert_from_pem
>
Re: [ptxdist] [APPLIED] mesalib: allow enabling patent encumbered video codecs
Thanks, applied as 9244d1961690c8738c53d8c0647cd0f67d92bd2c. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:07 +0100, Philipp Zabel wrote: > Add a menu with options to enable the VC-1, H.264, and H.265 codecs > when VA-API support is enabled. > > Signed-off-by: Philipp Zabel > Message-Id: <20221024134505.2041999-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mesalib.in b/rules/mesalib.in > index 1f505b9dcc90..5e89907ed955 100644 > --- a/rules/mesalib.in > +++ b/rules/mesalib.in > @@ -156,6 +156,34 @@ config MESALIB_VA > depends on MESALIB_DRI_RADEONSI || MESALIB_DRI_R600 || > MESALIB_DRI_NOUVEAU > prompt "VA" > > +if MESALIB_VA > + > +menu "Patent encumbered video codecs" > + > +config MESALIB_VIDEO_VC1DEC > + bool > + prompt "VC-1 decoding" > + > +config MESALIB_VIDEO_H264DEC > + bool > + prompt "H.264 decoding" > + > +config MESALIB_VIDEO_H264ENC > + bool > + prompt "H.264 encoding" > + > +config MESALIB_VIDEO_H265DEC > + bool > + prompt "H.265 decoding" > + > +config MESALIB_VIDEO_H265ENC > + bool > + prompt "H.265 encoding" > + > +endmenu > + > +endif > + > comment "Platforms" > > config MESALIB_EGL_X11 > diff --git a/rules/mesalib.make b/rules/mesalib.make > index dfbb0d11ae73..6395e1384261 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -92,6 +92,12 @@ MESALIB_DRI_GALLIUM_LIBS-y = \ > ,$(MESALIB_GALLIUM_DRIVERS-y) \ > > > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_VC1DEC) += vc1dec > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264DEC)+= h264dec > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H264ENC)+= h264enc > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265DEC)+= h265dec > +MESALIB_VIDEO_CODECS-$(PTXCONF_MESALIB_VIDEO_H265ENC)+= h265enc > + > ifdef PTXCONF_ARCH_X86 > MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_AMD) += amd > MESALIB_VULKAN_DRIVERS-$(PTXCONF_MESALIB_VULKAN_INTEL) += intel > @@ -203,7 +209,7 @@ MESALIB_CONF_OPT := \ > -Dva-libs-path=/usr/lib/dri \ > -Dvalgrind=disabled \ > -Dvdpau-libs-path=/usr/lib/vdpau \ > - -Dvideo-codecs=[] \ > + -Dvideo-codecs=$(subst $(space),$(comma),$(MESALIB_VIDEO_CODECS-y)) \ > -Dvmware-mks-stats=false \ > -Dvulkan-beta=false \ > -Dvulkan-drivers=$(subst $(space),$(comma),$(MESALIB_VULKAN_DRIVERS-y)) > \
Re: [ptxdist] [APPLIED] libdrm: version bump 2.4.112 -> 2.4.113
Thanks, applied as 67fb039b0d858e442581d8279448d8af1ae82063. Michael [sent from post-receive hook] On Fri, 11 Nov 2022 15:31:06 +0100, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221021104202.3131552-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libdrm.make b/rules/libdrm.make > index 262cd045dbc2..39ebe3d98211 100644 > --- a/rules/libdrm.make > +++ b/rules/libdrm.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBDRM) += libdrm > # > # Paths and names > # > -LIBDRM_VERSION := 2.4.112 > -LIBDRM_MD5 := 2db7e05df012cab16d6c547317407ff2 > +LIBDRM_VERSION := 2.4.113 > +LIBDRM_MD5 := 34a4dcf7eaf0c771b3b0757b5fd5f803 > LIBDRM := libdrm-$(LIBDRM_VERSION) > LIBDRM_SUFFIX:= tar.xz > LIBDRM_URL := http://dri.freedesktop.org/libdrm/$(LIBDRM).$(LIBDRM_SUFFIX) > @@ -39,7 +39,6 @@ LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_RADEON) += radeon > LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_AMDGPU) += amdgpu > LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_NOUVEAU) += nouveau > LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_FREEDRENO) += freedreno > -LIBDRM_BACKENDS- += freedreno-kgsl > LIBDRM_BACKENDSC-$(PTXCONF_LIBDRM_VMWGFX) += vmwgfx > LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_OMAP) += omap > LIBDRM_BACKENDS-$(PTXCONF_LIBDRM_EXYNOS) += exynos > @@ -58,12 +57,14 @@ LIBDRM_BACKENDSL-y += $(LIBDRM_BACKENDS-y) > LIBDRM_CONF_TOOL := meson > LIBDRM_CONF_OPT := \ > $(CROSS_MESON_USR) \ > - $(patsubst %,-D%=true,$(LIBDRM_BACKENDSC-y)) \ > - $(patsubst %,-D%=false,$(LIBDRM_BACKENDSC-)) \ > - -Dcairo-tests=false \ > - -Dman-pages=false \ > - -Dvalgrind=false \ > + $(patsubst %,-D%=enabled,$(LIBDRM_BACKENDSC-y)) \ > + $(patsubst %,-D%=disabled,$(LIBDRM_BACKENDSC-)) \ > + -Dcairo-tests=disabled \ > + -Dfreedreno-kgsl=false \ > + -Dman-pages=disabled \ > + -Dvalgrind=disabled \ > -Dinstall-test-programs=$(call ptx/truefalse, PTXCONF_LIBDRM_TESTS) \ > + -Dtests=true \ > -Dudev=true > >
