Re: [ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12

[Ladislav Michl]

On Thu, May 02, 2024 at 11:38:14AM +0200, Michael Olbrich wrote:
> 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.

I already sent v2 with different approach. Problems boils down to beep's
GNUMakefile trying to figure out whenever compiler supports various
sanitizers flags, but fails to figure out, that it comes at price linking
with sanitizer libraries on some architectures. V2 solves that by removing
all those checks, so external libraries are no longer needed.

ladis

[ptxdist] [PATCH v2] beep: version bump 1.3 -> 1.4.12

[Ladislav Michl]

From: Ladislav Michl 

Move package to a new upstream at https://github.com/spkr-beep/beep/

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 - v2: Add prepare rule to avoid dependencies on additional
   libraries (beep's GNUMakefile is trying to be smart,
   but lacks handling consequences)

 rules/beep.make | 26 ++
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/rules/beep.make b/rules/beep.make
index 69ab02f1a..234a3513f 100644
--- a/rules/beep.make
+++ b/rules/beep.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_BEEP) += beep
 #
 # Paths and names
 #
-BEEP_VERSION   := 1.3
-BEEP_MD5   := 49c340ceb95dbda3f97b2daafac7892a
+BEEP_VERSION   := 1.4.12
+BEEP_MD5   := a817f05c5473a23d700778b2c0108cc4
 BEEP   := beep-$(BEEP_VERSION)
 BEEP_SUFFIX:= tar.gz
-BEEP_URL   := http://www.johnath.com/beep/$(BEEP).$(BEEP_SUFFIX)
+BEEP_URL   := 
https://github.com/spkr-beep/beep/archive/refs/tags/v$(BEEP_VERSION).$(BEEP_SUFFIX)
 BEEP_SOURCE:= $(SRCDIR)/$(BEEP).$(BEEP_SUFFIX)
 BEEP_DIR   := $(BUILDDIR)/$(BEEP)
 BEEP_LICENSE   := GPL-2.0-only
@@ -28,7 +28,25 @@ BEEP_LICENSE := GPL-2.0-only
 # 
 
 BEEP_CONF_TOOL := NO
-BEEP_MAKE_OPT  := CC=$(CROSS_CC)
+BEEP_MAKE_OPT  := \
+   CC=$(CROSS_CC) \
+   prefix=/usr
+
+$(STATEDIR)/beep.prepare:
+   @$(call targetinfo)
+   # Override detected CFLAGS as some of them may require linking
+   # with additional libraries (-lubsan and -latomic)
+   @echo "common_CFLAGS = -std=gnu99 -pedantic">  $(BEEP_DIR)/local.mk
+   @echo "CFLAGS = -O2 -g -save-temps=obj" >> $(BEEP_DIR)/local.mk
+   @$(call touch)
+
+# 
+# Install
+# 
+
+BEEP_INSTALL_OPT   := \
+   prefix=/usr \
+   install
 
 # 
 # Target-Install
-- 
2.39.2

Re: [ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12

[Ladislav Michl]

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?

l.

[ptxdist] [PATCH] at91bootstrap: drop atmel download url

[Ladislav Michl]

From: Ladislav Michl 

Atmel url just redirects to https://www.microchip.com/ happily
feeding tarball with  content, so drop it entirely.

Signed-off-by: Ladislav Michl 
---
 rules/at91bootstrap.make | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/rules/at91bootstrap.make b/rules/at91bootstrap.make
index 7835564ea..1dfabdcbf 100644
--- a/rules/at91bootstrap.make
+++ b/rules/at91bootstrap.make
@@ -20,9 +20,7 @@ AT91BOOTSTRAP_MD5 := 2d222312cf0af81c56db8747d6a38c7c
 AT91BOOTSTRAP_SUFFIX   := zip
 AT91BOOTSTRAP  := Bootstrap-v$(AT91BOOTSTRAP_VERSION)
 AT91BOOTSTRAP_TARBALL  := 
AT91Bootstrap$(AT91BOOTSTRAP_VERSION).$(AT91BOOTSTRAP_SUFFIX)
-AT91BOOTSTRAP_URL  := \
-
http://www.atmel.com/dyn/resources/prod_documents/$(AT91BOOTSTRAP_TARBALL) \
-http://sources.buildroot.net/$(AT91BOOTSTRAP_TARBALL)
+AT91BOOTSTRAP_URL  := http://sources.buildroot.net/$(AT91BOOTSTRAP_TARBALL)
 AT91BOOTSTRAP_SOURCE   := $(SRCDIR)/$(AT91BOOTSTRAP_TARBALL)
 AT91BOOTSTRAP_DIR  := $(BUILDDIR)/$(AT91BOOTSTRAP)
 AT91BOOTSTRAP_LICENSE  := BSD-Source-Code AND GPL-2.0-or-later
-- 
2.39.2

[ptxdist] [PATCH 2/2] beep: version bump 1.3 -> 1.4.12

[Ladislav Michl]

From: Ladislav Michl 

Move package to a new upstream at https://github.com/spkr-beep/beep/

Signed-off-by: Ladislav Michl 
---
 rules/beep.make | 18 ++
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/rules/beep.make b/rules/beep.make
index 69ab02f1a..06c42ce37 100644
--- a/rules/beep.make
+++ b/rules/beep.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_BEEP) += beep
 #
 # Paths and names
 #
-BEEP_VERSION   := 1.3
-BEEP_MD5   := 49c340ceb95dbda3f97b2daafac7892a
+BEEP_VERSION   := 1.4.12
+BEEP_MD5   := a817f05c5473a23d700778b2c0108cc4
 BEEP   := beep-$(BEEP_VERSION)
 BEEP_SUFFIX:= tar.gz
-BEEP_URL   := http://www.johnath.com/beep/$(BEEP).$(BEEP_SUFFIX)
+BEEP_URL   := 
https://github.com/spkr-beep/beep/archive/refs/tags/v$(BEEP_VERSION).$(BEEP_SUFFIX)
 BEEP_SOURCE:= $(SRCDIR)/$(BEEP).$(BEEP_SUFFIX)
 BEEP_DIR   := $(BUILDDIR)/$(BEEP)
 BEEP_LICENSE   := GPL-2.0-only
@@ -28,7 +28,17 @@ BEEP_LICENSE := GPL-2.0-only
 # 
 
 BEEP_CONF_TOOL := NO
-BEEP_MAKE_OPT  := CC=$(CROSS_CC)
+BEEP_MAKE_OPT  := \
+   CC=$(CROSS_CC) \
+   prefix=/usr
+
+# 
+# Install
+# 
+
+BEEP_INSTALL_OPT   := \
+   prefix=/usr \
+   install
 
 # 
 # Target-Install
-- 
2.39.2

[ptxdist] [PATCH 1/2] Revert "beep: move to staging"

[Ladislav Michl]

From: Ladislav Michl 

This reverts commit 56ddc68d6cada7fee791122e27d4b2388dc8715d
as original upstream is indeed dead, but project continues to
live at a new location and subsequent patch will update it.

Signed-off-by: Ladislav Michl 
---
 rules/beep.in | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/rules/beep.in b/rules/beep.in
index 6c9ea8532..52abcd11e 100644
--- a/rules/beep.in
+++ b/rules/beep.in
@@ -1,12 +1,7 @@
-## SECTION=staging
-## old section:
-### SECTION=multimedia_sound
+## SECTION=multimedia_sound
 
 config BEEP
tristate
prompt "beep"
help
  Extended beep utility
-
- STAGING: remove in PTXdist 2025.05.0
- Unmaintained in PTXdist. Original upstream and URL are dead.
-- 
2.39.2

Re: [ptxdist] [EXT] [PATCH] host-dtc: set make env

[Ladislav Michl]

Hi Denis,

On Mon, Jan 08, 2024 at 02:46:06PM +0100, Denis OSTERLAND-HEIM wrote:
> Hi,
> 
> what about using the target parameters here?
> HOST_DTC_MAKE_OPT = $(DTC_MAKE_OPT)
> HOST_DTC_INSTALL_OPT = $(DTC_INSTALL_OPT)

The equality is pure coincidence here, so making them the same could
cause troubes in the future if the need to change one of them arise.

Best regards,
ladis

> Regards, Denis
> 
> -Original Message-
> From: ptxdist  On Behalf Of Ladislav Michl
> Sent: Friday, January 5, 2024 1:13 PM
> To: ptxdist@pengutronix.de
> Subject: [EXT] [ptxdist] [PATCH] host-dtc: set make env
> 
> [EXTERNAL EMAIL]
>  
> 
> From: Ladislav Michl 
> 
> Signed-off-by: Ladislav Michl 
> ---
>  rules/host-dtc.make | 12 +++-
>  1 file changed, 7 insertions(+), 5 deletions(-)
> 
> diff --git a/rules/host-dtc.make b/rules/host-dtc.make index
> 586b098bc..e1625ef91 100644
> --- a/rules/host-dtc.make
> +++ b/rules/host-dtc.make
> @@ -28,15 +28,17 @@ HOST_DTC_LICENSE  := GPL-2.0-only
>  # Prepare
>  #
> 
>  
> -HOST_DTC_CONF_TOOL := NO
> -HOST_DTC_MAKE_OPT := \
> +HOST_DTC_CONF_TOOL   := NO
> +
> +HOST_DTC_MAKE_ENV:= $(HOST_ENV)
> +
> +HOST_DTC_MAKE_OPT:= \
>   PREFIX=/usr \
>   NO_PYTHON=1 \
>   NO_VALGRIND=1 \
> - NO_YAML=1 \
> - $(HOST_ENV_CC)
> + NO_YAML=1
>  
> -HOST_DTC_INSTALL_OPT := \
> +HOST_DTC_INSTALL_OPT := \
>   $(HOST_DTC_MAKE_OPT) \
>   install-bin \
>   install-lib
> --
> 2.39.2
> 

[ptxdist] [PATCH] host-dtc: set make env

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/host-dtc.make | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/rules/host-dtc.make b/rules/host-dtc.make
index 586b098bc..e1625ef91 100644
--- a/rules/host-dtc.make
+++ b/rules/host-dtc.make
@@ -28,15 +28,17 @@ HOST_DTC_LICENSE:= GPL-2.0-only
 # Prepare
 # 
 
-HOST_DTC_CONF_TOOL := NO
-HOST_DTC_MAKE_OPT := \
+HOST_DTC_CONF_TOOL := NO
+
+HOST_DTC_MAKE_ENV  := $(HOST_ENV)
+
+HOST_DTC_MAKE_OPT  := \
PREFIX=/usr \
NO_PYTHON=1 \
NO_VALGRIND=1 \
-   NO_YAML=1 \
-   $(HOST_ENV_CC)
+   NO_YAML=1
 
-HOST_DTC_INSTALL_OPT := \
+HOST_DTC_INSTALL_OPT   := \
$(HOST_DTC_MAKE_OPT) \
install-bin \
install-lib
-- 
2.39.2

[ptxdist] [PATCH v3] dtc: new package

[Ladislav Michl]

From: Ladislav Michl 

Please note this package is not as symmetrical as the typical
host-* and normal variants. Here the latest version is usually
needed.

This work is prepping for qemu 8.2.0+, as it requires libfdt
as a separate library. It has stopped providing one internally.

Signed-off-by: Christian Melki 
Signed-off-by: Ladislav Michl 
---
 CHANGES:
 -v2: select HOST_FLEX, drop 'v' from url version, update md5,
  use proper DTC_MAKE_ENV
 -v3: use ptx/nl, use osi-conform license

 rules/dtc.in   | 37 +++
 rules/dtc.make | 82 ++
 2 files changed, 119 insertions(+)
 create mode 100644 rules/dtc.in
 create mode 100644 rules/dtc.make

diff --git a/rules/dtc.in b/rules/dtc.in
new file mode 100644
index 0..e6d0b84d5
--- /dev/null
+++ b/rules/dtc.in
@@ -0,0 +1,37 @@
+## SECTION=system_libraries
+menuconfig DTC
+   tristate
+   prompt "dtc   "
+   select HOST_FLEX
+   help
+ Device Tree Compiler (dtc) toolchain. While dtc itself is
+ occasionally needed for device tree manipulaton on the
+ target, libfdt may be required.
+
+if DTC
+
+config DTC_DTC
+   bool
+   prompt "dtc"
+
+config DTC_DTDIFF
+   bool
+   prompt "dtdiff"
+
+config DTC_FDTDUMP
+   bool
+   prompt "fdtdump"
+
+config DTC_FDTGET
+   bool
+   prompt "fdtget"
+
+config DTC_FDTOVERLAY
+   bool
+   prompt "fdtoverlay"
+
+config DTC_FDTPUT
+   bool
+   prompt "fdtput"
+
+endif
diff --git a/rules/dtc.make b/rules/dtc.make
new file mode 100644
index 0..9075e11a6
--- /dev/null
+++ b/rules/dtc.make
@@ -0,0 +1,82 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2022 Ladislav Michl 
+# Copyright (C) 2023 Christian Melki 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_DTC) += dtc
+
+#
+# Paths and names
+#
+DTC_VERSION:= 1.7.0
+DTC_MD5:= f8b4469ad89f4b882091895ec60dde6b
+DTC:= dtc-$(DTC_VERSION)
+DTC_SUFFIX := tar.gz
+DTC_URL:= 
https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(DTC).$(DTC_SUFFIX)
+DTC_SOURCE := $(SRCDIR)/$(DTC).$(DTC_SUFFIX)
+DTC_DIR:= $(BUILDDIR)/$(DTC)
+DTC_LICENSE:= GPL-2.0-or-later OR BSD-2-Clause
+DTC_LICENSE_FILES := \
+   file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e \
+   file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+   file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927
+
+# 
+# Prepare
+# 
+
+DTC_CONF_TOOL  := NO
+
+DTC_MAKE_ENV   := $(CROSS_ENV)
+
+DTC_MAKE_OPT   := \
+   PREFIX=/usr \
+   NO_PYTHON=1 \
+   NO_VALGRIND=1 \
+   NO_YAML=1
+
+DTC_INSTALL_OPT:= \
+   $(DTC_MAKE_OPT) \
+   install-bin \
+   install-includes \
+   install-lib
+
+# 
+# Target-Install
+# 
+
+DTC_BIN-y  :=
+DTC_BIN-$(PTXCONF_DTC_DTC) += dtc
+DTC_BIN-$(PTXCONF_DTC_DTDIFF)  += dtdiff
+DTC_BIN-$(PTXCONF_DTC_FDTDUMP) += fdtdump
+DTC_BIN-$(PTXCONF_DTC_FDTGET)  += fdtget
+DTC_BIN-$(PTXCONF_DTC_FDTOVERLAY)  += fdtoverlay
+DTC_BIN-$(PTXCONF_DTC_FDTPUT)  += fdtput
+
+$(STATEDIR)/dtc.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, dtc)
+   @$(call install_fixup, dtc,PRIORITY,optional)
+   @$(call install_fixup, dtc,SECTION,base)
+   @$(call install_fixup, dtc,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, dtc,DESCRIPTION,missing)
+
+   @$(call install_lib, dtc, 0, 0, 0644, libfdt-$(DTC_VERSION))
+
+   @$(foreach tool, $(DTC_BIN-y), \
+   $(call install_copy, dtc, 0, 0, 0755, -, \
+   /usr/bin/$(tool))$(ptx/nl))
+
+   @$(call install_finish, dtc)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH v2] dtc: new package

[Ladislav Michl]

From: Ladislav Michl 

Please note this package is not as symmetrical as the typical
host-* and normal variants. Here the latest version is usually
needed.

This work is prepping for qemu 8.2.0+, as it requires libfdt
as a separate library. It has stopped providing one internally.

Signed-off-by: Christian Melki 
Signed-off-by: Ladislav Michl 
---
 CHANGES:
 -v2: select HOST_FLEX, drop 'v' from url version, update md5,
  use proper DTC_MAKE_ENV

 rules/dtc.in   | 37 +++
 rules/dtc.make | 82 ++
 2 files changed, 119 insertions(+)
 create mode 100644 rules/dtc.in
 create mode 100644 rules/dtc.make

diff --git a/rules/dtc.in b/rules/dtc.in
new file mode 100644
index 0..e6d0b84d5
--- /dev/null
+++ b/rules/dtc.in
@@ -0,0 +1,37 @@
+## SECTION=system_libraries
+menuconfig DTC
+   tristate
+   prompt "dtc   "
+   select HOST_FLEX
+   help
+ Device Tree Compiler (dtc) toolchain. While dtc itself is
+ occasionally needed for device tree manipulaton on the
+ target, libfdt may be required.
+
+if DTC
+
+config DTC_DTC
+   bool
+   prompt "dtc"
+
+config DTC_DTDIFF
+   bool
+   prompt "dtdiff"
+
+config DTC_FDTDUMP
+   bool
+   prompt "fdtdump"
+
+config DTC_FDTGET
+   bool
+   prompt "fdtget"
+
+config DTC_FDTOVERLAY
+   bool
+   prompt "fdtoverlay"
+
+config DTC_FDTPUT
+   bool
+   prompt "fdtput"
+
+endif
diff --git a/rules/dtc.make b/rules/dtc.make
new file mode 100644
index 0..8aa38c5e3
--- /dev/null
+++ b/rules/dtc.make
@@ -0,0 +1,82 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2022 Ladislav Michl 
+# Copyright (C) 2023 Christian Melki 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_DTC) += dtc
+
+#
+# Paths and names
+#
+DTC_VERSION:= 1.7.0
+DTC_MD5:= f8b4469ad89f4b882091895ec60dde6b
+DTC:= dtc-$(DTC_VERSION)
+DTC_SUFFIX := tar.gz
+DTC_URL:= 
https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(DTC).$(DTC_SUFFIX)
+DTC_SOURCE := $(SRCDIR)/$(DTC).$(DTC_SUFFIX)
+DTC_DIR:= $(BUILDDIR)/$(DTC)
+DTC_LICENSE:= BSD-2-Clause OR GPL-2.0
+DTC_LICENSE_FILES := \
+   file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e \
+   file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+   file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927
+
+# 
+# Prepare
+# 
+
+DTC_CONF_TOOL  := NO
+
+DTC_MAKE_ENV   := $(CROSS_ENV)
+
+DTC_MAKE_OPT   := \
+   PREFIX=/usr \
+   NO_PYTHON=1 \
+   NO_VALGRIND=1 \
+   NO_YAML=1
+
+DTC_INSTALL_OPT:= \
+   $(DTC_MAKE_OPT) \
+   install-bin \
+   install-includes \
+   install-lib
+
+# 
+# Target-Install
+# 
+
+DTC_BIN-y  :=
+DTC_BIN-$(PTXCONF_DTC_DTC) += dtc
+DTC_BIN-$(PTXCONF_DTC_DTDIFF)  += dtdiff
+DTC_BIN-$(PTXCONF_DTC_FDTDUMP) += fdtdump
+DTC_BIN-$(PTXCONF_DTC_FDTGET)  += fdtget
+DTC_BIN-$(PTXCONF_DTC_FDTOVERLAY)  += fdtoverlay
+DTC_BIN-$(PTXCONF_DTC_FDTPUT)  += fdtput
+
+$(STATEDIR)/dtc.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, dtc)
+   @$(call install_fixup, dtc,PRIORITY,optional)
+   @$(call install_fixup, dtc,SECTION,base)
+   @$(call install_fixup, dtc,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, dtc,DESCRIPTION,missing)
+
+   @$(call install_lib, dtc, 0, 0, 0644, libfdt-$(DTC_VERSION))
+
+   @$(foreach tool, $(DTC_BIN-y), \
+   $(call install_copy, dtc, 0, 0, 0755, -, \
+   /usr/bin/$(tool));)
+
+   @$(call install_finish, dtc)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

Re: [ptxdist] [PATCH] libfdt: New package.

[Ladislav Michl]

Hi Christian!

On Thu, Jan 04, 2024 at 10:26:42AM +0100, Christian Melki wrote:
> Hi Ladis,
> 
> On 1/4/24 10:12 AM, Ladislav Michl wrote:
> > Hi,
> > 
> > On Wed, Jan 03, 2024 at 08:23:52PM +0100, Christian Melki wrote:
> > > Add the device-tree-compiler source as libfdt.
> > > I guess the package could have been named dtc as a target
> > > variant with libfdt, but I don't know of any uses of the
> > > dtc on target environments.
> > 
> > Appended my version created about two years ago... Those DTC tools
> > were used to patch devicetree during on field board upgrade when
> > moving from ancient kernel. Flash repartioning was part of that
> > upgrade as well as use of RAUC. Basically all userspace was moved
> > to ramdisk, detached from flash, new image was prepared and flashed
> > at once - single point of failure, board was dead when this failed,
> > but as far as I know, it never happened. So yes, dtc on target
> > environment is very usefull :)
> > 
> 
> Oh. Didn't know you already had a version.
> 
> I would probably have written my own tool using libfdt,
> integrated into something else. :)
> But that isn't saying there is no need for anyone.
> 
> > > So the only use I can think of is libfdt. I think the name is more
> > > accurate towards usage, but it isn't as symmetrical as the
> > > typical host-* and normal variants.
> > 
> > In case you reconsider, I'll merge your and my variant (I didn't
> > bother with licenses as it was part of local BSP).
> 
> I'll gladly reconsider. It's perfectly fine if there are usecases.
> Please go ahead and do a merge if you like.
> But keep binaries as optional. I prefer it that way.
> 
> Either way, libfdt needs to happen on target because of qemu afaict.

Yes. I expect qemu select DTC once someone (hint, hint) updates qemu :)
Here's updated version, please give it a try.

-- >8 --

Subject: [PATCH] dtc: new package

From: Ladislav Michl 

Please note this package is not as symmetrical as the typical
host-* and normal variants. Here the latest version is usually
needed.

This work is prepping for qemu 8.2.0+, as it requires libfdt
as a separate library. It has stopped providing one internally.

Signed-off-by: Christian Melki 
Signed-off-by: Ladislav Michl 
---
 rules/dtc.in   | 36 +++
 rules/dtc.make | 80 ++
 2 files changed, 116 insertions(+)
 create mode 100644 rules/dtc.in
 create mode 100644 rules/dtc.make

diff --git a/rules/dtc.in b/rules/dtc.in
new file mode 100644
index 0..2edb6f925
--- /dev/null
+++ b/rules/dtc.in
@@ -0,0 +1,36 @@
+## SECTION=system_libraries
+menuconfig DTC
+   tristate
+   prompt "dtc   "
+   help
+ Device Tree Compiler (dtc) toolchain. While dtc itself is
+ occasionally needed for device tree manipulaton on the
+ target, libfdt may be required.
+
+if DTC
+
+config DTC_DTC
+   bool
+   prompt "dtc"
+
+config DTC_DTDIFF
+   bool
+   prompt "dtdiff"
+
+config DTC_FDTDUMP
+   bool
+   prompt "fdtdump"
+
+config DTC_FDTGET
+   bool
+   prompt "fdtget"
+
+config DTC_FDTOVERLAY
+   bool
+   prompt "fdtoverlay"
+
+config DTC_FDTPUT
+   bool
+   prompt "fdtput"
+
+endif
diff --git a/rules/dtc.make b/rules/dtc.make
new file mode 100644
index 0..d0e6a7617
--- /dev/null
+++ b/rules/dtc.make
@@ -0,0 +1,80 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2022 Ladislav Michl 
+# Copyright (C) 2023 Christian Melki 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_DTC) += dtc
+
+#
+# Paths and names
+#
+DTC_VERSION:= 1.7.0
+DTC_MD5:= 58f007905843f6ed6cecf820eeada0ef
+DTC:= dtc-v$(DTC_VERSION)
+DTC_SUFFIX := tar.gz
+DTC_URL:= 
https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(DTC).$(DTC_SUFFIX)
+DTC_SOURCE := $(SRCDIR)/$(DTC).$(DTC_SUFFIX)
+DTC_DIR:= $(BUILDDIR)/$(DTC)
+DTC_LICENSE:= BSD-2-Clause OR GPL-2.0
+DTC_LICENSE_FILES := \
+   file://README.license;md5=a1eb22e37f09df5b5511b8a278992d0e \
+   file://GPL;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+   file://BSD-2-Clause;md5=5d6306d1b08f8df623178dfd81880927
+
+# 
+# Prepare
+# 
+
+DTC_CONF_TOOL := NO
+DTC_MAKE_OPT := \
+   PREFIX=/usr \
+   NO_PYTHON=1 \
+   NO_VALGRIND=1 \
+   NO_YAML=1 \
+   $(CROSS_ENV_CC)
+
+DTC_INSTALL_OPT := \
+  

Re: [ptxdist] [PATCH] libfdt: New package.

[Ladislav Michl]

= dtc

#
# Paths and names
#
DTC_VERSION := 1.6.0
DTC_MD5 := cd36ac756290597f3cf1c5b6cfe12e77
DTC := dtc-v$(DTC_VERSION)
DTC_SUFFIX  := tar.gz
DTC_URL := 
https://git.kernel.org/pub/scm/utils/dtc/dtc.git/snapshot/$(DTC).$(DTC_SUFFIX)
DTC_SOURCE  := $(SRCDIR)/$(DTC).$(DTC_SUFFIX)
DTC_DIR := $(BUILDDIR)/$(DTC)
DTC_LICENSE := GPL-2.0-only

# 
# Prepare
# 

DTC_CONF_TOOL := NO
DTC_MAKE_OPT := \
PREFIX=/usr \
NO_PYTHON=1 \
NO_VALGRIND=1 \
NO_YAML=1 \
$(CROSS_ENV_CC)

DTC_INSTALL_OPT := \
$(DTC_MAKE_OPT) \
install-bin \
install-lib

# 
# Target-Install
# 

DTC_BIN-y   :=
DTC_BIN-$(PTXCONF_DTC_DTC)  += dtc
DTC_BIN-$(PTXCONF_DTC_DTDIFF)   += dtdiff
DTC_BIN-$(PTXCONF_DTC_FDTDUMP)  += fdtdump
DTC_BIN-$(PTXCONF_DTC_FDTGET)   += fdtget
DTC_BIN-$(PTXCONF_DTC_FDTOVERLAY)   += fdtoverlay
DTC_BIN-$(PTXCONF_DTC_FDTPUT)   += fdtput

$(STATEDIR)/dtc.targetinstall:
@$(call targetinfo)

@$(call install_init, dtc)
@$(call install_fixup, dtc,PRIORITY,optional)
@$(call install_fixup, dtc,SECTION,base)
@$(call install_fixup, dtc,AUTHOR,"Ladislav Michl 
")
@$(call install_fixup, dtc,DESCRIPTION,missing)

@$(call install_lib, dtc, 0, 0, 0644, libfdt-$(DTC_VERSION))

@$(foreach tool, $(DTC_BIN-y), \
$(call install_copy, dtc, 0, 0, 0755, -, \
/usr/bin/$(tool));)

@$(call install_finish, dtc)

@$(call touch)

# vim: syntax=make

[ptxdist] [PATCH 9/9] libdvdread: new package

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/libdvdread.in   |  7 +
 rules/libdvdread.make | 60 +++
 2 files changed, 67 insertions(+)
 create mode 100644 rules/libdvdread.in
 create mode 100644 rules/libdvdread.make

diff --git a/rules/libdvdread.in b/rules/libdvdread.in
new file mode 100644
index 0..0106fd70b
--- /dev/null
+++ b/rules/libdvdread.in
@@ -0,0 +1,7 @@
+## SECTION=multimedia_libs
+
+config LIBDVDREAD
+   tristate
+   prompt "libdvdread"
+   help
+ libdvdread is a library for simpler navigation (DVDs without menus).
diff --git a/rules/libdvdread.make b/rules/libdvdread.make
new file mode 100644
index 0..25c607c54
--- /dev/null
+++ b/rules/libdvdread.make
@@ -0,0 +1,60 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Ladislav Michl 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBDVDREAD) += libdvdread
+
+#
+# Paths and names
+#
+LIBDVDREAD_VERSION := 6.1.3
+LIBDVDREAD_MD5 := 3c58d1624a71a16ff40f55dbaca82523
+LIBDVDREAD := libdvdread-$(LIBDVDREAD_VERSION)
+LIBDVDREAD_SUFFIX  := tar.bz2
+LIBDVDREAD_URL := 
https://download.videolan.org/pub/videolan/libdvdread/$(LIBDVDREAD_VERSION)/$(LIBDVDREAD).$(LIBDVDREAD_SUFFIX)
 
+LIBDVDREAD_SOURCE  := $(SRCDIR)/$(LIBDVDREAD).$(LIBDVDREAD_SUFFIX)
+LIBDVDREAD_DIR := $(BUILDDIR)/$(LIBDVDREAD)
+LIBDVDREAD_LICENSE := GPL-2.0-or-later
+LIBDVDREAD_LICENSE_FILES   := \
+   file://COPYING;md5=64e753fa7d1ca31632bc383da3b57c27
+
+# 
+# Prepare
+# 
+
+#
+# autoconf
+#
+LIBDVDREAD_CONF_TOOL   := autoconf
+LIBDVDREAD_CONF_OPT:= \
+   $(CROSS_AUTOCONF_USR) \
+   $(GLOBAL_LARGE_FILE_OPTION) \
+   --disable-apidoc
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/libdvdread.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, libdvdread)
+   @$(call install_fixup, libdvdread,PRIORITY,optional)
+   @$(call install_fixup, libdvdread,SECTION,base)
+   @$(call install_fixup, libdvdread,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, libdvdread,DESCRIPTION,missing)
+
+   @$(call install_lib, libdvdread, 0, 0, 0644, libdvdread)
+
+   @$(call install_finish, libdvdread)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH 8/9] libdvdnav: new package

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/libdvdnav.in   | 10 
 rules/libdvdnav.make | 59 
 2 files changed, 69 insertions(+)
 create mode 100644 rules/libdvdnav.in
 create mode 100644 rules/libdvdnav.make

diff --git a/rules/libdvdnav.in b/rules/libdvdnav.in
new file mode 100644
index 0..77e73c188
--- /dev/null
+++ b/rules/libdvdnav.in
@@ -0,0 +1,10 @@
+## SECTION=multimedia_libs
+
+config LIBDVDNAV
+   tristate
+   prompt "libdvdnav"
+   select LIBDVDREAD
+   help
+ libdvdnav is a library that allows easy use of sophisticated
+ DVD navigation features such as DVD menus, multiangle playback
+ and even interactive DVD games.
diff --git a/rules/libdvdnav.make b/rules/libdvdnav.make
new file mode 100644
index 0..4efbb1691
--- /dev/null
+++ b/rules/libdvdnav.make
@@ -0,0 +1,59 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Ladislav Michl 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBDVDNAV) += libdvdnav
+
+#
+# Paths and names
+#
+LIBDVDNAV_VERSION  := 6.1.1
+LIBDVDNAV_MD5  := 46c46cb0294fbd1fcb8a0181818dad15
+LIBDVDNAV  := libdvdnav-$(LIBDVDNAV_VERSION)
+LIBDVDNAV_SUFFIX   := tar.bz2
+LIBDVDNAV_URL  := 
https://download.videolan.org/pub/videolan/libdvdnav/$(LIBDVDNAV_VERSION)/$(LIBDVDNAV).$(LIBDVDNAV_SUFFIX)
 
