Re: [ptxdist] [PATCH 4/4] ptxd_make_world_inject: Introduce separate destination directory

[Michael Olbrich]

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

[Michael Olbrich]

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

[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?

> 
> 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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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.

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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"

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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.

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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.

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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

[Michael Olbrich]

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)

Re: [ptxdist] [APPLIED] vulkan-tools: version bump 1.3.275.0 -> 1.3.280.0

[Michael Olbrich]

Thanks, applied as 9f8f30d53a8cbb544c4d2faaa7237485aa3ec653.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:30 +0200, Philipp Zabel  
wrote:
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240326082221.2458163-7-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/vulkan-tools.make b/rules/vulkan-tools.make
> index 7a3547faf853..8b7c9624538c 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.275.0
> -VULKAN_TOOLS_MD5 := 438bd9ce3e70c54b43101edb12dd8d19
> +VULKAN_TOOLS_VERSION := 1.3.280.0
> +VULKAN_TOOLS_MD5 := f68e21f73b893d882e5f97959f489757
>  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.275.0 -> 1.3.280.0

[Michael Olbrich]

Thanks, applied as 5c7932118bcf1906d4cab2b434fd2aaaba0c2992.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:29 +0200, Philipp Zabel  
wrote:
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240326082221.2458163-6-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/vulkan-loader.make b/rules/vulkan-loader.make
> index ee82b6040df4..40a89591ebe4 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.275.0
> -VULKAN_LOADER_MD5:= d8629661e42cb1823926984e55a91f49
> +VULKAN_LOADER_VERSION:= 1.3.280.0
> +VULKAN_LOADER_MD5:= 282d32eab31abf5aa14ec59be8e8ae19
>  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)

Re: [ptxdist] [APPLIED] vulkan-headers: version bump 1.3.275.0 -> 1.3.280.0

[Michael Olbrich]

Thanks, applied as 93067d20d78992dc8c005aa6db594c5870542485.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:28 +0200, Philipp Zabel  
wrote:
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240326082221.2458163-5-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/vulkan-headers.make b/rules/vulkan-headers.make
> index fff59ece81db..73d4969d1358 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.275.0
> -VULKAN_HEADERS_MD5   := f66b2d4d9f709d991f623ce1ea76b21d
> +VULKAN_HEADERS_VERSION   := 1.3.280.0
> +VULKAN_HEADERS_MD5   := 6a5ff0b86c072300fac88cfdd3996c75
>  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] volk: version bump 1.3.275.0 -> 1.3.280.0

[Michael Olbrich]

Thanks, applied as 1f3342f5be61cd47fd211fadd3583c3892ef109f.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:27 +0200, Philipp Zabel  
wrote:
> License change only due to copyright year extension to 2024.
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240326082221.2458163-4-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/volk.make b/rules/volk.make
> index d0fc3fe4739b..92e2a9f1d4ad 100644
> --- a/rules/volk.make
> +++ b/rules/volk.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_VOLK) += volk
>  #
>  # Paths and names
>  #
> -VOLK_VERSION := 1.3.275.0
> -VOLK_MD5 := a202eda3e1dca32065ce22d70403afd2
> +VOLK_VERSION := 1.3.280.0
> +VOLK_MD5 := 2154f24cd28be1adcf48ac34cb0daa59
>  VOLK := volk-$(VOLK_VERSION)
>  VOLK_SUFFIX  := tar.gz
>  VOLK_URL := 
> https://github.com/zeux/volk/archive/refs/tags/vulkan-sdk-$(VOLK_VERSION).$(VOLK_SUFFIX)
>  VOLK_SOURCE  := $(SRCDIR)/$(VOLK).$(VOLK_SUFFIX)
>  VOLK_DIR := $(BUILDDIR)/$(VOLK)
>  VOLK_LICENSE := MIT
> -VOLK_LICENSE_FILES   := 
> file://LICENSE.md;md5=b2dd098d35668a801190a9d9d47461b0
> +VOLK_LICENSE_FILES   := 
> file://LICENSE.md;md5=12e6af3a0e2a5e5dbf7796aa82b64626
>  
>  # 
> 
>  # Prepare

Re: [ptxdist] [APPLIED] spirv-headers: version bump 1.3.275.0 -> 1.3.280.0

[Michael Olbrich]

Thanks, applied as e405d8d284b2a71addc0bc2311c3fda97a51fa71.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:25 +0200, Philipp Zabel  
wrote:
> For license change, see upstream commit 1c9115b562ba ("List all licenses
> in the root LICENSE file. (#410)"). The MIT license was added for
> spir-v.xml and for the embedded jsoncpp.
> 
> The custom Khronos license governing most of the files is similar to the
> MIT license, but with an added section about modifications making the
> resulting files no longer reflect Khronos standards.
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240326082221.2458163-2-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/spirv-headers.make b/rules/spirv-headers.make
> index 42864622d0b4..aab2edd4029a 100644
> --- a/rules/spirv-headers.make
> +++ b/rules/spirv-headers.make
> @@ -14,15 +14,15 @@ PACKAGES-$(PTXCONF_SPIRV_HEADERS) += spirv-headers
>  #
>  # Paths and names
>  #
> -SPIRV_HEADERS_VERSION:= 1.3.275.0
> -SPIRV_HEADERS_MD5:= f293886617aa816fdbb2b50d5e909681
> +SPIRV_HEADERS_VERSION:= 1.3.280.0
> +SPIRV_HEADERS_MD5:= 438892138fe25c123cdacd05eb4a4b17
>  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)
>  SPIRV_HEADERS_SOURCE := 
> $(SRCDIR)/spirv-headers-$(SPIRV_HEADERS_VERSION).$(SPIRV_HEADERS_SUFFIX)
>  SPIRV_HEADERS_DIR:= $(BUILDDIR)/$(SPIRV_HEADERS)
> -SPIRV_HEADERS_LICENSE:= custom
> -SPIRV_HEADERS_LICENSE_FILES := 
> file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae2d
> +SPIRV_HEADERS_LICENSE:= custom AND MIT
> +SPIRV_HEADERS_LICENSE_FILES := 
> file://LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741
>  
>  # 
> 
>  # Prepare
> @@ -31,6 +31,7 @@ SPIRV_HEADERS_LICENSE_FILES := 
> file://LICENSE;md5=c938b85bceb8fb26c1a807f28a52ae
>  SPIRV_HEADERS_CONF_TOOL  := cmake
>  SPIRV_HEADERS_CONF_OPT   := \
>   $(CROSS_CMAKE_USR) \
> - -DBUILD_TESTS=OFF
> + -DSPIRV_HEADERS_ENABLE_INSTALL=ON \
> + -DSPIRV_HEADERS_ENABLE_TESTS=OFF
>  
>  # vim: syntax=make

Re: [ptxdist] [APPLIED] spirv-tools: version bump 1.3.275.0 -> 1.3.280.0

[Michael Olbrich]

Thanks, applied as 9f40976f0326869a7c03dbb4d5281061c99aa203.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:26 +0200, Philipp Zabel  
wrote:
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240326082221.2458163-3-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/spirv-tools.make b/rules/spirv-tools.make
> index 8e4ca44250ee..9df598a84e75 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.275.0
> -SPIRV_TOOLS_MD5  := f187bb132058995a5992a5a15c269bb1
> +SPIRV_TOOLS_VERSION  := 1.3.280.0
> +SPIRV_TOOLS_MD5  := d55af678b61667313d478db9399c09d4
>  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)
> @@ -47,6 +47,8 @@ SPIRV_TOOLS_CONF_OPT:= \
>   -DSPIRV_BUILD_LIBFUZZER_TARGETS=OFF \
>   -DSPIRV_CHECK_CONTEXT=ON \
>   -DSPIRV_COLOR_TERMINAL=ON \
> + -DSPIRV_HEADERS_ENABLE_INSTALL=OFF \
> + -DSPIRV_HEADERS_ENABLE_TESTS=OFF \
>   -DSPIRV_LIB_FUZZING_ENGINE_LINK_OPTIONS= \
>   -DSPIRV_LOG_DEBUG=OFF \
>   -DSPIRV_SKIP_EXECUTABLES=ON \

Re: [ptxdist] [APPLIED] glslang: version bump 1.3.275.0 -> 1.3.280.0

[Michael Olbrich]

Thanks, applied as 609d3d383df804963990c09450e6f2db45c9f94a.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:24 +0200, Philipp Zabel  
wrote:
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240326082221.2458163-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/glslang.make b/rules/glslang.make
> index 784e1666c7cd..21df9b9dcf23 100644
> --- a/rules/glslang.make
> +++ b/rules/glslang.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_GLSLANG) += glslang
>  #
>  # Paths and names
>  #
> -GLSLANG_VERSION  := 1.3.275.0
> -GLSLANG_MD5  := 017c759481a055f5eee91c74adc7d4cd
> +GLSLANG_VERSION  := 1.3.280.0
> +GLSLANG_MD5  := e6105068a700cdeb6d498bb982dcc570
>  GLSLANG  := glslang-$(GLSLANG_VERSION)
>  GLSLANG_SUFFIX   := tar.gz
>  GLSLANG_URL  := 
> https://github.com/KhronosGroup/glslang/archive/vulkan-sdk-$(GLSLANG_VERSION).$(GLSLANG_SUFFIX)
> @@ -44,6 +44,7 @@ GLSLANG_CONF_OPT:= \
>   -DENABLE_PCH=ON \
>   -DENABLE_RTTI=OFF \
>   -DENABLE_SPVREMAPPER=ON \
> + -DGLSLANG_ENABLE_INSTALL=ON \
>   -DGLSLANG_TESTS=OFF
>  
>  # 
> 

Re: [ptxdist] [APPLIED] wayland-protocols: version bump 1.33 -> 1.34

[Michael Olbrich]

Thanks, applied as 41a5ade129c0f277dfccf69aa2b21362eca34faa.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:23 +0200, Philipp Zabel  
wrote:
> Adds three new staging protocols: xdg-toplevel-drag, xdg-dialog, and
> linux-drm-syncobj.
> 
> https://lists.freedesktop.org/archives/wayland-devel/2024-March/043537.html
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240326082039.2457518-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/wayland-protocols.make b/rules/wayland-protocols.make
> index c4f64e9ade0a..2f28746379c7 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.33
> -WAYLAND_PROTOCOLS_MD5:= 6af4d3a18fbfc7d8aa3f9ccf5b4743f3
> +WAYLAND_PROTOCOLS_VERSION:= 1.34
> +WAYLAND_PROTOCOLS_MD5:= 512393249240369ad70a17dd0f98edaa
>  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] host-libcurl: Follow target libcurl.

[Michael Olbrich]

Thanks, applied as e697f174ec93dd7d5bb154a0879b398ab85cc22c.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:20 +0200, Christian Melki 
 wrote:
> * Add build option to disable docs.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240328171750.1773394-2-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/host-libcurl.make b/rules/host-libcurl.make
> index 686a3d4ab3dc..e223573ea095 100644
> --- a/rules/host-libcurl.make
> +++ b/rules/host-libcurl.make
> @@ -46,6 +46,7 @@ HOST_LIBCURL_CONF_OPT   := \
>   --disable-smb \
>   --disable-smtp \
>   --disable-gopher \
> + --disable-docs \
>   --disable-mqtt \
>   --disable-manual \
>   --enable-libcurl-option \

Re: [ptxdist] [APPLIED] Revert "initmethod-systemd: add more empty folders for ifupdown"

[Michael Olbrich]

Thanks, applied as 7c9507daa76067b8e08357809baa89e63b45b317.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:22 +0200, Alexander Dahl  wrote:
> Scripts in those folders not considered anymore since busybox 1.21.0
> (ptxdist-2013.06.0).
> 
> This reverts commit 09e94f459f26c5784a0440cb946fc97fc53f5879.
> 
> Signed-off-by: Alexander Dahl 
> Message-Id: <20240403100856.46337-3-...@thorsis.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/initmethod-systemd.make b/rules/initmethod-systemd.make
> index be2a31817a6e..8701a6bc138c 100644
> --- a/rules/initmethod-systemd.make
> +++ b/rules/initmethod-systemd.make
> @@ -48,10 +48,8 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD_IFUPDOWN
>   @$(call install_alternative, initmethod-systemd, 0, 0, 0644, 
> /etc/network/interfaces)
>   @$(call install_copy, initmethod-systemd, 0, 0, 0755, 
> /etc/network/if-down.d)
>   @$(call install_copy, initmethod-systemd, 0, 0, 0755, 
> /etc/network/if-up.d)
> - @$(call install_copy, initmethod-systemd, 0, 0, 0755, 
> /etc/network/if-pre-down.d)
>   @$(call install_copy, initmethod-systemd, 0, 0, 0755, 
> /etc/network/if-post-down.d)
>   @$(call install_copy, initmethod-systemd, 0, 0, 0755, 
> /etc/network/if-pre-up.d)
> - @$(call install_copy, initmethod-systemd, 0, 0, 0755, 
> /etc/network/if-post-up.d)
>  endif
>  
>   @$(call install_finish,initmethod-systemd)

Re: [ptxdist] [APPLIED] Revert "initmethod-bbinit: add more empty folders for ifupdown"

[Michael Olbrich]

Thanks, applied as b3782507809a289ced9b5cf7b9eff91107ef7340.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:21 +0200, Alexander Dahl  wrote:
> Scripts in those folders not considered anymore since busybox 1.21.0
> (ptxdist-2013.06.0).
> 
> This reverts commit eb2d9e63ae110b7f3069307ee89a4d281f12d118.
> 
> Signed-off-by: Alexander Dahl 
> Message-Id: <20240403100856.46337-2-...@thorsis.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
> index 75d381e29dca..4ae5c3284328 100644
> --- a/rules/initmethod-bbinit.make
> +++ b/rules/initmethod-bbinit.make
> @@ -59,10 +59,8 @@ ifdef PTXCONF_INITMETHOD_BBINIT_ETC_INITD_NETWORKING
>   @$(call install_alternative, initmethod-bbinit, 0, 0, 0644, 
> /etc/network/interfaces, n)
>   @$(call install_copy, initmethod-bbinit, 0, 0, 0755, 
> /etc/network/if-down.d)
>   @$(call install_copy, initmethod-bbinit, 0, 0, 0755, 
> /etc/network/if-up.d)
> - @$(call install_copy, initmethod-bbinit, 0, 0, 0755, 
> /etc/network/if-pre-down.d)
>   @$(call install_copy, initmethod-bbinit, 0, 0, 0755, 
> /etc/network/if-post-down.d)
>   @$(call install_copy, initmethod-bbinit, 0, 0, 0755, 
> /etc/network/if-pre-up.d)
> - @$(call install_copy, initmethod-bbinit, 0, 0, 0755, 
> /etc/network/if-post-up.d)
>  endif
>  
>  ifdef PTXCONF_INITMETHOD_BBINIT_ETC_INITD_RT_SET_BANDWIDTH

Re: [ptxdist] [APPLIED] zstd: Version bump. 1.5.5 -> 1.5.6

[Michael Olbrich]

Thanks, applied as f212f5921753c09bb6a787cd9350d6d8048b27fc.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:18 +0200, Christian Melki 
 wrote:
> Various improvements.
> https://github.com/facebook/zstd/releases/tag/v1.5.6
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240328170726.1636808-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/zstd.make b/rules/zstd.make
> index 6310cc4fc9ef..fdda5819ebed 100644
> --- a/rules/zstd.make
> +++ b/rules/zstd.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_ZSTD) += zstd
>  #
>  # Paths and names
>  #
> -ZSTD_VERSION := 1.5.5
> -ZSTD_MD5 := 4ff0ee1965ab161bc55be7c9dcd1f7f9
> +ZSTD_VERSION := 1.5.6
> +ZSTD_MD5 := 2543d7cb3beda9ec48f965e5059dbd42
>  ZSTD := zstd-$(ZSTD_VERSION)
>  ZSTD_SUFFIX  := tar.gz
>  ZSTD_URL := 
> https://github.com/facebook/zstd/archive/v$(ZSTD_VERSION).$(ZSTD_SUFFIX)

Re: [ptxdist] [APPLIED] mesalib: version bump 24.0.3 -> 24.0.4

[Michael Olbrich]

Thanks, applied as 97f9f5d2d48d325860211cfba785a06ddd799ddf.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:17 +0200, Philipp Zabel  
wrote:
> https://docs.mesa3d.org/relnotes/24.0.4.html
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240328074532.376093-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 5182b6f27489..eee7d5880e80 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
>  #
>  # Paths and names
>  #
> -MESALIB_VERSION  := 24.0.3
> -MESALIB_MD5  := fb1794acf5f714e4835be3bf2ab010fe
> +MESALIB_VERSION  := 24.0.4
> +MESALIB_MD5  := de4661e901f2dfb194e6b1bf04dc2171
>  MESALIB  := mesa-$(MESALIB_VERSION)
>  MESALIB_SUFFIX   := tar.xz
>  MESALIB_URL  := \

Re: [ptxdist] [APPLIED] libxkbcommon: Version bump. 1.6.0 -> 1.7.0

[Michael Olbrich]

Thanks, applied as 61a7beb6b2a54bc515a5010613c45b542c68e074.

Michael

[sent from post-receive hook]

On Mon, 08 Apr 2024 13:05:14 +0200, Christian Melki 
 wrote:
> Minor changes and fixes.
> Reverts the removal of previously deleted keysyms.
> https://github.com/xkbcommon/libxkbcommon/blob/xkbcommon-1.7.0/NEWS.md
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240326202828.3578624-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libxkbcommon.make b/rules/libxkbcommon.make
> index f0e307567c6d..ca54115a6b62 100644
> --- a/rules/libxkbcommon.make
> +++ b/rules/libxkbcommon.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBXKBCOMMON) += libxkbcommon
>  #
>  # Paths and names
>  #
> -LIBXKBCOMMON_VERSION := 1.6.0
> -LIBXKBCOMMON_MD5 := 90079ab4a0c6fa56dc75abffef9b1bc6
> +LIBXKBCOMMON_VERSION := 1.7.0
> +LIBXKBCOMMON_MD5 := b05b1a0d473189efb2dd995dd944f152
>  LIBXKBCOMMON := libxkbcommon-$(LIBXKBCOMMON_VERSION)
>  LIBXKBCOMMON_SUFFIX  := tar.xz
>  LIBXKBCOMMON_URL := 
> http://xkbcommon.org/download/$(LIBXKBCOMMON).$(LIBXKBCOMMON_SUFFIX)

Re: [ptxdist] [PATCH 1/2] mtd-utils: Version bump. 2.1.6 -> 2.2.0

[Michael Olbrich]

On Tue, Apr 02, 2024 at 10:54:06PM +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.

You forgot to remove the patches for the old version.

Michael

