Re: [ptxdist] year 2038 Toolchain
On Fri, May 24, 2024 at 11:04:24AM +0200, Erwin Rol wrote: > On 5/24/24 10:41, Ian Abbott wrote: > > > > If I figure it out I'll let you guys know (so it can be added to the > > > official Toolchain) > > > > Rememember to define _FILE_OFFSET_BITS=64 too if it is not already > > defined. _TIME_BITS=64 is ineffective when _FILE_OFFSET_BITS=32 for > > Glibc policy reasons. > > I tried some things to convince the Toolchain project (latest gcc13 release) > to use those two defines, but without much luck. Sometimes parts complained > that there were duplicate declarations of (time) functions, with some other > tries it actually complained the the _FILE_OFFSET_BITS was missing for some > part, that I really don't understand because I added them always in pairs. > > So I believe it is just a bit too early for 100% year 2038 compliance at the > moment. Especially when it comes to C++/libstd++ there is also not much info > online. > > But the C part seems to work with the support ptxdist offers, and C++ has > always been some unwanted stepchild, especially now Rust is going to safe > the world :-) So gcc-14 has a --enable-year2038 configure option, but I didn't test if it works. But I don't know if that causes any API or ABI incompatibilities. The changelog says "Disable year2038 by default on 32-bit hosts.". That looks a bit suspicious to me. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH] rauc: optional rauc-mark-good.service installation
On Wed, May 22, 2024 at 04:25:54PM +0200, r.czerwin...@pengutronix.de wrote: > From: Rouven Czerwinski > > Make the installation and enablement of the ruac-mark-good.service > optional. This is useful for BSPs which have the application indicate if > startup was successful instead of indicating succesful startup using the > rauc-mark-good-service. > > Signed-off-by: Rouven Czerwinski > --- > rules/rauc.in | 10 ++ > rules/rauc.make | 2 ++ > 2 files changed, 12 insertions(+) > > diff --git a/rules/rauc.in b/rules/rauc.in > index ee9c3f955..c65e3f04f 100644 > --- a/rules/rauc.in > +++ b/rules/rauc.in > @@ -46,6 +46,16 @@ config RAUC_SERVICE > that communicate with each other via D-Bus interface. > Only deactivate this if you have a system that does not provide D-Bus! > > +config RAUC_MARK_GOOD > + bool depends on INITMETHOD_SYSTEMD Michael > + prompt "Enable systemd mark-good service" > + default y > + help > + Installs and enables the default rauc-mark-good.service shipped with > rauc. > + The rauc-mark-good.service runs when the systemd has successfully > started > + up, which is not desirable if the application indicates the succesful > + startup. > + > config RAUC_NETWORK > bool > prompt "Enable network support" > diff --git a/rules/rauc.make b/rules/rauc.make > index 38577f94d..7aed77e89 100644 > --- a/rules/rauc.make > +++ b/rules/rauc.make > @@ -95,10 +95,12 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD > @$(call install_alternative, rauc, 0, 0, 0644, \ > /usr/lib/systemd/system/rauc.service) > > +ifdef PTXCONF_RAUC_MARK_GOOD > @$(call install_alternative, rauc, 0, 0, 0644, \ > /usr/lib/systemd/system/rauc-mark-good.service) > @$(call install_link, rauc, ../rauc-mark-good.service, \ > > /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service) > +endif > else > @$(call install_copy, rauc, 0, 0, 0755, -, \ > /usr/libexec/rauc-service.sh) > -- > 2.44.0 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 13/13] python3-protobuf: new package
On Wed, May 22, 2024 at 11:15:43PM +0200, Roland Hieber wrote: > Signed-off-by: Roland Hieber > --- > rules/python3-protobuf.in | 9 ++ > rules/python3-protobuf.make | 55 + > 2 files changed, 64 insertions(+) > create mode 100644 rules/python3-protobuf.in > create mode 100644 rules/python3-protobuf.make > > diff --git a/rules/python3-protobuf.in b/rules/python3-protobuf.in > new file mode 100644 > index ..ba740bd67b86 > --- /dev/null > +++ b/rules/python3-protobuf.in > @@ -0,0 +1,9 @@ > +## SECTION=python3 > + > +config PYTHON3_PROTOBUF > + tristate > + select HOST_SYSTEM_PYTHON3_SETUPTOOLS Same here. Michael > + select PYTHON3 > + prompt "protobuf" > + help > + Protocol buffers library for Python 3 > diff --git a/rules/python3-protobuf.make b/rules/python3-protobuf.make > new file mode 100644 > index ..6b92295e8a4d > --- /dev/null > +++ b/rules/python3-protobuf.make > @@ -0,0 +1,55 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2024 by Roland Hieber > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PYTHON3_PROTOBUF) += python3-protobuf > + > +# > +# Paths and names > +# > +PYTHON3_PROTOBUF_VERSION := 5.26.1 > +PYTHON3_PROTOBUF_MD5 := 8360a781926b9dac954678a823835d23 > +PYTHON3_PROTOBUF := protobuf-$(PYTHON3_PROTOBUF_VERSION) > +PYTHON3_PROTOBUF_SUFFIX := tar.gz > +PYTHON3_PROTOBUF_URL := $(call ptx/mirror-pypi, protobuf, > $(PYTHON3_PROTOBUF).$(PYTHON3_PROTOBUF_SUFFIX)) > +PYTHON3_PROTOBUF_SOURCE := > $(SRCDIR)/$(PYTHON3_PROTOBUF).$(PYTHON3_PROTOBUF_SUFFIX) > +PYTHON3_PROTOBUF_DIR := $(BUILDDIR)/$(PYTHON3_PROTOBUF) > +PYTHON3_PROTOBUF_LICENSE := BSD-3-Clause AND custom-exception > +PYTHON3_PROTOBUF_LICENSE_FILES := \ > + > file://PKG-INFO;startline=7;endline=9;md5=b2e1494c98b3b7127af75dfb2edf369e \ > + file://LICENSE;md5=37b5762e07f0af8c74ce80a8bda4266b > + > +# > > +# Prepare > +# > > + > +PYTHON3_PROTOBUF_CONF_TOOL := python3 > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/python3-protobuf.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, python3-protobuf) > + @$(call install_fixup, python3-protobuf,PRIORITY,optional) > + @$(call install_fixup, python3-protobuf,SECTION,base) > + @$(call install_fixup, python3-protobuf,AUTHOR,"Roland Hieber > ") > + @$(call install_fixup, python3-protobuf,DESCRIPTION,missing) > + > + @$(call install_glob, python3-protobuf, 0, 0, -, \ > + $(PYTHON3_SITEPACKAGES),, *.py) > + > + @$(call install_finish, python3-protobuf) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.39.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 12/13] python3-periphery: new package
On Wed, May 22, 2024 at 11:15:42PM +0200, Roland Hieber wrote: > Signed-off-by: Roland Hieber > --- > rules/python3-periphery.in | 10 +++ > rules/python3-periphery.make | 55 > 2 files changed, 65 insertions(+) > create mode 100644 rules/python3-periphery.in > create mode 100644 rules/python3-periphery.make > > diff --git a/rules/python3-periphery.in b/rules/python3-periphery.in > new file mode 100644 > index ..41a626acebce > --- /dev/null > +++ b/rules/python3-periphery.in > @@ -0,0 +1,10 @@ > +## SECTION=python3 > + > +config PYTHON3_PERIPHERY > + tristate > + select HOST_SYSTEM_PYTHON3_SETUPTOOLS No. The PYTHON3 dependency already includes the correct setuptools. Michael > + select PYTHON3 > + prompt "periphery" > + help > + A pure Python library for peripheral I/O (GPIO, LED, PWM, SPI, I2C, > + MMIO, Serial) in Linux. > diff --git a/rules/python3-periphery.make b/rules/python3-periphery.make > new file mode 100644 > index ..9f0ace01feea > --- /dev/null > +++ b/rules/python3-periphery.make > @@ -0,0 +1,55 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2024 by Roland Hieber > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_PYTHON3_PERIPHERY) += python3-periphery > + > +# > +# Paths and names > +# > +PYTHON3_PERIPHERY_VERSION:= 2.4.1 > +PYTHON3_PERIPHERY_MD5:= 2b2a1037fb4ac15e7b0514ce3659d26c > +PYTHON3_PERIPHERY:= python-periphery-$(PYTHON3_PERIPHERY_VERSION) > +PYTHON3_PERIPHERY_SUFFIX := tar.gz > +PYTHON3_PERIPHERY_URL:= $(call ptx/mirror-pypi, > python-periphery, $(PYTHON3_PERIPHERY).$(PYTHON3_PERIPHERY_SUFFIX)) > +PYTHON3_PERIPHERY_SOURCE := > $(SRCDIR)/$(PYTHON3_PERIPHERY).$(PYTHON3_PERIPHERY_SUFFIX) > +PYTHON3_PERIPHERY_DIR:= $(BUILDDIR)/$(PYTHON3_PERIPHERY) > +PYTHON3_PERIPHERY_LICENSE:= MIT > +PYTHON3_PERIPHERY_LICENSE_FILES := \ > + > file://README.md;startline=202;endline=204;md5=bc9620815782faae308ef7bcf23bcecb > \ > + file://LICENSE;md5=30fe6f023a80fb33989fb3b9d773fea0 > + > +# > > +# Prepare > +# > > + > +PYTHON3_PERIPHERY_CONF_TOOL := python3 > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/python3-periphery.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, python3-periphery) > + @$(call install_fixup, python3-periphery,PRIORITY,optional) > + @$(call install_fixup, python3-periphery,SECTION,base) > + @$(call install_fixup, python3-periphery,AUTHOR,"Roland Hieber > ") > + @$(call install_fixup, python3-periphery,DESCRIPTION,missing) > + > + @$(call install_glob, python3-periphery, 0, 0, -, \ > + $(PYTHON3_SITEPACKAGES),, *.py) > + > + @$(call install_finish, python3-periphery) > + > + @$(call touch) > + > +# vim: syntax=make > -- > 2.39.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 02/13] nanopb: new package: tiny protobuf implementation
On Wed, May 22, 2024 at 11:15:32PM +0200, Roland Hieber wrote: > Signed-off-by: Roland Hieber > --- > rules/nanopb.in | 12 > rules/nanopb.make | 49 +++ > 2 files changed, 61 insertions(+) > create mode 100644 rules/nanopb.in > create mode 100644 rules/nanopb.make > > diff --git a/rules/nanopb.in b/rules/nanopb.in > new file mode 100644 > index ..ca3ac1b2c1d8 > --- /dev/null > +++ b/rules/nanopb.in > @@ -0,0 +1,12 @@ > +## SECTION=system_libraries > + > +config NANOPB > + tristate > + select HOST_CMAKE > + select HOST_SYSTEM_PYTHON3 > + select HOST_PROTOBUF > + prompt "nanopb" > + help > + Nanopb is a plain-C implementation of Google's Protocol Buffers data > + format. It is targeted at 32 bit microcontrollers, but is also fit for > + other embedded systems with tight memory constraints. > diff --git a/rules/nanopb.make b/rules/nanopb.make > new file mode 100644 > index ..808c26b917e5 > --- /dev/null > +++ b/rules/nanopb.make > @@ -0,0 +1,49 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2024 by Roland Hieber > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_NANOPB) += nanopb > + > +# > +# Paths and names > +# > +NANOPB_VERSION := 0.4.8 > +NANOPB_MD5 := 7c5305add7bf70b915c6eb1dc50cc20f > +NANOPB := nanopb-$(NANOPB_VERSION) > +NANOPB_SUFFIX:= tar.gz > +NANOPB_URL := > https://jpa.kapsi.fi/nanopb/download//$(NANOPB).$(NANOPB_SUFFIX) Remove double /. > +NANOPB_SOURCE:= $(SRCDIR)/$(NANOPB).$(NANOPB_SUFFIX) > +NANOPB_DIR := $(BUILDDIR)/$(NANOPB) > +NANOPB_LICENSE := Zlib > +NANOPB_LICENSE_FILES := > file://LICENSE.txt;md5=9db4b73a55a3994384112efcdb37c01f > + > +# > > +# Prepare > +# > > + > +NANOPB_CONF_ENV := $(CROSS_ENV) Remove, it's the default. > + > +# > +# cmake > +# > +NANOPB_CONF_TOOL := cmake > +NANOPB_CONF_OPT := \ > + $(CROSS_CMAKE_USR) > + > +# > > +# Target-Install > +# > > + > +# Note: the package installs only headers, generators, and static libraries > +$(STATEDIR)/nanopb.targetinstall: > + @$(call targetinfo) > + @$(call touch) The default targetinstall stage is empty, so just remove it here. Michael > + > +# vim: syntax=make > -- > 2.39.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 01/13] atk: rename to at-spi2-core; version bump 2.38.0 -> 2.52.0
On Wed, May 22, 2024 at 11:15:31PM +0200, Roland Hieber wrote:
> I cannot find any official announcement on this, but it seems that atk
> was merged into the at-spi2-core tree. At least the atk repository [1]
> has been archived, there have been no new releases since 2022, but there
> has been further development on the atk/ subdir in the at-spi2-core
> repository [2], to which the ATK docs [3] now link too.
>
> [1]: https://git.gnome.org/atk
> [2]: https://gitlab.gnome.org/GNOME/at-spi2-core/
> [3]: https://gnome.pages.gitlab.gnome.org/at-spi2-core/atk/
>
> Rename the atk recipe to at-spi2-core, and build libatk as part of it.
> The 'atk_only' meson option carries a big "(UNSUPPORTED)", so build
> everything and only install the two new libs if needed, since they are
> each about 1 MiB big even after stripping the debug symbols.
>
> Update the license info; COPYING was update from a LGPL-2.0 to a
> LGPL-2.1 license text, and atspi/atspi-gmain.c carries both
> LGPL-2.1-or-later as well as "Academic Free License version 2.1"
> license statements.
>
> Signed-off-by: Roland Hieber
> ---
> Note: use "git diff -M1" to show the diff between the renamed files
> ---
> rules/{atk.in => at-spi2-core.in} | 19 +--
> rules/at-spi2-core.make | 90 +++
> rules/atk.make| 67 ---
> rules/gtk.in | 2 +-
> scripts/migrate/migrate_ptx | 9
> 5 files changed, 114 insertions(+), 73 deletions(-)
> rename rules/{atk.in => at-spi2-core.in} (53%)
> create mode 100644 rules/at-spi2-core.make
> delete mode 100644 rules/atk.make
>
> diff --git a/rules/atk.in b/rules/at-spi2-core.in
> similarity index 53%
> rename from rules/atk.in
> rename to rules/at-spi2-core.in
> index 3ddd3c4fffe6..97669181d6e5 100644
> --- a/rules/atk.in
> +++ b/rules/at-spi2-core.in
> @@ -1,11 +1,13 @@
> ## SECTION=multimedia_gtk
>
> -config ATK
> +config AT_SPI2_CORE
> tristate
> - prompt "atk"
> + prompt "at-spi2-core"
> select HOST_MESON
> + select DBUS
> select GLIB
> - select GOBJECT_INTROSPECTIONif ATK_INTROSPECTION
> + select GOBJECT_INTROSPECTIONif AT_SPI2_CORE_INTROSPECTION
> + select LIBXML2 if BUILDTIME# only used for tests
> help
> ATK is a toolkit providing accessibility interfaces
> for applications or other toolkits. By implementing
> @@ -14,10 +16,17 @@ config ATK
> magnifiers, and other alternative input devices.
> ATK is part of the GNOME project.
>
> -if ATK
> +if AT_SPI2_CORE
>
> -config ATK_INTROSPECTION
> +config AT_SPI2_CORE_INTROSPECTION
> bool
> default GOBJECT_INTROSPECTION_HELPER
>
> +config AT_SPI2_CORE_LIBATK_BRIDGE
> + select AT_SPI2_CORE_LIBATSPI
> + bool "install libatk-bridge"
> +
> +config AT_SPI2_CORE_LIBATSPI
> + bool "install libatspi"
Do you have a use-case for this? I have yet to find an embedded use-case,
so I think we should just disable this unconditionally.
With that, you can set -Datk_only=true and make libxml only required if
atk_only is enabled, with a trivial patch. That way you can remove the
extra dependency.
Michael
> +
> endif
> diff --git a/rules/at-spi2-core.make b/rules/at-spi2-core.make
> new file mode 100644
> index ..05d92fa486d8
> --- /dev/null
> +++ b/rules/at-spi2-core.make
> @@ -0,0 +1,90 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2003-2006 Robert Schwebel
> +# Pengutronix , Germany
> +# 2009 by Marc Kleine-Budde
> +# 2024 Roland Hieber, Pengutronix
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_AT_SPI2_CORE) += at-spi2-core
> +
> +#
> +# Paths and names
> +#
> +AT_SPI2_CORE_VERSION := 2.52.0
> +AT_SPI2_CORE_MD5 := e6591545b2bf204fe9a58f777bd0b78a
> +AT_SPI2_CORE := at-spi2-core-$(AT_SPI2_CORE_VERSION)
> +AT_SPI2_CORE_SUFFIX := tar.xz
> +AT_SPI2_CORE_URL := $(call ptx/mirror, GNOME, at-spi2-core/$(basename
> $(AT_SPI2_CORE_VERSION))/$(AT_SPI2_CORE).$(AT_SPI2_CORE_SUFFIX))
> +AT_SPI2_CORE_SOURCE := $(SRCDIR)/$(AT_SPI2_CORE).$(AT_SPI2_CORE_SUFFIX)
> +AT_SPI2_CORE_DIR := $(BUILDDIR)/$(AT_SPI2_CORE)
> +AT_SPI2_CORE_LICENSE := LGPL-2.0-or-later AND LGPL-2.1-or-later AND AFL-2.1
> +AT_SPI2_CORE_LICENSE_FILES := \
> +
> file://atk/atkaction.c;startline=1;endline=18;md5=6fd31cd2fdc9b30f619ca8d819bc12d3
> \
> +
> file://atspi/atspi-gmain.c;startline=4;endline=21;md5=5a40bca956865414952184669ef3985c
> \
> + file://COPYING;md5=4fbd65380cdd255951079008b364516c
> +
> +#
>
> +# Prepare
> +#
>
> +
> +#
> +# meson
> +#
> +AT_SPI2_CORE_CONF_TOOL :=
Re: [ptxdist] [APPLIED] volk: version bump 1.3.280.0 -> 1.3.283.0
Thanks, applied as 33406db22f2c58333f7c43d223b4852586037145. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:56 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125739.2652725-4-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/volk.make b/rules/volk.make > index 92e2a9f1d4ad..6c3ea71af6f2 100644 > --- a/rules/volk.make > +++ b/rules/volk.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VOLK) += volk > # > # Paths and names > # > -VOLK_VERSION := 1.3.280.0 > -VOLK_MD5 := 2154f24cd28be1adcf48ac34cb0daa59 > +VOLK_VERSION := 1.3.283.0 > +VOLK_MD5 := 41574b56a258bc6b8654879e5c363d5c > VOLK := volk-$(VOLK_VERSION) > VOLK_SUFFIX := tar.gz > VOLK_URL := > https://github.com/zeux/volk/archive/refs/tags/vulkan-sdk-$(VOLK_VERSION).$(VOLK_SUFFIX)
Re: [ptxdist] [APPLIED] proftpd: move to staging
Thanks, applied as 0bb1d3a12745f2522a9bc4fcba09d82760bc66d4. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:21 +0200, Lucas Stach wrote: > The package has had its last real version bump in 2015, so there > are probably quite a few security issues with it and nobody seems > to care. > > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-20-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/proftpd.in b/rules/proftpd.in > index 9740ab655696..145c80e80e93 100644 > --- a/rules/proftpd.in > +++ b/rules/proftpd.in > @@ -1,4 +1,6 @@ > -## SECTION=networking > +## SECTION=staging > +## old section: > +### SECTION=networking > menuconfig PROFTPD > tristate > prompt "proftpd " > @@ -23,6 +25,9 @@ menuconfig PROFTPD > multiple password files and upload/download ratios are also > supported. > > + STAGING: remove in PTXdist 2025.06.0 > + Package is unmaintained in PTXdist. > + > if PROFTPD > > config PROFTPD_PAM
Re: [ptxdist] [APPLIED] nvmetcli: version bump 0.7 -> 0.8
Thanks, applied as 849506ab98a2b81f35aec6f28b360ba093b9b035. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:20 +0200, Lucas Stach wrote: > Bump to latest tagged release. Switch to git URL, as there is no > alternative location to FTP available. > > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-19-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/nvmetcli.make b/rules/nvmetcli.make > index b9e30a673e98..6d8169fb1673 100644 > --- a/rules/nvmetcli.make > +++ b/rules/nvmetcli.make > @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_NVMETCLI) += nvmetcli > # > # Paths and names > # > -NVMETCLI_VERSION := 0.7 > -NVMETCLI_MD5 := eed70ef32d327c814345178dd35d088b > +NVMETCLI_VERSION := 0.8 > +NVMETCLI_MD5 := acc0b236485f1a08ce9a70113abe55cc > NVMETCLI := nvmetcli-$(NVMETCLI_VERSION) > NVMETCLI_SUFFIX := tar.gz > -NVMETCLI_URL := > ftp://ftp.infradead.org/pub/nvmetcli/$(NVMETCLI).$(NVMETCLI_SUFFIX) > +NVMETCLI_URL := > git://git.infradead.org/users/hch/nvmetcli.git;tag=v$(NVMETCLI_VERSION) > NVMETCLI_SOURCE := $(SRCDIR)/$(NVMETCLI).$(NVMETCLI_SUFFIX) > NVMETCLI_DIR := $(BUILDDIR)/$(NVMETCLI) > NVMETCLI_LICENSE := Apache-2.0
Re: [ptxdist] [APPLIED] npth: remove FTP URL
Thanks, applied as d974f6bf603743ca20b93fd1470d697a35121de8. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:19 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-18-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/npth.make b/rules/npth.make > index 48b7501a5587..3d657c0a7e1b 100644 > --- a/rules/npth.make > +++ b/rules/npth.make > @@ -18,9 +18,7 @@ NPTH_VERSION:= 1.6 > NPTH_MD5 := 375d1a15ad969f32d25f1a7630929854 > NPTH := npth-$(NPTH_VERSION) > NPTH_SUFFIX := tar.bz2 > -NPTH_URL := \ > - https://www.gnupg.org/ftp/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX) \ > - ftp://ftp.gnupg.org/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX) > +NPTH_URL := > https://www.gnupg.org/ftp/gcrypt/npth/$(NPTH).$(NPTH_SUFFIX) > NPTH_SOURCE := $(SRCDIR)/$(NPTH).$(NPTH_SUFFIX) > NPTH_DIR := $(BUILDDIR)/$(NPTH) > NPTH_LICENSE := LGPL-2.1-only
Re: [ptxdist] [APPLIED] netkit-ftp: remove FTP URL
Thanks, applied as 53e528857cac6030381dc8d7bbf997c0f427ac27. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:18 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-17-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/netkit-ftp.make b/rules/netkit-ftp.make > index a6470ffc3311..a8e5126d5054 100644 > --- a/rules/netkit-ftp.make > +++ b/rules/netkit-ftp.make > @@ -19,9 +19,7 @@ NETKIT_FTP_VERSION := 0.17 > NETKIT_FTP_MD5 := 94441610c9b86ef45c4c6ec609444060 > NETKIT_FTP := netkit-ftp-$(NETKIT_FTP_VERSION) > NETKIT_FTP_SUFFIX:= tar.gz > -NETKIT_FTP_URL := \ > - > ftp://ftp.uk.linux.org/pub/linux/Networking/netkit/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX) > \ > - > http://www.ibiblio.org/pub/Linux/system/network/netkit/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX) > +NETKIT_FTP_URL := > http://www.ibiblio.org/pub/Linux/system/network/netkit/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX) > NETKIT_FTP_SOURCE:= $(SRCDIR)/$(NETKIT_FTP).$(NETKIT_FTP_SUFFIX) > NETKIT_FTP_DIR := $(BUILDDIR)/$(NETKIT_FTP) > NETKIT_FTP_LICENSE := BSD
Re: [ptxdist] [APPLIED] mesa-demos: replace download URL with HTTPS
Thanks, applied as c5282c392930ed8b2640c590134661e2ccde59a6. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:17 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-16-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mesa-demos.make b/rules/mesa-demos.make > index 2b7180a979ef..42337a3a011b 100644 > --- a/rules/mesa-demos.make > +++ b/rules/mesa-demos.make > @@ -18,7 +18,7 @@ MESA_DEMOS_VERSION := 8.3.0 > MESA_DEMOS_MD5 := 628e75c23c17394f11a316c36f8e4164 > MESA_DEMOS := mesa-demos-$(MESA_DEMOS_VERSION) > MESA_DEMOS_SUFFIX:= tar.bz2 > -MESA_DEMOS_URL := > ftp://ftp.freedesktop.org/pub/mesa/demos/$(MESA_DEMOS_VERSION)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX) > +MESA_DEMOS_URL := > https://mesa.freedesktop.org/archive/demos/$(MESA_DEMOS_VERSION)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX) > MESA_DEMOS_SOURCE:= $(SRCDIR)/$(MESA_DEMOS).$(MESA_DEMOS_SUFFIX) > MESA_DEMOS_DIR := $(BUILDDIR)/$(MESA_DEMOS) > MESA_DEMOS_LICENSE := unknown
Re: [ptxdist] [APPLIED] libksba: remove FTP URL
Thanks, applied as 600f24b4dd50670e3d64d307e0a2d6bb27a0bae1. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:16 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-15-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libksba.make b/rules/libksba.make > index 853fe90abc07..4aae3745b021 100644 > --- a/rules/libksba.make > +++ b/rules/libksba.make > @@ -18,9 +18,7 @@ LIBKSBA_VERSION := 1.6.5 > LIBKSBA_MD5 := 57b88e5d24c8705d9a3ba3832140d188 > LIBKSBA := libksba-$(LIBKSBA_VERSION) > LIBKSBA_SUFFIX := tar.bz2 > -LIBKSBA_URL := \ > - https://www.gnupg.org/ftp/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) \ > - ftp://ftp.gnupg.org/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) > +LIBKSBA_URL := > https://www.gnupg.org/ftp/gcrypt/libksba/$(LIBKSBA).$(LIBKSBA_SUFFIX) > LIBKSBA_SOURCE := $(SRCDIR)/$(LIBKSBA).$(LIBKSBA_SUFFIX) > LIBKSBA_DIR := $(BUILDDIR)/$(LIBKSBA) > LIBKSBA_LICENSE := GPL-2.0-only AND GPL-3.0-only AND LGPL-3.0-only
Re: [ptxdist] [APPLIED] libgpg-error: remove FTP URL
Thanks, applied as 24e3ff61328fd30cb750def2adda89f26e079d1b. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:15 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-14-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libgpg-error.make b/rules/libgpg-error.make > index 32f1390d1774..8e8097999e9a 100644 > --- a/rules/libgpg-error.make > +++ b/rules/libgpg-error.make > @@ -21,8 +21,7 @@ LIBGPG_ERROR:= > libgpg-error-$(LIBGPG_ERROR_VERSION) > LIBGPG_ERROR_SUFFIX := tar.bz2 > LIBGPG_ERROR_URL := \ > > http://artfiles.org/gnupg.org/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) > \ > - > https://www.gnupg.org/ftp/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) > \ > - > ftp://ftp.gnupg.org/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) > + > https://www.gnupg.org/ftp/gcrypt/libgpg-error/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) > LIBGPG_ERROR_SOURCE := $(SRCDIR)/$(LIBGPG_ERROR).$(LIBGPG_ERROR_SUFFIX) > LIBGPG_ERROR_DIR := $(BUILDDIR)/$(LIBGPG_ERROR) > LIBGPG_ERROR_LICENSE := GPL-2.0-only AND LGPL-2.0-only
Re: [ptxdist] [APPLIED] libffi: remove FTP URL
Thanks, applied as e90fb377c0099e07e615eedee1d54dfdec19dbde. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:14 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-13-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libffi.make b/rules/libffi.make > index df6ca0a5c9d6..4ccc437d5e99 100644 > --- a/rules/libffi.make > +++ b/rules/libffi.make > @@ -21,9 +21,7 @@ LIBFFI := libffi-$(LIBFFI_VERSION) > LIBFFI_SUFFIX:= tar.gz > LIBFFI_SOURCE:= $(SRCDIR)/$(LIBFFI).$(LIBFFI_SUFFIX) > LIBFFI_DIR := $(BUILDDIR)/$(LIBFFI) > -LIBFFI_URL := \ > - > https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION)/$(LIBFFI).$(LIBFFI_SUFFIX) > \ > - ftp://sourceware.org/pub/libffi/$(LIBFFI).$(LIBFFI_SUFFIX) > +LIBFFI_URL := > https://github.com/libffi/libffi/releases/download/v$(LIBFFI_VERSION)/$(LIBFFI).$(LIBFFI_SUFFIX) > LIBFFI_LICENSE := MIT > LIBFFI_LICENSE_FILES := \ > file://LICENSE;md5=1db54c9fd307a12218766c3c7f650ca7
Re: [ptxdist] [APPLIED] gnupg: remove FTP URL
Thanks, applied as 77c19b9887ef3580e3ed34bdd10e67cc7c5d9484. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:13 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-12-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/gnupg.make b/rules/gnupg.make > index 1a90f472f9bf..5fbb6543cb9d 100644 > --- a/rules/gnupg.make > +++ b/rules/gnupg.make > @@ -19,9 +19,7 @@ GNUPG_VERSION := 2.4.3 > GNUPG_MD5:= e21ab42c629af80f19f813eeb61aa939 > GNUPG:= gnupg-$(GNUPG_VERSION) > GNUPG_SUFFIX := tar.bz2 > -GNUPG_URL:= \ > - https://www.gnupg.org/ftp/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) \ > - ftp://ftp.gnupg.org/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) > +GNUPG_URL:= > https://www.gnupg.org/ftp/gcrypt/gnupg/$(GNUPG).$(GNUPG_SUFFIX) > GNUPG_SOURCE := $(SRCDIR)/$(GNUPG).$(GNUPG_SUFFIX) > GNUPG_DIR:= $(BUILDDIR)/$(GNUPG) > GNUPG_LICENSE:= GPL-2.0-or-later AND GPL-3.0-or-later AND > LGPL-2.1-or-later AND LGPL-3.0-or-later AND MIT AND Spencer-86 AND > BSD-2-Clause-Views AND Unicode-DFS-2016
Re: [ptxdist] [APPLIED] glu: replace download URL with HTTPS
Thanks, applied as f3bc12d3784bbc00da0584f9563d9887ef333c67. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:12 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-11-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/glu.make b/rules/glu.make > index 6eab71036597..1b36cf1feb70 100644 > --- a/rules/glu.make > +++ b/rules/glu.make > @@ -18,7 +18,7 @@ GLU_VERSION := 9.0.2 > GLU_MD5 := 2b0f13fa5b949bfb3a995927c6e35125 > GLU := glu-$(GLU_VERSION) > GLU_SUFFIX := tar.xz > -GLU_URL := > ftp://ftp.freedesktop.org/pub/mesa/glu/$(GLU).$(GLU_SUFFIX) > +GLU_URL := > https://mesa.freedesktop.org/archive/glu/$(GLU).$(GLU_SUFFIX) > GLU_SOURCE := $(SRCDIR)/$(GLU).$(GLU_SUFFIX) > GLU_DIR := $(BUILDDIR)/$(GLU) > GLU_LICENSE := SGI-B-2.0 AND SGI-B-1.1
Re: [ptxdist] [APPLIED] figlet: replace URL with HTTPS
Thanks, applied as 6e138365d117723938385c41f6ccc3d282b22937. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:11 +0200, Lucas Stach wrote: > As the figlet page only provides FTP downloads, point the download > URL to the github repository of the maintainer, which is also linked > from the homepage. > > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-8-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/figlet.make b/rules/figlet.make > index 3dad77154430..c6d2fb38ea06 100644 > --- a/rules/figlet.make > +++ b/rules/figlet.make > @@ -20,7 +20,7 @@ FIGLET_VERSION := 2.2.5 > FIGLET_MD5 := d88cb33a14f1469fff975d021ae2858e > FIGLET := figlet-$(FIGLET_VERSION) > FIGLET_SUFFIX:= tar.gz > -FIGLET_URL := > ftp://ftp.figlet.org/pub/figlet/program/unix/$(FIGLET).$(FIGLET_SUFFIX) > +FIGLET_URL := > https://github.com/cmatsuoka/figlet/archive/refs/tags/$(FIGLET_VERSION).$(FIGLET_SUFFIX) > FIGLET_SOURCE:= $(SRCDIR)/$(FIGLET).$(FIGLET_SUFFIX) > FIGLET_DIR := $(BUILDDIR)/$(FIGLET) > FIGLET_LICENSE := BSD-3-clause
Re: [ptxdist] [APPLIED] fftw: remove FTP URL
Thanks, applied as 13dee8507d3da001ebc1195aa95d8ada99590f18. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:10 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-7-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/fftw.make b/rules/fftw.make > index 8c1a8fff93d0..7fd9c49a70f2 100644 > --- a/rules/fftw.make > +++ b/rules/fftw.make > @@ -21,9 +21,7 @@ FFTW:= fftw-$(FFTW_VERSION) > FFTW_SUFFIX := tar.gz > FFTW_SOURCE := $(SRCDIR)/$(FFTW).$(FFTW_SUFFIX) > FFTW_DIR := $(BUILDDIR)/$(FFTW) > -FFTW_URL := \ > - http://www.fftw.org/$(FFTW).$(FFTW_SUFFIX) \ > - ftp://ftp.fftw.org/pub/fftw/old/$(FFTW).$(FFTW_SUFFIX) > +FFTW_URL := http://www.fftw.org/$(FFTW).$(FFTW_SUFFIX) > FFTW_LICENSE := GPL-2.0-or-later > FFTW_LICENSE_FILES := \ > file://COPYRIGHT;md5=f19d163a5d9bc582a8ba578f591eab80 \
Re: [ptxdist] [APPLIED] alsa-utils: remove FTP URL
Thanks, applied as af4f835db47fb1857a78d01bef831f72b4d8e22c. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:08 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-3-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/alsa-utils.make b/rules/alsa-utils.make > index c5d06853ba1b..0ff6f11c2980 100644 > --- a/rules/alsa-utils.make > +++ b/rules/alsa-utils.make > @@ -19,9 +19,7 @@ ALSA_UTILS_VERSION := 1.2.11 > ALSA_UTILS_MD5 := 36676025301315789306e99e39154732 > ALSA_UTILS := alsa-utils-$(ALSA_UTILS_VERSION) > ALSA_UTILS_SUFFIX:= tar.bz2 > -ALSA_UTILS_URL := \ > - > https://www.alsa-project.org/files/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) > \ > - ftp://ftp.alsa-project.org/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) > +ALSA_UTILS_URL := > https://www.alsa-project.org/files/pub/utils/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) > ALSA_UTILS_SOURCE:= $(SRCDIR)/$(ALSA_UTILS).$(ALSA_UTILS_SUFFIX) > ALSA_UTILS_DIR := $(BUILDDIR)/$(ALSA_UTILS) > ALSA_UTILS_LICENSE := GPL-2.0-or-later
Re: [ptxdist] [APPLIED] dialog: remove FTP URL
Thanks, applied as 7f4a0d6b49191f4e5d5a77de6902e12c2182f090. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:09 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-5-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/dialog.make b/rules/dialog.make > index cc8980fc8a7d..6ab97bde0073 100644 > --- a/rules/dialog.make > +++ b/rules/dialog.make > @@ -18,9 +18,7 @@ DIALOG_VERSION := 1.3-20171209 > DIALOG_MD5 := f66f28beca900b54f5fc90fdcce93508 > DIALOG := dialog-$(DIALOG_VERSION) > DIALOG_SUFFIX:= tgz > -DIALOG_URL := \ > - ftp://ftp.invisible-island.net/dialog/$(DIALOG).$(DIALOG_SUFFIX) \ > - https://invisible-mirror.net/archives/dialog/$(DIALOG).$(DIALOG_SUFFIX) > +DIALOG_URL := > https://invisible-mirror.net/archives/dialog/$(DIALOG).$(DIALOG_SUFFIX) > DIALOG_SOURCE:= $(SRCDIR)/$(DIALOG).$(DIALOG_SUFFIX) > DIALOG_DIR := $(BUILDDIR)/$(DIALOG) > DIALOG_LICENSE := LGPL-2.1-only
Re: [ptxdist] [APPLIED] ckermit: replace download URL with HTTP
Thanks, applied as cd8e04787286578ca94a25796108c81a6ea8c9df. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:09 +0200, Lucas Stach wrote: > The site hosting ckermit has retired the FTP server and does not > yet provide HTTPS, so fall back to a HTTP URL. > > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-4-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/ckermit.make b/rules/ckermit.make > index ecf1df5a7988..b9bd3dbd2b9f 100644 > --- a/rules/ckermit.make > +++ b/rules/ckermit.make > @@ -20,7 +20,7 @@ CKERMIT_VERSION := 302 > CKERMIT_MD5 := eac4dbf18b45775e4cdee5a7c74762b0 > CKERMIT := cku$(CKERMIT_VERSION) > CKERMIT_SUFFIX := tar.gz > -CKERMIT_URL := > ftp://ftp.kermitproject.org/kermit/archives/$(CKERMIT).$(CKERMIT_SUFFIX) > +CKERMIT_URL := > http://www.columbia.edu/kermit/ftp/archives/$(CKERMIT).$(CKERMIT_SUFFIX) > CKERMIT_SOURCE := $(SRCDIR)/$(CKERMIT).$(CKERMIT_SUFFIX) > CKERMIT_DIR := $(BUILDDIR)/$(CKERMIT) > CKERMIT_STRIP_LEVEL := 0
Re: [ptxdist] [APPLIED] alsa-lib: remove FTP URL
Thanks, applied as 9b72223de67b3d8b574d2c21aace655c0b666436. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:07 +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > Message-Id: <20240514203552.1297323-2-l.st...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/alsa-lib.make b/rules/alsa-lib.make > index ffc75b3ae9d1..fc9b4c51787e 100644 > --- a/rules/alsa-lib.make > +++ b/rules/alsa-lib.make > @@ -19,9 +19,7 @@ ALSA_LIB_VERSION:= 1.2.11 > ALSA_LIB_MD5 := 1c5870770047b6a520d18a43f49e42ea > ALSA_LIB := alsa-lib-$(ALSA_LIB_VERSION) > ALSA_LIB_SUFFIX := tar.bz2 > -ALSA_LIB_URL := \ > - > https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) \ > - ftp://ftp.alsa-project.org/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) > +ALSA_LIB_URL := > https://www.alsa-project.org/files/pub/lib/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) > ALSA_LIB_SOURCE := $(SRCDIR)/$(ALSA_LIB).$(ALSA_LIB_SUFFIX) > ALSA_LIB_DIR := $(BUILDDIR)/$(ALSA_LIB) > ALSA_LIB_LICENSE := LGPL-2.1-or-later
Re: [ptxdist] [APPLIED] wayland-protocols: Version bump. 1.35 -> 1.36
Thanks, applied as f94a08c9f1539312a1325b2297df2cb442e4f136. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:06 +0200, Christian Melki wrote: > Minor bugfix. > https://lists.freedesktop.org/archives/wayland-devel/2024-April/043572.html > > Signed-off-by: Christian Melki > Message-Id: <20240517180349.4086637-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make > index 066e9b00071b..8dad5d220c4c 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.35 > -WAYLAND_PROTOCOLS_MD5:= cd0f2a1ab6e54568e4f856f140dedca9 > +WAYLAND_PROTOCOLS_VERSION:= 1.36 > +WAYLAND_PROTOCOLS_MD5:= d733380202a75ca837744e65b4dbadc5 > 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] exfatprogs: new package
Thanks, applied as 0aeccb563fb949b6c3abce38a9d4c3dfa7ec2744. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:05 +0200, Ian Abbott wrote: > Signed-off-by: Ian Abbott > Message-Id: <20240517162608.437086-1-abbo...@mev.co.uk> > Signed-off-by: Michael Olbrich > > diff --git a/rules/exfatprogs.in b/rules/exfatprogs.in > new file mode 100644 > index ..07658ff35e8e > --- /dev/null > +++ b/rules/exfatprogs.in > @@ -0,0 +1,57 @@ > +## SECTION=disk_and_file > + > +menuconfig EXFATPROGS > + tristate > + prompt "exfatprogs" > + help > + exFAT (Extensible File Allocation Table) is a filesystem > + introduced by Microsoft in 2006 commonly used on USB flash > + drives and SDXC cards. It was proprietary until 2019 when > + Microsoft published the exFAT specification and released the > + patent to the Open Invention Network. > + > + The exfatprogs package provides the filesystem utilities for > + use with the exFAT filesystem. > + > +if EXFATPROGS > + > +config EXFATPROGS_DUMP_EXFAT > + bool > + prompt "dump.exfat" > + help > + Show on-disk information of an exFAT filesystem. > + > +config EXFATPROGS_EXFAT2IMG > + bool > + prompt "exfat2img" > + help > + Dump metadata of an exFAT filesystem. > + > +config EXFATPROGS_EXFATLABEL > + bool > + prompt "exfatlabel" > + help > + Get or set volume label or volume serial of an exFAT > + filesystem. > + > +config EXFATPROGS_FSCK_EXFAT > + bool > + prompt "fsck.exfat" > + help > + Check an exFAT filesystem. > + > +config EXFATPROGS_MKFS_EXFAT > + bool > + prompt "mkfs.exfat" > + help > + Create an exFAT filesystem. > + > +config EXFATPROGS_TUNE_EXFAT > + bool > + prompt "tune.exfat" > + help > + Adjust tunable filesystem parameters on an exFAT filesystem. > + > +endif > + > +# vim: ft=kconfig noet tw=72 ts=8 sw=8 > diff --git a/rules/exfatprogs.make b/rules/exfatprogs.make > new file mode 100644 > index ..789aa9f06dfe > --- /dev/null > +++ b/rules/exfatprogs.make > @@ -0,0 +1,76 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2024 by Ian Abbott > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_EXFATPROGS) += exfatprogs > + > +# > +# Paths and names > +# > +EXFATPROGS_VERSION := 1.2.2 > +EXFATPROGS_MD5 := cbe2a6529b4972fc2cc260553f28f983 > +EXFATPROGS := exfatprogs-$(EXFATPROGS_VERSION) > +EXFATPROGS_SUFFIX:= tar.xz > +EXFATPROGS_URL := > https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION)/$(EXFATPROGS).$(EXFATPROGS_SUFFIX) > +EXFATPROGS_SOURCE:= $(SRCDIR)/$(EXFATPROGS).$(EXFATPROGS_SUFFIX) > +EXFATPROGS_DIR := $(BUILDDIR)/$(EXFATPROGS) > +EXFATPROGS_LICENSE := GPL-2.0 > +EXFATPROGS_LICENSE_FILES := > file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 > + > +# > > +# Prepare > +# > > + > +EXFATPROGS_CONF_ENV := $(CROSS_ENV) > + > +# > +# autoconf > +# > +EXFATPROGS_CONF_TOOL := autoconf > +EXFATPROGS_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/exfatprogs.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, exfatprogs) > + @$(call install_fixup, exfatprogs,PRIORITY,optional) > + @$(call install_fixup, exfatprogs,SECTION,base) > + @$(call install_fixup, exfatprogs,AUTHOR,"Ian Abbott > ") > + @$(call install_fixup, exfatprogs,DESCRIPTION,missing) > + > +ifdef PTXCONF_EXFATPROGS_DUMP_EXFAT > + @$(call install_copy, exfatprogs, 0, 0, 0755, -, /usr/sbin/dump.exfat) > +endif > +ifdef PTXCONF_EXFATPROGS_EXFAT2IMG > + @$(call install_copy, exfatprogs, 0, 0, 0755, -, /usr/sbin/exfat2img) > +endif > +ifdef PTXCONF_EXFATPROGS_EXFATLABEL > + @$(call install_copy, exfatprogs, 0, 0, 0755, -, /usr/sbin/exfatlabel) > +endif > +ifdef PTXCONF_EXFATPROGS_FSCK_EXFAT > + @$(call install_copy, exfatprogs, 0, 0, 0755, -, /usr/sbin/fsck.exfat) > +endif > +ifdef PTXCONF_EXFATPROGS_MKFS_EXFAT > + @$(call install_copy, exfatprogs, 0, 0, 0755, -, /usr/sbin/mkfs.exfat) > +endif > +ifdef PTXCONF_EXFATPROGS_TUNE_EXFAT > + @$(call install_copy, exfatprogs, 0, 0, 0755, -, /usr/sbin/tune.exfat) > +endif > + > + @$(call install_finish, exfatprogs) > + > + @$(call touch) > + > +# vim: syntax=make
Re: [ptxdist] [APPLIED] linux-firmware: Version bump. 20240410 -> 20240513
Thanks, applied as 489e9591c51ba067df3580dd6019f85638902ba6. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:04 +0200, Christian Melki wrote: > Usual updates. > https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20240513 > > * AMDGPU license changed copyright year. > > Signed-off-by: Christian Melki > Message-Id: <20240516185329.997310-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make > index f12901f024f5..ac1a3967f7ed 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 := 20240410 > -LINUX_FIRMWARE_MD5 := 62c5622044539ca0a431a19d7c57bc02 > +LINUX_FIRMWARE_VERSION := 20240513 > +LINUX_FIRMWARE_MD5 := 3c54e7d6d2d39e68870875b93aeb654c > 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)) > @@ -67,7 +67,7 @@ LINUX_FIRMWARE_LICENSE_FILES := \ > > file://LICENCE.ralink_a_mediatek_company_firmware;md5=728f1a85fd53fd67fa8d7afb080bc435 > \ > file://LICENCE.ti-keystone;md5=3a86335d32864b0bef996bee26cc0f2c \ > file://LICENSE.amd-sev;md5=e750538791a8be0b7249c579edefb035 \ > - file://LICENSE.amdgpu;md5=a2589a05ea5b6bd2b7f4f623c7e7a649 \ > + file://LICENSE.amdgpu;md5=1433dfea38c97a2e563a248a863dcb94 \ > file://LICENSE.nxp;md5=cca321ca1524d6a1e4fed87486cd82dc \ > file://LICENSE.airoha;md5=fa3dedb960e2673aea51aa509f7b537d \ > file://LICENCE.agere;md5=af0133de6b4a9b2522defd5f188afd31 \
Re: [ptxdist] [APPLIED] strace: Version bump. 6.8 -> 6.9
Thanks, applied as f12cc7234710e5e30cbc64d232b22992782cbcbe. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:03 +0200, Christian Melki wrote: > Minor changes. > https://github.com/strace/strace/releases/tag/v6.9 > > Signed-off-by: Christian Melki > Message-Id: <20240516184346.981568-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/strace.make b/rules/strace.make > index 697b1495aadb..bc39aca88956 100644 > --- a/rules/strace.make > +++ b/rules/strace.make > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace > # > # Paths and names > # > -STRACE_VERSION := 6.8 > -STRACE_MD5 := 1c7aca3fad1f309fdb54031866fad6d9 > +STRACE_VERSION := 6.9 > +STRACE_MD5 := 395900d4de0b6b8c4707045a9782134c > STRACE := strace-$(STRACE_VERSION) > STRACE_SUFFIX:= tar.xz > STRACE_URL := > https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX)
Re: [ptxdist] [APPLIED] qt-everywhere-opensource-src: Removed whitespace error from patch
Thanks, applied as d63b6290753c43958ff1094fb2f8956a7990b4d1. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:02 +0200, Sven Püschel wrote: > fixed 'warning: 1 line adds whitespace errors.' when running > 'ptxdist extract --git qt5' > > Signed-off-by: Sven Püschel > Message-Id: <20240515151438.23189-1-s.puesc...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch > b/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch > index f4462608f641..9d5b9fdf3524 100644 > --- > a/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch > +++ > b/patches/qt-everywhere-opensource-src-5.15.12/0001-CVE-2023-4863-5.15.patch > @@ -424,7 +424,7 @@ index 2b46f5bec641..d72147658721 100644 > +#include > + > + #include > -+ > ++ >#ifdef HAVE_CONFIG_H > - #include "src/webp/config.h" > - #endif
Re: [ptxdist] [APPLIED] shaderc: version bump v2024.0 -> v2024.1
Thanks, applied as 3ffcfe6b5d2297c3de0d01a69644caaa655bb5bb. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:01 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125805.2653250-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/shaderc.make b/rules/shaderc.make > index aedc79f308f2..7e816ee46352 100644 > --- a/rules/shaderc.make > +++ b/rules/shaderc.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc > # > # Paths and names > # > -SHADERC_VERSION := v2024.0 > -SHADERC_MD5 := c29fbe8f3c10fc0097e04327e1f64a73 > +SHADERC_VERSION := v2024.1 > +SHADERC_MD5 := 3d445aeffa0ad59f62b87124454f85f6 > SHADERC := shaderc-$(SHADERC_VERSION) > SHADERC_SUFFIX := tar.gz > SHADERC_URL := \
Re: [ptxdist] [APPLIED] vulkan-validationlayers: version bump 1.3.280.0 -> 1.3.283.0
Thanks, applied as 3ce7e9c081fa21a0d1a45a23acbb22c11db62c52. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:00 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125739.2652725-9-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-validationlayers.make > b/rules/vulkan-validationlayers.make > index 6bfca4e359ce..e88a77710eb3 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.280.0 > -VULKAN_VALIDATIONLAYERS_MD5 := 04805a2454d6e6facc9ca6651d04dbbf > +VULKAN_VALIDATIONLAYERS_VERSION := 1.3.283.0 > +VULKAN_VALIDATIONLAYERS_MD5 := 28c871c2e13cc7b7e4ea7d2685c3a075 > VULKAN_VALIDATIONLAYERS := > vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION) > VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz > VULKAN_VALIDATIONLAYERS_URL := > https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/vulkan-sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX) > @@ -32,6 +32,7 @@ VULKAN_VALIDATIONLAYERS_CONF_TOOL := cmake > VULKAN_VALIDATIONLAYERS_CONF_OPT := \ > $(CROSS_CMAKE_USR) \ > -DCMAKE_BUILD_TYPE=Release \ > + -DBUILD_SELF_VVL=OFF \ > -DBUILD_TESTS=OFF \ > -DBUILD_WERROR=OFF \ > -DBUILD_WSI_WAYLAND_SUPPORT=$(call ptx/onoff, > PTXCONF_VULKAN_VALIDATIONLAYERS_WAYLAND) \
Re: [ptxdist] [APPLIED] vulkan-utility-libraries: version bump 1.3.280.0 -> 1.3.283.0
Thanks, applied as 47a23c8eeca4ce405d8a0b3dea58c136286f17ef. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:59:00 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125739.2652725-8-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-utility-libraries.make > b/rules/vulkan-utility-libraries.make > index 6ef2d3fe724c..9d0468c81455 100644 > --- a/rules/vulkan-utility-libraries.make > +++ b/rules/vulkan-utility-libraries.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_UTILITY_LIBRARIES) += > vulkan-utility-libraries > # > # Paths and names > # > -VULKAN_UTILITY_LIBRARIES_VERSION := 1.3.280.0 > -VULKAN_UTILITY_LIBRARIES_MD5 := c611d59dcabce5d0ee11f5f6521666aa > +VULKAN_UTILITY_LIBRARIES_VERSION := 1.3.283.0 > +VULKAN_UTILITY_LIBRARIES_MD5 := 76d884af52443fb91df589b8e43c51e5 > VULKAN_UTILITY_LIBRARIES := > vulkan-utility-libraries-$(VULKAN_UTILITY_LIBRARIES_VERSION) > VULKAN_UTILITY_LIBRARIES_SUFFIX := tar.gz > VULKAN_UTILITY_LIBRARIES_URL := > https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/vulkan-sdk-$(VULKAN_UTILITY_LIBRARIES_VERSION).$(VULKAN_UTILITY_LIBRARIES_SUFFIX) > @@ -34,6 +34,7 @@ VULKAN_UTILITY_LIBRARIES_CONF_OPT := \ > -DCMAKE_BUILD_TYPE=Release \ > -DBUILD_TESTS=OFF \ > -DUPDATE_DEPS=OFF \ > + -DVUL_MOCK_ANDROID=OFF \ > -DVUL_WERROR=OFF > > # vim: syntax=make
Re: [ptxdist] [APPLIED] vulkan-tools: version bump 1.3.280.0 -> 1.3.283.0
Thanks, applied as 3a5556ce341f39af822ac6d2f0c7540aeb0dc171. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:59 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125739.2652725-7-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make > index 8b7c9624538c..78fdb0c5d57b 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.280.0 > -VULKAN_TOOLS_MD5 := f68e21f73b893d882e5f97959f489757 > +VULKAN_TOOLS_VERSION := 1.3.283.0 > +VULKAN_TOOLS_MD5 := 2cb87f3f848335b7e2a76326ffdcce00 > VULKAN_TOOLS := vulkan-tools-$(VULKAN_TOOLS_VERSION) > VULKAN_TOOLS_SUFFIX := tar.gz > VULKAN_TOOLS_URL := > https://github.com/KhronosGroup/Vulkan-Tools/archive/vulkan-sdk-$(VULKAN_TOOLS_VERSION).$(VULKAN_TOOLS_SUFFIX)
Re: [ptxdist] [APPLIED] vulkan-loader: version bump 1.3.280.0 -> 1.3.283.0
Thanks, applied as de0c5bdbf1373ffe18ff9f5b65e1180aa8d0b240. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:58 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125739.2652725-6-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make > index 40a89591ebe4..161bdca98b2b 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.280.0 > -VULKAN_LOADER_MD5:= 282d32eab31abf5aa14ec59be8e8ae19 > +VULKAN_LOADER_VERSION:= 1.3.283.0 > +VULKAN_LOADER_MD5:= 80b9bfeba8132c76f897b3de300eaa70 > VULKAN_LOADER:= vulkan-loader-$(VULKAN_LOADER_VERSION) > VULKAN_LOADER_SUFFIX := tar.gz > VULKAN_LOADER_URL:= > https://github.com/KhronosGroup/Vulkan-Loader/archive/vulkan-sdk-$(VULKAN_LOADER_VERSION).$(VULKAN_LOADER_SUFFIX) > @@ -48,6 +48,7 @@ VULKAN_LOADER_CONF_OPT := \ > -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 \ > + -DCODE_COVERAGE=OFF \ > -DFALLBACK_CONFIG_DIRS=/etc/xdg \ > -DFALLBACK_DATA_DIRS=/usr/local/share:/usr/share \ > -DLOADER_CODEGEN=OFF \
Re: [ptxdist] [APPLIED] vulkan-headers: version bump 1.3.280.0 -> 1.3.283.0
Thanks, applied as 82ce1f2d5c92db7ac277b274263ef142cc5cb34b. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:57 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125739.2652725-5-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make > index 73d4969d1358..2e66b091f68e 100644 > --- a/rules/vulkan-headers.make > +++ b/rules/vulkan-headers.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_VULKAN_HEADERS) += vulkan-headers > # Paths and names > # > > -VULKAN_HEADERS_VERSION := 1.3.280.0 > -VULKAN_HEADERS_MD5 := 6a5ff0b86c072300fac88cfdd3996c75 > +VULKAN_HEADERS_VERSION := 1.3.283.0 > +VULKAN_HEADERS_MD5 := 5d9916540db7cb0ca59d0146f0c638a1 > VULKAN_HEADERS := vulkan-headers-$(VULKAN_HEADERS_VERSION) > VULKAN_HEADERS_SUFFIX:= tar.gz > VULKAN_HEADERS_URL := > https://github.com/KhronosGroup/Vulkan-Headers/archive/vulkan-sdk-$(VULKAN_HEADERS_VERSION).$(VULKAN_HEADERS_SUFFIX)
Re: [ptxdist] [APPLIED] spirv-tools: version bump 1.3.280.0 -> 1.3.283.0
Thanks, applied as b5b67420e538eecedaef823b6675d873b339adee. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:55 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125739.2652725-3-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make > index 9df598a84e75..c80d2fdf1646 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.280.0 > -SPIRV_TOOLS_MD5 := d55af678b61667313d478db9399c09d4 > +SPIRV_TOOLS_VERSION := 1.3.283.0 > +SPIRV_TOOLS_MD5 := c2dc7b5d6e9083974bc4659205a43931 > SPIRV_TOOLS := spirv-tools-$(SPIRV_TOOLS_VERSION) > SPIRV_TOOLS_SUFFIX := tar.gz > SPIRV_TOOLS_URL := > https://github.com/KhronosGroup/SPIRV-Tools/archive/vulkan-sdk-$(SPIRV_TOOLS_VERSION).$(SPIRV_TOOLS_SUFFIX)
Re: [ptxdist] [APPLIED] pipewire: version bump 1.0.1 -> 1.0.3
Thanks, applied as 556073a6752c96582526f0730b751ee2d02a8f80. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:53 +0200, Michael Riesch wrote: > https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.0.3 > > Signed-off-by: Michael Riesch > Reviewed-by: Michael Tretter > Message-Id: > <20240515-feature-libcamera-0-2-0-v2-2-47555e12e...@wolfvision.net> > Signed-off-by: Michael Olbrich > > diff --git a/rules/pipewire.make b/rules/pipewire.make > index 8747ebe6cecc..322ae70a1c67 100644 > --- a/rules/pipewire.make > +++ b/rules/pipewire.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire > # > # Paths and names > # > -PIPEWIRE_VERSION := 1.0.1 > -PIPEWIRE_MD5 := d70bde8000d62df6c03c6dd928ab8948 > +PIPEWIRE_VERSION := 1.0.3 > +PIPEWIRE_MD5 := 92eb16fb925aa9dc9191d8ef7b04687d > PIPEWIRE := pipewire-$(PIPEWIRE_VERSION) > PIPEWIRE_SUFFIX := tar.bz2 > PIPEWIRE_URL := > https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)
Re: [ptxdist] [APPLIED] libcamera: version bump 0.0.5 -> 0.2.0
Thanks, applied as 412cade673d7f5e14a3061f87b61c43549924887. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:51 +0200, Michael Riesch wrote: > Due to an API breakage in libcamera it may be necessary to update the > consumers of the library. One example is pipewire, which needs to be > updated to at least 1.0.2. > > Signed-off-by: Michael Riesch > Reviewed-by: Michael Tretter > Message-Id: > <20240515-feature-libcamera-0-2-0-v2-1-47555e12e...@wolfvision.net> > [mol: fix raspberrypi options, plugin names] > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcamera.make b/rules/libcamera.make > index 928a95654d56..625be5ab6f9c 100644 > --- a/rules/libcamera.make > +++ b/rules/libcamera.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera > # > # Paths and names > # > -LIBCAMERA_VERSION:= 0.0.5 > -LIBCAMERA_MD5:= cc2f5c0c051319a7e853dc6916807ce5 > +LIBCAMERA_VERSION:= 0.2.0 > +LIBCAMERA_MD5:= 08f0681221c654838e54e6b3a32f89b5 > LIBCAMERA:= libcamera-$(LIBCAMERA_VERSION) > LIBCAMERA_SUFFIX := tar.gz > LIBCAMERA_URL:= > https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$(LIBCAMERA_VERSION)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX) > @@ -44,8 +44,8 @@ LIBCAMERA_LICENSE_FILES := > file://LICENSES/Apache-2.0.txt;md5=3b83ef96387f14655f > > LIBCAMERA_IPAS-y := > LIBCAMERA_IPAS-$(PTXCONF_LIBCAMERA_IPA_IPU3) += ipu3 > -LIBCAMERA_IPASC-$(PTXCONF_LIBCAMERA_IPA_RASPBERRYPI) += raspberrypi > -LIBCAMERA_IPASM-$(PTXCONF_LIBCAMERA_IPA_RASPBERRYPI) += rpi > +LIBCAMERA_IPASC-$(PTXCONF_LIBCAMERA_IPA_RASPBERRYPI) += rpi/vc4 > +LIBCAMERA_IPASM-$(PTXCONF_LIBCAMERA_IPA_RASPBERRYPI) += rpi_vc4 > LIBCAMERA_IPAS-$(PTXCONF_LIBCAMERA_IPA_RKISP1) += rkisp1 > LIBCAMERA_IPAS-$(PTXCONF_LIBCAMERA_IPA_VIMC) += vimc > > @@ -54,7 +54,7 @@ LIBCAMERA_IPASM-y += $(LIBCAMERA_IPAS-y) > > LIBCAMERA_PIPELINES-y:= > LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINE_IPU3) += ipu3 > -LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINE_RASPBERRYPI)+= > raspberrypi > +LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINE_RASPBERRYPI)+= > rpi/vc4 > LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINE_RKISP1) += rkisp1 > LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINE_SIMPLE) += simple > LIBCAMERA_PIPELINES-$(PTXCONF_LIBCAMERA_PIPELINE_UVCVIDEO) += uvcvideo > @@ -79,6 +79,7 @@ LIBCAMERA_CONF_OPT := \ > -Dqcam=$(call ptx/endis,PTXCONF_LIBCAMERA_QCAM)d \ > -Dtest=false \ > -Dtracing=disabled \ > + -Dudev=enabled \ > -Dv4l2=false \ > -Dpycamera=disabled >
Re: [ptxdist] [APPLIED] spirv-headers: version bump 1.3.280.0 -> 1.3.283.0
Thanks, applied as a25e825063b8c6ff0f95212a88a0401146da73f3. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:54 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125739.2652725-2-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make > index aab2edd4029a..6d547d274929 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.280.0 > -SPIRV_HEADERS_MD5:= 438892138fe25c123cdacd05eb4a4b17 > +SPIRV_HEADERS_VERSION:= 1.3.283.0 > +SPIRV_HEADERS_MD5:= 5f258f65b4526c053d9ca3cddc94e71b > SPIRV_HEADERS:= spirv-headers-$(SPIRV_HEADERS_VERSION) > SPIRV_HEADERS_SUFFIX := tar.gz > SPIRV_HEADERS_URL:= > https://github.com/KhronosGroup/SPIRV-Headers/archive/vulkan-sdk-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
Re: [ptxdist] [APPLIED] kernel/perf: Make use of libtraceevent
Thanks, applied as 5022500e42936a12a97c63d45e9712c69fa58141. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:50 +0200, Uwe Kleine-König wrote: > This makes it possible to use with tracepoints and enable the > subcommands kmem, kwork, lock, sched and timechart. > > Signed-off-by: Uwe Kleine-König > Message-Id: <20240515072254.12082-6-u.kleine-koe...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/kernel.in b/rules/kernel.in > index 8174815775c0..862d52598556 100644 > --- a/rules/kernel.in > +++ b/rules/kernel.in > @@ -6,6 +6,7 @@ menuconfig KERNEL > select LIBELF_LIBDW if KERNEL_TOOL_PERF > select SLANGif KERNEL_TOOL_PERF > select BINUTILS if KERNEL_TOOL_PERF > + select LIBTRACEEVENTif KERNEL_TOOL_PERF > select LIBUNWINDif KERNEL_TOOL_PERF > > if KERNEL > diff --git a/rules/kernel.make b/rules/kernel.make > index d82aa27fb78e..0fe4f1e1b12a 100644 > --- a/rules/kernel.make > +++ b/rules/kernel.make > @@ -223,7 +223,6 @@ KERNEL_TOOL_PERF_OPTS := \ > NO_LIBBIONIC=1 \ > NO_LIBCRYPTO=1 \ > NO_LIBDW_DWARF_UNWIND= \ > - NO_LIBTRACEEVENT=1 \ > NO_PERF_READ_VDSO32=1 \ > NO_PERF_READ_VDSOX32=1 \ > NO_ZLIB= \
Re: [ptxdist] [APPLIED] libtraceevent: new package
Thanks, applied as 84741db5d065b58f307ecea288ef8cc76503f30f.
Michael
[sent from post-receive hook]
On Tue, 21 May 2024 11:58:49 +0200, Uwe Kleine-König
wrote:
> This is required for perf (PTXCONF_KERNEL_TOOL_PERF) to work with
> tracepoints and enable the subcommands kmem, kwork, lock, sched and
> timechart.
>
> Signed-off-by: Uwe Kleine-König
> Message-Id: <20240515072254.12082-5-u.kleine-koe...@pengutronix.de>
> Signed-off-by: Michael Olbrich
>
> diff --git a/rules/libtraceevent.in b/rules/libtraceevent.in
> new file mode 100644
> index ..a3b7b97379f3
> --- /dev/null
> +++ b/rules/libtraceevent.in
> @@ -0,0 +1,8 @@
> +## SECTION=system_libraries
> +
> +config LIBTRACEEVENT
> + bool
> + prompt "libtraceevent"
> + select HOST_MESON
> + help
> + FIXME
> diff --git a/rules/libtraceevent.make b/rules/libtraceevent.make
> new file mode 100644
> index ..7acc9c9652c4
> --- /dev/null
> +++ b/rules/libtraceevent.make
> @@ -0,0 +1,70 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2024 by Uwe Kleine-Koenig
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBTRACEEVENT) += libtraceevent
> +
> +#
> +# Paths and names
> +#
> +LIBTRACEEVENT_VERSION:= 1.8.2
> +LIBTRACEEVENT_MD5:= 671645965e835ef4236b96851fb889c9
> +LIBTRACEEVENT:= libtraceevent-$(LIBTRACEEVENT_VERSION)
> +LIBTRACEEVENT_SUFFIX := tar.xz
> +LIBTRACEEVENT_URL:=
> https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;tag=libtraceevent-$(LIBTRACEEVENT_VERSION)
> +LIBTRACEEVENT_SOURCE := $(SRCDIR)/$(LIBTRACEEVENT).$(LIBTRACEEVENT_SUFFIX)
> +LIBTRACEEVENT_DIR:= $(BUILDDIR)/$(LIBTRACEEVENT)
> +LIBTRACEEVENT_LICENSE:= LGPL-2.1 + GPL-2.0
> +
> +#
>
> +# Prepare
> +#
>
> +
> +#LIBTRACEEVENT_CONF_ENV := $(CROSS_ENV)
> +
> +#
> +# meson
> +#
> +LIBTRACEEVENT_CONF_TOOL := meson
> +
> +# There are some more configuration variables that don't have any effect
> given
> +# -Ddoc=false.
> +# Currently these are: docbook-suppress-sp, docbook-xls-172, htmldir,
> man-bold-literal
> +#
> +# The variable plugindir defaults to '' which is then interpreted as
> +# join_paths(libdir, 'traceevent/plugins')
> +LIBTRACEEVENT_CONF_OPT := \
> + $(CROSS_MESON_USR) \
> + -Ddoc=false \
> +
> +#
>
> +# Target-Install
> +#
>
> +
> +$(STATEDIR)/libtraceevent.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, libtraceevent)
> + @$(call install_fixup, libtraceevent, PRIORITY, optional)
> + @$(call install_fixup, libtraceevent, SECTION, base)
> + @$(call install_fixup, libtraceevent, AUTHOR, "Uwe Kleine-König
> ")
> + @$(call install_fixup, libtraceevent, DESCRIPTION, missing)
> +
> + @$(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent)
> +
> + @for plugin in cfg80211 function futex hrtimer jbd2 kmem kvm mac80211
> sched_switch scsi tlb xen; do \
> + $(call install_lib, libtraceevent, 0, 0, 0644,
> libtraceevent/plugins/plugin_$${plugin}); \
> + done
> +
> + @$(call install_finish, libtraceevent)
> +
> + @$(call touch)
> +
> +# vim: syntax=make
Re: [ptxdist] [APPLIED] glslang: version bump 1.3.280.0 -> 1.3.283.0
Thanks, applied as 211fef74144243ffbd2fcbc1b1bd888c0046f46c. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:53 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240515125739.2652725-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/glslang.make b/rules/glslang.make > index 21df9b9dcf23..0999df3e9de8 100644 > --- a/rules/glslang.make > +++ b/rules/glslang.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang > # > # Paths and names > # > -GLSLANG_VERSION := 1.3.280.0 > -GLSLANG_MD5 := e6105068a700cdeb6d498bb982dcc570 > +GLSLANG_VERSION := 1.3.283.0 > +GLSLANG_MD5 := 3fdeb75b8439f1d1008679dd9dae782c > GLSLANG := glslang-$(GLSLANG_VERSION) > GLSLANG_SUFFIX := tar.gz > GLSLANG_URL := > https://github.com/KhronosGroup/glslang/archive/vulkan-sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
Re: [ptxdist] [APPLIED] tpm2-tss: Version bump. 4.1.0 -> 4.1.1
Thanks, applied as d83a6a971549a05f099f54cb23876b623223d96e. Michael [sent from post-receive hook] On Tue, 21 May 2024 11:58:48 +0200, Christian Melki wrote: > Minor fix to broken release tarballs. > https://github.com/tpm2-software/tpm2-tss/releases/tag/4.1.1 > > Signed-off-by: Christian Melki > Message-Id: <20240512104528.1296964-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make > index cf37742c4232..783dd07f494c 100644 > --- a/rules/tpm2-tss.make > +++ b/rules/tpm2-tss.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss > # > # Paths and names > # > -TPM2_TSS_VERSION := 4.1.0 > -TPM2_TSS_MD5 := 97e91ce0c77d361409502badb1023e80 > +TPM2_TSS_VERSION := 4.1.1 > +TPM2_TSS_MD5 := d50302e29150823254b9f1594add6dcd > TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION) > TPM2_TSS_SUFFIX := tar.gz > TPM2_TSS_URL := > https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
Re: [ptxdist] [PATCH] exfatprogs: new package
On Fri, May 17, 2024 at 01:51:38PM +0100, Ian Abbott wrote: > Signed-off-by: Ian Abbott > --- > rules/exfatprogs.in | 57 > rules/exfatprogs.make | 76 +++ > 2 files changed, 133 insertions(+) > create mode 100644 rules/exfatprogs.in > create mode 100644 rules/exfatprogs.make > > diff --git a/rules/exfatprogs.in b/rules/exfatprogs.in > new file mode 100644 > index 0..07658ff35 > --- /dev/null > +++ b/rules/exfatprogs.in > @@ -0,0 +1,57 @@ > +## SECTION=disk_and_file > + > +menuconfig EXFATPROGS > + tristate > + prompt "exfatprogs" > + help > + exFAT (Extensible File Allocation Table) is a filesystem > + introduced by Microsoft in 2006 commonly used on USB flash > + drives and SDXC cards. It was proprietary until 2019 when > + Microsoft published the exFAT specification and released the > + patent to the Open Invention Network. > + > + The exfatprogs package provides the filesystem utilities for > + use with the exFAT filesystem. > + > +if EXFATPROGS > + > +config EXFATPROGS_DUMP_EXFAT > + bool > + prompt "dump.exfat" > + help > + Show on-disk information of an exFAT filesystem. > + > +config EXFATPROGS_EXFAT2IMG > + bool > + prompt "exfat2img" > + help > + Dump metadata of an exFAT filesystem. > + > +config EXFATPROGS_EXFATLABEL > + bool > + prompt "exfatlabel" > + help > + Get or set volume label or volume serial of an exFAT > + filesystem. > + > +config EXFATPROGS_FSCK_EXFAT > + bool > + prompt "fsck.exfat" > + help > + Check an exFAT filesystem. > + > +config EXFATPROGS_MKFS_EXFAT > + bool > + prompt "mkfs.exfat" > + help > + Create an exFAT filesystem. > + > +config EXFATPROGS_TUNE_EXFAT > + bool > + prompt "tune.exfat" > + help > + Adjust tunable filesystem parameters on an exFAT filesystem. > + > +endif > + > +# vim: ft=kconfig noet tw=72 ts=8 sw=8 > diff --git a/rules/exfatprogs.make b/rules/exfatprogs.make > new file mode 100644 > index 0..ff0b3209e > --- /dev/null > +++ b/rules/exfatprogs.make > @@ -0,0 +1,76 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2024 by Ian Abbott > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_EXFATPROGS) += exfatprogs > + > +# > +# Paths and names > +# > +EXFATPROGS_VERSION := 1.2.2 > +EXFATPROGS_MD5 := cbe2a6529b4972fc2cc260553f28f983 > +EXFATPROGS := exfatprogs-$(EXFATPROGS_VERSION) > +EXFATPROGS_SUFFIX:= tar.xz > +EXFATPROGS_URL := > https://github.com/exfatprogs/exfatprogs/releases/download/$(EXFATPROGS_VERSION)/$(EXFATPROGS).$(EXFATPROGS_SUFFIX) > +EXFATPROGS_SOURCE:= $(SRCDIR)/$(EXFATPROGS).$(EXFATPROGS_SUFFIX) > +EXFATPROGS_DIR := $(BUILDDIR)/$(EXFATPROGS) > +EXFATPROGS_LICENSE := GPL-2.0 > +EXFATPROGS_LICENSE_FILES := > file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 > + > +# > > +# Prepare > +# > > + > +EXFATPROGS_CONF_ENV := $(CROSS_ENV) > + > +# > +# autoconf > +# > +EXFATPROGS_CONF_TOOL := autoconf > +EXFATPROGS_CONF_OPT := \ > + $(CROSS_AUTOCONF_USR) > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/exfatprogs.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, exfatprogs) > + @$(call install_fixup, exfatprogs,PRIORITY,optional) > + @$(call install_fixup, exfatprogs,SECTION,base) > + @$(call install_fixup, exfatprogs,AUTHOR,"Ian Abbott > ") > + @$(call install_fixup, exfatprogs,DESCRIPTION,missing) > + > +ifdef PTXCONF_EXFATPROGS_DUMP_EXFAT > + @$(call install_copy, exfatprogs, 0, 0, 0755, > $(EXFATPROGS_DIR)/dump/dump.exfat, /usr/sbin/dump.exfat) @$(call install_copy, exfatprogs, 0, 0, 0755, -, /usr/sbin/dump.exfat) The install stage install the file to $(EXFATPROGS_PKGDIR)/usr/sbin/dump.exfat and it will be used automatically with the '-' as used above. Same for all the others below. Michael > +endif > +ifdef PTXCONF_EXFATPROGS_EXFAT2IMG > + @$(call install_copy, exfatprogs, 0, 0, 0755, > $(EXFATPROGS_DIR)/exfat2img/exfat2img, /usr/sbin/exfat2img) > +endif > +ifdef PTXCONF_EXFATPROGS_EXFATLABEL > + @$(call install_copy, exfatprogs, 0, 0, 0755, > $(EXFATPROGS_DIR)/label/exfatlabel, /usr/sbin/exfatlabel) > +endif > +ifdef PTXCONF_EXFATPROGS_FSCK_EXFAT > + @$(call install_copy, exfatprogs, 0, 0, 0755, >
Re: [ptxdist] [PATCH 20/20] ptxd_make_get: remove FTP support
On Tue, May 14, 2024 at 10:35:52PM +0200, Lucas Stach wrote:
> wget2 as an (almost) drop-in replacement to wget doesn't support the
> FTP(S) protocol. Instead of trying to fix FTP downloads via other
> tools simply remove the support, as it's not really needed anymore
> due to available alternatives.
>
> Signed-off-by: Lucas Stach
> ---
> scripts/lib/ptxd_make_get.sh | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/scripts/lib/ptxd_make_get.sh b/scripts/lib/ptxd_make_get.sh
> index c06257ee6ebb..615809125932 100644
> --- a/scripts/lib/ptxd_make_get.sh
> +++ b/scripts/lib/ptxd_make_get.sh
> @@ -75,7 +75,6 @@ ptxd_make_get_http() {
> echo "Checking URL '${url}'..."
> temp_header="$(mktemp "${PTXDIST_TEMPDIR}/urlcheck.XX")" ||
> ptxd_bailout "failed to create tempfile"
> curl \
> - --ftp-pasv \
> --connect-timeout 30 \
> --retry 5 \
> --user-agent "PTXdist ${PTXDIST_VERSION_FULL}" \
> @@ -101,7 +100,6 @@ ptxd_make_get_http() {
> progress=bar:force
> fi
> wget \
> - --passive-ftp \
> --progress="${progress}" \
> --timeout=30 \
> --tries=5 \
> @@ -526,7 +524,7 @@ ptxd_make_get() {
> ptxd_make_get_download_permitted &&
> ptxd_make_get_svn && return
> ;;
> - http://*|https://*|ftp://*)
> + http://*|https://*)
I think we can drop the options above. Passive FTP is the default anyways
for both curl and wget nowadays. But keep the pattern here for now. I think
we should have a "ptxdist lint" check instead.
Michael
> ptxd_make_get_download_permitted &&
> ptxd_make_get_http && return
> ;;
> --
> 2.39.2
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 09/20] gdbserver: remove FTP URL
On Tue, May 14, 2024 at 10:35:41PM +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > --- > rules/gdbserver.make | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/rules/gdbserver.make b/rules/gdbserver.make > index 2ff2f15395c4..7937158a9851 100644 > --- a/rules/gdbserver.make > +++ b/rules/gdbserver.make > @@ -27,9 +27,7 @@ GDBSERVER_LICENSE_FILES := \ > file://COPYING.LIB;md5=9f604d8a4f8e74f4f5140845a21b6674 \ > file://COPYING3.LIB;md5=6a6a8e020838b23406c81b19c1d46df6 > > -GDBSERVER_URL := \ > - $(call ptx/mirror, GNU, gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX)) \ > - > ftp://sourceware.org/pub/gdb/snapshots/current/$(GDBSERVER).$(GDBSERVER_SUFFIX) Same as gdb. Michael > +GDBSERVER_URL := $(call ptx/mirror, GNU, > gdb/$(GDBSERVER).$(GDBSERVER_SUFFIX)) > > # > > # Prepare > -- > 2.39.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 08/20] gdb: remove FTP URL
On Tue, May 14, 2024 at 10:35:40PM +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > --- > rules/gdb.make | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/rules/gdb.make b/rules/gdb.make > index c1337427b605..085e1f66fc98 100644 > --- a/rules/gdb.make > +++ b/rules/gdb.make > @@ -24,9 +24,7 @@ GDB_SOURCE := $(SRCDIR)/$(GDB).$(GDB_SUFFIX) > GDB_DIR := $(BUILDDIR)/$(GDB) > GDB_LICENSE := GPL-3.0-or-later > > -GDB_URL := \ > - $(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX)) \ > - ftp://sourceware.org/pub/gdb/snapshots/current/$(GDB).$(GDB_SUFFIX) This URL is for pre-release snapshots. Please turn it into a https URL instead. Michael > +GDB_URL := $(call ptx/mirror, GNU, gdb/$(GDB).$(GDB_SUFFIX)) > > # > > # Prepare > -- > 2.39.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 05/20] efax: replace download URL with HTTPS
On Tue, May 14, 2024 at 10:35:37PM +0200, Lucas Stach wrote: > Signed-off-by: Lucas Stach > --- > rules/efax.in | 6 ++ > rules/efax.make | 2 +- > 2 files changed, 7 insertions(+), 1 deletion(-) > > diff --git a/rules/efax.in b/rules/efax.in > index ff45094a762e..55379a249aee 100644 > --- a/rules/efax.in > +++ b/rules/efax.in > @@ -1,3 +1,5 @@ > +## SECTION=staging > +## old section: That deserves a comment in the commit message. > ## SECTION=communication You need to add an extra '#' here, otherwise the package is in both sections. Michael > config EFAX > tristate > @@ -16,3 +18,7 @@ config EFAX > files as faxes and receive, print or preview > received faxes. > > + STAGING: remove in PTXdist 2025.06.0 > + Unmaintained in PTXdist. Old upstream and URL are > + dead. "New" development release from 2008 can be found > + here: https://www.cce.com/efax > diff --git a/rules/efax.make b/rules/efax.make > index 80d0abddb07d..ebd2ea65a73e 100644 > --- a/rules/efax.make > +++ b/rules/efax.make > @@ -19,7 +19,7 @@ EFAX_VERSION:= 0.9 > EFAX_MD5 := 23bd3767f87c455c58ccae7f88bce725 > EFAX := efax-$(EFAX_VERSION) > EFAX_SUFFIX := tar.gz > -EFAX_URL := > ftp://ftp.metalab.unc.edu/pub/Linux/apps/serialcomm/fax/$(EFAX).$(EFAX_SUFFIX) > +EFAX_URL := > https://www.ibiblio.org/pub/Linux/apps/serialcomm/fax/$(EFAX).$(EFAX_SUFFIX) > EFAX_SOURCE := $(SRCDIR)/$(EFAX).$(EFAX_SUFFIX) > EFAX_DIR := $(BUILDDIR)/$(EFAX) > EFAX_LICENSE := unknown > -- > 2.39.2 > > > -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 2/3] libcamera: version bump 0.0.5 -> 0.2.0
On Tue, May 14, 2024 at 04:34:25PM +0200, Michael Riesch wrote:
> Hi Michael,
>
> Sorry for the long silence...
>
> On 3/5/24 19:35, Michael Tretter wrote:
> > On Tue, 05 Mar 2024 11:51:35 +0100, Michael Riesch wrote:
> >> Due to an API breakage in libcamera it may be necessary to update the
> >> consumers of the library. One example is pipewire, which needs to be
> >> updated to at least 1.0.2.
> >>
> >> Signed-off-by: Michael Riesch
> >> ---
> >> rules/libcamera.make | 4 ++--
> >> 1 file changed, 2 insertions(+), 2 deletions(-)
> >>
> >> diff --git a/rules/libcamera.make b/rules/libcamera.make
> >> index 928a95654..c9c4e2055 100644
> >> --- a/rules/libcamera.make
> >> +++ b/rules/libcamera.make
> >> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera
> >> #
> >> # Paths and names
> >> #
> >> -LIBCAMERA_VERSION := 0.0.5
> >> -LIBCAMERA_MD5 := cc2f5c0c051319a7e853dc6916807ce5
> >> +LIBCAMERA_VERSION := 0.2.0
> >> +LIBCAMERA_MD5 := 08f0681221c654838e54e6b3a32f89b5
> >
> > There is a new feature flag for udev support, which should be set
> > explicitly.
>
> Hm. Why? Do you want to disable udev support explicitly?
>
> libcamera commit d314d3b9 ("libcamera: Add option to configure udev
> support") introduces the meson option but sets its default to "auto". If
> libudev is found (and it should be found, as LIBCAMERA selects
> UDEV_LIBUDEV) the new feature "Hotplug support" is enabled. As stated in
> the commit message of d314d3b9, the behavior is not changed by this commit.
>
> If one would like to disable udev support explicitly, we would need to
> introduce a ptxdist option, pass it to meson, and make the dependency on
> UDEV_LIBUDEV conditional. But personally I don't see any value in that.
'set explicitly' as in 'enable it explicitly'. This way, the build will
fail if udev is not detected correctly for some reason.
Michael
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 1/2] libwebsockets: new package
On Fri, May 10, 2024 at 09:58:47AM +0100, Ian Abbott wrote: > Includes the C library from the Libwebsockets (LWS) project, with > options for adding TLS (SSL) support, and options the adding various > event loop libraries that are dynamically loaded as plug-ins. > > Signed-off-by: Ian Abbott > --- > rules/libwebsockets.in | 56 ++ > rules/libwebsockets.make | 85 > 2 files changed, 141 insertions(+) > create mode 100644 rules/libwebsockets.in > create mode 100644 rules/libwebsockets.make > > diff --git a/rules/libwebsockets.in b/rules/libwebsockets.in > new file mode 100644 > index 0..e10413604 > --- /dev/null > +++ b/rules/libwebsockets.in > @@ -0,0 +1,56 @@ > +## SECTION=networking > + > +menuconfig LIBWEBSOCKETS > + tristate > + select HOST_CMAKE > + select ZLIB > + select LIBCAP > + select OPENSSL if LIBWEBSOCKETS_TLS > + select LIBEVif LIBWEBSOCKETS_LIBEV > + select LIBUVif LIBWEBSOCKETS_LIBUV > + select LIBEVENT if LIBWEBSOCKETS_LIBEVENT > + select GLIB if LIBWEBSOCKETS_GLIB > + prompt "libwebsockets " > + help > + Libwebsockets is a lightweight pure C library for both > + websockets clients and servers built to use minimal CPU > + and memory resources and provide fast throughput in both > + directions. > + > +if LIBWEBSOCKETS > + > +config LIBWEBSOCKETS_TLS > + bool > + prompt "TLS (SSL) support" > + help > + Turn on to include TLS (SSL) support. > + > +menuconfig LIBWEBSOCKETS_EVLIB > + bool > + prompt "Event library options " > + help > + Turn on to enable various event library plug-ins. > + > +if LIBWEBSOCKETS_EVLIB > + > +config LIBWEBSOCKETS_LIBEV > + bool > + prompt "compile with support for libev" > + > +config LIBWEBSOCKETS_LIBUV > + bool > + prompt "compile with support for libuv" > + > +config LIBWEBSOCKETS_LIBEVENT > + bool > + prompt "compile with support for libevent" > + > +config LIBWEBSOCKETS_GLIB > + bool > + prompt "compile with support for glib event loop" > + > +endif > + > +endif > + > +# vim: ft=kconfig noet tw=72 > diff --git a/rules/libwebsockets.make b/rules/libwebsockets.make > new file mode 100644 > index 0..4e22e9c18 > --- /dev/null > +++ b/rules/libwebsockets.make > @@ -0,0 +1,85 @@ > +# -*-makefile-*- > +# > +# Copyright (C) 2024 by Ian Abbott > +# > +# For further information about the PTXdist project and license conditions > +# see the README file. > +# > + > +# > +# We provide this package > +# > +PACKAGES-$(PTXCONF_LIBWEBSOCKETS) += libwebsockets > + > +# > +# Paths and names > +# > +LIBWEBSOCKETS_VERSION:= 4.3.3 > +LIBWEBSOCKETS_MD5:= 877f457d059718a7eafdaf8db5d7abbb > +LIBWEBSOCKETS:= > libwebsockets-v$(LIBWEBSOCKETS_VERSION) > +LIBWEBSOCKETS_SUFFIX := tar.bz2 > +LIBWEBSOCKETS_URL:= > https://libwebsockets.org/git/libwebsockets/snapshot/$(LIBWEBSOCKETS).$(LIBWEBSOCKETS_SUFFIX) Hmmm, the URL does not work properly for me. The md5sum is different and bzip2 reports "bzip2: Compressed file ends unexpectedly;". Michael > +LIBWEBSOCKETS_SOURCE := > $(SRCDIR)/$(LIBWEBSOCKETS).$(LIBWEBSOCKETS_SUFFIX) > +LIBWEBSOCKETS_DIR:= $(BUILDDIR)/$(LIBWEBSOCKETS) > +LIBWEBSOCKETS_LICENSE:= MIT AND BSD-2-Clause AND BSD-3-Clause > +LIBWEBSOCKETS_LICENSE_FILES := > file://LICENSE;md5=382bfdf329e774859fd401eaf850d29b > + > +# > > +# Prepare > +# > > + > +# > +# cmake > +# > +LIBWEBSOCKETS_CONF_TOOL := cmake > +LIBWEBSOCKETS_CONF_OPT := \ > + $(CROSS_CMAKE_USR) \ > + -DLWS_WITHOUT_DAEMONIZE=OFF \ > + -DLWS_WITH_ZLIB=ON \ > + -DLWS_WITH_SSL=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_TLS) \ > + -DLWS_WITH_LIBEV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEV) \ > + -DLWS_WITH_LIBUV=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBUV) \ > + -DLWS_WITH_LIBEVENT=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_LIBEVENT) \ > + -DLWS_WITH_GLIB=$(call ptx/onoff, PTXCONF_LIBWEBSOCKETS_GLIB) \ > + -DLWS_WITHOUT_TESTAPPS=ON \ > + -DLWS_WITHOUT_TEST_PING=ON \ > + -DLWS_WITHOUT_TEST_CLIENT=ON \ > + -DLWS_WITHOUT_EXTENSIONS=OFF \ > + -DLWS_WITH_EXTERNAL_POLL=ON \ > + -DLWS_IPV6=$(call ptx/onoff, PTXCONF_GLOBAL_IPV6) > + > +# > > +# Target-Install > +# > > + > +$(STATEDIR)/libwebsockets.targetinstall: > + @$(call targetinfo) > + > + @$(call install_init, libwebsockets) > + @$(call install_fixup,
Re: [ptxdist] /bin/sh link setting incompatibility when bash and dash installed
On Wed, Apr 24, 2024 at 03:49:06PM +0100, Ian Abbott wrote: > Hi, > > Currently, the Kconfig option for BASH_SH (which causes /usr/bin/sh to be > linked to bash) is as follows: > > config BASH_SH > bool > default BUSYBOX = n || BUSYBOX_SH_IS_NONE > > However, if DASH_LINK_SH is enabled, that will cause /usr/bin/sh to be > linked to dash, resulting in a conflict. > > I suppose the most robust fix would be to add a prompt to allow BASH_SH to > be configured manually. I'm not sure if the default should be changed to > `default (BUSYBOX = n || BUSYBOX_SH_IS_NONE) && DASH_LINK_SH = n`. If both > dash and bash are installed, it is likely that dash would be used as the > system shell and bash would be used as the interactive shell. Imho, having both bash and dash only makes sense if /bin/sh is dash. So I think changing the default as suggested above is the correct fix. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [APPLIED] gdb: Add option to configure lzma support
Thanks, applied as 68cd37983cacf188ccb6fd3fdfaeaf776937c6d0. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:47 +0200, Ian Abbott wrote: > GDB's '--with-lzma=auto/yes/no' option defaults to 'auto' but it would > be better to configure it to 'yes' or 'no' explicitly. GDB's lzma > support is required to read the .gnu_debuginfo sections in binaries (if > they have been built to include those sections), so call the > configuration option GDB_DEBUGINFO_SUPPORT. > > The '--with-lzma' option was added in GDB 7.6, but that is quite old, so > assume it is supported. > > While we are at it, change the test `ifneq ($(filter > 1%,$(GDBSERVER_VERSION)),)` to use `$(GDB_VERSION)` instead, and add the > '--without-python' configure command line option. > > Signed-off-by: Ian Abbott > Message-Id: <20240508101404.272507-1-abbo...@mev.co.uk> > Signed-off-by: Michael Olbrich > > diff --git a/rules/gdb.in b/rules/gdb.in > index 3014271de9c1..9e76307e36b1 100644 > --- a/rules/gdb.in > +++ b/rules/gdb.in > @@ -8,6 +8,7 @@ menuconfig GDB > select GCCLIBS_GCC_S > select NCURSES > select LIBGMP if GDB_11_1 > + select XZ if GDB_DEBUGINFO_SUPPORT > help > The GNU Debugger > > @@ -26,6 +27,17 @@ config GDB_SHARED > If not set, the build option > LDFLAGS=-static will be activated. > > +config GDB_DEBUGINFO_SUPPORT > + bool > + prompt "support reading .gnu_debuginfo sections" > + help > + Configures whether to link with liblzma to support reading the > + .gnu_debuginfo sections in binaries. > + > + Note: This is useful if TARGET_MINI_DEBUGINFO has been enabled > + in the platform configuration to add .gnu_debuginfo sections > + to all the binaries. > + > config GDB_11_1 > bool > prompt "gdb-11.1 or later" > diff --git a/rules/gdb.make b/rules/gdb.make > index 6c9f05fab7f5..c1337427b605 100644 > --- a/rules/gdb.make > +++ b/rules/gdb.make > @@ -40,10 +40,12 @@ endif > GDB_CONF_OPT_HOST:= \ > --disable-tui \ > --disable-rpath \ > + --with-lzma=$(call ptx/yesno, PTXCONF_GDB_DEBUGINFO_SUPPORT) \ > --without-expat \ > - --without-mpfr > + --without-mpfr \ > + --without-python > > -ifneq ($(filter 1%,$(GDBSERVER_VERSION)),) > +ifneq ($(filter 1%,$(GDB_VERSION)),) > # version >= 10 > GDB_CONF_OPT_HOST+= \ > --without-xxhash > @@ -72,7 +74,8 @@ GDB_BUILD_OOT := YES > > # for gdb subdir configure > GDB_MAKE_ENV := \ > - with_libgmp_prefix=no > + with_libgmp_prefix=no \ > + with_liblzma_prefix=no > > # > > # Install
Re: [ptxdist] [APPLIED] sdl2: Version bump. 2.30.2 -> 2.30.3
Thanks, applied as 822b5b11693f6428f571cf10ef3737cfda8b0bb9. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:48 +0200, Christian Melki wrote: > Minor stable series bump. Minor bugfixes. > https://github.com/libsdl-org/SDL/releases/tag/release-2.30.3 > > * Fix removed config option. > > Signed-off-by: Christian Melki > Message-Id: <20240509163408.3270244-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/sdl2.make b/rules/sdl2.make > index 4959560a002d..01747370d620 100644 > --- a/rules/sdl2.make > +++ b/rules/sdl2.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 > # > # Paths and names > # > -SDL2_VERSION := 2.30.2 > -SDL2_MD5 := 08667937c83fada423dacc7cd90f3ec8 > +SDL2_VERSION := 2.30.3 > +SDL2_MD5 := 85ceed58290332fa4ef75a3dabfa1b89 > SDL2 := SDL2-$(SDL2_VERSION) > SDL2_SUFFIX := tar.gz > SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX) > @@ -67,7 +67,6 @@ SDL2_CONF_OPT := \ > --$(call ptx/endis,PTXCONF_ARCH_X86_64)-sse3 \ > --$(call ptx/endis,PTXCONF_ARCH_PPC_ALTIVEC)-altivec \ > --disable-lsx \ > - --disable-lasx \ > --$(call ptx/endis,PTXCONF_SDL2_OSS)-oss \ > --$(call ptx/endis,PTXCONF_SDL2_ALSA)-alsa \ > --disable-alsatest \
Re: [ptxdist] [APPLIED] hwdata: Version bump. 0.381 -> 0.382
Thanks, applied as 85f484c3855fd8e8134ca1cd831708a40b880d36. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:46 +0200, Christian Melki wrote: > https://github.com/vcrhonek/hwdata/releases/tag/v0.382 > The usual updates. > > Signed-off-by: Christian Melki > Message-Id: <20240507190700.2636201-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/hwdata.make b/rules/hwdata.make > index ba1451b9ffb7..9c15cf790539 100644 > --- a/rules/hwdata.make > +++ b/rules/hwdata.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata > # > # Paths and names > # > -HWDATA_VERSION := 0.381 > -HWDATA_MD5 := 9db68f209f3393aa5bfa3217d7c890c5 > +HWDATA_VERSION := 0.382 > +HWDATA_MD5 := 17cffcd26a627070332422c65b55eaab > 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] u-boot: Add integration of firmware blobs
Thanks, applied as a5e90b02053a4173471a6dba5ab0f31a2aefeea2.
Michael
[sent from post-receive hook]
On Sun, 12 May 2024 15:16:46 +0200, Alexander Dahl wrote:
> Almost same approach as done for barebox with commit
> 6684c552fbd7 ("barebox: add integration of firmware blobs") already.
>
> For some boards it is required to inject files to build dir. This is
> cleaner and not cluttering your source dir. In U-Boot it seems to work
> in both ways, injecting to source or build dir, so we opt for build dir.
>
> Signed-off-by: Alexander Dahl
> Message-Id: <20240506131244.401909-4-...@thorsis.com>
> Signed-off-by: Michael Olbrich
>
> diff --git a/platforms/u-boot.firmware.in b/platforms/u-boot.firmware.in
> new file mode 100644
> index ..da7f8128f14d
> --- /dev/null
> +++ b/platforms/u-boot.firmware.in
> @@ -0,0 +1,7 @@
> +## SECTION=u_boot_firmware
> +
> +#
> +# This file does only exist to create a defined entry in the
> "u_boot_firmware"
> +# section, so that the toplevel Kconfig can include
> generated/u_boot_firmware.in
> +# even if no package is in that category.
> +#
> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
> index 9163a837827a..5ce7387e495d 100644
> --- a/platforms/u-boot.in
> +++ b/platforms/u-boot.in
> @@ -90,6 +90,14 @@ config U_BOOT_CONFIG
>
> endif
>
> +menuconfig U_BOOT_FIRMWARE
> + bool
> + prompt "integrate firmware blobs "
> +
> +if U_BOOT_FIRMWARE
> +source "generated/u_boot_firmware.in"
> +endif
> +
> config U_BOOT_CUSTOM_MAKE_ENV
> prompt "Custom (additional) make environment"
> string
> diff --git a/rules/u-boot.make b/rules/u-boot.make
> index e4c963d0c5a3..2a8059170ad5 100644
> --- a/rules/u-boot.make
> +++ b/rules/u-boot.make
> @@ -36,6 +36,9 @@ endif
> # Prepare
> #
>
>
> +U_BOOT_INJECT_PATH := ${PTXDIST_SYSROOT_TARGET}/usr/lib/firmware
> +U_BOOT_INJECT_OOT:= $(call ptx/ifdef, PTXCONF_U_BOOT_BUILD_OOT,YES,NO)
> +
> ifdef PTXCONF_U_BOOT_BOOT_SCRIPT
> U_BOOT_BOOT_SCRIPT_TXT := $(call ptx/in-platformconfigdir, uboot.scr)
> U_BOOT_BOOT_SCRIPT_BIN := $(call remove_quotes, \
> @@ -93,14 +96,23 @@ $(U_BOOT_CONFIG):
> @exit 1
> endif
>
> -
> -ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_LEGACY
> $(STATEDIR)/u-boot.prepare:
> @$(call targetinfo)
> +
> +ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_KCONFIG
> + @$(call world/prepare, U_BOOT)
> +endif
> +
> +ifdef PTXCONF_U_BOOT_CONFIGSYSTEM_LEGACY
> $(U_BOOT_CONF_ENV) $(MAKE) $(U_BOOT_CONF_OPT)
> - @$(call touch)
> endif
>
> +ifdef PTXCONF_U_BOOT_FIRMWARE
> + @$(call world/inject, U_BOOT)
> +endif
> +
> + @$(call touch)
> +
> #
>
> # Compile
> #
>
Re: [ptxdist] [APPLIED] u-boot: Allow other packages to inject dependencies
Thanks, applied as 3d8f856576f96e24869f24dd58f90eee2496a2e4. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:45 +0200, Alexander Dahl wrote: > Same approach as in barebox packages. > > Signed-off-by: Alexander Dahl > Message-Id: <20240506131244.401909-3-...@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 53db146e18ad..9163a837827a 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -1,6 +1,11 @@ > ## SECTION=bootloader > > +config U_BOOT_DEPENDENCIES > + tristate > + select VIRTUAL > + > menuconfig U_BOOT > + select U_BOOT_DEPENDENCIES > select BOOTLOADER > select HOST_SYSTEM_PYTHON3 > select HOST_OPENSSL if U_BOOT_NEEDS_HOST_OPENSSL
Re: [ptxdist] [APPLIED] u-boot: Add option to pass additional make env
Thanks, applied as 32707042153ff15d17e4cf7810f84b1e558e8369. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:44 +0200, Alexander Dahl wrote: > Some things need to be set in environment instead of passing them as > additional make opts. > > Signed-off-by: Alexander Dahl > Message-Id: <20240506131244.401909-2-...@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/platforms/u-boot.in b/platforms/u-boot.in > index 000ca491a1c2..53db146e18ad 100644 > --- a/platforms/u-boot.in > +++ b/platforms/u-boot.in > @@ -85,6 +85,15 @@ config U_BOOT_CONFIG > > endif > > +config U_BOOT_CUSTOM_MAKE_ENV > + prompt "Custom (additional) make environment" > + string > + help > + List of additional env variables set for make at build time. > + Can be used for example to set BINMAN_INDIRS= to a path > + containing firmware files (preferably somewhere in > + sysroot-target). > + > config U_BOOT_CUSTOM_MAKE_OPTS > prompt "Custom make options" > string > diff --git a/rules/u-boot.make b/rules/u-boot.make > index 4bc7f3f781fc..e4c963d0c5a3 100644 > --- a/rules/u-boot.make > +++ b/rules/u-boot.make > @@ -63,7 +63,9 @@ U_BOOT_CONF_OPT := \ > > U_BOOT_MAKE_ENV := \ > CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \ > - HOSTCC=$(HOSTCC) > + HOSTCC=$(HOSTCC) \ > + $(call remove_quotes,$(PTXCONF_U_BOOT_CUSTOM_MAKE_ENV)) > + > U_BOOT_MAKE_OPT := $(U_BOOT_CONF_OPT) > > U_BOOT_TAGS_OPT := ctags cscope etags
Re: [ptxdist] [APPLIED] ptxd_make_world_inject: Introduce new variable _INJECT_OOT
Thanks, applied as d4caaae5e1e35470f24b8b3da79aa77b57c4deb6.
Michael
[sent from post-receive hook]
On Sun, 12 May 2024 15:16:43 +0200, Alexander Dahl wrote:
> Setting the new variable to 'YES' allows to inject into _BUILD_DIR
> instead of _DIR as before.
>
> When building out-of-tree some bootloaders like U-Boot expect injected
> files in the build dir, not in the source dir. Backwards compatibility
> is ensured, the source dir is still the default, the new inject dest is
> optional and in case set it overwrites the default.
>
> For using this in u-boot package, on top of the things already done to
> use the old inject mechanism in general, add this line to
> 'rules/u-boot.make' for example:
>
> U_BOOT_INJECT_OOT := YES
>
> Signed-off-by: Alexander Dahl
> Acked-by: Michael Riesch
> Message-Id: <20240506105051.323546-5-...@thorsis.com>
> Signed-off-by: Michael Olbrich
>
> diff --git a/rules/post/ptxd_make_world_inject.make
> b/rules/post/ptxd_make_world_inject.make
> index eabcdd0529b8..1e3979a2f007 100644
> --- a/rules/post/ptxd_make_world_inject.make
> +++ b/rules/post/ptxd_make_world_inject.make
> @@ -9,7 +9,8 @@
> world/inject/env = \
> $(call world/env, $(1)) \
> pkg_inject_path="$(call ptx/escape,$($(1)_INJECT_PATH))" \
> - pkg_inject_files="$(call ptx/escape,$($(1)_INJECT_FILES))"
> + pkg_inject_files="$(call ptx/escape,$($(1)_INJECT_FILES))" \
> + pkg_inject_oot="$(call ptx/escape,$($(1)_INJECT_OOT))"
>
> world/inject = \
> $(call world/inject/env,$(strip $(1))) \
> diff --git a/scripts/lib/ptxd_make_world_inject.sh
> b/scripts/lib/ptxd_make_world_inject.sh
> index b74e464c6895..e8e94fbe6397 100644
> --- a/scripts/lib/ptxd_make_world_inject.sh
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -10,7 +10,7 @@ ptxd_make_inject() {
> local source target
>
> source="$(echo ${inject_file} | cut -d ":" -f 1)"
> -target="${pkg_dir}/$(echo ${inject_file} | cut -d ":" -f 2)"
> +target="${inject_dest}/$(echo ${inject_file} | cut -d ":" -f 2)"
>
> if [[ "${source}" =~ ^/.* ]]; then
> ptxd_bailout "'${source}' must not be an absolute path!" \
> @@ -32,8 +32,25 @@ export -f ptxd_make_inject
> ptxd_make_world_inject() {
> ptxd_make_world_init || return
>
> -if [ -z "${pkg_dir}" ]; then
> - ptxd_bailout "_DIR empty, no destination to inject to."
> +if [ -z "${pkg_inject_oot}" ]; then
> + pkg_inject_oot=NO
> +fi
> +
> +case "${pkg_inject_oot}" in
> + "YES") inject_dest="${pkg_build_dir}" ;;
> + "NO") inject_dest="${pkg_dir}" ;;
> + *) ptxd_bailout "_INJECT_OOT: please set to YES or NO" ;;
> +esac
> +
> +if [ "${pkg_build_oot:-NO}" = 'NO' ] && [ "${pkg_inject_oot}" != 'NO' ];
> then
> + ptxd_warning "_BUILD_OOT and _INJECT_OOT contradict each
> other." \
> + "Using $(ptxd_print_path ${inject_dest}) as inject destination
> anyways."
> +fi
> +
> +if [ ! -d "${inject_dest}" ]; then
> + ptxd_bailout " inject destination dir missing." \
> + "Correct placement of world/inject depends on _BUILD_OOT and
> _INJECT_OOT." \
> + "Check order of calls in prepare stage!"
> fi
>
> for inject_file in ${pkg_inject_files}; do
Re: [ptxdist] [APPLIED] ptxd_make_world_inject: Escape inject path and files
Thanks, applied as 23c5f686998c50412b5f5fd99d7dc9c345fe1af8. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:42 +0200, Alexander Dahl wrote: > Same as in ptxd_make_world_common for all the other variables set in > make and used in shell. > > Signed-off-by: Alexander Dahl > Acked-by: Michael Riesch > Message-Id: <20240506105051.323546-4-...@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/post/ptxd_make_world_inject.make > b/rules/post/ptxd_make_world_inject.make > index 3506ee1140e1..eabcdd0529b8 100644 > --- a/rules/post/ptxd_make_world_inject.make > +++ b/rules/post/ptxd_make_world_inject.make > @@ -8,8 +8,8 @@ > > world/inject/env = \ > $(call world/env, $(1)) \ > - pkg_inject_path="$($(1)_INJECT_PATH)" \ > - pkg_inject_files="$($(1)_INJECT_FILES)" > + pkg_inject_path="$(call ptx/escape,$($(1)_INJECT_PATH))" \ > + pkg_inject_files="$(call ptx/escape,$($(1)_INJECT_FILES))" > > world/inject = \ > $(call world/inject/env,$(strip $(1))) \
Re: [ptxdist] [APPLIED] ptxd_make_world_inject: Use _DIR directly
Thanks, applied as 0eea7080662b36cd39f03a3b0785d0e4a1c346bc.
Michael
[sent from post-receive hook]
On Sun, 12 May 2024 15:16:41 +0200, Alexander Dahl wrote:
> pkg_source was defined as "$($(1)_DIR)" which is the same as pkg_dir in
> ptxd_make_world_common. We can use pkg_dir directly. Add a safe-guard
> to bail out early if that var is empty.
>
> Signed-off-by: Alexander Dahl
> Acked-by: Michael Riesch
> Message-Id: <20240506105051.323546-3-...@thorsis.com>
> Signed-off-by: Michael Olbrich
>
> diff --git a/rules/post/ptxd_make_world_inject.make
> b/rules/post/ptxd_make_world_inject.make
> index b7d28e92f25b..3506ee1140e1 100644
> --- a/rules/post/ptxd_make_world_inject.make
> +++ b/rules/post/ptxd_make_world_inject.make
> @@ -9,8 +9,7 @@
> world/inject/env = \
> $(call world/env, $(1)) \
> pkg_inject_path="$($(1)_INJECT_PATH)" \
> - pkg_inject_files="$($(1)_INJECT_FILES)" \
> - pkg_source="$($(1)_DIR)"
> + pkg_inject_files="$($(1)_INJECT_FILES)"
>
> world/inject = \
> $(call world/inject/env,$(strip $(1))) \
> diff --git a/scripts/lib/ptxd_make_world_inject.sh
> b/scripts/lib/ptxd_make_world_inject.sh
> index 5c2d0dc5fb3e..b74e464c6895 100644
> --- a/scripts/lib/ptxd_make_world_inject.sh
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -10,7 +10,7 @@ ptxd_make_inject() {
> local source target
>
> source="$(echo ${inject_file} | cut -d ":" -f 1)"
> -target="${pkg_source}/$(echo ${inject_file} | cut -d ":" -f 2)"
> +target="${pkg_dir}/$(echo ${inject_file} | cut -d ":" -f 2)"
>
> if [[ "${source}" =~ ^/.* ]]; then
> ptxd_bailout "'${source}' must not be an absolute path!" \
> @@ -32,6 +32,10 @@ export -f ptxd_make_inject
> ptxd_make_world_inject() {
> ptxd_make_world_init || return
>
> +if [ -z "${pkg_dir}" ]; then
> + ptxd_bailout "_DIR empty, no destination to inject to."
> +fi
> +
> for inject_file in ${pkg_inject_files}; do
> ptxd_make_inject || return
> done
Re: [ptxdist] [APPLIED] ptxd_make_world_inject: Remove useless test
Thanks, applied as 33fa14b8b788e2d57d015c91c4c758708824a05d.
Michael
[sent from post-receive hook]
On Sun, 12 May 2024 15:16:41 +0200, Alexander Dahl wrote:
> One line above $target is set to "${var}/$(subshell)" and even if $var
> _and_ the result of the subshell call is empty, there's still the slash.
> Thus target is never empty.
>
> Signed-off-by: Alexander Dahl
> Acked-by: Michael Riesch
> Message-Id: <20240506105051.323546-2-...@thorsis.com>
> Signed-off-by: Michael Olbrich
>
> diff --git a/scripts/lib/ptxd_make_world_inject.sh
> b/scripts/lib/ptxd_make_world_inject.sh
> index fe4eb8363619..5c2d0dc5fb3e 100644
> --- a/scripts/lib/ptxd_make_world_inject.sh
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -11,9 +11,6 @@ ptxd_make_inject() {
>
> source="$(echo ${inject_file} | cut -d ":" -f 1)"
> target="${pkg_source}/$(echo ${inject_file} | cut -d ":" -f 2)"
> -if [ -z "${target}" ]; then
> - target="${source}"
> -fi
>
> if [[ "${source}" =~ ^/.* ]]; then
> ptxd_bailout "'${source}' must not be an absolute path!" \
Re: [ptxdist] [APPLIED] vim: allow vim to be installed alongside busybox vi and xxd
Thanks, applied as e859fea01e033f691efac8124902478f8496233c.
Michael
[sent from post-receive hook]
On Sun, 12 May 2024 15:16:40 +0200, Ian Abbott wrote:
> Commit ad2eb34a07ed ("vim: prevent file name conflicts with busybox")
> prevented vim being selected if busybox vi is selected. However, the vim
> package does not currently install /usr/bin/vi, so the only conflict is
> between vim's xxd and busybox's xxd.
>
> Allow vim to be installed alongside busybox vi. Also add a configuration
> option to allow installation of a /usr/bin/vi symbolic link to
> /usr/bin/vim, but only allow it to be selected if busybox vi is not
> selected.
>
> Make the auto-selection of LIBC_M depend on VIM_VIM because VIM_XXD does
> not appear to require it. While we are at it, remove the obsolete
> GCCLIBS_GCC_S and LIBC_DL selections.
>
> Signed-off-by: Ian Abbott
> Message-Id: <20240503180814.636648-1-abbo...@mev.co.uk>
> Signed-off-by: Michael Olbrich
>
> diff --git a/rules/vim.in b/rules/vim.in
> index c4c9d14e6833..d16b54a2deb1 100644
> --- a/rules/vim.in
> +++ b/rules/vim.in
> @@ -1,14 +1,8 @@
> ## SECTION=editors
>
> -comment "BusyBox' vi and xxd is selected!"
> - depends on BUSYBOX_VI && BUSYBOX_XXD
> -
> menuconfig VIM
> tristate
> - depends on !(BUSYBOX_VI && BUSYBOX_XXD)
> - select LIBC_DL
> - select LIBC_M
> - select GCCLIBS_GCC_S
> + select LIBC_M if VIM_VIM
> select NCURSES
> prompt "vim "
> help
> @@ -18,18 +12,22 @@ menuconfig VIM
>
> if VIM
>
> -comment "BusyBox' vi is selected!"
> - depends on BUSYBOX_VI
> -
> config VIM_VIM
> - depends on !BUSYBOX_VI
> bool "Vim Editor"
>
> +comment "BusyBox' vi is selected!"
> + depends on VIM_VIM && BUSYBOX_VI
> +
> +config VIM_VI_SYMLINK
> + depends on VIM_VIM && !BUSYBOX_VI || ALLYES
> + bool "install symbolic link /usr/bin/vi"
> + default y
> +
> comment "BusyBox' xxd is selected!"
> depends on BUSYBOX_XXD
>
> config VIM_XXD
> - depends on !BUSYBOX_XXD
> + depends on !BUSYBOX_XXD || ALLYES
> bool "XXD"
>
> endif
> diff --git a/rules/vim.make b/rules/vim.make
> index b03778e53f53..8700b70bdd82 100644
> --- a/rules/vim.make
> +++ b/rules/vim.make
> @@ -103,6 +103,10 @@ VIM_INSTALL_OPT := \
>
> VIM_LINKS := ex rview rvim view vimdiff
>
> +ifdef PTXCONF_VIM_VI_SYMLINK
> +VIM_LINKS += vi
> +endif
> +
> $(STATEDIR)/vim.targetinstall:
> @$(call targetinfo)
>
Re: [ptxdist] [APPLIED] libarchive: Version bump. 3.7.3 -> 3.7.4
Thanks, applied as 5a720c419cd1fabde04e8de8d1d1367c76a2666b. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:39 +0200, Christian Melki wrote: > More security fixes (probably paranoia in the wake). > https://github.com/libarchive/libarchive/releases/tag/v3.7.4 > > Signed-off-by: Christian Melki > Message-Id: <20240429170908.397443-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libarchive.make b/rules/libarchive.make > index 267d8c0fe90e..5fbe4b0fe112 100644 > --- a/rules/libarchive.make > +++ b/rules/libarchive.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive > # > # Paths and names > # > -LIBARCHIVE_VERSION := 3.7.3 > -LIBARCHIVE_MD5 := a6bf48d0d4f4974c4eac58341ced1227 > +LIBARCHIVE_VERSION := 3.7.4 > +LIBARCHIVE_MD5 := 5649f858cd87dc969b6901152bd6614d > LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION) > LIBARCHIVE_SUFFIX:= tar.gz > LIBARCHIVE_URL := > https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
Re: [ptxdist] [APPLIED] tpm2-tools: Version bump. 5.6 -> 5.7
Thanks, applied as 06c219fd40c34bbfd6e6f1944d5ee4ec37c8aa0e. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:38 +0200, Christian Melki wrote: > https://github.com/tpm2-software/tpm2-tools/releases/tag/5.7 > Bunch of fixes. > > Plugs CVEs (missing proper description at time of writing): > CVE-2024-29038 > CVE-2024-29039 > > Signed-off-by: Christian Melki > Message-Id: <20240428164145.824657-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/tpm2-tools.make b/rules/tpm2-tools.make > index 5261f972d305..69666a828854 100644 > --- a/rules/tpm2-tools.make > +++ b/rules/tpm2-tools.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TOOLS) += tpm2-tools > # > # Paths and names > # > -TPM2_TOOLS_VERSION := 5.6 > -TPM2_TOOLS_MD5 := c8362a622634646d3a5dbe012b9307d8 > +TPM2_TOOLS_VERSION := 5.7 > +TPM2_TOOLS_MD5 := 3acb6305070f064c28c5284d39aa0b04 > 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)
Re: [ptxdist] [APPLIED] tpm2-tss: Version bump. 4.0.1 -> 4.1.0
Thanks, applied as 49ebd974a8945b69ecca784e06485524178c1acb. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:37 +0200, Christian Melki wrote: > https://github.com/tpm2-software/tpm2-tss/releases/tag/4.1.0 > Nothing fancy, a bunch of fixes mostly. > > Plugs CVE: > CVE-2024-29040 - In tmu_set_table of tmu.c, there is a possible out of bounds > write due to a missing bounds check. > > Signed-off-by: Christian Melki > Message-Id: <20240428163837.824589-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make > index 729172b4c47c..cf37742c4232 100644 > --- a/rules/tpm2-tss.make > +++ b/rules/tpm2-tss.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_TPM2_TSS) += tpm2-tss > # > # Paths and names > # > -TPM2_TSS_VERSION := 4.0.1 > -TPM2_TSS_MD5 := fff676c669519097906bd8ce28fc4238 > +TPM2_TSS_VERSION := 4.1.0 > +TPM2_TSS_MD5 := 97e91ce0c77d361409502badb1023e80 > TPM2_TSS := tpm2-tss-$(TPM2_TSS_VERSION) > TPM2_TSS_SUFFIX := tar.gz > TPM2_TSS_URL := > https://github.com/tpm2-software/tpm2-tss/releases/download/$(TPM2_TSS_VERSION)/$(TPM2_TSS).$(TPM2_TSS_SUFFIX)
Re: [ptxdist] [APPLIED] beep: version bump 1.3 -> 1.4.12
Thanks, applied as 0b9fb169815fdea1de4901ce0434a048affbff39.
Michael
[sent from post-receive hook]
On Sun, 12 May 2024 15:16:36 +0200, Ladislav Michl wrote:
> Move package to a new upstream at https://github.com/spkr-beep/beep/
>
> Signed-off-by: Ladislav Michl
> Message-Id:
> [mol: remove old patches]
> Signed-off-by: Michael Olbrich
>
> diff --git a/patches/beep-1.3/0001-Makefile-fix.patch
> b/patches/beep-1.3/0001-Makefile-fix.patch
> deleted file mode 100644
> index 3a0e4eae8034..
> --- a/patches/beep-1.3/0001-Makefile-fix.patch
> +++ /dev/null
> @@ -1,25 +0,0 @@
> -From: Bastian Stender
> -Date: Tue, 10 Oct 2017 11:58:17 +0200
> -Subject: [PATCH] Makefile: fix
> -
> -Signed-off-by: Bastian Stender
>
> - Makefile | 4 ++--
> - 1 file changed, 2 insertions(+), 2 deletions(-)
> -
> -diff --git a/Makefile b/Makefile
> -index cc359c4843e4..23f40d4a2a10 100644
> a/Makefile
> -+++ b/Makefile
> -@@ -1,9 +1,9 @@
> - CC=gcc
> - FLAGS=-Wall
> - EXEC_NAME=beep
> --INSTALL_DIR=/usr/bin
> -+INSTALL_DIR=${DESTDIR}/usr/bin
> - MAN_FILE=beep.1.gz
> --MAN_DIR=/usr/man/man1
> -+MAN_DIR=${DESTDIR}/usr/man/man1
> -
> - default : beep
> -
> diff --git a/patches/beep-1.3/series b/patches/beep-1.3/series
> deleted file mode 100644
> index 1511acea7106..
> --- a/patches/beep-1.3/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Makefile-fix.patch
> -# d6a7d2de78aeb0017353e94c1b0870c5 - git-ptx-patches magic
> diff --git a/rules/beep.make b/rules/beep.make
> index 69ab02f1ab6b..234a3513fe1c 100644
> --- a/rules/beep.make
> +++ b/rules/beep.make
> @@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_BEEP) += beep
> #
> # Paths and names
> #
> -BEEP_VERSION := 1.3
> -BEEP_MD5 := 49c340ceb95dbda3f97b2daafac7892a
> +BEEP_VERSION := 1.4.12
> +BEEP_MD5 := a817f05c5473a23d700778b2c0108cc4
> BEEP := beep-$(BEEP_VERSION)
> BEEP_SUFFIX := tar.gz
> -BEEP_URL := http://www.johnath.com/beep/$(BEEP).$(BEEP_SUFFIX)
> +BEEP_URL :=
> https://github.com/spkr-beep/beep/archive/refs/tags/v$(BEEP_VERSION).$(BEEP_SUFFIX)
> BEEP_SOURCE := $(SRCDIR)/$(BEEP).$(BEEP_SUFFIX)
> BEEP_DIR := $(BUILDDIR)/$(BEEP)
> BEEP_LICENSE := GPL-2.0-only
> @@ -28,7 +28,25 @@ BEEP_LICENSE := GPL-2.0-only
> #
>
>
> BEEP_CONF_TOOL := NO
> -BEEP_MAKE_OPT:= CC=$(CROSS_CC)
> +BEEP_MAKE_OPT:= \
> + CC=$(CROSS_CC) \
> + prefix=/usr
> +
> +$(STATEDIR)/beep.prepare:
> + @$(call targetinfo)
> + # Override detected CFLAGS as some of them may require linking
> + # with additional libraries (-lubsan and -latomic)
> + @echo "common_CFLAGS = -std=gnu99 -pedantic"> $(BEEP_DIR)/local.mk
> + @echo "CFLAGS = -O2 -g -save-temps=obj" >> $(BEEP_DIR)/local.mk
> + @$(call touch)
> +
> +#
>
> +# Install
> +#
>
> +
> +BEEP_INSTALL_OPT := \
> + prefix=/usr \
> + install
>
> #
>
> # Target-Install
Re: [ptxdist] [APPLIED] weston: Version bump. 13.0.0 -> 13.0.1
Thanks, applied as 693ca85e45b8e276b6fa72dc01ca06ffe18c049e. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:35 +0200, Christian Melki wrote: > Bugfix release. > https://lists.freedesktop.org/archives/wayland-devel/2024-April/043575.html > > * Forward patchset, applies cleanly > > Signed-off-by: Christian Melki > Message-Id: <20240425191554.1065528-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/patches/weston-13.0.0/0001-HACK-don-t-build-tests.patch > b/patches/weston-13.0.1/0001-HACK-don-t-build-tests.patch > similarity index 100% > rename from patches/weston-13.0.0/0001-HACK-don-t-build-tests.patch > rename to patches/weston-13.0.1/0001-HACK-don-t-build-tests.patch > diff --git a/patches/weston-13.0.0/series b/patches/weston-13.0.1/series > similarity index 100% > rename from patches/weston-13.0.0/series > rename to patches/weston-13.0.1/series > diff --git a/rules/weston.make b/rules/weston.make > index ebf62645b186..b3a90288b806 100644 > --- a/rules/weston.make > +++ b/rules/weston.make > @@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston > # > # Paths and names > # > -WESTON_VERSION := 13.0.0 > +WESTON_VERSION := 13.0.1 > LIBWESTON_MAJOR := 13 > -WESTON_MD5 := f5d8614664a26211621910d310b42890 > +WESTON_MD5 := 8f8d0209d64d536d328ed78f4b7cf70b > WESTON := weston-$(WESTON_VERSION) > WESTON_SUFFIX:= tar.gz > WESTON_URL := > https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX)
Re: [ptxdist] [APPLIED] Revert "beep: move to staging"
Thanks, applied as 565c43e0bc0e9063af000d31b16bd1041b68701b. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:36 +0200, Ladislav Michl wrote: > This reverts commit 56ddc68d6cada7fee791122e27d4b2388dc8715d > as original upstream is indeed dead, but project continues to > live at a new location and subsequent patch will update it. > > Signed-off-by: Ladislav Michl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/beep.in b/rules/beep.in > index 6c9ea85321b3..52abcd11e2b2 100644 > --- a/rules/beep.in > +++ b/rules/beep.in > @@ -1,12 +1,7 @@ > -## SECTION=staging > -## old section: > -### SECTION=multimedia_sound > +## SECTION=multimedia_sound > > config BEEP > tristate > prompt "beep" > help > Extended beep utility > - > - STAGING: remove in PTXdist 2025.05.0 > - Unmaintained in PTXdist. Original upstream and URL are dead.
Re: [ptxdist] [APPLIED] tf-a: Update download defaults
Thanks, applied as dc9c7c945e3f29885f7fd9f29c6b0dfe68876ed9. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:33 +0200, Alexander Dahl wrote: > Previous URL threw 401 errors. Experiments with other paths from the > same server yield no stable tarballs. GitHub tarballs are stable, have > a different checksum however. Tarball content was checked to be the > same (at least compared to those unstable git snapshot tarballs from the > previous URL). GitHub tarball has same checksum as the one downloaded > by buildroot. > > Signed-off-by: Alexander Dahl > Link: > https://lore.distrokit.org/distrokit/20240424124341.243323-1-...@thorsis.com/ > Message-Id: <20240424133729.269291-1-...@thorsis.com> > Signed-off-by: Michael Olbrich > > diff --git a/platforms/tf-a.in b/platforms/tf-a.in > index 0a14bd8c4d63..495ae58fe24e 100644 > --- a/platforms/tf-a.in > +++ b/platforms/tf-a.in > @@ -11,14 +11,14 @@ if TF_A > > config TF_A_URL > string > - default > "https://git.trustedfirmware.org/TF-A/trusted-firmware-a.git/snapshot; > + default > "https://github.com/ARM-software/arm-trusted-firmware/archive/refs/tags; > prompt "TF-A URL" > help > Enter the TF-A URL you want to use. > > config TF_A_VERSION > string > - default "v2.2" > + default "v2.10" > prompt "TF-A version" > help > Enter the TF-A git commit-ish you want to build. Usually a tagged > @@ -26,7 +26,7 @@ config TF_A_VERSION > > config TF_A_MD5 > string > - default "bb300e5a62c911e189c80d935d497a4b" > + default "179042745d57dc03cb44063d43dc5301" > prompt "TF-A source md5" > > config TF_A_ARCH_STRING
Re: [ptxdist] [APPLIED] at91bootstrap: drop atmel download url
Thanks, applied as 66c1d9f2ceb47b58e1fdfe27e1b2e336f1ecb767. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:34 +0200, Ladislav Michl wrote: > Atmel url just redirects to https://www.microchip.com/ happily > feeding tarball with content, so drop it entirely. > > Signed-off-by: Ladislav Michl > Reviewed-by: Alexander Dahl > Message-Id: > Signed-off-by: Michael Olbrich > > diff --git a/rules/at91bootstrap.make b/rules/at91bootstrap.make > index 7835564ea006..1dfabdcbf283 100644 > --- a/rules/at91bootstrap.make > +++ b/rules/at91bootstrap.make > @@ -20,9 +20,7 @@ AT91BOOTSTRAP_MD5 := 2d222312cf0af81c56db8747d6a38c7c > AT91BOOTSTRAP_SUFFIX := zip > AT91BOOTSTRAP:= Bootstrap-v$(AT91BOOTSTRAP_VERSION) > AT91BOOTSTRAP_TARBALL:= > AT91Bootstrap$(AT91BOOTSTRAP_VERSION).$(AT91BOOTSTRAP_SUFFIX) > -AT91BOOTSTRAP_URL:= \ > - > http://www.atmel.com/dyn/resources/prod_documents/$(AT91BOOTSTRAP_TARBALL) \ > -http://sources.buildroot.net/$(AT91BOOTSTRAP_TARBALL) > +AT91BOOTSTRAP_URL:= http://sources.buildroot.net/$(AT91BOOTSTRAP_TARBALL) > AT91BOOTSTRAP_SOURCE := $(SRCDIR)/$(AT91BOOTSTRAP_TARBALL) > AT91BOOTSTRAP_DIR:= $(BUILDDIR)/$(AT91BOOTSTRAP) > AT91BOOTSTRAP_LICENSE:= BSD-Source-Code AND GPL-2.0-or-later
Re: [ptxdist] [APPLIED] rauc: version bump 1.11.1 -> 1.11.3
Thanks, applied as 1ad233a607790e27f4a7731067d7a82a6fb99768. Michael [sent from post-receive hook] On Sun, 12 May 2024 15:16:32 +0200, Enrico Jörns wrote: > Signed-off-by: Enrico Jörns > Message-Id: <20240424122139.4141648-1-...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/rauc.make b/rules/rauc.make > index 50b1ec35d57c..38577f94d486 100644 > --- a/rules/rauc.make > +++ b/rules/rauc.make > @@ -1,6 +1,6 @@ > # -*-makefile-*- > # > -# Copyright (C) 2015-2023 by Enrico Joerns > +# Copyright (C) 2015-2024 by Enrico Joerns > # > # For further information about the PTXdist project and license conditions > # see the README file. > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc > # > # Paths and names > # > -RAUC_VERSION := 1.11.1 > -RAUC_MD5 := 16e193e5e396a419a7ceee5777e7c077 > +RAUC_VERSION := 1.11.3 > +RAUC_MD5 := f6822268230e50efb6b2fe3a4db28e2b > RAUC := rauc-$(RAUC_VERSION) > RAUC_SUFFIX := tar.xz > RAUC_URL := > https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
Re: [ptxdist] Should GDB select XZ?
On Tue, May 07, 2024 at 02:39:01PM +0100, Ian Abbott wrote: > The configure script of GDB (version 7.6 or later) has a --with-lzma option That's definitely old enough, so we can rely on the option to be available. gdb is always a bit tricky because we need to support multiple versions. > that controls whether GDB will use liblzma or not. (It is needed to for > reading .gnu_debuginfo sections from ELF files, if they are present.) By > default (if not explicitly enabled or disabled), it will use liblzma if it > is detected at build time. > > Currently, PTXdist does not configure GDB with any --with-lzma value, so > whether or not it is configured to use liblzma depends on whether some > version of XZ has previously been built or not. > > If GDB gets automatically configured to use liblzma, but the XZ package is > not to be installed (perhaps there is a previous build of XZ in the > platform's sysroot-target), then there will be a run-time error when running > GDB due to the missing library. It also means that the build of GDB may not > be reproducible. > > It seems to me that PTXdist should have a configuration option to choose > whether GDB should be built with liblzma support or not (and possibly a > configuration option to select whether the GDB version is 7.6 or later, > defaulting to true). The default could depend on > PTXCONF_TARGET_MINI_DEBUGINFO. If binaries have a .gnu_debuginfo section > then we probably want GDB to be able to use it! Right, gdb should definitely be able to read .gnu_debuginfo sections. I just never noticed this because I always use gdbserver. As you probably noticed by now, depending on PTXCONF_TARGET_MINI_DEBUGINFO does not work because it is defined in the platformconfig and gdb is not. > I'll attempt to knock up a patch for it. I appreciate it. The gdb package has seen little updated in the past because I don't actually use it myself. So fixes from someone who actually uses it are welcome. Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] Race condition between rc-once.service and systemd-remount-fs.service
On Fri, May 03, 2024 at 07:33:32PM +0100, Ian Abbott wrote: > If the root file system is initially mounted read-only, there is a possible > race between rc-once.service and the systemd-remount-fs.service. If > rc-once.service sees the root filesystem is mounted read-only, then it will > temporarily remount it read-write and later mount it read-only again. > Meanwhile, systemd-remount-fs.service will also remount the root file system > as specified by /etc/fstab which could be read-write. Depending on the > ordering, it is possible for the root file-system to end up mounted > read-only when it should have ended up mounted read-write. > > As long as the two services do not run simultaneously, the root file system > should end up mounted in the correct state. However, I do not know what the > intended order is supposed to be. Perhaps it is intentionally > system-dependent? It's not intentional. I just never noticed because I always keep the rootfs read-only by default. I think rc-once.service should have 'After=systemd-remount-fs.service'. That should fix the problem, right? Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 4/4] ptxd_make_world_inject: Introduce separate destination directory
On Fri, May 03, 2024 at 12:08:34PM +0200, Alexander Dahl wrote:
> Am Fri, May 03, 2024 at 11:48:52AM +0200 schrieb Michael Olbrich:
> > On Wed, Apr 24, 2024 at 04:31:09PM +0200, Alexander Dahl wrote:
> > > Setting the optional _INJECT_DEST now allows to give a different
> > > target for putting the binary blobs into. When building out-of-tree
> > > some bootloaders like U-Boot expect injected files in the build dir, not
> > > in the source dir. Backwards compatibility is ensured, the source dir
> > > is still the default, the new inject dest is optional and in case set it
> > > overwrites the default.
> > >
> > > For using this in u-boot package, on top of the things already done to
> > > use the inject mechanism in general, add this line to
> > > 'rules/u-boot.make' for example:
> > >
> > > U_BOOT_INJECT_DEST := $(U_BOOT_BUILD_DIR)
> >
> > Can you add a patch for u-boot?
>
> I will, in an upcoming patch series with more changes to the u-boot
> package. Planned to this after lunch later today anyways. ^^
>
> > >
> > > Signed-off-by: Alexander Dahl
> > > ---
> > > rules/post/ptxd_make_world_inject.make | 3 ++-
> > > scripts/lib/ptxd_make_world_inject.sh | 22 ++
> > > 2 files changed, 20 insertions(+), 5 deletions(-)
> > >
> > > diff --git a/rules/post/ptxd_make_world_inject.make
> > > b/rules/post/ptxd_make_world_inject.make
> > > index eabcdd052..509d480ba 100644
> > > --- a/rules/post/ptxd_make_world_inject.make
> > > +++ b/rules/post/ptxd_make_world_inject.make
> > > @@ -9,7 +9,8 @@
> > > world/inject/env = \
> > > $(call world/env, $(1)) \
> > > pkg_inject_path="$(call ptx/escape,$($(1)_INJECT_PATH))" \
> > > - pkg_inject_files="$(call ptx/escape,$($(1)_INJECT_FILES))"
> > > + pkg_inject_files="$(call ptx/escape,$($(1)_INJECT_FILES))" \
> > > + pkg_inject_dest="$(call ptx/escape,$($(1)_INJECT_DEST))"
> > >
> > > world/inject = \
> > > $(call world/inject/env,$(strip $(1))) \
> > > diff --git a/scripts/lib/ptxd_make_world_inject.sh
> > > b/scripts/lib/ptxd_make_world_inject.sh
> > > index b74e464c6..90bd8b684 100644
> > > --- a/scripts/lib/ptxd_make_world_inject.sh
> > > +++ b/scripts/lib/ptxd_make_world_inject.sh
> > > @@ -7,10 +7,15 @@
> > > #
> > >
> > > ptxd_make_inject() {
> > > -local source target
> > > +local dest source target
> > > +
> > > +dest="${pkg_dir}"
> > > +if [ -n "${pkg_inject_dest}" ]; then
> > > + dest="${pkg_inject_dest}"
> > > +fi
> >
> > This should be in ptxd_make_world_inject(). It remains the same for all
> > files.
>
> I thought about this when changing it, but decided to keep it at this
> place. Moving it to ptxd_make_world_inject() would require to
> introduce another non-local variable and I did not want that. But
> sure, can be done.
Just set pkg_inject_dest if it's empty. No need for a separate variable.
> >
> > >
> > > source="$(echo ${inject_file} | cut -d ":" -f 1)"
> > > -target="${pkg_dir}/$(echo ${inject_file} | cut -d ":" -f 2)"
> > > +target="${dest}/$(echo ${inject_file} | cut -d ":" -f 2)"
> > >
> > > if [[ "${source}" =~ ^/.* ]]; then
> > > ptxd_bailout "'${source}' must not be an absolute path!" \
> > > @@ -32,8 +37,17 @@ export -f ptxd_make_inject
> > > ptxd_make_world_inject() {
> > > ptxd_make_world_init || return
> > >
> > > -if [ -z "${pkg_dir}" ]; then
> > > - ptxd_bailout "_DIR empty, no destination to inject to."
> > > +if [ -z "${pkg_inject_dest}" ] && [ -z "${pkg_dir}" ]; then
> > > + ptxd_bailout "No destination to inject to." \
> > > + "Set either _DIR or _INJECT_DEST to have a valid
> > > destination!"
> > > +fi
> > > +
> > > +if [ -n "${pkg_inject_dest}" ]; then
> > > + if [ "${pkg_build_dir}" = "${pkg_inject_dest}" ] && [
> > > "${pkg_build_oot}" = "YES" ]; then
> >
> > This gives a warning even in the good case, right?
>
> No it does not. In the good case user has set either _DIR or
> _INJECT_DEST
Re: [ptxdist] [PATCH v2] vim: allow vim to be installed alongside busybox vi and xxd
On Fri, May 03, 2024 at 10:14:44AM +0100, Ian Abbott wrote:
> Commit ad2eb34a07ed ("vim: prevent file name conflicts with busybox")
> prevented vim being selected if busybox vi is selected. However, the vim
> package does not currently install /usr/bin/vi, so the only conflict is
> between vim's xxd and busybox's xxd.
>
> Allow vim to be installed alongside busybox vi. Also add a configuration
> option to allow installation of a /usr/bin/vi symbolic link to
> /usr/bin/vim, but only allow it to be selected if busybox vi is not
> selected.
>
> Make the auto-selections of LIBC_DL, LIBC_M, GCCLIBS_GCC_S, and NCURSES
> depend on VIM_VIM because VIM_XXD does not appear to require them.
>
> Signed-off-by: Ian Abbott
> ---
> v2: Corrected dependency problem I introduced by moving the
> auto-selection of the required libraries from VIM to VIM_VIM. I have
> move them back, but only select them if VIM_VIM is selected, as
> suggested by Alexander Dahl
> ---
> rules/vim.in | 24
> rules/vim.make | 4
> 2 files changed, 16 insertions(+), 12 deletions(-)
>
> diff --git a/rules/vim.in b/rules/vim.in
> index c4c9d14e6..24772d969 100644
> --- a/rules/vim.in
> +++ b/rules/vim.in
> @@ -1,15 +1,11 @@
> ## SECTION=editors
>
> -comment "BusyBox' vi and xxd is selected!"
> - depends on BUSYBOX_VI && BUSYBOX_XXD
> -
> menuconfig VIM
> tristate
> - depends on !(BUSYBOX_VI && BUSYBOX_XXD)
> - select LIBC_DL
> - select LIBC_M
> - select GCCLIBS_GCC_S
> - select NCURSES
> + select LIBC_DL if VIM_VIM
> + select LIBC_M if VIM_VIM
> + select GCCLIBS_GCC_S if VIM_VIM
> + select NCURSES if VIM_VIM
1. Align the 'if ...' with tabs.
2. vim is still compiled even if VIM_VIM is disabled so ncurses still
needed. So leave that dependency as is.
3. GCCLIBS_GCC_S LIBC_DL are actually no longer used. That was missed
during some update in the past. Just remove those while at it.
> prompt "vim "
> help
> Vim is an advanced text editor that seeks to provide the
> @@ -18,13 +14,17 @@ menuconfig VIM
>
> if VIM
>
> -comment "BusyBox' vi is selected!"
> - depends on BUSYBOX_VI
> -
> config VIM_VIM
> - depends on !BUSYBOX_VI
> bool "Vim Editor"
>
> +comment "BusyBox' vi is selected!"
> + depends on VIM_VIM && BUSYBOX_VI
> +
> +config VIM_VI_SYMLINK
> + depends on VIM_VIM && !BUSYBOX_VI
This should have a '|| ALLYES' at the end for better build tests.
Michael
> + bool "install symbolic link /usr/bin/vi"
> + default y
> +
> comment "BusyBox' xxd is selected!"
> depends on BUSYBOX_XXD
>
> diff --git a/rules/vim.make b/rules/vim.make
> index b03778e53..8700b70bd 100644
> --- a/rules/vim.make
> +++ b/rules/vim.make
> @@ -103,6 +103,10 @@ VIM_INSTALL_OPT := \
>
> VIM_LINKS := ex rview rvim view vimdiff
>
> +ifdef PTXCONF_VIM_VI_SYMLINK
> +VIM_LINKS += vi
> +endif
> +
> $(STATEDIR)/vim.targetinstall:
> @$(call targetinfo)
>
> --
> 2.43.0
>
>
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 4/4] ptxd_make_world_inject: Introduce separate destination directory
On Wed, Apr 24, 2024 at 04:31:09PM +0200, Alexander Dahl wrote:
> Setting the optional _INJECT_DEST now allows to give a different
> target for putting the binary blobs into. When building out-of-tree
> some bootloaders like U-Boot expect injected files in the build dir, not
> in the source dir. Backwards compatibility is ensured, the source dir
> is still the default, the new inject dest is optional and in case set it
> overwrites the default.
>
> For using this in u-boot package, on top of the things already done to
> use the inject mechanism in general, add this line to
> 'rules/u-boot.make' for example:
>
> U_BOOT_INJECT_DEST := $(U_BOOT_BUILD_DIR)
Can you add a patch for u-boot?
>
> Signed-off-by: Alexander Dahl
> ---
> rules/post/ptxd_make_world_inject.make | 3 ++-
> scripts/lib/ptxd_make_world_inject.sh | 22 ++
> 2 files changed, 20 insertions(+), 5 deletions(-)
>
> diff --git a/rules/post/ptxd_make_world_inject.make
> b/rules/post/ptxd_make_world_inject.make
> index eabcdd052..509d480ba 100644
> --- a/rules/post/ptxd_make_world_inject.make
> +++ b/rules/post/ptxd_make_world_inject.make
> @@ -9,7 +9,8 @@
> world/inject/env = \
> $(call world/env, $(1)) \
> pkg_inject_path="$(call ptx/escape,$($(1)_INJECT_PATH))" \
> - pkg_inject_files="$(call ptx/escape,$($(1)_INJECT_FILES))"
> + pkg_inject_files="$(call ptx/escape,$($(1)_INJECT_FILES))" \
> + pkg_inject_dest="$(call ptx/escape,$($(1)_INJECT_DEST))"
>
> world/inject = \
> $(call world/inject/env,$(strip $(1))) \
> diff --git a/scripts/lib/ptxd_make_world_inject.sh
> b/scripts/lib/ptxd_make_world_inject.sh
> index b74e464c6..90bd8b684 100644
> --- a/scripts/lib/ptxd_make_world_inject.sh
> +++ b/scripts/lib/ptxd_make_world_inject.sh
> @@ -7,10 +7,15 @@
> #
>
> ptxd_make_inject() {
> -local source target
> +local dest source target
> +
> +dest="${pkg_dir}"
> +if [ -n "${pkg_inject_dest}" ]; then
> + dest="${pkg_inject_dest}"
> +fi
This should be in ptxd_make_world_inject(). It remains the same for all
files.
>
> source="$(echo ${inject_file} | cut -d ":" -f 1)"
> -target="${pkg_dir}/$(echo ${inject_file} | cut -d ":" -f 2)"
> +target="${dest}/$(echo ${inject_file} | cut -d ":" -f 2)"
>
> if [[ "${source}" =~ ^/.* ]]; then
> ptxd_bailout "'${source}' must not be an absolute path!" \
> @@ -32,8 +37,17 @@ export -f ptxd_make_inject
> ptxd_make_world_inject() {
> ptxd_make_world_init || return
>
> -if [ -z "${pkg_dir}" ]; then
> - ptxd_bailout "_DIR empty, no destination to inject to."
> +if [ -z "${pkg_inject_dest}" ] && [ -z "${pkg_dir}" ]; then
> + ptxd_bailout "No destination to inject to." \
> + "Set either _DIR or _INJECT_DEST to have a valid
> destination!"
> +fi
> +
> +if [ -n "${pkg_inject_dest}" ]; then
> + if [ "${pkg_build_dir}" = "${pkg_inject_dest}" ] && [
> "${pkg_build_oot}" = "YES" ]; then
This gives a warning even in the good case, right? I think we should
require that pkg_inject_dest already exists at this point and fail if it
does not.
Michael
> + ptxd_warning "_INJECT_DEST is set to _BUILD_DIR and
> _BUILD_OOT is set to 'YES'." \
> + "If you called world/inject before world/prepare your files
> will be removed after injecting."
> + fi
> + mkdir -p -- "${pkg_inject_dest}"
> fi
>
> for inject_file in ${pkg_inject_files}; do
> --
> 2.39.2
>
>
>
--
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] wayland-protocols: version bump 1.34 -> 1.35
Thanks, applied as 549a207826f541515b26c8f8bdcc1b8df23fe3c5. Michael [sent from post-receive hook] On Fri, 03 May 2024 10:29:47 +0200, Philipp Zabel wrote: > Marks the tablet-v2 protocol as stable. New protocol: alpha-modifier. > Some small buf fixes and clarifications. > > https://lists.freedesktop.org/archives/wayland-devel/2024-April/043572.html > > Signed-off-by: Philipp Zabel > Message-Id: <20240417160030.184488-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make > index 2f28746379c7..066e9b00071b 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.34 > -WAYLAND_PROTOCOLS_MD5:= 512393249240369ad70a17dd0f98edaa > +WAYLAND_PROTOCOLS_VERSION:= 1.35 > +WAYLAND_PROTOCOLS_MD5:= cd0f2a1ab6e54568e4f856f140dedca9 > 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] linux-firmware: Version bump. 20240312 -> 20240410
Thanks, applied as df5a93146d57e03ce217923eda901272bc39dbef. Michael [sent from post-receive hook] On Fri, 03 May 2024 10:29:46 +0200, Christian Melki wrote: > No license file changes. > https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20240410 > > Signed-off-by: Christian Melki > Message-Id: <20240412164840.2165113-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make > index 6473f1f86064..f12901f024f5 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 := 20240312 > -LINUX_FIRMWARE_MD5 := 9dde672fd15408bca23a4df38d4513e2 > +LINUX_FIRMWARE_VERSION := 20240410 > +LINUX_FIRMWARE_MD5 := 62c5622044539ca0a431a19d7c57bc02 > 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))
Re: [ptxdist] [APPLIED] mesalib: version bump 24.0.4 -> 24.0.5
Thanks, applied as f1838e1f4b5aa2cb9deb5bf59828ea71c00e. Michael [sent from post-receive hook] On Fri, 03 May 2024 10:29:45 +0200, Philipp Zabel wrote: > https://docs.mesa3d.org/relnotes/24.0.5.html > > Signed-off-by: Philipp Zabel > Message-Id: <20240412080840.3882092-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-mesalib.make b/rules/host-mesalib.make > index f353f8f434e8..3bf420f44191 100644 > --- a/rules/host-mesalib.make > +++ b/rules/host-mesalib.make > @@ -64,7 +64,6 @@ HOST_MESALIB_CONF_OPT := \ > -Dimagination-srv=false \ > -Dinstall-intel-gpu-tests=false \ > -Dintel-clc=disabled \ > - -Dintel-xe-kmd=disabled \ > -Dlibunwind=disabled \ > -Dllvm=disabled \ > -Dlmsensors=disabled \ > diff --git a/rules/mesalib.make b/rules/mesalib.make > index eee7d5880e80..4a278f6a640c 100644 > --- a/rules/mesalib.make > +++ b/rules/mesalib.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib > # > # Paths and names > # > -MESALIB_VERSION := 24.0.4 > -MESALIB_MD5 := de4661e901f2dfb194e6b1bf04dc2171 > +MESALIB_VERSION := 24.0.5 > +MESALIB_MD5 := 8d8c4bb8d938adcf1a9381570d45 > MESALIB := mesa-$(MESALIB_VERSION) > MESALIB_SUFFIX := tar.xz > MESALIB_URL := \ > @@ -191,7 +191,6 @@ MESALIB_CONF_OPT := \ > -Dimagination-srv=false \ > -Dinstall-intel-gpu-tests=false \ > -Dintel-clc=disabled \ > - -Dintel-xe-kmd=disabled \ > -Dlibunwind=disabled \ > -Dllvm=$(call ptx/endis, PTXCONF_MESALIB_LLVM)d \ > -Dlmsensors=$(call ptx/endis, PTXCONF_MESALIB_LMSENSORS)d \
[ptxdist] [ANNOUNCE] PTXdist 2024.05.0 released
Hi,
I'm happy to announce that I've just released ptxdist-2024.05.0.
This is a smaller and rather boring release. No really big changes.
There is a new polkit version that makes it more usable for embedded use
cases. It comes with a JavaScript engine that makes it rather easy to write
policies that make sense for embedded devices.
The rest are mostly version bumps and a few new packages and bugfixes.
Thanks to all contributors and - as always - the shortlog below.
Enjoy,
Michael Olbrich
Ahmad Fatoum (1):
tf-a: stop defining AS and other variables in cross make env
Alexander Dahl (2):
Revert "initmethod-bbinit: add more empty folders for ifupdown"
Revert "initmethod-systemd: add more empty folders for ifupdown"
Christian Melki (16):
libxkbcommon: Version bump. 1.6.0 -> 1.7.0
zstd: Version bump. 1.5.5 -> 1.5.6
libcurl: Version bump. 8.6.0 -> 8.7.1
host-libcurl: Follow target libcurl.
hwdata: Version bump. 0.380 -> 0.381.
sdl2: Version bump. 2.30.1 -> 2.30.2
mtd-utils: Version bump. 2.1.6 -> 2.2.0
host-mtd-utils: Follow target mtd-utils
util-linux: Version bump. 2.39.3 -> 2.40
host-util-linux: Follow target util-linux.
mtdev: Version bump. 1.1.6 -> 1.1.7
pciutils: Version bump. 3.11.1 -> 3.12.0
chrony: Fix URL.
libarchive: Version bump. 3.7.2 -> 3.7.3
libcap-ng: Version bump. 0.8.4 -> 0.8.5
linux-firmware: Version bump. 20240312 -> 20240410
Markus Heidelberg (2):
Fix typos "can/must be uses" -> "used"
Fix duplicated "to to" in texts
Michael Olbrich (32):
iperf3: version bump 3.6 -> 3.16
ptxd_make_nested: only redirect PTXDIST_FD_STD{OUT,ERR} if defined
{host-,}shaderc: explicitly use the Python wrapper
util-linux: allow 32-bit time_t if Y2K38 support is disabled
systemd: don't use install_alternative_tree for a /usr/share/polkit-1
duktape: new package
polkit: version bump 0.105 -> 124
libatasmart: new package
libnvme: new package
mpfr: new package
libbytesize: new package
libblockdev: new package
udisks: new package
gstreamer1: version bump 1.24.1 -> 1.24.2
gst-plugins-base1: version bump 1.24.1 -> 1.24.2
gst-plugins-good1: version bump 1.24.1 -> 1.24.2
gst-plugins-bad1: version bump 1.24.1 -> 1.24.2
gst-plugins-ugly1: version bump 1.24.1 -> 1.24.2
gst-devtools1: version bump 1.24.1 -> 1.24.2
gst-libav1: version bump 1.24.1 -> 1.24.2
gst-plugins-rs: version bump 1.24.1 -> 1.24.2
gst-python1: version bump 1.24.1 -> 1.24.2
gst-rtsp-server1: version bump 1.24.1 -> 1.24.2
gstreamer-vaapi1: version bump 1.24.1 -> 1.24.2
intel-gmmlib: version bump 22.3.16 -> 22.3.19
intel-media-driver: version bump 23.4.3 -> 24.2.0
host-glslang: add missing dependency
libbytesize: only build & install in src/
gdb: don't use libmpfr without depending on it
polkit: allow building without polkitd
beep: move to staging
ntpclient: move to staging
Michael Tretter (1):
rauc/image-rauc: move BUNDLE_VERSION to image-rauc
Philipp Zabel (15):
mesalib: version bump 24.0.3 -> 24.0.4
wayland-protocols: version bump 1.33 -> 1.34
glslang: version bump 1.3.275.0 -> 1.3.280.0
spirv-headers: version bump 1.3.275.0 -> 1.3.280.0
spirv-tools: version bump 1.3.275.0 -> 1.3.280.0
volk: version bump 1.3.275.0 -> 1.3.280.0
vulkan-headers: version bump 1.3.275.0 -> 1.3.280.0
vulkan-loader: version bump 1.3.275.0 -> 1.3.280.0
vulkan-tools: version bump 1.3.275.0 -> 1.3.280.0
vulkan-utility-libraries: version bump 1.3.275.0 -> 1.3.280.0
vulkan-validationlayers: version bump 1.3.275.0 -> 1.3.280.0
shaderc: version bump v2023.8 -> v2024.0
opus: add machine learning options
mesalib: version bump 24.0.4 -> 24.0.5
wayland-protocols: version bump 1.34 -> 1.35
--
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
Re: [ptxdist] [PATCH v6 3/5] scripts: add helper to inject files into a source directory
On Fri, Apr 19, 2024 at 11:48:51AM +0200, Alexander Dahl wrote: > sorry for digging up this old discussion, but I kind of want to use this > approach and … see below. > > Am Samstag, 29. Januar 2022, 08:03:28 CEST schrieb Michael Riesch: > > Some packages may require certain files that are maintained > > or generated outside of their source repository. For example, > > binary firmware blobs could be excluded from the sources due > > to licensing issues. Add a helper that allows to inject certain > > files into the source directory (usually in the prepare stage). > > Currently trying to build recent U-Boot for i.MX8 and i.MX9 based boards > which > require additional firmware. However I still want to build OOT to keep my > source tree clean, especially when building with an external tree (after > `ptxdist local-src u-boot $HOME/src/u-boot`). > > Now U-Boot needs those binaries in the build tree, it does not work using > this > nice inject mechanism putting it in the source tree. > > > > > Signed-off-by: Michael Riesch > > --- > > > > Notes: > > v6: > > - replaced 'break' with 'return' > > > > rules/post/ptxd_make_world_inject.make | 19 > > scripts/lib/ptxd_make_world_inject.sh | 42 ++ > > 2 files changed, 61 insertions(+) > > create mode 100644 rules/post/ptxd_make_world_inject.make > > create mode 100644 scripts/lib/ptxd_make_world_inject.sh > > > > diff --git a/rules/post/ptxd_make_world_inject.make > > b/rules/post/ptxd_make_world_inject.make new file mode 100644 > > index 0..b7d28e92f > > --- /dev/null > > +++ b/rules/post/ptxd_make_world_inject.make > > @@ -0,0 +1,19 @@ > > +# -*-makefile-*- > > +# > > +# Copyright (C) 2021 by Michael Riesch > > +# > > +# For further information about the PTXdist project and license conditions > > +# see the README file. > > +# > > + > > +world/inject/env = \ > > + $(call world/env, $(1)) \ > > + pkg_inject_path="$($(1)_INJECT_PATH)" \ > > + pkg_inject_files="$($(1)_INJECT_FILES)" \ > > + pkg_source="$($(1)_DIR)" > > Here _DIR is assigned to pkg_source which makes the source dir the > target > folder. > > Did anyone already think of how to extend this approach to be more flexible > for the target folder? Maybe even without damaging existing use cases? > > Maybe adding a new optional variable _INJECT_DEST which defaults to > _DIR and can be overridden? Makes sense to me. I would have named it _INJECT_DIR but either is fine with me. And if it's empty, set it to pkg_dir in ptxd_make_world_inject() Regards, Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12
On Wed, Apr 24, 2024 at 05:33:22PM +0200, Ladislav Michl wrote: > On Tue, Apr 23, 2024 at 07:36:52AM +0200, Ladislav Michl wrote: > > Move package to a new upstream at https://github.com/spkr-beep/beep/ > > For v5te I needed to add LDFLAGS=-latomic to satisfy undefined reference: > arm-v5te-linux-gnueabi-gcc -Wl,-Map=beep.map,--cref > -fasynchronous-unwind-tables -fanalyzer -fstack-protector-strong > -fstack-clash-protection -fsanitize=undefined -save-temps=obj -O2 -g > -std=gnu99 -pedantic -Wall -Wextra -Werror -Wno-padded -Wno-format-nonliteral > -o beep beep-log.o beep-main.o beep-library.o beep-usage.o beep-drivers.o > beep-driver-console.o beep-driver-evdev.o > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: > > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: > undefined reference to `__atomic_compare_exchange_8' > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/bin/ld: > > /opt/OSELAS.Toolchain-2023.07.1/arm-v5te-linux-gnueabi/gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized/lib/gcc/arm-v5te-linux-gnueabi/13.2.1/../../../../arm-v5te-linux-gnueabi/lib/libubsan.so: > undefined reference to `__atomic_load_8' > collect2: error: ld returned 1 exit status > > I can see haproxy and dhcp packages are adding target flags based on > selected architecture. Is it to way to follow here? Yes, please handle it like that. If it's missing for other architectures (ppc is a possibility here), I'll fix it when it fails in my tests. Regards, Michael -- Pengutronix e.K. | | Steuerwalder Str. 21 | http://www.pengutronix.de/ | 31137 Hildesheim, Germany | Phone: +49-5121-206917-0| Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917- |
Re: [ptxdist] [APPLIED] rauc/image-rauc: move BUNDLE_VERSION to image-rauc
Thanks, applied as 6ffbc11e383c3d674aca5868dce606d875c544cc.
Michael
[sent from post-receive hook]
On Thu, 11 Apr 2024 17:04:59 +0200, Michael Tretter
wrote:
> RAUC_BUNDLE_VERSION is only used by the image rule to generate the
> bundle. Therefore, it belongs into image-rauc.
>
> This fixes the issue that RAUC is rebuilt on every commit in a BSP, as a
> commit changes PTXDIST_BSP_AUTOVERSION, which in turn changes the
> configuration of RAUC. The rebuild is not necessary and only the RAUC
> bundle should be rebuilt if the version has changed.
>
> Rename the config, as the move to the image moves the item from the
> ptxconfig to the platformconfig.
>
> Signed-off-by: Michael Tretter
> Message-Id: <20240410081234.3902043-1-m.tret...@pengutronix.de>
> [mol: fix indention]
> Signed-off-by: Michael Olbrich
>
> diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in
> index 2070cf0069c1..2faa8ff7e1d8 100644
> --- a/platforms/image-rauc.in
> +++ b/platforms/image-rauc.in
> @@ -19,6 +19,13 @@ menuconfig IMAGE_RAUC
>
> if IMAGE_RAUC
>
> +config IMAGE_RAUC_BUNDLE_VERSION
> + string
> + prompt "RAUC Bundle Version"
> + default "${PTXDIST_BSP_AUTOVERSION}"
> + help
> + Version that will be placed in the bundle's metadata.
> +
> config IMAGE_RAUC_DESCRIPTION
> prompt "RAUC Bundle Description"
> string
> diff --git a/rules/image-rauc.make b/rules/image-rauc.make
> index a05c19f61de2..30e460dd8cd7 100644
> --- a/rules/image-rauc.make
> +++ b/rules/image-rauc.make
> @@ -58,7 +58,7 @@ IMAGE_RAUC_ENV = \
> $(CODE_SIGNING_ENV) \
> RAUC_BUNDLE_COMPATIBLE="$(call
> remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \
> RAUC_BUNDLE_FORMAT=$(IMAGE_RAUC_BUNDLE_FORMAT) \
> - RAUC_BUNDLE_VERSION="$(call remove_quotes,
> $(PTXCONF_RAUC_BUNDLE_VERSION))" \
> + RAUC_BUNDLE_VERSION="$(call remove_quotes,
> $(PTXCONF_IMAGE_RAUC_BUNDLE_VERSION))" \
> RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \
> RAUC_BUNDLE_DESCRIPTION="$(call remove_quotes,
> $(PTXCONF_IMAGE_RAUC_DESCRIPTION))" \
> $(IMAGE_RAUC_ENV_HOOK) \
> diff --git a/rules/rauc.in b/rules/rauc.in
> index e67f5131c615..ee9c3f955b79 100644
> --- a/rules/rauc.in
> +++ b/rules/rauc.in
> @@ -105,13 +105,6 @@ config RAUC_COMPATIBLE
> Only if the compatible in the targets RAUC system.conf file and those
> in the Bundle's manifest match exactly, an update will be performed
>
> -config RAUC_BUNDLE_VERSION
> - string
> - prompt "RAUC Bundle Version"
> - default "${PTXDIST_BSP_AUTOVERSION}"
> - help
> - Overwrite the bundle version if needed.
> -
> endif
>
> config RAUC_BAREBOX
Re: [ptxdist] [APPLIED] libcap-ng: Version bump. 0.8.4 -> 0.8.5
Thanks, applied as 65365688811e7081a6b604be1f41c5ccdaf7e75a. Michael [sent from post-receive hook] On Thu, 11 Apr 2024 17:05:01 +0200, Christian Melki wrote: > Minor changes. > https://github.com/stevegrubb/libcap-ng/blob/v0.8.5/ChangeLog > > Signed-off-by: Christian Melki > Message-Id: <20240410163335.940184-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libcap-ng.make b/rules/libcap-ng.make > index d508e1986217..f85c96eb56a7 100644 > --- a/rules/libcap-ng.make > +++ b/rules/libcap-ng.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAP_NG) += libcap-ng > # > # Paths and names > # > -LIBCAP_NG_VERSION:= 0.8.4 > -LIBCAP_NG_MD5:= 950748fcbc46a9bacf544e97724e46a2 > +LIBCAP_NG_VERSION:= 0.8.5 > +LIBCAP_NG_MD5:= 3c280d902b902f28caf3990e018fcd31 > LIBCAP_NG:= libcap-ng-$(LIBCAP_NG_VERSION) > LIBCAP_NG_SUFFIX := tar.gz > LIBCAP_NG_URL:= > http://people.redhat.com/sgrubb/libcap-ng/$(LIBCAP_NG).$(LIBCAP_NG_SUFFIX)
Re: [ptxdist] [APPLIED] libarchive: Version bump. 3.7.2 -> 3.7.3
Thanks, applied as a0c08f59bea10e337da7776425932f5e39ce300a. Michael [sent from post-receive hook] On Thu, 11 Apr 2024 17:04:59 +0200, Christian Melki wrote: > Version bump after the xz debacle. > libarchive was affected by the same malicious user and 3.7.3 > has reviewed relevant commits. > > https://github.com/libarchive/libarchive/releases/tag/v3.7.3 > https://github.com/libarchive/libarchive/issues/2103 > > Signed-off-by: Christian Melki > Message-Id: <20240409202050.1649970-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/libarchive.make b/rules/libarchive.make > index eb22652aa8ab..267d8c0fe90e 100644 > --- a/rules/libarchive.make > +++ b/rules/libarchive.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBARCHIVE) += libarchive > # > # Paths and names > # > -LIBARCHIVE_VERSION := 3.7.2 > -LIBARCHIVE_MD5 := dfaf015d642da9235bdd8270460928f7 > +LIBARCHIVE_VERSION := 3.7.3 > +LIBARCHIVE_MD5 := a6bf48d0d4f4974c4eac58341ced1227 > LIBARCHIVE := libarchive-$(LIBARCHIVE_VERSION) > LIBARCHIVE_SUFFIX:= tar.gz > LIBARCHIVE_URL := > https://www.libarchive.org/downloads/$(LIBARCHIVE).$(LIBARCHIVE_SUFFIX)
Re: [ptxdist] [APPLIED] chrony: Fix URL.
Thanks, applied as 1d1944bb28c5fc6b4de4c8789a24acdd7f7b5719. Michael [sent from post-receive hook] On Thu, 11 Apr 2024 17:04:58 +0200, Christian Melki wrote: > tuxfamily.org seems down. Atleast partly. > Might as well adjust the URL to something officially > listed at: > > https://chrony-project.org/download.html > > Signed-off-by: Christian Melki > Message-Id: <20240409200045.1135011-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/chrony.make b/rules/chrony.make > index faa7e9a691d9..5b320d4a4265 100644 > --- a/rules/chrony.make > +++ b/rules/chrony.make > @@ -19,7 +19,7 @@ CHRONY_VERSION := 4.5 > CHRONY_MD5 := fa50d026df54f9919e6a37fae1258c61 > CHRONY := chrony-$(CHRONY_VERSION) > CHRONY_SUFFIX:= tar.gz > -CHRONY_URL := > http://download.tuxfamily.org/chrony/$(CHRONY).$(CHRONY_SUFFIX) > +CHRONY_URL := > https://chrony-project.org/releases/$(CHRONY).$(CHRONY_SUFFIX) > CHRONY_SOURCE:= $(SRCDIR)/$(CHRONY).$(CHRONY_SUFFIX) > CHRONY_DIR := $(BUILDDIR)/$(CHRONY) > CHRONY_LICENSE := GPL-2.0-only AND RSA-MD
Re: [ptxdist] [APPLIED] tf-a: stop defining AS and other variables in cross make env
Thanks, applied as 341428f780542f718348dd9138c50a577f2998cd.
Michael
[sent from post-receive hook]
On Thu, 11 Apr 2024 17:04:57 +0200, Ahmad Fatoum
wrote:
> The MAKE_ENV incantation results in PTXdist defining variables like AS
> and LD that point at the respective tools in the cross toolchain.
>
> This was unused as TF-A doesn't consult the AS setting in the
> environment, and unneeded, because we already supply a CROSS_COMPILE
> option, which is used to derive the correct tools.
>
> This will expectedly change with TF-A v2.11, which should merge commit
> cc277de81692 ("build: refactor toolchain detection"), currently sitting
> in the integration branch[1].
>
> This will start accepting AS to be set from the environment and not only
> from the make arguments. This will break using the default cross env as
> TF-A assumes AS to point at a C compiler and not at an assembler.
>
> This will result in build issues, like[2]:
>
> - hang during tool discovery, because `as -v` keeps waiting for input,
> unlike gcc -v
>
> - Assembler errors during build, because GCC-specific options (e.g.
> -DMACRO=VAL) are now passed to as(1).
>
> Avoid these issues by not defining the CROSS_ENV.
>
> [1]: https://github.com/ARM-software/arm-trusted-firmware/commit/cc277de8169
> [2]: https://review.trustedfirmware.org/c/TF-A/trusted-firmware-a/+/27163
>
> Signed-off-by: Ahmad Fatoum
> Message-Id: <20240409102429.3143482-1-a.fat...@pengutronix.de>
> Signed-off-by: Michael Olbrich
>
> diff --git a/rules/tf-a.make b/rules/tf-a.make
> index 54fe7d1e37d8..b8c477476c74 100644
> --- a/rules/tf-a.make
> +++ b/rules/tf-a.make
> @@ -74,8 +74,6 @@ TF_A_CONF_TOOL := NO
> # Compile
> #
>
>
> -TF_A_MAKE_ENV:= $(CROSS_ENV)
> -
> $(STATEDIR)/tf-a.compile:
> @$(call targetinfo)
>
Re: [ptxdist] [APPLIED] Fix duplicated "to to" in texts
Thanks, applied as 7b26087bb4521871942476f077598bedc17bf29e. Michael [sent from post-receive hook] On Thu, 11 Apr 2024 17:04:56 +0200, Markus Heidelberg wrote: > Signed-off-by: Markus Heidelberg > Reviewed-by: Alexander Dahl > Message-Id: <20240409073745.1549906-3-m.heidelb...@cab.de> > Signed-off-by: Michael Olbrich > > diff --git a/doc/ref_make_variables.rst b/doc/ref_make_variables.rst > index 6bba9db5d773..775ff71be64f 100644 > --- a/doc/ref_make_variables.rst > +++ b/doc/ref_make_variables.rst > @@ -486,7 +486,7 @@ different. >Note that this will not ensure that the packages are enabled or that all >all package dependencies are satisfied. ``$(PTX_PACKAGES_INSTALL)`` can >be used to specify all enabled packages. Or ``$(call ptx/collection, > - $(PTXDIST_WORKSPACE)/configs/)`` can be used to to > + $(PTXDIST_WORKSPACE)/configs/)`` can be used to >specify the packages enabled by this collection. In both cases ``=`` must >be used instead of ``:=`` due to the makefile include order. > > diff --git a/platforms/image_ipkg.in b/platforms/image_ipkg.in > index 106a3cb77d97..11ddaa9d1e35 100644 > --- a/platforms/image_ipkg.in > +++ b/platforms/image_ipkg.in > @@ -30,7 +30,7 @@ menuconfig IMAGE_IPKG_SIGN_OPENSSL > select HOST_OPENSSL > prompt "sign ipkg-repository with openssl" > help > - Use openssl to to sign the Packages file in the package > + Use openssl to sign the Packages file in the package > repository. > >
Re: [ptxdist] [APPLIED] Fix typos "can/must be uses" -> "used"
Thanks, applied as 4afd6a07eaae49b0cf9e8c1681140fb38eb0cabe. Michael [sent from post-receive hook] On Thu, 11 Apr 2024 17:04:55 +0200, Markus Heidelberg wrote: > Signed-off-by: Markus Heidelberg > Reviewed-by: Alexander Dahl > Message-Id: <20240409073745.1549906-2-m.heidelb...@cab.de> > Signed-off-by: Michael Olbrich > > diff --git a/doc/multi_image_platforms.inc b/doc/multi_image_platforms.inc > index 2c8838f4eca5..726a4276740c 100644 > --- a/doc/multi_image_platforms.inc > +++ b/doc/multi_image_platforms.inc > @@ -26,7 +26,7 @@ package rules manually. See :ref:`adding_new_packages` for > more details one > how to create a new package. > > .. note:: PTXdist looks in ``patches/$()`` for the patches. Symlinks > - can be uses to share the patch stack across multiple bootloader packages. > + can be used to share the patch stack across multiple bootloader packages. > > .. _multi_image_individual_root_filesystems: > > @@ -46,7 +46,7 @@ There are two ways to mange the package list for the image: > Manually create the package list by listing package names or using > **make** > macros to manipulate the default package list ``$(PTX_PACKAGES_INSTALL)``. > > - To add a single custom package, extra packages can be uses. An extra > package > + To add a single custom package, extra packages can be used. An extra > package > is not added to ``$(PTX_PACKAGES_INSTALL)``. It is created by modifying > the > package rule like this: > > @@ -93,7 +93,7 @@ The final steps are highly hardware dependent. In some > cases a bootloader > image and a rootfs are all that is needed. > > To boot from SD-Card a disk image including bootloader, partition table and > -rootfs is needed. The ``image-genimage`` template can be uses again to > +rootfs is needed. The ``image-genimage`` template can be used again to > create such an image for each variant. > > .. note:: The genimage config files in ``config/images/`` are good examples > diff --git a/doc/ref_make_variables.rst b/doc/ref_make_variables.rst > index 31616ac6f349..6bba9db5d773 100644 > --- a/doc/ref_make_variables.rst > +++ b/doc/ref_make_variables.rst > @@ -478,7 +478,7 @@ different. >package then this package should be selected in the menu file. > > ``_PKGS`` > - This is another mechanism to add files to the image. It can be uses > + This is another mechanism to add files to the image. It can be used >instead of or in addition to ``_FILES``. It must be set to a list of >ptxdist packages (the lowercase name of the packages). PTXdist will add >the necessary dependencies. > @@ -486,9 +486,9 @@ different. >Note that this will not ensure that the packages are enabled or that all >all package dependencies are satisfied. ``$(PTX_PACKAGES_INSTALL)`` can >be used to specify all enabled packages. Or ``$(call ptx/collection, > - $(PTXDIST_WORKSPACE)/configs/)`` can be uses to to > + $(PTXDIST_WORKSPACE)/configs/)`` can be used to to >specify the packages enabled by this collection. In both cases ``=`` must > - be uses instead of ``:=`` due to the makefile include order. > + be used instead of ``:=`` due to the makefile include order. > > ``_CONFIG`` >``genimage`` packages use this to specify the ``genimage`` configuration > diff --git a/rules/other/Toplevel.make b/rules/other/Toplevel.make > index f1a13d72f9b8..ac2289431ea9 100644 > --- a/rules/other/Toplevel.make > +++ b/rules/other/Toplevel.make > @@ -203,7 +203,7 @@ endif > # > # Pattern target to allow printing variable > # $(filter ..) is used to match against all existing variables so patterns > -# containing '%' can be uses to print multiple variables. > +# containing '%' can be used to print multiple variables. > # In verbose mode, '=' is printed. > # Trying to print undefined variables results in an error unless '-k' is > # used. In this case an empty value is printed.
Re: [ptxdist] [APPLIED] pciutils: Version bump. 3.11.1 -> 3.12.0
Thanks, applied as efbd1d9a848f7e06c83976500d12ade2dd76c832. Michael [sent from post-receive hook] On Thu, 11 Apr 2024 17:04:54 +0200, Christian Melki wrote: > Minor changes. > https://github.com/pciutils/pciutils/blob/v3.12.0/ChangeLog > > Signed-off-by: Christian Melki > Message-Id: <20240408193617.2460509-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/pciutils.make b/rules/pciutils.make > index f2da15ebe236..20e2b7f7e0cc 100644 > --- a/rules/pciutils.make > +++ b/rules/pciutils.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PCIUTILS) += pciutils > # > # Paths and names > # > -PCIUTILS_VERSION := 3.11.1 > -PCIUTILS_MD5 := b97a06ef3944b1a4afdb46ac6d7b8600 > +PCIUTILS_VERSION := 3.12.0 > +PCIUTILS_MD5 := f6607d41eb8ce0f676368a1012b5fe5c > PCIUTILS := pciutils-$(PCIUTILS_VERSION) > PCIUTILS_SUFFIX := tar.gz > PCIUTILS_URL := > https://github.com/pciutils/pciutils/archive/refs/tags/v$(PCIUTILS_VERSION).$(PCIUTILS_SUFFIX)
Re: [ptxdist] [APPLIED] mtdev: Version bump. 1.1.6 -> 1.1.7
Thanks, applied as e60a7add8050c2c024b0c4b533a590f361468695. Michael [sent from post-receive hook] On Thu, 11 Apr 2024 17:04:53 +0200, Christian Melki wrote: > Very minor changes. > > Signed-off-by: Christian Melki > Message-Id: <20240408191752.2455651-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/mtdev.make b/rules/mtdev.make > index 8b9986f25af7..57f337baf619 100644 > --- a/rules/mtdev.make > +++ b/rules/mtdev.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MTDEV) += mtdev > # > # Paths and names > # > -MTDEV_VERSION:= 1.1.6 > -MTDEV_MD5:= bf8ef2482e84a00b5db8fbd3ce00e249 > +MTDEV_VERSION:= 1.1.7 > +MTDEV_MD5:= 483ed7fdf7c1e7b7375c05a62848cce7 > MTDEV:= mtdev-$(MTDEV_VERSION) > MTDEV_SUFFIX := tar.bz2 > MTDEV_URL:= http://bitmath.org/code/mtdev/$(MTDEV).$(MTDEV_SUFFIX)
Re: [ptxdist] [APPLIED] mtd-utils: Version bump. 2.1.6 -> 2.2.0
Thanks, applied as 38ae08e600e8eadaf8ff26c7f8617479435754a8. Michael [sent from post-receive hook] On Mon, 08 Apr 2024 13:05:37 +0200, Christian Melki wrote: > Not overly exciting. > https://lists.infradead.org/pipermail/linux-mtd/2024-March/104058.html > > * Fix options that changed from endis to wwo. > > * Forward patchset, applies cleanly. > > Signed-off-by: Christian Melki > Message-Id: <20240406180520.35472-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git > a/patches/mtd-utils-2.1.6/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > > b/patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > similarity index 100% > rename from > patches/mtd-utils-2.1.6/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > rename to > patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch > diff --git a/patches/mtd-utils-2.1.6/autogen.sh > b/patches/mtd-utils-2.2.0/autogen.sh > similarity index 100% > rename from patches/mtd-utils-2.1.6/autogen.sh > rename to patches/mtd-utils-2.2.0/autogen.sh > diff --git a/patches/mtd-utils-2.1.6/series b/patches/mtd-utils-2.2.0/series > similarity index 100% > rename from patches/mtd-utils-2.1.6/series > rename to patches/mtd-utils-2.2.0/series > diff --git a/rules/mtd-utils.make b/rules/mtd-utils.make > index bef25b9ab063..9722c20a5a7d 100644 > --- a/rules/mtd-utils.make > +++ b/rules/mtd-utils.make > @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MTD_UTILS) += mtd-utils > # > # Paths and names > # > -MTD_UTILS_VERSION:= 2.1.6 > -MTD_UTILS_MD5:= 2851d4b13e5c1cf9415f76102a34d623 > +MTD_UTILS_VERSION:= 2.2.0 > +MTD_UTILS_MD5:= 35d71328107c54068c8df5a3b980c06e > MTD_UTILS:= mtd-utils-$(MTD_UTILS_VERSION) > MTD_UTILS_SUFFIX := tar.bz2 > MTD_UTILS_URL:= > https://infraroot.at/pub/mtd/$(MTD_UTILS).$(MTD_UTILS_SUFFIX) > @@ -35,9 +35,9 @@ MTD_UTILS_CONF_OPT := \ > $(CROSS_AUTOCONF_USR) \ > --disable-unit-tests \ > $(GLOBAL_LARGE_FILE_OPTION) \ > - --$(call ptx/endis,PTXCONF_MTD_UTILS_TESTS)-tests \ > + --$(call ptx/wwo,PTXCONF_MTD_UTILS_TESTS)-tests \ > --$(call ptx/endis,PTXCONF_MTD_UTILS_UBIHEALTHD)-ubihealthd \ > - --$(call ptx/endis, PTXCONF_MTD_UTILS_LSMTD)-lsmtd \ > + --$(call ptx/wwo, PTXCONF_MTD_UTILS_LSMTD)-lsmtd \ > --$(call ptx/wwo, PTXCONF_MTD_UTILS_JFFS)-jffs \ > --$(call ptx/wwo, PTXCONF_MTD_UTILS_UBIFS)-ubifs \ > --without-xattr \
Re: [ptxdist] [APPLIED] host-util-linux: Follow target util-linux.
Thanks, applied as f84605e61e041bb925420a4528697c3131674c92. Michael [sent from post-receive hook] On Mon, 08 Apr 2024 13:05:40 +0200, Christian Melki wrote: > * Disabled new functions. > > Signed-off-by: Christian Melki > Message-Id: <20240406202341.1082397-2-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-util-linux.make b/rules/host-util-linux.make > index 849c09c7a252..adaf0b86cd5a 100644 > --- a/rules/host-util-linux.make > +++ b/rules/host-util-linux.make > @@ -50,6 +50,7 @@ HOST_UTIL_LINUX_CONF_OPT:= \ > -Dbuild-last=disabled \ > -Dbuild-libblkid=enabled \ > -Dbuild-libfdisk=disabled \ > + -Dbuild-liblastlog2=disabled \ > -Dbuild-libmount=enabled \ > -Dbuild-libsmartcols=disabled \ > -Dbuild-libuuid=enabled \ > @@ -68,6 +69,7 @@ HOST_UTIL_LINUX_CONF_OPT:= \ > -Dbuild-newgrp=disabled \ > -Dbuild-nologin=disabled \ > -Dbuild-nsenter=disabled \ > + -Dbuild-pam-lastlog2=disabled \ > -Dbuild-partx=disabled \ > -Dbuild-pg=disabled \ > -Dbuild-pipesz=disabled \
Re: [ptxdist] [APPLIED] util-linux: Version bump. 2.39.3 -> 2.40
Thanks, applied as c7f0ce7be8df206885c261780e0be9d075572b22.
Michael
[sent from post-receive hook]
On Mon, 08 Apr 2024 13:05:39 +0200, Christian Melki
wrote:
> https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes
>
> * Switch URL. Release tarballs (using make dist)
> were missing files needed to build with meson.
> But the files are present in the git snapshot url.
>
> * New liblastlog2 stuff does seem to have various
> building issues etc, so disable them for now.
>
> * Old patches dropped, seem to be included in the new release.
>
> Signed-off-by: Christian Melki
> Message-Id: <20240406202341.1082397-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich
>
> diff --git
> a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
>
> b/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
> deleted file mode 100644
> index 01d07d3f6f1a..
> ---
> a/patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
> +++ /dev/null
> @@ -1,29 +0,0 @@
> -From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?=
> -Date: Sat, 5 Aug 2023 08:57:28 +0200
> -Subject: [PATCH] meson: properly handle gettext non-existence
> -MIME-Version: 1.0
> -Content-Type: text/plain; charset=UTF-8
> -Content-Transfer-Encoding: 8bit
> -
> -Commit e91a49c9747f ("meson: don't build po if no gettext")
> -tried to add the possibility to build util-linux without gettext.
> -
> -Unfortunately by default the call to find_program() would abort the
> -build if the program is not found.
> -Avoid aborting the build.
> -
> -Signed-off-by: Thomas Weißschuh
>
> - po/meson.build | 2 +-
> - 1 file changed, 1 insertion(+), 1 deletion(-)
> -
> -diff --git a/po/meson.build b/po/meson.build
> -index c10deafd28a6..8adfa48d8327 100644
> a/po/meson.build
> -+++ b/po/meson.build
> -@@ -1,4 +1,4 @@
> --if not find_program('gettext').found()
> -+if not find_program('gettext', required : false).found()
> - subdir_done()
> - endif
> -
> diff --git a/patches/util-linux-2.39.3/series
> b/patches/util-linux-2.39.3/series
> deleted file mode 100644
> index ca4f8cdfd9c4..
> --- a/patches/util-linux-2.39.3/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-meson-properly-handle-gettext-non-existence.patch
> -# 58d7fd4eca561971b85d47838b3463cf - git-ptx-patches magic
> diff --git a/rules/util-linux.make b/rules/util-linux.make
> index 2a2215570c39..60c6e9228ece 100644
> --- a/rules/util-linux.make
> +++ b/rules/util-linux.make
> @@ -15,12 +15,11 @@ PACKAGES-$(PTXCONF_UTIL_LINUX) += util-linux
> #
> # Paths and names
> #
> -UTIL_LINUX_VERSION := 2.39.3
> -UTIL_LINUX_MD5 := f3591e6970c017bb4bcd24ae762a98f5
> +UTIL_LINUX_VERSION := 2.40
> +UTIL_LINUX_MD5 := bc4272a7821bb12c68c441d23b8eaa89
> UTIL_LINUX := util-linux-$(UTIL_LINUX_VERSION)
> -UTIL_LINUX_SUFFIX:= tar.xz
> -UTIL_LINUX_BASENAME := v$(if $(filter 2,$(basename
> $(UTIL_LINUX_VERSION))),$(UTIL_LINUX_VERSION),$(basename
> $(UTIL_LINUX_VERSION)))
> -UTIL_LINUX_URL := $(call ptx/mirror, KERNEL,
> utils/util-linux/$(UTIL_LINUX_BASENAME)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX))
> +UTIL_LINUX_SUFFIX:= tar.gz
> +UTIL_LINUX_URL :=
> https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/snapshot/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
> UTIL_LINUX_SOURCE:= $(SRCDIR)/$(UTIL_LINUX).$(UTIL_LINUX_SUFFIX)
> UTIL_LINUX_DIR := $(BUILDDIR)/$(UTIL_LINUX)
> UTIL_LINUX_LICENSE := GPL-2.0-only AND GPL-2.0-or-later AND
> LGPL-2.0-or-later AND BSD-3-Clause AND BSD-4-Clause AND public_domain
> @@ -70,6 +69,7 @@ UTIL_LINUX_CONF_OPT := \
> -Dbuild-last=disabled \
> -Dbuild-libblkid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBBLKID)d \
> -Dbuild-libfdisk=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBFDISK)d \
> + -Dbuild-liblastlog2=disabled \
> -Dbuild-libmount=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBMOUNT)d \
> -Dbuild-libsmartcols=$(call ptx/endis,
> PTXCONF_UTIL_LINUX_LIBSMARTCOLS)d \
> -Dbuild-libuuid=$(call ptx/endis, PTXCONF_UTIL_LINUX_LIBUUID)d \
> @@ -88,6 +88,7 @@ UTIL_LINUX_CONF_OPT := \
> -Dbuild-newgrp=disabled \
> -Dbuild-nologin=disabled \
> -Dbuild-nsenter=$(call ptx/endis, PTXCONF_UTIL_LINUX_NSENTER)d \
> + -Dbuild-pam-lastlog2=disabled \
> -Dbuild-partx=$(call ptx/endis, PTXCONF_UTIL_LINUX_PARTX_TOOLS)d \
> -Dbuild-pg=disabled \
> -Dbuild-pipesz=$(call ptx/endis, PTXCONF_UTIL_LINUX_PIPESZ)d \
Re: [ptxdist] [APPLIED] host-mtd-utils: Follow target mtd-utils
Thanks, applied as ea8fc77e89ef131e3a98fd8395268aad57fe349f. Michael [sent from post-receive hook] On Mon, 08 Apr 2024 13:05:38 +0200, Christian Melki wrote: > * Fix options that changed from endis to wwo. > > Signed-off-by: Christian Melki > Message-Id: <20240406180520.35472-2-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/host-mtd-utils.make b/rules/host-mtd-utils.make > index 61179adce1b9..99de070836aa 100644 > --- a/rules/host-mtd-utils.make > +++ b/rules/host-mtd-utils.make > @@ -24,9 +24,9 @@ HOST_MTD_UTILS_CONF_OPT := \ > $(HOST_AUTOCONF) \ > --disable-unit-tests \ > --enable-largefile \ > - --disable-tests \ > + --without-tests \ > --disable-ubihealthd \ > - --disable-lsmtd \ > + --without-lsmtd \ > --without-jffs \ > --with-ubifs \ > --with-xattr \
Re: [ptxdist] [APPLIED] sdl2: Version bump. 2.30.1 -> 2.30.2
Thanks, applied as b55f88f1c7341aaa344ca03262a479c4a1714232. Michael [sent from post-receive hook] On Mon, 08 Apr 2024 13:05:36 +0200, Christian Melki wrote: > Minor stable series bump. Minor bugfixes. > https://github.com/libsdl-org/SDL/releases/tag/release-2.30.2 > > Signed-off-by: Christian Melki > Message-Id: <20240406170237.18837-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/sdl2.make b/rules/sdl2.make > index c8cdcf97b974..4959560a002d 100644 > --- a/rules/sdl2.make > +++ b/rules/sdl2.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2 > # > # Paths and names > # > -SDL2_VERSION := 2.30.1 > -SDL2_MD5 := a28514e50ef4bb5cc2e1e8c70553425d > +SDL2_VERSION := 2.30.2 > +SDL2_MD5 := 08667937c83fada423dacc7cd90f3ec8 > SDL2 := SDL2-$(SDL2_VERSION) > SDL2_SUFFIX := tar.gz > SDL2_URL := https://www.libsdl.org/release/$(SDL2).$(SDL2_SUFFIX)
Re: [ptxdist] [APPLIED] hwdata: Version bump. 0.380 -> 0.381.
Thanks, applied as 1fb5d91a735eb284a574b2ff457ade0167cc8c16. Michael [sent from post-receive hook] On Mon, 08 Apr 2024 13:05:35 +0200, Christian Melki wrote: > Usual ID bumps. > > Signed-off-by: Christian Melki > Message-Id: <20240406165953.4190648-1-christian.me...@t2data.com> > Signed-off-by: Michael Olbrich > > diff --git a/rules/hwdata.make b/rules/hwdata.make > index efd4eec22afd..ba1451b9ffb7 100644 > --- a/rules/hwdata.make > +++ b/rules/hwdata.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata > # > # Paths and names > # > -HWDATA_VERSION := 0.380 > -HWDATA_MD5 := 65d190da425b4fc9a38f4fb96b21f56f > +HWDATA_VERSION := 0.381 > +HWDATA_MD5 := 9db68f209f3393aa5bfa3217d7c890c5 > 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] opus: add machine learning options
Thanks, applied as 13df1bf7f28fbfe7632b2fba67391b9093dc5010. Michael [sent from post-receive hook] On Mon, 08 Apr 2024 13:05:34 +0200, Philipp Zabel wrote: > Allow to use machine learning methods that improve voice quality under > sporadic packet loss and at low bitrates, by enabling the deep packet > loss concealment (PLC) and opus speech coding enhancement (OSCE), > respectively. > > The speech coding enhancements are not yet standardized, but turning > them on does not have compability implications, as they are purely > voice quality enhancement steps done by the decoder. > > For details, see https://opus-codec.org/demo/opus-1.5/. > > Signed-off-by: Philipp Zabel > Message-Id: <20240326082400.2458682-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/opus.in b/rules/opus.in > index d906da5e687a..df7e715690a6 100644 > --- a/rules/opus.in > +++ b/rules/opus.in > @@ -1,9 +1,35 @@ > ## SECTION=multimedia_libs > > -config OPUS > +menuconfig OPUS > tristate > prompt "opus" > select HOST_SYSTEM_PERL > select HOST_MESON > help > Opus is a totally open, royalty-free, highly versatile audio codec. > + > +if OPUS > + > +config OPUS_DEEP_PLC > + bool > + prompt "enable deep packet loss concealment (PLC)" > + help > + Improves voice quality under sporadic packet loss, by using a deep > + neural network to help with filling in short audio gaps in the > + decoder. The decoder complexity needs to be set to 5 or more for this. > + Increases binary size by about 1 MiB. > + For details, see https://opus-codec.org/demo/opus-1.5/. > + > +config OPUS_OSCE > + bool > + prompt "enable opus speech coding enhancement (OSCE)" > + help > + Improves voice quality of low-bitrate streams by applying voice > + enhancements in the decoder. > + A Linear Adaptive Coding Enhancer (LACE, ~100 MFLOPS) is used at > + decoder complexity setting 6, and a Non-Linear variation (NoLACE, > + ~400 MFLOPS) is used at decoder complexity setting 7. > + Increases binary size by about 1.6 MiB. > + For details, see https://opus-codec.org/demo/opus-1.5/. > + > +endif > diff --git a/rules/opus.make b/rules/opus.make > index 0c3c659d0d43..707889c79662 100644 > --- a/rules/opus.make > +++ b/rules/opus.make > @@ -53,10 +53,10 @@ OPUS_CONF_OPT := \ > -Dcustom-modes=false \ > -Ddocdir=doc/opus \ > -Ddocs=disabled \ > - -Denable-deep-plc=false \ > + -Denable-deep-plc=$(call ptx/truefalse, PTXCONF_OPUS_DEEP_PLC) \ > -Denable-dnn-debug-float=false \ > -Denable-dred=false \ > - -Denable-osce=false \ > + -Denable-osce=$(call ptx/truefalse, PTXCONF_OPUS_OSCE) \ > -Dextra-programs=disabled \ > -Dfixed-point=$(call ptx/falsetrue, PTXCONF_HAS_HARDFLOAT) \ > -Dfixed-point-debug=false \
Re: [ptxdist] [APPLIED] shaderc: version bump v2023.8 -> v2024.0
Thanks, applied as b98c32d6e22a3750db6bfaf926b7e772f6cbbac9. Michael [sent from post-receive hook] On Mon, 08 Apr 2024 13:05:33 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240326082251.2458299-1-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/shaderc.make b/rules/shaderc.make > index e1b3ed00824c..72cd7a3b7f7f 100644 > --- a/rules/shaderc.make > +++ b/rules/shaderc.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SHADERC) += shaderc > # > # Paths and names > # > -SHADERC_VERSION := v2023.8 > -SHADERC_MD5 := 28051b01db5b263f015ad363977ba610 > +SHADERC_VERSION := v2024.0 > +SHADERC_MD5 := c29fbe8f3c10fc0097e04327e1f64a73 > SHADERC := shaderc-$(SHADERC_VERSION) > SHADERC_SUFFIX := tar.gz > SHADERC_URL := \
Re: [ptxdist] [APPLIED] vulkan-validationlayers: version bump 1.3.275.0 -> 1.3.280.0
Thanks, applied as 76dba88d7250ebca2dd217e9986b4f2ad000a23c. Michael [sent from post-receive hook] On Mon, 08 Apr 2024 13:05:32 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240326082221.2458163-9-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-validationlayers.make > b/rules/vulkan-validationlayers.make > index 5f608d58b045..6bfca4e359ce 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.275.0 > -VULKAN_VALIDATIONLAYERS_MD5 := b9258bcfe5c46ad1ded5a50e6e6f7d1c > +VULKAN_VALIDATIONLAYERS_VERSION := 1.3.280.0 > +VULKAN_VALIDATIONLAYERS_MD5 := 04805a2454d6e6facc9ca6651d04dbbf > VULKAN_VALIDATIONLAYERS := > vulkan-validationlayers-$(VULKAN_VALIDATIONLAYERS_VERSION) > VULKAN_VALIDATIONLAYERS_SUFFIX := tar.gz > VULKAN_VALIDATIONLAYERS_URL := > https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/vulkan-sdk-$(VULKAN_VALIDATIONLAYERS_VERSION).$(VULKAN_VALIDATIONLAYERS_SUFFIX)
Re: [ptxdist] [APPLIED] vulkan-utility-libraries: version bump 1.3.275.0 -> 1.3.280.0
Thanks, applied as d685df43d92dc109d143fe0a2b9b07c1a983011f. Michael [sent from post-receive hook] On Mon, 08 Apr 2024 13:05:31 +0200, Philipp Zabel wrote: > Signed-off-by: Philipp Zabel > Message-Id: <20240326082221.2458163-8-p.za...@pengutronix.de> > Signed-off-by: Michael Olbrich > > diff --git a/rules/vulkan-utility-libraries.make > b/rules/vulkan-utility-libraries.make > index bc46c4ea87cb..6ef2d3fe724c 100644 > --- a/rules/vulkan-utility-libraries.make > +++ b/rules/vulkan-utility-libraries.make > @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_VULKAN_UTILITY_LIBRARIES) += > vulkan-utility-libraries > # > # Paths and names > # > -VULKAN_UTILITY_LIBRARIES_VERSION := 1.3.275.0 > -VULKAN_UTILITY_LIBRARIES_MD5 := 6608d13a1153ddeea7d48a6afcd85ad5 > +VULKAN_UTILITY_LIBRARIES_VERSION := 1.3.280.0 > +VULKAN_UTILITY_LIBRARIES_MD5 := c611d59dcabce5d0ee11f5f6521666aa > VULKAN_UTILITY_LIBRARIES := > vulkan-utility-libraries-$(VULKAN_UTILITY_LIBRARIES_VERSION) > VULKAN_UTILITY_LIBRARIES_SUFFIX := tar.gz > VULKAN_UTILITY_LIBRARIES_URL := > https://github.com/KhronosGroup/Vulkan-Utility-Libraries/archive/vulkan-sdk-$(VULKAN_UTILITY_LIBRARIES_VERSION).$(VULKAN_UTILITY_LIBRARIES_SUFFIX)