+LIBDVDNAV_SOURCE   := $(SRCDIR)/$(LIBDVDNAV).$(LIBDVDNAV_SUFFIX)
+LIBDVDNAV_DIR  := $(BUILDDIR)/$(LIBDVDNAV)
+LIBDVDNAV_LICENSE  := GPL-2.0-or-later
+LIBDVDNAV_LICENSE_FILES:= \
+   file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f
+
+# 
+# Prepare
+# 
+
+#
+# autoconf
+#
+LIBDVDNAV_CONF_TOOL:= autoconf
+LIBDVDNAV_CONF_OPT := \
+   $(CROSS_AUTOCONF_USR) \
+   $(GLOBAL_LARGE_FILE_OPTION)
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/libdvdnav.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, libdvdnav)
+   @$(call install_fixup, libdvdnav,PRIORITY,optional)
+   @$(call install_fixup, libdvdnav,SECTION,base)
+   @$(call install_fixup, libdvdnav,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, libdvdnav,DESCRIPTION,missing)
+
+   @$(call install_lib, libdvdnav, 0, 0, 0644, libdvdnav)
+
+   @$(call install_finish, libdvdnav)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH 7/9] libdvdcss: new package

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/libdvdcss.in   |  8 ++
 rules/libdvdcss.make | 60 
 2 files changed, 68 insertions(+)
 create mode 100644 rules/libdvdcss.in
 create mode 100644 rules/libdvdcss.make

diff --git a/rules/libdvdcss.in b/rules/libdvdcss.in
new file mode 100644
index 0..1dc51535e
--- /dev/null
+++ b/rules/libdvdcss.in
@@ -0,0 +1,8 @@
+## SECTION=multimedia_libs
+
+config LIBDVDCSS
+   tristate
+   prompt "libdvdcss"
+   help
+ A simple library designed for accessing DVDs like a block device
+ without having to bother about the decryption.
diff --git a/rules/libdvdcss.make b/rules/libdvdcss.make
new file mode 100644
index 0..930723879
--- /dev/null
+++ b/rules/libdvdcss.make
@@ -0,0 +1,60 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Ladislav Michl 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBDVDCSS) += libdvdcss
+
+#
+# Paths and names
+#
+LIBDVDCSS_VERSION  := 1.4.3
+LIBDVDCSS_MD5  := e98239a88af9b2204f9b9d987c2bc71a
+LIBDVDCSS  := libdvdcss-$(LIBDVDCSS_VERSION)
+LIBDVDCSS_SUFFIX   := tar.bz2
+LIBDVDCSS_URL  := 
https://download.videolan.org/pub/libdvdcss/$(LIBDVDCSS_VERSION)/$(LIBDVDCSS).$(LIBDVDCSS_SUFFIX)
 
+LIBDVDCSS_SOURCE   := $(SRCDIR)/$(LIBDVDCSS).$(LIBDVDCSS_SUFFIX)
+LIBDVDCSS_DIR  := $(BUILDDIR)/$(LIBDVDCSS)
+LIBDVDCSS_LICENSE  := GPL-2.0-or-later
+LIBDVDCSS_LICENSE_FILES:= \
+   file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263
+
+# 
+# Prepare
+# 
+
+#
+# autoconf
+#
+LIBDVDCSS_CONF_TOOL:= autoconf
+LIBDVDCSS_CONF_OPT := \
+   $(CROSS_AUTOCONF_USR) \
+   $(GLOBAL_LARGE_FILE_OPTION) \
+   --disable-doc
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/libdvdcss.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, libdvdcss)
+   @$(call install_fixup, libdvdcss,PRIORITY,optional)
+   @$(call install_fixup, libdvdcss,SECTION,base)
+   @$(call install_fixup, libdvdcss,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, libdvdcss,DESCRIPTION,missing)
+
+   @$(call install_lib, libdvdcss, 0, 0, 0644, libdvdcss)
+
+   @$(call install_finish, libdvdcss)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH 6/9] gst-plugins-good1: unbreak libtag support

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/gst-plugins-good1.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rules/gst-plugins-good1.in b/rules/gst-plugins-good1.in
index 6d91fffb1..82031da0a 100644
--- a/rules/gst-plugins-good1.in
+++ b/rules/gst-plugins-good1.in
@@ -31,6 +31,7 @@ menuconfig GST_PLUGINS_GOOD1
select LIBSHOUT if GST_PLUGINS_GOOD1_SHOUT2
select LIBSOUP  if GST_PLUGINS_GOOD1_SOUP
select LIBSOUP  if GST_PLUGINS_GOOD1_ADAPTIVEDEMUX2 && 
RUNTIME
+   select LIBTAG   if GST_PLUGINS_GOOD1_TAGLIB
select LIBXML2  if GST_PLUGINS_GOOD1_ADAPTIVEDEMUX2
select LIBGCRYPTif GST_PLUGINS_GOOD1_HLS_CRYPTO_GCRYPT
select NETTLE   if GST_PLUGINS_GOOD1_HLS_CRYPTO_NETTLE
@@ -412,8 +413,6 @@ config GST_PLUGINS_GOOD1_SYSTEMD
 
 config GST_PLUGINS_GOOD1_TAGLIB
bool
-   # needs libtag
-   depends on BROKEN
prompt "taglib"
help
  Tag-writing plugin based on taglib
-- 
2.39.2

[ptxdist] [PATCH 5/9] libtag: new package

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/libtag.in   | 17 ++
 rules/libtag.make | 60 +++
 2 files changed, 77 insertions(+)
 create mode 100644 rules/libtag.in
 create mode 100644 rules/libtag.make

diff --git a/rules/libtag.in b/rules/libtag.in
new file mode 100644
index 0..17132b49e
--- /dev/null
+++ b/rules/libtag.in
@@ -0,0 +1,17 @@
+## SECTION=multimedia_libs
+
+menuconfig LIBTAG
+   tristate
+   prompt "libtag"
+   select HOST_CMAKE
+   select ZLIB if LIBTAG_ZLIB
+   help
+ A library for reading and editing the meta-data of several
+ popular audio formats.
+
+if LIBTAG
+
+config LIBTAG_ZLIB
+bool "zlib support"
+
+endif
diff --git a/rules/libtag.make b/rules/libtag.make
new file mode 100644
index 0..8d26a56da
--- /dev/null
+++ b/rules/libtag.make
@@ -0,0 +1,60 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Ladislav Michl 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBTAG) += libtag
+
+#
+# Paths and names
+#
+LIBTAG_VERSION := 1.13.1
+LIBTAG_MD5 := 2fe6089da73ad414aa1b982b83415362
+LIBTAG := taglib-$(LIBTAG_VERSION)
+LIBTAG_SUFFIX  := tar.gz
+LIBTAG_URL := 
https://taglib.org/releases/$(LIBTAG).$(LIBTAG_SUFFIX)
+LIBTAG_SOURCE  := $(SRCDIR)/$(LIBTAG).$(LIBTAG_SUFFIX)
+LIBTAG_DIR := $(BUILDDIR)/$(LIBTAG)
+LIBTAG_LICENSE := LGPL-2.1-or-later
+LIBTAG_LICENSE_FILES   := \
+   file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \
+   file://COPYING.MPL;md5=bfe1f75d606912a4111c90743d6c7325
+
+# 
+# Prepare
+# 
+
+LIBTAG_CONF_TOOL   := cmake
+LIBTAG_CONF_OPT:= \
+   $(CROSS_CMAKE_USR) \
+   -DBUILD_SHARED_LIBS=ON \
+   -DBUILD_TESTING=OFF \
+   -DBUILD_EXAMPLES=OFF \
+   -DWITH_ZLIB=$(call ptx/onoff, PTXCONF_LIBTAG_ZLIB)
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/libtag.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, libtag)
+   @$(call install_fixup, libtag,PRIORITY,optional)
+   @$(call install_fixup, libtag,SECTION,base)
+   @$(call install_fixup, libtag,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, libtag,DESCRIPTION,missing)
+
+   $(call install_lib, libtag, 0, 0, 0644, libtag)
+
+   @$(call install_finish, libtag)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH 4/9] gst-plugins-ugly1: unbreak cdio support

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/gst-plugins-ugly1.in | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/rules/gst-plugins-ugly1.in b/rules/gst-plugins-ugly1.in
index 2a1dabcc1..fe8aecc8e 100644
--- a/rules/gst-plugins-ugly1.in
+++ b/rules/gst-plugins-ugly1.in
@@ -8,6 +8,7 @@ menuconfig GST_PLUGINS_UGLY1
select GSTREAMER1
select GST_PLUGINS_BASE1
select ORC  if GST_PLUGINS_UGLY1_A52DEC
+   select LIBCDIO  if GST_PLUGINS_UGLY1_CDIO
select LIBMPEG2 if GST_PLUGINS_UGLY1_MPEG2DEC
prompt "gst-plugins-ugly  "
help
@@ -66,8 +67,6 @@ config GST_PLUGINS_UGLY1_AMRWBDEC
 
 config GST_PLUGINS_UGLY1_CDIO
bool
-   # needs libcdio
-   depends on BROKEN
prompt "cdio"
help
  CD audio source plugin
-- 
2.39.2

[ptxdist] [PATCH 3/9] libcdio: new package

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/libcdio.in   | 15 ++
 rules/libcdio.make | 68 ++
 2 files changed, 83 insertions(+)
 create mode 100644 rules/libcdio.in
 create mode 100644 rules/libcdio.make

diff --git a/rules/libcdio.in b/rules/libcdio.in
new file mode 100644
index 0..fd0d591ea
--- /dev/null
+++ b/rules/libcdio.in
@@ -0,0 +1,15 @@
+## SECTION=multimedia_libs
+
+menuconfig LIBCDIO
+   tristate
+   prompt "libcdio   "
+   select GCCLIBS_CXX  if LIBCDIO_CXX
+   help
+ A library for CD-ROM and CD image access. 
+
+if LIBCDIO
+
+config LIBCDIO_CXX
+bool "install c++ bindings"
+
+endif
diff --git a/rules/libcdio.make b/rules/libcdio.make
new file mode 100644
index 0..e586ce581
--- /dev/null
+++ b/rules/libcdio.make
@@ -0,0 +1,68 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Ladislav Michl 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBCDIO) += libcdio
+
+#
+# Paths and names
+#
+LIBCDIO_VERSION:= 2.1.0
+LIBCDIO_MD5:= aa7629e8f73662a762f64c444b901055
+LIBCDIO:= libcdio-$(LIBCDIO_VERSION)
+LIBCDIO_SUFFIX := tar.bz2
+LIBCDIO_URL:= $(call ptx/mirror, GNU, 
libcdio/$(LIBCDIO).$(LIBCDIO_SUFFIX))
+LIBCDIO_SOURCE := $(SRCDIR)/$(LIBCDIO).$(LIBCDIO_SUFFIX)
+LIBCDIO_DIR:= $(BUILDDIR)/$(LIBCDIO)
+LIBCDIO_LICENSE:= GPL-3.0-or-later
+LIBCDIO_LICENSE_FILES  := \
+   file://COPYING;md5=d32239bcb673463ab874e80d47fae504
+
+# 
+# Prepare
+# 
+
+LIBCDIO_CONF_TOOL  := autoconf
+LIBCDIO_CONF_OPT   := \
+   $(CROSS_AUTOCONF_USR) \
+   $(GLOBAL_LARGE_FILE_OPTION) \
+   --$(call ptx/endis, PTXCONF_LIBCDIO_CXX)-cxx \
+   --disable-example-progs \
+   --without-cd-drive \
+   --without-cd-info \
+   --without-cdda-player \
+   --without-cd-read \
+   --without-iso-info \
+   --without-iso-read
+
+# 
+# Target-Install
+# 
+
+LIBCDIO_LIBS-y := libcdio libiso9660 libudf
+LIBCDIO_LIBS-$(PTXCONF_LIBCDIO_CXX)+= libcdio++ libiso9660++
+
+$(STATEDIR)/libcdio.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, libcdio)
+   @$(call install_fixup, libcdio,PRIORITY,optional)
+   @$(call install_fixup, libcdio,SECTION,base)
+   @$(call install_fixup, libcdio,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, libcdio,DESCRIPTION,missing)
+
+   @$(foreach lib, $(LIBCDIO_LIBS-y), \
+   $(call install_lib, libcdio, 0, 0, 0644, lib$(lib))$(ptx/nl))
+
+   @$(call install_finish, libcdio)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH 2/9] libass: new package

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/libass.in   | 12 +
 rules/libass.make | 63 +++
 2 files changed, 75 insertions(+)
 create mode 100644 rules/libass.in
 create mode 100644 rules/libass.make

diff --git a/rules/libass.in b/rules/libass.in
new file mode 100644
index 0..a94fb960a
--- /dev/null
+++ b/rules/libass.in
@@ -0,0 +1,12 @@
+## SECTION=multimedia_libs
+
+config LIBASS
+   tristate
+   prompt "libass"
+   select FONTCONFIG
+   select FREETYPE
+   select FRIBIDI
+   select HARFBUZZ
+   help
+ Portable subtitle renderer for the ASS/SSA (Advanced Substation
+ Alpha/Substation Alpha) subtitle format. 
diff --git a/rules/libass.make b/rules/libass.make
new file mode 100644
index 0..a0066e156
--- /dev/null
+++ b/rules/libass.make
@@ -0,0 +1,63 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Ladislav Michl 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_LIBASS) += libass
+
+#
+# Paths and names
+#
+LIBASS_VERSION := 0.17.1
+LIBASS_MD5 := e920cfac44bf9e729d9a0aeed22d9ddb
+LIBASS := libass-$(LIBASS_VERSION)
+LIBASS_SUFFIX  := tar.gz
+LIBASS_URL := 
https://github.com/libass/libass/archive/$(LIBASS_VERSION).$(LIBASS_SUFFIX)
+LIBASS_SOURCE  := $(SRCDIR)/$(LIBASS).$(LIBASS_SUFFIX)
+LIBASS_DIR := $(BUILDDIR)/$(LIBASS)
+LIBASS_LICENSE := ISC
+LIBASS_LICENSE_FILES   := \
+   file://COPYING;md5=a42532a0684420bdb15556c3cdd49a75
+
+# 
+# Prepare
+# 
+
+LIBASS_CONF_TOOL   := autoconf
+LIBASS_CONF_OPT:= \
+   $(CROSS_AUTOCONF_USR) \
+   --disable-test \
+   --disable-profile
+
+$(STATEDIR)/libass.prepare:
+   @$(call targetinfo)
+   @$(call world/execute, LIBASS, ./autogen.sh)
+   @$(call world/prepare, LIBASS)
+   @$(call touch)
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/libass.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, libass)
+   @$(call install_fixup, libass,PRIORITY,optional)
+   @$(call install_fixup, libass,SECTION,base)
+   @$(call install_fixup, libass,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, libass,DESCRIPTION,missing)
+
+   @$(call install_lib, libass, 0, 0, 0644, libass)
+
+   @$(call install_finish, libass)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH 1/9] dav1d: new package

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/dav1d.in   |  8 +++
 rules/dav1d.make | 62 
 2 files changed, 70 insertions(+)
 create mode 100644 rules/dav1d.in
 create mode 100644 rules/dav1d.make

diff --git a/rules/dav1d.in b/rules/dav1d.in
new file mode 100644
index 0..5c07b251f
--- /dev/null
+++ b/rules/dav1d.in
@@ -0,0 +1,8 @@
+## SECTION=multimedia_libs
+
+config DAV1D
+   tristate
+   prompt "dav1d"
+   select HOST_MESON
+   help
+ AV1 cross-platform decoder.
diff --git a/rules/dav1d.make b/rules/dav1d.make
new file mode 100644
index 0..4421b3e28
--- /dev/null
+++ b/rules/dav1d.make
@@ -0,0 +1,62 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2023 by Ladislav Michl 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_DAV1D) += dav1d
+
+#
+# Paths and names
+#
+DAV1D_VERSION  := 1.3.0
+DAV1D_MD5  := c8381f8346525dcd4205e9b50d80c5f4
+DAV1D  := dav1d-$(DAV1D_VERSION)
+DAV1D_SUFFIX   := tar.bz2
+DAV1D_URL  := 
https://code.videolan.org/videolan/dav1d/-/archive/$(DAV1D_VERSION)/$(DAV1D).$(DAV1D_SUFFIX)
 
+DAV1D_SOURCE   := $(SRCDIR)/$(DAV1D).$(DAV1D_SUFFIX)
+DAV1D_DIR  := $(BUILDDIR)/$(DAV1D)
+DAV1D_LICENSE  := BSD-2-Clause
+DAV1D_LICENSE_FILES:= \
+   file://COPYING;md5=c8055cfe7548dfdaa3a6dc45d8793669
+
+# 
+# Prepare
+# 
+
+#
+# meson
+#
+DAV1D_CONF_TOOL:= meson
+DAV1D_CONF_OPT := \
+   $(CROSS_MESON_USR) \
+   -Denable_tools=false \
+   -Denable_examples=false \
+   -Denable_tests=false \
+   -Denable_docs=false
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/dav1d.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, dav1d)
+   @$(call install_fixup, dav1d,PRIORITY,optional)
+   @$(call install_fixup, dav1d,SECTION,base)
+   @$(call install_fixup, dav1d,AUTHOR,"Ladislav Michl 
")
+   @$(call install_fixup, dav1d,DESCRIPTION,missing)
+
+   @$(call install_lib, dav1d, 0, 0, 0644, libdav1d)
+
+   @$(call install_finish, dav1d)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.39.2

[ptxdist] [PATCH 0/9] Add a few multimedia libraries

[Ladislav Michl]

Hi there,

an ongoing attempt give you a KODIST, yet another way to provide
Just enough OS for KODI, is bringing you this patchset.
Something like LibreELEC (https://libreelec.tv/), but implemented as
PTXDist layer based on DistroKit.
It's just a hobby project, but these intermediate results might
be interesting for general public.

Ladislav Michl (9):
  dav1d: new package
  libass: new package
  libcdio: new package
  gst-plugins-ugly1: unbreak cdio support
  libtag: new package
  gst-plugins-good1: unbreak libtag support
  libdvdcss: new package
  libdvdnav: new package
  libdvdread: new package

 rules/dav1d.in |  8 +
 rules/dav1d.make   | 62 ++
 rules/gst-plugins-good1.in |  3 +-
 rules/gst-plugins-ugly1.in |  3 +-
 rules/libass.in| 12 +++
 rules/libass.make  | 63 +++
 rules/libcdio.in   | 15 +
 rules/libcdio.make | 68 ++
 rules/libdvdcss.in |  8 +
 rules/libdvdcss.make   | 60 +
 rules/libdvdnav.in | 10 ++
 rules/libdvdnav.make   | 59 +
 rules/libdvdread.in|  7 
 rules/libdvdread.make  | 60 +
 rules/libtag.in| 17 ++
 rules/libtag.make  | 60 +
 16 files changed, 511 insertions(+), 4 deletions(-)
 create mode 100644 rules/dav1d.in
 create mode 100644 rules/dav1d.make
 create mode 100644 rules/libass.in
 create mode 100644 rules/libass.make
 create mode 100644 rules/libcdio.in
 create mode 100644 rules/libcdio.make
 create mode 100644 rules/libdvdcss.in
 create mode 100644 rules/libdvdcss.make
 create mode 100644 rules/libdvdnav.in
 create mode 100644 rules/libdvdnav.make
 create mode 100644 rules/libdvdread.in
 create mode 100644 rules/libdvdread.make
 create mode 100644 rules/libtag.in
 create mode 100644 rules/libtag.make

-- 
2.39.2

Re: [ptxdist] [ANNOUNCE] OSELAS.Toolchain() 2022.10.2 and 2023.07.1 released

[Ladislav Michl]

On Thu, Dec 21, 2023 at 10:38:16AM +0100, Michael Olbrich wrote:
> Hi,
> 
> On Wed, Dec 20, 2023 at 05:48:31PM +0100, Ladislav Michl wrote:
> > On Tue, Nov 21, 2023 at 08:46:31AM +0100, Michael Olbrich wrote:
> > > I'm happy to announce that I've just released OSELAS.Toolchain-2022.10.2
> > > and 2023.07.1.
> > > 
> > > This is a bugfix only release. There are no major update. The relevant
> > > changes are:
> > > 
> > >  - gcc was updated to the 12-20231117 and 13-20231118 snapshot releases.
> > >Note, that for the 2023.07.1 toolchain the reported version is now
> > >13.2.1 so the platformconfig in PTXdist BSPs must be updated
> > >accordingly.
> > >  - glibc was updated to 2.36-121-g88d5d70b1e89 and 2.37-48-g8e20aedfd7fc 
> > > in
> > >the respective stable branch.
> > >  - All patches from the binutils stable branches that seemed relevant
> > >have been cherry-picked.
> > >  - The gcc fortran compiler is now enabled in all Linux toolchains
> > > 
> > > Download the release here:
> > > https://public.pengutronix.de/oselas/toolchain/
> > > 
> > > Debian / Ubuntu Packages will be available at
> > > http://debian.pengutronix.de/
> > 
> > I finally got time to update all my BSPs to newer toolchain. However, it 
> > does
> > not fly without force-overwrite:
> > ladis@lenoch:~$ sudo dpkg --force-overwrite -i 
> > /var/cache/apt/archives/oselas.toolchain-2023.07.1-arm-v7a-linux-gnueabi-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym_2023.07.1-1~deb12+1_amd64.deb
> >  
> > (Reading database ... 621067 files and directories currently installed.)
> > Preparing to unpack 
> > .../oselas.toolchain-2023.07.1-arm-v7a-linux-gnueabi-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym_2023.07.1-1~deb12+1_amd64.deb
> >  ...
> > Unpacking 
> > oselas.toolchain-2023.07.1-arm-v7a-linux-gnueabi-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
> >  (2023.07.1-1~deb12+1) ...
> > dpkg: warning: overriding problem because --force enabled:
> > dpkg: warning: trying to overwrite 
> > '/usr/lib/debug/.build-id/0c/9b7ee1580684fbdac23548ca46c1c34408e49b.debug', 
> > which is also in package 
> > oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
> >  2023.07.1-1~deb12+1
> [...]
> 
> Don't install the *-dbgsym packages unless you really need them. They
> contain the debug symbols for the compiler itself etc. not the target
> libraries. So you will only need them if you want to debug a crashing gcc
> or something like that.

Thanks, that's what I was doing, but turned out problem was too much pressure
on VM on build host, so random crashes occured.

> I'm not sure what those debug files are for, but my guess ist libLLVM.so
> or something like that. Stuff that does not change with the selected target
> architecture. And the builds are sufficiently reproducible that the
> build-id is the same.

Ah, that is very nice gotcha ;-)

> Regards,
> Michael

Thank you,
ladis

Re: [ptxdist] [ANNOUNCE] OSELAS.Toolchain() 2022.10.2 and 2023.07.1 released

[Ladislav Michl]

Hi there,

On Tue, Nov 21, 2023 at 08:46:31AM +0100, Michael Olbrich wrote:
> 
> Hi,
> 
> I'm happy to announce that I've just released OSELAS.Toolchain-2022.10.2
> and 2023.07.1.
> 
> This is a bugfix only release. There are no major update. The relevant
> changes are:
> 
>  - gcc was updated to the 12-20231117 and 13-20231118 snapshot releases.
>Note, that for the 2023.07.1 toolchain the reported version is now
>13.2.1 so the platformconfig in PTXdist BSPs must be updated
>accordingly.
>  - glibc was updated to 2.36-121-g88d5d70b1e89 and 2.37-48-g8e20aedfd7fc in
>the respective stable branch.
>  - All patches from the binutils stable branches that seemed relevant
>have been cherry-picked.
>  - The gcc fortran compiler is now enabled in all Linux toolchains
> 
> Download the release here:
> https://public.pengutronix.de/oselas/toolchain/
> 
> Debian / Ubuntu Packages will be available at
> http://debian.pengutronix.de/

I finally got time to update all my BSPs to newer toolchain. However, it does
not fly without force-overwrite:
ladis@lenoch:~$ sudo dpkg --force-overwrite -i 
/var/cache/apt/archives/oselas.toolchain-2023.07.1-arm-v7a-linux-gnueabi-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym_2023.07.1-1~deb12+1_amd64.deb
 
(Reading database ... 621067 files and directories currently installed.)
Preparing to unpack 
.../oselas.toolchain-2023.07.1-arm-v7a-linux-gnueabi-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym_2023.07.1-1~deb12+1_amd64.deb
 ...
Unpacking 
oselas.toolchain-2023.07.1-arm-v7a-linux-gnueabi-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 (2023.07.1-1~deb12+1) ...
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 
'/usr/lib/debug/.build-id/0c/9b7ee1580684fbdac23548ca46c1c34408e49b.debug', 
which is also in package 
oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 2023.07.1-1~deb12+1
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 
'/usr/lib/debug/.build-id/10/71c9b1b3afe929d3b7270d0d465b166998ae1e.debug', 
which is also in package 
oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 2023.07.1-1~deb12+1
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 
'/usr/lib/debug/.build-id/23/5e92ac1123455fa6da01d18096efb107d113e3.debug', 
which is also in package 
oselas.toolchain-2023.07.1-arm-v5te-linux-gnueabi-gcc-13.2.1-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 2023.07.1-1~deb12+1
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 
'/usr/lib/debug/.build-id/2d/23f7b0adc49a68ae66977a9ce7dad298d7a039.debug', 
which is also in package 
oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 2023.07.1-1~deb12+1
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 
'/usr/lib/debug/.build-id/33/e34b75004c63e2e418c2b6aacfb19381581287.debug', 
which is also in package 
oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 2023.07.1-1~deb12+1
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 
'/usr/lib/debug/.build-id/44/2f6a15f40afb81e488ba9701a2afc5466daf68.debug', 
which is also in package 
oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 2023.07.1-1~deb12+1
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 
'/usr/lib/debug/.build-id/49/5f820aa35e6ad2d55b05dfd6d7c981d9567ce5.debug', 
which is also in package 
oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 2023.07.1-1~deb12+1
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 
'/usr/lib/debug/.build-id/5a/c02c08bcfe2be87f3e788df174b2e128144527.debug', 
which is also in package 
oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 2023.07.1-1~deb12+1
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 
'/usr/lib/debug/.build-id/5c/b60f90fdc7ba97a7b519255b1bb5e510d77e59.debug', 
which is also in package 
oselas.toolchain-2023.07.1-x86-64-unknown-linux-gnu-gcc-13.2.1-clang-16.0.6-glibc-2.37-binutils-2.40-kernel-6.3.6-sanitized-dbgsym
 2023.07.1-1~deb12+1
dpkg: warning: overriding problem because --force enabled:
dpkg: warning: trying to overwrite 

Re: [ptxdist] websocat rust package

[Ladislav Michl]

Hi,

On Fri, Aug 04, 2023 at 10:54:59AM -0400, Jon Ringle wrote:
> I'm trying to create a new package to build websocat (
> https://github.com/vi/websocat).
> Here is the websocat.make file I have now:

it seems something eat your whitespace, so output is a bit hard to read.
As you didn't provide complete patch, I can only guess websocat.in is
not selecting OPENSSL...

> #
> # We provide this package
> #
> PACKAGES-$(PTXCONF_WEBSOCAT) += websocat
> 
> #
> 
> # Paths and names
> 
> #
> 
> WEBSOCAT_VERSION := 1.11.0
> WEBSOCAT_MD5 := 2a43004dc1c256119089994b5ddb414b
> WEBSOCAT := websocat-$(WEBSOCAT_VERSION)
> WEBSOCAT_SUFFIX := tar.gz
> WEBSOCAT_URL :=
> https://github.com/vi/websocat/archive/refs/tags/v${WEBSOCAT_VERSION}.$(WEBSOCAT_SUFFIX)
> WEBSOCAT_SOURCE := $(SRCDIR)/$(WEBSOCAT).$(WEBSOCAT_SUFFIX)
> WEBSOCAT_DIR := $(BUILDDIR)/$(WEBSOCAT)
> WEBSOCAT_LICENSE := MIT
> WEBSOCAT_LICENSE_FILES :=
> file://LICENSE;md5=240269ccb62c2c66a81d8fdd094dd69f
> 
> WEBSOCAT_MAKE_ENV := \
> $(CROSS_CARGO_ENV) \
> $(CROSS_ENV_PKG_CONFIG) \
> PKG_CONFIG_SYSROOT_DIR=/.
> 
> WEBSOCAT_CONF_TOOL := cargo
> WEBSOCAT_CONF_OPT := \
> $(CROSS_CARGO_OPT) \
> --features=ssl
> 
> 
> It is failing in the compile stage:
> 
> 
> target: websocat.compile
> 
> 
> ptxdist: executing: cd
> /home/local/GRIDPOINT/jringle/git/gridpoint-com/gpec2phx/ptxdist/platform-ec2k/build-target/websocat-1.11.0
> && PATH=/home/local/GRIDPOINT/jringle/git/gridpoint-com/gp
> ec2phx/ptxdist/platform-ec2k/sysroot-cross/usr/bin:/home/local/GRIDPOINT/jringle/git/gridpoint-com/gpec2phx/ptxdist/platform-ec2k/sysroot-cross/usr/sbin:/home/local/GRIDPOINT/jringle/git/gr
> idpoint-com/gpec2phx/ptxdist/platform-ec2k/sysroot-host/usr/lib/wrapper:/home/local/GRIDPOINT/jringle/git/gridpoint-com/gpec2phx/ptxdist/platform-ec2k/sysroot-host/usr/bin:/home/local/GRIDP
> OINT/jringle/git/gridpoint-com/gpec2phx/ptxdist/platform-ec2k/sysroot-host/usr/sbin:/home/local/GRIDPOINT/jringle/git/gridpoint-com/gpec2phx/ptxdist/selected_toolchain:/usr/local/lib/ptxdis
> t-2023.08.1_GP/bin:/opt/bin:/home/local/GRIDPOINT/jringle/git/gridpoint-com/gpec2phx/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
> HTTPS_PROXY=PTXDIST-UNALLOWED-DOWNLOAD
> HTTP_PROXY=PTXDIST-UNALLOWED-DOWNLOAD
> https_proxy=PTXDIST-UNALLOWED-DOWNLOAD
> http_proxy=PTXDIST-UNALLOWED-DOWNLOAD PKGCONFIG_WHITELIST_HOST='libcrypto
> libssl openssl' PKGCONFIG_WHITELIST_TA
> RGET='' PKGCONFIG_WHITELIST_SRC='websocat'
> SYSROOT='/home/local/GRIDPOINT/jringle/git/gridpoint-com/gpec2phx/ptxdist/platform-ec2k/sysroot-target'
> V=1 VERBOSE=1 KBUILD_BUILD_TIMESTAMP=2022-
> 04-13T00:00:00+00:00 KBUILD_BUILD_USER=ptxdist KBUILD_BUILD_HOST=ptxdist
> CARGO_HOME='/home/local/GRIDPOINT/jringle/git/gridpoint-com/gpec2phx/ptxdist/platform-ec2k/build-target/websocat-1.1
> 1.0/ptxdist-cargo-home' CARGO_BUILD_TARGET="arm-v7a-linux-gnueabihf"
> RUST_TARGET_PATH=/home/local/GRIDPOINT/jringle/git/gridpoint-com/gpec2phx/ptxdist/platform-ec2k/selected_toolchain
> PKG_C
> ONFIG=arm-v7a-linux-gnueabihf-pkg-config PKG_CONFIG_SYSROOT_DIR=/. cargo
> build --target "arm-v7a-linux-gnueabihf" --release --frozen -j16
> 
> [...snip...]
> 
> error: failed to run custom build command for `openssl-sys v0.9.75`
> 
> Caused by:
>  process didn't exit successfully:
> `/home/local/GRIDPOINT/jringle/git/gridpoint-com/gpec2phx/ptxdist/platform-ec2k/build-target/websocat-1.11.0/target/release/build/openssl-sys-62d0d30c1c7
> 985aa/build-script-main` (exit status: 101)
>  --- stdout
>  cargo:rustc-cfg=const_fn
>  cargo:rerun-if-env-changed=ARM_V7A_LINUX_GNUEABIHF_OPENSSL_LIB_DIR
>  ARM_V7A_LINUX_GNUEABIHF_OPENSSL_LIB_DIR unset
>  cargo:rerun-if-env-changed=OPENSSL_LIB_DIR
>  OPENSSL_LIB_DIR unset
>  cargo:rerun-if-env-changed=ARM_V7A_LINUX_GNUEABIHF_OPENSSL_INCLUDE_DIR
>  ARM_V7A_LINUX_GNUEABIHF_OPENSSL_INCLUDE_DIR unset
>  cargo:rerun-if-env-changed=OPENSSL_INCLUDE_DIR
>  OPENSSL_INCLUDE_DIR unset
>  cargo:rerun-if-env-changed=ARM_V7A_LINUX_GNUEABIHF_OPENSSL_DIR
>  ARM_V7A_LINUX_GNUEABIHF_OPENSSL_DIR unset
>  cargo:rerun-if-env-changed=OPENSSL_DIR
>  OPENSSL_DIR unset
>  cargo:rerun-if-env-changed=OPENSSL_NO_PKG_CONFIG
>  cargo:rerun-if-env-changed=PKG_CONFIG_ALLOW_CROSS_arm-v7a-linux-gnueabihf
>  cargo:rerun-if-env-changed=PKG_CONFIG_ALLOW_CROSS_arm_v7a_linux_gnueabihf
>  cargo:rerun-if-env-changed=TARGET_PKG_CONFIG_ALLOW_CROSS
>  cargo:rerun-if-env-changed=PKG_CONFIG_ALLOW_CROSS
>  cargo:rerun-if-env-changed=PKG_CONFIG_arm-v7a-linux-gnueabihf
>  cargo:rerun-if-env-changed=PKG_CONFIG_arm_v7a_linux_gnueabihf
>  cargo:rerun-if-env-changed=TARGET_PKG_CONFIG
>  cargo:rerun-if-env-changed=PKG_CONFIG
>  cargo:rerun-if-env-changed=PKG_CONFIG_arm-v7a-linux-gnueabihf
>  cargo:rerun-if-env-changed=PKG_CONFIG_arm_v7a_linux_gnueabihf
>  cargo:rerun-if-env-changed=TARGET_PKG_CONFIG
>  cargo:rerun-if-env-changed=PKG_CONFIG
>  cargo:rerun-if-env-changed=OPENSSL_STATIC
>  cargo:rerun-if-env-changed=OPENSSL_DYNAMIC
>  

Re: [ptxdist] [PATCH] libunwind: Version bump. 1.70 -> 1.7.1

[Ladislav Michl]

On Mon, Jul 24, 2023 at 08:32:36PM +0200, Christian Melki wrote:
> On 7/24/23 19:04, Ladislav Michl wrote:
> > Hi,
> > 
> > On Mon, Jul 24, 2023 at 05:58:15PM +0200, Christian Melki wrote:
> >> Developers fixed the tarball misnomer and released a new version.
> >> No other changes.
> >>
> >> * (Re-)fix URL and remove comment.
> > 
> 
> Normally you'd be right, but not this time around. :)
> They broke the tarball and version name,
> hence the comment above and the nag in the previous bump commit.
> 
> https://github.com/libunwind/libunwind/releases/tag/v1.7.1
> https://github.com/libunwind/libunwind/compare/v1.7.0...v1.7.1
> 
> https://github.com/libunwind/libunwind/issues/535

Well, the previous commit was:
libunwind: Version bump. 1.6.2 -> 1.7.0 (-ish).

So I would expect this one is following the same scheme, otherwise it
is hard to tell what's happening without reading both commit messages.

Unless this is meant as developer attention test ;-)