> 
> Signed-off-by: Christian Melki 
> ---
>  ...rkbad-new-util-to-mark-blocks-as-bad.patch | 158 ++
>  patches/mtd-utils-2.2.0/autogen.sh|   1 +
>  patches/mtd-utils-2.2.0/series|   4 +
>  rules/mtd-utils.make  |   8 +-
>  4 files changed, 167 insertions(+), 4 deletions(-)
>  create mode 100644 
> patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch
>  create mode 12 patches/mtd-utils-2.2.0/autogen.sh
>  create mode 100644 patches/mtd-utils-2.2.0/series
> 
> diff --git 
> a/patches/mtd-utils-2.2.0/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
> new file mode 100644
> index 0..e6ff202a7
> --- /dev/null
> +++ 
> b/patches/mtd-utils-2.2.0/0001-nandmarkbad-new-util-to-mark-blocks-as-bad.patch
> @@ -0,0 +1,158 @@
> +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= 
> +Date: Wed, 30 Aug 2017 13:31:46 +0200
> +Subject: [PATCH] nandmarkbad: new util to mark blocks as bad
> +
> +---
> + nand-utils/Makemodule.am |   5 +-
> + nand-utils/nandmarkbad.c | 119 
> +++
> + 2 files changed, 123 insertions(+), 1 deletion(-)
> + create mode 100644 nand-utils/nandmarkbad.c
> +
> +diff --git a/nand-utils/Makemodule.am b/nand-utils/Makemodule.am
> +index cee677783e7a..7fd1de5aa9ae 100644
> +--- a/nand-utils/Makemodule.am
>  b/nand-utils/Makemodule.am
> +@@ -7,6 +7,9 @@ nandwrite_LDADD = libmtd.a
> + nandtest_SOURCES = nand-utils/nandtest.c
> + nandtest_LDADD = libmtd.a
> + 
> ++nandmarkbad_SOURCES = nand-utils/nandmarkbad.c
> ++nandmarkbad_LDADD = libmtd.a
> ++
> + nftldump_SOURCES = nand-utils/nftldump.c include/mtd_swab.h
> + nftldump_SOURCES += include/mtd/nftl-user.h include/mtd/ftl-user.h
> + nftldump_LDADD = libmtd.a
> +@@ -23,7 +26,7 @@ NAND_SH = \
> + 
> + EXTRA_DIST += $(NAND_SH)
> + 
> +-sbin_PROGRAMS += nanddump nandwrite nandtest nftldump nftl_format 
> nandflipbits
> ++sbin_PROGRAMS += nanddump nandwrite nandtest nandmarkbad nftldump 
> nftl_format nandflipbits
> + 
> + if BUILD_TESTS
> + test_SCRIPTS += $(NAND_SH)
> +diff --git a/nand-utils/nandmarkbad.c b/nand-utils/nandmarkbad.c
> +new file mode 100644
> +index ..cf05698c3609
> +--- /dev/null
>  b/nand-utils/nandmarkbad.c
> +@@ -0,0 +1,119 @@
> ++#define PROGRAM_NAME "nandmarkbad"
> ++
> ++#include 
> ++#include 
> ++#include 
> ++#include 
> ++
> ++#include "common.h"
> ++#include 
> ++
> ++static void usage(int status)
> ++{
> ++fprintf(status ? stderr : stdout,
> ++"usage: %s [OPTIONS] \n\n"
> ++"  -b, --markbad=blocknoMark block bad\n"
> ++"  -h, --help   Display this help and exit\n"
> ++"  -V, --versionOutput version information and 
> exit\n"
> ++"  -y, --i-know-what-i-do   really do mark blocks as bad\n",
> ++PROGRAM_NAME);
> ++exit(status);
> ++}
> ++
> ++/*
> ++ * Main program
> ++ */
> ++int main(int argc, char **argv)
> ++{
> ++loff_t mark_bad[32];
> ++unsigned cnt_bad = 0;
> ++struct mtd_dev_info mtd;
> ++libmtd_t mtd_desc;
> ++int fd;
> ++int error = 0;
> ++int ret;
> ++unsigned int i;
> ++int iknowwhatido = 0;
> ++
> ++for (;;) {
> ++static const char short_options[] = "b:hVy";
> ++static const struct option long_options[] = {
> ++{ "help", no_argument, 0, 'h' },
> ++{ "markbad", required_argument, 0, 'b' },
> ++{ "version", no_argument, 0, 'V'},
> ++{ "i-know-what-i-do", no_argument, 0, 'y' },
> ++{0, 0, 0, 0},
> ++};
> ++int option_index = 0;
> ++int c = getopt_long(argc, argv, short_options, long_options,
> ++_index);
> ++if (c == EOF)
> ++break;
> ++
> ++switch (c) {
> ++case '?':
> ++usage(EXIT_FAILURE);
> ++break;
> ++
> ++case 'b':
> ++if (cnt_bad < ARRAY_SIZE(mark_bad)) {
> ++mark_bad[cnt_bad] =
> ++simple_strtoll(optarg, );
> ++++cnt_bad;
> ++} else {
> ++errmsg_die("Can't handle so many bad blocks\n");
> ++}
> ++
> ++break;
> ++
> ++case 'h':
> ++usage(EXIT_SUCCESS);
> ++

Re: [ptxdist] [PATCH v2 1/2] util-linux: Version bump. 2.39.3 -> 2.40

[Michael Olbrich]

On Tue, Apr 02, 2024 at 11:09:16PM +0200, Christian Melki wrote:
> https://github.com/util-linux/util-linux/blob/master/Documentation/releases/v2.40-ReleaseNotes
> 
> * Fix missing files in the release. Add patches.

Hmm, for meson, we don't need the 'make dist' tarball. No need for the
generated configure. So we could switch to the tarball for the git tag[1]

Considering the whole mess with xz, doing so when possible seems to be a
good idea anyways.

Michael

[1] 
https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git/snapshot/util-linux-2.40.tar.gz

> 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 
> ---
>  ...roperly-handle-gettext-non-existence.patch | 29 ---
>  patches/util-linux-2.39.3/series  |  4 --
>  ...-distribute-pam_lastlog2-meson.build.patch | 27 ++
>  ..._lastlog2-Add-missing-file-for-meson.patch | 52 +++
>  patches/util-linux-2.40/series|  5 ++
>  rules/util-linux.make |  6 ++-
>  6 files changed, 88 insertions(+), 35 deletions(-)
>  delete mode 100644 
> patches/util-linux-2.39.3/0001-meson-properly-handle-gettext-non-existence.patch
>  delete mode 100644 patches/util-linux-2.39.3/series
>  create mode 100644 
> patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch
>  create mode 100644 
> patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch
>  create mode 100644 patches/util-linux-2.40/series
> 
> 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 01d07d3f6..0
> --- 
> 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 ca4f8cdfd..0
> --- 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/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch
>  
> b/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch
> new file mode 100644
> index 0..a0b045def
> --- /dev/null
> +++ 
> b/patches/util-linux-2.40/0001-autotools-distribute-pam_lastlog2-meson.build.patch
> @@ -0,0 +1,27 @@
> +From: =?UTF-8?q?Thomas=20Wei=C3=9Fschuh?= 
> +Date: Sat, 30 Mar 2024 17:46:19 +0100
> +Subject: [PATCH] autotools: distribute pam_lastlog2/meson.build
> +MIME-Version: 1.0
> +Content-Type: text/plain; charset=UTF-8
> +Content-Transfer-Encoding: 8bit
> +
> +Otherwise building the dist tarball via meson doesn't work.
> +
> +Fixes #2875
> +Signed-off-by: Thomas Weißschuh 
> +---
> + pam_lastlog2/Makemodule.am | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/pam_lastlog2/Makemodule.am b/pam_lastlog2/Makemodule.am
> +index f33c98ba5324..f17cc09f6a14 100644
> +--- a/pam_lastlog2/Makemodule.am
>  b/pam_lastlog2/Makemodule.am
> +@@ -3,6 +3,6 @@ if BUILD_PAM_LASTLOG2
> + include pam_lastlog2/man/Makemodule.am
> + include pam_lastlog2/src/Makemodule.am
> + 
> +-EXTRA_DIST += pam_lastlog2/COPYING
> ++EXTRA_DIST += pam_lastlog2/COPYING pam_lastlog2/meson.build
> + 
> + endif # BUILD_PAM_LASTLOG2
> diff --git 
> a/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch 
> b/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch
> new file mode 100644
> index 0..04c2a9141
> --- /dev/null
> +++ 
> b/patches/util-linux-2.40/0002-pam_lastlog2-Add-missing-file-for-meson.patch
> @@ -0,0 

[ptxdist] [ANNOUNCE] PTXdist 2024.04.0 released

[Michael Olbrich]

Hi,

I'm happy to announce that I've just released ptxdist-2024.04.0.

This is one of the bigger releases. There are some bigger updates in the
core but also a lot of updates to the packages.

Several HOST_SYSTEM_PYTHON3_* suboptions are now packages. This reduces the
number of dependencies on the build host. These are basically Python only
packages that are trivial and fast to build.

The new infrastructure introduced in ptxdist-2023.11.0 to generate license
documents, can now generate SPDX SBOMs as well. Part of the work to make
this possible included enhanced support for packages with multiple source
archives in full-bsp-report.yaml.
The SBOM contains quite a bit of information already. But I'm sure there is
room for improvements.

It took a while, but with this release, all packages except staging should
build with OSELAS.Toolchain-2023.07.x.

The rest are various fixes, a lot of version bumps and several new packages.

Thanks to all contributors and - as always - the shortlog below.

Enjoy,
Michael Olbrich


Andreas Helmcke (5):
  jq: update to V1.7.1
  php8: Version bump 8.2.11 -> 8.3.3
  openvpn: Version bump, 2.6.6 -> 2.6.9
  lighttpd: Version bump, 1.4.72 -> 1.4.74
  sudo: version bump 1.9.14p3 -> 1.9.15p5

Artur Wiebe (1):
  python3-asyncua: version bump 1.0.6 -> 1.1.0

Bruno Thomsen (3):
  openssl: update license and add license file with hash
  autossh: update URL
  autossh: Version bump 1.4c -> 1.4g

Christian Melki (25):
  libffi: Version bump. 3.4.4 -> 3.4.5
  nss: Version bump. 3.97 -> 3.98
  ca-certificates: Version bump. 3.97 -> 3.98
  libffi: Version bump. 3.4.5 -> 3.4.6
  pcre2: Version bump. 10.42 -> 10.43
  linux-fiwmare: Version bump. 20240115 -> 20240220
  libunwind: Version bump. 1.8.0 -> 1.8.1
  xz: Version bump. 5.4.4 -> 5.6.0
  host-xz: Follow suit from target xz.
  libpng: Version bump. 1.6.42 -> 1.6.43.
  pciutils: Version bump. 3.10.0 -> 3.11.1
  pixman: Version bump. 0.43.2 -> 0.43.4
  expat: Version bump. 2.6.0 -> 2.6.1
  qemu: Version bump. 8.2.1 -> 8.2.2
  hwdata: Version bump. 0.379 -> 0.380.
  sdl2: Version bump. 2.30.0 -> 2.30.1
  libkmod: Version bump. 31 -> 32.
  host-libkmod: Follow target libkmod.
  openssh: Version bump. 9.6 -> 9.7
  iproute2: Version bump. 6.7.0 -> 6.8.0
  linux-firmware: Version bump. 20240220 -> 20240312
  expat: Version bump. 2.6.1 -> 2.6.2
  glib: Version bump. 2.78.4 -> 2.80.0
  strace: Version bump. 6.7 -> 6.8
  libpciaccess: Version bump. 0.18 -> 0.18.1

Lars Pedersen (2):
  libqmi: Add option to enable QMI firmware update tool
  strongswan: version bump 5.9.8 -> 5.9.14

Markus Heidelberg (8):
  ptxd_lib_template: fix "ptxdist newpackage host" with an existing target 
counterpart
  host-nettle: new package
  host-gnutls: new package
  u-boot: new options to select host-gnutls and host-libuuid
  configure.ac: fix check for unzip
  configure.ac: add check for xz
  gitignore: remove outdated and redundant patterns for kconfig
  rootfs: add file extension to nsswitch.conf in prompt/help text

Michael Olbrich (119):
  host-cython3: use the correct package name
  host-python3-pyproject-hooks: use the correct package name
  host-system-python3-webencodings: new package
  host-system-python3-html5lib: new package
  host-qt6: add tools with -qt6 suffix to the default path
  qt5: version bump 5.15.11 -> 5.15.12
  qt6: version bump 6.5.3 -> 6.6.2
  orc: version bump 0.4.37 -> 0.4.38
  nlohmann-json: version bump 3.10.5 -> 3.11.3
  host-unifdef: new package
  libwpe: version bump 1.14.1 -> 1.14.2
  wpebackend-fdo: version bump 1.14.0 -> 1.14.2
  wpewebkit: version bump 2.38.5 -> 2.42.5
  cog: version bump 0.16.1 -> 0.18.3
  host-system-python3-cheetah3: new package
  host-system-python3-pymongo: new package
  rules: support host-system-python3-* packages with setup.py
  templates: add template for host-system-python packages
  qemu: add upstream patch to fix qemu-system crashes
  ptxd_install_file_extract_debug: don't choke on non-sha1 build-ids
  host-python3-scons: version bump 3.1.2 -> 4.6.0
  host-system-python3-psutil: new package
  mongodb: new package
  ptxd_make_get: indent like the rest of the shell code
  ptxd_make_get: restrict pattern when removing old files
  ptxd_make_get_s3: fix download semantics
  ptxd_make_world_report_yaml: fix devpkg check
  ptxd_make_world_report_yaml_fragment: md5 is not a list
  ptxd_make_world_report_yaml: don't generate empty md5s entry
  ptxd_make_world_report_yaml: add missing directory to devpkg
  bsp-report-schema: fix and extend git+ url schemes
  bsp-report-schema: update with

Re: [ptxdist] [PATCH] xz: Version bump. 5.4.4 -> 5.6.0

[Michael Olbrich]

On Sun, Feb 25, 2024 at 03:35:13PM +0100, Christian Melki wrote:
> https://github.com/tukaani-project/xz/releases/tag/v5.6.0
> https://github.com/tukaani-project/xz/releases/tag/v5.5.2beta
> https://github.com/tukaani-project/xz/releases/tag/v5.5.1alpha
> https://github.com/tukaani-project/xz/releases/tag/v5.4.6
> https://github.com/tukaani-project/xz/releases/tag/v5.4.5
> 
> * License conditions changed! The majority of XZ
> that was public domain is now re-released under the 0-clause BSD license.
> Otherwise, the other parts still remains the same.
> The sum of XZ licensing is pretty complex however.
> 
> * URL changed. XZ is now hosted on github.
> 
> * Fix a few options.

FYI, I reverted this for now. It seems the release tarballs are
compromised[1]. From what I've read so far, PTXdist is probably not
affected, since we don't carry the relevant openssh patches.
But the next PTXdist release will happen pretty soon, so we'll stick to the
old version for now. We can update once upstream is sorted out.

Regards,
Michael

[1] https://www.cve.org/CVERecord?id=CVE-2024-3094


> Signed-off-by: Christian Melki 
> ---
>  rules/xz.make | 17 ++---
>  1 file changed, 10 insertions(+), 7 deletions(-)
> 
> diff --git a/rules/xz.make b/rules/xz.make
> index f24a2ac03..51490b2ce 100644
> --- a/rules/xz.make
> +++ b/rules/xz.make
> @@ -14,16 +14,16 @@ PACKAGES-$(PTXCONF_XZ) += xz
>  #
>  # Paths and names
>  #
> -XZ_VERSION   := 5.4.4
> -XZ_MD5   := fbb849a27e266964aefe26bad508144f
> +XZ_VERSION   := 5.6.0
> +XZ_MD5   := cfb1afdfcfeca02f7677b1b401bc536e
>  XZ   := xz-$(XZ_VERSION)
> -XZ_SUFFIX:= tar.bz2
> -XZ_URL   := https://tukaani.org/xz/$(XZ).$(XZ_SUFFIX)
> +XZ_SUFFIX:= tar.xz
> +XZ_URL   := 
> https://github.com/tukaani-project/xz/releases/download/v$(XZ_VERSION)/$(XZ).$(XZ_SUFFIX)
>  XZ_SOURCE:= $(SRCDIR)/$(XZ).$(XZ_SUFFIX)
>  XZ_DIR   := $(BUILDDIR)/$(XZ)
> -XZ_LICENSE   := public_domain AND LGPL-2.1-or-later AND GPL-2.0-or-later AND 
> GPL-3.0-or-later
> +XZ_LICENSE   := public_domain AND 0BSD AND LGPL-2.1-or-later AND 
> GPL-2.0-or-later AND GPL-3.0-or-later
>  XZ_LICENSE_FILES := \
> - file://COPYING;md5=c8ea84ebe7b93cce676b54355dc6b2c0 \
> + file://COPYING;md5=3ef4de063517b8d33e97bbb87a3339ee \
>   file://COPYING.GPLv2;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
>   file://COPYING.GPLv3;md5=1ebbd3e34237af26da5dc08a4e440464 \
>   file://COPYING.LGPLv2.1;md5=4fbd65380cdd255951079008b364516c
> @@ -44,6 +44,7 @@ XZ_CONF_OPT := \
>   --disable-lzip-decoder \
>   --enable-assembler \
>   --enable-clmul-crc \
> + --enable-arm64-crc32 \
>   --disable-small \
>   --enable-threads \
>   --$(call ptx/endis,PTXCONF_XZ_TOOLS)-xz \
> @@ -60,9 +61,11 @@ XZ_CONF_OPT:= \
>   --disable-nls \
>   --disable-rpath \
>   $(GLOBAL_LARGE_FILE_OPTION) \
> + --enable-ifunc \
>   --enable-unaligned-access=auto \
>   --disable-unsafe-type-punning \
> - --disable-werror
> + --disable-werror \
> + --$(call ptx/endis, PTXDIST_Y2038)-year2038
>  
>  # 
> 
>  # Target-Install
> -- 
> 2.34.1
> 
> 
> 

-- 
Pengutronix e.K.   | |
Steuerwalder Str. 21   | http://www.pengutronix.de/  |
31137 Hildesheim, Germany  | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

Re: [ptxdist] Getting error 'kernel' must depend on 'host-system-python3' for 'python3'!

[Michael Olbrich]

On Thu, Mar 28, 2024 at 10:59:43AM +, Ian Abbott wrote:
> On 28/03/2024 08:10, Michael Olbrich wrote:
> > On Wed, Mar 27, 2024 at 05:17:21PM +, Ian Abbott wrote:
> > > I'm getting this error when trying to build a kernel that has "Kernel
> > > hacking > Compile-time checks and compiler options > Generate BTF typeinfo
> > > (DEBUG_INFO_BTF)" enabled in the configuration:
> > > 
> > > 
> > > --
> > > target: kernel.compile
> > > --
> > > 
> > > make: Entering directory 
> > > '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21'
> > > make[1]: Entering directory 
> > > '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build'
> > >GEN Makefile
> > >DESCEND bpf/resolve_btfids
> > >CALL 
> > > /mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21/scripts/checksyscalls.sh
> > >GEN 
> > > /mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build/tools/bpf/resolve_btfids/libbpf/bpf_helper_defs.h
> > >INSTALL libsubcmd_headers
> > > 
> > > 'kernel' must depend on 'host-system-python3' for 'python3'!
> > > 
> > > make[5]: *** [Makefile:160: 
> > > /mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build/tools/bpf/resolve_btfids/libbpf/bpf_helper_defs.h]
> > > Error 1
> > > make[5]: *** Deleting file 
> > > '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build/tools/bpf/resolve_btfids/libbpf/bpf_helper_defs.h'
> > > make[4]: *** [Makefile:63: 
> > > /mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build/tools/bpf/resolve_btfids//libbpf/libbpf.a]
> > > Error 2
> > > make[4]: *** Waiting for unfinished jobs
> > > make[3]: *** [Makefile:76: bpf/resolve_btfids] Error 2
> > > make[2]: *** 
> > > [/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21/Makefile:1355:
> > > tools/bpf/resolve_btfids] Error 2
> > > make[1]: *** 
> > > [/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21/Makefile:234:
> > > __sub-make] Error 2
> > > make[1]: Leaving directory 
> > > '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build'
> > > make: *** [Makefile:234: __sub-make] Error 2
> > > make: Leaving directory 
> > > '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21'
> > > make: *** 
> > > [/mnt/lindata/work/abbotti/ptxdist/ptxdist/ptxdist_git/ptxdist/rules/kernel.make:251:
> > >  
> > > /home/abbotti/work/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/state/kernel.compile]
> > > Error 2
> > > 
> > > 
> > > I could live without it.  It is required for RestrictFileSystems= in 
> > > systemd
> > > service units according to
> > > <https://github.com/systemd/systemd/blob/main/README>.  But is there an 
> > > easy
> > > fix?
> > 
> > Put this in "platforms/kernel.fixup.in" in your BSP:
> > --->8
> > ## SECTION=base_kernel
> > 
> > config KERNEL
> > select HOST_SYSTEM_PYTHON3
> > 
> > --->8
> > 
> > > I'm currently using ptxdist 2024.03.0 but is also reproducible on the
> > > ptxdist master branch.
> > 
> > We should add that dependency Upstream as well. Something like
> > 
> > config KERNEL_PYTHON3
> > prompt "ensure Python3 is available"
> > bool
> > help
> >   Python3 is needed at build-time when CONFIG_DEBUG_INFO_BTF is
> >   enabled.
> 
> Thanks.  I combined the two and added the following to
> "platforms/kernel.fixup.in" in my BSP:
> 
> --->8
> ## SECTION=base_kernel
> 
> config KERNEL
>   select HO

Re: [ptxdist] Getting error 'kernel' must depend on 'host-system-python3' for 'python3'!

[Michael Olbrich]

On Wed, Mar 27, 2024 at 05:17:21PM +, Ian Abbott wrote:
> I'm getting this error when trying to build a kernel that has "Kernel
> hacking > Compile-time checks and compiler options > Generate BTF typeinfo
> (DEBUG_INFO_BTF)" enabled in the configuration:
> 
> 
> --
> target: kernel.compile
> --
> 
> make: Entering directory 
> '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21'
> make[1]: Entering directory 
> '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build'
>   GEN Makefile
>   DESCEND bpf/resolve_btfids
>   CALL 
> /mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21/scripts/checksyscalls.sh
>   GEN 
> /mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build/tools/bpf/resolve_btfids/libbpf/bpf_helper_defs.h
>   INSTALL libsubcmd_headers
> 
> 'kernel' must depend on 'host-system-python3' for 'python3'!
> 
> make[5]: *** [Makefile:160: 
> /mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build/tools/bpf/resolve_btfids/libbpf/bpf_helper_defs.h]
> Error 1
> make[5]: *** Deleting file 
> '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build/tools/bpf/resolve_btfids/libbpf/bpf_helper_defs.h'
> make[4]: *** [Makefile:63: 
> /mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build/tools/bpf/resolve_btfids//libbpf/libbpf.a]
> Error 2
> make[4]: *** Waiting for unfinished jobs
> make[3]: *** [Makefile:76: bpf/resolve_btfids] Error 2
> make[2]: *** 
> [/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21/Makefile:1355:
> tools/bpf/resolve_btfids] Error 2
> make[1]: *** 
> [/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21/Makefile:234:
> __sub-make] Error 2
> make[1]: Leaving directory 
> '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21-build'
> make: *** [Makefile:234: __sub-make] Error 2
> make: Leaving directory 
> '/mnt/lindata/work/abbotti/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/build-target/linux-6.6.21'
> make: *** 
> [/mnt/lindata/work/abbotti/ptxdist/ptxdist/ptxdist_git/ptxdist/rules/kernel.make:251:
>  
> /home/abbotti/work/ptxdist/projects/its-ipt4-demo/platform-its-ipt4-demo/state/kernel.compile]
> Error 2
> 
> 
> I could live without it.  It is required for RestrictFileSystems= in systemd
> service units according to
> .  But is there an easy
> fix?

Put this in "platforms/kernel.fixup.in" in your BSP:
--->8
## SECTION=base_kernel

config KERNEL
select HOST_SYSTEM_PYTHON3

--->8

> I'm currently using ptxdist 2024.03.0 but is also reproducible on the
> ptxdist master branch.

We should add that dependency Upstream as well. Something like

config KERNEL_PYTHON3
prompt "ensure Python3 is available"
bool
help
  Python3 is needed at build-time when CONFIG_DEBUG_INFO_BTF is
  enabled.

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] python3: Add option to include ensurepip module

[Michael Olbrich]

On Tue, Mar 26, 2024 at 05:17:10PM +0100, Michiel Schelfhout wrote:
> I just discovered that this causes a problem with oldconfig. When I run
> oldconfig I get the following: 
> 
> .config:1959:warning: override: reassigning to symbol PYTHON3_PIP
> 
> I think this is caused by
> https://git.pengutronix.de/cgit/ptxdist/tree/scripts/migrate/migrate_ptx?h=ptxdist-2024.03.0#n428
> 
> So this probably means we cannot reuse the symbol PYTHON3_ENSUREPIP?

Right, we need to rename it. I'll take care of it.

Michael

> On Tue, 26 Mar 2024 17:03:34 +0100
> Michael Olbrich  wrote:
> 
> > Thanks, applied as 7662f004c174da6cf628793a86655c2dc95f8855.
> > 
> > Michael
> > 
> > [sent from post-receive hook]
> > 
> > On Tue, 26 Mar 2024 17:03:34 +0100, Michiel Schelfhout
> >  wrote:
> > > The configuration option --without-ensurepip disables ensurepip at
> > > install time, but the module is still included.
> > > 
> > > Signed-off-by: Michiel Schelfhout 
> > > Message-Id: <20240325083151.371704-1-michiel.schelfh...@protonic.nl>
> > > Signed-off-by: Michael Olbrich 
> > > 
> > > diff --git a/rules/python3.in b/rules/python3.in
> > > index 70fc44f17b20..afa33b077cbf 100644
> > > --- a/rules/python3.in
> > > +++ b/rules/python3.in
> > > @@ -62,6 +62,10 @@ config PYTHON3_DISTUTILS
> > >   bool
> > >   prompt "Include distutils packages"
> > >  
> > > +config PYTHON3_ENSUREPIP
> > > + bool
> > > + prompt "Include ensurepip module"
> > > +
> > >  endif
> > >  
> > >  menu "python3 Extra Modules "
> > > diff --git a/rules/python3.make b/rules/python3.make
> > > index 99a553c008d7..ae128c12a4f3 100644
> > > --- a/rules/python3.make
> > > +++ b/rules/python3.make
> > > @@ -166,6 +166,7 @@ PYTHON3_SKIP-$(call ptx/opt-dis,
> > > PTXCONF_PYTHON3_READLINE) += */readline*so
> > > PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_SQLITE)  +=
> > > */sqlite3 */_sqlite3*.so PYTHON3_SKIP-$(call ptx/opt-dis,
> > > PTXCONF_PYTHON3_SSL)  += */ssl.pyc */_ssl*.so
> > > */hashlib.pyc */_hashlib*.so PYTHON3_SKIP-$(call ptx/opt-dis,
> > > PTXCONF_PYTHON3_DISTUTILS)+= */distutils
> > > +PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_ENSUREPIP)
> > > += */ensurepip $(STATEDIR)/python3.targetinstall: @$(call
> > > targetinfo)  
> 

-- 
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] python3: Add option to include ensurepip module

[Michael Olbrich]

Thanks, applied as 7662f004c174da6cf628793a86655c2dc95f8855.

Michael

[sent from post-receive hook]

On Tue, 26 Mar 2024 17:03:34 +0100, Michiel Schelfhout 
 wrote:
> The configuration option --without-ensurepip disables ensurepip at install
> time, but the module is still included.
> 
> Signed-off-by: Michiel Schelfhout 
> Message-Id: <20240325083151.371704-1-michiel.schelfh...@protonic.nl>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/python3.in b/rules/python3.in
> index 70fc44f17b20..afa33b077cbf 100644
> --- a/rules/python3.in
> +++ b/rules/python3.in
> @@ -62,6 +62,10 @@ config PYTHON3_DISTUTILS
>   bool
>   prompt "Include distutils packages"
>  
> +config PYTHON3_ENSUREPIP
> + bool
> + prompt "Include ensurepip module"
> +
>  endif
>  
>  menu "python3 Extra Modules "
> diff --git a/rules/python3.make b/rules/python3.make
> index 99a553c008d7..ae128c12a4f3 100644
> --- a/rules/python3.make
> +++ b/rules/python3.make
> @@ -166,6 +166,7 @@ PYTHON3_SKIP-$(call ptx/opt-dis, 
> PTXCONF_PYTHON3_READLINE)+= */readline*so
>  PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_SQLITE) += */sqlite3 
> */_sqlite3*.so
>  PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_SSL)+= 
> */ssl.pyc */_ssl*.so */hashlib.pyc */_hashlib*.so
>  PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_DISTUTILS)  += */distutils
> +PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_ENSUREPIP)  += */ensurepip
>  
>  $(STATEDIR)/python3.targetinstall:
>   @$(call targetinfo)

