[ptxdist] [PATCH 3/3] modemmanager: version bump 1.18.12 -> 1.20.0
From: Ladislav Michl 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 --- rules/modemmanager.in | 3 ++- rules/modemmanager.make | 60 +++-- 2 files changed, 29 insertions(+), 34 deletions(-) diff --git a/rules/modemmanager.in b/rules/modemmanager.in index 5b8d03016..bac104699 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 f942b5a65..58427ff8a 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 -- 2.32.0
[ptxdist] [PATCH 1/3] libmbim: version bump 1.26.4 -> 1.28.0
From: Ladislav Michl There is no longer an upstream-provided source tarball. Autoconf support was dropped and package uses meson. Signed-off-by: Ladislav Michl --- rules/libmbim.in | 2 +- rules/libmbim.make | 29 - 2 files changed, 13 insertions(+), 18 deletions(-) diff --git a/rules/libmbim.in b/rules/libmbim.in index 2f5e21f02..01e222533 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 f2f8e5801..095b16e36 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 -- 2.32.0
[ptxdist] [PATCH 2/3] libqmi: version bump 1.30.8 -> 1.32.0
From: Ladislav Michl There is no longer an upstream-provided source tarball. Autoconf support was dropped and package uses meson. Signed-off-by: Ladislav Michl --- rules/libqmi.in | 2 +- rules/libqmi.make | 40 +++- 2 files changed, 20 insertions(+), 22 deletions(-) diff --git a/rules/libqmi.in b/rules/libqmi.in index 9fe39036a..571bfa3a0 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 4607cf778..cfdfb65b1 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 -- 2.32.0
[ptxdist] [PATCH 0/3] ModemManager update
Hi there! Yesterday new ModemManager version 1.20.0 was released. As it contains quite a lot of new features, please give it some testing. This version is also last stable release using autotools, next one will support meson only. As both libmbim and libqmi already dropped autotools support do it for ModemManager now as well. Happy testing, l.
Re: [ptxdist] ncurses 6.3 compile error
On Thu, Oct 27, 2022 at 09:36:21PM +0200, Christian Melki wrote: > On 10/27/22 20:50, Bruno Thomsen wrote: > > Has anyone experienced issues with ncurses 6.3? > > Project is using OSELAS.Toolchain 2021.07 and ptxdist 2022.10.0. > > > > /Bruno > > > > ---8<--- > > > > --- > > target: ncurses.prepare > > --- > > > > Removing files from sysroot... > > > > configure: loading site script /usr/share/config.site > > checking for ggrep... no > > checking for grep... grep > > checking for egrep... grep -E > > Configuring NCURSES 6.3 ABI 6 (Thu Oct 27 11:56:05 UTC 2022) > > checking for package version... 6.3 > > checking for package patch date... 20211021 > > checking build system type... x86_64-host-linux-gnu > > checking host system type... arm-v7a-linux-gnueabihf > > checking target system type... arm-v7a-linux-gnueabihf > > Configuring for linux-gnueabihf > > checking for fgrep... grep -F > > checking for prefix... /usr > > checking for arm-v7a-linux-gnueabihf-gcc... arm-v7a-linux-gnueabihf-gcc > > checking for C compiler default output... a.out > > checking whether the C compiler works... yes > > checking whether we are cross compiling... yes > > checking for executable suffix... > > checking for object suffix... o > > checking whether we are using the GNU C compiler... yes > > checking whether arm-v7a-linux-gnueabihf-gcc accepts -g... yes > > checking version of arm-v7a-linux-gnueabihf-gcc... 7 > > checking if this is really Intel C compiler... no > > checking if this is really Clang C compiler... no > > checking for arm-v7a-linux-gnueabihf-gcc option to accept ANSI C... none > > needed > > checking $CFLAGS variable... ok > > checking $CC variable... ok > > checking how to run the C preprocessor... arm-v7a-linux-gnueabihf-gcc -E > > checking whether arm-v7a-linux-gnueabihf-gcc needs -traditional... no > > checking whether arm-v7a-linux-gnueabihf-gcc understands -c and -o > > together... yes > > checking if you want to ensure bool is consistent with C++... no > > checking if you want to build C++ binding and demo... no > > checking if you want to build with Ada... no > > checking if you want to install terminal database... yes > > checking if you want to install manpages... no > > checking if you want to build programs such as tic... no > > checking if you want to build test-programs... no > > checking if you wish to install curses.h... yes > > checking for mawk... no > > checking for gawk... gawk > > checking for a BSD compatible install... > > /usr/local/lib/ptxdist-2022.10.0/bin/install -c > > checking for lint... no > > checking for cppcheck... no > > checking for splint... no > > checking whether ln -s works... yes > > checking if ln -s -f options work... yes > > checking for long file names... yes > > checking if you want to use pkg-config... yes > > checking for arm-v7a-linux-gnueabihf-pkg-config... > > /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/sysroot-cross/bin/arm-v7a-linux-gnueabihf-pkg-config > > checking for > > /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/sysroot-cross/bin/arm-v7a-linux-gnueabihf-pkg-config > > library directory... checking for first directory... none > > checking if we should install .pc files for > > /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/sysroot-cross/bin/arm-v7a-linux-gnueabihf-pkg-config... > > yes > > configure: error: expected a pathname, not "" > > Does your config.log contain more information? Indeed, and do you have a local ncurses.make? The upstream rule explicitly specifies this path with --with-pkg-config-libdir=/usr/$(CROSS_LIB_DIR)/pkgconfig if I read the configure script correctly. Michael > > make: *** > > [/usr/local/lib/ptxdist-2022.10.0/rules/post/ptxd_make_world_prepare.make:24: > > /home/bth/gitlab/rockhopper/ptxdist/platform-tqma7/state/ncurses.prepare] > > Error 1 > > > > > -- 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] [APPLIED] host-opkg-utils: update download URL
Thanks, applied as 957b2d265ba4363172e402bd7c6e82528f3aad64. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:39 +0200, Bruno Thomsen wrote: > Downloading package result in double http code 301 Moved Permanently > from servers. Update used URL to match redirect URL. > > --2022-10-20 11:27:03-- > http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz > Resolving git.yoctoproject.org (git.yoctoproject.org)... 198.145.29.90 > Connecting to git.yoctoproject.org > (git.yoctoproject.org)|198.145.29.90|:80... connected. > HTTP request sent, awaiting response... 301 Moved Permanently > Location: > https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz > [following] > --2022-10-20 11:27:03-- > https://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz > Connecting to git.yoctoproject.org > (git.yoctoproject.org)|198.145.29.90|:443... connected. > HTTP request sent, awaiting response... 301 Moved Permanently > Location: > https://git.yoctoproject.org/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz > [following] > --2022-10-20 11:27:04-- > https://git.yoctoproject.org/opkg-utils/snapshot/opkg-utils-0.5.0.tar.gz > Reusing existing connection to git.yoctoproject.org:443. > HTTP request sent, awaiting response... 200 OK > Length: unspecified [application/x-gzip] > > Signed-off-by: Bruno Thomsen > Message-Id: <20221020145407.3651-4-bruno.thom...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-opkg-utils.make b/rules/host-opkg-utils.make > index 159eac64bfb6..0e6e28e9ffe1 100644 > --- a/rules/host-opkg-utils.make > +++ b/rules/host-opkg-utils.make > @@ -18,7 +18,7 @@ HOST_OPKG_UTILS_VERSION := 0.5.0 > HOST_OPKG_UTILS_MD5 := c71939ee02c69462bd3ba1fe0d6de5e2 > HOST_OPKG_UTILS := opkg-utils-$(HOST_OPKG_UTILS_VERSION) > HOST_OPKG_UTILS_SUFFIX := tar.gz > -HOST_OPKG_UTILS_URL := > http://git.yoctoproject.org/cgit/cgit.cgi/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX) > +HOST_OPKG_UTILS_URL := > https://git.yoctoproject.org/opkg-utils/snapshot/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX) > HOST_OPKG_UTILS_SOURCE := > $(SRCDIR)/$(HOST_OPKG_UTILS).$(HOST_OPKG_UTILS_SUFFIX) > HOST_OPKG_UTILS_DIR := $(HOST_BUILDDIR)/$(HOST_OPKG_UTILS) > HOST_OPKG_UTILS_LICENSE := GPL-2.0-only
Re: [ptxdist] [APPLIED] python3: update download URL
Thanks, applied as 68bf98206331ca5c28e0070ee9aac68076fc9c5a. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:41 +0200, Bruno Thomsen wrote: > Downloading package result in double http code 301 Moved Permanently > from servers. Update used URL to match redirect URL. > > --2022-10-20 11:25:21-- > http://python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz > Resolving python.org (python.org)... 138.197.63.241 > Connecting to python.org (python.org)|138.197.63.241|:80... connected. > HTTP request sent, awaiting response... 301 Moved Permanently > Location: https://python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz > [following] > --2022-10-20 11:25:22-- > https://python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz > Connecting to python.org (python.org)|138.197.63.241|:443... connected. > HTTP request sent, awaiting response... 301 Moved Permanently > Location: https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz > [following] > --2022-10-20 11:25:22-- > https://www.python.org/ftp/python/3.10.4/Python-3.10.4.tar.xz > Resolving www.python.org (www.python.org)... 199.232.40.223, 2a04:4e42:47::223 > Connecting to www.python.org (www.python.org)|199.232.40.223|:443... > connected. > HTTP request sent, awaiting response... 200 OK > Length: 19342692 (18M) [application/octet-stream] > > Signed-off-by: Bruno Thomsen > Message-Id: <20221020145407.3651-5-bruno.thom...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/python3.make b/rules/python3.make > index 59c46ca0f177..b1858256373c 100644 > --- a/rules/python3.make > +++ b/rules/python3.make > @@ -26,7 +26,7 @@ PYTHON3_DIR := $(BUILDDIR)/$(PYTHON3) > PYTHON3_DEVPKG := NO > > PYTHON3_URL := \ > - > http://python.org/ftp/python/$(PYTHON3_VERSION)/$(PYTHON3).$(PYTHON3_SUFFIX) \ > + > https://www.python.org/ftp/python/$(PYTHON3_VERSION)/$(PYTHON3).$(PYTHON3_SUFFIX) > \ > > http://python.org/ftp/python/$(PYTHON3_MAJORMINOR)/$(PYTHON3).$(PYTHON3_SUFFIX) > > CROSS_PYTHON3:= > $(PTXDIST_SYSROOT_CROSS)/bin/python$(PYTHON3_MAJORMINOR)
Re: [ptxdist] [APPLIED] linux-firmware: Version bump. 20220913 -> 20221012
Thanks, applied as 46956ae204a14b564da9d373c418ed47a544f6c4. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:31 +0200, Christian Melki wrote: > https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20221012 > Usual churn of updates. GPUs, BT, Wifi. > > * Amd-ucode license file changed. New copyright year. > > Signed-off-by: Christian Melki > Message-Id: <20221020131725.2594010-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make > index 287bfd63e04e..0a0630ed7c69 100644 > --- a/rules/linux-firmware.make > +++ b/rules/linux-firmware.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LINUX_FIRMWARE) += linux-firmware > # > # Paths and names > # > -LINUX_FIRMWARE_VERSION := 20220913 > -LINUX_FIRMWARE_MD5 := 1ea1f09e040b8c86d4bc4a4e41acffc5 > +LINUX_FIRMWARE_VERSION := 20221012 > +LINUX_FIRMWARE_MD5 := 50fa95d6dc86758089df2981d704f36e > LINUX_FIRMWARE := linux-firmware-$(LINUX_FIRMWARE_VERSION) > LINUX_FIRMWARE_SUFFIX:= tar.gz > LINUX_FIRMWARE_URL := $(call ptx/mirror, KERNEL, > kernel/firmware/$(LINUX_FIRMWARE).$(LINUX_FIRMWARE_SUFFIX)) > @@ -31,7 +31,7 @@ LINUX_FIRMWARE_LICENSE_FILES := \ > file://LICENSE.dib0700;md5=f7411825c8a555a1a3e5eab9ca773431 \ > file://LICENCE.adsp_sst;md5=615c45b91a5a4a9fe046d6ab9a2df728 \ > file://LICENCE.cadence;md5=009f46816f6956cfb75ede13d3e1cee0 \ > - file://LICENSE.amd-ucode;md5=3c5399dc9148d7f0e1f41e34b69cf14f \ > + file://LICENSE.amd-ucode;md5=6ca90c57f7b248de1e25c7f68ffc4698 \ > file://LICENSE.atmel;md5=aa74ac0c60595dee4d4e239107ea77a3 \ > file://LICENCE.fw_sst_0f28;md5=6353931c988ad52818ae733ac61cd293 \ > file://LICENSE.amphion_vpu;md5=2bcdc00527b2d0542bd92b52aaec2b60 \
Re: [ptxdist] [APPLIED] libcurl: update download URL
Thanks, applied as 6b12b417d9bf0f93b69fdf2b58c4b540cd890f26. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:33 +0200, Bruno Thomsen wrote: > Downloading package result in http code 301 Moved Permanently from > server. Update used URL to match redirect URL. > > --2022-10-20 11:25:26-- https://curl.haxx.se/download/curl-7.85.0.tar.xz > Resolving curl.haxx.se (curl.haxx.se)... 151.101.66.49, 151.101.130.49, > 151.101.194.49, ... > Connecting to curl.haxx.se (curl.haxx.se)|151.101.66.49|:443... connected. > HTTP request sent, awaiting response... 301 Moved Permanently > Location: https://curl.se/download/curl-7.85.0.tar.xz [following] > --2022-10-20 11:25:27-- https://curl.se/download/curl-7.85.0.tar.xz > Resolving curl.se (curl.se)... 151.101.65.91, 151.101.129.91, 151.101.193.91, > ... > Connecting to curl.se (curl.se)|151.101.65.91|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 2480648 (2.4M) [application/x-xz] > > Signed-off-by: Bruno Thomsen > Message-Id: <20221020145407.3651-1-bruno.thom...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcurl.make b/rules/libcurl.make > index e5daf5395be6..4097462c5721 100644 > --- a/rules/libcurl.make > +++ b/rules/libcurl.make > @@ -19,7 +19,7 @@ LIBCURL_VERSION := 7.85.0 > LIBCURL_MD5 := 131f76c84016c45806b902330a74164f > LIBCURL := curl-$(LIBCURL_VERSION) > LIBCURL_SUFFIX := tar.xz > -LIBCURL_URL := https://curl.haxx.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) > +LIBCURL_URL := https://curl.se/download/$(LIBCURL).$(LIBCURL_SUFFIX) > LIBCURL_SOURCE := $(SRCDIR)/$(LIBCURL).$(LIBCURL_SUFFIX) > LIBCURL_DIR := $(BUILDDIR)/$(LIBCURL) > LIBCURL_LICENSE := curl
Re: [ptxdist] [APPLIED] libmbim: change URL from http to https
Thanks, applied as c3590c706f19f6769bbb5781ea41d3cb15d8. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:37 +0200, Bruno Thomsen wrote: > Downloading package result in a redirect from http to https. > Use URL we have been told to follow. > > --2022-10-20 11:25:17-- > http://www.freedesktop.org/software/libmbim/libmbim-1.26.4.tar.xz > Resolving www.freedesktop.org (www.freedesktop.org)... 131.252.210.176, > 2610:10:20:722:a800:ff:feda:470f > Connecting to www.freedesktop.org > (www.freedesktop.org)|131.252.210.176|:80... connected. > HTTP request sent, awaiting response... 302 Found > Location: https://www.freedesktop.org/software/libmbim/libmbim-1.26.4.tar.xz > [following] > --2022-10-20 11:25:18-- > https://www.freedesktop.org/software/libmbim/libmbim-1.26.4.tar.xz > Connecting to www.freedesktop.org > (www.freedesktop.org)|131.252.210.176|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 566188 (553K) [application/x-xz] > > Signed-off-by: Bruno Thomsen > Message-Id: <20221020145407.3651-3-bruno.thom...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libmbim.make b/rules/libmbim.make > index 781f9c0ce0fd..f2f8e5801e9a 100644 > --- a/rules/libmbim.make > +++ b/rules/libmbim.make > @@ -18,7 +18,7 @@ LIBMBIM_VERSION := 1.26.4 > LIBMBIM_MD5 := 58dea20cad346f31d2873b68385a9973 > LIBMBIM := libmbim-$(LIBMBIM_VERSION) > LIBMBIM_SUFFIX := tar.xz > -LIBMBIM_URL := > http://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX) > +LIBMBIM_URL := > https://www.freedesktop.org/software/libmbim/$(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
Re: [ptxdist] [APPLIED] dbus: update download URL
Thanks, applied as 44fd98e2a727f24708e7340042ccfd7e2dcfc1b6. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:35 +0200, Bruno Thomsen wrote: > Downloading package result in http code 301 Moved Permanently from > server. Update used URL to match redirect URL. > > --2022-10-20 11:24:55-- > http://dbus.freedesktop.org/releases/dbus/dbus-1.14.0.tar.xz > Resolving dbus.freedesktop.org (dbus.freedesktop.org)... 131.252.210.176, > 2610:10:20:722:a800:ff:feda:470f > Connecting to dbus.freedesktop.org > (dbus.freedesktop.org)|131.252.210.176|:80... connected. > HTTP request sent, awaiting response... 301 Moved Permanently > Location: https://dbus.freedesktop.org/releases/dbus/dbus-1.14.0.tar.xz > [following] > --2022-10-20 11:24:56-- > https://dbus.freedesktop.org/releases/dbus/dbus-1.14.0.tar.xz > Connecting to dbus.freedesktop.org > (dbus.freedesktop.org)|131.252.210.176|:443... connected. > HTTP request sent, awaiting response... 200 OK > Length: 1360228 (1.3M) [application/x-xz] > > Signed-off-by: Bruno Thomsen > Message-Id: <20221020145407.3651-2-bruno.thom...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/dbus.make b/rules/dbus.make > index 6ceae4c21407..b4b1aa82e5a5 100644 > --- a/rules/dbus.make > +++ b/rules/dbus.make > @@ -20,7 +20,7 @@ DBUS_VERSION:= 1.15.2 > DBUS_MD5 := c56de960ea9031b92ee71aaa0e8e72c2 > DBUS := dbus-$(DBUS_VERSION) > DBUS_SUFFIX := tar.xz > -DBUS_URL := > http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) > +DBUS_URL := > https://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX) > DBUS_SOURCE := $(SRCDIR)/$(DBUS).$(DBUS_SUFFIX) > DBUS_DIR := $(BUILDDIR)/$(DBUS) > DBUS_LICENSE := AFL-2.1 AND GPL-2.0-or-later
Re: [ptxdist] [APPLIED] libxml2: Version bump. 2.10.2 -> 2.10.3
Thanks, applied as f7958126d135935d23893290fe1ed69b2cd17df4. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:27 +0200, Christian Melki wrote: > https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.10.3 > Plugs CVEs: > [CVE-2022-40303] Fix integer overflows with XML_PARSE_HUGE > [CVE-2022-40304] Fix dict corruption caused by entity reference cycles > > * Forward patchset. Applies cleanly. > > Signed-off-by: Christian Melki > Message-Id: <20221020124901.2581876-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/libxml2-2.10.2/0200-xml2-config-is-not-SYSROOT-aware.patch > b/patches/libxml2-2.10.3/0200-xml2-config-is-not-SYSROOT-aware.patch > similarity index 100% > rename from patches/libxml2-2.10.2/0200-xml2-config-is-not-SYSROOT-aware.patch > rename to patches/libxml2-2.10.3/0200-xml2-config-is-not-SYSROOT-aware.patch > diff --git a/patches/libxml2-2.10.2/series b/patches/libxml2-2.10.3/series > similarity index 100% > rename from patches/libxml2-2.10.2/series > rename to patches/libxml2-2.10.3/series > diff --git a/rules/libxml2.make b/rules/libxml2.make > index be6e9d60a279..16df57460164 100644 > --- a/rules/libxml2.make > +++ b/rules/libxml2.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_LIBXML2) += libxml2 > # > # Paths and names > # > -LIBXML2_VERSION := 2.10.2 > -LIBXML2_MD5 := 5ffd0cd047056d5699b3363c635582bc > +LIBXML2_VERSION := 2.10.3 > +LIBXML2_MD5 := f9edac7fac232b3657a003fd9a5bbe42 > LIBXML2 := libxml2-$(LIBXML2_VERSION) > LIBXML2_SUFFIX := tar.xz > LIBXML2_SOURCE := $(SRCDIR)/$(LIBXML2).$(LIBXML2_SUFFIX)
Re: [ptxdist] [APPLIED] iproute2: Version bump. 5.19.0 -> 6.0.0
Thanks, applied as 45b6be2510d056dc7dbd76e6ba45817c6d2da036. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:25 +0200, Christian Melki wrote: > Minor fixes, header updates. > > Signed-off-by: Christian Melki > Message-Id: <20221020124346.2570521-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/iproute2.make b/rules/iproute2.make > index fb362f403a45..f811d0fb0078 100644 > --- a/rules/iproute2.make > +++ b/rules/iproute2.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2 > # > # Paths and names > # > -IPROUTE2_VERSION := 5.19.0 > -IPROUTE2_MD5 := 415bd9eeb8515a585e245809d2fe45a6 > +IPROUTE2_VERSION := 6.0.0 > +IPROUTE2_MD5 := 5da6cb3154ee09b9a8b4004d1c2df4cd > IPROUTE2 := iproute2-$(IPROUTE2_VERSION) > IPROUTE2_SUFFIX := tar.xz > IPROUTE2_URL := $(call ptx/mirror, KERNEL, > utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))
Re: [ptxdist] [APPLIED] pixman: Version bump. 0.40.0 -> 0.42.0
Thanks, applied as b04ba02152ad6f4e0e88aadf8acf79bc3b5217ef. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:29 +0200, Christian Melki wrote: > Two years worth of changes. > Mostly minor though. > > * Make use of the new meson flag to disable building of test/demos. > > Signed-off-by: Christian Melki > Message-Id: <20221020125932.2587724-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/pixman.make b/rules/pixman.make > index 32685bc7309e..db1a014390d8 100644 > --- a/rules/pixman.make > +++ b/rules/pixman.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIXMAN) += pixman > # > # Paths and names > # > -PIXMAN_VERSION := 0.40.0 > -PIXMAN_MD5 := ee642c14f4f18934246c57a440da9ca2 > +PIXMAN_VERSION := 0.42.0 > +PIXMAN_MD5 := 7330a91505c123c09163d211cb285e88 > PIXMAN := pixman-$(PIXMAN_VERSION) > PIXMAN_SUFFIX:= tar.xz > PIXMAN_URL := $(call ptx/mirror, XORG, > individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX)) > @@ -48,7 +48,8 @@ PIXMAN_CONF_OPT := \ > -Dsse2=$(call ptx/endis, PTXCONF_ARCH_X86)d \ > -Dssse3=$(call ptx/endis, PTXCONF_ARCH_X86)d \ > -Dtimers=false \ > - -Dvmx=disabled > + -Dvmx=disabled \ > + -Dtests=disabled > > # > > # Target-Install
Re: [ptxdist] [APPLIED] hwdata: Version bump. 0.362 -> 0.363.
Thanks, applied as e4af175a179f903d54b14427a274507fe8d7a5d0. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:23 +0200, Christian Melki wrote: > The regular churn of id updates. > > Signed-off-by: Christian Melki > Message-Id: <20221020124013.2563142-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/hwdata.make b/rules/hwdata.make > index 364b83e22cd3..6a03929d9553 100644 > --- a/rules/hwdata.make > +++ b/rules/hwdata.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata > # > # Paths and names > # > -HWDATA_VERSION := 0.362 > -HWDATA_MD5 := 8a47c40da026c74314c95ec63050b9f8 > +HWDATA_VERSION := 0.363 > +HWDATA_MD5 := 059a195108ea23852bb550e4196f286f > HWDATA := hwdata-$(HWDATA_VERSION) > HWDATA_SUFFIX:= tar.gz > HWDATA_URL := > https://github.com/vcrhonek/hwdata/archive/refs/tags/v$(HWDATA_VERSION).$(HWDATA_SUFFIX)
Re: [ptxdist] [APPLIED] mesalib: version bump 22.2.1 -> 22.2.2
Thanks, applied as 2046b1181a472061245a9275d6edb3960bb4a005. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:19 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20221020084643.2243914-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mesalib.make b/rules/mesalib.make > index e06417b34018..dfbb0d11ae73 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 22.2.1 > -MESALIB_MD5 := 5ff97bb6bf82af6f81b41ff9dacbcc0a > +MESALIB_VERSION := 22.2.2 > +MESALIB_MD5 := b696316674c2007cdcc25e67e192aba8 > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \
Re: [ptxdist] [APPLIED] ethtool: Version bump. 5.19 -> 6.0.
Thanks, applied as d4ec47a8cd43080fe35811e4d9ac2eeeca99eec6. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:21 +0200, Christian Melki wrote: > Minor changes. UAPI bump. > > Signed-off-by: Christian Melki > Message-Id: <20221020123614.2559186-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/ethtool.make b/rules/ethtool.make > index a5de32baac12..9150fdaea94b 100644 > --- a/rules/ethtool.make > +++ b/rules/ethtool.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_ETHTOOL) += ethtool > # > # Paths and names > # > -ETHTOOL_VERSION := 5.19 > -ETHTOOL_MD5 := f7748330e125448660d84b1fddd01c61 > +ETHTOOL_VERSION := 6.0 > +ETHTOOL_MD5 := 1284306e608fad9c79fa80edc288e071 > ETHTOOL_SUFFIX := tar.xz > ETHTOOL := ethtool-$(ETHTOOL_VERSION) > ETHTOOL_URL := $(call ptx/mirror, KERNEL, > ../software/network/ethtool/$(ETHTOOL).$(ETHTOOL_SUFFIX))
Re: [ptxdist] [APPLIED] zlib: Version bump. 1.2.12 -> 1.2.13
Thanks, applied as 03f1deb5adf18ef54014476c1b82ca5efa04780b.
Michael
[sent from post-receive hook]
On Fri, 28 Oct 2022 16:44:18 +0200, Christian Melki
wrote:
> https://zlib.net/
> Minor fixes in this release.
> Version bump plugs CVE-2022-37434.
>
> * Remove all patches for 1.2.12. They're now fixed.
> * Reindent license file line.
> * Zlib added a real LICENSE file describing the zlib license.
> Use that file instead of the README which changes every
> release due to version numbering.
>
> Signed-off-by: Christian Melki
> Message-Id: <20221019071827.3557341-1-christian.me...@t2data.com>
> Acked-by: Denis Osterland-Heim
> Signed-off-by: Michael Olbrich
>
> diff --git
> a/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
>
> b/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
> deleted file mode 100644
> index 63bdb67c0225..
> ---
> a/patches/zlib-1.2.12/0001-Fix-configure-issue-that-discarded-provided-CC-defin.patch
> +++ /dev/null
> @@ -1,23 +0,0 @@
> -From: Mark Adler
> -Date: Mon, 28 Mar 2022 18:34:10 -0700
> -Subject: [PATCH] Fix configure issue that discarded provided CC definition.
> -
>
> - configure | 3 +++
> - 1 file changed, 3 insertions(+)
> -
> -diff --git a/configure b/configure
> -index 52ff4a04ea89..3fa3e8618f9c 100755
> a/configure
> -+++ b/configure
> -@@ -174,7 +174,10 @@ if test -z "$CC"; then
> - else
> - cc=${CROSS_PREFIX}cc
> - fi
> -+else
> -+ cc=${CC}
> - fi
> -+
> - cflags=${CFLAGS-"-O3"}
> - # to force the asm version use: CFLAGS="-O3 -DASMV" ./configure
> - case "$cc" in
> diff --git
> a/patches/zlib-1.2.12/0002-Fix-a-bug-when-getting-a-gzip-header-extra-field-wit.patch
>
> b/patches/zlib-1.2.12/0002-Fix-a-bug-when-getting-a-gzip-header-extra-field-wit.patch
> deleted file mode 100644
> index e8b36be46ac3..
> ---
> a/patches/zlib-1.2.12/0002-Fix-a-bug-when-getting-a-gzip-header-extra-field-wit.patch
> +++ /dev/null
> @@ -1,31 +0,0 @@
> -From: Mark Adler
> -Date: Sat, 30 Jul 2022 15:51:11 -0700
> -Subject: [PATCH] Fix a bug when getting a gzip header extra field with
> - inflate().
> -
> -If the extra field was larger than the space the user provided with
> -inflateGetHeader(), and if multiple calls of inflate() delivered
> -the extra header data, then there could be a buffer overflow of the
> -provided space. This commit assures that provided space is not
> -exceeded.
>
> - inflate.c | 5 +++--
> - 1 file changed, 3 insertions(+), 2 deletions(-)
> -
> -diff --git a/inflate.c b/inflate.c
> -index 7be8c63662a7..7a728974923a 100644
> a/inflate.c
> -+++ b/inflate.c
> -@@ -763,9 +763,10 @@ int flush;
> - copy = state->length;
> - if (copy > have) copy = have;
> - if (copy) {
> -+len = state->head->extra_len - state->length;
> - if (state->head != Z_NULL &&
> --state->head->extra != Z_NULL) {
> --len = state->head->extra_len - state->length;
> -+state->head->extra != Z_NULL &&
> -+len < state->head->extra_max) {
> - zmemcpy(state->head->extra + len, next,
> - len + copy > state->head->extra_max ?
> - state->head->extra_max - len : copy);
> diff --git
> a/patches/zlib-1.2.12/0003-Fix-extra-field-processing-bug-that-dereferences-NUL.patch
>
> b/patches/zlib-1.2.12/0003-Fix-extra-field-processing-bug-that-dereferences-NUL.patch
> deleted file mode 100644
> index 381c5212898c..
> ---
> a/patches/zlib-1.2.12/0003-Fix-extra-field-processing-bug-that-dereferences-NUL.patch
> +++ /dev/null
> @@ -1,28 +0,0 @@
> -From: Mark Adler
> -Date: Mon, 8 Aug 2022 10:50:09 -0700
> -Subject: [PATCH] Fix extra field processing bug that dereferences NULL
> - state->head.
> -
> -The recent commit to fix a gzip header extra field processing bug
> -introduced the new bug fixed here.
>
> - inflate.c | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/inflate.c b/inflate.c
> -index 7a728974923a..2a3c4fe98464 100644
> a/inflate.c
> -+++ b/inflate.c
> -@@ -763,10 +763,10 @@ int flush;
> - copy = state->length;
> - if (copy > have) copy = have;
> - if (copy) {
> --len = state->head->extra_len - state->length;
> - if (state->head != Z_NULL &&
> - state->head->extra != Z_NULL &&
> --len < state->head->extra_max) {
> -+(len = state->head->extra_len - state->length) <
> -+state->head->extra_max) {
> - zmemcpy(state->head->extra + len, next,
> - len + copy > state->head->extra_max ?
> -
Re: [ptxdist] [APPLIED] mmc-utils: add license files
Thanks, applied as c6a4247915452a018cce9e55e2ab929dcab30ead. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:16 +0200, Bruno Thomsen wrote: > Newly added README file clearly states that license is GPL-2.0-only. > 3rdparty hmac_sha2 has a dual BSD and GPLv2 license when distributed > with mmc-utils. > Add README, mmc.c and 3rdparty/hmac_sha/sha2.h license header as license > files. > > Signed-off-by: Bruno Thomsen > Message-Id: <20221018172118.4196-1-bruno.thom...@gmail.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mmc-utils.make b/rules/mmc-utils.make > index a5045b079c1e..9a43c148b112 100644 > --- a/rules/mmc-utils.make > +++ b/rules/mmc-utils.make > @@ -23,6 +23,10 @@ MMC_UTILS_URL := > https://git.kernel.org/pub/scm/utils/mmc/mmc-utils.git;tag=$(M > MMC_UTILS_SOURCE := $(SRCDIR)/$(MMC_UTILS).$(MMC_UTILS_SUFFIX) > MMC_UTILS_DIR:= $(BUILDDIR)/$(MMC_UTILS) > MMC_UTILS_LICENSE:= GPL-2.0-only AND BSD-3-Clause > +MMC_UTILS_LICENSE_FILES := \ > + > file://README;startline=28;endline=31;md5=73e5e3ce638b21eca6e204e260201d4a \ > + > file://mmc.c;startline=1;endline=20;md5=fae32792e20f4d27ade1c5a762d16b7d \ > + > file://3rdparty/hmac_sha/sha2.h;startline=1;endline=36;md5=6ce341e87c5fcac36e417f4a0e283afd > > # > > # Prepare
Re: [ptxdist] [APPLIED] rules: Replace deprecated _ENV
Thanks, applied as 59febb48bdae2b5bcc9d9a186a4cb6482edc5f17. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:12 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > [mol: update explicit user of JVISU_ENV] > Signed-off-by: Michael Olbrich > > diff --git a/rules/at.make b/rules/at.make > index 7a4da8f5a9b8..c7089d156b8d 100644 > --- a/rules/at.make > +++ b/rules/at.make > @@ -31,7 +31,7 @@ AT_LICENSE_FILES := \ > # Prepare > # > > > -AT_ENV := \ > +AT_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_header_security_pam_appl_h=$(call ptx/yesno, PTXCONF_GLOBAL_PAM) > > diff --git a/rules/bonniexx.make b/rules/bonniexx.make > index b0c69be8b885..70f98e8bccf0 100644 > --- a/rules/bonniexx.make > +++ b/rules/bonniexx.make > @@ -30,7 +30,7 @@ BONNIEXX_LICENSE_FILES := \ > # Prepare > # > > > -BONNIEXX_ENV := \ > +BONNIEXX_CONF_ENV:= \ > $(CROSS_ENV) \ > bonnie_cv_sys_largefile=$(call ptx/yesno, PTXCONF_GLOBAL_LARGE_FILE) > > diff --git a/rules/fontconfig.make b/rules/fontconfig.make > index 6c45bad668c1..925e036493f5 100644 > --- a/rules/fontconfig.make > +++ b/rules/fontconfig.make > @@ -33,7 +33,7 @@ FONTCONFIG_LICENSE_FILES:= \ > # Prepare > # > > > -FONTCONFIG_ENV := \ > +FONTCONFIG_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_prog_HASDOCBOOK=no > > diff --git a/rules/gnupg.make b/rules/gnupg.make > index 99e7f776aa3c..a2c33212c923 100644 > --- a/rules/gnupg.make > +++ b/rules/gnupg.make > @@ -36,12 +36,12 @@ GNUPG_LICENSE_FILES := \ > # Prepare > # > > > -GNUPG_ENV := \ > +GNUPG_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_path_GPGRT_CONFIG=$(PTXDIST_SYSROOT_CROSS)/bin/gpgrt-config > > -GNUPG_CONF_TOOL := autoconf > -GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ > +GNUPG_CONF_TOOL := autoconf > +GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \ > --disable-gpgsm \ > --disable-scdaemon \ > --disable-g13 \ > diff --git a/rules/grub.make b/rules/grub.make > index a85321172e68..63b93c2d7ba9 100644 > --- a/rules/grub.make > +++ b/rules/grub.make > @@ -28,7 +28,7 @@ GRUB_DIR:= $(BUILDDIR)/$(GRUB) > # non-standard CFLAGS. We can unset them here as grub is compiled > # standalone anyway (without Linux/glibc includes) > > -GRUB_ENV := $(CROSS_ENV) CFLAGS='' > +GRUB_CONF_ENV:= $(CROSS_ENV) CFLAGS='' > > GRUB_CFLAGS := -fgnu89-inline > > diff --git a/rules/host-cairo.make b/rules/host-cairo.make > index 6936b9bc2893..092641e25920 100644 > --- a/rules/host-cairo.make > +++ b/rules/host-cairo.make > @@ -15,8 +15,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_CAIRO) += host-cairo > # Prepare > # > > > -#HOST_CAIRO_CONF_ENV := $(HOST_ENV) > - > # > # autoconf > # > diff --git a/rules/host-libxcb.make b/rules/host-libxcb.make > index 579c3274e974..4996695c0cec 100644 > --- a/rules/host-libxcb.make > +++ b/rules/host-libxcb.make > @@ -15,7 +15,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBXCB) += host-libxcb > # Prepare > # > > > -HOST_LIBXCB_ENV := \ > +HOST_LIBXCB_CONF_ENV := \ > $(HOST_ENV) \ > ac_cv_prog_BUILD_DOCS=no \ > ac_cv_lib_Xdmcp_XdmcpWrap=no > diff --git a/rules/host-openssl.make b/rules/host-openssl.make > index f80b4e1c9f8d..bd2a2512645b 100644 > --- a/rules/host-openssl.make > +++ b/rules/host-openssl.make > @@ -23,8 +23,6 @@ HOST_OPENSSL_DIR= $(HOST_BUILDDIR)/$(HOST_OPENSSL) > # Prepare > # > > > -HOST_OPENSSL_CONF_ENV:= $(HOST_ENV) > - > # > # autoconf > # > diff --git a/rules/host-opkg.make b/rules/host-opkg.make > index a8cae57ce031..a9fe3d20a363 100644 > --- a/rules/host-opkg.make > +++ b/rules/host-opkg.make > @@ -22,8 +22,6 @@ HOST_OPKG_DIR = $(HOST_BUILDDIR)/$(HOST_OPKG) > # Prepare > # > > > -HOST_OPKG_ENV:= $(HOST_ENV) > - > # > # autoconf > # > diff --git a/rules/host-postgresql.make b/rules/host-postgresql.make > index 1092c38a8b1c..c9c92a40b27a 100644 > --- a/rules/host-postgresql.make > +++ b/rules/host-postgresql.make > @@ -15,8 +15,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_POSTGRESQL) += host-postgresql > # Prepare > # > > > -#HOST_POSTGRESQL_CONF_ENV:= $(HOST_ENV) > - > # > # autoconf > # > diff --git a/rules/host-python3.make b/rules/host-python3.make > index
Re: [ptxdist] [APPLIED] rules: Replace deprecated _BUILDDIR
Thanks, applied as a007a9d11d1c2f6522d878d77ad744b221d146d1. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:10 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > [mol: update TF_A_BUILDDIR user as well] > Signed-off-by: Michael Olbrich > > diff --git a/rules/db.make b/rules/db.make > index 1fce58623c66..2872a1c0230d 100644 > --- a/rules/db.make > +++ b/rules/db.make > @@ -25,7 +25,7 @@ DB_URL := > http://download.oracle.com/berkeley-db/$(DB).$(DB_SUFFIX) > DB_SOURCE:= $(SRCDIR)/$(DB).$(DB_SUFFIX) > DB_DIR := $(BUILDDIR)/$(DB) > DB_SUBDIR:= dist > -DB_BUILDDIR := $(DB_DIR)/build_unix > +DB_BUILD_DIR := $(DB_DIR)/build_unix > DB_LICENCE := Sleepycat > > # > > @@ -35,7 +35,7 @@ DB_LICENCE := Sleepycat > # > # autoconf > # > -DB_CONF_TOOL := autoconf > +DB_CONF_TOOL := autoconf > DB_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-smallbuild \ > diff --git a/rules/tf-a.make b/rules/tf-a.make > index 561af0d390af..ac1bff0322b4 100644 > --- a/rules/tf-a.make > +++ b/rules/tf-a.make > @@ -22,7 +22,7 @@ TF_A_SUFFIX := tar.gz > TF_A_URL := $(call remove_quotes, > $(PTXCONF_TF_A_URL))/$(TF_A_VERSION).$(TF_A_SUFFIX) > TF_A_SOURCE := $(SRCDIR)/$(TF_A).$(TF_A_SUFFIX) > TF_A_DIR := $(BUILDDIR)/$(TF_A) > -TF_A_BUILDDIR:= $(TF_A_DIR)/build > +TF_A_BUILD_DIR := $(TF_A_DIR)/build > TF_A_BUILD_OOT := YES > TF_A_LICENSE := BSD-3-Clause AND BSD-2-Clause \ > AND (GPL-2.0-or-later OR BSD-2-Clause) \ > @@ -41,7 +41,7 @@ TF_A_WRAPPER_BLACKLIST := \ > $(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST) > > TF_A_EXTRA_ARGS := $(call > remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS)) > -TF_A_BINDIR = $(TF_A_BUILDDIR)/$(1)/$(if $(filter > DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release) > +TF_A_BINDIR = $(TF_A_BUILD_DIR)/$(1)/$(if $(filter > DEBUG=1,$(TF_A_EXTRA_ARGS)),debug,release) > TF_A_MAKE_OPT:= \ > -C $(TF_A_DIR) \ > CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
Re: [ptxdist] [APPLIED] ptxd_make_world_common: optionally bailout on deprecated variable use
Thanks, applied as 1405db882535f78318d8d62573b952cae3fa371d.
Michael
[sent from post-receive hook]
On Fri, 28 Oct 2022 16:44:14 +0200, Ladislav Michl wrote:
> Signed-off-by: Ladislav Michl
> Message-Id:
> Signed-off-by: Michael Olbrich
>
> diff --git a/config/setup/Kconfig b/config/setup/Kconfig
> index 0a7db1678a4b..f1a31e792bf5 100644
> --- a/config/setup/Kconfig
> +++ b/config/setup/Kconfig
> @@ -304,6 +304,12 @@ config SETUP_CHECK_EXIT_ON_ERROR
> quite aggressive error checking. Don't turn this on until
> you know what you're doing.
>
> +config SETUP_DEPRECATED_FATAL
> + bool "bailout on deprecated variable use"
> + help
> + Terminate on deprecated variable use. Turn this on only
> + if you are going to hunt for deprecated variables.
> +
> config SETUP_ICECC
> bool "use icecc"
> depends on !SETUP_CCACHE
> diff --git a/scripts/lib/ptxd_make_world_common.sh
> b/scripts/lib/ptxd_make_world_common.sh
> index db24af99f729..f722210763a9 100644
> --- a/scripts/lib/ptxd_make_world_common.sh
> +++ b/scripts/lib/ptxd_make_world_common.sh
> @@ -20,6 +20,15 @@ ptxd_make_world_init_deprecation_check() {
> pkg_deprecated_compile_env
> pkg_deprecated_makevars
> )
> +local -a depname
> +depname=(
> + BUILDDIR
> + ENV
> + AUTOCONF
> + CMAKE
> + COMPILE_ENV
> + MAKEVARS
> + )
> local i
>
> for ((i = 0; i < ${#dep[@]}; i++)); do
> @@ -28,8 +37,12 @@ ptxd_make_world_init_deprecation_check() {
>
> [ -z "${val}" ] && continue
>
> - echo "${var}=\"${val}\""
> + echo "_${depname[i]}: ${var}=\"${val}\""
> echo
> +
> + if [ "${PTXCONF_SETUP_DEPRECATED_FATAL}" = "y" ]; then
> + ptxd_bailout "${FUNCNAME}: deprecated variable _${depname[i]}
> detected!"
> + fi
> done
>
> }
Re: [ptxdist] [APPLIED] rules: Replace deprecated _COMPILE_ENV
Thanks, applied as e7cdee2e88afe21bfaa2f7c49ac0bc0c5213c6eb. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:08 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-nodejs.make b/rules/host-nodejs.make > index 6da85be2cad5..2bf5f7971891 100644 > --- a/rules/host-nodejs.make > +++ b/rules/host-nodejs.make > @@ -13,7 +13,7 @@ > HOST_PACKAGES-$(PTXCONF_HOST_NODEJS) += host-nodejs > > # Always run the preprocessor locally. > -HOST_NODEJS_COMPILE_ENV := \ > +HOST_NODEJS_MAKE_ENV := \ > ICECC_REMOTE_CPP=0 > > # > > diff --git a/rules/libpcap.make b/rules/libpcap.make > index ae7292fed15c..1d51449aec8f 100644 > --- a/rules/libpcap.make > +++ b/rules/libpcap.make > @@ -31,7 +31,7 @@ LIBPCAP_CONF_ENV := \ > $(CROSS_ENV) \ > ac_cv_lbl_hci_channel_monitor_is_defined=no > > -LIBPCAP_COMPILE_ENV := \ > +LIBPCAP_MAKE_ENV := \ > $(CROSS_ENV_CFLAGS) \ > $(CROSS_ENV_CPPFLAGS) \ > $(CROSS_ENV_LDFLAGS) \ > diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make > index c9330f6bae6d..d05fc7b7e60c 100644 > --- a/rules/pcmciautils.make > +++ b/rules/pcmciautils.make > @@ -27,7 +27,7 @@ PCMCIAUTILS_DIR := $(BUILDDIR)/$(PCMCIAUTILS) > # Prepare > # > > > -PCMCIAUTILS_COMPILE_ENV := \ > +PCMCIAUTILS_MAKE_ENV := \ > $(CROSS_ENV_CFLAGS) \ > $(CROSS_ENV_CPPFLAGS) \ > $(CROSS_ENV_LDFLAGS) > diff --git a/rules/poppler.make b/rules/poppler.make > index d56e2601bba0..9679ccc65a6c 100644 > --- a/rules/poppler.make > +++ b/rules/poppler.make > @@ -78,7 +78,7 @@ POPPLER_CONF_OPT:= \ > -DWITH_TIFF=$(call ptx/onoff,PTXCONF_POPPLER_TIFF) > > ifdef PTXCONF_POPPLER_QT5 > -POPPLER_COMPILE_ENV := \ > +POPPLER_MAKE_ENV := \ > ICECC_REMOTE_CPP=0 > endif >
Re: [ptxdist] [APPLIED] proftpd: Use ptx/endis to enable options
Thanks, applied as ccf0340b89cb754cf171fb9f8e88d2dc308b923c. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:07 +0200, Ladislav Michl wrote: > Remove some ifdefs and replace deprecated variables while there. > > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/proftpd.make b/rules/proftpd.make > index 6554dced73b8..889a9fef8e69 100644 > --- a/rules/proftpd.make > +++ b/rules/proftpd.make > @@ -27,39 +27,20 @@ PROFTPD_DIR := $(BUILDDIR)/$(PROFTPD) > # Prepare > # > > > -PROFTPD_COMPILE_ENV := $(CROSS_ENV_CC_FOR_BUILD) > +PROFTPD_MAKE_ENV := $(CROSS_ENV_CC_FOR_BUILD) > > # > # autoconf > # > -PROFTPD_AUTOCONF := \ > +PROFTPD_CONF_TOOL:= autoconf > +PROFTPD_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_IPV6_OPTION) \ > - --disable-cap > - > -ifdef PTXCONF_PROFTPD_PAM > -PROFTPD_AUTOCONF += --enable-auth-pam > -else > -PROFTPD_AUTOCONF += --disable-auth-pam > -endif > - > -ifdef PTXCONF_PROFTPD_SENDFILE > -PROFTPD_AUTOCONF += --enable-sendfile > -else > -PROFTPD_AUTOCONF += --disable-sendfile > -endif > - > -ifdef PTXCONF_PROFTPD_SHADOW > -PROFTPD_AUTOCONF += --enable-shadow > -else > -PROFTPD_AUTOCONF += --disable-shadow > -endif > - > -ifdef PTXCONF_PROFTPD_AUTOSHADOW > -PROFTPD_AUTOCONF += --enable-autoshadow > -else > -PROFTPD_AUTOCONF += --disable-autoshadow > -endif > + --disable-cap \ > + --$(call ptx/endis, PTXCONF_PROFTPD_PAM)-auth-pam \ > + --$(call ptx/endis, PTXCONF_PROFTPD_SENDFILE)-sendfile \ > + --$(call ptx/endis, PTXCONF_PROFTPD_SHADOW)-shadow \ > + --$(call ptx/endis, PTXCONF_PROFTPD_AUTOSHADOW)-autoshadow > > PROFTPD_MAKE_PAR := NO >
Re: [ptxdist] [APPLIED] rules: Remove default assignments to _PATH and _ENV
Thanks, applied as 86b0b033e855e8c6264e50f81762e67e76728303. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:01 +0200, Ladislav Michl wrote: > Undefined _PATH is set to PATH=$(CROSS_PATH) for target packages, > PATH=$(HOST_PATH) for host packages and PATH=$(HOST_CROSS_PATH) for > cross packages. > > Undefined _ENV is set to $(CROSS_ENV) for target packages, > $(HOST_ENV) for host packages and $(HOST_CROSS_ENV) for cross > packages. > > Remove those default assignments. > > Signed-off-by: Ladislav Michl > Message-Id: > [mol: don't drop PNPUTILS_MAKE_ENV, it's still needed] > Signed-off-by: Michael Olbrich > > diff --git a/rules/argtable2.make b/rules/argtable2.make > index d58b17d5d48d..48d6d92aa776 100644 > --- a/rules/argtable2.make > +++ b/rules/argtable2.make > @@ -31,9 +31,6 @@ ARGTABLE2_LICENSE_FILES := \ > # Prepare > # > > > -ARGTABLE2_PATH := PATH=$(CROSS_PATH) > -ARGTABLE2_ENV:= $(CROSS_ENV) > - > # > # autoconf > # > diff --git a/rules/bash.make b/rules/bash.make > index 080c8f307370..ef07053abc66 100644 > --- a/rules/bash.make > +++ b/rules/bash.make > @@ -29,7 +29,6 @@ BASH_LICENSE_FILES := \ > # Prepare > # > > > -BASH_PATH:= PATH=$(CROSS_PATH) > BASH_ENV := \ > $(CROSS_ENV) \ > bash_cv_job_control_missing=$(call ptx/ifdef, PTXCONF_BASH_JOBS, > present, missing) \ > diff --git a/rules/bc.make b/rules/bc.make > index af8a0b1a4d19..9aad230583c2 100644 > --- a/rules/bc.make > +++ b/rules/bc.make > @@ -31,9 +31,6 @@ BC_LICENSE_FILES:= \ > # Prepare > # > > > -BC_PATH := PATH=$(CROSS_PATH) > -BC_ENV := $(CROSS_ENV) > - > # > # autoconf > # > diff --git a/rules/boost.make b/rules/boost.make > index f9f6bb587a42..8d5a9f78e431 100644 > --- a/rules/boost.make > +++ b/rules/boost.make > @@ -65,7 +65,6 @@ BOOST_LIBRARIES-$(PTXCONF_BOOST_TIMER) += timer > BOOST_LIBRARIES-$(PTXCONF_BOOST_TYPE_ERASURE)+= type_erasure > BOOST_LIBRARIES-$(PTXCONF_BOOST_WAVE)+= wave > > -BOOST_PATH := PATH=$(CROSS_PATH) > BOOST_CONF_TOOL := NO > BOOST_CONF_OPT := \ > --with-toolset=gcc \ > diff --git a/rules/bustle.make b/rules/bustle.make > index b5dd33560b74..d3e09889179e 100644 > --- a/rules/bustle.make > +++ b/rules/bustle.make > @@ -27,7 +27,6 @@ BUSTLE_LICENSE := GPL-2.0-or-later AND > LGPL-2.1-or-later > # Prepare > # > > > -BUSTLE_PATH := PATH=$(CROSS_PATH) > BUSTLE_MAKE_ENV := $(CROSS_ENV) > > $(STATEDIR)/bustle.prepare: > diff --git a/rules/cairomm.make b/rules/cairomm.make > index 4575f005ffd6..f0b3d82debef 100644 > --- a/rules/cairomm.make > +++ b/rules/cairomm.make > @@ -27,9 +27,6 @@ CAIROMM_DIR := $(BUILDDIR)/$(CAIROMM) > # Prepare > # > > > -CAIROMM_PATH := PATH=$(CROSS_PATH) > -CAIROMM_ENV := $(CROSS_ENV) > - > # > # autoconf > # > diff --git a/rules/calibrator.make b/rules/calibrator.make > index 92e891f43a65..67b85852 100644 > --- a/rules/calibrator.make > +++ b/rules/calibrator.make > @@ -28,7 +28,6 @@ CALIBRATOR_LICENSE_FILES:= > file://calibrator.c;md5=8f7790f3cb58345fcb862c4ceab8 > # Compile > # > > > -CALIBRATOR_PATH := PATH=$(CROSS_PATH) > CALIBRATOR_MAKE_ENV := $(CROSS_ENV) LDLIBS=-lm > CALIBRATOR_MAKE_OPT := calibrator > > diff --git a/rules/classpath.make b/rules/classpath.make > index 188bb3c59d47..f5d095f18758 100644 > --- a/rules/classpath.make > +++ b/rules/classpath.make > @@ -28,7 +28,6 @@ CLASSPATH_DIR := $(BUILDDIR)/$(CLASSPATH) > # Prepare > # > > > -CLASSPATH_PATH := PATH=$(CROSS_PATH) > CLASSPATH_ENV:= \ > $(CROSS_ENV) \ > JAVAC=$(PTXCONF_SETUP_JAVA_SDK)/bin/javac \ > diff --git a/rules/daemonize.make b/rules/daemonize.make > index ea0aa8133b7e..db9bbb2e5b83 100644 > --- a/rules/daemonize.make > +++ b/rules/daemonize.make > @@ -29,9 +29,6 @@ DAEMONIZE_LICENSE_FILES := > file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f > # Prepare > # > > > -DAEMONIZE_PATH := PATH=$(CROSS_PATH) > -DAEMONIZE_ENV:= $(CROSS_ENV) > - > # > # autoconf > # > diff --git a/rules/dash.make b/rules/dash.make > index dfa3ba4673f7..398f83ada010 100644 > --- a/rules/dash.make > +++ b/rules/dash.make > @@ -31,9 +31,6 @@ DASH_LICENSE_FILES := \ > # Prepare > # >
Re: [ptxdist] [APPLIED] rules: Replace deprecated _AUTOCONF
Thanks, applied as d82f0cd5657851a854e0731e8255ae3d40ce2af1. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:05 +0200, Ladislav Michl wrote: > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/argtable2.make b/rules/argtable2.make > index 48d6d92aa776..79630e2754a4 100644 > --- a/rules/argtable2.make > +++ b/rules/argtable2.make > @@ -34,7 +34,8 @@ ARGTABLE2_LICENSE_FILES := \ > # > # autoconf > # > -ARGTABLE2_AUTOCONF := \ > +ARGTABLE2_CONF_TOOL := autoconf > +ARGTABLE2_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-debug > > diff --git a/rules/bash.make b/rules/bash.make > index ef07053abc66..86dc532348b0 100644 > --- a/rules/bash.make > +++ b/rules/bash.make > @@ -29,12 +29,13 @@ BASH_LICENSE_FILES:= \ > # Prepare > # > > > -BASH_ENV := \ > +BASH_CONF_ENV:= \ > $(CROSS_ENV) \ > bash_cv_job_control_missing=$(call ptx/ifdef, PTXCONF_BASH_JOBS, > present, missing) \ > bash_cv_termcap_lib=$(call ptx/ifdef, PTXCONF_BASH_CURSES, libncurses, > libtermcap) > > -BASH_AUTOCONF:= \ > +BASH_CONF_TOOL := autoconf > +BASH_CONF_OPT:= \ > $(CROSS_AUTOCONF_USR) \ > $(GLOBAL_LARGE_FILE_OPTION) \ > --without-bash-malloc \ > diff --git a/rules/bc.make b/rules/bc.make > index 9aad230583c2..c23cf0707bc6 100644 > --- a/rules/bc.make > +++ b/rules/bc.make > @@ -34,7 +34,8 @@ BC_LICENSE_FILES:= \ > # > # autoconf > # > -BC_AUTOCONF := $(CROSS_AUTOCONF_USR) > +BC_CONF_TOOL := autoconf > +BC_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # > > # Target-Install > diff --git a/rules/binutils.make b/rules/binutils.make > index ca1080bc811d..17b7f7e3e313 100644 > --- a/rules/binutils.make > +++ b/rules/binutils.make > @@ -38,7 +38,8 @@ BINUTILS_CONF_ENV := \ > # > # autoconf > # > -BINUTILS_AUTOCONF := \ > +BINUTILS_CONF_TOOL := autoconf > +BINUTILS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --target=$(PTXCONF_GNU_TARGET) \ > --disable-werror > diff --git a/rules/bridge-utils.make b/rules/bridge-utils.make > index 9034e65509e3..3ba5ce191540 100644 > --- a/rules/bridge-utils.make > +++ b/rules/bridge-utils.make > @@ -36,7 +36,7 @@ BRIDGE_UTILS_CONF_TOOL := autoconf > > # Set with-linux-headers to something that doesn't exist to avoid the default > # path picking up a path from the build host. > -BRIDGE_UTILS_AUTOCONF := \ > +BRIDGE_UTILS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --with-linux-headers=/this/path/must/not/exist > > diff --git a/rules/cairomm.make b/rules/cairomm.make > index f0b3d82debef..6d73ab0b5dce 100644 > --- a/rules/cairomm.make > +++ b/rules/cairomm.make > @@ -30,7 +30,8 @@ CAIROMM_DIR := $(BUILDDIR)/$(CAIROMM) > # > # autoconf > # > -CAIROMM_AUTOCONF := \ > +CAIROMM_CONF_TOOL:= autoconf > +CAIROMM_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-documentation \ > --disable-tests > diff --git a/rules/classpath.make b/rules/classpath.make > index f5d095f18758..4c7a3620aedd 100644 > --- a/rules/classpath.make > +++ b/rules/classpath.make > @@ -28,7 +28,7 @@ CLASSPATH_DIR := $(BUILDDIR)/$(CLASSPATH) > # Prepare > # > > > -CLASSPATH_ENV:= \ > +CLASSPATH_CONF_ENV := \ > $(CROSS_ENV) \ > JAVAC=$(PTXCONF_SETUP_JAVA_SDK)/bin/javac \ > JAVA=jamvm \ > @@ -43,7 +43,8 @@ CLASSPATH_ENV := \ > # > # autoconf > # > -CLASSPATH_AUTOCONF := \ > +CLASSPATH_CONF_TOOL := autoconf > +CLASSPATH_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-option-checking \ > --disable-collections \ > diff --git a/rules/daemonize.make b/rules/daemonize.make > index db9bbb2e5b83..6b7d591bada8 100644 > --- a/rules/daemonize.make > +++ b/rules/daemonize.make > @@ -32,7 +32,8 @@ DAEMONIZE_LICENSE_FILES := > file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f > # > # autoconf > # > -DAEMONIZE_AUTOCONF := $(CROSS_AUTOCONF_USR) > +DAEMONIZE_CONF_TOOL := autoconf > +DAEMONIZE_CONF_OPT := $(CROSS_AUTOCONF_USR) > > # > > # Target-Install > diff --git a/rules/dash.make b/rules/dash.make > index 398f83ada010..343e132e8bba 100644 > --- a/rules/dash.make > +++ b/rules/dash.make > @@ -34,7 +34,8 @@ DASH_LICENSE_FILES := \ > # > # autoconf > # > -DASH_AUTOCONF := \ > +DASH_CONF_TOOL := autoconf > +DASH_CONF_OPT:= \ > $(CROSS_AUTOCONF_USR) \ > --with-libedit=no > > diff --git a/rules/dbench.make b/rules/dbench.make > index 4c016b0646c7..7413d7091543 100644 > --- a/rules/dbench.make > +++ b/rules/dbench.make > @@ -30,14 +30,17 @@ DBENCH_LICENSE_FILES := \ > # Prepare >
Re: [ptxdist] [APPLIED] bsdiff: Fix configuration tool (not) used
Thanks, applied as ab6a3fcc7ed4e4e00a79ad040a432db41b302252. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:44:03 +0200, Ladislav Michl wrote: > Fix typo. > > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/bsdiff.make b/rules/bsdiff.make > index 22cd97c44f62..f561bc81672c 100644 > --- a/rules/bsdiff.make > +++ b/rules/bsdiff.make > @@ -30,7 +30,7 @@ BSDIFF_LICENSE := BSD-2-Clause > # > # autoconf > # > -BSDIFF_AUTOCONF_CONF_TOOL := NO > +BSDIFF_CONF_TOOL := NO > BSDIFF_MAKE_ENV := $(CROSS_ENV) PREFIX=/usr > > # >
Re: [ptxdist] [APPLIED] tpm2-tools: Version bump. 5.2 -> 5.3
Thanks, applied as 1a19e42ea2ac6388f9eb2a43904a716808f31831. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:43:59 +0200, Christian Melki wrote: > https://github.com/tpm2-software/tpm2-tools/releases/tag/5.3 > A lot of fixes and enhancements over the last year. > > * License file moved from doc to docs. Contents is identical. > * Explicitly enable fapi for the new tools. Requires tpm2-tss fapi. > * Add tpm2 tools and a section for tss2 tools. Was missing previously. > > Signed-off-by: Christian Melki > Message-Id: <20221014210351.2257285-2-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make > index eedef48158c4..42a473fb348a 100644 > --- a/rules/tpm2-tools.make > +++ b/rules/tpm2-tools.make > @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools > # > # Paths and names > # > -TPM2_TOOLS_VERSION := 5.2 > -TPM2_TOOLS_MD5 := 0057615ef43b9322d4577fc3bde0e8d6 > +TPM2_TOOLS_VERSION := 5.3 > +TPM2_TOOLS_MD5 := a319d4623f184b80851780b4e425208f > TPM2_TOOLS := tpm2-tools-$(TPM2_TOOLS_VERSION) > TPM2_TOOLS_SUFFIX:= tar.gz > TPM2_TOOLS_URL := > https://github.com/tpm2-software/tpm2-tools/releases/download/$(TPM2_TOOLS_VERSION)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) > TPM2_TOOLS_SOURCE:= $(SRCDIR)/$(TPM2_TOOLS).$(TPM2_TOOLS_SUFFIX) > TPM2_TOOLS_DIR := $(BUILDDIR)/$(TPM2_TOOLS) > TPM2_TOOLS_LICENSE := BSD-3-Clause > -TPM2_TOOLS_LICENSE_FILES := > file://doc/LICENSE;md5=a846608d090aa64494c45fc147cc12e3 > +TPM2_TOOLS_LICENSE_FILES := > file://docs/LICENSE;md5=a846608d090aa64494c45fc147cc12e3 > > # > > # Prepare > @@ -42,6 +42,7 @@ TPM2_TOOLS_CONF_OPT := \ > --disable-code-coverage \ > --disable-unit \ > --enable-hardening \ > + --enable-fapi \ > --without-gcov \ > --with-bashcompdir=/ignore > > @@ -75,6 +76,7 @@ TPM2_TOOLS_TPM2_PROGS := \ > tpm2_ecdhkeygen \ > tpm2_ecdhzgen \ > tpm2_ecephemeral \ > + tpm2_encodeobject \ > tpm2_encryptdecrypt \ > tpm2_eventlog \ > tpm2_evictcontrol \ > @@ -154,6 +156,45 @@ TPM2_TOOLS_TPM2_PROGS := \ > tpm2_verifysignature \ > tpm2_zgen2phase > > +TPM2_TOOLS_TSS2_PROGS := \ > + tss2_authorizepolicy \ > + tss2_changeauth \ > + tss2_createkey \ > + tss2_createnv \ > + tss2_createseal \ > + tss2_decrypt \ > + tss2_delete \ > + tss2_encrypt \ > + tss2_exportkey \ > + tss2_exportpolicy \ > + tss2_getappdata \ > + tss2_getcertificate \ > + tss2_getdescription \ > + tss2_getinfo \ > + tss2_getplatformcertificates \ > + tss2_getrandom \ > + tss2_gettpm2object \ > + tss2_gettpmblobs \ > + tss2_import \ > + tss2_list \ > + tss2_nvextend \ > + tss2_nvincrement \ > + tss2_nvread \ > + tss2_nvsetbits \ > + tss2_nvwrite \ > + tss2_pcrextend \ > + tss2_pcrread \ > + tss2_provision \ > + tss2_quote \ > + tss2_setappdata \ > + tss2_setcertificate \ > + tss2_setdescription \ > + tss2_sign \ > + tss2_unseal \ > + tss2_verifyquote \ > + tss2_verifysignature \ > + tss2_writeauthorizenv > + > $(STATEDIR)/tpm2-tools.targetinstall: > @$(call targetinfo) > > @@ -164,10 +205,14 @@ $(STATEDIR)/tpm2-tools.targetinstall: > @$(call install_fixup, tpm2-tools,DESCRIPTION,missing) > > @$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tpm2) > + @$(call install_copy, tpm2-tools, 0, 0, 0755, -, /usr/bin/tss2) > > @$(foreach prog, $(TPM2_TOOLS_TPM2_PROGS), \ > @$(call install_link, tpm2-tools, tpm2, > /usr/bin/$(prog))$(ptx/nl)) > > + @$(foreach prog, $(TPM2_TOOLS_TSS2_PROGS), \ > + @$(call install_link, tpm2-tools, tss2, > /usr/bin/$(prog))$(ptx/nl)) > + > @$(call install_finish, tpm2-tools) > > @$(call touch)
Re: [ptxdist] [APPLIED] tpm2-tss: Enable fapi.
Thanks, applied as b52072eb2bfc495cbb39b6969f729e720029e195. Michael [sent from post-receive hook] On Fri, 28 Oct 2022 16:43:55 +0200, Christian Melki wrote: > * Explicitly enable fapi and install the library. > This is needed by tpm2-tools fapi dependent binaries. > > Signed-off-by: Christian Melki > Message-Id: <20221014210351.2257285-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make > index 7e0b4ff52609..310ec8014e9e 100644 > --- a/rules/tpm2-tss.make > +++ b/rules/tpm2-tss.make > @@ -43,6 +43,7 @@ TPM2_TSS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --enable-debug=info \ > --disable-unit \ > + --enable-fapi \ > --enable-tcti-device \ > --enable-tcti-mssim \ > --disable-tcti-fuzzing \ > @@ -87,6 +88,7 @@ $(STATEDIR)/tpm2-tss.targetinstall: > @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-esys) > @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-mu) > @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-sys) > + @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-fapi) > @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-device) > @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tcti-mssim) > @$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tctildr)
[ptxdist] Prepare Image for Raspberry Pi 4
Hi Michael, Thank you for your support. Earlier we were stuck in building toolchain and root filesystem for Raspberry Pi platform using PTXDist Tool, OSELAS Toolchain and DistroKit. We have been successfully able to prepare an image with the solutions provided by you. We tried prepared image over RPi 4, once we have powered up RPi 4 it is showing an error like "This board requires newer software". After some inspection we understood that the prepared image can support RPi 3. Now can you please give some path to prepare supported image for RPi 4 using PTXDist tool? >From where can we get an idea to modify an image for a new platform like RPi 4 >using PTXDist? Pranay Joshi Lead Engineer-Firmware Engineering Drilling Services Baker Hughes
[ptxdist] [ANNOUNCE] OSELAS.Toolchain() 2022.10.0 released
Hi, I'm happy to announce that I've just released OSELAS.Toolchain-2022.10.0. This is a major release with significant changes. All components of the primary toolchains have been updated to the latest versions. The highlights are: - binutils 2.39 - clang 15.0.2 - gcc 12.2 - gdb 12.1 - glibc 2.36 - kernel headers 6.0.5 There are some changes that are relevant for those that build the toolchains themself: The option PTXCONF_TOOLCHAIN_DEBUG is disabled in the configs and was broken in the last release. It is not needed in most cases. The default toolchains already contain debug symbols for all target libraries. Enabling this option just adds the sources files of glibc and gcc (for libstdc++ etc.) to the installed toolchain. If the toolchain is installed to /opt/OSELAS.Toolchain-2022.10.0/... then gdb will find the source files automatically. If the toolchain is installed with "ptxdist make install DESTDIR=..." then the host binaries are now stripped. The result is basically the same as creating a tarball with "ptxdist images" and the extracting it. Download the release here: https://public.pengutronix.de/oselas/toolchain/ Debian / Ubuntu Packages will be available at http://debian.pengutronix.de/ My current plan is to build packages for Debian bookworm/sid, bullseye, buster and Ubuntu 18.04, 20.04, 22.04. I may build toolchains for Debian stretch and Ubuntu 16.04 but that depends on how easy that is. Enjoy, Michael Olbrich -- 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- | signature.asc Description: PGP signature