> > note small typo in the subject: 1.70 -> 1.7.0
> > 
> > l.
> > 

Re: [ptxdist] [PATCH] libunwind: Version bump. 1.70 -> 1.7.1

[Ladislav Michl]

Hi,

On Mon, Jul 24, 2023 at 05:58:15PM +0200, Christian Melki wrote:
> Developers fixed the tarball misnomer and released a new version.
> No other changes.
> 
> * (Re-)fix URL and remove comment.

note small typo in the subject: 1.70 -> 1.7.0

l.

[ptxdist] [PATCH] glibc: fix typo in Y2038 check

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 Note: The previous commit message had a typo as well...

 rules/glibc.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/glibc.make b/rules/glibc.make
index 0f54bb181..a550f4b92 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -32,7 +32,7 @@ ifdef PTXCONF_GLIBC_Y2038
@echo Checking Y2038 support...
@echo 'static_assert(sizeof(time_t) == 8, "y2038");' | \
$(CROSS_CC) -c -x c -include sys/types.h -include assert.h - 
&>/dev/null || \
-   ptxd_bailout "PTXCONF_GLIBC_Y2038 is enabled but the toolchain 
has no Y2028 support!"
+   ptxd_bailout "PTXCONF_GLIBC_Y2038 is enabled but the toolchain 
has no Y2038 support!"
 endif
@$(call touch)
 
-- 
2.32.0

[ptxdist] [PATCH v2] doc: environment: add urls to tarballs

[Ladislav Michl]

From: Ladislav Michl 

Make newbie life easier by providing clickable links to
PTXdist and OSELAS.Toolchain sources.

Signed-off-by: Ladislav Michl 
Acked-by: Roland Hieber 
---
 CHANGES:
 - v2: 'the toolchain'..., Roland's ack.

 doc/environment.rst | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/environment.rst b/doc/environment.rst
index 18aecec4e..21156033f 100644
--- a/doc/environment.rst
+++ b/doc/environment.rst
@@ -17,10 +17,13 @@ components which are available to the public).
 In order to build |ptxdistBSPName|, the following source archives have to be 
available
 on the development host:
 
- * ptxdist-|ptxdistVendorVersion|.tar.bz2
+ * `ptxdist-|ptxdistVendorVersion|.tar.bz2 
<https://public.pengutronix.de/software/ptxdist/ptxdist-|ptxdistVendorVersion|.tar.bz2>`_
  * |ptxdistBSPName|.tar.bz2 (or a similar source)
- * ptxdist-|oselasTCNVendorptxdistversion|.tar.bz2
- * OSELAS.Toolchain-|oselasTCNVendorVersion|.tar.bz2
+
+Additionally, these source archives are needed to build the toolchain:
+
+ * `ptxdist-|oselasTCNVendorptxdistversion|.tar.bz2 
<https://public.pengutronix.de/software/ptxdist/ptxdist-|oselasTCNVendorptxdistversion|.tar.bz2>`_
+ * `OSELAS.Toolchain-|oselasTCNVendorVersion|.tar.bz2 
<https://public.pengutronix.de/oselas/toolchain/OSELAS.Toolchain-|oselasTCNVendorVersion|.tar.bz2>`_
 
 Main Parts of PTXdist
 ~
-- 
2.32.0

[ptxdist] [PATCH] doc: environment: add urls to tarballs

[Ladislav Michl]

From: Ladislav Michl 

Make newbie life easier by providing clickable links to
PTXdist and OSELAS.Toolchain sources.

Signed-off-by: Ladislav Michl 
---
 doc/environment.rst | 9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/doc/environment.rst b/doc/environment.rst
index 18aecec4e..9638aba60 100644
--- a/doc/environment.rst
+++ b/doc/environment.rst
@@ -17,10 +17,13 @@ components which are available to the public).
 In order to build |ptxdistBSPName|, the following source archives have to be 
available
 on the development host:
 
- * ptxdist-|ptxdistVendorVersion|.tar.bz2
+ * `ptxdist-|ptxdistVendorVersion|.tar.bz2 
<https://public.pengutronix.de/software/ptxdist/ptxdist-|ptxdistVendorVersion|.tar.bz2>`_
  * |ptxdistBSPName|.tar.bz2 (or a similar source)
- * ptxdist-|oselasTCNVendorptxdistversion|.tar.bz2
- * OSELAS.Toolchain-|oselasTCNVendorVersion|.tar.bz2
+
+Additionally, these source archives are needed to build toolchain:
+
+ * `ptxdist-|oselasTCNVendorptxdistversion|.tar.bz2 
<https://public.pengutronix.de/software/ptxdist/ptxdist-|oselasTCNVendorptxdistversion|.tar.bz2>`_
+ * `OSELAS.Toolchain-|oselasTCNVendorVersion|.tar.bz2 
<https://public.pengutronix.de/oselas/toolchain/OSELAS.Toolchain-|oselasTCNVendorVersion|.tar.bz2>`_
 
 Main Parts of PTXdist
 ~
-- 
2.32.0

Re: [ptxdist] ptxdist initial impressions

[Ladislav Michl]

Hi there,

On Wed, May 24, 2023 at 12:34:21PM +0200, Alexander Dahl wrote:
> Hello Jookia,
> 
> as a long term user not affiliated with pengutronix I have some comments 
> which 
> might help.  See below.
> 
> Am Mittwoch, 17. Mai 2023, 18:11:31 CEST schrieb Jookia:
> > Hello ptxdist friends,
> > 
> > I spent some time over the past few days trying to use ptxdist and
> > documenting all the pain I hit in the process. This isn't a criticism
> > more just anecdotal data of my experience. Hopefully it's useful to
> > smooth down some rough edges.
> > 
> > I'm going to write this up in a psuedo-markdown format in sections,
> > sorry if that breaks anyone's workflow.
> > 
> > 
> > Documentation
> > -
> > 
> > First up: Documentation is quite good aside from the 'Getting a working
> > environment' section. I will be focusing on this today since I think it's
> > probably the most critical problem with ptxdist at the moment: I expect
> > that by the end of following this chapter I should have a bootable image
> > of some kind and commands for using it, such as with qemu.
> > 
> > The first issue is that I'm told to downloaded files, but I'm not linked
> > to them, quoting:
> > 
> > ptxdist-2023.05.0.tar.bz2
> > OSELAS.BSP-Pengutronix-Example.tar.bz2 (or a similar source)
> > ptxdist-2019.09.0.tar.bz2
> > OSELAS.Toolchain-2019.09.1.tar.bz2
> > 
> > The OSELAS website is linked as ptxdist.org that doesn't mention OSELAS
> > at all. There is a link to the toolchain but it's a different version.
> > I managed to find a BSP for 'Generic' but it's 9 years old.
> 
> +1
> 
> That has to be improved.  There's no easy accessible single platform example 
> BSP to get your feet wet, and DistroKit is nice for supporting some quite 
> common SBCs, but is already quite complicated.

would something like this be sufficient?

diff --git a/doc/environment.rst b/doc/environment.rst
index 18aecec4e..670f86a48 100644
--- a/doc/environment.rst
+++ b/doc/environment.rst
@@ -17,10 +17,13 @@ components which are available to the public).
 In order to build |ptxdistBSPName|, the following source archives have to be 
available
 on the development host:
 
- * ptxdist-|ptxdistVendorVersion|.tar.bz2
+ * `ptxdist-|ptxdistVendorVersion|.tar.bz2 
`_
  * |ptxdistBSPName|.tar.bz2 (or a similar source)
- * ptxdist-|oselasTCNVendorptxdistversion|.tar.bz2
- * OSELAS.Toolchain-|oselasTCNVendorVersion|.tar.bz2
+
+Additionally, those source archives are needed to build toolchain:
+
+ * `OSELAS.Toolchain-|oselasTCNVendorVersion|.tar.bz2 
`_
+ * `ptxdist-|oselasTCNVendorptxdistversion|.tar.bz2 
`_
 
 Main Parts of PTXdist
 ~

> What's also lacking: some template or documentation on how to start from 
> scratch without deriving your work from pre existing BSPs.  I tried that 
> lately and put the steps online:
> 
> https://gist.github.com/LeSpocky/31af75ab63bc6f35fd71d53f06b5a50e
> 
> I dropped that link in IRC, but I got no clear signal if that's something to 
> put into the official ptxdist documentation?

I'm hereby sending a clear signal to maintainers that I'd like to
see something like that in the documentation ;-)

> > The documentation says having a BSP is optional, but there's no
> > instructions on how to work without one. It's probably not even a good
> > idea to mention this, perhaps ptxdist should provide a skeleton project?
> > 
> > I get the distinct impression the right solution here is to use
> > DistroKit as the starter BSP. This isn't mentioned anywhere in the
> > documentation but is something I found out about on IRC.
> > 
> > I'm also not a fan of suggesting installing ptxdist. It seems strange to
> > lock yourself to a repository of packages that you will need to tweak
> > and fix. I would like to see more support for running it in tree.
> 
> Maybe this is some kind of misunderstanding.  You would never touch the 
> distributed/installed ptxdist, but "overwrite" things by placing package 
> rules 
> with the same name in your BSP.  For example if you need a version bump for 
> libfoo, you could copy /usr/local/lib/ptxdist-2100.01.0/rules/libfoo.make to 
> your BSP at rules/libfoo.make and adapt it to your needs.

or you can even put that into post/ rules in case just upgrading
package is sufficient (no configure, etc. changes)

Re: [ptxdist] [PATCH] pam: add installation of /sbin/mkhomedir_helper

[Ladislav Michl]

Hi Tamino,

On Fri, May 19, 2023 at 03:47:10PM +0200, Tamino Bauknecht wrote:
> This binary is required by the PAM library pam_mkhomedir.so which is
> installed to '/usr/lib/security'. If used in a PAM configuration, a
> home directory will be automatically created when a user logs in.
> Without this helper, the library will fail with an error.

could you provide more informations about your use case? As PTXdist
is not normally used to build "user friendly" distribution, there
are no users logging in...

ladis

> Signed-off-by: Tamino Bauknecht 
> ---
>  rules/pam.make | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/rules/pam.make b/rules/pam.make
> index 6e97e3320..df86c8da0 100644
> --- a/rules/pam.make
> +++ b/rules/pam.make
> @@ -84,6 +84,8 @@ $(STATEDIR)/pam.targetinstall:
>   @$(call install_alternative, pam, 0, 0, 0644, 
> /etc/security/pam_env.conf)
>   @$(call install_alternative, pam, 0, 0, 0644, /etc/security/time.conf)
>  
> + @$(call install_alternative, pam, 0, 0, 0755, /sbin/mkhomedir_helper)
> +
>   @$(call install_finish, pam)
>  
>   @$(call touch)
> -- 
> 2.40.1
> 

Re: [ptxdist] ptxdist initial impressions

[Ladislav Michl]

On Thu, May 18, 2023 at 10:23:30PM +1000, Jookia wrote:
> On Thu, May 18, 2023 at 11:28:07AM +0200, Ladislav Michl wrote:
> > Hi,
> 
> Hello,
> 
> > From all the previous lenghty explanation I didn't get what you did
> > wrong, so I cannot provide any advice. I normally just download and
> > run build inside BSP :)
> 
> It's a lot easier if you're used to the quirks so far.
> 
> > > I don't quite understand what's gained by having an installable ptxdist
> > > and a DistroKit BSP if you're just going to modify both when building
> > > your system. Maybe someone could explain this to me?
> > 
> > Well, you do not need to modify PTXdist itself, unless there is a bug
> > somewhere...
> 
> There's always bugs or out of date packages, so you have to modify ptxdist to
> fix those.

Yes and you do that by overriding rule locally (production use) or by fixing
upstream (devel), so others can benefit from those changes as well. Then you
just migrate your bsp to a newer version.

Re: [ptxdist] ptxdist initial impressions

[Ladislav Michl]

Hi,

On Thu, May 18, 2023 at 02:11:31AM +1000, Jookia wrote:
> Hello ptxdist friends,
[snip]
> Compared to buildroot's 'download and run make menuconfig' ptxdist has a
> pretty hard hill to climb, especially with having to download toolchains
> and BSPs and dealing with some of the package bugs.

>From all the previous lenghty explanation I didn't get what you did
wrong, so I cannot provide any advice. I normally just download and
run build inside BSP :)

> I don't quite understand what's gained by having an installable ptxdist
> and a DistroKit BSP if you're just going to modify both when building
> your system. Maybe someone could explain this to me?

Well, you do not need to modify PTXdist itself, unless there is a bug
somewhere...

But having to install it (or any such build tool in general) is
something Rob Landley whined about two decades ago and it is one of
those rare opinions I agree with him. However I'm unable to find
his post anymore, so I cannot properly quote him.

PTXdist already checks if it is build at each run, so actually builing
it is not that hard. I remember we discussed it few times on the IRC,
but there was never a conclusion. Parhaps we can discuss it now?

ladis

Re: [ptxdist] [PATCH] libmodbus: adapt help text to the reality

[Ladislav Michl]

On Fri, Mar 10, 2023 at 01:49:28PM +0100, Juergen Borleis wrote:
> Am Freitag, dem 10.03.2023 um 12:57 +0100 schrieb Michael Olbrich:
> > On Thu, Mar 09, 2023 at 02:29:25PM +0100, Juergen Borleis wrote:
> > > It is even more worse: 2.x.x API != 3.0.x API != 3.1.x API 
> > 
> > I'm tempted to say we just need 3.1.x in PTXdist upstream. Unless updating
> > an application from 3.0.x to 3.1.x is difficult, because the API changed
> > a lot?
> 
> I don't know. I read the documentation and it just pointed out this API
> incompatibility. Thus, no idea how difficult it would be to port a user from
> 3.0.x to 3.1.x.

There are no in-tree libmodbus users, so let's put it simple: any out of
tree package depending on 3.0.x will carry local libmodbus 3.0.x rule
or update to 3.1.x ;-)

ladis

Re: [ptxdist] [PATCH] libmodbus: adapt help text to the reality

[Ladislav Michl]

On Thu, Mar 09, 2023 at 10:38:15AM +0100, Alexander Dahl wrote:
> Hei hei,
> 
> Am Thu, Mar 09, 2023 at 10:29:06AM +0100 schrieb Michael Olbrich:
> > On Thu, Mar 09, 2023 at 10:08:50AM +0100, Juergen Borleis wrote:
> > > With change a08638d93d19624cf3c20d033ea8f61b96c43408
> > >   "libmodbus: version bump 2.0.4 -> 3.0.8"
> > > libmodbus changed from 2.x.x to 3.0.x version like libmodbus3 did.
> > > 
> > > And with change a76b31d5b637bc89ca26e7fa81503cbc7632b666
> > >   "libmodbus3: version bump 3.0.6 -> 3.1.4"
> > > libmodbus3 switched to the recent to 3.1.x version.
> > 
> > Hmmm, it feels like there were supposed to be for two packages, one for
> > version 2.x and one for 3.x, at least it started that way.
> > I don't really know anything about libmodbus. Are the two versions
> > incompatible?
> 
> Yes, 3.0.x and 3.1.x have incompatible APIs and probably ABIs.
> 3.0.x has .so version 5 and 3.1.x has .so version 6, at least to my
> notes and the code trying to distinguish this.
> 
> Greets
> Alex
> 
> > 
> > Ladislav, you touched it last, you did the "2.0.4 -> 3.0.8". Do you have
> > any insight here?

As Alex pointed out above, 2.0.x has incompatible API and was last
touched 12 years ago. I pretty much doubt anything sane currently depends
on it and the truth is I overlooked libmodbus3 while doing update.

Now I would vote to simply remove libmodbus3 and continue updating
libmodbus.

ladis

Re: [ptxdist] [PATCH] openssl: Version bump. 1.1.1t -> 1.1.1s.

[Ladislav Michl]

Hi Christian!

On Wed, Feb 08, 2023 at 09:01:07AM +0100, Christian Melki wrote:
> Plug 4 CVEs.
> https://www.openssl.org/news/cl111.txt
> X.400 address type confusion in X.509 GeneralName (CVE-2023-0286)
> Use-after-free following BIO_new_NDEF (CVE-2023-0215)
> Double free after calling PEM_read_bio_ex (CVE-2022-4450)
> Timing Oracle in RSA Decryption (CVE-2022-4304)

seems bump text is reverted, should be 1.1.1s -> 1.1.1t...

l.