Re: [ptxdist] [APPLIED] libpciaccess: Version bump. 0.18 -> 0.18.1

[Michael Olbrich]

Thanks, applied as a469498ec0e38e3f3443daf79b6a1849e7a5dfac.

Michael

[sent from post-receive hook]

On Tue, 26 Mar 2024 17:03:35 +0100, Christian Melki 
 wrote:
> Very minor meson build change.
> Bumping anyway.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <2024032517.2416203-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libpciaccess.make b/rules/libpciaccess.make
> index 7ab035ab51cb..79b4f926368e 100644
> --- a/rules/libpciaccess.make
> +++ b/rules/libpciaccess.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBPCIACCESS) += libpciaccess
>  #
>  # Paths and names
>  #
> -LIBPCIACCESS_VERSION := 0.18
> -LIBPCIACCESS_MD5 := 54f48367e37666f9e0f12571d1ee3620
> +LIBPCIACCESS_VERSION := 0.18.1
> +LIBPCIACCESS_MD5 := 57c7efbeceedefde006123a77a7bc825
>  LIBPCIACCESS := libpciaccess-$(LIBPCIACCESS_VERSION)
>  LIBPCIACCESS_SUFFIX  := tar.xz
>  LIBPCIACCESS_URL := $(call ptx/mirror, XORG, 
> individual/lib/$(LIBPCIACCESS).$(LIBPCIACCESS_SUFFIX))

Re: [ptxdist] [APPLIED] busybox: New patch to fix compilation with Linux v6.8-rc1

[Michael Olbrich]

Thanks, applied as 54229b64d737d46cbb5e5913700937ba2d1c40af.

Michael

[sent from post-receive hook]

On Tue, 26 Mar 2024 17:03:32 +0100, Uwe Kleine-König 
 wrote:
> Signed-off-by: Uwe Kleine-König 
> Message-Id: <20240323172337.741656-1-u.kleine-koe...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git 
> a/patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch 
> b/patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> new file mode 100644
> index ..23715aa1a588
> --- /dev/null
> +++ b/patches/busybox-1.36.1/0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> @@ -0,0 +1,61 @@
> +From: =?UTF-8?q?Uwe=20Kleine-K=C3=B6nig?= 
> +Date: Sat, 23 Mar 2024 13:28:56 +0100
> +Subject: [PATCH] tc: Fix compilation with Linux v6.8-rc1
> +
> +Linux v6.8-rc1 removed the definitions related to CBQ making tc fail to
> +build. Add some #ifdefs to handle this missing support.
> +
> +Forwarded: http://lists.busybox.net/pipermail/busybox/2024-March/090678.html
> +---
> + networking/tc.c | 12 
> + 1 file changed, 12 insertions(+)
> +
> +diff --git a/networking/tc.c b/networking/tc.c
> +index 43187f7ee26c..1315b953e39f 100644
> +--- a/networking/tc.c
>  b/networking/tc.c
> +@@ -231,6 +231,13 @@ static int cbq_parse_opt(int argc, char **argv, struct 
> nlmsghdr *n)
> + return 0;
> + }
> + #endif
> ++
> ++#ifndef TCA_CBQ_MAX
> ++/*
> ++ * Linux v6.8-rc1~131^2~60^2^2 removed the uapi definitions for CBQ.
> ++ * See https://git.kernel.org/linus/33241dca48626
> ++ */
> ++#else
> + static int cbq_print_opt(struct rtattr *opt)
> + {
> + struct rtattr *tb[TCA_CBQ_MAX+1];
> +@@ -322,6 +329,7 @@ static int cbq_print_opt(struct rtattr *opt)
> +  done:
> + return 0;
> + }
> ++#endif
> + 
> + static FAST_FUNC int print_qdisc(
> + const struct sockaddr_nl *who UNUSED_PARAM,
> +@@ -372,8 +380,10 @@ static FAST_FUNC int print_qdisc(
> + int qqq = index_in_strings(_q_, name);
> + if (qqq == 0) { /* pfifo_fast aka prio */
> + prio_print_opt(tb[TCA_OPTIONS]);
> ++#ifdef TCA_CBQ_MAX
> + } else if (qqq == 1) { /* class based queuing */
> + cbq_print_opt(tb[TCA_OPTIONS]);
> ++#endif
> + } else {
> + /* don't know how to print options for this qdisc */
> + printf("(options for %s)", name);
> +@@ -442,9 +452,11 @@ static FAST_FUNC int print_class(
> + int qqq = index_in_strings(_q_, name);
> + if (qqq == 0) { /* pfifo_fast aka prio */
> + /* nothing. */ /*prio_print_opt(tb[TCA_OPTIONS]);*/
> ++#ifdef TCA_CBQ_MAX
> + } else if (qqq == 1) { /* class based queuing */
> + /* cbq_print_copt() is identical to cbq_print_opt(). */
> + cbq_print_opt(tb[TCA_OPTIONS]);
> ++#endif
> + } else {
> + /* don't know how to print options for this class */
> + printf("(options for %s)", name);
> diff --git a/patches/busybox-1.36.1/series b/patches/busybox-1.36.1/series
> index ee536088790b..87fee50916c0 100644
> --- a/patches/busybox-1.36.1/series
> +++ b/patches/busybox-1.36.1/series
> @@ -6,4 +6,5 @@
>  0200-reactivate-check-for-tty.patch
>  0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch
>  0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
> -# 9c0cc4baa8090165b429198c9a10e02c  - git-ptx-patches magic
> +0203-tc-Fix-compilation-with-Linux-v6.8-rc1.patch
> +# e781b8c6838e27fd021f9c1a9f87654d  - git-ptx-patches magic

Re: [ptxdist] What can be actually set in a collection

[Michael Olbrich]

Hi,

On Tue, Mar 12, 2024 at 02:47:04PM +0100, Mircea Ciocan wrote:
> in an attempt to consolidate multiple similar platforms under one
> ptxconfig + individual collection configs we are not sure if in the
> collection only individual software packages can be set that have been
> already marked with  in the root ptxconfig, or other things, like
> variables containing a string or different build options for a specific
> package can be put in a collection.

Collections only work to get a subset of packages. They cannot be used for
other options.

> If these things can't be stored in a collection, can be stored somewhere
> else so they can be merged with the global ptxdist when a specific
> configuration is selected ?

If you need more than what collections allow, then I suggest you use
layers. A layer allows you to store what is basically a diff for the base
ptxconfig. You can do the same thing for other configs, such as the
platformconfig or a kernelconfig. It can have a separate projectroot/ to
overwrite things from the base BSP. You can customize just about everything
in the BSP but still keep the common parts in one place.

> Can/will the already define variable be overridden ? Is there any related 
> documentation ?

Collections are not really documented. They are rarely used because of the
limitations you noticed. Layers are documented[1], but I'm use that could
be better :-). Feel free to ask questions here if anything is unclear.

Michael

[1] https://www.ptxdist.org/doc/dev_layers_in_ptxdist.html

-- 
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] Can SYSTEMD_HELPER be changed persistently?

[Michael Olbrich]

Hi,

On Tue, Mar 19, 2024 at 04:17:11PM +, Ian Abbott wrote:
> This is really just a minor inconvenience.  I am not using systemd in a
> project, but every time I do an 'oldconfig' operation, the configuration
> system asks if I want to select SYSTEMD_HELPER, i.e.:
> 
> ---
> Updating 'myproject/configs/ptxconfig'...
> info: successfully migrated
> '/path/to/ptxdist/projects/myproject/configs/ptxconfig'
> 
> *
> * Restart config...
> *
> *
> * systemd
> *
> systemd(SYSTEMD_HELPER) [N/m/y/?] (NEW)
> #
> # configuration written to .config
> #
> ---
> 
> The ptxconfig file contains the line:
> 
> # PTXCONF_SYSTEMD_HELPER is not set
> 
> As an experiment, I tried setting the SYSTEMD_HELPER to all three states in
> turn (not set, m, and y), but the next 'oldconfig' operation always ignores
> the current setting and asks for the new setting.
> 
> I'm currently using ptxdist release 2024.03.0 but I guess this problem will
> have first appeared in release 2023.11.0.

Right, the migrate helper that I added when SYSTEMD_HELPER was introduced,
is not quite correct and drops the SYSTEMD_HELPER symbol in your case.

I have a fix for this in my test queue and it should hit master soon. It
should be fixed in the next release.

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] strace: Version bump. 6.7 -> 6.8

[Michael Olbrich]

Thanks, applied as 7827e225be2d5418e03ab8cc0646f3bbee31fdda.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:39 +0100, Christian Melki 
 wrote:
> Minor changes.
> https://github.com/strace/strace/releases/tag/v6.8
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240321194643.4034187-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/strace.make b/rules/strace.make
> index 2b505e57eeb6..697b1495aadb 100644
> --- a/rules/strace.make
> +++ b/rules/strace.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_STRACE) += strace
>  #
>  # Paths and names
>  #
> -STRACE_VERSION   := 6.7
> -STRACE_MD5   := 8eb0aa75111a8e66cc14176159cc8ee9
> +STRACE_VERSION   := 6.8
> +STRACE_MD5   := 1c7aca3fad1f309fdb54031866fad6d9
>  STRACE   := strace-$(STRACE_VERSION)
>  STRACE_SUFFIX:= tar.xz
>  STRACE_URL   := 
> https://strace.io/files/$(STRACE_VERSION)/$(STRACE).$(STRACE_SUFFIX)

Re: [ptxdist] [APPLIED] strongswan: version bump 5.9.8 -> 5.9.14

[Michael Olbrich]

Thanks, applied as 19ae7cd22c60445f50b74efa64396635181c59bf.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:38 +0100, Lars Pedersen  wrote:
> Enchancement and new features regarding OCSP and certificate use cases.
> Otherwise mainly minor bugfixes.
> 
> New configure options, which all is default disabled:
> 
>  --enable-openxpki (enable OCSP responder accessing OpenXPKI certificate 
> database)
>  --enable-cert-enroll (enable automatic certificate enrollment via EST or 
> SCEP)
>  --enable-cert-enroll-timer (enable installation of cert-enroll as a systemd)
> 
> Signed-off-by: Lars Pedersen 
> Message-Id: <20240321133751.1533587-1-lape...@gmail.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/strongswan.make b/rules/strongswan.make
> index 5f4e840dc6d7..de657eaf7ae8 100644
> --- a/rules/strongswan.make
> +++ b/rules/strongswan.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_STRONGSWAN) += strongswan
>  #
>  # Paths and names
>  #
> -STRONGSWAN_VERSION   := 5.9.8
> -STRONGSWAN_MD5   := f46b0d3e7aed88824650d0721c887443
> +STRONGSWAN_VERSION   := 5.9.14
> +STRONGSWAN_MD5   := 21ca3fc7c18456405d03b77266ba630a
>  STRONGSWAN   := strongswan-$(STRONGSWAN_VERSION)
>  STRONGSWAN_SUFFIX:= tar.bz2
>  STRONGSWAN_URL   := 
> https://download.strongswan.org/$(STRONGSWAN).$(STRONGSWAN_SUFFIX)