Re: [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0

[Ladislav Michl]

On Wed, Jan 11, 2023 at 12:20:34PM +0100, Michael Olbrich wrote:
> On Wed, Jan 11, 2023 at 12:15:38PM +0100, Ladislav Michl wrote:
> > On Wed, Jan 11, 2023 at 12:02:54PM +0100, Christian Melki wrote:
> > > On 1/11/23 11:19, Philipp Zabel wrote:
> > > > https://mesonbuild.com/Release-notes-for-1-0-0.html
> > > > 
> > > > This bumps the host Python minimum version requirement from 3.6 to 3.7.
> > > 
> > > Highly subjective disclaimer here,
> > > 
> > > This boils down to when ptxdist starts forcing users to python 3.7+ for
> > > building. Calling python (as a build tool) outdated when the last 3.6.x
> > > release was in late 2021, is a stretch.
> > > I'm pro upgrade, but also really dislike breaking stuff like this.
> > 
> > python3 package, therefore host-python as well is already at 3.10.4,
> > so it does not make any difference.
> 
> No, currently host-python is only for building target python packages. Not
> for build tools that use python. We use the system python for that.

Ah, thank you clarifying that.

> I've thought about changing that optionally. In that case,
> host-system-python3 would select host-python3. But so far, I've not seen a
> real need for it, because all reasonable Distros have a python that is
> sufficiently new.

In that unprobable case you'll end doing so, I would appreciate generic
mechanism of replacing host-system-* packages with host-* ones. Then
configure.ac could look only for bare minimum, while the rest could
be built later. scripts/kconfig included, so ptxdist would run out
of the box.

l

Re: [ptxdist] [PATCH 1/2] host-meson: version bump 0.61.4 -> 1.0.0

[Ladislav Michl]

On Wed, Jan 11, 2023 at 12:02:54PM +0100, Christian Melki wrote:
> On 1/11/23 11:19, Philipp Zabel wrote:
> > https://mesonbuild.com/Release-notes-for-1-0-0.html
> > 
> > This bumps the host Python minimum version requirement from 3.6 to 3.7.
> 
> Highly subjective disclaimer here,
> 
> This boils down to when ptxdist starts forcing users to python 3.7+ for
> building. Calling python (as a build tool) outdated when the last 3.6.x
> release was in late 2021, is a stretch.
> I'm pro upgrade, but also really dislike breaking stuff like this.

python3 package, therefore host-python as well is already at 3.10.4,
so it does not make any difference.

l.

Re: [ptxdist] [PATCH v2] busybox: Version bump. 1.35.0 -> 1.36.0

[Ladislav Michl]

On Fri, Jan 06, 2023 at 12:19:56PM +0100, Michael Olbrich wrote:
> On Fri, Jan 06, 2023 at 12:17:16PM +0100, Ladislav Michl wrote:
> > one more thing, commit f51d04cbcf2c ("treewide: Consistently use ':'
> > instead to separate user and group for chown") says:
> > 
> > | Since coreutils 9.1 chown warns when a '.' is used as separator. Fix this
> > | consistently also for documentation and scripts that are expected to use
> > | busybox's chown which (up to now) has no problem with '.'.
[snip]
> Hi, this is fine. This is an imported file and the commit mentioned above
> should not have touched this. It's just a comment anyways so it doesn't
> really matter.

Or send it also to busybox, so that change will be in next import anyway :)

ladis

Re: [ptxdist] [PATCH v2] busybox: Version bump. 1.35.0 -> 1.36.0

[Ladislav Michl]

Hi Christian,

one more thing, commit f51d04cbcf2c ("treewide: Consistently use ':'
instead to separate user and group for chown") says:

| Since coreutils 9.1 chown warns when a '.' is used as separator. Fix this
| consistently also for documentation and scripts that are expected to use
| busybox's chown which (up to now) has no problem with '.'.

On Wed, Jan 04, 2023 at 10:14:33AM +0100, Christian Melki wrote:
> After a year of low activity and questionmarks,
> we finally have a new release of busybox.
> Release changelog @ https://busybox.net/
[snip]
> diff --git a/config/busybox/Config.in b/config/busybox/Config.in
> index 329e2f8e8..199cc6ab2 100644
> --- a/config/busybox/Config.in
> +++ b/config/busybox/Config.in
> @@ -267,10 +267,10 @@ config BUSYBOX_FEATURE_SUID_CONFIG
>  
>   The file has to be owned by user root, group root and has to be
>   writeable only by root:
> - (chown 0:0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
> + (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
>   The busybox executable has to be owned by user root, group
>   root and has to be setuid root for this to work:
> - (chown 0:0 /bin/busybox; chmod 4755 /bin/busybox)
> + (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
>  
>   Robert 'sandman' Griebl has more information here:
>   http://www.softforge.de/bb/suid.html >.
[snip]
> diff --git a/config/busybox/networking/Config.in 
> b/config/busybox/networking/Config.in
> index 27e0f44ba..3a3ad56d9 100644
> --- a/config/busybox/networking/Config.in
> +++ b/config/busybox/networking/Config.in
> @@ -959,7 +959,7 @@ config BUSYBOX_TELNETD
>   FEATURE_SUID enabled. And finally, you should make
>   certain that busybox has been installed setuid root:
>  
> - chown root:root /bin/busybox
> + chown root.root /bin/busybox
>   chmod 4755 /bin/busybox
>  
>   with all that done, telnetd _should_ work

Above two changes are reverting that, so it should be probably dropped.

ladis

Re: [ptxdist] [PATCH v2] busybox: Version bump. 1.35.0 -> 1.36.0

[Ladislav Michl]

On Wed, Jan 04, 2023 at 10:23:41AM +0100, Ladislav Michl wrote:
> On Wed, Jan 04, 2023 at 10:14:33AM +0100, Christian Melki wrote:
> > +config BUSYBOX_UDHCPC6_DEFAULT_SCRIPT
> > +   string "Absolute path to config script for IPv6"
> > +   default "/usr/share/udhcpc/default6.script"
> > +   depends on BUSYBOX_UDHCPC6
> > +
> 
> This probably needs
> +ifdef PTXCONF_BUSYBOX_UDHCPC6
> + @$(call install_alternative, busybox, 0, 0, 0754, /etc/udhcpc6.script)
> ...
> in rules/busybox.make
> 
> Thinking more about it, we should probably take BUSYBOX_UDHCPC_DEFAULT_SCRIPT
> and BUSYBOX_UDHCPC6_DEFAULT_SCRIPT into account when installing links, but as
> nobody complained so far, let it be optional separate patch :)

After some discussion on IRC, let me provide some summary.
As both IPv4 and IPv6 script version can point to the same file (and buildroot
actually provides such common file), there is no need to complicate things
right now. Just wait for actual need of separate scripts. With that in mind:

Tested-by: Ladislav Michl 

[ptxdist] [RFC] Do not select INITMETHOD

[Ladislav Michl]

Do not force INITMETHOD to allow BSPs to use alternative inits
on their own (minit for example)

Now that initmethod.in part of patch is questionable, but it breaks
various ways without it, for example:
WARNING: unmet direct dependencies detected for RC_ONCE
  Depends on [n]: INITMETHOD [=n]
  Selected by [m]:
  - DROPBEAR [=m] && RUNTIME [=y]

Any other ideas?

Thak you,
ladis
---
 rules/dropbear.in   | 1 -
 rules/initmethod.in | 4 ++--
 rules/lldpd.in  | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/rules/dropbear.in b/rules/dropbear.in
index 95beb09bf..7b5736696 100644
--- a/rules/dropbear.in
+++ b/rules/dropbear.in
@@ -6,7 +6,6 @@ menuconfig DROPBEAR
select LIBC_UTIL
select LIBC_CRYPT
select GCCLIBS_GCC_S
-   select INITMETHOD
select RC_ONCE  if RUNTIME
select BUSYBOX_START_STOP_DAEMONif 
DROPBEAR_STARTSCRIPT
select BUSYBOX_FEATURE_START_STOP_DAEMON_FANCY  if 
DROPBEAR_STARTSCRIPT
diff --git a/rules/initmethod.in b/rules/initmethod.in
index 489fd365d..4066a05ba 100644
--- a/rules/initmethod.in
+++ b/rules/initmethod.in
@@ -33,6 +33,6 @@ choice
 
 endchoice
 
-source "generated/initmethod.in"
-
 endif
+
+source "generated/initmethod.in"
diff --git a/rules/lldpd.in b/rules/lldpd.in
index 8b253ba83..d2afccbd0 100644
--- a/rules/lldpd.in
+++ b/rules/lldpd.in
@@ -3,7 +3,6 @@
 menuconfig LLDPD
tristate
prompt "lldpd "
-   select INITMETHOD
select LIBBSD
select LIBCAP
select LIBEVENT
-- 
2.32.0

Re: [ptxdist] [PATCH v2] busybox: Version bump. 1.35.0 -> 1.36.0

[Ladislav Michl]

Hi Christian,

On Wed, Jan 04, 2023 at 10:14:33AM +0100, Christian Melki wrote:
> After a year of low activity and questionmarks,
> we finally have a new release of busybox.
> Release changelog @ https://busybox.net/
> 
> Not that many new features, mostly fixes.
> One notable addition is seedrng.
> But it marks a new release that includes security fixes.
> 
> Plugs CVEs: CVE-2022-28391, CVE-2022-30065
> 
> * Forward the ptxdist specific patches.
> * Remove one security patch to awk that has been fixed.
> * Update busybox imported kconfig tree.
> Not that many changes, since it has been a slow year.
> New utilites: tsort, seedrng and tree.
> 
> Signed-off-by: Christian Melki 
> ---
>  config/busybox/Config.in  |  4 +-
>  config/busybox/coreutils/Config.in|  7 ++-
>  config/busybox/libbb/Config.in| 62 ---
>  config/busybox/miscutils/Config.in| 12 
>  config/busybox/networking/Config.in   |  2 +-
>  config/busybox/networking/udhcp/Config.in |  7 ++-
>  config/busybox/shell/Config.in|  5 ++
>  ...wk-fix-use-after-free-CVE-2022-30065.patch | 29 -
>  .../0200-reactivate-check-for-tty.patch   |  0
>  ...-only-pass-real-libs-to-SELINUX_LIBS.patch |  2 +-
>  ...honour-SKIP_STRIP-and-don-t-strip-if.patch |  0
>  .../{busybox-1.35.0 => busybox-1.36.0}/series |  3 +-
>  rules/busybox.make|  4 +-
>  13 files changed, 91 insertions(+), 46 deletions(-)
>  delete mode 100644 
> patches/busybox-1.35.0/0203-awk-fix-use-after-free-CVE-2022-30065.patch
>  rename patches/{busybox-1.35.0 => 
> busybox-1.36.0}/0200-reactivate-check-for-tty.patch (100%)
>  rename patches/{busybox-1.35.0 => 
> busybox-1.36.0}/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch 
> (94%)
>  rename patches/{busybox-1.35.0 => 
> busybox-1.36.0}/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
>  (100%)
>  rename patches/{busybox-1.35.0 => busybox-1.36.0}/series (74%)
> 
> diff --git a/config/busybox/Config.in b/config/busybox/Config.in
> index 329e2f8e8..199cc6ab2 100644
> --- a/config/busybox/Config.in
> +++ b/config/busybox/Config.in
> @@ -267,10 +267,10 @@ config BUSYBOX_FEATURE_SUID_CONFIG
>  
>   The file has to be owned by user root, group root and has to be
>   writeable only by root:
> - (chown 0:0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
> + (chown 0.0 /etc/busybox.conf; chmod 600 /etc/busybox.conf)
>   The busybox executable has to be owned by user root, group
>   root and has to be setuid root for this to work:
> - (chown 0:0 /bin/busybox; chmod 4755 /bin/busybox)
> + (chown 0.0 /bin/busybox; chmod 4755 /bin/busybox)
>  
>   Robert 'sandman' Griebl has more information here:
>   http://www.softforge.de/bb/suid.html >.
> diff --git a/config/busybox/coreutils/Config.in 
> b/config/busybox/coreutils/Config.in
> index 8c9e66e17..1a95a6785 100644
> --- a/config/busybox/coreutils/Config.in
> +++ b/config/busybox/coreutils/Config.in
> @@ -653,7 +653,7 @@ config BUSYBOX_SORT
>   sort is used to sort lines of text in specified files.
>  
>  config BUSYBOX_FEATURE_SORT_BIG
> - bool "Full SuSv3 compliant sort (support -ktcbdfiogM)"
> + bool "Full SuSv3 compliant sort (support -ktcbdfioghM)"
>   default y
>   depends on BUSYBOX_SORT
>   help
> @@ -851,6 +851,11 @@ config BUSYBOX_TRUNCATE
>   help
>   truncate truncates files to a given size. If a file does
>   not exist, it is created unless told otherwise.
> +config BUSYBOX_TSORT
> + bool "tsort (0.7 kb)"
> + default y
> + help
> + tsort performs a topological sort.
>  config BUSYBOX_TTY
>   bool "tty (3.6 kb)"
>   default y
> diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
> index 8e4fe855e..66c135ec6 100644
> --- a/config/busybox/libbb/Config.in
> +++ b/config/busybox/libbb/Config.in
> @@ -98,21 +98,47 @@ config BUSYBOX_MD5_SMALL
>   default 1  # all "fast or small" options default to small
>   range 0 3
>   help
> - Trade binary size versus speed for the md5sum algorithm.
> + Trade binary size versus speed for the md5 algorithm.
>   Approximate values running uClibc and hashing
>   linux-2.4.4.tar.bz2 were:
> - value   user times (sec)  text size (386)
> - 0 (fastest) 1.16144
> - 1   1.45392
> - 2   3.05088
> - 3 (smallest)5.14912
> + value   user times (sec)  text size (386)
> + 0 (fastest) 1.1   6144
> + 1   1.4   5392
> + 2   3.0   5088
> + 3 (smallest)5.1   4912
> +
> +config BUSYBOX_SHA1_SMALL
> + int "SHA1: Trade bytes for speed (0:fast, 3:slow)"
> + default 3  # all "fast or 

Re: [ptxdist] [PATCH] busybox: Version bump. 1.35.0 -> 1.36.0

[Ladislav Michl]

Hi Christian,

On Tue, Jan 03, 2023 at 11:29:22PM +0100, Christian Melki wrote:
> After a year of low activity and questionmarks,
> we finally have a new release of busybox.
> Release changelog @ https://busybox.net/
> 
> Not that many new features, mostly fixes.
> One notable addition is seedrng.
> But it marks a new release that includes security fixes.
> 
> Plugs CVEs: CVE-2022-28391, CVE-2022-30065
> 
> * Forward the ptxdist specific patches.
> * Remove one security patch to awk that has been fixed.
> * Update busybox imported kconfig tree.
> Not that many changes, since it has been a slow year.
> New utilites: tsort, seedrng and tree.
> 
> Signed-off-by: Christian Melki 
> ---
>  config/busybox/Config.in  |  4 +-
>  config/busybox/coreutils/Config.in|  7 ++-
>  config/busybox/libbb/Config.in| 62 ---
>  config/busybox/miscutils/Config.in| 12 
>  config/busybox/networking/Config.in   |  2 +-
>  config/busybox/networking/udhcp/Config.in |  7 ++-
>  config/busybox/shell/Config.in|  5 ++
>  ...wk-fix-use-after-free-CVE-2022-30065.patch | 29 -
>  .../0200-reactivate-check-for-tty.patch   |  0
>  ...-only-pass-real-libs-to-SELINUX_LIBS.patch |  2 +-
>  ...honour-SKIP_STRIP-and-don-t-strip-if.patch |  0
>  .../{busybox-1.35.0 => busybox-1.36.0}/series |  3 +-
>  12 files changed, 89 insertions(+), 44 deletions(-)
>  delete mode 100644 
> patches/busybox-1.35.0/0203-awk-fix-use-after-free-CVE-2022-30065.patch
>  rename patches/{busybox-1.35.0 => 
> busybox-1.36.0}/0200-reactivate-check-for-tty.patch (100%)
>  rename patches/{busybox-1.35.0 => 
> busybox-1.36.0}/0201-build-system-only-pass-real-libs-to-SELINUX_LIBS.patch 
> (94%)
>  rename patches/{busybox-1.35.0 => 
> busybox-1.36.0}/0202-scripts-trylink-honour-SKIP_STRIP-and-don-t-strip-if.patch
>  (100%)
>  rename patches/{busybox-1.35.0 => busybox-1.36.0}/series (74%)

It seems rules/busybox.make is ommited from the patch...

ladis

[ptxdist] [PATCH v2] dropbear: version bump 2022.82 -> 2022.83

[Ladislav Michl]

From: Ladislav Michl 

Remove local patch which is already merged upstream.
DROPBEAR_SK_KEYS config option now replaces separate
DROPBEAR_SK_ECDSA and DROPBEAR_SK_ED25519 options, so
generate localoptions.h accordingly.

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 -v2: use DROPBEAR_SK_KEYS

 ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 ---
 patches/dropbear-2022.82/series   |  4 
 rules/dropbear.make   |  7 +++
 3 files changed, 3 insertions(+), 29 deletions(-)
 delete mode 100644 
patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
 delete mode 100644 patches/dropbear-2022.82/series

diff --git 
a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
 
b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
deleted file mode 100644
index 8c46daf9c..0
--- 
a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Matt Johnston 
-Date: Sat, 23 Apr 2022 22:33:31 +0800
-Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY
-

- svr-x11fwd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/svr-x11fwd.c b/svr-x11fwd.c
-index 353cb12e8dd1..5d9e6a96f577 100644
 a/svr-x11fwd.c
-+++ b/svr-x11fwd.c
-@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) {
- }
- 
- static int x11_inithandler(struct Channel *channel) {
--  channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE;
-+  channel->prio = DROPBEAR_PRIO_LOWDELAY;
-   return 0;
- }
- 
diff --git a/patches/dropbear-2022.82/series b/patches/dropbear-2022.82/series
deleted file mode 100644
index 87840318b..0
--- a/patches/dropbear-2022.82/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
-# dacc85cb839b0a9eec87bf2d3fc2463f  - git-ptx-patches magic
diff --git a/rules/dropbear.make b/rules/dropbear.make
index e86b8bf43..dfdbe572d 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear
 #
 # Paths and names
 #
-DROPBEAR_VERSION   := 2022.82
-DROPBEAR_MD5   := 7a4a5f2c6d23ff2e6627c97d7c1aeceb
+DROPBEAR_VERSION   := 2022.83
+DROPBEAR_MD5   := a75a34bcc03cacf71a2db9da3b7c94a5
 DROPBEAR   := dropbear-$(DROPBEAR_VERSION)
 DROPBEAR_SUFFIX:= tar.bz2
 DROPBEAR_URL   := 
https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
@@ -215,8 +215,7 @@ else
 endif
 
@echo "ptxdist: disabling u2f security key support"
-   @echo "#define DROPBEAR_SK_ECDSA 0" >> $(DROPBEAR_LOCALOPTIONS)
-   @echo "#define DROPBEAR_SK_ED25519 0" >> $(DROPBEAR_LOCALOPTIONS)
+   @echo "#define DROPBEAR_SK_KEYS 0" >> $(DROPBEAR_LOCALOPTIONS)
 
 # key exchange algorithm
 ifdef PTXCONF_DROPBEAR_DH_GROUP14_SHA256
-- 
2.32.0

Re: [ptxdist] [PATCH] dropbear: version bump 2022.82 -> 2022.83

[Ladislav Michl]

Hi Alexander,

On Mon, Jan 02, 2023 at 09:34:15AM +0100, Alexander Dahl wrote:
> Hello Ladislav,
> 
> Am Mittwoch, 28. Dezember 2022, 12:53:13 CET schrieb Ladislav Michl:
> > From: Ladislav Michl 
> > 
> > Remove local patch which is already merged upstream.
> > 
> > Signed-off-by: Ladislav Michl 
> > ---
> >  ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 ---
> >  patches/dropbear-2022.82/series   |  4 
> >  rules/dropbear.make   |  4 ++--
> >  3 files changed, 2 insertions(+), 27 deletions(-)
> >  delete mode 100644
> > patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDE
> > LAY.patch delete mode 100644 patches/dropbear-2022.82/series
> > 
> > diff --git
> > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW
> > DELAY.patch
> > b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW
> > DELAY.patch deleted file mode 100644
> > index 8c46daf9c..0
> > ---
> > a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOW
> > DELAY.patch +++ /dev/null
> > @@ -1,21 +0,0 @@
> > -From: Matt Johnston 
> > -Date: Sat, 23 Apr 2022 22:33:31 +0800
> > -Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY
> > -
> > 
> > - svr-x11fwd.c | 2 +-
> > - 1 file changed, 1 insertion(+), 1 deletion(-)
> > -
> > -diff --git a/svr-x11fwd.c b/svr-x11fwd.c
> > -index 353cb12e8dd1..5d9e6a96f577 100644
> >  a/svr-x11fwd.c
> > -+++ b/svr-x11fwd.c
> > -@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) {
> > - }
> > -
> > - static int x11_inithandler(struct Channel *channel) {
> > --  channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE;
> > -+  channel->prio = DROPBEAR_PRIO_LOWDELAY;
> > -   return 0;
> > - }
> > -
> > diff --git a/patches/dropbear-2022.82/series
> > b/patches/dropbear-2022.82/series deleted file mode 100644
> > index 87840318b..0
> > --- a/patches/dropbear-2022.82/series
> > +++ /dev/null
> > @@ -1,4 +0,0 @@
> > -# generated by git-ptx-patches
> > -#tag:base --start-number 1
> > -0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
> > -# dacc85cb839b0a9eec87bf2d3fc2463f  - git-ptx-patches magic
> > diff --git a/rules/dropbear.make b/rules/dropbear.make
> > index e86b8bf43..fcfe8bce4 100644
> > --- a/rules/dropbear.make
> > +++ b/rules/dropbear.make
> > @@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear
> >  #
> >  # Paths and names
> >  #
> > -DROPBEAR_VERSION   := 2022.82
> > -DROPBEAR_MD5   := 7a4a5f2c6d23ff2e6627c97d7c1aeceb
> > +DROPBEAR_VERSION   := 2022.83
> > +DROPBEAR_MD5   := a75a34bcc03cacf71a2db9da3b7c94a5
> >  DROPBEAR   := dropbear-$(DROPBEAR_VERSION)
> >  DROPBEAR_SUFFIX:= tar.bz2
> >  DROPBEAR_URL   :=
> > https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
> 
> The announcement contains this:
> 
> „- >> DROPBEAR_SK_KEYS config option now replaces separate DROPBEAR_SK_ECDSA
>   and DROPBEAR_SK_ED25519 options.“
> 
> These options are explicitly disabled in rules/dropbear.make and I think that 
> line(s) should be changed to the new config option.

I've left that unchanged as sysoptions.h contains:
#ifndef DROPBEAR_SK_ECDSA
#define DROPBEAR_SK_ECDSA DROPBEAR_SK_KEYS
#endif
#ifndef DROPBEAR_SK_ED25519
#define DROPBEAR_SK_ED25519 DROPBEAR_SK_KEYS
#endif
anyway, I will send v2 as it seems to be right to do the change now. Thanks
for pointing that out.

ladis

[ptxdist] [PATCH] dropbear: version bump 2022.82 -> 2022.83

[Ladislav Michl]

From: Ladislav Michl 

Remove local patch which is already merged upstream.

Signed-off-by: Ladislav Michl 
---
 ...d-failure-use-DROPBEAR_PRIO_LOWDELAY.patch | 21 ---
 patches/dropbear-2022.82/series   |  4 
 rules/dropbear.make   |  4 ++--
 3 files changed, 2 insertions(+), 27 deletions(-)
 delete mode 100644 
patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
 delete mode 100644 patches/dropbear-2022.82/series

diff --git 
a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
 
b/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
deleted file mode 100644
index 8c46daf9c..0
--- 
a/patches/dropbear-2022.82/0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Matt Johnston 
-Date: Sat, 23 Apr 2022 22:33:31 +0800
-Subject: [PATCH] Fix X11 build failure, use DROPBEAR_PRIO_LOWDELAY
-

- svr-x11fwd.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/svr-x11fwd.c b/svr-x11fwd.c
-index 353cb12e8dd1..5d9e6a96f577 100644
 a/svr-x11fwd.c
-+++ b/svr-x11fwd.c
-@@ -206,7 +206,7 @@ void x11cleanup(struct ChanSess *chansess) {
- }
- 
- static int x11_inithandler(struct Channel *channel) {
--  channel->prio = DROPBEAR_CHANNEL_PRIO_INTERACTIVE;
-+  channel->prio = DROPBEAR_PRIO_LOWDELAY;
-   return 0;
- }
- 
diff --git a/patches/dropbear-2022.82/series b/patches/dropbear-2022.82/series
deleted file mode 100644
index 87840318b..0
--- a/patches/dropbear-2022.82/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-Fix-X11-build-failure-use-DROPBEAR_PRIO_LOWDELAY.patch
-# dacc85cb839b0a9eec87bf2d3fc2463f  - git-ptx-patches magic
diff --git a/rules/dropbear.make b/rules/dropbear.make
index e86b8bf43..fcfe8bce4 100644
--- a/rules/dropbear.make
+++ b/rules/dropbear.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_DROPBEAR) += dropbear
 #
 # Paths and names
 #
-DROPBEAR_VERSION   := 2022.82
-DROPBEAR_MD5   := 7a4a5f2c6d23ff2e6627c97d7c1aeceb
+DROPBEAR_VERSION   := 2022.83
+DROPBEAR_MD5   := a75a34bcc03cacf71a2db9da3b7c94a5
 DROPBEAR   := dropbear-$(DROPBEAR_VERSION)
 DROPBEAR_SUFFIX:= tar.bz2
 DROPBEAR_URL   := 
https://matt.ucc.asn.au/dropbear/releases/$(DROPBEAR).$(DROPBEAR_SUFFIX)
-- 
2.32.0

Re: [ptxdist] e2fsprogs: possibly broken when using OSELAS.Toolchain 2022.10.0

[Ladislav Michl]

On Sun, Nov 13, 2022 at 10:07:48PM +0100, Christian Melki wrote:
> Hi Felix,
> 
> On 11/13/22 18:32, Felix Mellmann wrote:
> > Hi everyone,
> > 
> > I've just run into a linker problem when building e2fsprogs 1.46.5 using 
> > OSELAS.Toolchain 2022.10.0 (arm-v7a-linux-gnueabihf):
> > 
> > 
> > -
> > target: e2fsprogs.compile
> > -
> > 
> > make: Entering directory 
> > '/PTXdist/BSP/platform-imx6/build-target/e2fsprogs-1.46.5'
> > cd ./util ; make subst
> > make[1]: Entering directory 
> > '/PTXdist/BSP/platform-imx6/build-target/e2fsprogs-1.46.5/util'
> >      CREATE dirpaths.h
> >      CC subst.c
> >      LD subst
> > lto1: fatal error: bytecode stream in file 'subst.o' generated with LTO 
> > version 11.2 instead of the expected 11.3
> > compilation terminated.
> > lto-wrapper: fatal error: /usr/bin/gcc returned 1 exit status
> > compilation terminated.
> > /usr/bin/ld: error: lto-wrapper failed
> > collect2: error: ld returned 1 exit status
> > make[1]: *** [Makefile:369: subst] Error 1
> > make[1]: Leaving directory 
> > '/PTXdist/BSP/platform-imx6/build-target/e2fsprogs-1.46.5/util'
> > make: *** [Makefile:194: util/subst] Error 2
> > make: Leaving directory 
> > '/PTXdist/BSP/platform-imx6/build-target/e2fsprogs-1.46.5'
> > make: *** 
> > [/usr/local/lib/ptxdist-2022.11.0/rules/post/ptxd_make_world_compile.make:20:
> >  
> > /PTXdist/BSP/platform-imx6/state/e2fsprogs.compile] Error 2
> > 
> > The error vanishes if ./configure is called with "--disable-lto" instead 
> > of "--enable-lto".
> > 
> 
> First things first.
> So it looks like e2fsprogs is mixing compilers and archs here?
> That would be my guess to what's behind the 11.2 / 11.3 error.
> 
> But probably more importantly,
> enable-lto looks like a misconfiguration to me.
> Maybe if it was controlled by a global.
> And even then one would probably have to weed out a lot of compile
> failures given the rocky history of LTO over a lot of stuff.
> I suggest you disable it and submit a patch.

I second that. Also see commit 'debian: stop using LTO (link-time optimization)'
https://github.com/tytso/e2fsprogs/commit/cfb073a4d4f37768b0be81660054044162dd8766

Regards,
l.

> Regards,
> Christian
> 
> > As I'm no expert at this level, I hope anyone could put some hints about 
> > the issue.
> > 
> > 
> > Best regards,
> > 
> > Felix
> > 
> > 
> > 
> 

[ptxdist] [PATCH] modemmanager: version bump 1.20.0 -> 1.20.2

[Ladislav Michl]

From: Ladislav Michl 

First bugfix release of 1.20 series. Among other things building
without tests is now fixed.

Signed-off-by: Ladislav Michl 
---
 rules/modemmanager.make | 8 +++-
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index 58427ff8a..94b327c43 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
 #
 # Paths and names
 #
-MODEMMANAGER_VERSION   := 1.20.0
-MODEMMANAGER_MD5   := 900b2e707a2095a4b476b68d1efb1c34
+MODEMMANAGER_VERSION   := 1.20.2
+MODEMMANAGER_MD5   := 441b08c34136f3a28d79c7f110b6ee32
 MODEMMANAGER   := ModemManager-$(MODEMMANAGER_VERSION)
 MODEMMANAGER_SUFFIX:= tar.bz2
 MODEMMANAGER_URL   := 
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEMMANAGER_VERSION)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
@@ -38,7 +38,7 @@ MODEMMANAGER_CONF_OPT := \
$(CROSS_MESON_USR) \
-Dudev=true \
-Dudevdir=/usr/lib/udev \
-   -Dtests=true \
+   -Dtests=false \
-Ddbus_policy_dir=/usr/share/dbus-1/system.d \
-Dsystemdsystemunitdir=/usr/lib/systemd/system \
-Dsystemd_suspend_resume=$(call ptx/truefalse, 
PTXCONF_INITMETHOD_SYSTEMD) \
@@ -55,8 +55,6 @@ MODEMMANAGER_CONF_OPT := \
-Dman=false \
-Dbash_completion=false
 
-# sadly, ModemManager does not build with -Dtests=false
-
 # 
 # Target-Install
 # 
-- 
2.32.0

Re: [ptxdist] [PATCH] gdb: add option for 11.1 and later

[Ladislav Michl]

Hi Philipp!

On Thu, Nov 03, 2022 at 05:55:42PM +0100, Philipp Zabel wrote:
> GDB requires GMP since version 11.1. Add an option to allow selecting
> LIBGMP for newer toolchains. This is somewhat analogous to commit
> bc5cac5c54d2 ("glibc: add option for 2.34 and later").

before adding one more analogous commit, what about turning both of
them to something like
def_bool $(success,test "you_test_goes_there")


> Signed-off-by: Philipp Zabel 
> ---
>  rules/gdb.in | 8 
>  1 file changed, 8 insertions(+)
> 
> diff --git a/rules/gdb.in b/rules/gdb.in
> index 1dd2213abc8a..3014271de9c1 100644
> --- a/rules/gdb.in
> +++ b/rules/gdb.in
> @@ -7,6 +7,7 @@ menuconfig GDB
>   select LIBC_DL
>   select GCCLIBS_GCC_S
>   select NCURSES
> + select LIBGMP   if GDB_11_1
>   help
> The GNU Debugger
>  
> @@ -25,5 +26,12 @@ config GDB_SHARED
> If not set, the build option
> LDFLAGS=-static will be activated.
>  
> +config GDB_11_1
> + bool
> + prompt "gdb-11.1 or later"
> + help
> +   Since gdb-11.1, GMP is a required dependency. Enable this option
> +   if your toolchain gdb version is 11.1 or later.
> +
>  endif
>  
> -- 
> 2.30.2
> 

[ptxdist] [PATCH 3/3] modemmanager: version bump 1.18.12 -> 1.20.0

[Ladislav Michl]

From: Ladislav Michl 

There is no longer an upstream-provided source tarball.
This is the last stable release with autoconf support
which is considered deprecated and will be removed in
future releases in favour of meson, so do the change now.

dbus-1 is now mandatory dependency.

This release comes with lots of new features, see announcement:
https://lists.freedesktop.org/archives/modemmanager-devel/2022-October/009481.html

Signed-off-by: Ladislav Michl 
---
 rules/modemmanager.in   |  3 ++-
 rules/modemmanager.make | 60 +++--
 2 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/rules/modemmanager.in b/rules/modemmanager.in
index 5b8d03016..bac104699 100644
--- a/rules/modemmanager.in
+++ b/rules/modemmanager.in
@@ -2,7 +2,8 @@
 
 menuconfig MODEMMANAGER
tristate
-   select DBUS if MODEMMANAGER_ALLOW_DBUS_AT_CMDS && RUNTIME
+   select HOST_MESON
+   select DBUS
select GLIB
select UDEV
select LIBGUDEV
diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index f942b5a65..58427ff8a 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
 #
 # Paths and names
 #
-MODEMMANAGER_VERSION   := 1.18.12
-MODEMMANAGER_MD5   := 9f014dfc59f1bd8bc230bb2c2974d104
+MODEMMANAGER_VERSION   := 1.20.0
+MODEMMANAGER_MD5   := 900b2e707a2095a4b476b68d1efb1c34
 MODEMMANAGER   := ModemManager-$(MODEMMANAGER_VERSION)
-MODEMMANAGER_SUFFIX:= tar.xz
-MODEMMANAGER_URL   := 
https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
+MODEMMANAGER_SUFFIX:= tar.bz2
+MODEMMANAGER_URL   := 
https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/archive/$(MODEMMANAGER_VERSION)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
 MODEMMANAGER_SOURCE:= $(SRCDIR)/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
 MODEMMANAGER_DIR   := $(BUILDDIR)/$(MODEMMANAGER)
 MODEMMANAGER_LICENSE   := GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -30,38 +30,32 @@ MODEMMANAGER_LICENSE_FILES := \
 # Prepare
 # 
 
-#MODEMMANAGER_CONF_ENV := $(CROSS_ENV)
-
 #
-# autoconf
+# meson
 #
-MODEMMANAGER_CONF_TOOL := autoconf
+MODEMMANAGER_CONF_TOOL := meson
 MODEMMANAGER_CONF_OPT  := \
-   $(CROSS_AUTOCONF_USR) \
-   --disable-compile-warnings \
-   --disable-Werror \
-   --disable-gtk-doc \
-   --disable-gtk-doc-html \
-   --disable-gtk-doc-pdf \
-   --disable-nls \
-   --disable-rpath \
-   --disable-code-coverage \
-   --disable-introspection \
-   --disable-vala \
-   --enable-all-plugins \
-   --with-gnu-ld \
-   --without-gcov \
-   --without-qrtr \
-   --with-dbus-sys-dir=/usr/share/dbus-1/system.d \
-   --with-udev-base-dir=/usr/lib/udev \
-   --with-systemdsystemunitdir=/usr/lib/systemd/system \
-   --with-udev \
-   --$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-suspend-resume \
-   --$(call ptx/wwo, PTXCONF_INITMETHOD_SYSTEMD)-systemd-journal \
-   --without-polkit \
-   --$(call ptx/wwo, 
PTXCONF_MODEMMANAGER_ALLOW_DBUS_AT_CMDS)-at-command-via-dbus \
-   --with-mbim \
-   --with-qmi
+   $(CROSS_MESON_USR) \
+   -Dudev=true \
+   -Dudevdir=/usr/lib/udev \
+   -Dtests=true \
+   -Ddbus_policy_dir=/usr/share/dbus-1/system.d \
+   -Dsystemdsystemunitdir=/usr/lib/systemd/system \
+   -Dsystemd_suspend_resume=$(call ptx/truefalse, 
PTXCONF_INITMETHOD_SYSTEMD) \
+   -Dpowerd_suspend_resume=false \
+   -Dsystemd_journal=$(call ptx/truefalse, PTXCONF_INITMETHOD_SYSTEMD) \
+   -Dpolkit=no \
+   -Dat_command_via_dbus=$(call ptx/truefalse, 
PTXCONF_MODEMMANAGER_ALLOW_DBUS_AT_CMDS) \
+   -Dmbim=true \
+   -Dqmi=true \
+   -Dqrtr=false \
+   -Dintrospection=false \
+   -Dvapi=false \
+   -Dgtk_doc=false \
+   -Dman=false \
+   -Dbash_completion=false
+
+# sadly, ModemManager does not build with -Dtests=false
 
 # 
 # Target-Install
-- 
2.32.0

[ptxdist] [PATCH 1/3] libmbim: version bump 1.26.4 -> 1.28.0

[Ladislav Michl]

From: Ladislav Michl 

There is no longer an upstream-provided source tarball.
Autoconf support was dropped and package uses meson.

Signed-off-by: Ladislav Michl 
---
 rules/libmbim.in   |  2 +-
 rules/libmbim.make | 29 -
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/rules/libmbim.in b/rules/libmbim.in
index 2f5e21f02..01e222533 100644
--- a/rules/libmbim.in
+++ b/rules/libmbim.in
@@ -2,7 +2,7 @@
 
 config LIBMBIM
tristate
-   select HOST_SYSTEM_PYTHON3
+   select HOST_MESON
select GLIB
select UDEV
select LIBGUDEV
diff --git a/rules/libmbim.make b/rules/libmbim.make
index f2f8e5801..095b16e36 100644
--- a/rules/libmbim.make
+++ b/rules/libmbim.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBMBIM) += libmbim
 #
 # Paths and names
 #
-LIBMBIM_VERSION:= 1.26.4
-LIBMBIM_MD5:= 58dea20cad346f31d2873b68385a9973
+LIBMBIM_VERSION:= 1.28.0
+LIBMBIM_MD5:= c3ffcb573b7de1a5509b2d222303f1ec
 LIBMBIM:= libmbim-$(LIBMBIM_VERSION)
-LIBMBIM_SUFFIX := tar.xz
-LIBMBIM_URL:= 
https://www.freedesktop.org/software/libmbim/$(LIBMBIM).$(LIBMBIM_SUFFIX)
+LIBMBIM_SUFFIX := tar.bz2
+LIBMBIM_URL:= 
https://gitlab.freedesktop.org/mobile-broadband/libmbim/-/archive/$(LIBMBIM_VERSION)/$(LIBMBIM).$(LIBMBIM_SUFFIX)
 LIBMBIM_SOURCE := $(SRCDIR)/$(LIBMBIM).$(LIBMBIM_SUFFIX)
 LIBMBIM_DIR:= $(BUILDDIR)/$(LIBMBIM)
 LIBMBIM_LICENSE:= GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -27,22 +27,17 @@ LIBMBIM_LICENSE := GPL-2.0-or-later AND 
LGPL-2.1-or-later
 # Prepare
 # 
 
-LIBMBIM_CONF_ENV   := \
-   $(CROSS_ENV) \
-   ac_cv_path_PYTHON=$(SYSTEMPYTHON3)
 #
-# autoconf
+# meson
 #
-LIBMBIM_CONF_TOOL  := autoconf
+LIBMBIM_CONF_TOOL  := meson
 LIBMBIM_CONF_OPT   := \
-   $(CROSS_AUTOCONF_USR) \
-   --disable-compile-warnings \
-   --disable-Werror \
-   --disable-gtk-doc \
-   --disable-gtk-doc-html \
-   --disable-gtk-doc-pdf \
-   --disable-introspection \
-   --with-udev-base-dir=/usr/lib/udev
+   $(CROSS_MESON_USR) \
+   -Dudevdir=/usr/lib/udev \
+   -Dintrospection=false \
+   -Dgtk_doc=false \
+   -Dman=false \
+   -Dbash_completion=false
 
 # 
 # Target-Install
-- 
2.32.0

[ptxdist] [PATCH 2/3] libqmi: version bump 1.30.8 -> 1.32.0

[Ladislav Michl]

From: Ladislav Michl 

There is no longer an upstream-provided source tarball.
Autoconf support was dropped and package uses meson.

Signed-off-by: Ladislav Michl 
---
 rules/libqmi.in   |  2 +-
 rules/libqmi.make | 40 +++-
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/rules/libqmi.in b/rules/libqmi.in
index 9fe39036a..571bfa3a0 100644
--- a/rules/libqmi.in
+++ b/rules/libqmi.in
@@ -2,7 +2,7 @@
 
 menuconfig LIBQMI
tristate
-   select HOST_SYSTEM_PYTHON3
+   select HOST_MESON
select GLIB
select LIBMBIM if LIBQMI_MBIM_QMUX
prompt "libqmi"
diff --git a/rules/libqmi.make b/rules/libqmi.make
index 4607cf778..cfdfb65b1 100644
--- a/rules/libqmi.make
+++ b/rules/libqmi.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_LIBQMI) += libqmi
 #
 # Paths and names
 #
-LIBQMI_VERSION := 1.30.8
-LIBQMI_MD5 := 5ec8838914f80e1dfa4d2fa8cc2f186d
+LIBQMI_VERSION := 1.32.0
+LIBQMI_MD5 := c3a279461dc71ebc596c1cbae4bad19c
 LIBQMI := libqmi-$(LIBQMI_VERSION)
-LIBQMI_SUFFIX  := tar.xz
-LIBQMI_URL := 
http://www.freedesktop.org/software/libqmi/$(LIBQMI).$(LIBQMI_SUFFIX)
+LIBQMI_SUFFIX  := tar.bz2
+LIBQMI_URL := 
https://gitlab.freedesktop.org/mobile-broadband/libqmi/-/archive/$(LIBQMI_VERSION)/$(LIBQMI).$(LIBQMI_SUFFIX)
 LIBQMI_SOURCE  := $(SRCDIR)/$(LIBQMI).$(LIBQMI_SUFFIX)
 LIBQMI_DIR := $(BUILDDIR)/$(LIBQMI)
 LIBQMI_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later
@@ -31,25 +31,23 @@ LIBQMI_LICENSE_FILES := \
 # 
 
 #
-# autoconf
+# meson
 #
-LIBQMI_CONF_TOOL   := autoconf
+LIBQMI_CONF_TOOL   := meson
 LIBQMI_CONF_OPT:= \
-   $(CROSS_AUTOCONF_USR) \
-   --disable-compile-warnings \
-   --disable-Werror \
-   --disable-introspection \
-   --enable-collection=full \
-   --disable-firmware-update \
-   --disable-mm-runtime-check \
-   --disable-gtk-doc \
-   --disable-gtk-doc-html \
-   --disable-gtk-doc-pdf \
-   --disable-qmi-username \
-   --$(call ptx/endis, PTXCONF_LIBQMI_MBIM_QMUX)-mbim-qmux \
-   --disable-qrtr \
-   --without-udev \
-   --with-udev-base-dir=/usr/lib/udev
+   $(CROSS_MESON_USR) \
+   -Dfirmware_update=false \
+   -Dcollection=full \
+   -Dmbim_qmux=$(call ptx/truefalse, PTXCONF_LIBQMI_MBIM_QMUX) \
+   -Dmm_runtime_check=false \
+   -Dqrtr=false \
+   -Drmnet=false \
+   -Dudev=false \
+   -Dudevdir=/usr/lib/udev \
+   -Dintrospection=false \
+   -Dgtk_doc=false \
+   -Dman=false \
+   -Dbash_completion=false
 
 # 
 # Target-Install
-- 
2.32.0

[ptxdist] [PATCH 0/3] ModemManager update

[Ladislav Michl]

Hi there!

Yesterday new ModemManager version 1.20.0 was released.
As it contains quite a lot of new features, please give
it some testing. This version is also last stable release
using autotools, next one will support meson only.
As both libmbim and libqmi already dropped autotools support
do it for ModemManager now as well.

Happy testing,
l.

[ptxdist] [PATCH v2] rules: Replace deprecated _MAKEVARS

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 -v2: 
   dropped from patch:
   - module-init-tools: removed by separate patch
   - host-libaio: only mysql needs this and it is in staging
   other packages compile tested and evetually fixed

 rules/ckermit.make | 10 +-
 rules/etherwake.make   |  8 +++-
 rules/gdb.make |  3 ++-
 rules/killproc.make| 11 +++
 rules/libcgi.make  |  2 +-
 rules/liblockfile.make |  3 ++-
 rules/lpc21isp.make|  2 +-
 rules/netcat.make  |  5 ++---
 rules/pcmciautils.make |  6 +-
 rules/pv.make  |  2 +-
 rules/wireless.make| 11 ++-
 11 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/rules/ckermit.make b/rules/ckermit.make
index e983803c1..5a6373938 100644
--- a/rules/ckermit.make
+++ b/rules/ckermit.make
@@ -35,7 +35,7 @@ CKERMIT_CONF_TOOL := NO
 # Compile
 # 
 
-CKERMIT_MAKEVARS := \
+CKERMIT_MAKE_OPT := \
xermit \
KTARGET=linuxa  \
prefix=/usr \
@@ -46,6 +46,14 @@ CKERMIT_MAKEVARS := \
LNKFLAGS='$(CROSS_LDFLAGS)' \
LIBS='-lncurses -lutil -lresolv -lcrypt -lm'
 
+# 
+# Install
+# 
+
+CKERMIT_INSTALL_OPT := \
+   prefix=/usr \
+   install
+
 # 
 # Target-Install
 # 
diff --git a/rules/etherwake.make b/rules/etherwake.make
index 8ae6fd734..70285310b 100644
--- a/rules/etherwake.make
+++ b/rules/etherwake.make
@@ -29,7 +29,13 @@ ETHERWAKE_LICENSE:= GPL
 # Prepare
 # 
 
-ETHERWAKE_MAKEVARS := CC=$(CROSS_CC)
+ETHERWAKE_CONF_TOOL:= NO
+
+# 
+# Compile
+# 
+
+ETHERWAKE_MAKE_OPT := CC=$(CROSS_CC)
 
 # 
 # Target-Install
diff --git a/rules/gdb.make b/rules/gdb.make
index 8d2c7ffdb..d8c0c1dc6 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -54,12 +54,13 @@ GDB_CONF_ENV:= \
host_configargs='$(GDB_CONF_OPT_HOST)'
 
 ifndef PTXCONF_GDB_SHARED
-GDB_MAKEVARS := LDFLAGS=-static
+GDB_MAKE_OPT := LDFLAGS=-static
 endif
 
 #
 # autoconf
 #
+GDB_CONF_TOOL  := autoconf
 GDB_CONF_OPT   := \
$(CROSS_AUTOCONF_USR) \
--target=$(PTXCONF_GNU_TARGET) \
diff --git a/rules/killproc.make b/rules/killproc.make
index 196d2a45c..fc830dd1f 100644
--- a/rules/killproc.make
+++ b/rules/killproc.make
@@ -25,14 +25,17 @@ KILLPROC_DIR:= $(BUILDDIR)/$(KILLPROC)
 KILLPROC_LICENSE   := GPL-2.0-only
 
 # 
-# Prepare
+# Prepare + Compile + Install
 # 
 
-KILLPROC_MAKEVARS := \
-   CC=$(CROSS_CC) \
+KILLPROC_CONF_TOOL := NO
+KILLPROC_MAKE_OPT  := \
+   CC=$(CROSS_CC)
+KILLPROC_INSTALL_OPT   := \
SBINDIR=$(KILLPROC_PKGDIR)/usr/sbin \
UBINDIR=$(KILLPROC_PKGDIR)/usr/bin \
-   INSTBINFLAGS="-m 0755"
+   INSTBINFLAGS="-m 0755" \
+   install
 
 # 
 # Target-Install
diff --git a/rules/libcgi.make b/rules/libcgi.make
index eb9d704d2..f761ebaed 100644
--- a/rules/libcgi.make
+++ b/rules/libcgi.make
@@ -34,7 +34,7 @@ LIBCGI_LICENSE:= LGPL-2.1-only
 LIBCGI_CONF_TOOL := autoconf
 LIBCGI_CONF_OPT := $(CROSS_AUTOCONF_USR)
 
-LIBCGI_MAKEVARS:= $(CROSS_ENV_CC) $(CROSS_ENV_AR)
+LIBCGI_MAKE_OPT:= $(CROSS_ENV_CC) $(CROSS_ENV_AR)
 
 # 
 # Target-Install
diff --git a/rules/liblockfile.make b/rules/liblockfile.make
index 162ec491b..06f3c8bd1 100644
--- a/rules/liblockfile.make
+++ b/rules/liblockfile.make
@@ -30,7 +30,8 @@ LIBLOCKFILE_LICENSE_FILES := 
file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868
 # Prepare
 # 
 
-LIBLOCKFILE_MAKEVARS   := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR)
+LIBLOCKFILE_MAKE_OPT   := $(CROSS_ENV_AR)
+LIBLOCKFILE_INSTALL_OPT:= ROOT=$(PKGDIR)/$(LIBLOCKFILE) install
 
 #
 # autoconf
diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make
index f18ad84ee..e6a9fb051 100644
--- a/rules/lpc21isp.make
+++ b/rules/lpc21isp.make
@@ -30,7 +30,7 @@ LPC21ISP_LICENSE  := GPL-3.0-or-later
 
 LPC21ISP_CONF_TOOL := NO
 LPC21ISP_MAKE_ENV

[ptxdist] [PATCH] module-init-tools: Remove after one year in staging

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/module-init-tools.in   | 90 
 rules/module-init-tools.make | 75 --
 2 files changed, 165 deletions(-)
 delete mode 100644 rules/module-init-tools.in
 delete mode 100644 rules/module-init-tools.make

diff --git a/rules/module-init-tools.in b/rules/module-init-tools.in
deleted file mode 100644
index 9eba00aba..0
--- a/rules/module-init-tools.in
+++ /dev/null
@@ -1,90 +0,0 @@
-## SECTION=staging
-## old section:
-### SECTION=shell_and_console
-# module-init-tools configuration
-
-menuconfig MODULE_INIT_TOOLS
-   tristate
-   prompt "module-init-tools "
-   help
- This package contains a set of programs for loading, inserting
- and removing kernel modules for Linux (versions 2.5.48 and
- above).
-
- STAGING: this package is obsolete and has been replaced by libkmod.
-
-if MODULE_INIT_TOOLS
-
-config MODULE_INIT_TOOLS_INSMOD
-   bool
-   prompt "Install insmod on target"
-   depends on (!BUSYBOX_INSMOD && !LIBKMOD_INSMOD) || ALLYES
-   help
- simple program to insert a module into the Linux Kernel
-
-comment "BusyBox' insmod is selected!"
-   depends on BUSYBOX_INSMOD
-
-comment "kmod insmod is selected!"
-   depends on LIBKMOD_INSMOD
-
-config MODULE_INIT_TOOLS_RMMOD
-   bool
-   prompt "Install rmmod on target"
-   depends on (!BUSYBOX_RMMOD && !LIBKMOD_RMMOD) || ALLYES
-   help
- simple program to remove a module from the Linux Kernel
-
-comment "BusyBox' rmmod is selected!"
-   depends on BUSYBOX_RMMOD
-
-comment "kmod rmmod is selected!"
-   depends on LIBKMOD_RMMOD
-
-config MODULE_INIT_TOOLS_LSMOD
-   bool
-   prompt "Install lsmod on target"
-   depends on (!BUSYBOX_LSMOD && !LIBKMOD_LSMOD) || ALLYES
-   help
- program to show the status of modules in the Linux Kernel
-
-comment "BusyBox' lsmod is selected!"
-   depends on BUSYBOX_LSMOD
-
-comment "kmod lsmod is selected!"
-   depends on LIBKMOD_LSMOD
-
-config MODULE_INIT_TOOLS_MODINFO
-   bool
-   prompt "Install modinfo on target"
-   depends on (!BUSYBOX_MODINFO && !LIBKMOD_MODINFO) || ALLYES
-   help
- program to show information about a Linux Kernel module
-
-comment "BusyBox' modinfo is selected!"
-   depends on BUSYBOX_MODINFO
-
-comment "kmod modinfo is selected!"
-   depends on LIBKMOD_MODINFO
-
-config MODULE_INIT_TOOLS_MODPROBE
-   bool
-   prompt "Install modprobe on target"
-   depends on (!BUSYBOX_MODPROBE && !LIBKMOD_MODPROBE) || ALLYES
-   help
- program to add and remove modules from the Linux Kernel
-
-comment "BusyBox' modprobe is selected!"
-   depends on BUSYBOX_MODPROBE
-
-comment "kmod modprobe is selected!"
-   depends on LIBKMOD_MODPROBE
-
-config MODULE_INIT_TOOLS_DEPMOD
-   bool
-   prompt "Install depmod on target"
-   depends on (!BUSYBOX_DEPMOD && !LIBKMOD_DEPMOD) || ALLYES
-   help
- program to generate modules.dep and map files
-
-endif
diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make
deleted file mode 100644
index eb8811b24..0
--- a/rules/module-init-tools.make
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2005 Ladislav Michl 
-#   2006, 2008, 2009 by Marc Kleine-Budde 
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_MODULE_INIT_TOOLS) += module-init-tools
-
-#
-# Paths and names
-#
-MODULE_INIT_TOOLS_VERSION  := 3.16
-MODULE_INIT_TOOLS_MD5  := bc44832c6e41707b8447e2847d2019f5
-MODULE_INIT_TOOLS  := 
module-init-tools-$(MODULE_INIT_TOOLS_VERSION)
-MODULE_INIT_TOOLS_SUFFIX   := tar.bz2
-MODULE_INIT_TOOLS_URL  := $(call ptx/mirror, KERNEL, 
utils/kernel/module-init-tools/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX))
-MODULE_INIT_TOOLS_SOURCE   := 
$(SRCDIR)/$(MODULE_INIT_TOOLS).$(MODULE_INIT_TOOLS_SUFFIX)
-MODULE_INIT_TOOLS_DIR  := $(BUILDDIR)/$(MODULE_INIT_TOOLS)
-MODULE_INIT_TOOLS_LICENSE  := GPL-2.0-only
-
-# 
-# Prepare
-# 
-
-MODULE_INIT_TOOLS_MAKEVARS := MAN5="" MAN8=""
-
-#
-# autoconf
-#
-MODULE_INIT_TOOLS_CONF_TOOL := autoconf
-MODULE_INIT_TOOLS_CONF_OPT := $(CROSS_AUTOCONF_USR)
-
-# 
-# Target-Install
-# -

[ptxdist] [PATCH] rules: Replace deprecated _ENV

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/at.make  | 2 +-
 rules/bonniexx.make| 2 +-
 rules/fontconfig.make  | 2 +-
 rules/gnupg.make   | 6 +++---
 rules/grub.make| 2 +-
 rules/host-cairo.make  | 2 --
 rules/host-libxcb.make | 2 +-
 rules/host-openssl.make| 2 --
 rules/host-opkg.make   | 2 --
 rules/host-postgresql.make | 2 --
 rules/host-python3.make| 2 +-
 rules/jvisu.make   | 2 +-
 rules/sdl2-test.make   | 2 +-
 rules/valgrind.make| 2 +-
 rules/wget.make| 2 +-
 15 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/rules/at.make b/rules/at.make
index 7a4da8f5a..c7089d156 100644
--- a/rules/at.make
+++ b/rules/at.make
@@ -31,7 +31,7 @@ AT_LICENSE_FILES := \
 # Prepare
 # 
 
-AT_ENV := \
+AT_CONF_ENV:= \
$(CROSS_ENV) \
ac_cv_header_security_pam_appl_h=$(call ptx/yesno, PTXCONF_GLOBAL_PAM)
 
diff --git a/rules/bonniexx.make b/rules/bonniexx.make
index b0c69be8b..70f98e8bc 100644
--- a/rules/bonniexx.make
+++ b/rules/bonniexx.make
@@ -30,7 +30,7 @@ BONNIEXX_LICENSE_FILES:= \
 # Prepare
 # 
 
-BONNIEXX_ENV   := \
+BONNIEXX_CONF_ENV  := \
$(CROSS_ENV) \
bonnie_cv_sys_largefile=$(call ptx/yesno, PTXCONF_GLOBAL_LARGE_FILE)
 
diff --git a/rules/fontconfig.make b/rules/fontconfig.make
index 6c45bad66..925e03649 100644
--- a/rules/fontconfig.make
+++ b/rules/fontconfig.make
@@ -33,7 +33,7 @@ FONTCONFIG_LICENSE_FILES  := \
 # Prepare
 # 
 
-FONTCONFIG_ENV :=  \
+FONTCONFIG_CONF_ENV:=  \
$(CROSS_ENV) \
ac_cv_prog_HASDOCBOOK=no
 
diff --git a/rules/gnupg.make b/rules/gnupg.make
index 99e7f776a..a2c33212c 100644
--- a/rules/gnupg.make
+++ b/rules/gnupg.make
@@ -36,12 +36,12 @@ GNUPG_LICENSE_FILES := \
 # Prepare
 # 
 
-GNUPG_ENV := \
+GNUPG_CONF_ENV := \
$(CROSS_ENV) \
ac_cv_path_GPGRT_CONFIG=$(PTXDIST_SYSROOT_CROSS)/bin/gpgrt-config
 
-GNUPG_CONF_TOOL := autoconf
-GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
+GNUPG_CONF_TOOL:= autoconf
+GNUPG_CONF_OPT := $(CROSS_AUTOCONF_USR) \
--disable-gpgsm \
--disable-scdaemon \
--disable-g13 \
diff --git a/rules/grub.make b/rules/grub.make
index a85321172..63b93c2d7 100644
--- a/rules/grub.make
+++ b/rules/grub.make
@@ -28,7 +28,7 @@ GRUB_DIR  := $(BUILDDIR)/$(GRUB)
 # non-standard CFLAGS. We can unset them here as grub is compiled
 # standalone anyway (without Linux/glibc includes)
 
-GRUB_ENV   := $(CROSS_ENV) CFLAGS=''
+GRUB_CONF_ENV  := $(CROSS_ENV) CFLAGS=''
 
 GRUB_CFLAGS:= -fgnu89-inline
 
diff --git a/rules/host-cairo.make b/rules/host-cairo.make
index 6936b9bc2..092641e25 100644
--- a/rules/host-cairo.make
+++ b/rules/host-cairo.make
@@ -15,8 +15,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_CAIRO) += host-cairo
 # Prepare
 # 
 
-#HOST_CAIRO_CONF_ENV   := $(HOST_ENV)
-
 #
 # autoconf
 #
diff --git a/rules/host-libxcb.make b/rules/host-libxcb.make
index 579c3274e..4996695c0 100644
--- a/rules/host-libxcb.make
+++ b/rules/host-libxcb.make
@@ -15,7 +15,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBXCB) += host-libxcb
 # Prepare
 # 
 
-HOST_LIBXCB_ENV:= \
+HOST_LIBXCB_CONF_ENV   := \
$(HOST_ENV) \
ac_cv_prog_BUILD_DOCS=no \
ac_cv_lib_Xdmcp_XdmcpWrap=no
diff --git a/rules/host-openssl.make b/rules/host-openssl.make
index f80b4e1c9..bd2a25126 100644
--- a/rules/host-openssl.make
+++ b/rules/host-openssl.make
@@ -23,8 +23,6 @@ HOST_OPENSSL_DIR  = $(HOST_BUILDDIR)/$(HOST_OPENSSL)
 # Prepare
 # 
 
-HOST_OPENSSL_CONF_ENV  := $(HOST_ENV)
-
 #
 # autoconf
 #
diff --git a/rules/host-opkg.make b/rules/host-opkg.make
index a8cae57ce..a9fe3d20a 100644
--- a/rules/host-opkg.make
+++ b/rules/host-opkg.make
@@ -22,8 +22,6 @@ HOST_OPKG_DIR = $(HOST_BUILDDIR)/$(HOST_OPKG)
 # Prepare
 # 
 
-HOST_OPKG_ENV  := $(HOST_ENV)
-
 #
 # autoconf
 #
diff --git a/rules/host-postgresql.make b/rules/host-postgresql.make
index 1092c38a8..c9c92a40b 100644
--- a/rules/host-postgresql.make
+++ b/rules/host-postgresql.make
@@ -15,8 +15,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_POSTGRESQL) += host-postgresql
 # Prepare
 # 
 
-#HOST_POSTGRESQL_CONF_ENV  := $(HOST_ENV)
-
 #
 # autoconf
 #
diff --git a/rules/host-python3.make b/rules/host-python3.make
index 4bccd21d7

[ptxdist] [PATCH v3] rules: Replace deprecated _AUTOCONF

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 - v2: add a few more previously forgotten rules
 - v3: add even more rules
   now result of grep -rPe '_AUTOCONF(?![)_])'
   looks good and all my configurations build
   with PTXCONF_SETUP_DEPRECATED_FATAL=y
 
 rules/argtable2.make |  3 +-
 rules/bash.make  |  5 +-
 rules/bc.make|  3 +-
 rules/binutils.make  |  3 +-
 rules/bridge-utils.make  |  2 +-
 rules/cairomm.make   |  3 +-
 rules/classpath.make |  5 +-
 rules/daemonize.make |  3 +-
 rules/dash.make  |  3 +-
 rules/dbench.make| 13 --
 rules/diffutils.make |  3 +-
 rules/eggdbus.make   |  3 +-
 rules/eventlog.make  |  3 +-
 rules/failmalloc.make|  3 +-
 rules/fcgi.make  |  3 +-
 rules/fftw.make  |  3 +-
 rules/findutils.make |  3 +-
 rules/frodo.make |  4 +-
 rules/glibmm.make|  3 +-
 rules/gnuplot.make   |  3 +-
 rules/grub.make  | 21 +
 rules/gtk-engines.make   |  3 +-
 rules/haserl.make|  3 +-
 rules/host-eggdbus.make  |  3 +-
 rules/host-genext2fs.make|  5 +-
 rules/host-gettext.make  |  3 +-
 rules/host-gperf.make|  4 +-
 rules/host-libgd.make|  3 +-
 rules/host-libpng.make   |  2 +-
 rules/host-libpthread-stubs.make |  2 +-
 rules/host-libsigcpp.make|  2 +-
 rules/host-libusb.make   |  3 +-
 rules/host-libxml2.make  |  3 +-
 rules/host-libxslt.make  |  3 +-
 rules/host-lrzsz.make|  3 +-
 rules/host-pelts.make|  2 +-
 rules/host-xorg-app-bdftopcf.make|  2 +-
 rules/host-xorg-app-mkfontscale.make |  2 +-
 rules/host-xorg-font-util.make   |  2 +-
 rules/host-xorg-lib-Xau.make |  2 +-
 rules/host-xorg-lib-fontenc.make |  2 +-
 rules/host-xorg-lib-xtrans.make  |  2 +-
 rules/ima-evm-utils.make |  4 +-
 rules/imagemagick.make   |  4 +-
 rules/inotify-tools.make |  3 +-
 rules/iperf.make |  3 +-
 rules/iperf3.make|  3 +-
 rules/jamvm.make | 27 +--
 rules/jed.make   |  5 +-
 rules/joe.make   |  3 +-
 rules/kexec-tools.make   |  3 +-
 rules/libassuan.make |  3 +-
 rules/libcaca.make   |  7 ++-
 rules/libcgi.make|  3 +-
 rules/libcgicc.make  |  3 +-
 rules/libconfuse.make|  7 +--
 rules/libdaemon.make |  3 +-
 rules/libfsl-vpu.make|  3 +-
 rules/libftdi.make   |  7 +--
 rules/libgcrypt.make |  7 +--
 rules/libgd.make |  3 +-
 rules/libgsloop.make |  3 +-
 rules/libid3tag.make |  3 +-
 rules/libiodbc.make  |  3 +-
 rules/libksba.make   |  3 +-
 rules/liblist.make   |  3 +-
 rules/liblockfile.make   |  3 +-
 rules/libltdl.make   |  5 +-
 rules/liblzo.make|  3 +-
 rules/libmad.make|  7 +--
 rules/libmemcache.make   |  7 +--
 rules/libmemcached.make  | 15 +++---
 rules/libmng.make|  3 +-
 rules/liboop.make|  3 +-
 rules/libpthread-stubs.make  |  4 +-
 rules/librn.make |  3 +-
 rules/librsvg.make   |  3 +-
 rules/libsigcpp.make |  3 +-
 rules/libsocketcan.make  |  3 +-
 rules/libssh2.make   |  4 +-
 rules/libsysfs.make  |  3 +-
 rules/libucdaemon.make   |  3 +-
 rules/libusb-compat.make |  3 +-
 rules/libusb.make|  3 +-
 rules/libxml2.make   | 11 +++--
 rules/libxmlconfig.make  |  3 +-
 rules/libxslt.make   |  5 +-
 rules/links.make | 11 +++--
 rules/lsuio.make |  3 +-
 rules/ltt-control.make   |  3 +-
 rules/madplay.make   |  4 +-
 rules/memedit.make   |  3 +-
 rules/module-init-tools.make |  3 +-
 rules/mtr.make

[ptxdist] [RFC] ptxd_make_world_common: optionally bailout on deprecated variable use

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 This is aimed as helper for those willing to remove deprecated
 variables.
 Most of them are gone now, but a few _ENV is still there.
 You may use (regexp provided by Uwe Kleine-König)
   grep -rPe '(?_${depname[i]}: ${var}=\"${val}\""
echo
+
+   if [ "${PTXCONF_SETUP_DEPRECATED_FATAL}" = "y" ]; then
+   ptxd_bailout "${FUNCNAME}: deprecated variable _${depname[i]} 
detected!"
+   fi
 done
 
 }
-- 
2.32.0

[ptxdist] [PATCH] rules: Replace deprecated _BUILDDIR

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/db.make   | 4 ++--
 rules/tf-a.make | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/db.make b/rules/db.make
index 1fce58623..2872a1c02 100644
--- a/rules/db.make
+++ b/rules/db.make
@@ -25,7 +25,7 @@ DB_URL:= 
http://download.oracle.com/berkeley-db/$(DB).$(DB_SUFFIX)
 DB_SOURCE  := $(SRCDIR)/$(DB).$(DB_SUFFIX)
 DB_DIR := $(BUILDDIR)/$(DB)
 DB_SUBDIR  := dist
-DB_BUILDDIR:= $(DB_DIR)/build_unix
+DB_BUILD_DIR   := $(DB_DIR)/build_unix
 DB_LICENCE := Sleepycat
 
 # 
@@ -35,7 +35,7 @@ DB_LICENCE:= Sleepycat
 #
 # autoconf
 #
-DB_CONF_TOOL := autoconf
+DB_CONF_TOOL   := autoconf
 DB_CONF_OPT:= \
$(CROSS_AUTOCONF_USR) \
--disable-smallbuild \
diff --git a/rules/tf-a.make b/rules/tf-a.make
index 561af0d39..0a9c0179c 100644
--- a/rules/tf-a.make
+++ b/rules/tf-a.make
@@ -22,7 +22,7 @@ TF_A_SUFFIX   := tar.gz
 TF_A_URL   := $(call remove_quotes, 
$(PTXCONF_TF_A_URL))/$(TF_A_VERSION).$(TF_A_SUFFIX)
 TF_A_SOURCE:= $(SRCDIR)/$(TF_A).$(TF_A_SUFFIX)
 TF_A_DIR   := $(BUILDDIR)/$(TF_A)
-TF_A_BUILDDIR  := $(TF_A_DIR)/build
+TF_A_BUILD_DIR := $(TF_A_DIR)/build
 TF_A_BUILD_OOT := YES
 TF_A_LICENSE   := BSD-3-Clause AND BSD-2-Clause \
   AND (GPL-2.0-or-later OR BSD-2-Clause) \
-- 
2.32.0

[ptxdist] [PATCH] rules: Replace deprecated _COMPILE_ENV

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/host-nodejs.make | 2 +-
 rules/libpcap.make | 2 +-
 rules/pcmciautils.make | 2 +-
 rules/poppler.make | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/host-nodejs.make b/rules/host-nodejs.make
index 6da85be2c..2bf5f7971 100644
--- a/rules/host-nodejs.make
+++ b/rules/host-nodejs.make
@@ -13,7 +13,7 @@
 HOST_PACKAGES-$(PTXCONF_HOST_NODEJS) += host-nodejs
 
 # Always run the preprocessor locally.
-HOST_NODEJS_COMPILE_ENV:= \
+HOST_NODEJS_MAKE_ENV   := \
ICECC_REMOTE_CPP=0
 
 # 
diff --git a/rules/libpcap.make b/rules/libpcap.make
index ae7292fed..1d51449ae 100644
--- a/rules/libpcap.make
+++ b/rules/libpcap.make
@@ -31,7 +31,7 @@ LIBPCAP_CONF_ENV  := \
$(CROSS_ENV) \
ac_cv_lbl_hci_channel_monitor_is_defined=no
 
-LIBPCAP_COMPILE_ENV := \
+LIBPCAP_MAKE_ENV := \
$(CROSS_ENV_CFLAGS) \
$(CROSS_ENV_CPPFLAGS) \
$(CROSS_ENV_LDFLAGS) \
diff --git a/rules/pcmciautils.make b/rules/pcmciautils.make
index 6dc358c89..e9328a589 100644
--- a/rules/pcmciautils.make
+++ b/rules/pcmciautils.make
@@ -27,7 +27,7 @@ PCMCIAUTILS_DIR   := $(BUILDDIR)/$(PCMCIAUTILS)
 # Prepare
 # 
 
-PCMCIAUTILS_COMPILE_ENV := \
+PCMCIAUTILS_MAKE_ENV := \
$(CROSS_ENV_CFLAGS) \
$(CROSS_ENV_CPPFLAGS) \
$(CROSS_ENV_LDFLAGS)
diff --git a/rules/poppler.make b/rules/poppler.make
index d56e2601b..9679ccc65 100644
--- a/rules/poppler.make
+++ b/rules/poppler.make
@@ -78,7 +78,7 @@ POPPLER_CONF_OPT  := \
-DWITH_TIFF=$(call ptx/onoff,PTXCONF_POPPLER_TIFF)
 
 ifdef PTXCONF_POPPLER_QT5
-POPPLER_COMPILE_ENV := \
+POPPLER_MAKE_ENV := \
ICECC_REMOTE_CPP=0
 endif
 
-- 
2.32.0

[ptxdist] [PATCH] rules: Replace deprecated _MAKEVARS

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/ckermit.make   | 2 +-
 rules/etherwake.make | 2 +-
 rules/gdb.make   | 2 +-
 rules/host-libaio.make   | 2 +-
 rules/killproc.make  | 2 +-
 rules/libcgi.make| 2 +-
 rules/liblockfile.make   | 2 +-
 rules/lpc21isp.make  | 2 --
 rules/module-init-tools.make | 2 +-
 rules/netcat.make| 2 --
 rules/pcmciautils.make   | 2 +-
 rules/pv.make| 2 +-
 rules/wireless.make  | 2 +-
 13 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/rules/ckermit.make b/rules/ckermit.make
index e983803c1..2a6f08528 100644
--- a/rules/ckermit.make
+++ b/rules/ckermit.make
@@ -35,7 +35,7 @@ CKERMIT_CONF_TOOL := NO
 # Compile
 # 
 
-CKERMIT_MAKEVARS := \
+CKERMIT_MAKE_OPT := \
xermit \
KTARGET=linuxa  \
prefix=/usr \
diff --git a/rules/etherwake.make b/rules/etherwake.make
index 8ae6fd734..b5eb9eaf4 100644
--- a/rules/etherwake.make
+++ b/rules/etherwake.make
@@ -29,7 +29,7 @@ ETHERWAKE_LICENSE := GPL
 # Prepare
 # 
 
-ETHERWAKE_MAKEVARS := CC=$(CROSS_CC)
+ETHERWAKE_MAKE_OPT := CC=$(CROSS_CC)
 
 # 
 # Target-Install
diff --git a/rules/gdb.make b/rules/gdb.make
index 8d2c7ffdb..1eef9beb2 100644
--- a/rules/gdb.make
+++ b/rules/gdb.make
@@ -54,7 +54,7 @@ GDB_CONF_ENV  := \
host_configargs='$(GDB_CONF_OPT_HOST)'
 
 ifndef PTXCONF_GDB_SHARED
-GDB_MAKEVARS := LDFLAGS=-static
+GDB_MAKE_OPT := LDFLAGS=-static
 endif
 
 #
diff --git a/rules/host-libaio.make b/rules/host-libaio.make
index 4c428e477..251a4e68a 100644
--- a/rules/host-libaio.make
+++ b/rules/host-libaio.make
@@ -17,6 +17,6 @@ HOST_PACKAGES-$(PTXCONF_HOST_LIBAIO) += host-libaio
 
 HOST_LIBAIO_CONF_TOOL  := NO
 HOST_LIBAIO_MAKE_ENV   := $(HOST_ENV)
-HOST_LIBAIO_MAKEVARS   := prefix=
+HOST_LIBAIO_MAKE_OPT   := prefix=
 
 # vim: syntax=make
diff --git a/rules/killproc.make b/rules/killproc.make
index 196d2a45c..17c649569 100644
--- a/rules/killproc.make
+++ b/rules/killproc.make
@@ -28,7 +28,7 @@ KILLPROC_LICENSE  := GPL-2.0-only
 # Prepare
 # 
 