Re: [ptxdist] [APPLIED] libqmi: Add option to enable QMI firmware update tool

[Michael Olbrich]

Thanks, applied as 61143543fa1d18cfc6ec7340777bf64b5b54dc75.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:37 +0100, Lars Pedersen  wrote:
> Signed-off-by: Lars Pedersen 
> Message-Id: <20240321114423.1503313-1-lape...@gmail.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libqmi.in b/rules/libqmi.in
> index 571bfa3a0aa6..1b4c8c88c146 100644
> --- a/rules/libqmi.in
> +++ b/rules/libqmi.in
> @@ -15,4 +15,7 @@ config LIBQMI_MBIM_QMUX
>   bool "enable mbim-qmux support"
>   default y if MODEMMANAGER
>  
> +config LIBQMI_FIRMWARE_UPDATE
> + bool "Add firmware update tool for QMI devices"
> +
>  endif
> diff --git a/rules/libqmi.make b/rules/libqmi.make
> index 03487369cbdf..2cc6695cb061 100644
> --- a/rules/libqmi.make
> +++ b/rules/libqmi.make
> @@ -36,7 +36,7 @@ LIBQMI_LICENSE_FILES := \
>  LIBQMI_CONF_TOOL := meson
>  LIBQMI_CONF_OPT  := \
>   $(CROSS_MESON_USR) \
> - -Dfirmware_update=false \
> + -Dfirmware_update=$(call ptx/truefalse, PTXCONF_LIBQMI_FIRMWARE_UPDATE) 
> \
>   -Dcollection=full \
>   -Dmbim_qmux=$(call ptx/truefalse, PTXCONF_LIBQMI_MBIM_QMUX) \
>   -Dmm_runtime_check=false \
> @@ -65,6 +65,10 @@ $(STATEDIR)/libqmi.targetinstall:
>   @$(call install_copy, libqmi, 0, 0, 0755, -, /usr/bin/qmicli)
>   @$(call install_copy, libqmi, 0, 0, 0755, -, /usr/bin/qmi-network)
>  
> +ifdef PTXCONF_LIBQMI_FIRMWARE_UPDATE
> + @$(call install_copy, libqmi, 0, 0, 0755, -, 
> /usr/bin/qmi-firmware-update)
> +endif
> +
>   @$(call install_copy, libqmi, 0, 0, 0755, -, /usr/libexec/qmi-proxy)
>   @$(call install_lib, libqmi, 0, 0, 0644, libqmi-glib)
>  

Re: [ptxdist] [APPLIED] glib: Version bump. 2.78.4 -> 2.80.0

[Michael Olbrich]

Thanks, applied as d285fdd1da5270322e7d71fece9750358b2c7b6d.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:36 +0100, Christian Melki 
 wrote:
> New stable series.
> Looks like mostly bugfixes with a few API changes.
> https://gitlab.gnome.org/GNOME/glib/-/releases/2.79.0
> https://gitlab.gnome.org/GNOME/glib/-/releases/2.79.1
> https://gitlab.gnome.org/GNOME/glib/-/releases/2.79.2
> https://gitlab.gnome.org/GNOME/glib/-/releases/2.79.3
> https://gitlab.gnome.org/GNOME/glib/-/releases/2.80.0
> 
> * Fix option changes.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240320184951.1307528-1-christian.me...@t2data.com>
> [mol: update configure options]
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/glib.make b/rules/glib.make
> index 67c60227c94d..2acc9539b89a 100644
> --- a/rules/glib.make
> +++ b/rules/glib.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_GLIB) += glib
>  #
>  # Paths and names
>  #
> -GLIB_VERSION := 2.78.4
> -GLIB_MD5 := 0781e889cab64f1f7dbb6e8357c6a95f
> +GLIB_VERSION := 2.80.0
> +GLIB_MD5 := 3a51e2803ecd22c2dadcd07d9475ebe3
>  GLIB := glib-$(GLIB_VERSION)
>  GLIB_SUFFIX  := tar.xz
>  GLIB_URL := $(call ptx/mirror, GNOME, glib/$(basename 
> $(GLIB_VERSION))/$(GLIB).$(GLIB_SUFFIX))
> @@ -44,11 +44,13 @@ GLIB_CONF_OPT := \
>   -Dglib_assert=true \
>   -Dglib_checks=true \
>   -Dglib_debug=enabled \
> - -Dgtk_doc=false \
> + -Ddocumentation=false \
>   -Dinstalled_tests=false \
> + -Dintrospection=disabled \
>   -Dlibelf=disabled \
>   -Dlibmount=$(call ptx/endis, PTXCONF_GLIB_LIBMOUNT)d \
> - -Dman=false \
> + -Dman-pages=disabled \
> + -Dmultiarch=false \
>   -Dnls=disabled \
>   -Doss_fuzz=disabled \
>   -Dselinux=disabled \
> diff --git a/rules/host-glib.make b/rules/host-glib.make
> index fd7d11d9e19f..3d6cd8ffb270 100644
> --- a/rules/host-glib.make
> +++ b/rules/host-glib.make
> @@ -27,6 +27,7 @@ HOST_GLIB_CONF_TOOL := meson
>  HOST_GLIB_CONF_OPT   := \
>   $(HOST_MESON_OPT) \
>   -Dbsymbolic_functions=true \
> + -Ddocumentation=false \
>   -Ddtrace=false \
>   -Dforce_posix_threads=true \
>   -Dglib_assert=true \
> @@ -34,9 +35,11 @@ HOST_GLIB_CONF_OPT := \
>   -Dglib_debug=enabled \
>   -Dgtk_doc=false \
>   -Dinstalled_tests=false \
> + -Dintrospection=disabled \
>   -Dlibelf=disabled \
>   -Dlibmount=disabled \
> - -Dman=false \
> + -Dman-pages=disabled \
> + -Dmultiarch=false \
>   -Dnls=disabled \
>   -Doss_fuzz=disabled \
>   -Dselinux=disabled \

Re: [ptxdist] [APPLIED] autossh: Version bump 1.4c -> 1.4g

[Michael Olbrich]

Thanks, applied as 60a75dfe5effe0376e414e2d57c6613746d7eb32.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:35 +0100, Bruno Thomsen  
wrote:
> https://www.harding.motd.ca/autossh/CHANGES.txt
> 
> Patch removed as change has been upstreamed.
> 
> Add license file (autossh.c) and hash. Changed SPDX indentifier
> to custom as I have been unable to determine license with SPDX
> Check License[1] or by manual review. It looks like a blend of
> MIT and BSD.
> 
> [1] https://tools.spdx.org/app/check_license/
> 
> Signed-off-by: Bruno Thomsen 
> Message-Id: <20240317090522.9271-2-bruno.thom...@gmail.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git 
> a/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch
>  
> b/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch
> deleted file mode 100644
> index 96fca563aa50..
> --- 
> a/patches/autossh-1.4c/0001-Make-install-rule-friendly-towards-packaging-with-DE.patch
> +++ /dev/null
> @@ -1,47 +0,0 @@
> -From: Jon Ringle 
> -Date: Fri, 27 Jun 2014 16:39:41 -0400
> -Subject: [PATCH] Make install rule friendly towards packaging with $DESTDIR
> -
> -Signed-off-by: Jon Ringle 
> 
> - Makefile.in | 30 +++---
> - 1 file changed, 15 insertions(+), 15 deletions(-)
> -
> -diff --git a/Makefile.in b/Makefile.in
> -index fb7cc1d..a8e7a7e 100644
>  a/Makefile.in
> -+++ b/Makefile.in
> -@@ -45,18 +45,18 @@ distclean:   allclean
> - - /bin/rm -f Makefile
> - 
> - install:$(TARGET)
> --mkdir -p -m 755 $(bindir)
> --mkdir -p -m 755 $(prefix)/share/doc/autossh
> --mkdir -p -m 755 $(datadir)/examples/autossh
> --mkdir -p -m 755 $(mandir)/man1
> --cp $(TARGET) $(bindir)
> --cp CHANGES README $(datadir)/doc/autossh
> --cp autossh.host $(datadir)/examples/autossh
> --cp rscreen $(datadir)/examples/autossh
> --cp autossh.1 $(mandir)/man1
> --chmod 755 $(bindir)/$(TARGET)
> --chmod 644 $(datadir)/doc/autossh/CHANGES
> --chmod 644 $(datadir)/doc/autossh/README
> --chmod 644 $(datadir)/examples/autossh/autossh.host 
> --chmod 644 $(datadir)/examples/autossh/rscreen
> --chmod 644 $(mandir)/man1/autossh.1 
> -+mkdir -p -m 755 $(DESTDIR)$(bindir)
> -+mkdir -p -m 755 $(DESTDIR)$(prefix)/share/doc/autossh
> -+mkdir -p -m 755 $(DESTDIR)$(datadir)/examples/autossh
> -+mkdir -p -m 755 $(DESTDIR)$(mandir)/man1
> -+cp $(TARGET) $(DESTDIR)$(bindir)
> -+cp CHANGES README $(DESTDIR)$(datadir)/doc/autossh
> -+cp autossh.host $(DESTDIR)$(datadir)/examples/autossh
> -+cp rscreen $(DESTDIR)$(datadir)/examples/autossh
> -+cp autossh.1 $(DESTDIR)$(mandir)/man1
> -+chmod 755 $(DESTDIR)$(bindir)/$(TARGET)
> -+chmod 644 $(DESTDIR)$(datadir)/doc/autossh/CHANGES
> -+chmod 644 $(DESTDIR)$(datadir)/doc/autossh/README
> -+chmod 644 $(DESTDIR)$(datadir)/examples/autossh/autossh.host 
> -+chmod 644 $(DESTDIR)$(datadir)/examples/autossh/rscreen
> -+chmod 644 $(DESTDIR)$(mandir)/man1/autossh.1 
> diff --git a/patches/autossh-1.4c/series b/patches/autossh-1.4c/series
> deleted file mode 100644
> index 29f971c73214..
> --- a/patches/autossh-1.4c/series
> +++ /dev/null
> @@ -1,4 +0,0 @@
> -# generated by git-ptx-patches
> -#tag:base --start-number 1
> -0001-Make-install-rule-friendly-towards-packaging-with-DE.patch
> -# ecdd87ec5c25c56d421024daf8acf722  - git-ptx-patches magic
> diff --git a/rules/autossh.make b/rules/autossh.make
> index 879cd1c99ce0..86dae4db7762 100644
> --- a/rules/autossh.make
> +++ b/rules/autossh.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh
>  #
>  # Paths and names
>  #
> -AUTOSSH_VERSION  := 1.4c
> -AUTOSSH_MD5  := 26520eea934f296be0783dabe7fcfd28
> -AUTOSSH  := autossh-$(AUTOSSH_VERSION)
> -AUTOSSH_SUFFIX   := tgz
> -AUTOSSH_URL  := 
> https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> -AUTOSSH_SOURCE   := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> -AUTOSSH_DIR  := $(BUILDDIR)/$(AUTOSSH)
> -AUTOSSH_LICENSE  := unknown
> +AUTOSSH_VERSION  := 1.4g
> +AUTOSSH_MD5  := 2b804bc1bf6d2f2afaa526d02df7c0a2
> +AUTOSSH  := autossh-$(AUTOSSH_VERSION)
> +AUTOSSH_SUFFIX   := tgz
> +AUTOSSH_URL  := 
> https://www.harding.motd.ca/autoss

Re: [ptxdist] [APPLIED] autossh: update URL

[Michael Olbrich]

Thanks, applied as dbed1fb29767fbd29fa905fe36ae9d70c83aab54.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:34 +0100, Bruno Thomsen  
wrote:
> Update URL from http to https as it returns 301 Moved Permanently.
> 
> Download log:
> 
> --2024-03-08 13:14:10--  http://www.harding.motd.ca/autossh/autossh-1.4c.tgz
> Resolving www.harding.motd.ca (www.harding.motd.ca)... 70.73.86.42
> Connecting to www.harding.motd.ca (www.harding.motd.ca)|70.73.86.42|:80... 
> connected.
> HTTP request sent, awaiting response... 301 Moved Permanently
> Location: https://www.harding.motd.ca/autossh/autossh-1.4c.tgz [following]
> --2024-03-08 13:14:11--  https://www.harding.motd.ca/autossh/autossh-1.4c.tgz
> Connecting to www.harding.motd.ca (www.harding.motd.ca)|70.73.86.42|:443... 
> connected.
> HTTP request sent, awaiting response... 200 OK
> Length: 65191 (64K) [application/octet-stream]
> 
> Signed-off-by: Bruno Thomsen 
> Message-Id: <20240317090522.9271-1-bruno.thom...@gmail.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/autossh.make b/rules/autossh.make
> index ef8240bcb19a..879cd1c99ce0 100644
> --- a/rules/autossh.make
> +++ b/rules/autossh.make
> @@ -18,7 +18,7 @@ AUTOSSH_VERSION := 1.4c
>  AUTOSSH_MD5  := 26520eea934f296be0783dabe7fcfd28
>  AUTOSSH  := autossh-$(AUTOSSH_VERSION)
>  AUTOSSH_SUFFIX   := tgz
> -AUTOSSH_URL  := 
> http://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> +AUTOSSH_URL  := 
> https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
>  AUTOSSH_SOURCE   := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
>  AUTOSSH_DIR  := $(BUILDDIR)/$(AUTOSSH)
>  AUTOSSH_LICENSE  := unknown

Re: [ptxdist] [APPLIED] opus: switch to meson build system

[Michael Olbrich]

Thanks, applied as 2dcef33c7a975f99664811f96c0bee9665c1a65a.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:34 +0100, Philipp Zabel  
wrote:
> Enable the asm option only together with fixed-point.
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240316122236.2136539-2-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/opus.in b/rules/opus.in
> index 7412eb76a538..237928a29453 100644
> --- a/rules/opus.in
> +++ b/rules/opus.in
> @@ -3,5 +3,6 @@
>  config OPUS
>   tristate
>   prompt "opus"
> + select HOST_MESON
>   help
> Opus is a totally open, royalty-free, highly versatile audio codec.
> diff --git a/rules/opus.make b/rules/opus.make
> index 490ef6ea44d6..f666ab9a8f03 100644
> --- a/rules/opus.make
> +++ b/rules/opus.make
> @@ -27,35 +27,29 @@ OPUS_LICENSE  := BSD-3-Clause
>  # Prepare
>  # 
> 
>  
> -#
> -# autoconf
> -#
> -OPUS_CONF_TOOL   := autoconf
> +OPUS_CONF_TOOL   := meson
>  OPUS_CONF_OPT:= \
> - $(CROSS_AUTOCONF_USR) \
> - --disable-static \
> - --$(call ptx/disen, PTXCONF_HAS_HARDFLOAT)-fixed-point \
> - --disable-fixed-point-debug \
> - --enable-float-api \
> - --disable-custom-modes \
> - --disable-dred \
> - --disable-deep-plc \
> - --disable-lossgen \
> - --enable-float-approx \
> - --enable-asm \
> - --enable-rtcd \
> - --enable-intrinsics \
> - --disable-assertions \
> - --enable-hardening \
> - --disable-fuzzing \
> - --disable-check-asm \
> - --disable-doc \
> - --disable-dot-product \
> - --disable-dnn-debug-float \
> - --disable-osce-training-data \
> - --disable-osce \
> - --disable-extra-programs \
> - --enable-rfc8251
> + $(CROSS_MESON_USR) \
> + -Dasm=$(call ptx/disen, PTXCONF_HAS_HARDFLOAT)d \
> + -Dassertions=false \
> + -Dcheck-asm=false \
> + -Dcustom-modes=false \
> + -Ddocdir=doc/opus \
> + -Ddocs=disabled \
> + -Denable-deep-plc=false \
> + -Denable-dnn-debug-float=false \
> + -Denable-dred=false \
> + -Denable-osce=false \
> + -Dextra-programs=disabled \
> + -Dfixed-point=$(call ptx/falsetrue, PTXCONF_HAS_HARDFLOAT) \
> + -Dfixed-point-debug=false \
> + -Dfloat-api=true \
> + -Dfloat-approx=true \
> + -Dfuzzing=false \
> + -Dhardening=true \
> + -Dintrinsics=enabled \
> + -Drtcd=enabled \
> + -Dtests=disabled
>  
>  # 
> 
>  # Target-Install

Re: [ptxdist] [APPLIED] opus: version bump 1.4 -> 1.5.1

[Michael Olbrich]

Thanks, applied as 69c3ecfb6d8edb33c3959d520e352c06a7a20f88.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:33 +0100, Philipp Zabel  
wrote:
> https://opus-codec.org/demo/opus-1.5/
> 
> New machine learning features (DRED, deep PLC, and OSCE) disabled for
> now, as they increase library size by a few MiB.
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240316122236.2136539-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/opus.make b/rules/opus.make
> index 4dd2f9d9b653..490ef6ea44d6 100644
> --- a/rules/opus.make
> +++ b/rules/opus.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPUS) += opus
>  #
>  # Paths and names
>  #
> -OPUS_VERSION := 1.4
> -OPUS_MD5 := 0d89c15268c5c5984f583d7997d2a148
> +OPUS_VERSION := 1.5.1
> +OPUS_MD5 := 06c0e626ea3ad72f7b006e9130c8b15d
>  OPUS := opus-$(OPUS_VERSION)
>  OPUS_SUFFIX  := tar.gz
>  OPUS_URL := 
> http://downloads.xiph.org/releases/opus/$(OPUS).$(OPUS_SUFFIX)
> @@ -38,6 +38,9 @@ OPUS_CONF_OPT   := \
>   --disable-fixed-point-debug \
>   --enable-float-api \
>   --disable-custom-modes \
> + --disable-dred \
> + --disable-deep-plc \
> + --disable-lossgen \
>   --enable-float-approx \
>   --enable-asm \
>   --enable-rtcd \
> @@ -47,6 +50,10 @@ OPUS_CONF_OPT  := \
>   --disable-fuzzing \
>   --disable-check-asm \
>   --disable-doc \
> + --disable-dot-product \
> + --disable-dnn-debug-float \
> + --disable-osce-training-data \
> + --disable-osce \
>   --disable-extra-programs \
>   --enable-rfc8251
>  

Re: [ptxdist] [APPLIED] sudo: version bump 1.9.14p3 -> 1.9.15p5

[Michael Olbrich]