-KILLPROC_MAKEVARS := \
+KILLPROC_MAKE_OPT := \
CC=$(CROSS_CC) \
SBINDIR=$(KILLPROC_PKGDIR)/usr/sbin \
UBINDIR=$(KILLPROC_PKGDIR)/usr/bin \
diff --git a/rules/libcgi.make b/rules/libcgi.make
index eb9d704d2..f761ebaed 100644
--- a/rules/libcgi.make
+++ b/rules/libcgi.make
@@ -34,7 +34,7 @@ LIBCGI_LICENSE:= LGPL-2.1-only
 LIBCGI_CONF_TOOL := autoconf
 LIBCGI_CONF_OPT := $(CROSS_AUTOCONF_USR)
 
-LIBCGI_MAKEVARS:= $(CROSS_ENV_CC) $(CROSS_ENV_AR)
+LIBCGI_MAKE_OPT:= $(CROSS_ENV_CC) $(CROSS_ENV_AR)
 
 # 
 # Target-Install
diff --git a/rules/liblockfile.make b/rules/liblockfile.make
index 0022c3320..20213203b 100644
--- a/rules/liblockfile.make
+++ b/rules/liblockfile.make
@@ -30,7 +30,7 @@ LIBLOCKFILE_LICENSE_FILES := 
file://COPYRIGHT;md5=35127b30003a121544b5d13a2ac868
 # Prepare
 # 
 
-LIBLOCKFILE_MAKEVARS   := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR)
+LIBLOCKFILE_MAKE_OPT   := ROOT=$(PKGDIR)/$(LIBLOCKFILE) $(CROSS_ENV_AR)
 
 #
 # autoconf
diff --git a/rules/lpc21isp.make b/rules/lpc21isp.make
index f18ad84ee..25d229080 100644
--- a/rules/lpc21isp.make
+++ b/rules/lpc21isp.make
@@ -29,8 +29,6 @@ LPC21ISP_LICENSE  := GPL-3.0-or-later
 # 
 
 LPC21ISP_CONF_TOOL := NO
-LPC21ISP_MAKE_ENV  := $(CROSS_ENV)
-LPC21ISP_MAKEVARS  := $(CROSS_ENV)
 
 # 
 # Install
diff --git a/rules/module-init-tools.make b/rules/module-init-tools.make
index eb8811b24..34e193a5d 100644
--- a/rules/module-init-tools.make
+++ b/rules/module-init-tools.make
@@ -28,7 +28,7 @@ MODULE_INIT_TOOLS_LICENSE := GPL-2.0-only
 # Prepare
 # 
 
-MODULE_INIT_TOOLS_MAKEVARS := MAN5="" MAN8=""
+MODULE_INIT_TOOLS_MAKE_OPT := MAN5="" MAN8=""
 
 #
 # autoconf
diff --git a/rules/netcat.make b/rules/netcat.make
index 7dd209f61..6e5d046f6 100644
--- a/rules/netcat.make
+++ b/rules/netcat.make
@@ -29,8 +29,6 @@ NETCAT_LICENSE:= BSD
 # 
 
 NETCAT_CONF_TOOL   := NO
-NETCAT_MAKEVARS:= \
-   $(CROSS_ENV)
 
 # --

[ptxdist] [PATCH] proftpd: Use ptx/endis to enable options

[Ladislav Michl]

From: Ladislav Michl 

Remove some ifdefs and replace deprecated variables while there.

Signed-off-by: Ladislav Michl 
---
 rules/proftpd.make | 35 ---
 1 file changed, 8 insertions(+), 27 deletions(-)

diff --git a/rules/proftpd.make b/rules/proftpd.make
index 6554dced7..889a9fef8 100644
--- a/rules/proftpd.make
+++ b/rules/proftpd.make
@@ -27,39 +27,20 @@ PROFTPD_DIR := $(BUILDDIR)/$(PROFTPD)
 # Prepare
 # 
 
-PROFTPD_COMPILE_ENV:= $(CROSS_ENV_CC_FOR_BUILD)
+PROFTPD_MAKE_ENV   := $(CROSS_ENV_CC_FOR_BUILD)
 
 #
 # autoconf
 #
-PROFTPD_AUTOCONF   := \
+PROFTPD_CONF_TOOL  := autoconf
+PROFTPD_CONF_OPT   := \
$(CROSS_AUTOCONF_USR) \
$(GLOBAL_IPV6_OPTION) \
-   --disable-cap
-
-ifdef PTXCONF_PROFTPD_PAM
-PROFTPD_AUTOCONF += --enable-auth-pam
-else
-PROFTPD_AUTOCONF += --disable-auth-pam
-endif
-
-ifdef PTXCONF_PROFTPD_SENDFILE
-PROFTPD_AUTOCONF += --enable-sendfile
-else
-PROFTPD_AUTOCONF += --disable-sendfile
-endif
-
-ifdef PTXCONF_PROFTPD_SHADOW
-PROFTPD_AUTOCONF += --enable-shadow
-else
-PROFTPD_AUTOCONF += --disable-shadow
-endif
-
-ifdef PTXCONF_PROFTPD_AUTOSHADOW
-PROFTPD_AUTOCONF += --enable-autoshadow
-else
-PROFTPD_AUTOCONF += --disable-autoshadow
-endif
+   --disable-cap \
+   --$(call ptx/endis, PTXCONF_PROFTPD_PAM)-auth-pam \
+   --$(call ptx/endis, PTXCONF_PROFTPD_SENDFILE)-sendfile \
+   --$(call ptx/endis, PTXCONF_PROFTPD_SHADOW)-shadow \
+   --$(call ptx/endis, PTXCONF_PROFTPD_AUTOSHADOW)-autoshadow
 
 PROFTPD_MAKE_PAR := NO
 
-- 
2.32.0

[ptxdist] [PATCH v2] rules: Replace deprecated _AUTOCONF

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 - v2: add a few more previously forgotten rules

 rules/argtable2.make |  3 +-
 rules/bash.make  |  5 +-
 rules/bc.make|  3 +-
 rules/binutils.make  |  3 +-
 rules/bridge-utils.make  |  2 +-
 rules/cairomm.make   |  3 +-
 rules/classpath.make |  5 +-
 rules/daemonize.make |  3 +-
 rules/dash.make  |  3 +-
 rules/dbench.make| 13 --
 rules/diffutils.make |  3 +-
 rules/eggdbus.make   |  3 +-
 rules/eventlog.make  |  3 +-
 rules/failmalloc.make|  3 +-
 rules/fcgi.make  |  3 +-
 rules/fftw.make  |  3 +-
 rules/findutils.make |  3 +-
 rules/frodo.make |  4 +-
 rules/glibmm.make|  3 +-
 rules/gnuplot.make   |  3 +-
 rules/grub.make  | 21 +
 rules/gtk-engines.make   |  3 +-
 rules/haserl.make|  3 +-
 rules/host-eggdbus.make  |  3 +-
 rules/host-genext2fs.make|  5 +-
 rules/host-gettext.make  |  3 +-
 rules/host-libgd.make|  3 +-
 rules/host-libusb.make   |  3 +-
 rules/host-libxml2.make  |  3 +-
 rules/host-libxslt.make  |  3 +-
 rules/host-lrzsz.make|  3 +-
 rules/ima-evm-utils.make |  4 +-
 rules/imagemagick.make   |  4 +-
 rules/inotify-tools.make |  3 +-
 rules/iperf.make |  3 +-
 rules/iperf3.make|  3 +-
 rules/jamvm.make | 27 +--
 rules/jed.make   |  5 +-
 rules/joe.make   |  3 +-
 rules/kexec-tools.make   |  3 +-
 rules/libassuan.make |  3 +-
 rules/libcaca.make   |  7 ++-
 rules/libcgi.make|  3 +-
 rules/libcgicc.make  |  3 +-
 rules/libconfuse.make|  7 +--
 rules/libdaemon.make |  3 +-
 rules/libfsl-vpu.make|  3 +-
 rules/libftdi.make   |  7 +--
 rules/libgcrypt.make |  7 +--
 rules/libgd.make |  3 +-
 rules/libgsloop.make |  3 +-
 rules/libid3tag.make |  3 +-
 rules/libiodbc.make  |  3 +-
 rules/libksba.make   |  3 +-
 rules/liblist.make   |  3 +-
 rules/libltdl.make   |  5 +-
 rules/liblzo.make|  3 +-
 rules/libmad.make|  7 +--
 rules/libmemcache.make   |  7 +--
 rules/libmemcached.make  | 15 +++---
 rules/libmng.make|  3 +-
 rules/liboop.make|  3 +-
 rules/libpthread-stubs.make  |  4 +-
 rules/librn.make |  3 +-
 rules/librsvg.make   |  3 +-
 rules/libsigcpp.make |  3 +-
 rules/libsocketcan.make  |  3 +-
 rules/libssh2.make   |  4 +-
 rules/libsysfs.make  |  3 +-
 rules/libucdaemon.make   |  3 +-
 rules/libusb-compat.make |  3 +-
 rules/libusb.make|  3 +-
 rules/libxml2.make   | 11 +++--
 rules/libxmlconfig.make  |  3 +-
 rules/libxslt.make   |  5 +-
 rules/links.make | 11 +++--
 rules/lsuio.make |  3 +-
 rules/ltt-control.make   |  3 +-
 rules/madplay.make   |  4 +-
 rules/memedit.make   |  3 +-
 rules/module-init-tools.make |  3 +-
 rules/mtr.make   |  3 +-
 rules/net-snmp.make  |  7 +--
 rules/netkit-ftp.make|  3 +-
 rules/npth.make  |  3 +-
 rules/pangomm.make   |  3 +-
 rules/pelts_tests.make   |  3 +-
 rules/php8.make  |  3 +-
 rules/pop3spam.make  |  3 +-
 rules/prelink.make   |  3 +-
 rules/ps3-utils.make |  3 +-
 rules/pureftpd.make  |  3 +-
 rules/pv.make|  3 +-
 rules/quota-tools.make   |  3 +-
 rules/readline.make  |  3 +-
 rules/rsync.make |  7 +--
 rules/rsync3.make

Re: [ptxdist] [PATCH 1/3] rules: Remove default assignments to _PATH and _ENV

[Ladislav Michl]

On Tue, Oct 18, 2022 at 09:48:34AM +0200, Michael Olbrich wrote:
> On Mon, Oct 17, 2022 at 09:59:04PM +0200, Ladislav Michl wrote:
> > From: Ladislav Michl 
> > 
> > Undefined _PATH is set to PATH=$(CROSS_PATH) for target packages,
> > PATH=$(HOST_PATH) for host packages and PATH=$(HOST_CROSS_PATH) for
> > cross packages.
> > 
> > Undefined _ENV is set to $(CROSS_ENV) for target packages,
> > $(HOST_ENV) for host packages and $(HOST_CROSS_ENV) for cross
> > packages.
> 
> Hmmm, _ENV is also used in the install stage and it has no default
> here. But it's not used in the compile stage. In general I think those two
> stages should have the default environment. So if this breaks something,
> then it was probably somewhat broken anyways.
> I'll throw in in my 'build everything' test. Let's see what happens here.

Thank you,

it was meant as preparation for _AUTOCONF removal patch where
_CONF_ENV is used when needed. _AUTOCONF and _ENV 
are two heavily used deprecated variables. There are few _MAKEVARS
and _COMPILE_ENV left.

I can prepare patch to replace them, so we can bail out with error after
some transitional period.

l.

> Michael

Re: [ptxdist] [PATCH v2 3/3] util-linux-ng: Rename to util-linux

[Ladislav Michl]

Hi Michael,

On Thu, Sep 29, 2022 at 07:54:38PM +0200, Ladislav Michl wrote:
> diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
> index caee22fdd..7779c2937 100755
> --- a/scripts/migrate/migrate_ptx
> +++ b/scripts/migrate/migrate_ptx
> @@ -453,3 +453,10 @@ s/^\(\(# \)\?PTXCONF_LIBTHEORA_\)_/\1/
>  # reason : upstream lighttpd module mod_compress was replaced by mod_deflate
>  #
>  s/^\(\(# \)\?PTXCONF_LIGHTTPD_MOD_\)COMPRESS\>/\1DEFLATE/
> +
> +# from   : ptxdist-2022.09.0
> +# to : ptxdist-2022.10.0

This should now read:
# from   : ptxdist-2022.10.0
# to : ptxdist-2022.11.0

Will you fixup while applying or is there a need for v3?

> +# symbol : UTIL_LINUX_NG* -> UTIL_LINUX*
> +# reason : upstream util-linux-ng fork was renamed back to util-linux over a 
> decade ago
> +#
> +s/^\(\(# \)\?PTXCONF_UTIL_LINUX\)_NG/\1/
> -- 
> 2.32.0
> 

[ptxdist] [PATCH 3/3] bsdiff: Fix configuration tool (not) used

[Ladislav Michl]

From: Ladislav Michl 

Fix typo.

Signed-off-by: Ladislav Michl 
---
 rules/bsdiff.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/bsdiff.make b/rules/bsdiff.make
index 22cd97c44..f561bc816 100644
--- a/rules/bsdiff.make
+++ b/rules/bsdiff.make
@@ -30,7 +30,7 @@ BSDIFF_LICENSE:= BSD-2-Clause
 #
 # autoconf
 #
-BSDIFF_AUTOCONF_CONF_TOOL := NO
+BSDIFF_CONF_TOOL := NO
 BSDIFF_MAKE_ENV := $(CROSS_ENV) PREFIX=/usr
 
 # 
-- 
2.32.0

[ptxdist] [PATCH 2/3] rules: Replace deprecated _AUTOCONF

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/argtable2.make |  3 +-
 rules/bc.make|  3 +-
 rules/binutils.make  |  3 +-
 rules/bridge-utils.make  |  2 +-
 rules/cairomm.make   |  3 +-
 rules/classpath.make |  5 +-
 rules/daemonize.make |  3 +-
 rules/dash.make  |  3 +-
 rules/dbench.make| 13 --
 rules/diffutils.make |  3 +-
 rules/eggdbus.make   |  3 +-
 rules/eventlog.make  |  3 +-
 rules/failmalloc.make|  3 +-
 rules/fcgi.make  |  3 +-
 rules/fftw.make  |  3 +-
 rules/findutils.make |  3 +-
 rules/frodo.make |  4 +-
 rules/glibmm.make|  3 +-
 rules/gnuplot.make   |  3 +-
 rules/grub.make  | 21 +
 rules/gtk-engines.make   |  3 +-
 rules/haserl.make|  3 +-
 rules/host-eggdbus.make  |  3 +-
 rules/host-genext2fs.make|  5 +-
 rules/host-gettext.make  |  3 +-
 rules/host-libusb.make   |  3 +-
 rules/host-libxslt.make  |  3 +-
 rules/ima-evm-utils.make |  4 +-
 rules/imagemagick.make   |  4 +-
 rules/inotify-tools.make |  3 +-
 rules/iperf.make |  3 +-
 rules/iperf3.make|  3 +-
 rules/jamvm.make | 27 +--
 rules/jed.make   |  5 +-
 rules/joe.make   |  3 +-
 rules/kexec-tools.make   |  3 +-
 rules/libassuan.make |  3 +-
 rules/libcaca.make   |  7 ++-
 rules/libcgi.make|  3 +-
 rules/libcgicc.make  |  3 +-
 rules/libconfuse.make|  7 +--
 rules/libdaemon.make |  3 +-
 rules/libfsl-vpu.make|  3 +-
 rules/libftdi.make   |  7 +--
 rules/libgcrypt.make |  7 +--
 rules/libgd.make |  3 +-
 rules/libgsloop.make |  3 +-
 rules/libid3tag.make |  3 +-
 rules/libiodbc.make  |  3 +-
 rules/libksba.make   |  3 +-
 rules/liblist.make   |  3 +-
 rules/libltdl.make   |  5 +-
 rules/liblzo.make|  3 +-
 rules/libmad.make|  7 +--
 rules/libmemcache.make   |  7 +--
 rules/libmemcached.make  | 15 +++---
 rules/libmng.make|  3 +-
 rules/liboop.make|  3 +-
 rules/libpthread-stubs.make  |  4 +-
 rules/librn.make |  3 +-
 rules/librsvg.make   |  3 +-
 rules/libsigcpp.make |  3 +-
 rules/libsocketcan.make  |  3 +-
 rules/libssh2.make   |  4 +-
 rules/libsysfs.make  |  3 +-
 rules/libucdaemon.make   |  3 +-
 rules/libusb-compat.make |  3 +-
 rules/libusb.make|  3 +-
 rules/libxml2.make   | 11 +++--
 rules/libxmlconfig.make  |  3 +-
 rules/libxslt.make   |  5 +-
 rules/links.make | 11 +++--
 rules/lsuio.make |  3 +-
 rules/ltt-control.make   |  3 +-
 rules/madplay.make   |  4 +-
 rules/memedit.make   |  3 +-
 rules/module-init-tools.make |  3 +-
 rules/mtr.make   |  3 +-
 rules/net-snmp.make  |  7 +--
 rules/netkit-ftp.make|  3 +-
 rules/npth.make  |  3 +-
 rules/pangomm.make   |  3 +-
 rules/pelts_tests.make   |  3 +-
 rules/php8.make  |  3 +-
 rules/pop3spam.make  |  3 +-
 rules/prelink.make   |  3 +-
 rules/ps3-utils.make |  3 +-
 rules/pureftpd.make  |  3 +-
 rules/pv.make|  3 +-
 rules/quota-tools.make   |  3 +-
 rules/readline.make  |  3 +-
 rules/rsync.make |  7 +--
 rules/rsync3.make|  3 +-
 rules/screen.make|  3 +-
 rules/sdl-gfx.make   |  3 +-
 rules/sdl-ttf.make   |  5 +-
 rules/sdl_image.make |  3 +-
 rules/sdl_mixer.make | 58

[ptxdist] [PATCH 1/3] rules: Remove default assignments to _PATH and _ENV

[Ladislav Michl]

From: Ladislav Michl 

Undefined _PATH is set to PATH=$(CROSS_PATH) for target packages,
PATH=$(HOST_PATH) for host packages and PATH=$(HOST_CROSS_PATH) for
cross packages.

Undefined _ENV is set to $(CROSS_ENV) for target packages,
$(HOST_ENV) for host packages and $(HOST_CROSS_ENV) for cross
packages.

Remove those default assignments.

Signed-off-by: Ladislav Michl 
---
 rules/argtable2.make | 3 ---
 rules/bash.make  | 1 -
 rules/bc.make| 3 ---
 rules/boost.make | 1 -
 rules/bustle.make| 1 -
 rules/cairomm.make   | 3 ---
 rules/calibrator.make| 1 -
 rules/classpath.make | 1 -
 rules/daemonize.make | 3 ---
 rules/dash.make  | 3 ---
 rules/dbench.make| 1 -
 rules/diffutils.make | 3 ---
 rules/efax.make  | 1 -
 rules/etherwake.make | 3 ---
 rules/eventlog.make  | 3 ---
 rules/failmalloc.make| 3 ---
 rules/fbtest.make| 1 -
 rules/fbutils.make   | 1 -
 rules/fftw.make  | 3 ---
 rules/findutils.make | 2 --
 rules/frodo.make | 1 -
 rules/glibmm.make| 3 ---
 rules/gnuplot.make   | 3 ---
 rules/grub.make  | 2 --
 rules/haserl.make| 3 ---
 rules/heirloom-mailx.make| 1 -
 rules/host-libgd.make| 3 ---
 rules/host-libpng.make   | 3 ---
 rules/host-libpthread-stubs.make | 3 ---
 rules/host-libsigcpp.make| 3 ---
 rules/host-libxml2.make  | 3 ---
 rules/host-libxslt.make  | 3 ---
 rules/host-pelts.make| 3 ---
 rules/host-tz-database.make  | 1 -
 rules/host-xorg-app-bdftopcf.make| 3 ---
 rules/host-xorg-app-mkfontscale.make | 3 ---
 rules/host-xorg-font-util.make   | 3 ---
 rules/host-xorg-lib-Xfont.make   | 3 ---
 rules/host-xorg-lib-fontenc.make | 3 ---
 rules/host-xorg-lib-xtrans.make  | 3 ---
 rules/hpanel.make| 1 -
 rules/hping.make | 1 -
 rules/hwdata.make| 3 ---
 rules/inotify-tools.make | 3 ---
 rules/iperf.make | 3 ---
 rules/jamvm.make | 3 ---
 rules/jed.make   | 1 -
 rules/joe.make   | 3 ---
 rules/kernel-header.make | 2 --
 rules/killproc.make  | 3 ---
 rules/krb5.make  | 1 -
 rules/libcaca.make   | 1 -
 rules/libcgi.make| 3 ---
 rules/libcgicc.make  | 3 ---
 rules/libconfuse.make| 3 ---
 rules/libdaemon.make | 3 ---
 rules/libftdi.make   | 3 ---
 rules/libgd.make | 3 ---
 rules/libgsloop.make | 3 ---
 rules/libid3tag.make | 3 ---
 rules/libiodbc.make  | 2 --
 rules/liblist.make   | 3 ---
 rules/liblockfile.make   | 2 --
 rules/libltdl.make   | 1 -
 rules/liblzo.make| 3 ---
 rules/libmad.make| 3 ---
 rules/libmng.make| 3 ---
 rules/libpthread-stubs.make  | 3 ---
 rules/librn.make | 3 ---
 rules/librsvg.make   | 3 ---
 rules/libsigcpp.make | 3 ---
 rules/libssh2.make   | 3 ---
 rules/libsysfs.make  | 3 ---
 rules/libucdaemon.make   | 3 ---
 rules/libusb-compat.make | 3 ---
 rules/libxml2.make   | 3 ---
 rules/libxmlconfig.make  | 3 ---
 rules/links.make | 3 ---
 rules/lsuio.make | 3 ---
 rules/ltt-control.make   | 3 ---
 rules/madplay.make   | 3 ---
 rules/memedit.make   | 3 ---
 rules/memtest86p.make| 1 -
 rules/memtester.make | 1 -
 rules/mii-diag.make  | 3 ---
 rules/module-init-tools.make | 2 --
 rules/mtr.make   | 3 ---
 rules/netkit-ftp.make| 2 --
 rules/ntpclient.make | 1 -
 rules/pangomm.make   | 3 ---
 rules/pcmciautils.make   | 3 ---
 rules/pelts_tests.make   | 3 ---
 rules/pnputils.make  | 7 ---
 rules

[ptxdist] [PATCH 0/3] Cleanup autoconf rules

[Ladislav Michl]

Hi there,

this serie removes implicit default assignments and fixes deprecated
_AUTOCONF.

hping package is not touched as it is in staging already and it seems
broken beyond repair to me.

bsdiff is fixed in separate patch - that seems like typo.

l.

[ptxdist] [PATCH] liblzo: version bump 2.08 -> 2.10

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/liblzo.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/liblzo.make b/rules/liblzo.make
index cf1e3c0e4..ee9cfb571 100644
--- a/rules/liblzo.make
+++ b/rules/liblzo.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_LIBLZO) += liblzo
 #
 # Paths and names
 #
-LIBLZO_VERSION := 2.08
-LIBLZO_MD5 := fcec64c26a0f4f4901468f360029678f
+LIBLZO_VERSION := 2.10
+LIBLZO_MD5 := 39d3f3f9c55c87b1e5d6888e1420f4b5
 LIBLZO := lzo-$(LIBLZO_VERSION)
 LIBLZO_SUFFIX  := tar.gz
 LIBLZO_URL := 
http://www.oberhumer.com/opensource/lzo/download/$(LIBLZO).$(LIBLZO_SUFFIX)
-- 
2.32.0

[ptxdist] [PATCH] libcurl: Align help texts

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/libcurl.in | 17 +
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/rules/libcurl.in b/rules/libcurl.in
index 36800b012..d5cf3519d 100644
--- a/rules/libcurl.in
+++ b/rules/libcurl.in
@@ -11,12 +11,13 @@ menuconfig LIBCURL
select CA_CERTIFICATES  if LIBCURL_SSL_CA_CERTIFICATES && RUNTIME
select C_ARES   if LIBCURL_C_ARES
help
-   curl is a command line tool for transferring files with URL syntax, 
supporting
-   FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT, LDAP, LDAPS and 
FILE.
-   curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading,
-   HTTP form based upload, proxies, cookies, user+password authentication
-   (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume,
-   proxy tunneling and a busload of other useful tricks.
+ curl is a command line tool for transferring files with URL syntax,
+ supporting FTP, FTPS, HTTP, HTTPS, SCP, SFTP, TFTP, TELNET, DICT,
+ LDAP, LDAPS and FILE.
+ curl supports SSL certificates, HTTP POST, HTTP PUT, FTP uploading,
+ HTTP form based upload, proxies, cookies, user+password authentication
+ (Basic, Digest, NTLM, Negotiate, kerberos...), file transfer resume,
+ proxy tunneling and a busload of other useful tricks.
 
 if LIBCURL
 
@@ -47,12 +48,12 @@ config LIBCURL_FILE
 config LIBCURL_SMTP
bool "smtp"
help
-   enable smtp support for sending emails
+ enable smtp support for sending emails
 
 config LIBCURL_VERBOSE
bool "verbose messages"
help
-   enable verbose messages, helpful for error indication
+ enable verbose messages, helpful for error indication
 
 config LIBCURL_SSL
bool "ssl"
-- 
2.32.0

[ptxdist] [PATCH] libcurl: Add optional MIME support

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/libcurl.in   | 3 +++
 rules/libcurl.make | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/libcurl.in b/rules/libcurl.in
index f86598747..36800b012 100644
--- a/rules/libcurl.in
+++ b/rules/libcurl.in
@@ -115,4 +115,7 @@ config LIBCURL_CRYPTO_AUTH
 config LIBCURL_LIBSSH2
bool "scp/sftp (via libssh2)"
 
+config LIBCURL_MIME
+   bool "MIME support"
+
 endif
diff --git a/rules/libcurl.make b/rules/libcurl.make
index 5da835d73..e5daf5395 100644
--- a/rules/libcurl.make
+++ b/rules/libcurl.make
@@ -82,7 +82,7 @@ LIBCURL_CONF_OPT  := \
--enable-socketpair \
--$(call ptx/endis, PTXCONF_LIBCURL_HTTP)-http-auth \
--disable-doh \
-   --disable-mime \
+   --$(call ptx/endis, PTXCONF_LIBCURL_MIME)-mime \
--enable-dateparse \
--enable-netrc \
--enable-progress-meter \
-- 
2.32.0

[ptxdist] Golang (again)

[Ladislav Michl]

Hi there,

I found these comments about Go support efforts:
04 Oct 2016 by Clemens Gruber:
https://www.mail-archive.com/ptxdist@pengutronix.de/msg11013.html

and 16 Apr 2021 by Enrico Weigelt:
https://www.mail-archive.com/ptxdist@pengutronix.de/msg17959.html

To my best knowledge, none of them was followed with patches.
One of the projects I'm working on is using Docker and for the sake
of simplicity I'm just deploying Docker provided statically linked
binary. So before starting over, is there anything even hackish
published somewhere?

Best regards,
ladis

Re: [ptxdist] pkg-config-wrapper issue

[Ladislav Michl]

On Mon, Oct 03, 2022 at 06:14:34PM +, Richard OGrady wrote:
> Hello,
> 
> We are using ptxdist 2022.07 and are building 2 packages, libimxvpuapi2 and 
> libimxdmabuffer.
> libimxvpuapi2 depends on libimxdmabuffer and accordingly libimxvpuapi2.in 
> selects libimxdmabuffer.

Those 'depends on' and 'select' are actual keywords used in *.in files
or just a description?

> The libimxvpuapi2 build fails during config.  The config file shows
> 
> Checking for 'libimxdmabuffer >= 0.9.0'
> ['/home/rich/imx6_3D104X_fsl6/Grayhill-iMX6/platform-3D50_std/sysroot-cross/bin/pkg-config',
>  '--cflags', '--libs', 'libimxdmabuffer', '>=', '0.9.0']
> err: pkg-config: warning: blocking 'libimxdmabuffer': not selected by 
> 'libimxvpuapi2'
> 
> So pkg-config-wrapper is blocking the libimxdmabuffer package.  The code that 
> does this in pkg-config-wrapper is:
> 
> for pkg in ${pkgs}; do
>if [[ ! " ${whitelist} " =~ " ${pkg} " && ! "${pkg}" =~ 
> '-uninstalled' ]]; then
>   echo "$(basename ${0}): warning: blocking '${pkg}': not 
> selected by '${PKGCONFIG_WHITELIST_SRC}'" >&${ERROR_FD}
>   exit 1
>fi
>done
> 
> We can get rid of the issue by commenting out the code above in 
> pkg-config-wrapper but it seems that then breaks some other packages.
> Libimxdmabuffer is version 1.1.2.  Both packages are using waf to build.
> 
> What could be going wrong?

It is a bit hard to tell without seeing actutal code, but from description
above I guess you created circular dependency which got dropped.

> Rich OGrady
> 
> 

[ptxdist] [PATCH] rauc: version bump 1.7 -> 1.8

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/rauc.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/rauc.make b/rules/rauc.make
index 6a2d49343..cac186a64 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
 #
 # Paths and names
 #
-RAUC_VERSION   := 1.7
-RAUC_MD5   := aa31fc2a457ba2e3fca8206d9fb9f126
+RAUC_VERSION   := 1.8
+RAUC_MD5   := acd0e788d804bda6645a2506c1068789
 RAUC   := rauc-$(RAUC_VERSION)
 RAUC_SUFFIX:= tar.xz
 RAUC_URL   := 
https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
-- 
2.32.0

Re: [ptxdist] Missing systemd-hwdb dependency?

[Ladislav Michl]

On Fri, Sep 30, 2022 at 03:55:47PM +0200, Ladislav Michl wrote:
> While updating BSP to current git, build stops there:
> 
> 
> target: systemd-hwdb.install
> 
> 
> Removing files from sysroot...
> 
> install: creating directory 
> '{BSP}/platform-armv7a/packages/systemd-hwdb-1/usr/lib/udev'
> /usr/bin/bash: line 1: {BSP}/platform-armv7a/sysroot-host/bin/systemd-hwdb: 
> No such file or directory
> make: *** [{PTXDIST}/rules/systemd-hwdb.make:26: 
> {BSP}/platform-armv7a/state/systemd-hwdb.install] Error 127
> 
> The systemd-hwdb.install rule needs host-systemd, but that is not selected as
> select SYSTEMD_HWDB if SYSTEMD_UDEV_HWDB && RUNTIME
> is used in rules/systemd.in.
> Removing 'RUNTIME' obviously fixes problem.

and in fact, it was done this way until 8b17816376e3
"systemd: move dependencies to the toplevel option"
changed that. Michael?

> How is that intended to be working?
> 
> Thank you,
>   ladis

[ptxdist] Missing systemd-hwdb dependency?

[Ladislav Michl]

While updating BSP to current git, build stops there:


target: systemd-hwdb.install


Removing files from sysroot...

install: creating directory 
'{BSP}/platform-armv7a/packages/systemd-hwdb-1/usr/lib/udev'
/usr/bin/bash: line 1: {BSP}/platform-armv7a/sysroot-host/bin/systemd-hwdb: No 
such file or directory
make: *** [{PTXDIST}/rules/systemd-hwdb.make:26: 
{BSP}/platform-armv7a/state/systemd-hwdb.install] Error 127

The systemd-hwdb.install rule needs host-systemd, but that is not selected as
select SYSTEMD_HWDB if SYSTEMD_UDEV_HWDB && RUNTIME
is used in rules/systemd.in.
Removing 'RUNTIME' obviously fixes problem.

How is that intended to be working?

Thank you,
ladis

[ptxdist] [PATCH] casync: version bump a8f6c841ccfe -> 0efa7abffe5f

[Ladislav Michl]

From: Ladislav Michl 

Includes fix for builds against glibc 2.36.

Signed-off-by: Ladislav Michl 
---
 rules/casync.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/casync.make b/rules/casync.make
index ce4ab93df..61d7ff361 100644
--- a/rules/casync.make
+++ b/rules/casync.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_CASYNC) += casync
 #
 # Paths and names
 #
-CASYNC_VERSION := a8f6c841ccfe59ca8c68aad64df170b64042dce8
-CASYNC_MD5 := 38cf3c9e1be9ac60243031538024aa01
+CASYNC_VERSION := 0efa7abffe5fffbde8c457d3c8fafbdde0bb6e4f
+CASYNC_MD5 := 9b28d76355acfb56ba6ddfcb95951c13
 CASYNC := casync-$(CASYNC_VERSION)
 CASYNC_SUFFIX  := tar.gz
 CASYNC_URL := 
https://github.com/systemd/casync/archive/$(CASYNC_VERSION).$(CASYNC_SUFFIX)
-- 
2.32.0

[ptxdist] [PATCH v2 3/3] util-linux-ng: Rename to util-linux

[Ladislav Michl]

From: Ladislav Michl 

The util-linux-ng project has been renamed back to util-linux as
per maintainer's annoucement dated 1 Dec 2010:
https://lkml.org/lkml/2010/12/1/464

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 v2: - rebased on top of previous patch
 - -M10% option to format-patch to detect renames

 rules/ecryptfs-utils.in   |   2 +-
 rules/glib.in |   4 +-
 rules/host-e2fsprogs.in   |   2 +-
 rules/host-libblkid.in|   6 +-
 rules/host-libuuid.in |   6 +-
 rules/host-systemd.in |   2 +-
 ...st-util-linux-ng.in => host-util-linux.in} |   4 +-
 ...til-linux-ng.make => host-util-linux.make} |   8 +-
 rules/libblkid.in |   8 +-
 rules/libuuid.in  |   8 +-
 rules/machine-id.in   |   4 +-
 rules/nfsutils.in |   4 +-
 rules/owfs.in |   6 +-
 rules/rauc.in |   2 +-
 rules/systemd.in  |   6 +-
 rules/{util-linux-ng.in => util-linux.in} | 216 
 rules/{util-linux-ng.make => util-linux.make} | 234 +-
 rules/xorg-app-xinit.in   |   4 +-
 scripts/migrate/migrate_ptx   |   7 +
 19 files changed, 270 insertions(+), 263 deletions(-)
 rename rules/{host-util-linux-ng.in => host-util-linux.in} (47%)
 rename rules/{host-util-linux-ng.make => host-util-linux.make} (88%)
 rename rules/{util-linux-ng.in => util-linux.in} (74%)
 rename rules/{util-linux-ng.make => util-linux.make} (32%)

diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in
index 60025ae27..ee7e131ad 100644
--- a/rules/ecryptfs-utils.in
+++ b/rules/ecryptfs-utils.in
@@ -15,7 +15,7 @@ menuconfig ECRYPTFS_UTILS
select COREUTILS_STAT   if ECRYPTFS_UTILS_TESTS
select COREUTILS_TR if ECRYPTFS_UTILS_TESTS
select COREUTILS_TRUNCATE   if ECRYPTFS_UTILS_TESTS
-   select UTIL_LINUX_NG_MKFS   if ECRYPTFS_UTILS_TESTS
+   select UTIL_LINUX_MKFS  if ECRYPTFS_UTILS_TESTS
help
  eCryptfs is a POSIX-compliant enterprise-class stacked
  cryptographic filesystem for Linux.
diff --git a/rules/glib.in b/rules/glib.in
index d4215a0df..140bf0131 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -10,8 +10,8 @@ menuconfig GLIB
select LIBFFI
select LIBPCRE
select LIBPCRE_ENABLE_UTF8
-   select UTIL_LINUX_NGif GLIB_LIBMOUNT
-   select UTIL_LINUX_NG_LIBMOUNT   if GLIB_LIBMOUNT
+   select UTIL_LINUX   if GLIB_LIBMOUNT
+   select UTIL_LINUX_LIBMOUNT  if GLIB_LIBMOUNT
select ZLIB
help
  GLib is a library containing many useful C routines for things
diff --git a/rules/host-e2fsprogs.in b/rules/host-e2fsprogs.in
index 122b0ba31..e203b2d7a 100644
--- a/rules/host-e2fsprogs.in
+++ b/rules/host-e2fsprogs.in
@@ -2,7 +2,7 @@
 
 config HOST_E2FSPROGS
tristate
-   select HOST_UTIL_LINUX_NG
+   select HOST_UTIL_LINUX
default y if ALLYES
help
  Useful hosttools for management of ext2 and ext3 filesystems
diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in
index 3b56df248..6a56299ef 100644
--- a/rules/host-libblkid.in
+++ b/rules/host-libblkid.in
@@ -3,12 +3,12 @@
 config HOST_LIBBLKID
tristate
select VIRTUAL
-   select HOST_UTIL_LINUX_NG
+   select HOST_UTIL_LINUX
default y if ALLYES
help
  Helper to select the host packet containing a recent libblkid.so
  library and its header.
 
  The following packages provide libblkid:
- - e2fsprogs  (older version)
- - utils-linux-ng (more recent version)
+ - e2fsprogs   (older version)
+ - utils-linux (more recent version)
diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in
index e1dc15120..e4509c44b 100644
--- a/rules/host-libuuid.in
+++ b/rules/host-libuuid.in
@@ -3,12 +3,12 @@
 config HOST_LIBUUID
tristate
select VIRTUAL
-   select HOST_UTIL_LINUX_NG
+   select HOST_UTIL_LINUX
default y if ALLYES
help
  Helper to select the host packet containing a recent libuuid.so
  library and its header.
 
  The following packages provide libuuid:
- - e2fsprogs  (older version)
- - utils-linux-ng (more recent version)
+ - e2fsprogs   (older version)
+ - utils-linux (more recent version)
diff --git a/rules/host-systemd.in b/rules/host-systemd.in
index 7e14ac8bf..d5c0ed0b5 100644
--- a/rules/host-systemd.in
+++ b/rules/host-systemd.in
@@ -7,5 +7,5 @@ config HOST_SYSTEMD
select HOST_SYSTEM_PYTHON3_JINJA2
select HOST_MESON
select HOST_GPERF
-   select HOST_UTIL

[ptxdist] [PATCH 2/3] util-linux-ng: Use for loop to install libs and tools

[Ladislav Michl]

From: Ladislav Michl 

Options are sorted alphabetically inside each group. Please keep
it that way.

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 - v2: $(ptx/nl) instead of ;

 rules/util-linux-ng.make | 240 ---
 1 file changed, 74 insertions(+), 166 deletions(-)

diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 5421ab50a..74ea0 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -182,6 +182,74 @@ UTIL_LINUX_NG_CONF_OPT := \
 # Target-Install
 # 
 
+UTIL_LINUX_LIB-y :=
+UTIL_LINUX_BIN-y :=
+
+# libraries
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBBLKID)   += blkid
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBUUID)+= uuid
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBMOUNT)   += mount
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)   += smartcols
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBFDISK)   += fdisk
+
+# disk-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_ADDPART)+= sbin/addpart
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CFDISK) += sbin/cfdisk
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_DELPART)+= sbin/delpart
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FDISK)  += sbin/fdisk
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSCK)   += sbin/fsck
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MKFS)   += sbin/mkfs
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MKSWAP) += sbin/mkswap
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_PARTX)  += sbin/partx
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SFDISK) += sbin/sfdisk
+# login-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LOGIN)  += bin/login
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SULOGIN)+= sbin/sulogin
+# misc-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_BLKID)  += sbin/blkid
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FINDFS) += sbin/findfs
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_GETOPT) += bin/getopt
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSBLK)  += bin/lsblk
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MCOOKIE)+= bin/mcookie
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UUIDD)  += sbin/uuidd
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UUIDGEN)+= bin/uuidgen
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_WIPEFS) += sbin/wipefs
+# schedutils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CHRT)   += bin/chrt
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IONICE) += bin/ionice
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_TASKSET)+= bin/taskset
+# sys-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CHMEM)  += bin/chmem
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_DMESG)  += bin/dmesg
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FLOCK)  += bin/flock
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSFREEZE)   += sbin/fsfreeze
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSTRIM) += sbin/fstrim
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_HWCLOCK)+= sbin/hwclock
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IPCRM)  += bin/ipcrm
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IPCS)   += bin/ipcs
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IRQTOP) += bin/irqtop
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LDATTACH)   += sbin/ldattach
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LOSETUP)+= sbin/losetup
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSCPU)  += bin/lscpu
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSIRQ)  += bin/lsirq
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSMEM)  += bin/lsmem
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MOUNT)  += bin/mount
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MOUNTPOINT) += bin/mountpoint
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_NSENTER)+= bin/nsenter
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT) += sbin/pivot_root
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_READPROFILE)+= sbin/readprofile
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SWAPON) += sbin/swapoff 
sbin/swapon
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT)+= sbin/switch_root
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UMOUNT) += bin/umount
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_WDCTL)  += bin/wdctl
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_ZRAMCTL)+= sbin/zramctl
+# term-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_AGETTY) += sbin/agetty
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SETTERM)+= bin/setterm
+# text-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_COLUMN) += bin/column
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LINE)   += bin/line
+
 $(STATEDIR)/util-linux-ng.targetinstall:
@$(call targetinfo)
 
@@ -191,173 +259,13 @@ $(STATEDIR)/util-linux-ng.targetinstall:
@$(call install_fixup, util-linux-ng,AUTHOR,"Robert Schwebel 
")
@$(call install_fixup, 

[ptxdist] [PATCH v2 1/3] util-linux-ng: Sort config entries

[Ladislav Michl]

From: Ladislav Michl 

Split menu entries into groups and sort them alphabetically.

Signed-off-by: Ladislav Michl 
---
 CHANGES:
 - v2: None

 rules/util-linux-ng.in | 610 +
 1 file changed, 312 insertions(+), 298 deletions(-)

diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index b317d6505..772d913ff 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -44,36 +44,7 @@ config UTIL_LINUX_NG_PARTX_TOOLS
 config UTIL_LINUX_NG_SCHEDUTILS
bool
 
-config UTIL_LINUX_NG_AGETTY
-   bool
-   prompt "agetty"
-   help
- A small getty.
-
-config UTIL_LINUX_NG_COLUMN
-   bool
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   prompt "column"
-   help
- Columnate lists.
-
-config UTIL_LINUX_NG_LINE
-   bool
-   prompt "line"
-   help
- The line utility.
-
-config UTIL_LINUX_NG_GETOPT
-   bool
-   prompt "getopt"
-   depends on !BUSYBOX_GETOPT || ALLYES
-   help
- The getopt is used to break up (parse) options in command
- lines for easy parsing by shell procedures, and to check
- for valid options.
-
-comment "BusyBox' getopt is selected!"
-   depends on BUSYBOX_GETOPT
+comment "disk-utils"
 
 config UTIL_LINUX_NG_ADDPART
bool
@@ -82,46 +53,22 @@ config UTIL_LINUX_NG_ADDPART
help
  The addpart utility.
 
-config UTIL_LINUX_NG_DELPART
+config UTIL_LINUX_NG_CFDISK
bool
-   select UTIL_LINUX_NG_PARTX_TOOLS
-   prompt "delpart"
+   select UTIL_LINUX_NG_LIBFDISK
+   select UTIL_LINUX_NG_LIBSMARTCOLS
+   select UTIL_LINUX_NG_FDISKS
+   select UTIL_LINUX_NG_USES_NCURSES
+   prompt "cfdisk"
help
- The delpart utility.
+ cfdisk is a curses based program for partitioning any hard disk drive.
 
-config UTIL_LINUX_NG_PARTX
+config UTIL_LINUX_NG_DELPART
bool
select UTIL_LINUX_NG_PARTX_TOOLS
-   prompt "partx"
-   help
- The partx utility.
-
-config UTIL_LINUX_NG_DMESG
-   bool
-   depends on !BUSYBOX_DMESG || ALLYES
-   prompt "dmesg"
-   help
- The dmesg utility.
-
-comment "BusyBox' dmesg is selected!"
-   depends on BUSYBOX_DMESG
-
-config UTIL_LINUX_NG_NSENTER
-   bool
-   prompt "nsenter"
-   help
- The nsenter utility
-
-config UTIL_LINUX_NG_MOUNTPOINT
-   bool
-   select UTIL_LINUX_NG_LIBMOUNT
-   depends on !BUSYBOX_MOUNTPOINT || ALLYES
-   prompt "mountpoint"
+   prompt "delpart"
help
- The mountpoint utility.
-
-comment "BusyBox' mountpoint is selected!"
-   depends on BUSYBOX_MOUNTPOINT
+ The delpart utility.
 
 config UTIL_LINUX_NG_FDISK
bool
@@ -136,25 +83,26 @@ config UTIL_LINUX_NG_FDISK
 comment "BusyBox' fdisk is selected!"
depends on BUSYBOX_FDISK
 
-config UTIL_LINUX_NG_SFDISK
+config UTIL_LINUX_NG_FSCK
bool
-   prompt "sfdisk"
-   select UTIL_LINUX_NG_LIBFDISK
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   select UTIL_LINUX_NG_FDISKS
+   prompt "fsck"
+   select UTIL_LINUX_NG_LIBMOUNT
+   depends on !BUSYBOX_FSCK || ALLYES
help
- sfdisk - Partition table manipulator for Linux,
- scriptable for unattended partitioning
+ fsck  is  used  to  check and optionally repair one or
+ more Linux file systems. fsck is simply a front-end for
+ the various file system checkers (fsck.fstype) available
+ under Linux.
 
-config UTIL_LINUX_NG_CFDISK
+comment "BusyBox' fsck is selected!"
+   depends on BUSYBOX_FSCK
+
+config UTIL_LINUX_NG_MKFS
bool
-   select UTIL_LINUX_NG_LIBFDISK
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   select UTIL_LINUX_NG_FDISKS
-   select UTIL_LINUX_NG_USES_NCURSES
-   prompt "cfdisk"
+   prompt "mkfs"
help
- cfdisk is a curses based program for partitioning any hard disk drive.
+ The mkfs command is a generic wrapper for fs specific
+ mkfs.* commands.
 
 config UTIL_LINUX_NG_MKSWAP
bool
@@ -173,164 +121,134 @@ config UTIL_LINUX_NG_MKSWAP_UUID
 comment "BusyBox' mkswap is selected!"
depends on BUSYBOX_MKSWAP
 
-config UTIL_LINUX_NG_SWAPON
+config UTIL_LINUX_NG_PARTX
bool
-   prompt "swapon"
-   select UTIL_LINUX_NG_LIBBLKID
-   select UTIL_LINUX_NG_LIBMOUNT
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   depends on !BUSYBOX_SWAPON || ALLYES
+   select UTIL_LINUX_NG_PARTX_TOOLS
+   prompt "partx"
help
- Swapon is used to specify devices on which paging and swapping are to 
take place.
-
-comment "BusyBox' swapon is selected!"
-   depends

[ptxdist] [PATCH] treewide: use $(ptx/nl) instead of ; in foreach loops

[Ladislav Michl]

From: Ladislav Michl 

Signed-off-by: Ladislav Michl 
---
 rules/barebox.make| 2 +-
 rules/connman.make| 2 +-
 rules/easy-rsa.make   | 4 ++--
 rules/ecryptfs-utils.make | 2 +-
 rules/gtk-engines.make| 2 +-
 rules/kbd.make| 2 +-
 rules/libdrm.make | 3 ++-
 rules/libelf.make | 2 +-
 rules/libnl3.make | 3 ++-
 rules/libsndfile.make | 3 ++-
 rules/libva.make  | 2 +-
 rules/lighttpd.make   | 2 +-
 rules/mesa-demos.make | 3 ++-
 rules/munin.make  | 5 +++--
 rules/ncftp.make  | 3 ++-
 rules/opensc.make | 2 +-
 rules/perl.make   | 3 ++-
 rules/poco.make   | 2 +-
 rules/psmisc.make | 2 +-
 rules/rt-tests.make   | 2 +-
 rules/strongswan.make | 2 +-
 rules/systemd.make| 6 +++---
 rules/tomoyo-tools.make   | 6 --
 rules/trace-cmd.make  | 2 +-
 rules/udev.make   | 4 ++--
 rules/vim.make| 2 +-
 rules/vorbis-tools.make   | 3 ++-
 27 files changed, 43 insertions(+), 33 deletions(-)

diff --git a/rules/barebox.make b/rules/barebox.make
index adab3c4fe..a82879e19 100644
--- a/rules/barebox.make
+++ b/rules/barebox.make
@@ -173,7 +173,7 @@ ifneq ($(strip $(BAREBOX_PROGS_TARGET_y)),)
 
@$(foreach prog, $(BAREBOX_PROGS_TARGET_y), \
$(call install_copy, barebox, 0, 0, 0755, -, \
-   /usr/bin/$(prog));)
+   /usr/bin/$(prog))$(ptx/nl))
 
@$(call install_finish, barebox)
 endif
diff --git a/rules/connman.make b/rules/connman.make
index d6eed8aa8..0092ed6ef 100644
--- a/rules/connman.make
+++ b/rules/connman.make
@@ -179,7 +179,7 @@ endif
 ifdef PTXCONF_CONNMAN_TESTS
@$(foreach test, $(CONNMAN_TESTS), \
$(call install_copy, connman, 0, 0, 0755, -, \
-   /usr/sbin/cm-$(test));)
+   /usr/sbin/cm-$(test))$(ptx/nl))
 endif
 
@$(call install_finish, connman)
diff --git a/rules/easy-rsa.make b/rules/easy-rsa.make
index 6d86e5317..bbf915076 100644
--- a/rules/easy-rsa.make
+++ b/rules/easy-rsa.make
@@ -47,11 +47,11 @@ $(STATEDIR)/easy-rsa.targetinstall:
 
@$(foreach script,$(EASY_RSA_INSTALL_SCRIPTS), \
$(call install_copy, easy-rsa, 0, 0, 0755, -, \
-   /usr/share/easy-rsa/$(script));)
+   /usr/share/easy-rsa/$(script))$(ptx/nl))
 
@$(foreach file,$(EASY_RSA_INSTALL_FILES), \
$(call install_copy, easy-rsa, 0, 0, 0644, -, \
-   /usr/share/easy-rsa/$(file));)
+   /usr/share/easy-rsa/$(file))$(ptx/nl))
 
@$(call install_finish, easy-rsa)
 
diff --git a/rules/ecryptfs-utils.make b/rules/ecryptfs-utils.make
index 5c38842d4..b7198d16a 100644
--- a/rules/ecryptfs-utils.make
+++ b/rules/ecryptfs-utils.make
@@ -94,7 +94,7 @@ ifdef PTXCONF_ECRYPTFS_UTILS_MOUNT_ECRYPTFS
 endif
 
@$(foreach prog, $(ECRYPTFS_UTILS_PROGS_y), \
-   $(call install_copy, ecryptfs-utils, 0, 0, 0755, -, $(prog));)
+   $(call install_copy, ecryptfs-utils, 0, 0, 0755, -, 
$(prog))$(ptx/nl))
 
@$(call install_finish, ecryptfs-utils)
 
diff --git a/rules/gtk-engines.make b/rules/gtk-engines.make
index 2544c89cb..bbbe1162d 100644
--- a/rules/gtk-engines.make
+++ b/rules/gtk-engines.make
@@ -60,7 +60,7 @@ $(STATEDIR)/gtk-engines.targetinstall:
 
@$(foreach engine,$(GTK_ENGINES_ENGINES), \
$(call install_lib, gtk-engines, 0, 0, 0644, \
-   gtk-3.0/3.0.0/engines/lib$(engine));)
+   gtk-3.0/3.0.0/engines/lib$(engine))$(ptx/nl))
 
@$(call install_tree, gtk-engines, 0, 0, -, \
/usr/share/themes)
diff --git a/rules/kbd.make b/rules/kbd.make
index 67e4ff165..60bba99b2 100644
--- a/rules/kbd.make
+++ b/rules/kbd.make
@@ -82,7 +82,7 @@ $(STATEDIR)/kbd.targetinstall:
 
@$(foreach tool,$(KBD_TOOLS-y), \
$(call install_copy, kbd, 0, 0, 0755, -, \
-   /usr/bin/$(tool));)
+   /usr/bin/$(tool))$(ptx/nl))
 
 ifdef PTXCONF_KBD_PSFXTABLE
@$(call install_link, kbd, psfxtable, /usr/bin/psfaddtable)
diff --git a/rules/libdrm.make b/rules/libdrm.make
index 212946e97..262cd045d 100644
--- a/rules/libdrm.make
+++ b/rules/libdrm.make
@@ -83,7 +83,8 @@ $(STATEDIR)/libdrm.targetinstall:
@$(call install_lib, libdrm, 0, 0, 0644, libdrm)
 
@$(foreach backend,$(LIBDRM_BACKENDSL-y), \
-   $(call install_lib, libdrm, 0, 0, 0644, libdrm_$(backend));)
+   $(call install_lib, libdrm, 0, 0, 0644, \
+   libdrm_$(backend))$(ptx/nl))
 
 ifdef PTXCONF_LIBDRM_TESTS
@$(call install_copy, libdrm, 0, 0, 0755, -, /usr/bin/modetest)
diff --git a/rules/libelf.make b/rules/libelf.make
index 5b55a8aa2..4f34333a5 100644
--- a/rules/libelf.make
+++ b/rules/libelf.make
@@ -96,7 +96,7 @@ ifdef PTXCONF_LIBELF_ELFSUTILS
make

[ptxdist] [PATCH] util-linux-ng: Rename to util-linux

[Ladislav Michl]

From: Ladislav Michl 

The util-linux-ng project has been renamed back to util-linux as
per maintainer's annoucement dated 1 Dec 2010:
https://lkml.org/lkml/2010/12/1/464

Signed-off-by: Ladislav Michl 
---
 This one applies on top of previous two patches. Now sure
 if it is worth renaming, so consider it as an RFC :)

 rules/ecryptfs-utils.in   |   2 +-
 rules/glib.in |   4 +-
 rules/host-e2fsprogs.in   |   2 +-
 rules/host-libblkid.in|   6 +-
 rules/host-libuuid.in |   6 +-
 rules/host-systemd.in |   2 +-
 rules/host-util-linux-ng.in   |   7 -
 rules/host-util-linux.in  |   7 +
 ...til-linux-ng.make => host-util-linux.make} |   8 +-
 rules/libblkid.in |   8 +-
 rules/libuuid.in  |   8 +-
 rules/machine-id.in   |   4 +-
 rules/nfsutils.in |   4 +-
 rules/owfs.in |   6 +-
 rules/rauc.in |   2 +-
 rules/systemd.in  |   6 +-
 rules/util-linux-ng.make  | 273 --
 rules/{util-linux-ng.in => util-linux.in} | 216 +++---
 rules/util-linux.make | 273 ++
 rules/xorg-app-xinit.in   |   4 +-
 scripts/migrate/migrate_ptx   |   7 +
 21 files changed, 431 insertions(+), 424 deletions(-)
 delete mode 100644 rules/host-util-linux-ng.in
 create mode 100644 rules/host-util-linux.in
 rename rules/{host-util-linux-ng.make => host-util-linux.make} (88%)
 delete mode 100644 rules/util-linux-ng.make
 rename rules/{util-linux-ng.in => util-linux.in} (74%)
 create mode 100644 rules/util-linux.make

diff --git a/rules/ecryptfs-utils.in b/rules/ecryptfs-utils.in
index 60025ae27..ee7e131ad 100644
--- a/rules/ecryptfs-utils.in
+++ b/rules/ecryptfs-utils.in
@@ -15,7 +15,7 @@ menuconfig ECRYPTFS_UTILS
select COREUTILS_STAT   if ECRYPTFS_UTILS_TESTS
select COREUTILS_TR if ECRYPTFS_UTILS_TESTS
select COREUTILS_TRUNCATE   if ECRYPTFS_UTILS_TESTS
-   select UTIL_LINUX_NG_MKFS   if ECRYPTFS_UTILS_TESTS
+   select UTIL_LINUX_MKFS  if ECRYPTFS_UTILS_TESTS
help
  eCryptfs is a POSIX-compliant enterprise-class stacked
  cryptographic filesystem for Linux.
diff --git a/rules/glib.in b/rules/glib.in
index d4215a0df..140bf0131 100644
--- a/rules/glib.in
+++ b/rules/glib.in
@@ -10,8 +10,8 @@ menuconfig GLIB
select LIBFFI
select LIBPCRE
select LIBPCRE_ENABLE_UTF8
-   select UTIL_LINUX_NGif GLIB_LIBMOUNT
-   select UTIL_LINUX_NG_LIBMOUNT   if GLIB_LIBMOUNT
+   select UTIL_LINUX   if GLIB_LIBMOUNT
+   select UTIL_LINUX_LIBMOUNT  if GLIB_LIBMOUNT
select ZLIB
help
  GLib is a library containing many useful C routines for things
diff --git a/rules/host-e2fsprogs.in b/rules/host-e2fsprogs.in
index 122b0ba31..e203b2d7a 100644
--- a/rules/host-e2fsprogs.in
+++ b/rules/host-e2fsprogs.in
@@ -2,7 +2,7 @@
 
 config HOST_E2FSPROGS
tristate
-   select HOST_UTIL_LINUX_NG
+   select HOST_UTIL_LINUX
default y if ALLYES
help
  Useful hosttools for management of ext2 and ext3 filesystems
diff --git a/rules/host-libblkid.in b/rules/host-libblkid.in
index 3b56df248..6a56299ef 100644
--- a/rules/host-libblkid.in
+++ b/rules/host-libblkid.in
@@ -3,12 +3,12 @@
 config HOST_LIBBLKID
tristate
select VIRTUAL
-   select HOST_UTIL_LINUX_NG
+   select HOST_UTIL_LINUX
default y if ALLYES
help
  Helper to select the host packet containing a recent libblkid.so
  library and its header.
 
  The following packages provide libblkid:
- - e2fsprogs  (older version)
- - utils-linux-ng (more recent version)
+ - e2fsprogs   (older version)
+ - utils-linux (more recent version)
diff --git a/rules/host-libuuid.in b/rules/host-libuuid.in
index e1dc15120..e4509c44b 100644
--- a/rules/host-libuuid.in
+++ b/rules/host-libuuid.in
@@ -3,12 +3,12 @@
 config HOST_LIBUUID
tristate
select VIRTUAL
-   select HOST_UTIL_LINUX_NG
+   select HOST_UTIL_LINUX
default y if ALLYES
help
  Helper to select the host packet containing a recent libuuid.so
  library and its header.
 
  The following packages provide libuuid:
- - e2fsprogs  (older version)
- - utils-linux-ng (more recent version)
+ - e2fsprogs   (older version)
+ - utils-linux (more recent version)
diff --git a/rules/host-systemd.in b/rules/host-systemd.in
index 7e14ac8bf..d5c0ed0b5 100644
--- a/rules/host-systemd.in
+++ 

[ptxdist] [PATCH 2/2] util-linux-ng: Use for loop to install libs and tools

[Ladislav Michl]

From: Ladislav Michl 
Date: Sat, 24 Sep 2022 21:42:39 +0200

Options are sorted alphabetically inside each group. Please keep
it that way.

Signed-off-by: Ladislav Michl 
---
 rules/util-linux-ng.make | 239 ---
 1 file changed, 73 insertions(+), 166 deletions(-)

diff --git a/rules/util-linux-ng.make b/rules/util-linux-ng.make
index 5421ab50a..f5e57a56f 100644
--- a/rules/util-linux-ng.make
+++ b/rules/util-linux-ng.make
@@ -182,6 +182,74 @@ UTIL_LINUX_NG_CONF_OPT := \
 # Target-Install
 # 
 
+UTIL_LINUX_LIB-y :=
+UTIL_LINUX_BIN-y :=
+
+# libraries
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBBLKID)   += blkid
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBUUID)+= uuid
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBMOUNT)   += mount
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBSMARTCOLS)   += smartcols
+UTIL_LINUX_LIB-$(PTXCONF_UTIL_LINUX_NG_LIBFDISK)   += fdisk
+
+# disk-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_ADDPART)+= sbin/addpart
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CFDISK) += sbin/cfdisk
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_DELPART)+= sbin/delpart
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FDISK)  += sbin/fdisk
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSCK)   += sbin/fsck
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MKFS)   += sbin/mkfs
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MKSWAP) += sbin/mkswap
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_PARTX)  += sbin/partx
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SFDISK) += sbin/sfdisk
+# login-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LOGIN)  += bin/login
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SULOGIN)+= sbin/sulogin
+# misc-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_BLKID)  += sbin/blkid
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FINDFS) += sbin/findfs
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_GETOPT) += bin/getopt
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSBLK)  += bin/lsblk
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MCOOKIE)+= bin/mcookie
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UUIDD)  += sbin/uuidd
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UUIDGEN)+= bin/uuidgen
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_WIPEFS) += sbin/wipefs
+# schedutils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CHRT)   += bin/chrt
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IONICE) += bin/ionice
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_TASKSET)+= bin/taskset
+# sys-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_CHMEM)  += bin/chmem
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_DMESG)  += bin/dmesg
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FLOCK)  += bin/flock
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSFREEZE)   += sbin/fsfreeze
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_FSTRIM) += sbin/fstrim
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_HWCLOCK)+= sbin/hwclock
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IPCRM)  += bin/ipcrm
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IPCS)   += bin/ipcs
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_IRQTOP) += bin/irqtop
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LDATTACH)   += sbin/ldattach
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LOSETUP)+= sbin/losetup
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSCPU)  += bin/lscpu
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSIRQ)  += bin/lsirq
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LSMEM)  += bin/lsmem
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MOUNT)  += bin/mount
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_MOUNTPOINT) += bin/mountpoint
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_NSENTER)+= bin/nsenter
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_PIVOT_ROOT) += sbin/pivot_root
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_READPROFILE)+= sbin/readprofile
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SWAPON) += sbin/swapoff 
sbin/swapon
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SWITCH_ROOT)+= sbin/switch_root
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_UMOUNT) += bin/umount
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_WDCTL)  += bin/wdctl
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_ZRAMCTL)+= sbin/zramctl
+# term-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_AGETTY) += sbin/agetty
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_SETTERM)+= bin/setterm
+# text-utils
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_COLUMN) += bin/column
+UTIL_LINUX_BIN-$(PTXCONF_UTIL_LINUX_NG_LINE)   += bin/line
+
 $(STATEDIR)/util-linux-ng.targetinstall:
@$(call targetinfo)
 
@@ -191,173 +259,12 @@ $(STATEDIR)/util-linux-ng.targetinstall:
@$(call install_fixup, util-linux-ng,AUTHOR,"Robert Schwebel 
")
@$(call install_fixup, uti

[ptxdist] [PATCH 1/2] util-linux-ng: Sort config entries

[Ladislav Michl]

From: Ladislav Michl 
Date: Sat, 24 Sep 2022 20:57:26 +0200

Split menu entries into groups and sort them alphabetically.

Signed-off-by: Ladislav Michl 
---
 rules/util-linux-ng.in | 610 +
 1 file changed, 312 insertions(+), 298 deletions(-)

diff --git a/rules/util-linux-ng.in b/rules/util-linux-ng.in
index b317d6505..772d913ff 100644
--- a/rules/util-linux-ng.in
+++ b/rules/util-linux-ng.in
@@ -44,36 +44,7 @@ config UTIL_LINUX_NG_PARTX_TOOLS
 config UTIL_LINUX_NG_SCHEDUTILS
bool
 
-config UTIL_LINUX_NG_AGETTY
-   bool
-   prompt "agetty"
-   help
- A small getty.
-
-config UTIL_LINUX_NG_COLUMN
-   bool
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   prompt "column"
-   help
- Columnate lists.
-
-config UTIL_LINUX_NG_LINE
-   bool
-   prompt "line"
-   help
- The line utility.
-
-config UTIL_LINUX_NG_GETOPT
-   bool
-   prompt "getopt"
-   depends on !BUSYBOX_GETOPT || ALLYES
-   help
- The getopt is used to break up (parse) options in command
- lines for easy parsing by shell procedures, and to check
- for valid options.
-
-comment "BusyBox' getopt is selected!"
-   depends on BUSYBOX_GETOPT
+comment "disk-utils"
 
 config UTIL_LINUX_NG_ADDPART
bool
@@ -82,46 +53,22 @@ config UTIL_LINUX_NG_ADDPART
help
  The addpart utility.
 
-config UTIL_LINUX_NG_DELPART
+config UTIL_LINUX_NG_CFDISK
bool
-   select UTIL_LINUX_NG_PARTX_TOOLS
-   prompt "delpart"
+   select UTIL_LINUX_NG_LIBFDISK
+   select UTIL_LINUX_NG_LIBSMARTCOLS
+   select UTIL_LINUX_NG_FDISKS
+   select UTIL_LINUX_NG_USES_NCURSES
+   prompt "cfdisk"
help
- The delpart utility.
+ cfdisk is a curses based program for partitioning any hard disk drive.
 
-config UTIL_LINUX_NG_PARTX
+config UTIL_LINUX_NG_DELPART
bool
select UTIL_LINUX_NG_PARTX_TOOLS
-   prompt "partx"
-   help
- The partx utility.
-
-config UTIL_LINUX_NG_DMESG
-   bool
-   depends on !BUSYBOX_DMESG || ALLYES
-   prompt "dmesg"
-   help
- The dmesg utility.
-
-comment "BusyBox' dmesg is selected!"
-   depends on BUSYBOX_DMESG
-
-config UTIL_LINUX_NG_NSENTER
-   bool
-   prompt "nsenter"
-   help
- The nsenter utility
-
-config UTIL_LINUX_NG_MOUNTPOINT
-   bool
-   select UTIL_LINUX_NG_LIBMOUNT
-   depends on !BUSYBOX_MOUNTPOINT || ALLYES
-   prompt "mountpoint"
+   prompt "delpart"
help
- The mountpoint utility.
-
-comment "BusyBox' mountpoint is selected!"
-   depends on BUSYBOX_MOUNTPOINT
+ The delpart utility.
 
 config UTIL_LINUX_NG_FDISK
bool
@@ -136,25 +83,26 @@ config UTIL_LINUX_NG_FDISK
 comment "BusyBox' fdisk is selected!"
depends on BUSYBOX_FDISK
 
-config UTIL_LINUX_NG_SFDISK
+config UTIL_LINUX_NG_FSCK
bool
-   prompt "sfdisk"
-   select UTIL_LINUX_NG_LIBFDISK
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   select UTIL_LINUX_NG_FDISKS
+   prompt "fsck"
+   select UTIL_LINUX_NG_LIBMOUNT
+   depends on !BUSYBOX_FSCK || ALLYES
help
- sfdisk - Partition table manipulator for Linux,
- scriptable for unattended partitioning
+ fsck  is  used  to  check and optionally repair one or
+ more Linux file systems. fsck is simply a front-end for
+ the various file system checkers (fsck.fstype) available
+ under Linux.
 
-config UTIL_LINUX_NG_CFDISK
+comment "BusyBox' fsck is selected!"
+   depends on BUSYBOX_FSCK
+
+config UTIL_LINUX_NG_MKFS
bool
-   select UTIL_LINUX_NG_LIBFDISK
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   select UTIL_LINUX_NG_FDISKS
-   select UTIL_LINUX_NG_USES_NCURSES
-   prompt "cfdisk"
+   prompt "mkfs"
help
- cfdisk is a curses based program for partitioning any hard disk drive.
+ The mkfs command is a generic wrapper for fs specific
+ mkfs.* commands.
 
 config UTIL_LINUX_NG_MKSWAP
bool
@@ -173,164 +121,134 @@ config UTIL_LINUX_NG_MKSWAP_UUID
 comment "BusyBox' mkswap is selected!"
depends on BUSYBOX_MKSWAP
 
-config UTIL_LINUX_NG_SWAPON
+config UTIL_LINUX_NG_PARTX
bool
-   prompt "swapon"
-   select UTIL_LINUX_NG_LIBBLKID
-   select UTIL_LINUX_NG_LIBMOUNT
-   select UTIL_LINUX_NG_LIBSMARTCOLS
-   depends on !BUSYBOX_SWAPON || ALLYES
+   select UTIL_LINUX_NG_PARTX_TOOLS
+   prompt "partx"
help
- Swapon is used to specify devices on which paging and swapping are to 
take place.
-
-comment "BusyBox' swapon is selected!"
-   depends

[ptxdist] [PATCH 2/2] psmisc: more finegrained tool instalation control

[Ladislav Michl]

From: Ladislav Michl 
Date: Tue, 13 Sep 2022 11:08:59 +0200

Signed-off-by: Ladislav Michl 
---
 rules/psmisc.in   | 42 --
 rules/psmisc.make | 20 +---
 2 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/rules/psmisc.in b/rules/psmisc.in
index 1c3a61414..3d3c7a802 100644
--- a/rules/psmisc.in
+++ b/rules/psmisc.in
@@ -1,18 +1,48 @@
 ## SECTION=shell_and_console
 
-config PSMISC
+menuconfig PSMISC
tristate
-   depends on ( !BUSYBOX_FUSER && !BUSYBOX_KILLALL && !BUSYBOX_PSTREE ) || 
ALLYES
select NCURSES
-   prompt "psmisc"
+   prompt "psmisc"
help
  utilities that use the proc file system
 
-comment "BusyBox' fuser is selected! (psmisc)"
+if PSMISC
+
+config PSMISC_FUSER
+   bool
+   prompt "fuser"
+   depends on !BUSYBOX_FUSER || ALLYES
+
+comment "BusyBox' fuser is selected!"
depends on BUSYBOX_FUSER
 
-comment "BusyBox' killall is selected! (psmisc)"
+config PSMISC_KILLALL
+   bool
+   prompt "killall"
+   depends on !BUSYBOX_KILLALL || ALLYES
+
+comment "BusyBox' killall is selected!"
depends on BUSYBOX_KILLALL
 
-comment "BusyBox' pstree is selected! (psmisc)"
+config PSMISC_PEEKFD
+   bool
+   prompt "peekfd"
+
+config PSMISC_PRTSTAT
+   bool
+   prompt "prtstat"
+
+config PSMISC_PSLOG
+   bool
+   prompt "pslog"
+
+config PSMISC_PSTREE
+   bool
+   prompt "pstree"
+   depends on !BUSYBOX_PSTREE || ALLYES
+
+comment "BusyBox' pstree is selected!"
depends on BUSYBOX_PSTREE
+
+endif
diff --git a/rules/psmisc.make b/rules/psmisc.make
index 66541c615..fdb479877 100644
--- a/rules/psmisc.make
+++ b/rules/psmisc.make
@@ -44,6 +44,16 @@ PSMISC_CONF_OPT  := \
 # Target-Install
 # 
 
+PSMISC_BIN-y   :=
+PSMISC_BIN-$(PTXCONF_PSMISC_FUSER) += fuser
+PSMISC_BIN-$(PTXCONF_PSMISC_KILLALL)   += killall
+ifndef PTXCONF_ARCH_ARM64
+PSMISC_BIN-$(PTXCONF_PSMISC_PEEKFD)+= peekfd
+endif
+PSMISC_BIN-$(PTXCONF_PSMISC_PRTSTAT)   += prtstat
+PSMISC_BIN-$(PTXCONF_PSMISC_PSLOG) += pslog
+PSMISC_BIN-$(PTXCONF_PSMISC_PSTREE)+= pstree
+
 $(STATEDIR)/psmisc.targetinstall:
@$(call targetinfo)
 
@@ -53,13 +63,9 @@ $(STATEDIR)/psmisc.targetinstall:
@$(call install_fixup, psmisc,AUTHOR,"Michael Olbrich 
")
@$(call install_fixup, psmisc,DESCRIPTION,missing)
 
-   @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/fuser)
-   @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/killall)
-ifndef PTXCONF_ARCH_ARM64
-   @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/peekfd)
-endif
-   @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/prtstat)
-   @$(call install_copy, psmisc, 0, 0, 0755, -, /usr/bin/pstree)
+   @$(foreach tool, $(PSMISC_BIN-y), \
+   $(call install_copy, psmisc, 0, 0, 0755, -, \
+   /usr/bin/$(tool));)
 
@$(call install_finish, psmisc)
 
-- 
2.32.0

[ptxdist] [PATCH 1/2] psmisc: version bump 23.2 -> 23.5

[Ladislav Michl]

From: Ladislav Michl 
Date: Tue, 13 Sep 2022 10:47:35 +0200

Signed-off-by: Ladislav Michl 
---
 rules/psmisc.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/psmisc.make b/rules/psmisc.make
index 58852bb39..66541c615 100644
--- a/rules/psmisc.make
+++ b/rules/psmisc.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PSMISC) += psmisc
 #
 # Paths and names
 #
-PSMISC_VERSION := 23.2
-PSMISC_MD5 := 0524258861f00be1a02d27d39d8e5e62
+PSMISC_VERSION := 23.5
+PSMISC_MD5 := 014f0b5d5ab32478a2c57812ad01e1fb
 PSMISC := psmisc-$(PSMISC_VERSION)
 PSMISC_SUFFIX  := tar.xz
 PSMISC_URL := $(call ptx/mirror, SF, psmisc/$(PSMISC).$(PSMISC_SUFFIX))
-- 
2.32.0

Re: [ptxdist] [PATCH 1/2] bbinit: Add rootrw script

[Ladislav Michl]

On Mon, Dec 28, 2020 at 11:59:36AM +0800, yd.zhang wrote:
> The script is remount root as rw. Some embedded systems to root mounted as ro,
> and cannot use custom u-boot and linux-kernel.

What is the use case here? Binary only u-boot and kernel, so modifying
kernel command line is impossible? I would leave such things to BSP.

> Signed-off-by: yd.zhang 
> ---
>  projectroot/etc/init.d/rootrw | 16 
>  rules/initmethod-bbinit.in| 14 ++
>  rules/initmethod-bbinit.make  | 12 
>  3 files changed, 42 insertions(+)
>  create mode 100644 projectroot/etc/init.d/rootrw
> 
> diff --git a/projectroot/etc/init.d/rootrw b/projectroot/etc/init.d/rootrw
> new file mode 100644
> index 0..50e7e5686
> --- /dev/null
> +++ b/projectroot/etc/init.d/rootrw
> @@ -0,0 +1,16 @@
> +#!/bin/sh
> +
> +#
> +# /etc/init.d/rootrw - remount root as rw
> +#
> +
> +case $1 in
> + start)
> + mount -o remount,rw /   
> + ;;
> + stop)
> + ;;
> + *)
> + echo "Usage: $0 [start|stop]"
> + ;;
> +esac
> diff --git a/rules/initmethod-bbinit.in b/rules/initmethod-bbinit.in
> index e0b3be178..2ed37c627 100644
> --- a/rules/initmethod-bbinit.in
> +++ b/rules/initmethod-bbinit.in
> @@ -2,6 +2,14 @@
>  
>  if INITMETHOD_BBINIT
>  
> +config INITMETHOD_BBINIT_ETC_INITD_ROOTRW
> + bool
> + prompt "install /etc/init.d/rootrw"
> + default y
> + select BUSYBOX_MOUNT if BUSYBOX
> + help
> + The /etc/init.d/rootrw script remount root as rw.
> +
>  config INITMETHOD_BBINIT_ETC_INITD_MODULES
>   bool
>   prompt "install /etc/init.d/modules"
> @@ -43,6 +51,12 @@ menu "service startup configuration "
>  
>  source "generated/initmethod_bbinit.in"
>  
> +config INITMETHOD_BBINIT_LINK_ROOTRW
> +  string
> +  depends on INITMETHOD_BBINIT_ETC_INITD_ROOTRW
> +  prompt "rootrw"
> +  default "S01rootrw"
> +
>  config INITMETHOD_BBINIT_LINK_LOGROTATE
>   string
>   depends on INITMETHOD_BBINIT_ETC_INITD_LOGROTATE
> diff --git a/rules/initmethod-bbinit.make b/rules/initmethod-bbinit.make
> index 75d381e29..5440b6032 100644
> --- a/rules/initmethod-bbinit.make
> +++ b/rules/initmethod-bbinit.make
> @@ -45,6 +45,11 @@ $(STATEDIR)/initmethod-bbinit.targetinstall:
>  ##
>  ## start scripts
>  ##
> +
> +ifdef PTXCONF_INITMETHOD_BBINIT_ETC_INITD_ROOTRW
> + @$(call install_alternative, initmethod-bbinit, 0, 0, 0755, 
> /etc/init.d/rootrw, n)
> +endif
> +
>  ifdef PTXCONF_INITMETHOD_BBINIT_ETC_INITD_MODULES
>   @$(call install_alternative, initmethod-bbinit, 0, 0, 0755, 
> /etc/init.d/modules, n)
>   @$(call install_alternative, initmethod-bbinit, 0, 0, 0644, 
> /etc/modules, n)
> @@ -72,6 +77,13 @@ endif
>  ##
>  ## collect start links
>  ##
> +
> +ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_ROOTRW)),)
> + @$(call install_link, initmethod-bbinit, \
> + ../init.d/rootrw, \
> + /etc/rc.d/$(PTXCONF_INITMETHOD_BBINIT_LINK_ROOTRW))
> +endif
> +
>  ifneq ($(call remove_quotes,$(PTXCONF_INITMETHOD_BBINIT_LINK_LOGROTATE)),)
>   @$(call install_link, initmethod-bbinit, \
>   ../init.d/logrotate, \
> -- 
> 2.29.2
> 
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to 
> ptxdist-requ...@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

[ptxdist] [PATCH] mc: version bump 4.8.23 -> 4.8.25

[Ladislav Michl]

Fixes compilation with gcc-10

Signed-off-by: Ladislav Michl 
---
 rules/mc.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/mc.make b/rules/mc.make
index 136bdae68..67fc61690 100644
--- a/rules/mc.make
+++ b/rules/mc.make
@@ -15,8 +15,8 @@ PACKAGES-$(PTXCONF_MC) += mc
 #
 # Paths and names
 #
-MC_VERSION := 4.8.23
-MC_MD5 := 466c3135f727f8ac2102d060a080ace3
+MC_VERSION := 4.8.25
+MC_MD5 := 19f14d368001aac454c28a2ddd2e851b
 MC := mc-$(MC_VERSION)
 MC_SUFFIX  := tar.xz
 MC_URL := http://ftp.midnight-commander.org/$(MC).$(MC_SUFFIX)
-- 
2.29.2

___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

Re: [ptxdist] [PATCH] machine-id: make using rc-once optional

[Ladislav Michl]

On Fri, Nov 27, 2020 at 09:38:41AM +0100, Michael Olbrich wrote:
> On Wed, Nov 25, 2020 at 05:56:49PM +0100, Artur Wiebe wrote:
> > If not set only an empty /etc/machine-id will be installed.
> > 
> > Signed-off-by: Artur Wiebe 
> > ---
> >  rules/machine-id.in   | 22 ++
> >  rules/machine-id.make |  4 
> >  rules/machine-id.postinst |  5 +++--
> >  3 files changed, 25 insertions(+), 6 deletions(-)
> > 
> > diff --git a/rules/machine-id.in b/rules/machine-id.in
> > index f18fec554..2a3901f41 100644
> > --- a/rules/machine-id.in
> > +++ b/rules/machine-id.in
> > @@ -1,11 +1,25 @@
> >  ## SECTION=initmethod
> >  
> > -config MACHINE_ID
> > +menuconfig MACHINE_ID
> > tristate
> > prompt "create /etc/machine-id"
> > -   select RC_ONCE  if RUNTIME
> > -   select UTIL_LINUX_NGif !INITMETHOD_SYSTEMD
> > -   select UTIL_LINUX_NG_UUIDGENif !INITMETHOD_SYSTEMD
> > +   select RC_ONCE  if MACHINE_ID_RC_ONCE && RUNTIME
> > +   select UTIL_LINUX_NGif MACHINE_ID_RC_ONCE && 
> > !INITMETHOD_SYSTEMD
> > +   select UTIL_LINUX_NG_UUIDGENif MACHINE_ID_RC_ONCE && 
> > !INITMETHOD_SYSTEMD
> > help
> >   Enable this to make sure there is always a unique /etc/machine-id
> >   available in the system.
> > +
> > +if MACHINE_ID
> > +
> > +config MACHINE_ID_RC_ONCE
> > +   bool "generate (bbinit) or save (systemd) machine-id using rc-once at 
> > first boot"
> > +   default y
> 
> Hmmm, maybe should have no prompt and 'depends on RC_ONCE' (instead of
> selecting it above). I don't think there is a use-case for not persisting
> the machine-id if rc-once is available.

Well, one of my systems has a service for that. Machine-id is generated using
hardware info. In that case I do not mind as RC_ONCE is not selected, but there
is a use-case in general. However it is still possible to override
rules/machine-id.in in BSP, so...

> This is different from the ssh server key case: There are other ways to
> create the keys.

There are other ways to create machine-id too...

___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

[ptxdist] [PATCH] modemmanager: version bump 1.14.6 -> 1.14.8

[Ladislav Michl]

Signed-off-by: Ladislav Michl 
---
 rules/modemmanager.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index ec475b121..09b3bc422 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
 #
 # Paths and names
 #
-MODEMMANAGER_VERSION   := 1.14.6
-MODEMMANAGER_MD5   := fdeef6399ab8937e5e0e09740d4a6585
+MODEMMANAGER_VERSION   := 1.14.8
+MODEMMANAGER_MD5   := 138762a976a654d244744963d2250372
 MODEMMANAGER   := ModemManager-$(MODEMMANAGER_VERSION)
 MODEMMANAGER_SUFFIX:= tar.xz
 MODEMMANAGER_URL   := 
https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
-- 
2.29.2


___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

Re: [ptxdist] [PATCH] DRAFT: openssh: make host key generation optional

[Ladislav Michl]

On Sat, Nov 14, 2020 at 09:34:47PM +0100, Roland Hieber wrote:
> On Fri, Nov 13, 2020 at 06:46:48PM +0100, Ladislav Michl wrote:
> > On Fri, Nov 13, 2020 at 03:19:55PM +0100, Artur Wiebe wrote:
> > > How can openssh.postinst be disabled from within the rule files?
> > 
> > The very same could be achieved with symlink in your BSP:
> > projectroot/etc/rc.once.d/openssh -> /dev/null
> 
> I don't understand why you want to disable this. The SSH server will not
> start without host keys. Or do you want to install a static version of
> the host keys generated at build time? 

Yes, keys are static, generated at build time. Root filesystem is
read-only.

> If so, there should be an option for this. But for now, in my opinion,
> disabling OPENSSH_SSHD_GENKEYS will just lead to a broken SSH server.

As this is easy to solve at BSP level I never thought it could
be a thing :)

ladis

___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

Re: [ptxdist] [PATCH] DRAFT: openssh: make host key generation optional

[Ladislav Michl]

On Fri, Nov 13, 2020 at 03:19:55PM +0100, Artur Wiebe wrote:
> How can openssh.postinst be disabled from within the rule files?

The very same could be achieved with symlink in your BSP:
projectroot/etc/rc.once.d/openssh -> /dev/null

> ---
>  rules/openssh.in   | 14 ++
>  rules/openssh.make |  2 ++
>  2 files changed, 12 insertions(+), 4 deletions(-)
> 
> diff --git a/rules/openssh.in b/rules/openssh.in
> index 09f5c..f9d1affbd 100644
> --- a/rules/openssh.in
> +++ b/rules/openssh.in
> @@ -6,10 +6,10 @@ menuconfig OPENSSH
>   select OPENSSL
>   select LIBC_CRYPT
>   select LIBC_UTIL
> - select RC_ONCE if OPENSSH_SSHD && RUNTIME
> + select RC_ONCE if OPENSSH_SSHD_GENKEYS && RUNTIME
>   select BUSYBOX_START_STOP_DAEMON if OPENSSH_SSHD_STARTSCRIPT
>   select LIBSELINUX if GLOBAL_SELINUX
> - select OPENSSH_KEYGEN if OPENSSH_SSHD
> + select OPENSSH_KEYGEN if OPENSSH_SSHD_GENKEYS
>   prompt "openssh   "
>   help
> secure shell client/server, an rlogin/rsh/rcp replacement
> @@ -40,15 +40,21 @@ config OPENSSH_SSHD
>  config OPENSSH_SSHD_STARTSCRIPT
>   bool
>   default y
> - depends on OPENSSH_SSHD
> + depends on OPENSSH_SSHD && INITMETHOD_BBINIT
>   prompt "install /etc/init.d/openssh"
>  
>  config OPENSSH_SSHD_SYSTEMD_UNIT
>   bool
>   default y
> - depends on OPENSSH_SSHD && SYSTEMD
> + depends on OPENSSH_SSHD && INITMETHOD_SYSTEMD
>   prompt "install systemd unit files for sshd"
>  
> +config OPENSSH_SSHD_GENKEYS
> + bool
> + default y
> + depends on OPENSSH_SSHD
> + prompt "generate sshd host keys at first boot"
> +
>  config OPENSSH_SCP
>   bool "scp"
>   help
> diff --git a/rules/openssh.make b/rules/openssh.make
> index cae04487f..0da2f23cd 100644
> --- a/rules/openssh.make
> +++ b/rules/openssh.make
> @@ -105,8 +105,10 @@ ifdef PTXCONF_OPENSSH_SSHD
>   /etc/ssh/moduli)
>   @$(call install_copy, openssh, 0, 0, 0755, -, \
>   /usr/sbin/sshd)
> +ifdef OPENSSH_SSHD_GENKEYS
>   @$(call install_alternative, openssh, 0, 0, 0755, 
> /etc/rc.once.d/openssh)
>  endif
> +endif
>  
>  ifdef PTXCONF_INITMETHOD_BBINIT
>  ifdef PTXCONF_OPENSSH_SSHD_STARTSCRIPT
> -- 
> 2.29.2
> 
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to 
> ptxdist-requ...@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

[ptxdist] [PATCH] cryptsetup: version bump 2.3.2 -> 2.3.4

[Ladislav Michl]

Signed-off-by: Ladislav Michl 
---
 rules/cryptsetup.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/cryptsetup.make b/rules/cryptsetup.make
index a997933f8..f3b26d9e3 100644
--- a/rules/cryptsetup.make
+++ b/rules/cryptsetup.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_CRYPTSETUP) += cryptsetup
 #
 # Paths and names
 #
-CRYPTSETUP_VERSION := 2.3.2
-CRYPTSETUP_MD5 := ced7b4720a6cc2dadeeb46b8e52b080e
+CRYPTSETUP_VERSION := 2.3.4
+CRYPTSETUP_MD5 := 911272e73181fdc850bb4d25103a9f83
 CRYPTSETUP := cryptsetup-$(CRYPTSETUP_VERSION)
-CRYPTSETUP_SUFFIX  := tar.gz
+CRYPTSETUP_SUFFIX  := tar.xz
 CRYPTSETUP_URL := 
https://www.kernel.org/pub/linux/utils/cryptsetup/v$(basename 
$(CRYPTSETUP_VERSION))/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
 CRYPTSETUP_SOURCE  := $(SRCDIR)/$(CRYPTSETUP).$(CRYPTSETUP_SUFFIX)
 CRYPTSETUP_DIR := $(BUILDDIR)/$(CRYPTSETUP)
-- 
2.29.1


___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

Re: [ptxdist] systemctl daemon-reload fails

[Ladislav Michl]

On Tue, Oct 20, 2020 at 08:57:27AM -0400, Jon Ringle wrote:
> On Tue, Oct 20, 2020 at 2:06 AM Ladislav Michl  wrote:
> >
> > On Mon, Oct 19, 2020 at 02:32:49PM -0400, Jon Ringle wrote:
> > > I recently updated to ptxdist-2020.10.0 for running on our device that
> > > has 64MB or physical ram.
> > > With systemd-246.6 that is installed,I'm finding that systemd
> > > daemon-reload now fails:
> > >
> > > $ sudo systemctl daemon-reload
> > > Failed to reload daemon: Refusing to reload, not enough space
> > > available on /run/systemd. Currently, 10.6M are free, but a safety
> > > buffer of 16.0M is enforced.
> > >
> > > Has anyone else encountered this issue?
> > > What is the recommended way to handle this? I'm hesitant to increase
> > > the size of /run in fstab because of the limited RAM I have available.
> >
> > I lowered RELOAD_DISK_SPACE_MIN with hope for the best. In my scenario,
> > daemon-reload is almost never called - only in case technician is doing
> > some tests on device and there is always watchdog to fix failed software.
> 
> Yeah, I noticed that systemd hardcoded the value of
> RELOAD_DISK_SPACE_MIN to 16MB.
> What did you patch your value to be?

1MB, previously there was no such check and it was added to fix
https://github.com/systemd/systemd/issues/5016
and those 16MB seems to be just a number big enough...

> Our firmware update script calls `systemctl daemon-reload` after
> installing an updated ipk package which then leads to failing to
> restart our application service

Btw, we are using rauc and casync to update firmware, so device gets
rebooted once done - but casync is storage hungry as well, so data
partition is sacrificed for update purposes and casync's TMP is set
to point there; all logged data are downloaded and erased before
firmware update begins.

ladis

> -Jon
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to 
> ptxdist-requ...@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

Re: [ptxdist] systemctl daemon-reload fails

[Ladislav Michl]

On Mon, Oct 19, 2020 at 02:32:49PM -0400, Jon Ringle wrote:
> I recently updated to ptxdist-2020.08.0 for running on our device that
> has 64MB or physical ram.

Same here (but running ptxdist-2020.10.0)

> With systemd-246.6 that is installed,I'm finding that systemd
> daemon-reload now fails:
> 
> $ sudo systemctl daemon-reload
> Failed to reload daemon: Refusing to reload, not enough space
> available on /run/systemd. Currently, 10.6M are free, but a safety
> buffer of 16.0M is enforced.
> 
> Has anyone else encountered this issue?
> What is the recommended way to handle this? I'm hesitant to increase
> the size of /run in fstab because of the limited RAM I have available.

I lowered RELOAD_DISK_SPACE_MIN with hope for the best. In my scenario,
daemon-reload is almost never called - only in case technician is doing
some tests on device and there is always watchdog to fix failed software.

(we are slowly reaching point where this devices will be unable to run
recent kernel and systemd)

ladis

> Thanks
> -Jon
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de
> To unsubscribe, send a mail with subject "unsubscribe" to 
> ptxdist-requ...@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

[ptxdist] [PATCH] modemmanager: version bump 1.14.2 -> 1.14.6

[Ladislav Michl]

Signed-off-by: Ladislav Michl 
---
 rules/modemmanager.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/modemmanager.make b/rules/modemmanager.make
index b592694a8..ec475b121 100644
--- a/rules/modemmanager.make
+++ b/rules/modemmanager.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_MODEMMANAGER) += modemmanager
 #
 # Paths and names
 #
-MODEMMANAGER_VERSION   := 1.14.2
-MODEMMANAGER_MD5   := 3a4a94376ca6e8dbfb964394022f7a0e
+MODEMMANAGER_VERSION   := 1.14.6
+MODEMMANAGER_MD5   := fdeef6399ab8937e5e0e09740d4a6585
 MODEMMANAGER   := ModemManager-$(MODEMMANAGER_VERSION)
 MODEMMANAGER_SUFFIX:= tar.xz
 MODEMMANAGER_URL   := 
https://www.freedesktop.org/software/ModemManager/$(MODEMMANAGER).$(MODEMMANAGER_SUFFIX)
-- 
2.28.0


___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de

[ptxdist] [PATCH v3 02/29] setup: introduce GNOME mirror

[Ladislav Michl]

Signed-off-by: Ladislav Michl 
---
 Changes:
 -v2: regerate config/setup/ptxdistrc.default
 -v3: regerate config/setup/ptxdistrc.default again

 config/setup/Kconfig   | 7 +++
 config/setup/ptxdistrc.default | 1 +
 2 files changed, 8 insertions(+)

diff --git a/config/setup/Kconfig b/config/setup/Kconfig
index ab2b8e83a..f3fe2e8e8 100644
--- a/config/setup/Kconfig
+++ b/config/setup/Kconfig
@@ -144,6 +144,13 @@ config SETUP_DEBMIRROR
  The Debian pool mirror to use for downloading various
  components of the target root filesystem.
 
+config SETUP_GNOMEMIRROR
+   string
+   default "https://download.gnome.org/sources 
https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.gnome.org/sources;
+   prompt "GNOME Mirror"
+   help
+ For all GNOME related packages enter an available mirror here.
+
 config SETUP_GNUMIRROR
string
default "https://ftp.gnu.org/gnu http://ftp.uni-kl.de/pub/gnu;
diff --git a/config/setup/ptxdistrc.default b/config/setup/ptxdistrc.default
index 50e751f20..8e870e27c 100644
--- a/config/setup/ptxdistrc.default
+++ b/config/setup/ptxdistrc.default
@@ -34,6 +34,7 @@ PTXCONF_SETUP_SRCDIR="${PTXDIST_WORKSPACE}/src"
 
PTXCONF_SETUP_PTXMIRROR="https://www.pengutronix.de/software/ptxdist/temporary-src;
 PTXCONF_SETUP_DEBMIRROR="http://ftp.uni-kl.de/debian 
http://archive.debian.org/debian;
 PTXCONF_SETUP_GNUMIRROR="https://ftp.gnu.org/gnu http://ftp.uni-kl.de/pub/gnu;
+PTXCONF_SETUP_GNOMEMIRROR="https://download.gnome.org/sources 
https://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.gnome.org/sources;
 PTXCONF_SETUP_KERNELMIRROR="https://www.kernel.org/pub/linux 
http://www.linux-mips.org/pub/linux/mips http://mirror.linux.org.au/linux;
 PTXCONF_SETUP_PYPIMIRROR="https://files.pythonhosted.org/packages/source;
 PTXCONF_SETUP_SFMIRROR="http://downloads.sourceforge.net/sourceforge;
-- 
2.28.0

___
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to 
ptxdist-requ...@pengutronix.de