Thanks, applied as 3848434d4b788e61c318bf103c7491d3c44f878e.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:32 +0100, Andreas Helmcke  
wrote:
> various bugfixes, including fixes for CVE-2023-42465 and CVE-2023-42456
> 
> Full info: https://www.sudo.ws/releases/stable/#1.9.15p5
> 
> Signed-off-by: Andreas Helmcke 
> Message-Id: <20240315114653.15820-1-ahelm...@ela-soft.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/sudo.make b/rules/sudo.make
> index 93b92ad69c16..83c3e7f8e89b 100644
> --- a/rules/sudo.make
> +++ b/rules/sudo.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_SUDO) += sudo
>  #
>  # Paths and names
>  #
> -SUDO_VERSION := 1.9.14p3
> -SUDO_MD5 := 4cc21cf7c9a89290b230954aed0d1e11
> +SUDO_VERSION := 1.9.15p5
> +SUDO_MD5 := 4166279cb188ecb6641c7a2ba5f68270
>  SUDO := sudo-$(SUDO_VERSION)
>  SUDO_SUFFIX  := tar.gz
>  SUDO_URL := \

Re: [ptxdist] [APPLIED] host-meson: ignore uic if it is not found

[Michael Olbrich]

Thanks, applied as b1f9b75c3a477d8d082dc62ffcd0891f65633a69.

Michael

[sent from post-receive hook]

On Sat, 23 Mar 2024 09:59:31 +0100, Michael Tretter  
wrote:
> Qt builds and installs the uic only if Widgets are enabled, but meson
> always checks for the uic when checking for the Qt tools. This breaks
> the build of applications that use Qt, but don't use Widgets.
> 
> Add a patch to ignore the uic if it is not found, as PTXdist already
> correctly handles the dependencies.
> 
> Signed-off-by: Michael Tretter 
> Message-Id: <20240315095623.1888719-1-m.tret...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch 
> b/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
> new file mode 100644
> index ..c404d3149d4c
> --- /dev/null
> +++ b/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
> @@ -0,0 +1,29 @@
> +From: Michael Tretter 
> +Date: Tue, 12 Mar 2024 18:22:06 +0100
> +Subject: [PATCH] HACK: don't fail if uic is missing
> +
> +Qt5 builds the uic only if Widgets are enabled. The uic is not required
> +for applications that don't use Widgets, but is required as standard
> +tool by meson.
> +
> +Ignore uic if it is not found.
> +
> +Signed-off-by: Michael Tretter 
> +---
> + mesonbuild/modules/qt.py | 3 +++
> + 1 file changed, 3 insertions(+)
> +
> +diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
> +index b3242ceaf167..26b5dbc9fc0d 100644
> +--- a/mesonbuild/modules/qt.py
>  b/mesonbuild/modules/qt.py
> +@@ -281,6 +281,9 @@ class QtBaseModule(ExtensionModule):
> + if tool.name == 'lrelease':
> + mlog.warning('Ignoring missing lrelease')
> + continue
> ++if tool.name == 'uic':
> ++mlog.warning('Ignoring missing uic')
> ++continue
> + if required:
> + raise MesonException('Qt tools not found')
> + return False
> diff --git a/patches/meson-1.3.0/series b/patches/meson-1.3.0/series
> index 209f73f563c2..3bba04f5b328 100644
> --- a/patches/meson-1.3.0/series
> +++ b/patches/meson-1.3.0/series
> @@ -3,4 +3,5 @@
>  0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
>  0002-HACK-enable-NEON-only-for-ARMv7.patch
>  0003-HACK-don-t-fail-if-lrelease-is-missing.patch
> -# ab164f87a7e08b87479345777ce62823  - git-ptx-patches magic
> +0004-HACK-don-t-fail-if-uic-is-missing.patch
> +# 344e721ffeeec9faa5876797156d7064  - git-ptx-patches magic

Re: [ptxdist] [PATCH] python3: Add option to include ensurepip module

[Michael Olbrich]

On Wed, Mar 20, 2024 at 04:59:41PM +0100, Michiel Schelfhout wrote:
> The configuration option --without-ensurepip disables ensurepip at install
> time, but the module is still included.
> 
> Signed-off-by: Michiel Schelfhout 
> ---
>  rules/python3.in   | 5 +
>  rules/python3.make | 1 +
>  2 files changed, 6 insertions(+)
> 
> diff --git a/rules/python3.in b/rules/python3.in
> index 70fc44f17..9ab89f9df 100644
> --- a/rules/python3.in
> +++ b/rules/python3.in
> @@ -62,6 +62,11 @@ config PYTHON3_DISTUTILS
>   bool
>   prompt "Include distutils packages"
>  
> +config PYTHON3_ENSUREPIP
> + bool
> + prompt "Include ensurepip module"
> + default y

I think this should be disabled by default. That was the intention anyways
and for those that need it, it should be pretty obvious that it's gone.

Michael

> +
>  endif
>  
>  menu "python3 Extra Modules "
> diff --git a/rules/python3.make b/rules/python3.make
> index 99a553c00..ae128c12a 100644
> --- a/rules/python3.make
> +++ b/rules/python3.make
> @@ -166,6 +166,7 @@ PYTHON3_SKIP-$(call ptx/opt-dis, 
> PTXCONF_PYTHON3_READLINE)+= */readline*so
>  PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_SQLITE) += */sqlite3 
> */_sqlite3*.so
>  PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_SSL)+= 
> */ssl.pyc */_ssl*.so */hashlib.pyc */_hashlib*.so
>  PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_DISTUTILS)  += */distutils
> +PYTHON3_SKIP-$(call ptx/opt-dis, PTXCONF_PYTHON3_ENSUREPIP)  += */ensurepip
>  
>  $(STATEDIR)/python3.targetinstall:
>   @$(call targetinfo)
> -- 
> 2.40.1
> 
> 
> 

-- 
Pengutronix e.K.   | |
Steuerwalder Str. 21   | http://www.pengutronix.de/  |
31137 Hildesheim, Germany  | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

Re: [ptxdist] [APPLIED] canfestival: port to Python 3

[Michael Olbrich]

Thanks, applied as 1ac1aaf668c383d54431e262c68ee0b539c15cae.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:54 +0100, Roland Hieber  wrote:
> The gnosis library is extracted and moved around by the objdictgen
> Makefile. Extract it early and do the same moving-around in the extract
> stage so we can patch it in PTXdist.
> 
> Not all of the Python code was ported, only enough to make the build
> work, which calls objdictgen.py to generate the C code for the examples.
> The examples are fairly extensive, so this should work for most
> user-supplied XML schema definitions. Of gnosis, only the XML pickle
> modules and the introspection module was ported since those are the only
> modules used by objdictgen. The test cases were mostly ignored, and some
> of them that test Python-specific class internals also don't apply any
> more since Python 3 refactored the whole type system. Also no care was
> taken to stay compatible with Python 1 (duh!) or Python 2.
> 
> Upstream is apparently still dead, judging from the Mercurial repo (last
> commit in 2019), the messages in the SourceForge mailing list archive
> (last message in 2020, none by the authors), and the issue tracker (last
> in 2020, none by the authors). gnosis is a whole different can of worms
> which doesn't even have a publicly available repository or contact
> information. So no attempt was made to send the changes upstream.
> 
> Remove a comment which referenced the old repository URL, which no
> longer exists, and remove the recipe from staging.
> 
> Signed-off-by: Roland Hieber 
> Message-Id: <20240312103109.3581087-1-...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git 
> a/patches/canfestival-3+hg20180126.794/0007-gnosis-port-to-python3.patch 
> b/patches/canfestival-3+hg20180126.794/0007-gnosis-port-to-python3.patch
> new file mode 100644
> index ..bc62c6b9a4e0
> --- /dev/null
> +++ b/patches/canfestival-3+hg20180126.794/0007-gnosis-port-to-python3.patch
> @@ -0,0 +1,1912 @@
> +From: Roland Hieber 
> +Date: Sun, 11 Feb 2024 22:51:48 +0100
> +Subject: [PATCH] gnosis: port to python3
> +
> +Not all of the code was ported, only enough to make objdictgen calls in
> +the Makefile work enough to generate the code in examples/.
> +---
> + objdictgen/gnosis/__init__.py  |  7 +-
> + objdictgen/gnosis/doc/xml_matters_39.txt   |  2 +-
> + objdictgen/gnosis/indexer.py   |  2 +-
> + objdictgen/gnosis/magic/dtdgenerator.py|  2 +-
> + objdictgen/gnosis/magic/multimethods.py|  4 +-
> + objdictgen/gnosis/pyconfig.py  | 34 -
> + objdictgen/gnosis/trigramlib.py|  2 +-
> + objdictgen/gnosis/util/XtoY.py | 22 +++---
> + objdictgen/gnosis/util/introspect.py   | 30 
> + objdictgen/gnosis/util/test/__init__.py|  0
> + objdictgen/gnosis/util/test/funcs.py   |  2 +-
> + objdictgen/gnosis/util/test/test_data2attr.py  | 16 ++---
> + objdictgen/gnosis/util/test/test_introspect.py | 39 +-
> + objdictgen/gnosis/util/test/test_noinit.py | 43 ++--
> + .../gnosis/util/test/test_variants_noinit.py   | 53 +-
> + objdictgen/gnosis/util/xml2sql.py  |  2 +-
> + objdictgen/gnosis/xml/indexer.py   | 14 ++--
> + objdictgen/gnosis/xml/objectify/_objectify.py  | 14 ++--
> + objdictgen/gnosis/xml/objectify/utils.py   |  4 +-
> + objdictgen/gnosis/xml/pickle/__init__.py   |  4 +-
> + objdictgen/gnosis/xml/pickle/_pickle.py| 82 
> ++
> + objdictgen/gnosis/xml/pickle/doc/HOWTO.extensions  |  6 +-
> + objdictgen/gnosis/xml/pickle/exception.py  |  2 +
> + objdictgen/gnosis/xml/pickle/ext/__init__.py   |  2 +-
> + objdictgen/gnosis/xml/pickle/ext/_mutate.py| 17 +++--
> + objdictgen/gnosis/xml/pickle/ext/_mutators.py  | 14 ++--
> + objdictgen/gnosis/xml/pickle/parsers/_dom.py   | 34 -
> + objdictgen/gnosis/xml/pickle/parsers/_sax.py   | 41 ++-
> + objdictgen/gnosis/xml/pickle/test/test_all.py  |  6 +-
> + .../gnosis/xml/pickle/test/test_badstring.py   |  2 +-
> + objdictgen/gnosis/xml/pickle/test/test_bltin.py|  2 +-
> + objdictgen/gnosis/xml/pickle/test/test_mutators.py | 18 ++---
> + objdictgen/gnosis/xml/pickle/test/test_unicode.py  | 31 
> + objdictgen/gnosis/xml/pickle/util/__init__.py  |  4 +-
> + objdictgen/gnosis/xml/pickle/util/_flags.py| 11 ++-
> + objdictgen/gnosis/xml/pickle/util/_util.py | 20 +++---
> + objdictgen/gnosis/xml/relax/lex.py | 12 ++--
> + objdictgen/gnosis/xm

Re: [ptxdist] [APPLIED] piglit: version bump 2021-11-17-g2f80c7cc9c02 -> 2024-03-09-gb32186ee5313

[Michael Olbrich]

Thanks, applied as 2ad762d196aff095f016fe13df86709ae428ed08.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:53 +0100, Philipp Zabel  
wrote:
> * Enable Vulkan tests.
> * Disable find_package(Git) to stop tests/llvmpipe/CMakeLists.gl.txt
>   from trying (and failing) to determine the git hash from an extracted
>   source tarball.
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240314154608.1015145-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/piglit.in b/rules/piglit.in
> index 397585c5d26b..72cd20e8983a 100644
> --- a/rules/piglit.in
> +++ b/rules/piglit.in
> @@ -24,6 +24,8 @@ menuconfig PIGLIT
>   select XORG if PIGLIT_TESTS_OPENGL
>   select MESALIB_GLES1 if PIGLIT_TESTS_OPENGLES1
>   select MESALIB_GLES2 if PIGLIT_TESTS_OPENGLES2 || PIGLIT_TESTS_OPENGLES3
> + select VULKAN_LOADER if PIGLIT_TESTS_VULKAN
> + select VKRUNNER if PIGLIT_TESTS_VULKAN && RUNTIME
>   help
> Piglit is the opensource OpenGL/OpenCL test suite.
>  
> @@ -51,4 +53,8 @@ config PIGLIT_TESTS_OPENGLES3
>   bool
>   prompt "build OpenGL ES3 tests"
>  
> +config PIGLIT_TESTS_VULKAN
> + bool
> + prompt "build Vulkan tests"
> +
>  endif
> diff --git a/rules/piglit.make b/rules/piglit.make
> index 626522d6ac9c..a84216567b7f 100644
> --- a/rules/piglit.make
> +++ b/rules/piglit.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIGLIT) += piglit
>  #
>  # Paths and names
>  #
> -PIGLIT_VERSION   := 2021-11-17-g2f80c7cc9c02
> -PIGLIT_MD5   := c1975f4f0ff2eb2c37e30af1da87d8a9
> +PIGLIT_VERSION   := 2024-03-09-gb32186ee5313
> +PIGLIT_MD5   := 404aec6973480d5ac54588c01f0c8fd4
>  PIGLIT   := piglit-$(PIGLIT_VERSION)
>  PIGLIT_SUFFIX:= tar.gz
>  PIGLIT_URL   := 
> https://gitlab.freedesktop.org/mesa/piglit/-/archive/$(PIGLIT_VERSION)/$(PIGLIT).$(PIGLIT_SUFFIX)
> @@ -32,6 +32,7 @@ PIGLIT_CONF_TOOL:= cmake
>  
>  PIGLIT_CONF_OPT  := $(CROSS_CMAKE_USR) \
>   -G Ninja \
> + -DCMAKE_DISABLE_FIND_PACKAGE_Git=TRUE \
>   -DPYTHON_EXECUTABLE:FILEPATH=$(SYSTEMPYTHON3) \
>   -DPIGLIT_USE_WAFFLE=1 \
>   -DPIGLIT_BUILD_GL_TESTS=$(call ptx/ifdef, 
> PTXCONF_PIGLIT_TESTS_OPENGL,1,0) \
> @@ -39,6 +40,7 @@ PIGLIT_CONF_OPT := $(CROSS_CMAKE_USR) \
>   -DPIGLIT_BUILD_GLES2_TESTS=$(call ptx/ifdef, 
> PTXCONF_PIGLIT_TESTS_OPENGLES2,1,0) \
>   -DPIGLIT_BUILD_GLES3_TESTS=$(call ptx/ifdef, 
> PTXCONF_PIGLIT_TESTS_OPENGLES3,1,0) \
>   -DPIGLIT_BUILD_CL_TESTS=0 \
> + -DPIGLIT_BUILD_VK_TESTS=$(call ptx/ifdef, 
> PTXCONF_PIGLIT_TESTS_VULKAN,1,0) \
>   -DHAVE_LIBCACA:BOOL=NO
>  
>  PIGLIT_MAKE_ENV  := \

Re: [ptxdist] [APPLIED] vkrunner: new package

[Michael Olbrich]

Thanks, applied as a465f6097b679f4fe8a643ee5454043c1ef41e69.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:52 +0100, Philipp Zabel  
wrote:
> VkRunner is a Vulkan shader tester based on shader_runner in Piglit.
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240308101032.4155741-1-p.za...@pengutronix.de>
> [mol: add environment with LIBCLANG_PATH to ensure that libclang is
> found by bindgen]
> Signed-off-by: Michael Olbrich 
> 
> diff --git 
> a/patches/vkrunner-2023-10-29-g93cbb7b1cca7/0001-Add-Cargo.lock.patch 
> b/patches/vkrunner-2023-10-29-g93cbb7b1cca7/0001-Add-Cargo.lock.patch
> new file mode 100644
> index ..5258acb9781c
> --- /dev/null
> +++ b/patches/vkrunner-2023-10-29-g93cbb7b1cca7/0001-Add-Cargo.lock.patch
> @@ -0,0 +1,460 @@
> +From: Philipp Zabel 
> +Date: Fri, 8 Mar 2024 11:08:17 +0100
> +Subject: [PATCH] Add Cargo.lock
> +
> +Add missing Cargo.lock.
> +---
> + Cargo.lock | 444 
> +
> + 1 file changed, 444 insertions(+)
> + create mode 100644 Cargo.lock
> +
> +diff --git a/Cargo.lock b/Cargo.lock
> +new file mode 100644
> +index ..cfa55bc79c86
> +--- /dev/null
>  b/Cargo.lock
> +@@ -0,0 +1,444 @@
> ++# This file is automatically @generated by Cargo.
> ++# It is not intended for manual editing.
> ++version = 3
> ++
> ++[[package]]
> ++name = "aho-corasick"
> ++version = "1.1.2"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
> ++dependencies = [
> ++ "memchr",
> ++]
> ++
> ++[[package]]
> ++name = "bindgen"
> ++version = "0.66.1"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "f2b84e06fc203107bfbad243f4aba2af864eb7db3b1cf46ea0a023b0b433d2a7"
> ++dependencies = [
> ++ "bitflags",
> ++ "cexpr",
> ++ "clang-sys",
> ++ "lazy_static",
> ++ "lazycell",
> ++ "log",
> ++ "peeking_take_while",
> ++ "prettyplease",
> ++ "proc-macro2",
> ++ "quote",
> ++ "regex",
> ++ "rustc-hash",
> ++ "shlex",
> ++ "syn",
> ++ "which",
> ++]
> ++
> ++[[package]]
> ++name = "bitflags"
> ++version = "2.4.1"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"
> ++
> ++[[package]]
> ++name = "cexpr"
> ++version = "0.6.0"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "6fac387a98bb7c37292057cffc56d62ecb629900026402633ae9160df93a8766"
> ++dependencies = [
> ++ "nom",
> ++]
> ++
> ++[[package]]
> ++name = "cfg-if"
> ++version = "1.0.0"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
> ++
> ++[[package]]
> ++name = "clang-sys"
> ++version = "1.6.1"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "c688fc74432808e3eb684cae8830a86be1d66a2bd58e1f248ed0960a590baf6f"
> ++dependencies = [
> ++ "glob",
> ++ "libc",
> ++ "libloading",
> ++]
> ++
> ++[[package]]
> ++name = "either"
> ++version = "1.9.0"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07"
> ++
> ++[[package]]
> ++name = "errno"
> ++version = "0.3.8"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
> ++dependencies = [
> ++ "libc",
> ++ "windows-sys 0.52.0",
> ++]
> ++
> ++[[package]]
> ++name = "glob"
> ++version = "0.3.1"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
> ++
> ++[[package]]
> ++name = "home"
> ++version = "0.5.5"
> ++source = "registry+https://github.com/rust-lang/crates.io-index;
> ++checksum = 
> "5444c27eef6923071f7ebcc33e3444

Re: [ptxdist] [APPLIED] expat: Version bump. 2.6.1 -> 2.6.2

[Michael Olbrich]

Thanks, applied as 6cc0a75121d43ca758ce2fc467427e368849f88c.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:51 +0100, Christian Melki 
 wrote:
> Minor changes
> https://github.com/libexpat/libexpat/blob/R_2_6_2/expat/Changes
> Plugs CVE:
> CVE-2024-28757: Prevent billion laughs attacks with isolated use of external 
> parsers.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240314195654.1708455-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/expat.make b/rules/expat.make
> index 1c5fcf44156c..03f9ac6b4d40 100644
> --- a/rules/expat.make
> +++ b/rules/expat.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_EXPAT) += expat
>  #
>  # Paths and names
>  #
> -EXPAT_VERSION:= 2.6.1
> -EXPAT_MD5:= d83bb2458956aeed4236cf45bff6eccd
> +EXPAT_VERSION:= 2.6.2
> +EXPAT_MD5:= b246f58b25a7629fca6cbd1429400cdf
>  EXPAT:= expat-$(EXPAT_VERSION)
>  EXPAT_SUFFIX := tar.bz2
>  EXPAT_RELEASE:= R_$(subst .,_,$(EXPAT_VERSION))

Re: [ptxdist] [APPLIED] mesalib: version bump 24.0.2 -> 24.0.3

[Michael Olbrich]

Thanks, applied as e9b77a73ff07ac4c0e125107b4ad50f996fa2209.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:50 +0100, Philipp Zabel  
wrote:
> https://docs.mesa3d.org/relnotes/24.0.3.html
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240314151223.520509-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index ca10fa4311af..5182b6f27489 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
>  #
>  # Paths and names
>  #
> -MESALIB_VERSION  := 24.0.2
> -MESALIB_MD5  := 178e138328ff57c7ae2a50621c99d4f7
> +MESALIB_VERSION  := 24.0.3
> +MESALIB_MD5  := fb1794acf5f714e4835be3bf2ab010fe
>  MESALIB  := mesa-$(MESALIB_VERSION)
>  MESALIB_SUFFIX   := tar.xz
>  MESALIB_URL  := \

Re: [ptxdist] [APPLIED] rootfs: add file extension to nsswitch.conf in prompt/help text

[Michael Olbrich]

Thanks, applied as 1461babd1bce792ba6f7b09769918b28459efb89.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:49 +0100, Markus Heidelberg  
wrote:
> Signed-off-by: Markus Heidelberg 
> Message-Id: <20240314113643.2508479-1-m.heidelb...@cab.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/rootfs.in b/rules/rootfs.in
> index 34e9bdcffb8c..2b7c50363df0 100644
> --- a/rules/rootfs.in
> +++ b/rules/rootfs.in
> @@ -382,9 +382,9 @@ config ROOTFS_MODPROBE_CONF
>  config ROOTFS_NSSWITCH_CONF
>   bool
>   default y
> - prompt "install /etc/nsswitch"
> + prompt "install /etc/nsswitch.conf"
>   help
> -   If enabled, it installs the "./projectroot/etc/nsswitch" file if
> +   If enabled, it installs the "./projectroot/etc/nsswitch.conf" file if
> present, else a generic one from the ptxdist directory.
>  
>  config ROOTFS_PROFILE

Re: [ptxdist] [APPLIED] gitignore: remove outdated and redundant patterns for kconfig

[Michael Olbrich]

Thanks, applied as 304e57894de6ec52c0b94c6106d850680b7637c5.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:48 +0100, Markus Heidelberg  
wrote:
> New rules had been added to scripts/kconfig/.gitignore in commit
> e9e8042645f3d4d07d6f ("kconfig: update to v5.11-rc3", 2021-01-22)
> and superseded the others.
> 
> Signed-off-by: Markus Heidelberg 
> Message-Id: <20240314113602.2508436-1-m.heidelb...@cab.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/.gitignore b/.gitignore
> index dabf0d56eb66..50bfa5185269 100644
> --- a/.gitignore
> +++ b/.gitignore
> @@ -15,18 +15,6 @@
>  
>  logfile
>  
> -scripts/kconfig/conf
> -scripts/kconfig/conf.o
> -scripts/kconfig/lex.zconf.c
> -scripts/kconfig/lkc_defs.h
> -scripts/kconfig/mconf
> -scripts/kconfig/nconf
> -scripts/kconfig/zconf.hash.c
> -scripts/kconfig/zconf.lex.c
> -scripts/kconfig/zconf.tab.c
> -scripts/kconfig/*.o
> -scripts/kconfig/lxdialog/*.o
> -
>  /bin/*
>  !/bin/ptxdist
>  !/bin/ptxdist-auto-version

Re: [ptxdist] [APPLIED] iproute2: Version bump. 6.7.0 -> 6.8.0

[Michael Olbrich]

Thanks, applied as c138388815b78fb5b03ba8a40387b149db432914.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:47 +0100, Christian Melki 
 wrote:
> Minor changes.
> https://git.kernel.org/pub/scm/network/iproute2/iproute2.git/log/?h=v6.8.0
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240313171618.3075240-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/iproute2.make b/rules/iproute2.make
> index 6de8652f22ce..79aa02f1d54f 100644
> --- a/rules/iproute2.make
> +++ b/rules/iproute2.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_IPROUTE2) += iproute2
>  #
>  # Paths and names
>  #
> -IPROUTE2_VERSION := 6.7.0
> -IPROUTE2_MD5 := 35d8277d1469596b7edc07a51470a033
> +IPROUTE2_VERSION := 6.8.0
> +IPROUTE2_MD5 := 9d6ea453986900d98e3b6bcb868815cd
>  IPROUTE2 := iproute2-$(IPROUTE2_VERSION)
>  IPROUTE2_SUFFIX  := tar.xz
>  IPROUTE2_URL := $(call ptx/mirror, KERNEL, 
> utils/net/iproute2/$(IPROUTE2).$(IPROUTE2_SUFFIX))

Re: [ptxdist] [APPLIED] linux-firmware: Version bump. 20240220 -> 20240312

[Michael Olbrich]

Thanks, applied as 027043abaa57b104848ab4d4144ba2871843eb5a.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:47 +0100, Christian Melki 
 wrote:
> Nothing overly interesting. Smaller than the last, big one.
> No license changes.
> https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/log/?h=20240312
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240313172727.3077907-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/linux-firmware.make b/rules/linux-firmware.make
> index 69e350d7d409..6473f1f86064 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   := 20240220
> -LINUX_FIRMWARE_MD5   := cf98535691464e21bb27acff2989cc6f
> +LINUX_FIRMWARE_VERSION   := 20240312
> +LINUX_FIRMWARE_MD5   := 9dde672fd15408bca23a4df38d4513e2
>  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] openssh: Version bump. 9.6 -> 9.7

[Michael Olbrich]

Thanks, applied as 6d0ee10071020feedf77cbe1da452307eeca9fa3.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:46 +0100, Christian Melki 
 wrote:
> Minor changes.
> Biggest notice is the permanent removal of DSA in 2025.
> https://www.openssh.com/txt/release-9.7
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240312174243.364628-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/openssh.make b/rules/openssh.make
> index 7f55b2ba3a19..5381cbca5752 100644
> --- a/rules/openssh.make
> +++ b/rules/openssh.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_OPENSSH) += openssh
>  #
>  # Paths and names
>  #
> -OPENSSH_VERSION  := 9.6p1
> -OPENSSH_MD5  := 5e90def5af3ffb27e149ca6fff12bef3
> +OPENSSH_VERSION  := 9.7p1
> +OPENSSH_MD5  := 1100f170ca1bc669038ca3743e074094
>  OPENSSH  := openssh-$(OPENSSH_VERSION)
>  OPENSSH_SUFFIX   := tar.gz
>  OPENSSH_URL  := \

Re: [ptxdist] [APPLIED] configure.ac: add check for xz

[Michael Olbrich]

Thanks, applied as 8fdeb74ae9a47e05b6afec505ac1ebe6056c8260.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:44 +0100, Markus Heidelberg  
wrote:
> Many packages are offered in .tar.xz format for download, so having xz
> installed is a hard requirement.
> 
> Signed-off-by: Markus Heidelberg 
> Message-Id: <20240311134552.608327-3-m.heidelb...@cab.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/configure.ac b/configure.ac
> index dfce4330ee8a..70f03f6da02d 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -243,6 +243,12 @@ if test -z "$UNZIP"; then
>   AC_MSG_ERROR([unzip could not be found, please install])
>  fi
>  
> +dnl Check for xz
> +AC_PATH_PROGS(XZ, xz,, $PATH)
> +if test -z "$XZ"; then
> + AC_MSG_ERROR([xz could not be found, please install])
> +fi
> +
>  dnl Check for wget
>  AC_PATH_PROGS(WGET, wget,, $PATH)
>  if test -z "$WGET"; then

Re: [ptxdist] [APPLIED] lighttpd: Version bump, 1.4.72 -> 1.4.74

[Michael Olbrich]

Thanks, applied as 9b17a224c7591ba41c8274c94d481d8b4112a2b3.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:45 +0100, Andreas Helmcke  
wrote:
> Mainly Bugfixes
> 
> Link: https://www.lighttpd.net/2024/2/19/1.4.74/
> Link: https://www.lighttpd.net/2023/10/30/1.4.73/
> 
> Removed no longer needed option LIGHTTPD_WEDAV_LOCKS
> 
> Signed-off-by: Andreas Helmcke 
> Tested-by: Alexander Dahl 
> Message-Id: <20240312105407.23541-1-ahelm...@ela-soft.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/lighttpd.in b/rules/lighttpd.in
> index 18dd8ab4efde..b782307f45ff 100644
> --- a/rules/lighttpd.in
> +++ b/rules/lighttpd.in
> @@ -13,7 +13,6 @@ menuconfig LIGHTTPD
>   select LIBPCRE  if LIGHTTPD_PCRE
>   select LIBXML2  if LIGHTTPD_WEBDAV_PROPS
>   select SQLITE   if LIGHTTPD_WEBDAV_PROPS
> - select LIBUUID  if LIGHTTPD_WEBDAV_LOCKS
>   select OPENSSL  if LIGHTTPD_OPENSSL
>   select LUA  if LIGHTTPD_LUA
>   select LUA_INSTALL_LIBLUA   if LIGHTTPD_LUA
> @@ -159,12 +158,6 @@ config LIGHTTPD_WEBDAV_PROPS
>   help
> properties in mod_webdav
>  
> -config LIGHTTPD_WEBDAV_LOCKS
> - bool
> - select LIGHTTPD_WEBDAV_PROPS
> - prompt "locks in mod_webdav"
> - help
> -   locks in mod_webdav
>  endif
>  
>  config LIGHTTPD_MOD_EXTRA
> diff --git a/rules/lighttpd.make b/rules/lighttpd.make
> index 40d59c346f75..96382b86af5b 100644
> --- a/rules/lighttpd.make
> +++ b/rules/lighttpd.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIGHTTPD) += lighttpd
>  #
>  # Paths and names
>  #
> -LIGHTTPD_VERSION := 1.4.72
> -LIGHTTPD_MD5 := 466f9fe131cd7d38d0fe47d2e6a2939d
> +LIGHTTPD_VERSION := 1.4.74
> +LIGHTTPD_MD5 := f38c400232151c69cc608fca35e593a9
>  LIGHTTPD := lighttpd-$(LIGHTTPD_VERSION)
>  LIGHTTPD_SUFFIX  := tar.xz
>  LIGHTTPD_URL := 
> http://download.lighttpd.net/lighttpd/releases-1.4.x/$(LIGHTTPD).$(LIGHTTPD_SUFFIX)
> @@ -72,8 +72,7 @@ LIGHTTPD_CONF_OPT   := \
>   --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-webdav-props \
>   --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-libxml \
>   --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_PROPS)-sqlite \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-webdav-locks \
> - --$(call ptx/wwo, PTXCONF_LIGHTTPD_WEBDAV_LOCKS)-uuid \
> + --without-webdav-locks \
>   --without-xxhash \
>   --without-maxminddb \
>   --$(call ptx/wwo, PTXCONF_LIGHTTPD_LUA)-lua

Re: [ptxdist] [APPLIED] configure.ac: fix check for unzip

[Michael Olbrich]

Thanks, applied as 3a5a24daa17f1979ca47643382fb633fd520e8f5.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:43 +0100, Markus Heidelberg  
wrote:
> Instead of unzip, gunzip was checked actually:
> checking for gunzip... /usr/bin/gunzip
> 
> Now it is checked properly:
> checking for unzip... /usr/bin/unzip
> 
> There are only seven packages using .zip format for download, though.
> 
> Signed-off-by: Markus Heidelberg 
> Message-Id: <20240311134552.608327-2-m.heidelb...@cab.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/configure.ac b/configure.ac
> index 2499b06fc0be..dfce4330ee8a 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -238,7 +238,7 @@ if test -z "$GUNZIP"; then
>  fi
>  
>  dnl Check for unzip
> -AC_PATH_PROGS(UNZIP, gunzip,, $PATH)
> +AC_PATH_PROGS(UNZIP, unzip,, $PATH)
>  if test -z "$UNZIP"; then
>   AC_MSG_ERROR([unzip could not be found, please install])
>  fi

Re: [ptxdist] [APPLIED] u-boot: new options to select host-gnutls and host-libuuid

[Michael Olbrich]

Thanks, applied as 2dd8696c067ca5a90122746e5109a3291ed5805d.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:42 +0100, Markus Heidelberg  
wrote:
> Certain U-Boot config options (e.g. EFI_CAPSULE_ON_DISK and
> FWU_MULTI_BANK_UPDATE) require host tools (e.g. TOOLS_MKEFICAPSULE and
> TOOLS_MKFWUMDATA) with these libraries as dependencies.
> 
> Signed-off-by: Markus Heidelberg 
> Message-Id: <20240311074308.34315-4-m.heidelb...@cab.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/platforms/u-boot.in b/platforms/u-boot.in
> index 7692370813b2..000ca491a1c2 100644
> --- a/platforms/u-boot.in
> +++ b/platforms/u-boot.in
> @@ -4,6 +4,8 @@ menuconfig U_BOOT
>   select BOOTLOADER
>   select HOST_SYSTEM_PYTHON3
>   select HOST_OPENSSL if U_BOOT_NEEDS_HOST_OPENSSL
> + select HOST_GNUTLS  if U_BOOT_NEEDS_HOST_GNUTLS
> + select HOST_LIBUUID if U_BOOT_NEEDS_HOST_LIBUUID
>   prompt "U-Boot"
>   bool
>  
> @@ -286,5 +288,23 @@ config U_BOOT_NEEDS_HOST_OPENSSL
> It might just increase the build time, if no other package has
> host openssl selected.
>  
> -endif
> +config U_BOOT_NEEDS_HOST_GNUTLS
> + prompt "needs host GnuTLS"
> + bool
> + help
> +   U-Boot from version 2022.04 includes host tools using GnuTLS for
> +   image signing.
>  
> +   Select this if your board config enables such tools, e.g. with
> +   CONFIG_TOOLS_MKEFICAPSULE.
> +
> +config U_BOOT_NEEDS_HOST_LIBUUID
> + prompt "needs host libuuid"
> + bool
> + help
> +   U-Boot from version 2022.04 includes host tools using libuuid.
> +
> +   Select this if your board config enables such tools, e.g. with
> +   CONFIG_TOOLS_MKEFICAPSULE or CONFIG_TOOLS_MKFWUMDATA.
> +
> +endif

Re: [ptxdist] [APPLIED] host-gnutls: new package

[Michael Olbrich]

Thanks, applied as 359576397afb515a8e33cce77f87f14cc2b1c478.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:41 +0100, Markus Heidelberg  
wrote:
> Will be needed for certain configurations of U-Boot.
> 
> Signed-off-by: Markus Heidelberg 
> Message-Id: <20240311074308.34315-3-m.heidelb...@cab.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/host-gnutls.in b/rules/host-gnutls.in
> new file mode 100644
> index ..9178fa7ef4b2
> --- /dev/null
> +++ b/rules/host-gnutls.in
> @@ -0,0 +1,7 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_GNUTLS
> + tristate
> + default y if ALLYES
> + select HOST_LIBTASN1
> + select HOST_NETTLE
> diff --git a/rules/host-gnutls.make b/rules/host-gnutls.make
> new file mode 100644
> index ..ddba332c8e49
> --- /dev/null
> +++ b/rules/host-gnutls.make
> @@ -0,0 +1,95 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2024 by Markus Heidelberg 
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_GNUTLS) += host-gnutls
> +
> +# 
> 
> +# Prepare
> +# 
> 
> +
> +#
> +# autoconf
> +#
> +HOST_GNUTLS_CONF_TOOL:= autoconf
> +HOST_GNUTLS_CONF_OPT :=  \
> + $(HOST_AUTOCONF) \
> + $(GLOBAL_LARGE_FILE_OPTION) \
> + --enable-threads=posix \
> + --disable-code-coverage \
> + --disable-bash-tests \
> + --disable-doc \
> + --disable-manpages \
> + --disable-tools \
> + --enable-cxx \
> + --disable-dyn-ncrypt \
> + --enable-hardware-acceleration \
> + --enable-tls13-interop \
> + --enable-padlock \
> + --enable-strict-der-time \
> + --enable-sha1-support \
> + --disable-ssl3-support \
> + --enable-ssl2-support \
> + --enable-dtls-srtp-support \
> + --enable-alpn-support \
> + --enable-heartbeat-support \
> + --enable-srp-authentication \
> + --enable-psk-authentication \
> + --enable-anon-authentication \
> + --enable-dhe \
> + --enable-ecdhe \
> + --enable-gost \
> + --disable-cryptodev \
> + --disable-afalg \
> + --disable-ktls \
> + --enable-ocsp \
> + --disable-openssl-compatibility \
> + --disable-tests \
> + --disable-fuzzer-target \
> + --disable-gtk-doc \
> + --disable-gtk-doc-html \
> + --disable-gtk-doc-pdf \
> + --disable-nls \
> + --disable-rpath \
> + --disable-seccomp-tests \
> + --enable-cross-guesses=conservative \
> + --disable-valgrind-tests \
> + --disable-full-test-suite \
> + --disable-oldgnutls-interop \
> + --disable-gcc-warnings \
> + --disable-static \
> + --enable-shared \
> + --disable-fips140-mode \
> + --disable-strict-x509 \
> + --enable-non-suiteb-curves \
> + --disable-libdane \
> + --disable-guile \
> + --without-gcov \
> + --with-nettle-mini \
> + --without-included-libtasn1 \
> + --with-included-unistring \
> + --without-fips140-key \
> + --without-fips140-module-name \
> + --without-fips140-module-version \
> + --with-pkcs12-iter-count=60 \
> + --without-idn \
> + --without-unbound-root-key-file \
> + --without-system-priority-file \
> + --without-default-priority-string \
> + --without-p11-kit \
> + --without-tpm2 \
> + --without-tpm \
> + --without-trousers-lib \
> + --without-zlib \
> + --without-brotli \
> + --without-zstd \
> + --with-default-trust-store-file=/etc/ssl/certs/ca-certificates.crt
> +
> +# vim: syntax=make

Re: [ptxdist] [APPLIED] host-nettle: new package

[Michael Olbrich]

Thanks, applied as ef7596f5e04f550869d11ceafec2a3e508a23dd8.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:41 +0100, Markus Heidelberg  
wrote:
> Will be needed for host-gnutls.
> 
> Signed-off-by: Markus Heidelberg 
> Message-Id: <20240311074308.34315-2-m.heidelb...@cab.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/host-nettle.in b/rules/host-nettle.in
> new file mode 100644
> index ..fc2d7f1650dc
> --- /dev/null
> +++ b/rules/host-nettle.in
> @@ -0,0 +1,5 @@
> +## SECTION=hosttools_noprompt
> +
> +config HOST_NETTLE
> + tristate
> + default y if ALLYES
> diff --git a/rules/host-nettle.make b/rules/host-nettle.make
> new file mode 100644
> index ..61e48b552b25
> --- /dev/null
> +++ b/rules/host-nettle.make
> @@ -0,0 +1,45 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2024 by Markus Heidelberg 
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +HOST_PACKAGES-$(PTXCONF_HOST_NETTLE) += host-nettle
> +
> +# 
> 
> +# Prepare
> +# 
> 
> +
> +#
> +# autoconf
> +#
> +HOST_NETTLE_CONF_TOOL:= autoconf
> +HOST_NETTLE_CONF_OPT :=  \
> + $(HOST_AUTOCONF) \
> + --enable-public-key \
> + --enable-assembler \
> + --disable-static \
> + --enable-shared \
> + --disable-openssl \
> + --disable-gcov \
> + --disable-documentation \
> + --disable-fat \
> + --disable-arm-neon \
> + --disable-arm64-crypto \
> + --disable-x86-aesni \
> + --disable-x86-sha-ni \
> + --disable-x86-pclmul \
> + --disable-power-crypto-ext \
> + --disable-power-altivec \
> + --disable-s390x-vf \
> + --disable-s390x-msa \
> + --enable-mini-gmp \
> + --without-include-path \
> + --without-lib-path
> +
> +# vim: syntax=make

Re: [ptxdist] [APPLIED] libcurl: add optional RTSP support

[Michael Olbrich]

Thanks, applied as 250fa50694b59bc527d77c57fee38160bb81b2e1.

Michael

[sent from post-receive hook]

On Tue, 19 Mar 2024 07:44:40 +0100, Rouven Czerwinski 
 wrote:
> Signed-off-by: Rouven Czerwinski 
> Message-Id: <20240308080555.1508551-1-r.czerwin...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libcurl.in b/rules/libcurl.in
> index d5cf3519d9e7..c717668bc942 100644
> --- a/rules/libcurl.in
> +++ b/rules/libcurl.in
> @@ -58,6 +58,9 @@ config LIBCURL_VERBOSE
>  config LIBCURL_SSL
>   bool "ssl"
>  
> +config LIBCURL_RTSP
> + bool "rtsp"
> +
>  if LIBCURL_SSL
>  
>  choice
> diff --git a/rules/libcurl.make b/rules/libcurl.make
> index 67dc9a634203..10c501e0d6bf 100644
> --- a/rules/libcurl.make
> +++ b/rules/libcurl.make
> @@ -51,7 +51,7 @@ LIBCURL_CONF_OPT:= \
>   --$(call ptx/endis, PTXCONF_LIBCURL_FILE)-file \
>   --disable-ldap \
>   --disable-ldaps \
> - --disable-rtsp \
> + --$(call ptx/endis, PTXCONF_LIBCURL_RTSP)-rtsp \
>   --enable-proxy \
>   --disable-dict \
>   --disable-telnet \

Re: [ptxdist] [PATCH 2/3] autossh: add license file and hash

[Michael Olbrich]

On Fri, Mar 08, 2024 at 06:16:17PM +0100, Bruno Thomsen wrote:
> Signed-off-by: Bruno Thomsen 
> ---
>  rules/autossh.make | 18 ++
>  1 file changed, 10 insertions(+), 8 deletions(-)
> 
> diff --git a/rules/autossh.make b/rules/autossh.make
> index 879cd1c99..19512070e 100644
> --- a/rules/autossh.make
> +++ b/rules/autossh.make
> @@ -14,14 +14,16 @@ PACKAGES-$(PTXCONF_AUTOSSH) += autossh
>  #
>  # Paths and names
>  #
> -AUTOSSH_VERSION  := 1.4c
> -AUTOSSH_MD5  := 26520eea934f296be0783dabe7fcfd28
> -AUTOSSH  := autossh-$(AUTOSSH_VERSION)
> -AUTOSSH_SUFFIX   := tgz
> -AUTOSSH_URL  := 
> https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> -AUTOSSH_SOURCE   := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> -AUTOSSH_DIR  := $(BUILDDIR)/$(AUTOSSH)
> -AUTOSSH_LICENSE  := unknown
> +AUTOSSH_VERSION  := 1.4c
> +AUTOSSH_MD5  := 26520eea934f296be0783dabe7fcfd28
> +AUTOSSH  := autossh-$(AUTOSSH_VERSION)
> +AUTOSSH_SUFFIX   := tgz
> +AUTOSSH_URL  := 
> https://www.harding.motd.ca/autossh/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> +AUTOSSH_SOURCE   := $(SRCDIR)/$(AUTOSSH).$(AUTOSSH_SUFFIX)
> +AUTOSSH_DIR  := $(BUILDDIR)/$(AUTOSSH)
> +AUTOSSH_LICENSE  := unknown

If there is no patching spdx identifier, then use 'custom' for the license.
'unknown' means, nobody looked at it.

> +AUTOSSH_LICENSE_FILES:= \
> + file://LICENSE;md5=799b1a7511fc918ee7de7122e1a538b5

I'm not seeing a LICENSE file in the source package.

Michael

>  
>  # 
> 
>  # Prepare
> -- 
> 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 1/2] opus: version bump 1.4 -> 1.5.1

[Michael Olbrich]

On Fri, Mar 08, 2024 at 12:57:55PM +0100, Philipp Zabel wrote:
> https://opus-codec.org/demo/opus-1.5/
> 
> New features optional, enabling DRED, deep PLC, and OSCE increases
> the library size by a few MiB.
> 
> Signed-off-by: Philipp Zabel 
> ---
>  rules/opus.in   | 20 ++--
>  rules/opus.make | 11 +--
>  2 files changed, 27 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/opus.in b/rules/opus.in
> index 7412eb76a538..3b8e6444cd3e 100644
> --- a/rules/opus.in
> +++ b/rules/opus.in
> @@ -1,7 +1,23 @@
>  ## SECTION=multimedia_libs
>  
> -config OPUS
> +menuconfig OPUS
>   tristate
> - prompt "opus"
> + prompt "opus  "
>   help
> Opus is a totally open, royalty-free, highly versatile audio codec.
> +
> +if OPUS
> +
> +config OPUS_DRED
> + bool
> + prompt "enable deep redundancy (DRED)"
> +
> +config OPUS_DEEP_PLC
> + bool
> + prompt "enable deep packet loss concealment (PLC)"
> +
> +config OPUS_OSCE
> + bool
> + prompt "enable opus speech coding enhancement (OSCE)"

What's the reason for making these optional? I'd prefer to just hardcode
whatever everybody else is doing unless there is a good reason to make
these optional. And in that case, the options need a help text to help
decide what to choose. I wouldn't know what to do by just looking at these
options.

Michael

> +
> +endif
> diff --git a/rules/opus.make b/rules/opus.make
> index 4dd2f9d9b653..ea1f04837cf1 100644
> --- a/rules/opus.make
> +++ b/rules/opus.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPUS) += opus
>  #
>  # Paths and names
>  #
> -OPUS_VERSION := 1.4
> -OPUS_MD5 := 0d89c15268c5c5984f583d7997d2a148
> +OPUS_VERSION := 1.5.1
> +OPUS_MD5 := 06c0e626ea3ad72f7b006e9130c8b15d
>  OPUS := opus-$(OPUS_VERSION)
>  OPUS_SUFFIX  := tar.gz
>  OPUS_URL := 
> http://downloads.xiph.org/releases/opus/$(OPUS).$(OPUS_SUFFIX)
> @@ -38,6 +38,9 @@ OPUS_CONF_OPT   := \
>   --disable-fixed-point-debug \
>   --enable-float-api \
>   --disable-custom-modes \
> + --$(call ptx/endis, PTXCONF_OPUS_DRED)-dred \
> + --$(call ptx/endis, PTXCONF_OPUS_DEEP_PLC)-deep-plc \
> + --disable-lossgen \
>   --enable-float-approx \
>   --enable-asm \
>   --enable-rtcd \
> @@ -47,6 +50,10 @@ OPUS_CONF_OPT  := \
>   --disable-fuzzing \
>   --disable-check-asm \
>   --disable-doc \
> + --disable-dot-product \
> + --disable-dnn-debug-float \
> + --disable-osce-training-data \
> + --$(call ptx/endis, PTXCONF_OPUS_OSCE)-osce \
>   --disable-extra-programs \
>   --enable-rfc8251
>  
> -- 
> 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 v2] sudo: version bump 1.9.14p3 -> 1.9.15p5

[Michael Olbrich]

On Fri, Mar 08, 2024 at 12:09:43PM +0100, Andreas Helmcke wrote:
> various bugfixes, including fixes for CVE-2023-42465 and CVE-2023-42456
> 
> Full info: https://www.sudo.ws/releases/stable/#1.9.15p5
> 
> Signed-off-by: Andreas Helmcke 
> ---
> v2: reverted accidentlly changed url and option
> 
>  rules/sudo.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/sudo.make b/rules/sudo.make
> index 93b92ad69..83c3e7f8e 100644
> --- a/rules/sudo.make
> +++ b/rules/sudo.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_SUDO) += sudo
>  #
>  # Paths and names
>  #
> -SUDO_VERSION   := 1.9.14p3
> -SUDO_MD5   := 4cc21cf7c9a89290b230954aed0d1e11
> +SUDO_VERSION   := 1.9.15p5
> +SUDO_MD5   := 4166279cb188ecb6641c7a2ba5f68270

The patch does not apply. Something turned all tabs into spaces when you
sent this mail.

Michael

>  SUDO   := sudo-$(SUDO_VERSION)
>  SUDO_SUFFIX:= tar.gz
>  SUDO_URL   := \
> -- 
> 2.40.1
> 
> 
> 

-- 
Pengutronix e.K.   | |
Steuerwalder Str. 21   | http://www.pengutronix.de/  |
31137 Hildesheim, Germany  | Phone: +49-5121-206917-0|
Amtsgericht Hildesheim, HRA 2686   | Fax:   +49-5121-206917- |

Re: [ptxdist] [APPLIED] host-libkmod: Follow target libkmod.

[Michael Olbrich]

Thanks, applied as ea707f537b4ff8031ec5cf4b6619369550a96dbc.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:31 +0100, Christian Melki 
 wrote:
> * Configure options changes.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240307212815.3583509-2-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/host-libkmod.make b/rules/host-libkmod.make
> index f95494084798..adb42a33af9d 100644
> --- a/rules/host-libkmod.make
> +++ b/rules/host-libkmod.make
> @@ -23,14 +23,13 @@ HOST_LIBKMOD_CONF_OPT := \
>   $(HOST_AUTOCONF) \
>   --disable-static \
>   --enable-shared \
> - --disable-experimental \
>   --enable-tools \
>   --disable-manpages \
>   --disable-test-modules \
>   --disable-logging \
>   --disable-debug \
> - --disable-python \
>   --disable-coverage \
> + --enable-year2038 \
>   --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZSTD)-zstd \
>   --without-xz \
>   --$(call ptx/wwo, PTXCONF_HOST_LIBKMOD_ZLIB)-zlib \

Re: [ptxdist] [APPLIED] host-cargo-c: version bump 0.9.12+cargo-0.64 -> 0.9.27+cargo-0.74.0

[Michael Olbrich]

Thanks, applied as 2216803115476efe36d1957df3048d0327f45e46.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:33 +0100, Michael Tretter  
wrote:
> While 0.9.27 is not the latest version, it is the last version that may
> be built with Rust 1.70. Later versions require Rust 1.72, which is not
> available as part of the OSELAS.toolchain, yet.
> 
> Signed-off-by: Michael Tretter 
> Message-Id: <20240131082803.3360978-1-m.tret...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/host-cargo-c.cargo.make b/rules/host-cargo-c.cargo.make
> index 25319da2128f..f2bf9c8c8d92 100644
> --- a/rules/host-cargo-c.cargo.make
> +++ b/rules/host-cargo-c.cargo.make
> @@ -11,187 +11,352 @@
>  # should not be modified manually!
>  #
>  
> -HOST_CARGO_C_CARGO_LOCK_MD5 := 99a33e517b78a370c6aeb415fec40e5f
> +HOST_CARGO_C_CARGO_LOCK_MD5 := b4da9f76a4b4fe2fe547be2980f2168c
>  
>  HOST_CARGO_C_ADLER_1_0_2_MD5 := 669215548c64019c08c92b2c1afd3deb
>  HOST_CARGO_C_ADLER_1_0_2_URL := 
> https://crates.io/api/v1/crates/adler/1.0.2/download
>  HOST_CARGO_C_ADLER_1_0_2_SOURCE  := $(SRCDIR)/adler-1.0.2.crate
>  HOST_CARGO_C_PARTS   += HOST_CARGO_C_ADLER_1_0_2
>  
> -HOST_CARGO_C_AHO_CORASICK_0_7_18_MD5 := 
> 425b8fdf70df59998d9b7c89083e48d1
> -HOST_CARGO_C_AHO_CORASICK_0_7_18_URL := 
> https://crates.io/api/v1/crates/aho-corasick/0.7.18/download
> -HOST_CARGO_C_AHO_CORASICK_0_7_18_SOURCE  := 
> $(SRCDIR)/aho-corasick-0.7.18.crate
> -HOST_CARGO_C_PARTS   += HOST_CARGO_C_AHO_CORASICK_0_7_18
> -
> -HOST_CARGO_C_ANYHOW_1_0_61_MD5   := 
> 1ec114112021ccef0e75f219d99f8cd4
> -HOST_CARGO_C_ANYHOW_1_0_61_URL   := 
> https://crates.io/api/v1/crates/anyhow/1.0.61/download
> -HOST_CARGO_C_ANYHOW_1_0_61_SOURCE:= $(SRCDIR)/anyhow-1.0.61.crate
> -HOST_CARGO_C_PARTS   += HOST_CARGO_C_ANYHOW_1_0_61
> +HOST_CARGO_C_AHASH_0_8_3_MD5 := 25bbf8d0145ba2670ba039c768bb4f44
> +HOST_CARGO_C_AHASH_0_8_3_URL := 
> https://crates.io/api/v1/crates/ahash/0.8.3/download
> +HOST_CARGO_C_AHASH_0_8_3_SOURCE  := $(SRCDIR)/ahash-0.8.3.crate
> +HOST_CARGO_C_PARTS   += HOST_CARGO_C_AHASH_0_8_3
> +
> +HOST_CARGO_C_AHO_CORASICK_1_1_2_MD5  := 
> 95e5f8d0b7ab37171b8d3118542ba06a
> +HOST_CARGO_C_AHO_CORASICK_1_1_2_URL  := 
> https://crates.io/api/v1/crates/aho-corasick/1.1.2/download
> +HOST_CARGO_C_AHO_CORASICK_1_1_2_SOURCE   := 
> $(SRCDIR)/aho-corasick-1.1.2.crate
> +HOST_CARGO_C_PARTS   += HOST_CARGO_C_AHO_CORASICK_1_1_2
> +
> +HOST_CARGO_C_ANSTREAM_0_6_4_MD5  := 
> d18a8aaf56bfd7418a91540a0174402d
> +HOST_CARGO_C_ANSTREAM_0_6_4_URL  := 
> https://crates.io/api/v1/crates/anstream/0.6.4/download
> +HOST_CARGO_C_ANSTREAM_0_6_4_SOURCE   := $(SRCDIR)/anstream-0.6.4.crate
> +HOST_CARGO_C_PARTS   += HOST_CARGO_C_ANSTREAM_0_6_4
> +
> +HOST_CARGO_C_ANSTYLE_1_0_4_MD5   := 
> b4f71ffecd3694a82ffb62c357d997a8
> +HOST_CARGO_C_ANSTYLE_1_0_4_URL   := 
> https://crates.io/api/v1/crates/anstyle/1.0.4/download
> +HOST_CARGO_C_ANSTYLE_1_0_4_SOURCE:= $(SRCDIR)/anstyle-1.0.4.crate
> +HOST_CARGO_C_PARTS   += HOST_CARGO_C_ANSTYLE_1_0_4
> +
> +HOST_CARGO_C_ANSTYLE_PARSE_0_2_2_MD5 := 
> 316c95b1454a81db86a56d5af6734c94
> +HOST_CARGO_C_ANSTYLE_PARSE_0_2_2_URL := 
> https://crates.io/api/v1/crates/anstyle-parse/0.2.2/download
> +HOST_CARGO_C_ANSTYLE_PARSE_0_2_2_SOURCE  := 
> $(SRCDIR)/anstyle-parse-0.2.2.crate
> +HOST_CARGO_C_PARTS   += HOST_CARGO_C_ANSTYLE_PARSE_0_2_2
> +
> +HOST_CARGO_C_ANSTYLE_QUERY_1_0_0_MD5 := 
> d2453c99c7af98286c2dc9017a8dba6d
> +HOST_CARGO_C_ANSTYLE_QUERY_1_0_0_URL := 
> https://crates.io/api/v1/crates/anstyle-query/1.0.0/download
> +HOST_CARGO_C_ANSTYLE_QUERY_1_0_0_SOURCE  := 
> $(SRCDIR)/anstyle-query-1.0.0.crate
> +HOST_CARGO_C_PARTS   += HOST_CARGO_C_ANSTYLE_QUERY_1_0_0
> +
> +HOST_CARGO_C_ANSTYLE_WINCON_3_0_1_MD5:= 
> b57fd47f132f32001e0d4bfc4621f1bf
> +HOST_CARGO_C_ANSTYLE_WINCON_3_0_1_URL:= 
> https://crates.io/api/v1/crates/anstyle-wincon/3.0.1/download
> +HOST_CARGO_C_ANSTYLE_WINCON_3_0_1_SOURCE := 
> $(SRCDIR)/anstyle-wincon-3.0.1.crate
> +HOST_CARGO_C_PARTS   += HOST_CARGO_C_ANSTYLE_WINCON_3_0_1
> +
> +HOST_CARGO_C_ANYHOW_1_0_75_MD5   := 
> 39a78bec5a0ae75f210c1f67250152b0
> +HOST_CARGO_C_ANYHOW_1_0_75_URL   := 
> https://crates.io/api/v1/crates/anyhow/1.0.75/download
> +HOST_CARGO_C_ANYHOW_1_0_75_SOURCE:= $(SRCD

Re: [ptxdist] [APPLIED] libkmod: Version bump. 31 -> 32.

[Michael Olbrich]

Thanks, applied as fa640ff68f25f99e5ea5eced6bf65f1a4182a587.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:30 +0100, Christian Melki 
 wrote:
> Minor fix release.
> Most interesting bit is that the module directory is now
> easily changeable.
> 
> https://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git/log/?h=v32
> 
> * Fix some deprecated options and add another.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240307212815.3583509-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libkmod.make b/rules/libkmod.make
> index e89388615a59..1f7e73d00b20 100644
> --- a/rules/libkmod.make
> +++ b/rules/libkmod.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBKMOD) += libkmod
>  #
>  # Paths and names
>  #
> -LIBKMOD_VERSION  := 31
> -LIBKMOD_MD5  := 6165867e1836d51795a11ea4762ff66a
> +LIBKMOD_VERSION  := 32
> +LIBKMOD_MD5  := 1046fda48766fae905f83150d12eec78
>  LIBKMOD  := kmod-$(LIBKMOD_VERSION)
>  LIBKMOD_SUFFIX   := tar.xz
>  LIBKMOD_URL  := $(call ptx/mirror, KERNEL, 
> utils/kernel/kmod/$(LIBKMOD).$(LIBKMOD_SUFFIX))
> @@ -35,17 +35,16 @@ LIBKMOD_CONF_TOOL := autoconf
>  LIBKMOD_CONF_OPT := \
>   $(CROSS_AUTOCONF_USR) \
>   $(GLOBAL_LARGE_FILE_OPTION) \
> - --disable-experimental \
>   --$(call ptx/endis, PTXCONF_LIBKMOD_TOOLS)-tools \
>   --disable-manpages \
>   --disable-test-modules \
>   --$(call ptx/endis, PTXCONF_LIBKMOD_LOGGING)-logging \
>   --$(call ptx/endis, PTXCONF_LIBKMOD_DEBUG)-debug \
> - --disable-python \
>   --disable-coverage \
>   --disable-gtk-doc \
>   --disable-gtk-doc-html \
>   --disable-gtk-doc-pdf \
> + --$(call ptx/endis, PTXDIST_Y2038)-year2038 \
>   --$(call ptx/wwo, PTXCONF_LIBKMOD_ZSTD)-zstd \
>   --without-xz \
>   --$(call ptx/wwo, PTXCONF_LIBKMOD_ZLIB)-zlib \

Re: [ptxdist] [APPLIED] sdl2: Version bump. 2.30.0 -> 2.30.1

[Michael Olbrich]

Thanks, applied as 96e99fe180121421c8accded6370ba482133e33d.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:29 +0100, Christian Melki 
 wrote:
> Minor bugfix release.
> https://github.com/libsdl-org/SDL/releases/tag/release-2.30.1
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240307211729.3468630-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/sdl2.make b/rules/sdl2.make
> index 64869c4e6d55..c8cdcf97b974 100644
> --- a/rules/sdl2.make
> +++ b/rules/sdl2.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_SDL2) += sdl2
>  #
>  # Paths and names
>  #
> -SDL2_VERSION := 2.30.0
> -SDL2_MD5 := 3b0a35e1d794382dcd64d9da93870ea1
> +SDL2_VERSION := 2.30.1
> +SDL2_MD5 := a28514e50ef4bb5cc2e1e8c70553425d
>  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.379 -> 0.380.

[Michael Olbrich]

Thanks, applied as e57614d31369f5d659dca484455161fc5c4aa6da.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:28 +0100, Christian Melki 
 wrote:
> Usual id updates.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240307211352.3466624-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/hwdata.make b/rules/hwdata.make
> index 6ffcbba70f94..efd4eec22afd 100644
> --- a/rules/hwdata.make
> +++ b/rules/hwdata.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_HWDATA) += hwdata
>  #
>  # Paths and names
>  #
> -HWDATA_VERSION   := 0.379
> -HWDATA_MD5   := 2d8d413696545fd889ca3d32b78f64b5
> +HWDATA_VERSION   := 0.380
> +HWDATA_MD5   := 65d190da425b4fc9a38f4fb96b21f56f
>  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] qemu: Version bump. 8.2.1 -> 8.2.2

[Michael Olbrich]

Thanks, applied as fc2e9c2c4d9e747659929d4238d244e6430cbdac.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:28 +0100, Christian Melki 
 wrote:
> Minor changes.
> https://github.com/qemu/qemu/compare/v8.2.1...v8.2.2
> 
> * Move patches forward, applies cleanly.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240306172950.3863782-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git 
> a/patches/qemu-8.2.1/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch
>  
> b/patches/qemu-8.2.2/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch
> similarity index 100%
> rename from 
> patches/qemu-8.2.1/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch
> rename to 
> patches/qemu-8.2.2/0001-linux-user-x86_64-Handle-the-vsyscall-page-in-open_s.patch
> diff --git 
> a/patches/qemu-8.2.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
>  
> b/patches/qemu-8.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> similarity index 100%
> rename from 
> patches/qemu-8.2.1/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> rename to 
> patches/qemu-8.2.2/0100-9pfs-allow-real-symlinks-for-security_model-mapped-f.patch
> diff --git a/patches/qemu-8.2.1/0101-let-ninja-use-the-jobserver.patch 
> b/patches/qemu-8.2.2/0101-let-ninja-use-the-jobserver.patch
> similarity index 100%
> rename from patches/qemu-8.2.1/0101-let-ninja-use-the-jobserver.patch
> rename to patches/qemu-8.2.2/0101-let-ninja-use-the-jobserver.patch
> diff --git a/patches/qemu-8.2.1/series b/patches/qemu-8.2.2/series
> similarity index 100%
> rename from patches/qemu-8.2.1/series
> rename to patches/qemu-8.2.2/series
> diff --git a/rules/qemu.make b/rules/qemu.make
> index f3cab4174a74..19d07a599c26 100644
> --- a/rules/qemu.make
> +++ b/rules/qemu.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_QEMU) += qemu
>  #
>  # Paths and names
>  #
> -QEMU_VERSION := 8.2.1
> -QEMU_MD5 := bda54248d773be2599df66f8995f10e1
> +QEMU_VERSION := 8.2.2
> +QEMU_MD5 := e43091262671c1728b09522932b75b1d
>  QEMU := qemu-$(QEMU_VERSION)
>  QEMU_SUFFIX  := tar.xz
>  QEMU_URL := https://download.qemu.org/$(QEMU).$(QEMU_SUFFIX)

Re: [ptxdist] [APPLIED] libcamera: switch to canonical tarball repository

[Michael Olbrich]

Thanks, applied as 62bb1cfb2413d621b4eee4cc90e9e861e15e225e.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:27 +0100, Michael Riesch 
 wrote:
> As discussed with Kieran Bingham, one of the maintainers of libcamera,
> the gitlab.freedesktop.org repository should serve as canonical tarball
> repository.
> 
> Signed-off-by: Michael Riesch 
> Cc: Kieran Bingham 
> Acked-by: Kieran Bingham 
> Message-Id: 
> <20240305-feature-libcamera-0-2-0-v1-1-0625f2fd9...@wolfvision.net>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/libcamera.make b/rules/libcamera.make
> index 2419e2d86072..928a95654d56 100644
> --- a/rules/libcamera.make
> +++ b/rules/libcamera.make
> @@ -18,7 +18,7 @@ LIBCAMERA_VERSION   := 0.0.5
>  LIBCAMERA_MD5:= cc2f5c0c051319a7e853dc6916807ce5
>  LIBCAMERA:= libcamera-$(LIBCAMERA_VERSION)
>  LIBCAMERA_SUFFIX := tar.gz
> -LIBCAMERA_URL:= 
> https://git.libcamera.org/libcamera/libcamera.git;tag=v$(LIBCAMERA_VERSION)
> +LIBCAMERA_URL:= 
> https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$(LIBCAMERA_VERSION)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX)
>  LIBCAMERA_SOURCE := $(SRCDIR)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX)
>  LIBCAMERA_DIR:= $(BUILDDIR)/$(LIBCAMERA)
>  LIBCAMERA_LICENSE:= Apache-2.0 AND \

Re: [ptxdist] [APPLIED] ptxd_lib_template: fix "ptxdist newpackage host" with an existing target counterpart

[Michael Olbrich]

Thanks, applied as 74d12e9c53065c7aaee1646739fc83d4a904dad9.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:26 +0100, Markus Heidelberg  
wrote:
> In that case, "prompt" and "help" lines were added to the .in file and
> "SECTION" was set to "project_specific" instead of "hosttools_noprompt".
> 
> Signed-off-by: Markus Heidelberg 
> Message-Id: <20240304072708.50708-1-m.heidelb...@cab.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/scripts/lib/ptxd_lib_template.sh 
> b/scripts/lib/ptxd_lib_template.sh
> index b6789382c6f3..cc512faa1821 100644
> --- a/scripts/lib/ptxd_lib_template.sh
> +++ b/scripts/lib/ptxd_lib_template.sh
> @@ -107,7 +107,7 @@ export -f ptxd_template_read_author
>  
>  ptxd_template_read_section() {
>  local section_name
> -if [ "${action}" = "host" ]; then
> +if [ "${action}" = "host" -o "${action}" = "host-existing-target" ]; then
>   section_name="${1:-hosttools_noprompt}"
>  else
>   section_name="${1:-project_specific}"

Re: [ptxdist] [APPLIED] openssl: update license and add license file with hash

[Michael Olbrich]

Thanks, applied as 99328f6c0f15d104c2bc1753c3e15d85fa9c92eb.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:25 +0100, Bruno Thomsen  
wrote:
> OpenSSL is covered by one of two licenses, depending on which
> release is involved. For the 3.0 release, and later releases
> derived from that, the Apache License v2 applies. This also
> applies to the git “master” branch.
> 
> https://www.openssl.org/source/license.html
> 
> Signed-off-by: Bruno Thomsen 
> Message-Id: <20240303093730.50924-1-bruno.thom...@gmail.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/openssl.make b/rules/openssl.make
> index 7080bd50ba55..fbc6424e0c56 100644
> --- a/rules/openssl.make
> +++ b/rules/openssl.make
> @@ -16,16 +16,18 @@ PACKAGES-$(PTXCONF_OPENSSL) += openssl
>  #
>  # Paths and names
>  #
> -OPENSSL_VERSION  := 3.2.1
> -OPENSSL_MD5  := c239213887804ba00654884918b37441
> -OPENSSL  := openssl-$(OPENSSL_VERSION)
> -OPENSSL_SUFFIX   := tar.gz
> -OPENSSL_URL  := \
> +OPENSSL_VERSION  := 3.2.1
> +OPENSSL_MD5  := c239213887804ba00654884918b37441
> +OPENSSL  := openssl-$(OPENSSL_VERSION)
> +OPENSSL_SUFFIX   := tar.gz
> +OPENSSL_URL  := \
>   https://www.openssl.org/source/$(OPENSSL).$(OPENSSL_SUFFIX) \
>   https://www.openssl.org/source/old/$(basename 
> $(OPENSSL_VERSION))/$(OPENSSL).$(OPENSSL_SUFFIX)
> -OPENSSL_SOURCE   := $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX)
> -OPENSSL_DIR  := $(BUILDDIR)/$(OPENSSL)
> -OPENSSL_LICENSE  := OpenSSL
> +OPENSSL_SOURCE   := $(SRCDIR)/$(OPENSSL).$(OPENSSL_SUFFIX)
> +OPENSSL_DIR  := $(BUILDDIR)/$(OPENSSL)
> +OPENSSL_LICENSE  := Apache-2.0
> +OPENSSL_LICENSE_FILES:= \
> + file://LICENSE.txt;md5=c75985e733726beaba57bc5253e96d04
>  
>  # 
> 
>  # Prepare

Re: [ptxdist] [APPLIED] expat: Version bump. 2.6.0 -> 2.6.1

[Michael Olbrich]

Thanks, applied as 6ed04a5fbb502cdb42dc9668765999347f24040b.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:24 +0100, Christian Melki 
 wrote:
> Minor fixes.
> https://github.com/libexpat/libexpat/blob/R_2_6_1/expat/Changes
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240302180314.2104194-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/expat.make b/rules/expat.make
> index c40d36ac8e1a..1c5fcf44156c 100644
> --- a/rules/expat.make
> +++ b/rules/expat.make
> @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_EXPAT) += expat
>  #
>  # Paths and names
>  #
> -EXPAT_VERSION:= 2.6.0
> -EXPAT_MD5:= eeb1cf76f51dadebff73fe6aa317ba37
> +EXPAT_VERSION:= 2.6.1
> +EXPAT_MD5:= d83bb2458956aeed4236cf45bff6eccd
>  EXPAT:= expat-$(EXPAT_VERSION)
>  EXPAT_SUFFIX := tar.bz2
>  EXPAT_RELEASE:= R_$(subst .,_,$(EXPAT_VERSION))

Re: [ptxdist] [APPLIED] pixman: Version bump. 0.43.2 -> 0.43.4

[Michael Olbrich]

Thanks, applied as 41962f0a33f5a5eeed0e2c083123f2d92b44c5aa.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:23 +0100, Christian Melki 
 wrote:
> Looks like very minor changes.
> https://lists.freedesktop.org/archives/pixman/2024-February/005012.html
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240301170310.3467135-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/pixman.make b/rules/pixman.make
> index bc1a97501741..5ebbcb059ed8 100644
> --- a/rules/pixman.make
> +++ b/rules/pixman.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIXMAN) += pixman
>  #
>  # Paths and names
>  #
> -PIXMAN_VERSION   := 0.43.2
> -PIXMAN_MD5   := 372c47d8c10027d66288fb928ebc4167
> +PIXMAN_VERSION   := 0.43.4
> +PIXMAN_MD5   := ca6767b8056637d690cd17970daf4b18
>  PIXMAN   := pixman-$(PIXMAN_VERSION)
>  PIXMAN_SUFFIX:= tar.xz
>  PIXMAN_URL   := $(call ptx/mirror, XORG, 
> individual/lib/$(PIXMAN).$(PIXMAN_SUFFIX))

Re: [ptxdist] [APPLIED] python3-asyncua: version bump 1.0.6 -> 1.1.0

[Michael Olbrich]

Thanks, applied as 5b557a69a4a3df46b7971facb65a1035bd297ef9.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:22 +0100, Artur Wiebe  wrote:
> Signed-off-by: Artur Wiebe 
> Message-Id: <20240229112012.1796364-1-ar...@4wiebe.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/python3-asyncua.make b/rules/python3-asyncua.make
> index 4f26db722abc..0fbf3e4fec47 100644
> --- a/rules/python3-asyncua.make
> +++ b/rules/python3-asyncua.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PYTHON3_ASYNCUA) += python3-asyncua
>  #
>  # Paths and names
>  #
> -PYTHON3_ASYNCUA_VERSION  := 1.0.6
> -PYTHON3_ASYNCUA_MD5  := 6353843cb95ba72a4e71bf623c26bff0
> +PYTHON3_ASYNCUA_VERSION  := 1.1.0
> +PYTHON3_ASYNCUA_MD5  := 3131bf0f9554f91c4f63cbdc019fce8b
>  PYTHON3_ASYNCUA  := asyncua-$(PYTHON3_ASYNCUA_VERSION)
>  PYTHON3_ASYNCUA_SUFFIX   := tar.gz
>  PYTHON3_ASYNCUA_URL  := $(call ptx/mirror-pypi, asyncua, 
> $(PYTHON3_ASYNCUA).$(PYTHON3_ASYNCUA_SUFFIX))

Re: [ptxdist] [APPLIED] pciutils: Version bump. 3.10.0 -> 3.11.1

[Michael Olbrich]

Thanks, applied as 58108ec3df8f7f48adbf867abc7c66e6413dcb29.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:21 +0100, Christian Melki 
 wrote:
> Minor changes. pcie lane margining utility.
> This could come in handy if dealing with electrical shenanigans
> on links with issues.
> 
> Signed-off-by: Christian Melki 
> Message-Id: <20240227185340.3623438-1-christian.me...@t2data.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/pciutils.make b/rules/pciutils.make
> index 069c3be4b08d..f2da15ebe236 100644
> --- a/rules/pciutils.make
> +++ b/rules/pciutils.make
> @@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_PCIUTILS) += pciutils
>  #
>  # Paths and names
>  #
> -PCIUTILS_VERSION := 3.10.0
> -PCIUTILS_MD5 := 701a7e54459ce382d8224afeec1ccb04
> +PCIUTILS_VERSION := 3.11.1
> +PCIUTILS_MD5 := b97a06ef3944b1a4afdb46ac6d7b8600
>  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] mesalib: version bump 24.0.1 -> 24.0.2

[Michael Olbrich]

Thanks, applied as 5304825436e996050812b59a0e523bb5bec56aa4.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:22 +0100, Philipp Zabel  
wrote:
> https://docs.mesa3d.org/relnotes/24.0.2.html
> 
> Signed-off-by: Philipp Zabel 
> Message-Id: <20240229095800.2969945-1-p.za...@pengutronix.de>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/mesalib.make b/rules/mesalib.make
> index 091d425b8c94..ca10fa4311af 100644
> --- a/rules/mesalib.make
> +++ b/rules/mesalib.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MESALIB) += mesalib
>  #
>  # Paths and names
>  #
> -MESALIB_VERSION  := 24.0.1
> -MESALIB_MD5  := 9e7fa53b68fa6b60dba0bbfa8da7d0a9
> +MESALIB_VERSION  := 24.0.2
> +MESALIB_MD5  := 178e138328ff57c7ae2a50621c99d4f7
>  MESALIB  := mesa-$(MESALIB_VERSION)
>  MESALIB_SUFFIX   := tar.xz
>  MESALIB_URL  := \

Re: [ptxdist] [APPLIED] openvpn: Version bump, 2.6.6 -> 2.6.9

[Michael Olbrich]

Thanks, applied as b9336a85c494f706474e4ca6ed79ebc4f5d90fa7.

Michael

[sent from post-receive hook]

On Fri, 15 Mar 2024 05:06:20 +0100, Andreas Helmcke  
wrote:
> various bugfixes, including fixes for CVE-2023-46850 and CVE-2023-46849
> 
> license change completed, therefore the corresponding note in COPYING has 
> been removed
> 
> Full info: https://github.com/OpenVPN/openvpn/releases/tag/v2.6.9
> 
> Signed-off-by: Andreas Helmcke 
> Message-Id: <20240225151204.54557-5-ahelm...@ela-soft.com>
> Signed-off-by: Michael Olbrich 
> 
> diff --git a/rules/openvpn.make b/rules/openvpn.make
> index 29a4b68e4111..c2cc4fb47458 100644
> --- a/rules/openvpn.make
> +++ b/rules/openvpn.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_OPENVPN) += openvpn
>  #
>  # Paths and names
>  #
> -OPENVPN_VERSION  := 2.6.6
> -OPENVPN_MD5  := 660e71db3ed3161e33b4b649855c2477
> +OPENVPN_VERSION  := 2.6.9
> +OPENVPN_MD5  := e5beda906a40e997e26766f0de09ecbf
>  OPENVPN  := openvpn-$(OPENVPN_VERSION)
>  OPENVPN_SUFFIX   := tar.gz
>  OPENVPN_URL  := 
> https://github.com/OpenVPN/openvpn/releases/download/v$(OPENVPN_VERSION)/$(OPENVPN).$(OPENVPN_SUFFIX)
> @@ -23,7 +23,7 @@ OPENVPN_SOURCE  := 
> $(SRCDIR)/$(OPENVPN).$(OPENVPN_SUFFIX)
>  OPENVPN_DIR  := $(BUILDDIR)/$(OPENVPN)
>  OPENVPN_LICENSE  := GPL-2.0-only WITH (openvpn-openssl-exception 
> AND custom-exception) AND BSD-2-Clause AND BSD-3-Clause AND ((GPL-2.0-only 
> WITH Linux-syscall-note) OR MIT)
>  OPENVPN_LICENSE_FILES := \
> - file://COPYING;md5=d8d34ce6390552676e4ce8279f13c48a \
> + file://COPYING;md5=4b34e946059f80dcfd811e8dd471b5ed \
>   file://COPYRIGHT.GPL;md5=52cadf4008002e3c314a47a54fa7306c \
>   
> file://src/openvpn/openvpn.c;startline=2;endline=21;md5=b9fb1976bc6d8ad5e02a251351dc58f2
>  \
>   
> file://src/openvpn/base64.c;startline=2;endline=31;md5=f4debd767645b13107fc5912faf2ad8f
>  \