Re: [ptxdist] [PATCH] rauc: optional rauc-mark-good.service installation

[Michael Tretter]

On Wed, 22 May 2024 16:25:54 +0200, r.czerwin...@pengutronix.de wrote:
> From: Rouven Czerwinski 
> 
> Make the installation and enablement of the ruac-mark-good.service
  ^ rauc-mark-good.service
> optional. This is useful for BSPs which have the application indicate if
> startup was successful instead of indicating succesful startup using the
   ^ successful
> rauc-mark-good-service.
> 
> Signed-off-by: Rouven Czerwinski 
> ---
>  rules/rauc.in   | 10 ++
>  rules/rauc.make |  2 ++
>  2 files changed, 12 insertions(+)
> 
> diff --git a/rules/rauc.in b/rules/rauc.in
> index ee9c3f955..c65e3f04f 100644
> --- a/rules/rauc.in
> +++ b/rules/rauc.in
> @@ -46,6 +46,16 @@ config RAUC_SERVICE
> that communicate with each other via D-Bus interface.
> Only deactivate this if you have a system that does not provide D-Bus!
>  
> +config RAUC_MARK_GOOD
> + bool
> + prompt "Enable systemd mark-good service"
> + default y
> + help
> +   Installs and enables the default rauc-mark-good.service shipped with 
> rauc.
> +   The rauc-mark-good.service runs when the systemd has successfully 
> started
> +   up, which is not desirable if the application indicates the succesful
  ^ 
successful
> +   startup.
> +
>  config RAUC_NETWORK
>   bool
>   prompt "Enable network support"
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 38577f94d..7aed77e89 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -95,10 +95,12 @@ ifdef PTXCONF_INITMETHOD_SYSTEMD
>   @$(call install_alternative, rauc, 0, 0, 0644, \
>   /usr/lib/systemd/system/rauc.service)
>  
> +ifdef PTXCONF_RAUC_MARK_GOOD
>   @$(call install_alternative, rauc, 0, 0, 0644, \
>   /usr/lib/systemd/system/rauc-mark-good.service)
>   @$(call install_link, rauc, ../rauc-mark-good.service, \
>   
> /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service)
> +endif
>  else
>   @$(call install_copy, rauc, 0, 0, 0755, -, \
>   /usr/libexec/rauc-service.sh)
> -- 
> 2.44.0
> 
> 
> 

Re: [ptxdist] [PATCH v2 2/2] pipewire: version bump 1.0.1 -> 1.0.3

[Michael Tretter]

On Wed, 15 May 2024 09:04:24 +0200, Michael Riesch wrote:
> https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/1.0.3
> 
> Signed-off-by: Michael Riesch 

Reviewed-by: Michael Tretter 

> ---
>  rules/pipewire.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/pipewire.make b/rules/pipewire.make
> index 8747ebe6c..322ae70a1 100644
> --- a/rules/pipewire.make
> +++ b/rules/pipewire.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire
>  #
>  # Paths and names
>  #
> -PIPEWIRE_VERSION := 1.0.1
> -PIPEWIRE_MD5 := d70bde8000d62df6c03c6dd928ab8948
> +PIPEWIRE_VERSION := 1.0.3
> +PIPEWIRE_MD5 := 92eb16fb925aa9dc9191d8ef7b04687d
>  PIPEWIRE := pipewire-$(PIPEWIRE_VERSION)
>  PIPEWIRE_SUFFIX  := tar.bz2
>  PIPEWIRE_URL := 
> https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)
> 
> -- 
> 2.34.1
> 
> 
> 

Re: [ptxdist] [PATCH v2 1/2] libcamera: version bump 0.0.5 -> 0.2.0

[Michael Tretter]

On Wed, 15 May 2024 09:04:23 +0200, Michael Riesch wrote:
> Due to an API breakage in libcamera it may be necessary to update the
> consumers of the library. One example is pipewire, which needs to be
> updated to at least 1.0.2.
> 
> Signed-off-by: Michael Riesch 

Reviewed-by: Michael Tretter 

> ---
>  rules/libcamera.make | 5 +++--
>  1 file changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/libcamera.make b/rules/libcamera.make
> index 928a95654..23a3c1d6b 100644
> --- a/rules/libcamera.make
> +++ b/rules/libcamera.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera
>  #
>  # Paths and names
>  #
> -LIBCAMERA_VERSION:= 0.0.5
> -LIBCAMERA_MD5:= cc2f5c0c051319a7e853dc6916807ce5
> +LIBCAMERA_VERSION:= 0.2.0
> +LIBCAMERA_MD5:= 08f0681221c654838e54e6b3a32f89b5
>  LIBCAMERA:= libcamera-$(LIBCAMERA_VERSION)
>  LIBCAMERA_SUFFIX := tar.gz
>  LIBCAMERA_URL:= 
> https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$(LIBCAMERA_VERSION)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX)
> @@ -79,6 +79,7 @@ LIBCAMERA_CONF_OPT  := \
>   -Dqcam=$(call ptx/endis,PTXCONF_LIBCAMERA_QCAM)d \
>   -Dtest=false \
>   -Dtracing=disabled \
> + -Dudev=enabled \
>   -Dv4l2=false \
>   -Dpycamera=disabled
>  
> 
> -- 
> 2.34.1
> 
> 
> 

Re: [ptxdist] [PATCH] libtraceevent: new package

[Michael Tretter]

On Wed, 08 May 2024 11:08:45 +0200, Uwe Kleine-König wrote:
> This is required for perf (PTXCONF_KERNEL_TOOL_PERF) to work with
> tracepoints and enable the subcommands kmem, kwork, lock, sched and
> timechart. The perf recipe is adapted accordingly to make use of it.

Nice. Thanks for the patch.

Maybe the addition of libtraceevent and the change to use it in perf
could be separate patches.

> 
> Signed-off-by: Uwe Kleine-König 
> ---
>  rules/kernel.in  |  1 +
>  rules/kernel.make|  1 -
>  rules/libtraceevent.in   |  8 +
>  rules/libtraceevent.make | 75 
>  4 files changed, 84 insertions(+), 1 deletion(-)
>  create mode 100644 rules/libtraceevent.in
>  create mode 100644 rules/libtraceevent.make
> 
> diff --git a/rules/kernel.in b/rules/kernel.in
> index 817481577..862d52598 100644
> --- a/rules/kernel.in
> +++ b/rules/kernel.in
> @@ -6,6 +6,7 @@ menuconfig KERNEL
>   select LIBELF_LIBDW if KERNEL_TOOL_PERF
>   select SLANGif KERNEL_TOOL_PERF
>   select BINUTILS if KERNEL_TOOL_PERF
> + select LIBTRACEEVENTif KERNEL_TOOL_PERF
>   select LIBUNWINDif KERNEL_TOOL_PERF
>  
>  if KERNEL
> diff --git a/rules/kernel.make b/rules/kernel.make
> index d82aa27fb..0fe4f1e1b 100644
> --- a/rules/kernel.make
> +++ b/rules/kernel.make
> @@ -223,7 +223,6 @@ KERNEL_TOOL_PERF_OPTS := \
>   NO_LIBBIONIC=1 \
>   NO_LIBCRYPTO=1 \
>   NO_LIBDW_DWARF_UNWIND= \
> - NO_LIBTRACEEVENT=1 \
>   NO_PERF_READ_VDSO32=1 \
>   NO_PERF_READ_VDSOX32=1 \
>   NO_ZLIB= \
> diff --git a/rules/libtraceevent.in b/rules/libtraceevent.in
> new file mode 100644
> index 0..de1c7675f
> --- /dev/null
> +++ b/rules/libtraceevent.in
> @@ -0,0 +1,8 @@
> +## SECTION=project_specific

The section is wrong: Maybe SECTION=system_libraries

> +
> +config LIBTRACEEVENT
> + bool
> + prompt "libtraceevent"
> + select HOST_MESON
> + help
> +   FIXME

Add a help text: Maybe "Linux kernel trace event library"

> diff --git a/rules/libtraceevent.make b/rules/libtraceevent.make
> new file mode 100644
> index 0..6017a983c
> --- /dev/null
> +++ b/rules/libtraceevent.make
> @@ -0,0 +1,75 @@
> +# -*-makefile-*-
> +#
> +# Copyright (C) 2024 by Uwe Kleine-Koenig 
> +#
> +# For further information about the PTXdist project and license conditions
> +# see the README file.
> +#
> +
> +#
> +# We provide this package
> +#
> +PACKAGES-$(PTXCONF_LIBTRACEEVENT) += libtraceevent
> +
> +#
> +# Paths and names
> +#
> +LIBTRACEEVENT_VERSION:= 1.8.2
> +LIBTRACEEVENT_MD5:= 671645965e835ef4236b96851fb889c9
> +LIBTRACEEVENT:= libtraceevent-$(LIBTRACEEVENT_VERSION)
> +LIBTRACEEVENT_SUFFIX := tar.xz
> +LIBTRACEEVENT_URL:= 
> https://git.kernel.org/pub/scm/libs/libtrace/libtraceevent.git;tag=libtraceevent-$(LIBTRACEEVENT_VERSION)
> +LIBTRACEEVENT_SOURCE := $(SRCDIR)/$(LIBTRACEEVENT).$(LIBTRACEEVENT_SUFFIX)
> +LIBTRACEEVENT_DIR:= $(BUILDDIR)/$(LIBTRACEEVENT)
> +LIBTRACEEVENT_LICENSE:= LGPL-2.1 + GPL-2.0

LIBTRACEEVENT_LICENSE   := LGPL-2.1 AND GPL-2.0

Maybe set LIBTRACEEVENT_LICENSE_FILES, too.

> +
> +# 
> 
> +# Get
> +# 
> 
> +
> +#$(LIBTRACEEVENT_SOURCE):
> +#@$(call targetinfo)
> +#@$(call get, LIBTRACEEVENT)

Drop the empty get stage.

> +
> +# 
> 
> +# Prepare
> +# 
> 
> +
> +#LIBTRACEEVENT_CONF_ENV  := $(CROSS_ENV)
> +
> +#
> +# meson
> +#
> +LIBTRACEEVENT_CONF_TOOL  := meson
> +LIBTRACEEVENT_CONF_OPT   := \
> + $(CROSS_MESON_USR) \
> + -Ddoc=false

The list isn't complete. Use the scripts/configure_helper.py to
explicitly set all options.

> +
> +# 
> 
> +# Target-Install
> +# 
> 
> +
> +$(STATEDIR)/libtraceevent.targetinstall:
> + @$(call targetinfo)
> +
> + @$(call install_init, libtraceevent)
> + @$(call install_fixup, libtraceevent, PRIORITY, optional)
> + @$(call install_fixup, libtraceevent, SECTION, base)
> + @$(call install_fixup, libtraceevent, AUTHOR, "Uwe Kleine-König 
> ")
> + @$(call install_fixup, libtraceevent, DESCRIPTION, missing)
> +
> + @$(call install_lib, libtraceevent, 0, 0, 0644, libtraceevent)
> +
> + @$(call install_finish, libtraceevent)
> +
> + @$(call touch)
> +
> +# 
> 
> +# Clean
> +# 
> 
> +
> +#$(STATEDIR)/libtraceevent.clean:
> +#@$(call targetinfo)
> +#@$(call 

[ptxdist] [PATCH] rauc/image-rauc: move BUNDLE_VERSION to image-rauc

[Michael Tretter]

RAUC_BUNDLE_VERSION is only used by the image rule to generate the
bundle. Therefore, it belongs into image-rauc.

This fixes the issue that RAUC is rebuilt on every commit in a BSP, as a
commit changes PTXDIST_BSP_AUTOVERSION, which in turn changes the
configuration of RAUC. The rebuild is not necessary and only the RAUC
bundle should be rebuilt if the version has changed.

Rename the config, as the move to the image moves the item from the
ptxconfig to the platformconfig.

Signed-off-by: Michael Tretter 
---
 platforms/image-rauc.in | 7 +++
 rules/image-rauc.make   | 2 +-
 rules/rauc.in   | 7 ---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/platforms/image-rauc.in b/platforms/image-rauc.in
index 2070cf0069c1..549a6b32d9ec 100644
--- a/platforms/image-rauc.in
+++ b/platforms/image-rauc.in
@@ -19,6 +19,13 @@ menuconfig IMAGE_RAUC
 
 if IMAGE_RAUC
 
+config IMAGE_RAUC_BUNDLE_VERSION
+   string
+   prompt "RAUC Bundle Version"
+   default "${PTXDIST_BSP_AUTOVERSION}"
+   help
+ Version that will be placed in the bundle's metadata.
+
 config IMAGE_RAUC_DESCRIPTION
prompt "RAUC Bundle Description"
string
diff --git a/rules/image-rauc.make b/rules/image-rauc.make
index a05c19f61de2..30e460dd8cd7 100644
--- a/rules/image-rauc.make
+++ b/rules/image-rauc.make
@@ -58,7 +58,7 @@ IMAGE_RAUC_ENV= \
$(CODE_SIGNING_ENV) \
RAUC_BUNDLE_COMPATIBLE="$(call 
remove_quotes,$(PTXCONF_RAUC_COMPATIBLE))" \
RAUC_BUNDLE_FORMAT=$(IMAGE_RAUC_BUNDLE_FORMAT) \
-   RAUC_BUNDLE_VERSION="$(call remove_quotes, 
$(PTXCONF_RAUC_BUNDLE_VERSION))" \
+   RAUC_BUNDLE_VERSION="$(call remove_quotes, 
$(PTXCONF_IMAGE_RAUC_BUNDLE_VERSION))" \
RAUC_BUNDLE_BUILD=$(call ptx/sh, date +%FT%T%z) \
RAUC_BUNDLE_DESCRIPTION="$(call remove_quotes, 
$(PTXCONF_IMAGE_RAUC_DESCRIPTION))" \
$(IMAGE_RAUC_ENV_HOOK) \
diff --git a/rules/rauc.in b/rules/rauc.in
index e67f5131c615..ee9c3f955b79 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -105,13 +105,6 @@ config RAUC_COMPATIBLE
  Only if the compatible in the targets RAUC system.conf file and those
  in the Bundle's manifest match exactly, an update will be performed
 
-config RAUC_BUNDLE_VERSION
-   string
-   prompt "RAUC Bundle Version"
-   default "${PTXDIST_BSP_AUTOVERSION}"
-   help
- Overwrite the bundle version if needed.
-
 endif
 
 config RAUC_BAREBOX
-- 
2.39.2

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

[Michael Tretter]

Qt builds and installs the uic only if Widgets are enabled, but meson
always checks for the uic when checking for the Qt tools. This breaks
the build of applications that use Qt, but don't use Widgets.

Add a patch to ignore the uic if it is not found, as PTXdist already
correctly handles the dependencies.

Signed-off-by: Michael Tretter 
---
 ...04-HACK-don-t-fail-if-uic-is-missing.patch | 29 +++
 patches/meson-1.3.0/series|  3 +-
 2 files changed, 31 insertions(+), 1 deletion(-)
 create mode 100644 
patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch

diff --git a/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch 
b/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
new file mode 100644
index ..c404d3149d4c
--- /dev/null
+++ b/patches/meson-1.3.0/0004-HACK-don-t-fail-if-uic-is-missing.patch
@@ -0,0 +1,29 @@
+From: Michael Tretter 
+Date: Tue, 12 Mar 2024 18:22:06 +0100
+Subject: [PATCH] HACK: don't fail if uic is missing
+
+Qt5 builds the uic only if Widgets are enabled. The uic is not required
+for applications that don't use Widgets, but is required as standard
+tool by meson.
+
+Ignore uic if it is not found.
+
+Signed-off-by: Michael Tretter 
+---
+ mesonbuild/modules/qt.py | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/mesonbuild/modules/qt.py b/mesonbuild/modules/qt.py
+index b3242ceaf167..26b5dbc9fc0d 100644
+--- a/mesonbuild/modules/qt.py
 b/mesonbuild/modules/qt.py
+@@ -281,6 +281,9 @@ class QtBaseModule(ExtensionModule):
+ if tool.name == 'lrelease':
+ mlog.warning('Ignoring missing lrelease')
+ continue
++if tool.name == 'uic':
++mlog.warning('Ignoring missing uic')
++continue
+ if required:
+ raise MesonException('Qt tools not found')
+ return False
diff --git a/patches/meson-1.3.0/series b/patches/meson-1.3.0/series
index 209f73f563c2..3bba04f5b328 100644
--- a/patches/meson-1.3.0/series
+++ b/patches/meson-1.3.0/series
@@ -3,4 +3,5 @@
 0001-don-t-add-rpaths-for-build-directories-when-cross-co.patch
 0002-HACK-enable-NEON-only-for-ARMv7.patch
 0003-HACK-don-t-fail-if-lrelease-is-missing.patch
-# ab164f87a7e08b87479345777ce62823  - git-ptx-patches magic
+0004-HACK-don-t-fail-if-uic-is-missing.patch
+# 344e721ffeeec9faa5876797156d7064  - git-ptx-patches magic
-- 
2.39.2

Re: [ptxdist] [PATCH 2/3] libcamera: version bump 0.0.5 -> 0.2.0

[Michael Tretter]

On Tue, 05 Mar 2024 11:51:35 +0100, Michael Riesch wrote:
> Due to an API breakage in libcamera it may be necessary to update the
> consumers of the library. One example is pipewire, which needs to be
> updated to at least 1.0.2.
> 
> Signed-off-by: Michael Riesch 
> ---
>  rules/libcamera.make | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/rules/libcamera.make b/rules/libcamera.make
> index 928a95654..c9c4e2055 100644
> --- a/rules/libcamera.make
> +++ b/rules/libcamera.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_LIBCAMERA) += libcamera
>  #
>  # Paths and names
>  #
> -LIBCAMERA_VERSION:= 0.0.5
> -LIBCAMERA_MD5:= cc2f5c0c051319a7e853dc6916807ce5
> +LIBCAMERA_VERSION:= 0.2.0
> +LIBCAMERA_MD5:= 08f0681221c654838e54e6b3a32f89b5

There is a new feature flag for udev support, which should be set
explicitly.

Michael

>  LIBCAMERA:= libcamera-$(LIBCAMERA_VERSION)
>  LIBCAMERA_SUFFIX := tar.gz
>  LIBCAMERA_URL:= 
> https://gitlab.freedesktop.org/camera/libcamera/-/archive/v$(LIBCAMERA_VERSION)/$(LIBCAMERA).$(LIBCAMERA_SUFFIX)
> 
> -- 
> 2.34.1
> 
> 
> 

[ptxdist] [PATCH] gst-plugins-bad1: select missing dependency of v4l2 codecs

[Michael Tretter]

The gstv4l2codecalphadecodebin element internally uses the
codecalphademux element. Therefore, the codecalpha plugin is required,
if the V4L2 codecs are enabled.

Signed-off-by: Michael Tretter 
---
 rules/gst-plugins-bad1.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/gst-plugins-bad1.in b/rules/gst-plugins-bad1.in
index 36df212e6773..0147a704cb36 100644
--- a/rules/gst-plugins-bad1.in
+++ b/rules/gst-plugins-bad1.in
@@ -298,6 +298,7 @@ config GST_PLUGINS_BAD1_TIMECODE
 
 config GST_PLUGINS_BAD1_V4L2CODECS
bool
+   select GST_PLUGINS_BAD1_CODECALPHA
prompt "v4l2codecs"
 
 config GST_PLUGINS_BAD1_VA
-- 
2.39.2

[ptxdist] [PATCH] gst-plugins-rs: disable tests

[Michael Tretter]

The tests have a dependency on gstreamer-check. Explicitly disable the
tests.

Signed-off-by: Michael Tretter 
---
 rules/gst-plugins-rs.make | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/gst-plugins-rs.make b/rules/gst-plugins-rs.make
index 8cbba1d611c4..f90d94a6d923 100644
--- a/rules/gst-plugins-rs.make
+++ b/rules/gst-plugins-rs.make
@@ -100,7 +100,8 @@ GST_PLUGINS_RS_CONF_OPT :=  \
-Ddebug=false \
-Ddoc=disabled \
-Dexamples=disabled \
-   -Dfrozen=true
+   -Dfrozen=true \
+   -Dtests=disabled
 
 ifneq ($(call remove_quotes,$(GST_PLUGINS_RS_ENABLEC-y)),)
 GST_PLUGINS_RS_CONF_OPT +=  $(addsuffix =enabled, $(addprefix -D, 
$(GST_PLUGINS_RS_ENABLEC-y)))
-- 
2.39.2

[ptxdist] [PATCH] pulseaudio: select libltdl only if daemon is built

[Michael Tretter]

libltdl is used only by the daemon and the pulsecore library. It is not
required if the daemon is disabled.

Signed-off-by: Michael Tretter 
---
 rules/pulseaudio.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/pulseaudio.in b/rules/pulseaudio.in
index 8e87ef4651ef..ce6ac19eae26 100644
--- a/rules/pulseaudio.in
+++ b/rules/pulseaudio.in
@@ -11,9 +11,9 @@ menuconfig PULSEAUDIO
select ALSA_LIB_MIXER
select ALSA_LIB_UCM
select LIBCAP
-   select LIBLTDL
select LIBSNDFILE
select ORC
+   select LIBLTDL  if PULSEAUDIO_DAEMON
select SYSTEMD  if PULSEAUDIO_SYSTEMD
select SBC  if PULSEAUDIO_BLUETOOTH
select DBUS if PULSEAUDIO_BLUETOOTH
-- 
2.39.2

[ptxdist] [PATCH 2/2] pipewire: fix readline support

[Michael Tretter]

Due to the missing PTXCONF_ prefix, pw-ctl was always built without
readline support even though the rule looked like readline support was
enabled. Furthermore, the readline dependency was pulled in.

Add the PTXCONF_ prefix to actually enable readline support.

Signed-off-by: Michael Tretter 
---
 rules/pipewire.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/pipewire.make b/rules/pipewire.make
index 34081c5ceeb5..8747ebe6cecc 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -90,7 +90,7 @@ PIPEWIRE_CONF_OPT := \
-Dpw-cat=enabled \
-Dpw-cat-ffmpeg=disabled \
-Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \
-   -Dreadline=$(call ptx/endis,PIPEWIRE_PW_CTL)d \
+   -Dreadline=$(call ptx/endis,PTXCONF_PIPEWIRE_PW_CTL)d \
-Drlimits-install=false \
-Drlimits-match=@pipewire \
-Drlimits-memlock=4194304 \
-- 
2.39.2

[ptxdist] [PATCH 1/2] readline: fix pkg-config errors with NCURSES_WIDE_CHAR

[Michael Tretter]

readline.pc contains Requires.private=ncurses, even if readline is built
with ncursesw. When a user of readline uses pkg-config to ask for the
cflags, the lookup fails if ncursesw without compatibility with ncurses
is used.

Fix it by ensuring that ncurses compatibility is enabled if readline is
built with ncurses.

Signed-off-by: Michael Tretter 
---
 rules/readline.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/readline.in b/rules/readline.in
index 036860409a56..7673ce7497eb 100644
--- a/rules/readline.in
+++ b/rules/readline.in
@@ -2,6 +2,7 @@
 menuconfig READLINE
tristate
select NCURSES if READLINE_NCURSES
+   select NCURSES_BACKWARD_COMPATIBLE_NON_WIDE_CHAR if READLINE_NCURSES && 
NCURSES_WIDE_CHAR
select TERMCAP if READLINE_TERMCAP
select GCCLIBS_GCC_S
prompt "readline  "
-- 
2.39.2

[ptxdist] [PATCH] gst-plugins-rs: select pango only for plugins that depend on it

[Michael Tretter]

Only the onvif and closedcaption plugins actually depend on Pango.

Signed-off-by: Michael Tretter 
---
 rules/gst-plugins-rs.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/gst-plugins-rs.in b/rules/gst-plugins-rs.in
index 51c848533e0b..8db30f821060 100644
--- a/rules/gst-plugins-rs.in
+++ b/rules/gst-plugins-rs.in
@@ -12,7 +12,7 @@ menuconfig GST_PLUGINS_RS
select GST_PLUGINS_BAD1_WEBRTC  if GST_PLUGINS_RS_WEBRTC || 
GST_PLUGINS_RS_WEBRTCHTTP
select LIBWEBP  if GST_PLUGINS_RS_WEBP
select LIBWEBP_DEMUXif GST_PLUGINS_RS_WEBP
-   select PANGO
+   select PANGOif GST_PLUGINS_RS_ONVIF || 
GST_PLUGINS_RS_CLOSEDCAPTION
prompt "gst-plugins-rs"
help
  GStreamer plugins written in Rust.
-- 
2.39.2

[ptxdist] [PATCH 2/2] igt-gpu-tools: avoid installing all files in targetinstall

[Michael Tretter]

The igt-gpu-tools installed all files by using install_tree during
targetinstall. That resulted in the installation in a lot of
platform-dependent tools and tests to be installed.

Avoid this by explicitly installing the tools and tests depending on the
package configuration.

As code_cov_parse_info is a Perl script, add Perl as a runtime
dependency if the tests are enabled.

Signed-off-by: Michael Tretter 
---
 rules/igt-gpu-tools.in   |  5 +++
 rules/igt-gpu-tools.make | 75 ++--
 2 files changed, 77 insertions(+), 3 deletions(-)

diff --git a/rules/igt-gpu-tools.in b/rules/igt-gpu-tools.in
index 10849c296cdb..24ba18c23621 100644
--- a/rules/igt-gpu-tools.in
+++ b/rules/igt-gpu-tools.in
@@ -17,6 +17,7 @@ menuconfig IGT_GPU_TOOLS
select UDEV_LIBUDEV
select ZLIB
select JSON_C   if IGT_GPU_TOOLS_TEST_RUNNER
+   select PERL if IGT_GPU_TOOLS_TESTS && RUNTIME
prompt "igt-gpu-tools "
help
  igt-gpu-tools is a package of tools for debugging the Intel
@@ -38,6 +39,10 @@ config IGT_GPU_TOOLS_NOUVEAU
bool
default LIBDRM_NOUVEAU
 
+config IGT_GPU_TOOLS_FREEDRENO
+   bool
+   default LIBDRM_FREEDRENO
+
 config IGT_GPU_TOOLS_TESTS
bool
prompt "build and install tests"
diff --git a/rules/igt-gpu-tools.make b/rules/igt-gpu-tools.make
index 734db1d07e8c..891ea5486cb7 100644
--- a/rules/igt-gpu-tools.make
+++ b/rules/igt-gpu-tools.make
@@ -86,10 +86,79 @@ $(STATEDIR)/igt-gpu-tools.targetinstall:
@$(call install_fixup, igt-gpu-tools,AUTHOR,"Michael Olbrich 
")
@$(call install_fixup, igt-gpu-tools,DESCRIPTION,missing)
 
-   @$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/lib)
-   @$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/bin)
-   @$(call install_tree, igt-gpu-tools, 0, 0, -, /usr/share/igt-gpu-tools)
+   @$(call install_lib, igt-gpu-tools, 0, 0, 0644, libigt)
+
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/amd_hdmi_compliance)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/dpcd_reg)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/gputop)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/lsgpu)
+
+ifdef PTXCONF_IGT_GPU_TOOLS_INTEL
+   @$(call install_lib, igt-gpu-tools, 0, 0, 0644, libi915_perf)
+
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/i915-perf-configs)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/i915-perf-control)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/i915-perf-reader)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/i915-perf-recorder)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_audio_dump)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_backlight)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_bios_dumper)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_display_crc)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_display_poller)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_dp_compliance)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_dump_decode)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_error_decode)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_firmware_decode)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_forcewaked)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_framebuffer_dump)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_gem_info)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel-gfx-fw-info)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_gpu_abrt)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_gpu_frequency)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_gpu_time)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_gpu_top)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_gtt)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_guc_logger)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_gvtg_test)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_infoframes)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_l3_parity)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, /usr/bin/intel_lid)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/bin/intel_opregion_decode)
+   @$(call install_copy, igt-gpu-tools, 0, 0, 0755, -, 
/usr/b

[ptxdist] [PATCH 1/2] igt-gpu-tools: limit blacklisting of BINDNOW to x86

[Michael Tretter]

The segfaults caused by BINDNOW are x86-specific.

Limit the blacklisting to x86 systems and add further documentation, why
BINDNOW has to be blacklisted.

Signed-off-by: Michael Tretter 
---
 rules/igt-gpu-tools.make | 10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/rules/igt-gpu-tools.make b/rules/igt-gpu-tools.make
index a2d9f4d5a221..734db1d07e8c 100644
--- a/rules/igt-gpu-tools.make
+++ b/rules/igt-gpu-tools.make
@@ -29,10 +29,16 @@ IGT_GPU_TOOLS_LICENSE_FILES := \
 # Prepare
 # 
 
-# For some reason, intel_gpu_frequency and other segfault immediately if
-# built with -Wl,-z,now.
+# On x86 systems, libigt resolves igt_half_to_float and igt_float_to_half as
+# indirect functions at runtime by checking CPU features with igt_x86_features.
+# The igt_x86_features function is implemented is a different object and the
+# call uses the PLT itself. If lazy binding is disabled, this causes a segfault
+# while resolving the symbols for libigt on x64 systems. Disable BINDNOW on X86
+# systems to prevent the segfaults.
+ifdef PTXCONF_ARCH_X86
 IGT_GPU_TOOLS_WRAPPER_BLACKLIST := \
TARGET_HARDEN_BINDNOW
+endif
 
 IGT_GPU_TOOLS_LIBDRM-y :=
 ifdef PTXCONF_ARCH_X86
-- 
2.39.2

[ptxdist] [PATCH] v4l-utils: version bump 1.24.1 -> 1.26.0

[Michael Tretter]

- Switch to meson build system

- ir-keytable can be built without bpf support

- Release tarball has changed to tar.xz

Signed-off-by: Michael Tretter 
---
 rules/v4l-utils.in   |  1 +
 rules/v4l-utils.make | 63 
 2 files changed, 30 insertions(+), 34 deletions(-)

diff --git a/rules/v4l-utils.in b/rules/v4l-utils.in
index d722aeb2531e..8b20fbc89d16 100644
--- a/rules/v4l-utils.in
+++ b/rules/v4l-utils.in
@@ -3,6 +3,7 @@
 menuconfig V4L_UTILS
tristate
prompt "v4l-utils "
+   select HOST_MESON
select UDEV if V4L_UTILS_MEDIACTL
select UDEV_LIBUDEV if V4L_UTILS_MEDIACTL
select LIBC_DL  if V4L_UTILS_LIBV4L2 || V4L_UTILS_MEDIACTL
diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index 1f4c608b9a84..f991e8cb1117 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_V4L_UTILS) += v4l-utils
 #
 # Paths and names
 #
-V4L_UTILS_VERSION  := 1.24.1
-V4L_UTILS_MD5  := 8ba9c73c4319b6afab5fa4358edc43de
+V4L_UTILS_VERSION  := 1.26.0
+V4L_UTILS_MD5  := 0ccb2a18e1d3a3b2986591753a2b3a7f
 V4L_UTILS  := v4l-utils-$(V4L_UTILS_VERSION)
-V4L_UTILS_SUFFIX   := tar.bz2
+V4L_UTILS_SUFFIX   := tar.xz
 V4L_UTILS_URL  := 
http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
 V4L_UTILS_SOURCE   := $(SRCDIR)/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
 V4L_UTILS_DIR  := $(BUILDDIR)/$(V4L_UTILS)
@@ -31,38 +31,33 @@ V4L_UTILS_LICENSE_FILES := \
 # Prepare
 # 
 
-V4L_UTILS_CONF_TOOL:= autoconf
+V4L_UTILS_CONF_TOOL:= meson
 V4L_UTILS_CONF_OPT := \
-   $(CROSS_AUTOCONF_USR) \
-   --disable-doxygen-doc \
-   --disable-doxygen-dot \
-   --disable-doxygen-man \
-   --disable-doxygen-rtf \
-   --disable-doxygen-xml \
-   --disable-doxygen-chm \
-   --disable-doxygen-chi \
-   --disable-doxygen-html \
-   --disable-doxygen-ps \
-   --disable-doxygen-pdf \
-   --disable-nls \
-   --disable-rpath \
-   --disable-libdvbv5 \
-   --enable-dyn-libv4l \
-   --enable-v4l-utils \
-   --enable-v4l2-compliance-libv4l \
-   --disable-v4l2-compliance-32 \
-   --$(call ptx/endis, PTXCONF_V4L_UTILS_TRACER)-v4l2-tracer \
-   --enable-v4l2-ctl-libv4l \
-   --enable-v4l2-ctl-stream-to \
-   --disable-v4l2-ctl-32 \
-   --disable-qv4l2 \
-   --disable-qvidcap \
-   --disable-gconv \
-   --$(call ptx/endis, PTXCONF_V4L_UTILS_IRKEYTABLE)-bpf \
-   --$(call ptx/wwo, PTXCONF_V4L_UTILS_LIBV4LCONVERT)-jpeg \
-   --$(call ptx/wwo, PTXCONF_V4L_UTILS_MEDIACTL)-libudev \
-   --with-udevdir=/usr/lib/udev \
-   --with-systemdsystemunitdir=/usr/lib/systemd/system
+   $(CROSS_MESON_USR) \
+   -Dbpf=disabled \
+   -Ddoxygen-doc=disabled \
+   -Ddoxygen-html=false \
+   -Ddoxygen-man=false \
+   -Dgconv=disabled \
+   -Dgconvsysdir= \
+   -Djpeg=$(call ptx/endis, PTXCONF_V4L_UTILS_LIBV4LCONVERT)d \
+   -Dlibdvbv5=disabled \
+   -Dlibv4l1subdir=libv4l \
+   -Dlibv4l2subdir=libv4l \
+   -Dlibv4lconvertsubdir=libv4l \
+   -Dqv4l2=disabled \
+   -Dqvidcap=disabled \
+   -Dsystemdsystemunitdir=/usr/lib/systemd/system \
+   -Dudevdir=/usr/lib/udev \
+   -Dv4l-plugins=true \
+   -Dv4l-utils=true \
+   -Dv4l-wrappers=true \
+   -Dv4l2-compliance-32=false \
+   -Dv4l2-compliance-libv4l=true \
+   -Dv4l2-ctl-32=false \
+   -Dv4l2-ctl-libv4l=true \
+   -Dv4l2-ctl-stream-to=true \
+   -Dv4l2-tracer=$(call ptx/endis, PTXCONF_V4L_UTILS_TRACER)d
 
 ifdef PTXCONF_KERNEL_HEADER
 V4L_UTILS_CPPFLAGS := \
-- 
2.39.2

[ptxdist] [PATCH] nbd: version bump 3.21 -> 3.25

[Michael Tretter]

Since release 3.25, the official releases of nbd are on GitHub and no
longer uploaded to sourceforge.

Support for the Sockets Direct Protocol (SDP) has been dropped from
upstream since the protocol is deprecated.

Signed-off-by: Michael Tretter 
---
 rules/nbd.make | 7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/rules/nbd.make b/rules/nbd.make
index 4d604d0fa5c7..ab5f2b7e93da 100644
--- a/rules/nbd.make
+++ b/rules/nbd.make
@@ -14,11 +14,11 @@ PACKAGES-$(PTXCONF_NBD) += nbd
 #
 # Paths and names
 #
-NBD_VERSION:= 3.21
-NBD_MD5:= c51c4c500fe1ed84c3d5d5dd2ca71d23
+NBD_VERSION:= 3.25
+NBD_MD5:= fc885361c00ac4de2c45d651c48bd937
 NBD:= nbd-$(NBD_VERSION)
 NBD_SUFFIX := tar.xz
-NBD_URL:= $(call ptx/mirror, SF, nbd/$(NBD).$(NBD_SUFFIX))
+NBD_URL:= 
https://github.com/NetworkBlockDevice/nbd/releases/download/$(NBD)/$(NBD).$(NBD_SUFFIX)
 NBD_SOURCE := $(SRCDIR)/$(NBD).$(NBD_SUFFIX)
 NBD_DIR:= $(BUILDDIR)/$(NBD)
 NBD_LICENSE:= GPL-2.0-only
@@ -34,7 +34,6 @@ NBD_CONF_OPT  := \
--$(call ptx/endis, PTXCONF_GLOBAL_LARGE_FILE)-lfs \
--disable-syslog \
--disable-debug \
-   --disable-sdp \
--disable-gznbd \
--disable-manpages \
--without-gnutls \
-- 
2.39.2

[ptxdist] [PATCH] sshpass: fix a few typos in help text

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/sshpass.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/sshpass.in b/rules/sshpass.in
index b855016e2340..7c5fc5786e6d 100644
--- a/rules/sshpass.in
+++ b/rules/sshpass.in
@@ -4,13 +4,13 @@ config SSHPASS
tristate
prompt "sshpass"
help
- Sshpass is a tool for non-interactivly performing password
+ sshpass is a tool for non-interactively performing password
  authentication with SSH's so called "interactive keyboard
  password authentication".
  Most user should use SSH's more secure public key
- authentiaction instead.
+ authentication instead.
 
- SECURITY NOTE: There is a reason openssh insists that
+ SECURITY NOTE: There is a reason OpenSSH insists that
  passwords be typed interactively.
  Passwords are harder to store securely and to pass around
  securely between programs.
-- 
2.39.2

[ptxdist] [PATCH 2/2] kernel: disable jevents support in perf

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/kernel.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/kernel.make b/rules/kernel.make
index 17255baae387..59ecdf19973f 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -214,6 +214,7 @@ KERNEL_TOOL_PERF_OPTS   := \
NO_SLANG= \
NO_GTK2=1 \
NO_DEMANGLE= \
+   NO_JEVENTS=1 \
NO_LIBELF= \
NO_LIBUNWIND=1 \
NO_BACKTRACE= \
-- 
2.39.2

[ptxdist] [PATCH 1/2] kernel: don't use libtraceevent for perf

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/kernel.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/kernel.make b/rules/kernel.make
index e70af54e6137..17255baae387 100644
--- a/rules/kernel.make
+++ b/rules/kernel.make
@@ -222,6 +222,7 @@ KERNEL_TOOL_PERF_OPTS   := \
NO_LIBBIONIC=1 \
NO_LIBCRYPTO=1 \
NO_LIBDW_DWARF_UNWIND= \
+   NO_LIBTRACEEVENT=1 \
NO_PERF_READ_VDSO32=1 \
NO_PERF_READ_VDSOX32=1 \
NO_ZLIB= \
-- 
2.39.2

[ptxdist] [PATCH] pipewire: version bump 0.3.76 -> 0.3.77

[Michael Tretter]

https://gitlab.freedesktop.org/pipewire/pipewire/-/releases/0.3.77

Signed-off-by: Michael Tretter 
---
 ...referencing-pointer-to-incomplete-ty.patch | 56 ---
 patches/pipewire-0.3.76/series|  4 --
 rules/pipewire.make   |  4 +-
 3 files changed, 2 insertions(+), 62 deletions(-)
 delete mode 100644 
patches/pipewire-0.3.76/0001-spa-fixes-for-dereferencing-pointer-to-incomplete-ty.patch
 delete mode 100644 patches/pipewire-0.3.76/series

diff --git 
a/patches/pipewire-0.3.76/0001-spa-fixes-for-dereferencing-pointer-to-incomplete-ty.patch
 
b/patches/pipewire-0.3.76/0001-spa-fixes-for-dereferencing-pointer-to-incomplete-ty.patch
deleted file mode 100644
index 9ce3c90b29e9..
--- 
a/patches/pipewire-0.3.76/0001-spa-fixes-for-dereferencing-pointer-to-incomplete-ty.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From: Sourav Das 
-Date: Sun, 30 Jul 2023 10:23:25 +0530
-Subject: [PATCH] spa: fixes for dereferencing pointer to incomplete type in
- __typeof__
-
-before gcc 10 its not supporting pointer dereferencing in __typeof__.
-so made changes according to that. Fixes #3375
-
-clang also defines __GNUC__ and resolves '4' along with __clang__ which
-resolves '1'. On any version of clang, __GNUC__ and resolves '4'.
-anyway clang has this feature since version 3.

- spa/include/spa/utils/cleanup.h | 16 
- 1 file changed, 16 insertions(+)
-
-diff --git a/spa/include/spa/utils/cleanup.h b/spa/include/spa/utils/cleanup.h
-index 04e2bd193f6e..aa3eb2eea71b 100644
 a/spa/include/spa/utils/cleanup.h
-+++ b/spa/include/spa/utils/cleanup.h
-@@ -40,13 +40,20 @@ __extension__ ({ \
-   _old_value; \
- })
- 
-+#if __GNUC__ > 10 || defined(__clang__)
- #define spa_steal_ptr(ptr) ((__typeof__(*(ptr)) *) spa_exchange((ptr), NULL))
-+#else
-+#define spa_steal_ptr(ptr) ((__typeof__(ptr)) spa_exchange((ptr), NULL))
-+#endif
-+
- #define spa_steal_fd(fd) spa_exchange((fd), -1)
- 
- /* == 
*/
- 
- #include 
- 
-+
-+#if __GNUC__ > 10 || defined(__clang__)
- #define spa_clear_ptr(ptr, destructor) \
- __extension__ ({ \
-   __typeof__(*(ptr)) *_old_value = spa_steal_ptr(ptr); \
-@@ -54,6 +61,15 @@ __extension__ ({ \
-   destructor(_old_value); \
-   (void) 0; \
- })
-+#else
-+#define spa_clear_ptr(ptr, destructor) \
-+__extension__ ({ \
-+  __typeof__(ptr) _old_value = spa_steal_ptr(ptr); \
-+  if (_old_value) \
-+  destructor(_old_value); \
-+  (void) 0; \
-+})
-+#endif
- 
- static inline void _spa_autofree_cleanup_func(void *p)
- {
diff --git a/patches/pipewire-0.3.76/series b/patches/pipewire-0.3.76/series
deleted file mode 100644
index 0969cdc945f1..
--- a/patches/pipewire-0.3.76/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-spa-fixes-for-dereferencing-pointer-to-incomplete-ty.patch
-# f664d909a9bfc1aca629f79fc2991ed1  - git-ptx-patches magic
diff --git a/rules/pipewire.make b/rules/pipewire.make
index fa8e88ed228a..f4f1ba276ce6 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire
 #
 # Paths and names
 #
-PIPEWIRE_VERSION   := 0.3.76
-PIPEWIRE_MD5   := 10bf151d8a790f8684c9c85eb18507f9
+PIPEWIRE_VERSION   := 0.3.77
+PIPEWIRE_MD5   := 70eeb9be6411b33a2adf8834ca4163b7
 PIPEWIRE   := pipewire-$(PIPEWIRE_VERSION)
 PIPEWIRE_SUFFIX:= tar.bz2
 PIPEWIRE_URL   := 
https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)
-- 
2.39.2

Re: [ptxdist] [PATCH] rauc: migrate to meson

[Michael Tretter]

On Fri, 30 Jun 2023 23:02:16 +0200, Enrico Jorns wrote:
> Since different archive paths are used for the autotools and the meson
> variant of rauc, we need to put them to distinct SRCDIR locations in
> order to differentiate them when picking up. For this, add the -meson
> suffix to RAUC_SOURCE.
> This might be removed again when switching to the next release.
> 
> Also, RAUC_CONF_ENV modification does not seem to be needed since all
> installed paths look valid without it.
> 
> Signed-off-by: Enrico Jorns 

Reviewed-by: Michael Tretter 

> ---
>  rules/host-rauc.in   |  1 +
>  rules/host-rauc.make | 32 -
>  rules/rauc.in|  1 +
>  rules/rauc.make  | 48 ++--
>  4 files changed, 34 insertions(+), 48 deletions(-)
> 
> diff --git a/rules/host-rauc.in b/rules/host-rauc.in
> index adb904107..0dddc742d 100644
> --- a/rules/host-rauc.in
> +++ b/rules/host-rauc.in
> @@ -4,5 +4,6 @@ config HOST_RAUC
>   tristate
>   default y if ALLYES
>   select HOST_GLIB
> + select HOST_MESON
>   select HOST_OPENSSL
>   select HOST_SQUASHFS_TOOLS
> diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> index 0dc727e6d..438d77bfb 100644
> --- a/rules/host-rauc.make
> +++ b/rules/host-rauc.make
> @@ -18,26 +18,20 @@ HOST_PACKAGES-$(PTXCONF_HOST_RAUC) += host-rauc
>  #
>  # autoconf
>  #
> -HOST_RAUC_CONF_TOOL  := autoconf
> +HOST_RAUC_CONF_TOOL  := meson
>  HOST_RAUC_CONF_OPT   := \
>   $(HOST_AUTOCONF) \
> - --enable-debug=info \
> - --enable-largefile \
> - --enable-compile-warnings=yes \
> - --disable-Werror \
> - --disable-code-coverage \
> - --disable-valgrind \
> - --disable-service \
> - --enable-create \
> - --disable-network \
> - --disable-streaming \
> - --disable-json \
> - --disable-gpt \
> - --with-gcov=gcov \
> - --with-streaming-user=nobody \
> - --with-systemdunitdir=/usr/lib/systemd/system \
> - --with-dbuspolicydir=/usr/share/dbus-1/system.d \
> - --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> - --with-dbusinterfacesdir=/usr/share/dbus-1/interfaces
> + -Dcreate=true \
> + -Ddbusinterfacesdir=/usr/share/dbus-1/interfaces \
> + -Ddbuspolicydir=/usr/share/dbus-1/system.d \
> + -Ddbussystemservicedir=/usr/share/dbus-1/system-services \
> + -Dgpt=disabled \
> + -Djson=disabled \
> + -Dnetwork=false \
> + -Dservice=false \
> + -Dstreaming=false \
> + -Dstreaming_user=nobody \
> + -Dsystemdunitdir=/usr/lib/systemd/system \
> + -Dtests=false
>  
>  # vim: syntax=make
> diff --git a/rules/rauc.in b/rules/rauc.in
> index db3a87485..e67f5131c 100644
> --- a/rules/rauc.in
> +++ b/rules/rauc.in
> @@ -3,6 +3,7 @@
>  menuconfig RAUC
>   tristate
>   prompt "RAUC Update Tool  "
> + select HOST_MESON
>   select OPENSSL
>   select GLIB
>   select GLIB_LIBMOUNT
> diff --git a/rules/rauc.make b/rules/rauc.make
> index bed381408..38fa86473 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -1,6 +1,6 @@
>  # -*-makefile-*-
>  #
> -# Copyright (C) 2015 by Enrico Joerns 
> +# Copyright (C) 2015-2023 by Enrico Joerns 
>  #
>  # For further information about the PTXdist project and license conditions
>  # see the README file.
> @@ -15,11 +15,11 @@ PACKAGES-$(PTXCONF_RAUC) += rauc
>  # Paths and names
>  #
>  RAUC_VERSION := 1.10
> -RAUC_MD5 := 28de8bb641402bb77df5d5233925a97d
> +RAUC_MD5 := ed1ebd5e0c1081528a3a6f26355cbbcc
>  RAUC := rauc-$(RAUC_VERSION)
>  RAUC_SUFFIX  := tar.xz
> -RAUC_URL := 
> https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC)-autotools.$(RAUC_SUFFIX)
> -RAUC_SOURCE  := $(SRCDIR)/$(RAUC).$(RAUC_SUFFIX)
> +RAUC_URL := 
> https://github.com/rauc/rauc/releases/download/v$(RAUC_VERSION)/$(RAUC).$(RAUC_SUFFIX)
> +RAUC_SOURCE  := $(SRCDIR)/$(RAUC)-meson.$(RAUC_SUFFIX)
>  RAUC_DIR := $(BUILDDIR)/$(RAUC)
>  RAUC_LICENSE := LGPL-2.1-only
>  
> @@ -27,34 +27,24 @@ RAUC_LICENSE  := LGPL-2.1-only
>  # Prepare
>  # 
> 
>  
> -RAUC_CONF_ENV:= \
> - $(CROSS_ENV) \
> - PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT=interfaces_dir
> -
>  #
> -# autoconf
> +# meson
>  #
> -RAUC_CONF_TOOL   := autoconf
> +RAUC_CONF_TOOL   := meson
>  RAUC_CONF_OPT:= \
> - $(CROSS_AUTOCONF_USR) \
> - --enable-debug=info \
> - $(GLOBAL_LARGE_FILE_OPTION) \
> - --enable-compile-warnings=yes 

Re: [ptxdist] [PATCH 2/3] rauc: extend and align option pinning with configure order

[Michael Tretter]

On Fri, 30 Jun 2023 22:49:26 +0200, Enrico Jorns wrote:
> Adds missing pinned configuration options and fixes ordering between
> create and service option.
> 
> Signed-off-by: Enrico Jorns 
> ---
>  rules/host-rauc.make | 2 ++
>  rules/rauc.make  | 3 ++-
>  2 files changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/rules/host-rauc.make b/rules/host-rauc.make
> index e5190bb8e..0dc727e6d 100644
> --- a/rules/host-rauc.make
> +++ b/rules/host-rauc.make
> @@ -30,9 +30,11 @@ HOST_RAUC_CONF_OPT := \
>   --disable-service \
>   --enable-create \
>   --disable-network \
> + --disable-streaming \
>   --disable-json \
>   --disable-gpt \
>   --with-gcov=gcov \
> + --with-streaming-user=nobody \
>   --with-systemdunitdir=/usr/lib/systemd/system \
>   --with-dbuspolicydir=/usr/share/dbus-1/system.d \
>   --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> diff --git a/rules/rauc.make b/rules/rauc.make
> index 35a4e8445..14e9f5ced 100644
> --- a/rules/rauc.make
> +++ b/rules/rauc.make
> @@ -43,13 +43,14 @@ RAUC_CONF_OPT := \
>   --disable-Werror \
>   --disable-code-coverage \
>   --disable-valgrind \
> - --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \
>   --$(call ptx/endis,PTXCONF_RAUC_SERVICE)-service \
> + --$(call ptx/endis,PTXCONF_RAUC_CREATE)-create \

Maybe move the reordering of this option to the previous patch. It already
touches the create option.

>   --$(call ptx/endis,PTXCONF_RAUC_NETWORK)-network \
>   --$(call ptx/endis,PTXCONF_RAUC_STREAMING)-streaming \
>   --$(call ptx/endis,PTXCONF_RAUC_JSON)-json \
>   --$(call ptx/endis,PTXCONF_RAUC_GPT)-gpt \
>   --with-gcov=gcov \
> + --with-streaming_user=nobody \

The option is inconsistent with the name of the option in the host-rauc
package. Should there be an underscore or a dash between streaming and user?

Michael

>   --with-systemdunitdir=/usr/lib/systemd/system \
>   --with-dbuspolicydir=/usr/share/dbus-1/system.d \
>   --with-dbussystemservicedir=/usr/share/dbus-1/system-services \
> -- 
> 2.39.2
> 
> 
> 

[ptxdist] [PATCH] glibc: fix typo GLIBC_GCONF_BASE -> GLIBC_GCONV_BASE

[Michael Tretter]

Fix the typo in the config item to fix the grep for GCONV.

Signed-off-by: Michael Tretter 
---
 rules/glibc.in   | 8 
 rules/glibc.make | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/rules/glibc.in b/rules/glibc.in
index 345d59a306c8..2bcaa8893e64 100644
--- a/rules/glibc.in
+++ b/rules/glibc.in
@@ -258,13 +258,13 @@ config GLIBC_I18N_RAWDATA
 
 menu "Install gconv libraries   "
 
-config GLIBC_GCONF_BASE
+config GLIBC_GCONV_BASE
bool
 
 config GLIBC_GCONV_DEF
bool
prompt "default gconv modules"
-   select GLIBC_GCONF_BASE
+   select GLIBC_GCONV_BASE
default y
help
  install the iso8859-1 (Latin Alphabet No.1) and the iso8859-15 (Latin
@@ -274,14 +274,14 @@ config GLIBC_GCONV_DEF
 config GLIBC_GCONV_UTF
bool
prompt "gconv modules for UTF"
-   select GLIBC_GCONF_BASE
+   select GLIBC_GCONV_BASE
help
  install the gconv modules for UTF conversion
 
 config GLIBC_GCONV_ZH
bool
prompt "gconv modules for chinese language"
-   select GLIBC_GCONF_BASE
+   select GLIBC_GCONV_BASE
help
  install the gconv modules for chinese language, including BIG5
  and GB18030
diff --git a/rules/glibc.make b/rules/glibc.make
index a550f4b9206a..f42901193a83 100644
--- a/rules/glibc.make
+++ b/rules/glibc.make
@@ -128,7 +128,7 @@ ifdef PTXCONF_GLIBC_NSL
@$(call install_copy_toolchain_lib, glibc, libnsl.so.1)
 endif
 
-ifdef PTXCONF_GLIBC_GCONF_BASE
+ifdef PTXCONF_GLIBC_GCONV_BASE
@$(call install_copy_toolchain_lib, glibc, gconv/gconv-modules,, n)
 endif
 
-- 
2.39.2

[ptxdist] [PATCH] wireplumber: version bump 0.4.13 -> 0.4.14

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/wireplumber.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wireplumber.make b/rules/wireplumber.make
index 2a537014abc7..07d3e3b6d0eb 100644
--- a/rules/wireplumber.make
+++ b/rules/wireplumber.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WIREPLUMBER) += wireplumber
 #
 # Paths and names
 #
-WIREPLUMBER_VERSION:= 0.4.13
-WIREPLUMBER_MD5:= ce7d3c388116ea893790204d3ae9e836
+WIREPLUMBER_VERSION:= 0.4.14
+WIREPLUMBER_MD5:= 5b1ae97978987f8790587f38a3d2241b
 WIREPLUMBER:= wireplumber-$(WIREPLUMBER_VERSION)
 WIREPLUMBER_SUFFIX := tar.bz2
 WIREPLUMBER_URL:= 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION)/$(WIREPLUMBER).$(WIREPLUMBER_SUFFIX)
-- 
2.39.2

[ptxdist] [PATCH] weston: version bump 11.0.2 -> 12.0.0

[Michael Tretter]

Add config items for the new VNC and PipeWire backends.

Release Announcement:

https://lists.freedesktop.org/archives/wayland-devel/2023-May/042720.html

Signed-off-by: Michael Tretter 
---
 rules/weston.in   | 11 +++
 rules/weston.make | 16 
 2 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index a698a7491509..37c0f231ae5f 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -41,6 +41,9 @@ menuconfig WESTON
select GST_PLUGINS_GOOD1_UDPif WESTON_REMOTING && RUNTIME
select PANGOif WESTON_IVISHELL_EXAMPLE
select PIPEWIRE if WESTON_PIPEWIRE
+   select PIPEWIRE if WESTON_BACKEND_PIPEWIRE
+   select NEATVNC  if WESTON_BACKEND_VNC
+   select PAM  if WESTON_BACKEND_VNC
prompt "weston"
help
  Wayland compositor reference implementation
@@ -59,6 +62,14 @@ config WESTON_HEADLESS_COMPOSITOR
bool
prompt "headless compositor"
 
+config WESTON_BACKEND_PIPEWIRE
+   bool
+   prompt "PipeWire backend"
+
+config WESTON_BACKEND_VNC
+   bool
+   prompt "VNC backend"
+
 config WESTON_STARTSCRIPT
bool
default y
diff --git a/rules/weston.make b/rules/weston.make
index b6a15a88dd0b..13bf7f760b8f 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION := 11.0.2
-LIBWESTON_MAJOR := 11
-WESTON_MD5 := a7633c418400c94ecefb9a6f43c1028e
+WESTON_VERSION := 12.0.0
+LIBWESTON_MAJOR := 12
+WESTON_MD5 := 358ebc5564538ca179af92d3441f4892
 WESTON := weston-$(WESTON_VERSION)
 WESTON_SUFFIX  := tar.gz
 WESTON_URL := 
https://gitlab.freedesktop.org/wayland/weston/-/archive/$(WESTON_VERSION)/$(WESTON).$(WESTON_SUFFIX)
@@ -40,19 +40,21 @@ WESTON_CONF_OPT := \
-Dbackend-drm=true \
-Dbackend-drm-screencast-vaapi=false \
-Dbackend-headless=$(call 
ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
+   -Dbackend-pipewire=$(call 
ptx/truefalse,PTXCONF_WESTON_BACKEND_PIPEWIRE) \
-Dbackend-rdp=false \
+   -Dbackend-vnc=$(call ptx/truefalse,PTXCONF_WESTON_BACKEND_VNC) \
-Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
-Dbackend-x11=false \
-Dcolor-management-lcms=false \
-Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \
-Ddeprecated-color-management-colord=false \
-Ddeprecated-color-management-static=false \
+   -Ddeprecated-launcher-logind=$(call 
ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \
-Ddesktop-shell-client-default=weston-desktop-shell \
-Ddoc=false \
-Dimage-jpeg=true \
-Dimage-webp=false \
-Dlauncher-libseat=$(call ptx/truefalse,PTXCONF_WESTON_SEATD) \
-   -Dlauncher-logind=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD_LOGIND) \
-Dpipewire=$(call ptx/truefalse,PTXCONF_WESTON_PIPEWIRE) \
-Dremoting=$(call ptx/truefalse,PTXCONF_WESTON_REMOTING) \
-Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
@@ -132,6 +134,12 @@ endif
 ifdef PTXCONF_WESTON_HEADLESS_COMPOSITOR
@$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/headless-backend)
 endif
+ifdef PTXCONF_WESTON_BACKEND_PIPEWIRE
+   @$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/pipewire-backend)
+endif
+ifdef PTXCONF_WESTON_BACKEND_VNC
+   @$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/vnc-backend)
+endif
 ifdef PTXCONF_WESTON_GL
@$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/wayland-backend)
@$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/gl-renderer)
-- 
2.39.2

[ptxdist] [PATCH] systemd: match end0 interface in default network rule

[Michael Tretter]

Since systemd v252, the network interface name is generated based on the
device tree. Thus, the default network interface may no longer be named
eth0.

Make sure that DHCP is used on the renamed interface, too.

Rename the file to default.network to avoid the interface name in the
file name.

Signed-off-by: Michael Tretter 
---
 .../usr/lib/systemd/network/{eth0.network => default.network}   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename projectroot/usr/lib/systemd/network/{eth0.network => default.network} 
(80%)

diff --git a/projectroot/usr/lib/systemd/network/eth0.network 
b/projectroot/usr/lib/systemd/network/default.network
similarity index 80%
rename from projectroot/usr/lib/systemd/network/eth0.network
rename to projectroot/usr/lib/systemd/network/default.network
index 818a6bd5b3fa..350dbf4a2b9b 100644
--- a/projectroot/usr/lib/systemd/network/eth0.network
+++ b/projectroot/usr/lib/systemd/network/default.network
@@ -1,5 +1,5 @@
 [Match]
-Name=eth0
+Name=eth0 end0
 KernelCommandLine=!root=/dev/nfs
 
 [Network]
-- 
2.39.2

[ptxdist] [PATCH] pulseaudio: fix rpath if daemon is not installed

[Michael Tretter]

The modules are installed only if the daemon is enabled and installed.
If the daemon is disabled, the modules won't be installed and the path
to the modules doesn't exist.

Don't add the modules directory from the rpath if the directory doesn't
exist.

Signed-off-by: Michael Tretter 
---
 rules/pulseaudio.make | 4 
 1 file changed, 4 insertions(+)

diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
index d33b31a7e3f1..afc3c7496595 100644
--- a/rules/pulseaudio.make
+++ b/rules/pulseaudio.make
@@ -97,7 +97,11 @@ PULSEAUDIO_CONF_OPT  := \
-Dx11=disabled \
-Dzshcompletiondir=
 
+ifdef PTXCONF_PULSEAUDIO_DAEMON
 PULSEAUDIO_LDFLAGS := 
-Wl,-rpath,/usr/lib/pulseaudio:/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules
+else
+PULSEAUDIO_LDFLAGS := -Wl,-rpath,/usr/lib/pulseaudio
+endif
 
 # 
 # Install
-- 
2.39.2

[ptxdist] [PATCH] barebox: add optional dependency to HOST_LZ4

[Michael Tretter]

barebox switched the default compression to lz4. Therefore, it needs the
host lz4 to build with lz4 compression. Add the option to specify
HOST_LZ4 as a dependency of barebox.

Signed-off-by: Michael Tretter 
---
 platforms/barebox.in | 9 +
 1 file changed, 9 insertions(+)

diff --git a/platforms/barebox.in b/platforms/barebox.in
index 956da81f34b9..11b346c07aab 100644
--- a/platforms/barebox.in
+++ b/platforms/barebox.in
@@ -19,6 +19,7 @@ menuconfig BAREBOX
select HOST_OPENSSL if BAREBOX_NEEDS_HOST_OPENSSL
select HOST_IMX_CST if BAREBOX_NEEDS_HOST_IMX_CST
select HOST_LZOP if BAREBOX_NEEDS_HOST_LZOP
+   select HOST_LZ4 if BAREBOX_NEEDS_HOST_LZ4
select CODE_SIGNING if BAREBOX_NEEDS_KEYS
prompt "barebox   "
bool
@@ -169,4 +170,12 @@ config BAREBOX_NEEDS_HOST_LZOP
  lzop is used in order to compile lzop for your development
  host.
 
+config BAREBOX_NEEDS_HOST_LZ4
+   prompt "barebox needs lz4"
+   bool
+   help
+ The barebox executable can be compressed. Select this if
+ lz4 is used in order to compile lz4 for your development
+ host.
+
 endif
-- 
2.39.2

[ptxdist] [PATCH] pipewire: version bump 0.3.64 -> 0.3.65

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/pipewire.make | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/pipewire.make b/rules/pipewire.make
index feae36ea9103..96738917141d 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire
 #
 # Paths and names
 #
-PIPEWIRE_VERSION   := 0.3.64
-PIPEWIRE_MD5   := e37730d11bd0c923e423f0a369826fd4
+PIPEWIRE_VERSION   := 0.3.65
+PIPEWIRE_MD5   := 5c31850705cacd12398da01b9b11cfd0
 PIPEWIRE   := pipewire-$(PIPEWIRE_VERSION)
 PIPEWIRE_SUFFIX:= tar.bz2
 PIPEWIRE_URL   := 
https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)
@@ -57,6 +57,7 @@ PIPEWIRE_CONF_OPT := \
-Dbluez5-codec-lc3plus=disabled \
-Dbluez5-codec-ldac=disabled \
-Dbluez5-codec-opus=disabled \
+   -Dcompress-offload=disabled \
-Dcontrol=enabled \
-Ddbus=enabled \
-Ddocdir= \
@@ -85,6 +86,7 @@ PIPEWIRE_CONF_OPT := \
-Dpipewire-jack=disabled \
-Dpipewire-v4l2=disabled \
-Dpw-cat=enabled \
+   -Dpw-cat-ffmpeg=disabled \
-Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \
-Dreadline=$(call ptx/endis,PIPEWIRE_PW_CTL)d \
-Droc=disabled \
-- 
2.30.2

[ptxdist] [PATCH 3/3] rootfs: add pipewire user and group

[Michael Tretter]

The pipewire.service and wireplumber.service system services by default
start the processes as user pipewire. Without a pipewire user, the
systemd.services fail to start.

Add the pipewire user to the video and audio groups to give PipeWire
access to the video and audio devices.

Signed-off-by: Michael Tretter 
---
 projectroot/etc/group  | 5 +++--
 projectroot/etc/passwd | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/projectroot/etc/group b/projectroot/etc/group
index b1965e6c297f..8f0af165ec9b 100644
--- a/projectroot/etc/group
+++ b/projectroot/etc/group
@@ -18,9 +18,9 @@ kmem:x:109:
 lp:x:110:
 tape:x:111:
 tty:x:112:
-video:x:113:
+video:x:113:pipewire
 lock:x:114:
-audio:x:115:
+audio:x:115:pipewire
 input:x:116:
 mysql:x:117:
 mosquitto:x:118:
@@ -36,4 +36,5 @@ rauc-hawkbit:x:212:
 redis:x:213:
 sgx:x:214:
 seat:x:215:
+pipewire:x:216:
 nogroup:x:65534:
diff --git a/projectroot/etc/passwd b/projectroot/etc/passwd
index b4669abb59dd..4ac336458e6c 100644
--- a/projectroot/etc/passwd
+++ b/projectroot/etc/passwd
@@ -18,5 +18,6 @@ pulse:x:209:210:pulse:/dev/null:/bin/false
 chrony:x:210:211:chrony:/dev/null:/bin/false
 rauc-hawkbit:x:211:212:rauc-hawkbit:/dev/null:/bin/false
 redis:x:212:213:redis:/dev/null:/bin/false
+pipewire:x:213:216:pipewire:/dev/null:/bin/false
 rpcuser:x:65533:65534:RPC user:/dev/null:/bin/false
 nobody:x:65534:65534:Unprivileged Nobody:/dev/null:/bin/false
-- 
2.30.2

[ptxdist] [PATCH 2/3] wireplumber: version bump 0.4.12 -> 0.4.13

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/wireplumber.make | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/rules/wireplumber.make b/rules/wireplumber.make
index 82f14baefe70..2a537014abc7 100644
--- a/rules/wireplumber.make
+++ b/rules/wireplumber.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WIREPLUMBER) += wireplumber
 #
 # Paths and names
 #
-WIREPLUMBER_VERSION:= 0.4.12
-WIREPLUMBER_MD5:= 86dacf1649f64e83de99b11b693dee4f
+WIREPLUMBER_VERSION:= 0.4.13
+WIREPLUMBER_MD5:= ce7d3c388116ea893790204d3ae9e836
 WIREPLUMBER:= wireplumber-$(WIREPLUMBER_VERSION)
 WIREPLUMBER_SUFFIX := tar.bz2
 WIREPLUMBER_URL:= 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION)/$(WIREPLUMBER).$(WIREPLUMBER_SUFFIX)
@@ -34,10 +34,13 @@ WIREPLUMBER_LICENSE_FILES   := 
file://LICENSE;md5=17d1fe479cdec331eecbc65d26bc7e77
 WIREPLUMBER_CONF_TOOL  := meson
 WIREPLUMBER_CONF_OPT   :=  \
$(CROSS_MESON_USR) \
+   -Ddaemon=true \
+   -Ddbus-tests=false \
-Ddoc=disabled \
-Delogind=disabled \
-Dglib-supp= \
-Dintrospection=disabled \
+   -Dmodules=true \
-Dsystem-lua=true \
-Dsystem-lua-version=auto \
-Dsystemd=$(call ptx/endis,PTXCONF_WIREPLUMBER_SYSTEMD)d \
@@ -45,7 +48,8 @@ WIREPLUMBER_CONF_OPT  :=  \
-Dsystemd-system-unit-dir=/usr/lib/systemd/system \
-Dsystemd-user-service=$(call 
ptx/truefalse,PTXCONF_WIREPLUMBER_SYSTEMD_UNIT_USER) \
-Dsystemd-user-unit-dir=/usr/lib/systemd/user \
-   -Dtests=false
+   -Dtests=false \
+   -Dtools=true
 
 # 
 # Target-Install
-- 
2.30.2

[ptxdist] [PATCH 1/3] pipewire: version bump 0.3.60 -> 0.3.64

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/pipewire.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/pipewire.make b/rules/pipewire.make
index cdb8c55596d9..feae36ea9103 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_PIPEWIRE) += pipewire
 #
 # Paths and names
 #
-PIPEWIRE_VERSION   := 0.3.60
-PIPEWIRE_MD5   := 3b77c023fef647f848fb4189349bde80
+PIPEWIRE_VERSION   := 0.3.64
+PIPEWIRE_MD5   := e37730d11bd0c923e423f0a369826fd4
 PIPEWIRE   := pipewire-$(PIPEWIRE_VERSION)
 PIPEWIRE_SUFFIX:= tar.bz2
 PIPEWIRE_URL   := 
https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/$(PIPEWIRE_VERSION)/$(PIPEWIRE).$(PIPEWIRE_SUFFIX)
@@ -66,6 +66,7 @@ PIPEWIRE_CONF_OPT := \
-Dexamples=enabled \
-Dffmpeg=disabled \
-Dflatpak=disabled \
+   -Dgsettings=disabled \
-Dgstreamer=$(call ptx/endis,PTXCONF_PIPEWIRE_GSTREAMER)d \
-Dgstreamer-device-provider=$(call 
ptx/endis,PTXCONF_PIPEWIRE_GSTREAMER)d \
-Dinstalled_tests=disabled \
-- 
2.30.2

[ptxdist] [PATCH v2] pulseaudio: fix targetinstall without daemon

[Michael Tretter]

The entire src/daemon subdirectory is disabled. This disables the build
of the pulseaudio executable and the generation of the daemon.conf,
system.pa, and default.pa configuration files. As the daemon is not
build, the D-BUS bus configuration and the systemd.service won't be
generated, too.

In src/utils, the pacmd and pasuspender are explicitly disabled.
pasuspender was never installed by the ptxdist rule.

The src/pulsecore subdirectory is disabled. Therefore, libpulsecore is
not built.

The src/modules subdirectory is disabled. Therefore, no modules are
built. As this disables the alsa-mixer module, there are no
configuration files for the alsa-mixer and, thus, the
usr/share/pulseaudio directory is empty and not created.

Signed-off-by: Michael Tretter 
---
Changelog:

v1 -> v2:

- reorder targetinstall to have a single PXTCONF_PULSEAUDIO_DAEMON check

- disable installation of pulseaudio-system.conf and systemd.service
---
 rules/pulseaudio.make | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
index 4c1763028cdd..d7a294967c48 100644
--- a/rules/pulseaudio.make
+++ b/rules/pulseaudio.make
@@ -121,7 +121,7 @@ $(STATEDIR)/pulseaudio.targetinstall:
@$(call install_fixup, pulseaudio,AUTHOR,"Michael Olbrich 
")
@$(call install_fixup, pulseaudio,DESCRIPTION,missing)
 
-   @$(call install_alternative, pulseaudio, 0, 0, 0644, 
/etc/pulse/client.conf)
+ifdef PTXCONF_PULSEAUDIO_DAEMON
@$(call install_alternative, pulseaudio, 0, 0, 0644, 
/etc/pulse/daemon.conf)
@$(call install_alternative, pulseaudio, 0, 0, 0644, 
/etc/pulse/system.pa)
@$(call install_alternative, pulseaudio, 0, 0, 0644, 
/etc/pulse/default.pa)
@@ -147,10 +147,18 @@ ifdef PTXCONF_PULSEAUDIO_SYSTEMD_UNIT_USER
@$(call install_link, pulseaudio, ../pulseaudio.socket, \
/usr/lib/systemd/user/sockets.target.wants/pulseaudio.socket)
 endif
-
@$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pulseaudio)
-   @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pactl)
@$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pacmd)
+
+   @$(call install_lib, pulseaudio, 0, 0, 0644, 
pulseaudio/libpulsecore-$(PULSEAUDIO_VERSION))
+
+   @$(call install_tree, pulseaudio, 0, 0, -, 
/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules)
+   @$(call install_tree, pulseaudio, 0, 0, -, /usr/share/pulseaudio)
+endif
+
+   @$(call install_alternative, pulseaudio, 0, 0, 0644, 
/etc/pulse/client.conf)
+
+   @$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pactl)
@$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pacat)
@$(call install_link, pulseaudio, pacat, /usr/bin/pamon)
@$(call install_link, pulseaudio, pacat, /usr/bin/paplay)
@@ -159,11 +167,7 @@ endif
 
@$(call install_lib, pulseaudio, 0, 0, 0644, libpulse)
@$(call install_lib, pulseaudio, 0, 0, 0644, libpulse-simple)
-   @$(call install_lib, pulseaudio, 0, 0, 0644, 
pulseaudio/libpulsecore-$(PULSEAUDIO_VERSION))
@$(call install_lib, pulseaudio, 0, 0, 0644, 
pulseaudio/libpulsecommon-$(PULSEAUDIO_VERSION))
-   @$(call install_tree, pulseaudio, 0, 0, -, 
/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules)
-
-   @$(call install_tree, pulseaudio, 0, 0, -, /usr/share/pulseaudio)
 
@$(call install_finish, pulseaudio)
 
-- 
2.30.2

[ptxdist] [PATCH] systemd: make default-net-naming-scheme configurable

[Michael Tretter]

The default-net-naming-scheme parameter allows to preserve the naming
scheme of a previous systemd version on a newer version. It may be
necessary to preserve a naming scheme if other system components rely on
certain network interface names generated by some naming scheme.

The default is "latest" to use the naming scheme of the currently used
systemd version.

Signed-off-by: Michael Tretter 
---
 rules/systemd.in   | 8 
 rules/systemd.make | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/rules/systemd.in b/rules/systemd.in
index 0818bf535866..17997574b62e 100644
--- a/rules/systemd.in
+++ b/rules/systemd.in
@@ -158,6 +158,14 @@ config SYSTEMD_NSPAWN
bool
prompt "install systemd-nspawn"
 
+config SYSTEMD_DEFAULT_NET_NAMING_SCHEME
+   string
+   prompt "default net.naming-scheme= value"
+   default "latest"
+   help
+ Preserve the naming scheme for network interfaces of the given
+ systemd version.
+
 menu "journald"
 
 config SYSTEMD_XZ
diff --git a/rules/systemd.make b/rules/systemd.make
index e5a6b26a5c55..69b044bb8123 100644
--- a/rules/systemd.make
+++ b/rules/systemd.make
@@ -78,7 +78,7 @@ SYSTEMD_CONF_OPT  := \
-Ddefault-llmnr=yes \
-Ddefault-locale=C \
-Ddefault-mdns=yes \
-   -Ddefault-net-naming-scheme=latest \
+   -Ddefault-net-naming-scheme=$(call 
remove_quotes,$(PTXCONF_SYSTEMD_DEFAULT_NET_NAMING_SCHEME)) \
-Ddev-kvm-mode=0660 \
-Ddns-over-tls=false \
-Ddns-servers= \
-- 
2.30.2

[ptxdist] [PATCH] pulseaudio: fix targetinstall without daemon

[Michael Tretter]

The entire src/daemon subdirectory is disabled. This disables the build
of the pulseaudio executable and the generation of the daemon.conf,
system.pa, and default.pa configuration files.

In src/utils, the pacmd and pasuspender are explicitly disabled.
pasuspender was never installed by the ptxdist rule.

The src/pulsecore subdirectory is disabled. Therefore, libpulsecore is
not built.

The src/modules subdirectory is disabled. Therefore, no modules are
built. As this disables the alsa-mixer module, there are no
configuration files for the alsa-mixer and, thus, the
usr/share/pulseaudio directory is empty and not created.

Signed-off-by: Michael Tretter 
---
 rules/pulseaudio.make | 12 
 1 file changed, 12 insertions(+)

diff --git a/rules/pulseaudio.make b/rules/pulseaudio.make
index 4c1763028cdd..63c4d8e9af86 100644
--- a/rules/pulseaudio.make
+++ b/rules/pulseaudio.make
@@ -122,9 +122,11 @@ $(STATEDIR)/pulseaudio.targetinstall:
@$(call install_fixup, pulseaudio,DESCRIPTION,missing)
 
@$(call install_alternative, pulseaudio, 0, 0, 0644, 
/etc/pulse/client.conf)
+ifdef PTXCONF_PULSEAUDIO_DAEMON
@$(call install_alternative, pulseaudio, 0, 0, 0644, 
/etc/pulse/daemon.conf)
@$(call install_alternative, pulseaudio, 0, 0, 0644, 
/etc/pulse/system.pa)
@$(call install_alternative, pulseaudio, 0, 0, 0644, 
/etc/pulse/default.pa)
+endif
 
 ifdef PTXCONF_PULSEAUDIO_BLUETOOTH
@$(call install_alternative, pulseaudio, 0, 0, 0644, \
@@ -148,9 +150,13 @@ ifdef PTXCONF_PULSEAUDIO_SYSTEMD_UNIT_USER
/usr/lib/systemd/user/sockets.target.wants/pulseaudio.socket)
 endif
 
+ifdef PTXCONF_PULSEAUDIO_DAEMON
@$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pulseaudio)
+endif
@$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pactl)
+ifdef PTXCONF_PULSEAUDIO_DAEMON
@$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pacmd)
+endif
@$(call install_copy, pulseaudio, 0, 0, 0755, -, /usr/bin/pacat)
@$(call install_link, pulseaudio, pacat, /usr/bin/pamon)
@$(call install_link, pulseaudio, pacat, /usr/bin/paplay)
@@ -159,11 +165,17 @@ endif
 
@$(call install_lib, pulseaudio, 0, 0, 0644, libpulse)
@$(call install_lib, pulseaudio, 0, 0, 0644, libpulse-simple)
+ifdef PTXCONF_PULSEAUDIO_DAEMON
@$(call install_lib, pulseaudio, 0, 0, 0644, 
pulseaudio/libpulsecore-$(PULSEAUDIO_VERSION))
+endif
@$(call install_lib, pulseaudio, 0, 0, 0644, 
pulseaudio/libpulsecommon-$(PULSEAUDIO_VERSION))
+ifdef PTXCONF_PULSEAUDIO_DAEMON
@$(call install_tree, pulseaudio, 0, 0, -, 
/usr/lib/pulse-$(PULSEAUDIO_VERSION)/modules)
+endif
 
+ifdef PTXCONF_PULSEAUDIO_DAEMON
@$(call install_tree, pulseaudio, 0, 0, -, /usr/share/pulseaudio)
+endif
 
@$(call install_finish, pulseaudio)
 
-- 
2.30.2

[ptxdist] [PATCH] wireplumber: version bump 0.4.9 -> 0.4.12

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/wireplumber.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/wireplumber.make b/rules/wireplumber.make
index 0b1de43d1a68..82f14baefe70 100644
--- a/rules/wireplumber.make
+++ b/rules/wireplumber.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_WIREPLUMBER) += wireplumber
 #
 # Paths and names
 #
-WIREPLUMBER_VERSION:= 0.4.9
-WIREPLUMBER_MD5:= b77170b2740ef7bc5e943d0878452a6c
+WIREPLUMBER_VERSION:= 0.4.12
+WIREPLUMBER_MD5:= 86dacf1649f64e83de99b11b693dee4f
 WIREPLUMBER:= wireplumber-$(WIREPLUMBER_VERSION)
 WIREPLUMBER_SUFFIX := tar.bz2
 WIREPLUMBER_URL:= 
https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/$(WIREPLUMBER_VERSION)/$(WIREPLUMBER).$(WIREPLUMBER_SUFFIX)
-- 
2.30.2

[ptxdist] [PATCH] stress-ng: version bump 0.11.15 -> 0.14.06

[Michael Tretter]

Fix the build with glibc 2.36:

stress-context.c:38:16: error: variably modified 'stack_sig' at file 
scope
make[1]: *** [Makefile:360: stress-context.o] Error 1

Signed-off-by: Michael Tretter 
---
 rules/stress-ng.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/stress-ng.make b/rules/stress-ng.make
index 1a6377b9bdc9..189fe29a41e5 100644
--- a/rules/stress-ng.make
+++ b/rules/stress-ng.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_STRESS_NG) += stress-ng
 #
 # Paths and names
 #
-STRESS_NG_VERSION  := 0.11.15
-STRESS_NG_MD5  := 1a716cde5a5a063fa3caa9b7d8aa1e70
+STRESS_NG_VERSION  := 0.14.06
+STRESS_NG_MD5  := 641d3be771a0350d0234d89cbab8834d
 STRESS_NG  := stress-ng-$(STRESS_NG_VERSION)
 STRESS_NG_SUFFIX   := tar.gz
 STRESS_NG_URL  := 
https://github.com/ColinIanKing/stress-ng/archive/refs/tags/V$(STRESS_NG_VERSION).$(STRESS_NG_SUFFIX)
-- 
2.30.2

[ptxdist] [PATCH] pipewire: allow to enable libcamera plugin

[Michael Tretter]

Add a configuration item to enable libcamera support. Make it
configurable to avoid always pulling libcamera as a dependency.

Signed-off-by: Michael Tretter 
---
 rules/pipewire.in   | 5 +
 rules/pipewire.make | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/rules/pipewire.in b/rules/pipewire.in
index e9032674c21a..9d1b920b429e 100644
--- a/rules/pipewire.in
+++ b/rules/pipewire.in
@@ -11,6 +11,7 @@ menuconfig PIPEWIRE
select GLIB if PIPEWIRE_GSTREAMER
select GSTREAMER1   if PIPEWIRE_GSTREAMER
select GST_PLUGINS_BASE1if PIPEWIRE_GSTREAMER
+   select LIBCAMERAif PIPEWIRE_LIBCAMERA
select LIBSNDFILE
select READLINE if PIPEWIRE_PW_CTL
select NCURSES  if PIPEWIRE_PW_TOP
@@ -49,6 +50,10 @@ config PIPEWIRE_PULSEAUDIO
bool
prompt "install pulseaudio compatibility service"
 
+config PIPEWIRE_LIBCAMERA
+   bool
+   prompt "build and install libcamera plugin"
+
 config PIPEWIRE_RAOP
bool
prompt "enable Remote Audio Output Protocol module"
diff --git a/rules/pipewire.make b/rules/pipewire.make
index 838ddc660fc0..3b9e1b51a914 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -71,7 +71,7 @@ PIPEWIRE_CONF_OPT := \
-Djack=disabled \
-Djack-devel=false \
-Dlegacy-rtkit=false \
-   -Dlibcamera=disabled \
+   -Dlibcamera=$(call ptx/endis,PTXCONF_PIPEWIRE_LIBCAMERA)d \
-Dlibcanberra=disabled \
-Dlibjack-path= \
-Dlibpulse=disabled \
@@ -145,6 +145,7 @@ PIPEWIRE_SPA_MODULES := \
audiomixer/libspa-audiomixer \
audiotestsrc/libspa-audiotestsrc \
control/libspa-control \
+   $(call ptx/ifdef,PTXCONF_PIPEWIRE_LIBCAMERA,libcamera/libspa-libcamera) 
\
support/libspa-dbus \
$(call ptx/ifdef,PTXCONF_PIPEWIRE_SYSTEMD,support/libspa-journal) \
support/libspa-support \
-- 
2.30.2

[ptxdist] [PATCH 3/3] weston: version bump 10.0.2 -> 11.0.0

[Michael Tretter]

Bump Weston to version 11.0.0

The fbdev backend and the wl_shell support have been removed. Remove the
config items, too.

weston-info has been replaced by wayland-info. Enable WAYLAND_UTILS to
get wayland-info.

libweston-desktop has been merged into libweston.

Signed-off-by: Michael Tretter 
---
 rules/weston.in   | 14 --
 rules/weston.make | 15 +--
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 6fe570e0a4b2..a698a7491509 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -59,20 +59,6 @@ config WESTON_HEADLESS_COMPOSITOR
bool
prompt "headless compositor"
 
-config WESTON_FBDEV_COMPOSITOR
-   bool
-   prompt "fbdev compositor"
-
-config WESTON_DEPRECATED_WL_SHELL
-   bool
-   prompt "enable the deprecated wl-shell protocol"
-   help
- Allow clients to use the deprecated wl-shell protocol.
-
- The wl-shell is deprecated. If you have to enable this option,
- consider migrating your clients to the xdg-shell protocol and
- disabling this option.
-
 config WESTON_STARTSCRIPT
bool
default y
diff --git a/rules/weston.make b/rules/weston.make
index adb24b0c739b..cbfbe624c03c 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION := 10.0.2
-LIBWESTON_MAJOR := 10
-WESTON_MD5 := 8d46c0c0dd5c2ddfdced0a79ea7b6155
+WESTON_VERSION := 11.0.0
+LIBWESTON_MAJOR := 11
+WESTON_MD5 := ce50a4b11e5bb6d4a3a517ab34e86aa5
 WESTON := weston-$(WESTON_VERSION)
 WESTON_SUFFIX  := tar.xz
 WESTON_URL := 
https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_VERSION)/downloads/$(WESTON).$(WESTON_SUFFIX)
@@ -43,12 +43,10 @@ WESTON_CONF_OPT := \
-Dbackend-rdp=false \
-Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
-Dbackend-x11=false \
-   -Dcolor-management-colord=false \
-Dcolor-management-lcms=false \
-Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \
-   -Ddeprecated-backend-fbdev=$(call 
ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
-   -Ddeprecated-weston-launch=false \
-   -Ddeprecated-wl-shell=$(call 
ptx/truefalse,PTXCONF_WESTON_DEPRECATED_WL_SHELL) \
+   -Ddeprecated-color-management-colord=false \
+   -Ddeprecated-color-management-static=false \
-Ddesktop-shell-client-default=weston-desktop-shell \
-Ddoc=false \
-Dimage-jpeg=true \
@@ -66,7 +64,6 @@ WESTON_CONF_OPT   := \
-Dshell-kiosk=$(call ptx/truefalse,PTXCONF_WESTON_SHELL_KIOSK) \
-Dsimple-clients=$(subst $(space),$(comma),$(WESTON_SIMPLE_CLIENTS-y)) \
-Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
-   -Dtest-gl-renderer=false \
-Dtest-junit-xml=false \
-Dtest-skip-is-failure=false \
-Dtools=calibrator,debug,info,terminal,touch-calibrator \
@@ -106,7 +103,6 @@ $(STATEDIR)/weston.targetinstall:
@$(call install_fixup, weston,DESCRIPTION,"wayland reference compositor 
implementation")
 
@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston)
-   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-info)
@$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-debug)
@$(call install_copy, weston, 0, 0, 0755, -, 
/usr/bin/weston-screenshooter)
 ifdef PTXCONF_WESTON_SIMPLE_CLIENTS
@@ -129,7 +125,6 @@ ifdef PTXCONF_WESTON_WCAP_TOOLS
 endif
 
@$(call install_lib, weston, 0, 0, 0644, libweston-$(LIBWESTON_MAJOR))
-   @$(call install_lib, weston, 0, 0, 0644, 
libweston-desktop-$(LIBWESTON_MAJOR))
 ifdef PTXCONF_WESTON_XWAYLAND
@$(call install_lib, weston, 0, 0, 0644, 
libweston-$(LIBWESTON_MAJOR)/xwayland)
 endif
-- 
2.30.2

[ptxdist] [PATCH 1/3] weston: select WESTON_GL for PipeWire plugin

[Michael Tretter]

Like the remoting plugin the PipeWire plugin uses DRM virtual, which
requires the renderer-gl.

Select WESTON_GL to avoid the error during configure.

Signed-off-by: Michael Tretter 
---
 rules/weston.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/weston.in b/rules/weston.in
index 550eda4b19aa..6fe570e0a4b2 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -125,6 +125,7 @@ config WESTON_SHELL_KIOSK
 
 config WESTON_PIPEWIRE
bool
+   select WESTON_GL
prompt "pipewire plugin"
 
 config WESTON_REMOTING
-- 
2.30.2

[ptxdist] [PATCH 2/3] weston: add missing license file

[Michael Tretter]

Add the Weston license file with the md5 hash.

Signed-off-by: Michael Tretter 
---
 rules/weston.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/weston.make b/rules/weston.make
index 552253a78cb9..adb24b0c739b 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -24,6 +24,7 @@ WESTON_URL:= 
https://gitlab.freedesktop.org/wayland/weston/-/releases/$(WESTON_
 WESTON_SOURCE  := $(SRCDIR)/$(WESTON).$(WESTON_SUFFIX)
 WESTON_DIR := $(BUILDDIR)/$(WESTON)
 WESTON_LICENSE := MIT
+WESTON_LICENSE_FILES   := file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70
 
 # 
 # Prepare
-- 
2.30.2

[ptxdist] [PATCH] template-src-linux-driver: add HOST_SYSTEM_PYTHON3 dependency

[Michael Tretter]

Since commit a637a4e50bac ("template-src-linux-driver: generate
compile_commands.json at build-time") the make template of the modules
uses the kernel's script to generate the compile_commands.json.

As this is a Python 3 script, kernel modules need the
HOST_SYSTEM_PYTHON3 dependency.

Signed-off-by: Michael Tretter 
---
 rules/templates/template-src-linux-driver-in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/templates/template-src-linux-driver-in 
b/rules/templates/template-src-linux-driver-in
index 7cb61c87cd46..4d0463a9f3f0 100644
--- a/rules/templates/template-src-linux-driver-in
+++ b/rules/templates/template-src-linux-driver-in
@@ -3,6 +3,7 @@
 config @PACKAGE@
tristate
select KERNEL
+   select HOST_SYSTEM_PYTHON3
prompt "@package@"
help
  FIXME
-- 
2.30.2

[ptxdist] [PATCH] ptxd_make_world_license: skip ignore in license report

[Michael Tretter]

The yaml contains packages with an ignored license. These packages are
removed from the license-compliance.pdf, but they must be removed from
the license-report.pdf as well.

Signed-off-by: Michael Tretter 
---
 scripts/lib/ptxd_make_license_report.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/lib/ptxd_make_license_report.sh 
b/scripts/lib/ptxd_make_license_report.sh
index 21135d0db9cd..24f833637de0 100644
--- a/scripts/lib/ptxd_make_license_report.sh
+++ b/scripts/lib/ptxd_make_license_report.sh
@@ -185,7 +185,7 @@ ptxd_make_license_report() {
ptxd_make_license_report_header
for pkg in ${@}; do
pkg_lic="${ptxd_package_license_association[${pkg}]}"
-   if [ -z ${pkg_lic} ]; then
+   if [ -z ${pkg_lic} -o "${pkg_lic}" = "ignore" ]; then
continue
fi
pkg_lic="${pkg_lic}/${pkg}"
-- 
2.30.2


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

[ptxdist] [PATCH] pipewire: disable v4l2 integration

[Michael Tretter]

PipeWire allows to emulate V4L2 devices by intercepting the device
ioctls and handling them in PipeWire. This is unrelated to the V4L2
backend, which allows to use V4L2 devices in PipeWire.

Disable the integration, because applications should use PipeWire
directly instead of using the V4L2 API.

Signed-off-by: Michael Tretter 
---
 rules/pipewire.make | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/rules/pipewire.make b/rules/pipewire.make
index 9fd3d4d40658..495c5188687c 100644
--- a/rules/pipewire.make
+++ b/rules/pipewire.make
@@ -75,7 +75,7 @@ PIPEWIRE_CONF_OPT := \
-Dman=disabled \
-Dpipewire-alsa=enabled \
-Dpipewire-jack=disabled \
-   -Dpipewire-v4l2=enabled \
+   -Dpipewire-v4l2=disabled \
-Dpw-cat=enabled \
-Draop=$(call ptx/endis,PTXCONF_PIPEWIRE_RAOP)d \
-Droc=disabled \
@@ -176,7 +176,6 @@ endif
 ifdef PTXCONF_PIPEWIRE_PW_TOP
@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-top)
 endif
-   @$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/pw-v4l2)
@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/spa-acp-tool)
@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/spa-inspect)
@$(call install_copy, pipewire, 0, 0, 755, -, /usr/bin/spa-json-dump)
@@ -193,8 +192,6 @@ endif
$(call install_lib, pipewire, 0, 0, 644, \
pipewire-0.3/libpipewire-module-$(module))$(ptx/nl))
 
-   @$(call install_lib, pipewire, 0, 0, 644, pipewire-0.3/v4l2/libpw-v4l2)
-
@$(foreach module, $(PIPEWIRE_SPA_MODULES), \
$(call install_lib, pipewire, 0, 0, 644, \
spa-0.2/$(module))$(ptx/nl))
-- 
2.30.2


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

[ptxdist] [PATCH v2] weston: version bump 9.0.0 -> 10.0.0

[Michael Tretter]

Drop the WESTON_DRM_COMPOSITOR option and always build the drm backend.
It was unconditionally selected as the default anyway and not building
the backend results in a build failure.

Drop WESTON_LAUNCH, as the weston-launch is deprecated and was BROKEN
anyway.

Add WESTON_SEATD to enable the libseat-launcher.

Add WESTON_DEPRECATED_WL_SHELL, which defaults to false to enable the
deprecated wl-shell if clients still require it.

Remove BROKEN from WESTON_PIPEWIRE, as PTXdist now includes Pipewire.

Update the installation of the example config files to use the files
that are generated by Weston instead of generating it in the rule file

Signed-off-by: Michael Tretter 
---
Changelog:

v2:

- fix dependency on LIBDRM, UDEV, and UDEV_LIBUDEV
- remove default n from WESTON_DEPRECATED_WL_SHELL
- add prompt for WESTON_SEATD
---
 rules/weston.in   | 36 ++--
 rules/weston.make | 31 +--
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 0005ca1c33cf..ca2e06a53201 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -13,11 +13,11 @@ menuconfig WESTON
select LIBINPUT
select CAIRO
select CAIRO_PNG
-   select LIBDRM   if WESTON_DRM_COMPOSITOR || BUILDTIME
-   select UDEV if WESTON_DRM_COMPOSITOR || 
WESTON_FBDEV_COMPOSITOR
-   select UDEV_LIBUDEV if WESTON_DRM_COMPOSITOR || 
WESTON_FBDEV_COMPOSITOR
+   select LIBDRM
+   select UDEV
+   select UDEV_LIBUDEV
select MESALIB  if WESTON_GL
-   select MESALIB_GBM  if WESTON_DRM_COMPOSITOR && WESTON_GL
+   select MESALIB_GBM  if WESTON_GL
select MESALIB_EGL  if WESTON_GL
select MESALIB_EGL_WAYLAND  if WESTON_GL
select MESALIB_GLES2if WESTON_GL
@@ -28,6 +28,7 @@ menuconfig WESTON
select XORG_LIB_XCURSOR if WESTON_XWAYLAND
select XORG_SERVER  if WESTON_XWAYLAND && RUNTIME
select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME
+   select SEATDif WESTON_SEATD
select SYSTEMD  if WESTON_SYSTEMD
select SYSTEMD_LOGIND   if WESTON_SYSTEMD_LOGIND
select DBUS if WESTON_SYSTEMD_LOGIND
@@ -39,6 +40,7 @@ menuconfig WESTON
select GST_PLUGINS_GOOD1_RTPif WESTON_REMOTING && RUNTIME
select GST_PLUGINS_GOOD1_UDPif WESTON_REMOTING && RUNTIME
select PANGOif WESTON_IVISHELL_EXAMPLE
+   select PIPEWIRE if WESTON_PIPEWIRE
prompt "weston"
help
  Wayland compositor reference implementation
@@ -49,13 +51,8 @@ config WESTON_XWAYLAND
bool
prompt "Xwayland support"
 
-config WESTON_DRM_COMPOSITOR
-   bool
-   prompt "drm compositor"
-
 config WESTON_GL
bool
-   depends on WESTON_DRM_COMPOSITOR
prompt "OpenGL accelerated compositing"
 
 config WESTON_HEADLESS_COMPOSITOR
@@ -66,14 +63,15 @@ config WESTON_FBDEV_COMPOSITOR
bool
prompt "fbdev compositor"
 
-config WESTON_LAUNCH
+config WESTON_DEPRECATED_WL_SHELL
bool
-   prompt "weston-launch support"
-   # needs pam
-   depends on BROKEN
+   prompt "enable the deprecated wl-shell protocol"
help
- weston-launch is a setuid-root program which does privileged
- operations on Weston's behalf
+ Allow clients to use the deprecated wl-shell protocol.
+
+ The wl-shell is deprecated. If you have to enable this option,
+ consider migrating your clients to the xdg-shell protocol and
+ disabling this option.
 
 config WESTON_STARTSCRIPT
bool
@@ -81,6 +79,11 @@ config WESTON_STARTSCRIPT
depends on INITMETHOD_BBINIT
prompt "install /etc/init.d/weston-init"
 
+config WESTON_SEATD
+   bool
+   default y
+   prompt "libseat backend"
+
 config WESTON_SYSTEMD
bool
default INITMETHOD_SYSTEMD
@@ -123,12 +126,9 @@ config WESTON_SHELL_KIOSK
 config WESTON_PIPEWIRE
bool
prompt "pipewire plugin"
-   # needs pipewire
-   depends on BROKEN
 
 config WESTON_REMOTING
bool
-   select WESTON_DRM_COMPOSITOR
select WESTON_GL
prompt "remoting plugin"
 
diff --git a/rules/weston.make b/rules/weston.make
index 716c990e7c36..ed22ce8fe2d2 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION := 9.0.0
-LIBWESTON_MAJOR := 9
-WESTON_MD5 := b406da0fe9139fd39653238fde22a6cf
+WESTON_VERSION := 10.0.0
+LIBWESTON_MAJOR := 10
+WESTON_MD5 := bc4

Re: [ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0

[Michael Tretter]

On Fri, 04 Feb 2022 13:31:34 +0100, Michael Olbrich wrote:
> On Fri, Feb 04, 2022 at 11:29:16AM +0100, Michael Tretter wrote:
> > Drop the WESTON_DRM_COMPOSITOR option and always build the drm backend.
> > It was unconditionally selected as the default anyway and not building
> > the backend results in a build failure.
> > 
> > Drop WESTON_LAUNCH, as the weston-launch is deprecated and was BROKEN
> > anyway.
> > 
> > Add WESTON_SEATD to enable the libseat-launcher.
> > 
> > Add WESTON_DEPRECATED_WL_SHELL, which defaults to false to enable the
> > deprecated wl-shell if clients still require it.
> > 
> > Remove BROKEN from WESTON_PIPEWIRE, as PTXdist now includes Pipewire.
> > 
> > Update the installation of the example config files to use the files
> > that are generated by Weston instead of generating it in the rule file
> > 
> > Signed-off-by: Michael Tretter 
> > ---
> >  rules/weston.in   | 36 ++--
> >  rules/weston.make | 31 +--
> >  2 files changed, 31 insertions(+), 36 deletions(-)
> > 
> > diff --git a/rules/weston.in b/rules/weston.in
> > index 0005ca1c33cf..05b61d14e64d 100644
> > --- a/rules/weston.in
> > +++ b/rules/weston.in
> > @@ -13,11 +13,11 @@ menuconfig WESTON
> > select LIBINPUT
> > select CAIRO
> > select CAIRO_PNG
> > -   select LIBDRM   if WESTON_DRM_COMPOSITOR || BUILDTIME
> > -   select UDEV if WESTON_DRM_COMPOSITOR || 
> > WESTON_FBDEV_COMPOSITOR
> > -   select UDEV_LIBUDEV if WESTON_DRM_COMPOSITOR || 
> > WESTON_FBDEV_COMPOSITOR
> > +   select LIBDRM   if BUILDTIME
> > +   select UDEV if WESTON_FBDEV_COMPOSITOR
> > +   select UDEV_LIBUDEV if WESTON_FBDEV_COMPOSITOR
> 
> This looks wrong. If the drm backend is enabled unconditionally then the
> dependencies should be as well.

A right. These should be always selected.

> 
> > select MESALIB  if WESTON_GL
> > -   select MESALIB_GBM  if WESTON_DRM_COMPOSITOR && WESTON_GL
> > +   select MESALIB_GBM  if WESTON_GL
> > select MESALIB_EGL  if WESTON_GL
> > select MESALIB_EGL_WAYLAND  if WESTON_GL
> > select MESALIB_GLES2if WESTON_GL
> > @@ -28,6 +28,7 @@ menuconfig WESTON
> > select XORG_LIB_XCURSOR if WESTON_XWAYLAND
> > select XORG_SERVER  if WESTON_XWAYLAND && RUNTIME
> > select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME
> > +   select SEATDif WESTON_SEATD
> > select SYSTEMD  if WESTON_SYSTEMD
> > select SYSTEMD_LOGIND   if WESTON_SYSTEMD_LOGIND
> > select DBUS if WESTON_SYSTEMD_LOGIND
> > @@ -39,6 +40,7 @@ menuconfig WESTON
> > select GST_PLUGINS_GOOD1_RTPif WESTON_REMOTING && RUNTIME
> > select GST_PLUGINS_GOOD1_UDPif WESTON_REMOTING && RUNTIME
> > select PANGOif WESTON_IVISHELL_EXAMPLE
> > +   select PIPEWIRE if WESTON_PIPEWIRE
> > prompt "weston"
> > help
> >   Wayland compositor reference implementation
> > @@ -49,13 +51,8 @@ config WESTON_XWAYLAND
> > bool
> > prompt "Xwayland support"
> >  
> > -config WESTON_DRM_COMPOSITOR
> > -   bool
> > -   prompt "drm compositor"
> > -
> >  config WESTON_GL
> > bool
> > -   depends on WESTON_DRM_COMPOSITOR
> > prompt "OpenGL accelerated compositing"
> >  
> >  config WESTON_HEADLESS_COMPOSITOR
> > @@ -66,14 +63,16 @@ config WESTON_FBDEV_COMPOSITOR
> > bool
> > prompt "fbdev compositor"
> >  
> > -config WESTON_LAUNCH
> > +config WESTON_DEPRECATED_WL_SHELL
> > bool
> > -   prompt "weston-launch support"
> > -   # needs pam
> > -   depends on BROKEN
> > +   default n
> 
> drop this line. It's the default.

Ack.

> 
> > +   prompt "enable the deprecated wl-shell protocol"
> > help
> > - weston-launch is a setuid-root program which does privileged
> > - operations on Weston's behalf
> > + Allow clients to use the deprecated wl-shell protocol.
> > +
> > + The wl-shell is deprecated. If you have to enable this option,
> > + consider migrating your clients to the xdg-shell protocol and
> > +  

[ptxdist] [PATCH] weston: version bump 9.0.0 -> 10.0.0

[Michael Tretter]

Drop the WESTON_DRM_COMPOSITOR option and always build the drm backend.
It was unconditionally selected as the default anyway and not building
the backend results in a build failure.

Drop WESTON_LAUNCH, as the weston-launch is deprecated and was BROKEN
anyway.

Add WESTON_SEATD to enable the libseat-launcher.

Add WESTON_DEPRECATED_WL_SHELL, which defaults to false to enable the
deprecated wl-shell if clients still require it.

Remove BROKEN from WESTON_PIPEWIRE, as PTXdist now includes Pipewire.

Update the installation of the example config files to use the files
that are generated by Weston instead of generating it in the rule file

Signed-off-by: Michael Tretter 
---
 rules/weston.in   | 36 ++--
 rules/weston.make | 31 +--
 2 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 0005ca1c33cf..05b61d14e64d 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -13,11 +13,11 @@ menuconfig WESTON
select LIBINPUT
select CAIRO
select CAIRO_PNG
-   select LIBDRM   if WESTON_DRM_COMPOSITOR || BUILDTIME
-   select UDEV if WESTON_DRM_COMPOSITOR || 
WESTON_FBDEV_COMPOSITOR
-   select UDEV_LIBUDEV if WESTON_DRM_COMPOSITOR || 
WESTON_FBDEV_COMPOSITOR
+   select LIBDRM   if BUILDTIME
+   select UDEV if WESTON_FBDEV_COMPOSITOR
+   select UDEV_LIBUDEV if WESTON_FBDEV_COMPOSITOR
select MESALIB  if WESTON_GL
-   select MESALIB_GBM  if WESTON_DRM_COMPOSITOR && WESTON_GL
+   select MESALIB_GBM  if WESTON_GL
select MESALIB_EGL  if WESTON_GL
select MESALIB_EGL_WAYLAND  if WESTON_GL
select MESALIB_GLES2if WESTON_GL
@@ -28,6 +28,7 @@ menuconfig WESTON
select XORG_LIB_XCURSOR if WESTON_XWAYLAND
select XORG_SERVER  if WESTON_XWAYLAND && RUNTIME
select XORG_SERVER_XWAYLAND if WESTON_XWAYLAND && RUNTIME
+   select SEATDif WESTON_SEATD
select SYSTEMD  if WESTON_SYSTEMD
select SYSTEMD_LOGIND   if WESTON_SYSTEMD_LOGIND
select DBUS if WESTON_SYSTEMD_LOGIND
@@ -39,6 +40,7 @@ menuconfig WESTON
select GST_PLUGINS_GOOD1_RTPif WESTON_REMOTING && RUNTIME
select GST_PLUGINS_GOOD1_UDPif WESTON_REMOTING && RUNTIME
select PANGOif WESTON_IVISHELL_EXAMPLE
+   select PIPEWIRE if WESTON_PIPEWIRE
prompt "weston"
help
  Wayland compositor reference implementation
@@ -49,13 +51,8 @@ config WESTON_XWAYLAND
bool
prompt "Xwayland support"
 
-config WESTON_DRM_COMPOSITOR
-   bool
-   prompt "drm compositor"
-
 config WESTON_GL
bool
-   depends on WESTON_DRM_COMPOSITOR
prompt "OpenGL accelerated compositing"
 
 config WESTON_HEADLESS_COMPOSITOR
@@ -66,14 +63,16 @@ config WESTON_FBDEV_COMPOSITOR
bool
prompt "fbdev compositor"
 
-config WESTON_LAUNCH
+config WESTON_DEPRECATED_WL_SHELL
bool
-   prompt "weston-launch support"
-   # needs pam
-   depends on BROKEN
+   default n
+   prompt "enable the deprecated wl-shell protocol"
help
- weston-launch is a setuid-root program which does privileged
- operations on Weston's behalf
+ Allow clients to use the deprecated wl-shell protocol.
+
+ The wl-shell is deprecated. If you have to enable this option,
+ consider migrating your clients to the xdg-shell protocol and
+ disabling this option.
 
 config WESTON_STARTSCRIPT
bool
@@ -81,6 +80,10 @@ config WESTON_STARTSCRIPT
depends on INITMETHOD_BBINIT
prompt "install /etc/init.d/weston-init"
 
+config WESTON_SEATD
+   bool
+   default y
+
 config WESTON_SYSTEMD
bool
default INITMETHOD_SYSTEMD
@@ -123,12 +126,9 @@ config WESTON_SHELL_KIOSK
 config WESTON_PIPEWIRE
bool
prompt "pipewire plugin"
-   # needs pipewire
-   depends on BROKEN
 
 config WESTON_REMOTING
bool
-   select WESTON_DRM_COMPOSITOR
select WESTON_GL
prompt "remoting plugin"
 
diff --git a/rules/weston.make b/rules/weston.make
index 716c990e7c36..ed22ce8fe2d2 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -15,9 +15,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
 #
 # Paths and names
 #
-WESTON_VERSION := 9.0.0
-LIBWESTON_MAJOR := 9
-WESTON_MD5 := b406da0fe9139fd39653238fde22a6cf
+WESTON_VERSION := 10.0.0
+LIBWESTON_MAJOR := 10
+WESTON_MD5 := bc4abe2ee6904a4890a0c641c6257f91
 WESTON := weston-$(WES

[ptxdist] [PATCH] gt: version bump 31b13554... -> 2021-09-30-g7247547a

[Michael Tretter]

Update to the latest master to get a few build system cleanups. For
example, the install location of the config file is now /etc, which
allows us to use install_alternative to be able to override the config
in a BSP.

Also add the date to the package version and document that there are no
tags for gt.

Signed-off-by: Michael Tretter 
---
 rules/gt.make | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rules/gt.make b/rules/gt.make
index 5fc40c2e247a..53deaba5a4c1 100644
--- a/rules/gt.make
+++ b/rules/gt.make
@@ -14,8 +14,9 @@ PACKAGES-$(PTXCONF_GT) += gt
 #
 # Paths and names
 #
-GT_VERSION := 31b135546d0d1733b5b7ca19f48748c06824d65a
-GT_MD5 := 5ae9260049f5d2cd2ebeccef92e7888b
+# No tags: use a fake descriptive commit-ish to include the date
+GT_VERSION := 2021-09-30-g7247547a
+GT_MD5 := ac390e90cc866ca95cf4821fbf25812b
 GT := gt-$(GT_VERSION)
 GT_SUFFIX  := tar.gz
 GT_URL := 
https://github.com/linux-usb-gadgets/gt/archive/$(GT_VERSION).$(GT_SUFFIX)
@@ -50,8 +51,7 @@ $(STATEDIR)/gt.targetinstall:
@$(call install_fixup, gt, DESCRIPTION, missing)
 
@$(call install_copy, gt, 0, 0, 0755, -, /usr/bin/gt)
-   @$(call install_copy, gt, 0, 0, 0644, \
-   $(GT_PKGDIR)/usr/etc/gt/gt.conf, /etc/gt/gt.conf)
+   @$(call install_alternative, gt, 0, 0, 0644, /etc/gt/gt.conf)
 
@$(call install_finish, gt)
 
-- 
2.30.2


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

Re: [ptxdist] [PATCH] rules/weston.make: Add kiosk shell install rule.

[Michael Tretter]

On Thu, 16 Sep 2021 16:26:25 +0200, Christian Melki wrote:
> Seems the kiosk shell was forgotten about during installation.
> Defined, built but never installed?
> Add install rule.
> 
> Signed-off-by: Christian Melki 

Reviewed-by: Michael Tretter 

> ---
>  rules/weston.make | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/rules/weston.make b/rules/weston.make
> index 2bd11b4ef..716c990e7 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -161,6 +161,9 @@ endif
>  ifdef PTXCONF_WESTON_IVISHELL
>   @$(call install_lib, weston, 0, 0, 0644, weston/ivi-shell)
>  endif
> +ifdef PTXCONF_WESTON_SHELL_KIOSK
> + @$(call install_lib, weston, 0, 0, 0644, weston/kiosk-shell)
> +endif
>  ifdef PTXCONF_WESTON_SYSTEMD
>   @$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify)
>  endif
> -- 
> 2.30.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

Re: [ptxdist] [RFC] Add DTB overlay handling to ptxdist

[Michael Tretter]

On Fri, 06 Aug 2021 13:42:33 +0200, Christian Melki wrote:
> On 8/4/21 9:10 AM, Michael Olbrich wrote:
> > On Thu, Jun 03, 2021 at 12:43:10PM +0200, Christian Melki wrote:
> >> On 6/3/21 9:21 AM, Michael Tretter wrote:
> >>> On Wed, 02 Jun 2021 14:19:10 +0200, Christian Melki wrote:
> >>>> The only real difference here is that the symbol handling
> >>>> must always be present. Hence "-@" for default extra arg.
> >>>> Make paths variable but default to boot for the old dtb behavior.
> >>>> There is a lot of duplication going on here, but the main purpose
> >>>> is to separate dtb from dtbo handling with separate names and functions.
> >>>
> >>> I am not convinced that it is a good idea to mix the handling of dtb and 
> >>> dtbo
> >>> in one rule file. Maybe it helps, if there is a separate rule for 
> >>> overlays,
> >>> but I didn't think this through.
> >>>
> >>
> >> Splitting them works for me. I have no opinion here.
> >> I thought that this was an easy way to start a seed for refinement.
> > 
> > I actually disagree with Michael here. In fact, I basically merged the dtc
> > package into the kernel package. And I think the overlays should be added
> > there as well.
> > The reality is, that devicetrees, cannot be built without the kernel source
> > tree. There are just too many includes. And once you start having multiple
> > kernel packages, a separate dtc package gets really messy. And the
> > dependencies got really complex.

For board device tree that usually include some dtsi from the kernel tree,
this is very valid, and building the board device trees with the kernel is
correct.

However, for overlays the situation is different. All overlays that I have
seen so far are pretty self-contained. If they are including dtsi files, these
are located in the same directory (or at least in the same repository).  Some
others use the definitions from the include/dt-bindings directory of the
kernel, but that's it.

Therefore, while the overlays still need some headers from the kernel source
tree, they are much more closely coupled with the thing that the overlay is
describing.

> > 
> > So I refactored the helper functions and they are now used by the kernel
> > package. I think that can be extended to allow building overlays as well.
> > Maybe just a different output dir? I'm not sure.
> > 
> > Some comments that will still be valid for a new version:
> > 
> >>>> Signed-off-by: Christian Melki 
> >>>>
> >>>> diff --git a/platforms/dtc.in b/platforms/dtc.in
> >>>> index 5e8b35291..101d99836 100644
> >>>> --- a/platforms/dtc.in
> >>>> +++ b/platforms/dtc.in
> >>>> @@ -13,10 +13,18 @@ menuconfig DTC
> >>>>   if DTC
> >>>>   config DTC_INSTALL_OFTREE
> >>>> -bool "install oftree to /boot"
> >>>> +bool "install oftrees to target path"
> >>>>  help
> >>>> -  Creates a package to install the 'oftree' file to /boot
> >>>> -  of your target system.
> >>>> +  Creates a package to install the 'oftree' files
> >>>> +  to your target system.
> >>>> +
> >>>> +config DTC_INSTALL_OFTREE_OVERLAY
> >>>> +bool "install oftrees overlays to target path"
> >>>> +help
> >>>> +  Creates a package to install the 'oftree' overlay
> >>>> +  files to your target system.
> >>>> +
> >>>> +comment "device tree paths   ---"
> >>>>   config DTC_OFTREE_DTS_PATH
> >>>>  string "path to source dts file"
> >>>> @@ -25,6 +33,15 @@ config DTC_OFTREE_DTS_PATH
> >>>>Define path to the dts source file. Multiple directories can 
> >>>> be
> >>>>specified separated by ':'.
> >>>> +config DTC_OFTREE_DTO_PATH
> >>>> +string "path to source dto (overlay) files"
> >>>> +default 
> >>>> "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts"
> >>>> +help
> >>>> +  Define path to the dto source files. Multiple directories can 
> >>>> be
> >>>> +  specified separated by ':'.
> > 
> > Hmm, the default is the same. Why 

[ptxdist] [PATCH] blspec-entry: fix device tree based generation

[Michael Tretter]

KERNEL_DTB is just the option to enable the device tree generation. The
actual dts files are stored in KERNEL_DTS.

Fixes: f50cd144 ("rework device-tree handling")
Signed-off-by: Michael Tretter 
---
 rules/blspec-entry.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/blspec-entry.make b/rules/blspec-entry.make
index 0108f09d95e8..f393b1bda162 100644
--- a/rules/blspec-entry.make
+++ b/rules/blspec-entry.make
@@ -19,7 +19,7 @@ BLSPEC_ENTRY_VERSION  := $(KERNEL_VERSION)
 
 BLSPEC_ENTRY_TITLE := PTXdist - $(call 
remove_quotes,$(PTXCONF_PROJECT_VENDOR)-$(PTXCONF_PROJECT))
 ifdef PTXCONF_BLSPEC_ENTRY_DEVICETREE
-BLSPEC_ENTRY_NAMES = $(basename $(notdir $(KERNEL_DTB)))
+BLSPEC_ENTRY_NAMES = $(basename $(notdir $(KERNEL_DTS)))
 blspec/title   = $(BLSPEC_ENTRY_TITLE) $(strip $(1))
 blspec/devicetree  = devicetree\t/boot/$(strip $(1)).dtb
 else
-- 
2.30.2


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

[ptxdist] [PATCH v2] seatd: new package

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
Changelog:

v2:

- fix dependency of SEATD_SEATD_SYSTEMD_UNIT
- add help text for SEATD_SEATD
---
 .../usr/lib/systemd/system/seatd.service  |  8 ++
 rules/seatd.in| 35 +
 rules/seatd.make  | 76 +++
 3 files changed, 119 insertions(+)
 create mode 100644 projectroot/usr/lib/systemd/system/seatd.service
 create mode 100644 rules/seatd.in
 create mode 100644 rules/seatd.make

diff --git a/projectroot/usr/lib/systemd/system/seatd.service 
b/projectroot/usr/lib/systemd/system/seatd.service
new file mode 100644
index ..59137e67c8b3
--- /dev/null
+++ b/projectroot/usr/lib/systemd/system/seatd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Seat management daemon
+
+[Service]
+Restart=always
+# Do not require a VT
+Environment=SEATD_VTBOUND=0
+ExecStart=/usr/bin/seatd
diff --git a/rules/seatd.in b/rules/seatd.in
new file mode 100644
index ..768cb7709698
--- /dev/null
+++ b/rules/seatd.in
@@ -0,0 +1,35 @@
+## SECTION=system_libraries
+
+menuconfig SEATD
+   tristate
+   select HOST_MESON
+   select SYSTEMD  if SEATD_SYSTEMD_LOGIND
+   select SYSTEMD_LOGIND   if SEATD_SYSTEMD_LOGIND
+   prompt "libseat"
+   help
+ A minimal seat management daemon, and a universal seat management 
library.
+
+if SEATD
+
+config SEATD_SYSTEMD_LOGIND
+   bool
+   default INITMETHOD_SYSTEMD
+   prompt "logind support"
+
+config SEATD_SEATD
+   bool
+   default y
+   prompt "seatd server"
+   help
+ The seatd server is an alternative to systemd-logind to provide the
+ seat. If you are using systemd-logind, you don't need the seatd
+ server. If both are installed and running, libseat will prefer the
+ seatd server.
+
+config SEATD_SEATD_SYSTEMD_UNIT
+   bool
+   default y
+   depends on SEATD_SEATD && INITMETHOD_SYSTEMD
+   prompt "install seatd service file"
+
+endif
diff --git a/rules/seatd.make b/rules/seatd.make
new file mode 100644
index ..b848a5dc1037
--- /dev/null
+++ b/rules/seatd.make
@@ -0,0 +1,76 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2021 by Philipp Zabel 
+#   2021 by Michael Tretter 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_SEATD) += seatd
+
+#
+# Paths and names
+#
+SEATD_VERSION  := 0.5.0
+SEATD_MD5  := 264a36907f4be34efa400fb6e1b26f5f
+SEATD  := seatd-$(SEATD_VERSION)
+SEATD_SUFFIX   := tar.gz
+SEATD_URL  := 
https://git.sr.ht/~kennylevinsen/seatd/archive/$(SEATD_VERSION).$(SEATD_SUFFIX)
+SEATD_SOURCE   := $(SRCDIR)/$(SEATD).$(SEATD_SUFFIX)
+SEATD_DIR  := $(BUILDDIR)/$(SEATD)
+SEATD_LICENSE  := MIT
+SEATD_LICENSE_FILES:= file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a
+
+
+# 
+# Prepare
+# 
+
+#
+# meson
+#
+SEATD_CONF_TOOL:= meson
+SEATD_CONF_OPT :=  \
+   $(CROSS_MESON_USR) \
+   -Dlogind=$(call ptx/endis,PTXCONF_SEATD_SYSTEMD_LOGIND)d \
+   -Dseatd=$(call ptx/endis,PTXCONF_SEATD_SEATD)d \
+   -Dbuiltin=disabled \
+   -Dserver=$(call ptx/endis,PTXCONF_SEATD_SEATD)d \
+   -Dexamples=disabled \
+   -Dman-pages=disabled \
+   -Ddefaultpath=
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/seatd.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, seatd)
+   @$(call install_fixup, seatd,PRIORITY,optional)
+   @$(call install_fixup, seatd,SECTION,base)
+   @$(call install_fixup, seatd,AUTHOR,"Philipp Zabel 
")
+   @$(call install_fixup, seatd,DESCRIPTION,missing)
+
+   @$(call install_lib, seatd, 0, 0, 0644, libseat)
+
+ifdef PTXCONF_SEATD_SEATD
+   @$(call install_copy, seatd, 0, 0, 0755, -, /usr/bin/seatd)
+ifdef PTXCONF_SEATD_SEATD_SYSTEMD_UNIT
+   @$(call install_alternative, seatd, 0, 0, 0644, \
+   /usr/lib/systemd/system/seatd.service)
+   @$(call install_link, seatd, ../seatd.service, \
+   /usr/lib/systemd/system/multi-user.target.wants/seatd.service)
+endif
+endif
+
+   @$(call install_finish, seatd)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.30.2


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

[ptxdist] [PATCH 1/2] template: code-signing-provider: ignore in license report

[Michael Tretter]

If the template is used to create a code-signing-provider, an example
script will be put into local_src. This script can be ignored in the
license report.

Signed-off-by: Michael Tretter 
---
 rules/templates/template-code-signing-provider-make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/templates/template-code-signing-provider-make 
b/rules/templates/template-code-signing-provider-make
index 94830d92e9e7..4cf9cac358cf 100644
--- a/rules/templates/template-code-signing-provider-make
+++ b/rules/templates/template-code-signing-provider-make
@@ -18,6 +18,7 @@ HOST_@PACKAGE@_CODE_SIGNING_VERSION   := @VERSION@
 HOST_@PACKAGE@_CODE_SIGNING:= 
@package@-code-signing-$(HOST_@PACKAGE@_CODE_SIGNING_VERSION)
 HOST_@PACKAGE@_CODE_SIGNING_URL:= 
file://local_src/@package@-code-signing
 HOST_@PACKAGE@_CODE_SIGNING_DIR:= 
$(HOST_BUILDDIR)/$(HOST_@PACKAGE@_CODE_SIGNING)
+HOST_@PACKAGE@_CODE_SIGNING_LICENSE:= ignore
 
 HOST_@PACKAGE@_CODE_SIGNING_CONF_TOOL  := NO
 
-- 
2.29.2


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

[ptxdist] [PATCH 2/2] host-ptx-code-signing-dev: ignore in license report

[Michael Tretter]

The package consists of a script based on the code signing template in
PTXdist and a few keys. It should be ignored in the license report.

Signed-off-by: Michael Tretter 
---
 rules/host-ptx-code-signing-dev.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/host-ptx-code-signing-dev.make 
b/rules/host-ptx-code-signing-dev.make
index d97ae60ef140..af7a774bc9a4 100644
--- a/rules/host-ptx-code-signing-dev.make
+++ b/rules/host-ptx-code-signing-dev.make
@@ -21,6 +21,7 @@ HOST_PTX_CODE_SIGNING_DEV_SUFFIX  := tar.gz
 HOST_PTX_CODE_SIGNING_DEV_URL  := 
https://git.pengutronix.de/cgit/ptx-code-signing-dev/snapshot/$(HOST_PTX_CODE_SIGNING_DEV).$(HOST_PTX_CODE_SIGNING_DEV_SUFFIX)
 HOST_PTX_CODE_SIGNING_DEV_SOURCE   := 
$(SRCDIR)/$(HOST_PTX_CODE_SIGNING_DEV).$(HOST_PTX_CODE_SIGNING_DEV_SUFFIX)
 HOST_PTX_CODE_SIGNING_DEV_DIR  := 
$(HOST_BUILDDIR)/$(HOST_PTX_CODE_SIGNING_DEV)
+HOST_PTX_CODE_SIGNING_DEV_LICENSE  := ignore
 
 CODE_SIGNING_ENV-$(PTXCONF_HOST_PTX_CODE_SIGNING_DEV) += 
$(SOFTHSM_CODE_SIGNING_ENV)
 
-- 
2.29.2


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

[ptxdist] [PATCH] libusbgx: fix license

[Michael Tretter]

libusbgx is licensed under GPL v2 or later and LGPL v2.1 or later. Fix
the SPDX identifier and add the license files.

Signed-off-by: Michael Tretter 
---
 rules/libusbgx.make | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rules/libusbgx.make b/rules/libusbgx.make
index b05724b1d3d0..517c7d87df20 100644
--- a/rules/libusbgx.make
+++ b/rules/libusbgx.make
@@ -23,7 +23,10 @@ LIBUSBGX_URL := \
 LIBUSBGX_SOURCE:= \
$(SRCDIR)/$(LIBUSBGX).$(LIBUSBGX_SUFFIX)
 LIBUSBGX_DIR   := $(BUILDDIR)/$(LIBUSBGX)
-LIBUSBGX_LICENSE   := GPLv2
+LIBUSBGX_LICENSE   := GPL-2.0-or-later AND LGPL-2.1-or-later
+LIBUSBGX_LICENSE_FILES := \
+   file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+   file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c
 
 # 
 # Prepare
-- 
2.29.2


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

[ptxdist] [PATCH] host-extract-cert: version bump 0.2 -> 0.3

[Michael Tretter]

Add the license and the license file, too.

Signed-off-by: Michael Tretter 
---
 rules/host-extract-cert.make | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/rules/host-extract-cert.make b/rules/host-extract-cert.make
index df7599011a71..3511aef3b21c 100644
--- a/rules/host-extract-cert.make
+++ b/rules/host-extract-cert.make
@@ -14,13 +14,15 @@ HOST_PACKAGES-$(PTXCONF_HOST_EXTRACT_CERT) += 
host-extract-cert
 #
 # Paths and names
 #
-HOST_EXTRACT_CERT_VERSION  := 0.2
-HOST_EXTRACT_CERT_MD5  := b2ec817a3d8bf9ec126b381642149d60
+HOST_EXTRACT_CERT_VERSION  := 0.3
+HOST_EXTRACT_CERT_MD5  := a0fb2a20ef7528edcedd1ebcb1578c92
 HOST_EXTRACT_CERT  := extract-cert-$(HOST_EXTRACT_CERT_VERSION)
 HOST_EXTRACT_CERT_SUFFIX   := tar.gz
 HOST_EXTRACT_CERT_URL  := 
https://git.pengutronix.de/cgit/extract-cert/snapshot/$(HOST_EXTRACT_CERT).$(HOST_EXTRACT_CERT_SUFFIX)
 HOST_EXTRACT_CERT_SOURCE   := 
$(SRCDIR)/$(HOST_EXTRACT_CERT).$(HOST_EXTRACT_CERT_SUFFIX)
 HOST_EXTRACT_CERT_DIR  := $(HOST_BUILDDIR)/$(HOST_EXTRACT_CERT)
+HOST_EXTRACT_CERT_LICENSE  := LGPL-2.1-only
+HOST_EXTRACT_CERT_LICENSE_FILES:= 
file://COPYING;md5=4fbd65380cdd255951079008b364516c
 
 # 
 # Prepare
-- 
2.29.2


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

[ptxdist] [PATCH] cross-nasm: ignore license for !x86

[Michael Tretter]

The package is not build on !x86 systems, but the license still appears
in the license report as unknown.

Ignore the license, if the package is selected but not built.

Signed-off-by: Michael Tretter 
---
 rules/cross-nasm.make | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rules/cross-nasm.make b/rules/cross-nasm.make
index 258d73af0f5a..2d6dbb0cab5c 100644
--- a/rules/cross-nasm.make
+++ b/rules/cross-nasm.make
@@ -37,6 +37,8 @@ CROSS_NASM_LICENSE_FILES := \
 CROSS_NASM_CONF_TOOL := autoconf
 CROSS_NASM_INSTALL_OPT := INSTALLROOT="$(CROSS_NASM_PKGDIR)" install
 
+else
+CROSS_NASM_LICENSE  := ignore
 endif
 
 # vim: syntax=make
-- 
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] seatd: new package

[Michael Tretter]

On Wed, 16 Jun 2021 14:08:46 +0200, Michael Olbrich wrote:
> On Wed, Jun 16, 2021 at 12:55:09PM +0200, Michael Tretter wrote:
> > Signed-off-by: Michael Tretter 
> > ---
> >  .../usr/lib/systemd/system/seatd.service  |  8 ++
> >  rules/seatd.in| 30 
> >  rules/seatd.make  | 76 +++
> >  3 files changed, 114 insertions(+)
> >  create mode 100644 projectroot/usr/lib/systemd/system/seatd.service
> >  create mode 100644 rules/seatd.in
> >  create mode 100644 rules/seatd.make
> > 
> > diff --git a/projectroot/usr/lib/systemd/system/seatd.service 
> > b/projectroot/usr/lib/systemd/system/seatd.service
> > new file mode 100644
> > index ..59137e67c8b3
> > --- /dev/null
> > +++ b/projectroot/usr/lib/systemd/system/seatd.service
> > @@ -0,0 +1,8 @@
> > +[Unit]
> > +Description=Seat management daemon
> > +
> > +[Service]
> > +Restart=always
> > +# Do not require a VT
> > +Environment=SEATD_VTBOUND=0
> > +ExecStart=/usr/bin/seatd
> > diff --git a/rules/seatd.in b/rules/seatd.in
> > new file mode 100644
> > index ..f0b755798c1f
> > --- /dev/null
> > +++ b/rules/seatd.in
> > @@ -0,0 +1,30 @@
> > +## SECTION=system_libraries
> > +
> > +menuconfig SEATD
> > +   tristate
> > +   select HOST_MESON
> > +   select SYSTEMD  if SEATD_SYSTEMD_LOGIND
> 
> > +   select SYSTEMD  if SEATD_SEATD_SYSTEMD_UNIT
> 
> Remove.
> 
> > +   select SYSTEMD_LOGIND   if SEATD_SYSTEMD_LOGIND
> > +   prompt "libseat"
> > +   help
> > + A minimal seat management daemon, and a universal seat management 
> > library.
> > +
> > +if SEATD
> > +
> > +config SEATD_SYSTEMD_LOGIND
> > +   bool
> > +   default INITMETHOD_SYSTEMD
> > +   prompt "logind support"
> > +
> > +config SEATD_SEATD
> > +   bool
> > +   default y
> > +   prompt "seatd server"
> 
> What's the use-case for not having a daemon?

With logind support, libseat is able to use the systemd-logind service to get
the seat. In this case, you don't need seatd as a daemon. If both are
installed (and running) libseat will prefer seatd, but allows to select the
backend via environment variable.

> 
> > +
> > +config SEATD_SEATD_SYSTEMD_UNIT
> > +   bool
> > +   depends on SEATD_SEATD
> 
> && INITMETHOD_SYSTEMD

This is the correct way to handle the systemd dependency of the service
instead of using the "select SYSTEMD" above. Correct?

Michael

> 
> Michael
> 
> > +   prompt "install seatd service file"
> > +
> > +endif
> > diff --git a/rules/seatd.make b/rules/seatd.make
> > new file mode 100644
> > index ..b848a5dc1037
> > --- /dev/null
> > +++ b/rules/seatd.make
> > @@ -0,0 +1,76 @@
> > +# -*-makefile-*-
> > +#
> > +# Copyright (C) 2021 by Philipp Zabel 
> > +#   2021 by Michael Tretter 
> > +#
> > +# For further information about the PTXdist project and license conditions
> > +# see the README file.
> > +#
> > +
> > +#
> > +# We provide this package
> > +#
> > +PACKAGES-$(PTXCONF_SEATD) += seatd
> > +
> > +#
> > +# Paths and names
> > +#
> > +SEATD_VERSION  := 0.5.0
> > +SEATD_MD5  := 264a36907f4be34efa400fb6e1b26f5f
> > +SEATD  := seatd-$(SEATD_VERSION)
> > +SEATD_SUFFIX   := tar.gz
> > +SEATD_URL  := 
> > https://git.sr.ht/~kennylevinsen/seatd/archive/$(SEATD_VERSION).$(SEATD_SUFFIX)
> > +SEATD_SOURCE   := $(SRCDIR)/$(SEATD).$(SEATD_SUFFIX)
> > +SEATD_DIR  := $(BUILDDIR)/$(SEATD)
> > +SEATD_LICENSE  := MIT
> > +SEATD_LICENSE_FILES:= 
> > file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a
> > +
> > +
> > +# 
> > 
> > +# Prepare
> > +# 
> > 
> > +
> > +#
> > +# meson
> > +#
> > +SEATD_CONF_TOOL:= meson
> > +SEATD_CONF_OPT :=  \
> > +   $(CROSS_MESON_USR) \
> > +   -Dlogind=$(call ptx/endis,PTXCONF_SEATD_SYSTEMD_LOGIND)d \
> > +   -Dseatd=$(call ptx/endis,PTXCONF_SEATD_SEATD)d \
> > +   -Dbuiltin=disabled \
> > +   -Dserver=$(call ptx/endis,PTXCONF_SEATD_SEATD)d \
> > +   -Dexampl

[ptxdist] [PATCH] seatd: new package

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 .../usr/lib/systemd/system/seatd.service  |  8 ++
 rules/seatd.in| 30 
 rules/seatd.make  | 76 +++
 3 files changed, 114 insertions(+)
 create mode 100644 projectroot/usr/lib/systemd/system/seatd.service
 create mode 100644 rules/seatd.in
 create mode 100644 rules/seatd.make

diff --git a/projectroot/usr/lib/systemd/system/seatd.service 
b/projectroot/usr/lib/systemd/system/seatd.service
new file mode 100644
index ..59137e67c8b3
--- /dev/null
+++ b/projectroot/usr/lib/systemd/system/seatd.service
@@ -0,0 +1,8 @@
+[Unit]
+Description=Seat management daemon
+
+[Service]
+Restart=always
+# Do not require a VT
+Environment=SEATD_VTBOUND=0
+ExecStart=/usr/bin/seatd
diff --git a/rules/seatd.in b/rules/seatd.in
new file mode 100644
index ..f0b755798c1f
--- /dev/null
+++ b/rules/seatd.in
@@ -0,0 +1,30 @@
+## SECTION=system_libraries
+
+menuconfig SEATD
+   tristate
+   select HOST_MESON
+   select SYSTEMD  if SEATD_SYSTEMD_LOGIND
+   select SYSTEMD  if SEATD_SEATD_SYSTEMD_UNIT
+   select SYSTEMD_LOGIND   if SEATD_SYSTEMD_LOGIND
+   prompt "libseat"
+   help
+ A minimal seat management daemon, and a universal seat management 
library.
+
+if SEATD
+
+config SEATD_SYSTEMD_LOGIND
+   bool
+   default INITMETHOD_SYSTEMD
+   prompt "logind support"
+
+config SEATD_SEATD
+   bool
+   default y
+   prompt "seatd server"
+
+config SEATD_SEATD_SYSTEMD_UNIT
+   bool
+   depends on SEATD_SEATD
+   prompt "install seatd service file"
+
+endif
diff --git a/rules/seatd.make b/rules/seatd.make
new file mode 100644
index ..b848a5dc1037
--- /dev/null
+++ b/rules/seatd.make
@@ -0,0 +1,76 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2021 by Philipp Zabel 
+#   2021 by Michael Tretter 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_SEATD) += seatd
+
+#
+# Paths and names
+#
+SEATD_VERSION  := 0.5.0
+SEATD_MD5  := 264a36907f4be34efa400fb6e1b26f5f
+SEATD  := seatd-$(SEATD_VERSION)
+SEATD_SUFFIX   := tar.gz
+SEATD_URL  := 
https://git.sr.ht/~kennylevinsen/seatd/archive/$(SEATD_VERSION).$(SEATD_SUFFIX)
+SEATD_SOURCE   := $(SRCDIR)/$(SEATD).$(SEATD_SUFFIX)
+SEATD_DIR  := $(BUILDDIR)/$(SEATD)
+SEATD_LICENSE  := MIT
+SEATD_LICENSE_FILES:= file://LICENSE;md5=715a99d2dd552e6188e74d4ed2914d5a
+
+
+# 
+# Prepare
+# 
+
+#
+# meson
+#
+SEATD_CONF_TOOL:= meson
+SEATD_CONF_OPT :=  \
+   $(CROSS_MESON_USR) \
+   -Dlogind=$(call ptx/endis,PTXCONF_SEATD_SYSTEMD_LOGIND)d \
+   -Dseatd=$(call ptx/endis,PTXCONF_SEATD_SEATD)d \
+   -Dbuiltin=disabled \
+   -Dserver=$(call ptx/endis,PTXCONF_SEATD_SEATD)d \
+   -Dexamples=disabled \
+   -Dman-pages=disabled \
+   -Ddefaultpath=
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/seatd.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, seatd)
+   @$(call install_fixup, seatd,PRIORITY,optional)
+   @$(call install_fixup, seatd,SECTION,base)
+   @$(call install_fixup, seatd,AUTHOR,"Philipp Zabel 
")
+   @$(call install_fixup, seatd,DESCRIPTION,missing)
+
+   @$(call install_lib, seatd, 0, 0, 0644, libseat)
+
+ifdef PTXCONF_SEATD_SEATD
+   @$(call install_copy, seatd, 0, 0, 0755, -, /usr/bin/seatd)
+ifdef PTXCONF_SEATD_SEATD_SYSTEMD_UNIT
+   @$(call install_alternative, seatd, 0, 0, 0644, \
+   /usr/lib/systemd/system/seatd.service)
+   @$(call install_link, seatd, ../seatd.service, \
+   /usr/lib/systemd/system/multi-user.target.wants/seatd.service)
+endif
+endif
+
+   @$(call install_finish, seatd)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.29.2


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

[ptxdist] [PATCH v3] ntfs-3g: new package

[Michael Tretter]

The NTFS-3G driver is an open source, freely available NTFS driver for
Linux with read and write support.

Signed-off-by: Michael Tretter 

---
v3:
- add README (partially), COPYING, and COPYING.LIB to LICENSE_FILES

v2:
- remove CREDITS
- remove setting of conf env in prepare
- fix comment in targetinstall
---
 rules/ntfs-3g.in   | 11 ++
 rules/ntfs-3g.make | 88 ++
 2 files changed, 99 insertions(+)
 create mode 100644 rules/ntfs-3g.in
 create mode 100644 rules/ntfs-3g.make

diff --git a/rules/ntfs-3g.in b/rules/ntfs-3g.in
new file mode 100644
index ..a61d6a374eac
--- /dev/null
+++ b/rules/ntfs-3g.in
@@ -0,0 +1,11 @@
+## SECTION=disk_and_file
+
+config NTFS_3G
+   tristate
+   prompt "ntfs-3g"
+   select FUSE
+   select FUSE_LIB
+   select LIBUUID
+   help
+ The NTFS-3G driver is an open source, freely available NTFS driver
+ for Linux with read and write support.
diff --git a/rules/ntfs-3g.make b/rules/ntfs-3g.make
new file mode 100644
index ..54450e8fb506
--- /dev/null
+++ b/rules/ntfs-3g.make
@@ -0,0 +1,88 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Thomas Haemmerle 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NTFS_3G) += ntfs-3g
+
+#
+# Paths and names
+#
+NTFS_3G_VERSION:= 2017.3.23
+NTFS_3G_MD5:= d97474ae1954f772c6d2fa386a6f462c
+NTFS_3G:= ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION)
+NTFS_3G_SUFFIX := tgz
+NTFS_3G_URL:= http://tuxera.com/opensource/$(NTFS_3G).$(NTFS_3G_SUFFIX)
+NTFS_3G_SOURCE := $(SRCDIR)/$(NTFS_3G).$(NTFS_3G_SUFFIX)
+NTFS_3G_DIR:= $(BUILDDIR)/$(NTFS_3G)
+NTFS_3G_LICENSE:= GPL-2.0-or-later AND LGPL-2.0-only
+NTFS_3G_LICENSE_FILES  := \
+   
file://README;startline=35;endline=42;md5=a3204cfad57631a62a347096d10f3498 \
+   file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \
+   file://COPYING.LIB;md5=f30a9716ef3762e3467a2f62bf790f0a
+
+# 
+# Prepare
+# 
+
+#
+# autoconf
+#
+NTFS_3G_CONF_TOOL  := autoconf
+NTFS_3G_CONF_OPT   := \
+   $(CROSS_AUTOCONF_USR) \
+   --exec-prefix=/usr \
+   --disable-debug \
+   --enable-warnings \
+   --disable-pedantic \
+   --disable-really-static \
+   --disable-mount-helper \
+   --disable-ldconfig \
+   --disable-ldscript \
+   --disable-library \
+   --disable-mtab \
+   --disable-posix-acls \
+   --disable-xattr-mappings \
+   --disable-plugins \
+   --enable-device-default-io-ops \
+   --enable-ntfs-3g \
+   --disable-ntfsprogs \
+   --disable-crypto \
+   --disable-quarantined \
+   --disable-extras \
+   --disable-nfconv \
+   --with-fuse=external \
+   --with-uuid \
+   --without-hd \
+   $(GLOBAL_LARGE_FILE_OPTION)
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/ntfs-3g.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, ntfs-3g)
+   @$(call install_fixup, ntfs-3g,PRIORITY,optional)
+   @$(call install_fixup, ntfs-3g,SECTION,base)
+   @$(call install_fixup, ntfs-3g,AUTHOR,"Thomas Haemmerle 
")
+   @$(call install_fixup, ntfs-3g,DESCRIPTION,missing)
+
+   @$(call install_copy, ntfs-3g, 0, 0, 0755, -, /usr/bin/ntfs-3g)
+
+#  # ntfs-g3 creates the links in /sbin. Create our own links.
+   @$(call install_link, ntfs-3g, ../bin/ntfs-3g, /usr/sbin/mount.ntfs)
+   @$(call install_link, ntfs-3g, ../bin/ntfs-3g, /usr/sbin/mount.ntfs-3g)
+
+   @$(call install_finish, ntfs-3g)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.29.2


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

Re: [ptxdist] [RFC] Add DTB overlay handling to ptxdist

[Michael Tretter]

On Wed, 02 Jun 2021 14:19:10 +0200, Christian Melki wrote:
> The only real difference here is that the symbol handling
> must always be present. Hence "-@" for default extra arg.
> Make paths variable but default to boot for the old dtb behavior.
> There is a lot of duplication going on here, but the main purpose
> is to separate dtb from dtbo handling with separate names and functions.

I am not convinced that it is a good idea to mix the handling of dtb and dtbo
in one rule file. Maybe it helps, if there is a separate rule for overlays,
but I didn't think this through.

> 
> Signed-off-by: Christian Melki 
> 
> diff --git a/platforms/dtc.in b/platforms/dtc.in
> index 5e8b35291..101d99836 100644
> --- a/platforms/dtc.in
> +++ b/platforms/dtc.in
> @@ -13,10 +13,18 @@ menuconfig DTC
>  if DTC
>  
>  config DTC_INSTALL_OFTREE
> - bool "install oftree to /boot"
> + bool "install oftrees to target path"
>   help
> -   Creates a package to install the 'oftree' file to /boot
> -   of your target system.
> +   Creates a package to install the 'oftree' files
> +   to your target system.
> +
> +config DTC_INSTALL_OFTREE_OVERLAY
> + bool "install oftrees overlays to target path"
> + help
> +   Creates a package to install the 'oftree' overlay
> +   files to your target system.
> +
> +comment "device tree paths   ---"
>  
>  config DTC_OFTREE_DTS_PATH
>   string "path to source dts file"
> @@ -25,6 +33,15 @@ config DTC_OFTREE_DTS_PATH
> Define path to the dts source file. Multiple directories can be
> specified separated by ':'.
>  
> +config DTC_OFTREE_DTO_PATH
> + string "path to source dto (overlay) files"
> + default 
> "${PTXDIST_PLATFORMCONFIG_SUBDIR}/dts:${KERNEL_DIR}/arch/${GENERIC_KERNEL_ARCH}/boot/dts"
> + help
> +   Define path to the dto source files. Multiple directories can be
> +   specified separated by ':'.
> +
> +comment "device tree sources ---"
> +
>  config DTC_OFTREE_DTS
>   string "source dts file"
>   default ".dts"
> @@ -34,7 +51,43 @@ config DTC_OFTREE_DTS
> is used as a search path for the device tree files specified
> here. Multiple dts files can be specified, separated by spaces.
>  
> +config DTC_OFTREE_DTO
> + string "source dto file"
> + default ".dto"
> + help
> +   Select the dts/dto files to use for the device tree binary overlay
> +   blob generation. For relative file names DTC_OFTREE_DTO_PATH
> +   is used as a search path for the device tree overlay files specified
> +   here. Multiple dts overlay files can be specified, separated by 
> spaces.
> +
> +if DTC_INSTALL_OFTREE
> +
> +comment "device tree binary install path  ---"
> +
> +config DTC_INSTALL_OFTREE_PATH
> +string "oftree installation path"
> + default "/boot"
> + help
> +   oftree target installation path
> +
> +endif
> +
> +if DTC_INSTALL_OFTREE_OVERLAY
> +
> +comment "device tree overlay install path ---"
> +
> +config DTC_INSTALL_OFTREE_OVERLAY_PATH
> +string "oftree overlay installation path"
> + default "/lib/firmware"
> + help
> +   oftree overlay target installation path
> +
> +endif
> +
>  config DTC_EXTRA_ARGS
>   string "extra options passed to dtc"
> + default "-@"

Building with symbols can increase the size of the device tree quite a lot. It
would be better to default to building with symbols only if overlays are
enabled.

Michael

> + help
> +   Defaults to -@ for compiling dtb/dtbo for resolving symbols.
>  
>  endif
> diff --git a/rules/dtc.make b/rules/dtc.make
> index 7c281e8f0..45543d3d4 100644
> --- a/rules/dtc.make
> +++ b/rules/dtc.make
> @@ -26,11 +26,18 @@ $(call ptx/error, PTXCONF_KERNEL_ARCH_STRING is no longer 
> defined.)
>  $(call ptx/error, Use GENERIC_KERNEL_ARCH instead)
>  endif
>  
> +ifneq ($(subst PTXCONF_KERNEL_ARCH_STRING,,$(value 
> PTXCONF_DTC_OFTREE_DTO_PATH)),$(value PTXCONF_DTC_OFTREE_DTO_PATH))
> +$(call ptx/error, invalid value for PTXCONF_DTC_OFTREE_DTO_PATH:)
> +$(call ptx/error, PTXCONF_KERNEL_ARCH_STRING is no longer defined.)
> +$(call ptx/error, Use GENERIC_KERNEL_ARCH instead)
> +endif
> +o
>  # 
> 
>  # Target-Install
>  # 
> 
>  
>  ptx/dtb = $(notdir $(basename $(strip $(1.dtb
> +ptx/dtbo = $(notdir $(basename $(strip $(1.dtbo
>  
>  dts/env = \
>   $(call ptx/env) \
> @@ -40,17 +47,31 @@ dts/env = \
>   dts_kernel_dir="$(KERNEL_DIR)" \
>   dts_kernel_arch="$(GENERIC_KERNEL_ARCH)"
>  
> +dto/env = \
> + $(call ptx/env) \
> + dts_path=$(PTXCONF_DTC_OFTREE_DTO_PATH) \
> + dts_dtb="$(strip $(1))" \
> + dts_dts="$(strip $(2))" \
> + dts_kernel_dir="$(KERNEL_DIR)" \
> + dts_kernel_arch="$(GENERIC_KERNEL_ARCH)"
> +
>  %.dtb: $(STATEDIR)/dtc.install
>   @$(call targetinfo)
>   

[ptxdist] [PATCH] ntfs-3g: new package

[Michael Tretter]

The NTFS-3G driver is an open source, freely available NTFS driver for
Linux with read and write support.

Signed-off-by: Michael Tretter 

---
v2:
- remove CREDITS
- remove setting of conf env in prepare
- fix comment in targetinstall
---
 rules/ntfs-3g.in   | 11 ++
 rules/ntfs-3g.make | 84 ++
 2 files changed, 95 insertions(+)
 create mode 100644 rules/ntfs-3g.in
 create mode 100644 rules/ntfs-3g.make

diff --git a/rules/ntfs-3g.in b/rules/ntfs-3g.in
new file mode 100644
index ..a61d6a374eac
--- /dev/null
+++ b/rules/ntfs-3g.in
@@ -0,0 +1,11 @@
+## SECTION=disk_and_file
+
+config NTFS_3G
+   tristate
+   prompt "ntfs-3g"
+   select FUSE
+   select FUSE_LIB
+   select LIBUUID
+   help
+ The NTFS-3G driver is an open source, freely available NTFS driver
+ for Linux with read and write support.
diff --git a/rules/ntfs-3g.make b/rules/ntfs-3g.make
new file mode 100644
index ..e2e08c731f9e
--- /dev/null
+++ b/rules/ntfs-3g.make
@@ -0,0 +1,84 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Thomas Haemmerle 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NTFS_3G) += ntfs-3g
+
+#
+# Paths and names
+#
+NTFS_3G_VERSION:= 2017.3.23
+NTFS_3G_MD5:= d97474ae1954f772c6d2fa386a6f462c
+NTFS_3G:= ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION)
+NTFS_3G_SUFFIX := tgz
+NTFS_3G_URL:= http://tuxera.com/opensource/$(NTFS_3G).$(NTFS_3G_SUFFIX)
+NTFS_3G_SOURCE := $(SRCDIR)/$(NTFS_3G).$(NTFS_3G_SUFFIX)
+NTFS_3G_DIR:= $(BUILDDIR)/$(NTFS_3G)
+NTFS_3G_LICENSE:= GPL-2.0-or-later AND LGPL-2.0-only
+
+# 
+# Prepare
+# 
+
+#
+# autoconf
+#
+NTFS_3G_CONF_TOOL  := autoconf
+NTFS_3G_CONF_OPT   := \
+   $(CROSS_AUTOCONF_USR) \
+   --exec-prefix=/usr \
+   --disable-debug \
+   --enable-warnings \
+   --disable-pedantic \
+   --disable-really-static \
+   --disable-mount-helper \
+   --disable-ldconfig \
+   --disable-ldscript \
+   --disable-library \
+   --disable-mtab \
+   --disable-posix-acls \
+   --disable-xattr-mappings \
+   --disable-plugins \
+   --enable-device-default-io-ops \
+   --enable-ntfs-3g \
+   --disable-ntfsprogs \
+   --disable-crypto \
+   --disable-quarantined \
+   --disable-extras \
+   --disable-nfconv \
+   --with-fuse=external \
+   --with-uuid \
+   --without-hd \
+   $(GLOBAL_LARGE_FILE_OPTION)
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/ntfs-3g.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, ntfs-3g)
+   @$(call install_fixup, ntfs-3g,PRIORITY,optional)
+   @$(call install_fixup, ntfs-3g,SECTION,base)
+   @$(call install_fixup, ntfs-3g,AUTHOR,"Thomas Haemmerle 
")
+   @$(call install_fixup, ntfs-3g,DESCRIPTION,missing)
+
+   @$(call install_copy, ntfs-3g, 0, 0, 0755, -, /usr/bin/ntfs-3g)
+
+#  # ntfs-g3 creates the links in /sbin. Create our own links.
+   @$(call install_link, ntfs-3g, ../bin/ntfs-3g, /usr/sbin/mount.ntfs)
+   @$(call install_link, ntfs-3g, ../bin/ntfs-3g, /usr/sbin/mount.ntfs-3g)
+
+   @$(call install_finish, ntfs-3g)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.29.2


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

[ptxdist] [PATCH] ntfs-3g: new package

[Michael Tretter]

The NTFS-3G driver is an open source, freely available NTFS driver for
Linux with read and write support.

Signed-off-by: Michael Tretter 
---
 rules/ntfs-3g.in   | 11 ++
 rules/ntfs-3g.make | 88 ++
 2 files changed, 99 insertions(+)
 create mode 100644 rules/ntfs-3g.in
 create mode 100644 rules/ntfs-3g.make

diff --git a/rules/ntfs-3g.in b/rules/ntfs-3g.in
new file mode 100644
index ..a61d6a374eac
--- /dev/null
+++ b/rules/ntfs-3g.in
@@ -0,0 +1,11 @@
+## SECTION=disk_and_file
+
+config NTFS_3G
+   tristate
+   prompt "ntfs-3g"
+   select FUSE
+   select FUSE_LIB
+   select LIBUUID
+   help
+ The NTFS-3G driver is an open source, freely available NTFS driver
+ for Linux with read and write support.
diff --git a/rules/ntfs-3g.make b/rules/ntfs-3g.make
new file mode 100644
index ..2b45c8f403ed
--- /dev/null
+++ b/rules/ntfs-3g.make
@@ -0,0 +1,88 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2017 by Thomas Haemmerle 
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_NTFS_3G) += ntfs-3g
+
+#
+# Paths and names
+#
+NTFS_3G_VERSION:= 2017.3.23
+NTFS_3G_MD5:= d97474ae1954f772c6d2fa386a6f462c
+NTFS_3G:= ntfs-3g_ntfsprogs-$(NTFS_3G_VERSION)
+NTFS_3G_SUFFIX := tgz
+NTFS_3G_URL:= http://tuxera.com/opensource/$(NTFS_3G).$(NTFS_3G_SUFFIX)
+NTFS_3G_SOURCE := $(SRCDIR)/$(NTFS_3G).$(NTFS_3G_SUFFIX)
+NTFS_3G_DIR:= $(BUILDDIR)/$(NTFS_3G)
+NTFS_3G_LICENSE:= GPL-2.0-or-later AND LGPL-2.0-only
+
+# 
+# Prepare
+# 
+
+NTFS_3G_CONF_ENV   := $(CROSS_ENV)
+
+#
+# autoconf
+#
+NTFS_3G_CONF_TOOL  := autoconf
+NTFS_3G_CONF_OPT   := \
+   $(CROSS_AUTOCONF_USR) \
+   --exec-prefix=/usr \
+   --disable-debug \
+   --enable-warnings \
+   --disable-pedantic \
+   --disable-really-static \
+   --disable-mount-helper \
+   --disable-ldconfig \
+   --disable-ldscript \
+   --disable-library \
+   --disable-mtab \
+   --disable-posix-acls \
+   --disable-xattr-mappings \
+   --disable-plugins \
+   --enable-device-default-io-ops \
+   --enable-ntfs-3g \
+   --disable-ntfsprogs \
+   --disable-crypto \
+   --disable-quarantined \
+   --disable-extras \
+   --disable-nfconv \
+   --with-fuse=external \
+   --with-uuid \
+   --without-hd \
+   $(GLOBAL_LARGE_FILE_OPTION)
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/ntfs-3g.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, ntfs-3g)
+   @$(call install_fixup, ntfs-3g,PRIORITY,optional)
+   @$(call install_fixup, ntfs-3g,SECTION,base)
+   @$(call install_fixup, ntfs-3g,AUTHOR,"Thomas Haemmerle 
")
+   @$(call install_fixup, ntfs-3g,DESCRIPTION,missing)
+
+   @$(call install_copy, ntfs-3g, 0, 0, 0755, -, /usr/bin/ntfs-3g)
+
+   # ntfs-g3 creates the links in /sbin. Create our own links.
+   @$(call install_link, ntfs-3g, ../bin/ntfs-3g, /usr/sbin/mount.ntfs)
+   @$(call install_link, ntfs-3g, ../bin/ntfs-3g, /usr/sbin/mount.ntfs-3g)
+
+   @$(call install_finish, ntfs-3g)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.29.2


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

[ptxdist] [PATCH] rauc: ignore sysroot in dbus-1 interfaces_dir variable

[Michael Tretter]

Rauc uses pkg-config to get the interfaces_dir, i.e., the path, where to
install the dbus interface description. This path must not contain the
sysroot directory, because files will be installed into this path in the
package.

Signed-off-by: Michael Tretter 
---
 rules/rauc.make | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rules/rauc.make b/rules/rauc.make
index 82b1953f662e..9571400d9995 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -27,7 +27,9 @@ RAUC_LICENSE  := LGPL-2.1-only
 # Prepare
 # 
 
-#RAUC_CONF_ENV := $(CROSS_ENV)
+RAUC_CONF_ENV  := \
+   $(CROSS_ENV) \
+   PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT=interfaces_dir
 
 #
 # autoconf
-- 
2.20.1


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

Re: [ptxdist] [PATCH 1/2] valgrind: version bump 3.14.0 -> 3.16.1

[Michael Tretter]

On Mon, 11 Jan 2021 08:25:38 +0100, Michael Olbrich wrote:
> On Fri, Jan 08, 2021 at 04:39:31PM +0100, Michael Tretter wrote:
> > Also switch to the new download URL that is referenced on the valgrind
> > Current Releases page.
> 
> There are patches for the old version.

Thanks. I sent a v2.

Michael

> 
> > Signed-off-by: Michael Tretter 
> > ---
> >  rules/valgrind.make | 6 +++---
> >  1 file changed, 3 insertions(+), 3 deletions(-)
> > 
> > diff --git a/rules/valgrind.make b/rules/valgrind.make
> > index dd168fb54228..aeabf825e64b 100644
> > --- a/rules/valgrind.make
> > +++ b/rules/valgrind.make
> > @@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_ARCH_ARM)-$(PTXCONF_VALGRIND) += 
> > valgrind
> >  #
> >  # Paths and names
> >  #
> > -VALGRIND_VERSION   := 3.14.0
> > -VALGRIND_MD5   := 74175426afa280184b62591b58c671b3
> > +VALGRIND_VERSION   := 3.16.1
> > +VALGRIND_MD5   := d1b153f1ab17cf1f311705e7a83ef589
> >  VALGRIND   := valgrind-$(VALGRIND_VERSION)
> >  VALGRIND_SUFFIX:= tar.bz2
> > -VALGRIND_URL   := 
> > http://valgrind.org/downloads/$(VALGRIND).$(VALGRIND_SUFFIX)
> > +VALGRIND_URL   := 
> > https://sourceware.org/pub/valgrind/$(VALGRIND).$(VALGRIND_SUFFIX)
> >  VALGRIND_SOURCE:= $(SRCDIR)/$(VALGRIND).$(VALGRIND_SUFFIX)
> >  VALGRIND_DIR   := $(BUILDDIR)/$(VALGRIND)
> >  VALGRIND_LICENSE   := GPL-2.0-only
> > -- 
> > 2.20.1

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

[ptxdist] [PATCH v2 2/2] valgrind: enable build for arm64

[Michael Tretter]

Valgrind supports ARM64/Linux. Allow to build it on ARM64 systems.

Signed-off-by: Michael Tretter 
---
 rules/valgrind.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/valgrind.make b/rules/valgrind.make
index aeabf825e64b..9662b4b9b6b0 100644
--- a/rules/valgrind.make
+++ b/rules/valgrind.make
@@ -13,6 +13,7 @@
 PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_VALGRIND) += valgrind
 PACKAGES-$(PTXCONF_ARCH_PPC)-$(PTXCONF_VALGRIND) += valgrind
 PACKAGES-$(PTXCONF_ARCH_ARM)-$(PTXCONF_VALGRIND) += valgrind
+PACKAGES-$(PTXCONF_ARCH_ARM64)-$(PTXCONF_VALGRIND) += valgrind
 
 #
 # Paths and names
-- 
2.20.1


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

[ptxdist] [PATCH v2 1/2] valgrind: version bump 3.14.0 -> 3.16.1

[Michael Tretter]

Also switch to the new download URL that is referenced on the valgrind
Current Releases page.

Signed-off-by: Michael Tretter 
---
Changelog:

v2: Include patches in version bump
---
 ...configure.ac-allow-all-arm-don-t-restrict-to-armv7.patch | 2 +-
 ...0002-make-kernel-version-a-autoconf-cache-variable.patch | 4 ++--
 patches/{valgrind-3.14.0 => valgrind-3.16.1}/autogen.sh | 0
 patches/{valgrind-3.14.0 => valgrind-3.16.1}/series | 0
 rules/valgrind.make | 6 +++---
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename patches/{valgrind-3.14.0 => 
valgrind-3.16.1}/0001-configure.ac-allow-all-arm-don-t-restrict-to-armv7.patch 
(93%)
 rename patches/{valgrind-3.14.0 => 
valgrind-3.16.1}/0002-make-kernel-version-a-autoconf-cache-variable.patch (93%)
 rename patches/{valgrind-3.14.0 => valgrind-3.16.1}/autogen.sh (100%)
 rename patches/{valgrind-3.14.0 => valgrind-3.16.1}/series (100%)

diff --git 
a/patches/valgrind-3.14.0/0001-configure.ac-allow-all-arm-don-t-restrict-to-armv7.patch
 
b/patches/valgrind-3.16.1/0001-configure.ac-allow-all-arm-don-t-restrict-to-armv7.patch
similarity index 93%
rename from 
patches/valgrind-3.14.0/0001-configure.ac-allow-all-arm-don-t-restrict-to-armv7.patch
rename to 
patches/valgrind-3.16.1/0001-configure.ac-allow-all-arm-don-t-restrict-to-armv7.patch
index 7602998ac24f..454fc3512720 100644
--- 
a/patches/valgrind-3.14.0/0001-configure.ac-allow-all-arm-don-t-restrict-to-armv7.patch
+++ 
b/patches/valgrind-3.16.1/0001-configure.ac-allow-all-arm-don-t-restrict-to-armv7.patch
@@ -10,7 +10,7 @@ Signed-off-by: Michael Olbrich 
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/configure.ac b/configure.ac
-index c18ae5f2acb5..935474f8b88b 100644
+index b86e802204ee..c5c1eccfe3b4 100755
 --- a/configure.ac
 +++ b/configure.ac
 @@ -252,7 +252,7 @@ case "${host_cpu}" in
diff --git 
a/patches/valgrind-3.14.0/0002-make-kernel-version-a-autoconf-cache-variable.patch
 
b/patches/valgrind-3.16.1/0002-make-kernel-version-a-autoconf-cache-variable.patch
similarity index 93%
rename from 
patches/valgrind-3.14.0/0002-make-kernel-version-a-autoconf-cache-variable.patch
rename to 
patches/valgrind-3.16.1/0002-make-kernel-version-a-autoconf-cache-variable.patch
index 9142dcf2ea48..d1fc29d46a1a 100644
--- 
a/patches/valgrind-3.14.0/0002-make-kernel-version-a-autoconf-cache-variable.patch
+++ 
b/patches/valgrind-3.16.1/0002-make-kernel-version-a-autoconf-cache-variable.patch
@@ -8,10 +8,10 @@ Signed-off-by: Michael Olbrich 
  1 file changed, 6 insertions(+), 5 deletions(-)
 
 diff --git a/configure.ac b/configure.ac
-index 935474f8b88b..0dffe27862ed 100644
+index c5c1eccfe3b4..54518bfa0cc5 100755
 --- a/configure.ac
 +++ b/configure.ac
-@@ -341,16 +341,17 @@ case "${host_os}" in
+@@ -345,16 +345,17 @@ case "${host_os}" in
  # Ok, this is linux. Check the kernel version
  AC_MSG_CHECKING([for the kernel version])
  
diff --git a/patches/valgrind-3.14.0/autogen.sh 
b/patches/valgrind-3.16.1/autogen.sh
similarity index 100%
rename from patches/valgrind-3.14.0/autogen.sh
rename to patches/valgrind-3.16.1/autogen.sh
diff --git a/patches/valgrind-3.14.0/series b/patches/valgrind-3.16.1/series
similarity index 100%
rename from patches/valgrind-3.14.0/series
rename to patches/valgrind-3.16.1/series
diff --git a/rules/valgrind.make b/rules/valgrind.make
index dd168fb54228..aeabf825e64b 100644
--- a/rules/valgrind.make
+++ b/rules/valgrind.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_ARCH_ARM)-$(PTXCONF_VALGRIND) += valgrind
 #
 # Paths and names
 #
-VALGRIND_VERSION   := 3.14.0
-VALGRIND_MD5   := 74175426afa280184b62591b58c671b3
+VALGRIND_VERSION   := 3.16.1
+VALGRIND_MD5   := d1b153f1ab17cf1f311705e7a83ef589
 VALGRIND   := valgrind-$(VALGRIND_VERSION)
 VALGRIND_SUFFIX:= tar.bz2
-VALGRIND_URL   := 
http://valgrind.org/downloads/$(VALGRIND).$(VALGRIND_SUFFIX)
+VALGRIND_URL   := 
https://sourceware.org/pub/valgrind/$(VALGRIND).$(VALGRIND_SUFFIX)
 VALGRIND_SOURCE:= $(SRCDIR)/$(VALGRIND).$(VALGRIND_SUFFIX)
 VALGRIND_DIR   := $(BUILDDIR)/$(VALGRIND)
 VALGRIND_LICENSE   := GPL-2.0-only
-- 
2.20.1


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

[ptxdist] [PATCH 2/2] valgrind: enable build for arm64

[Michael Tretter]

Valgrind supports ARM64/Linux. Allow to build it on ARM64 systems.

Signed-off-by: Michael Tretter 
---
 rules/valgrind.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/valgrind.make b/rules/valgrind.make
index aeabf825e64b..9662b4b9b6b0 100644
--- a/rules/valgrind.make
+++ b/rules/valgrind.make
@@ -13,6 +13,7 @@
 PACKAGES-$(PTXCONF_ARCH_X86)-$(PTXCONF_VALGRIND) += valgrind
 PACKAGES-$(PTXCONF_ARCH_PPC)-$(PTXCONF_VALGRIND) += valgrind
 PACKAGES-$(PTXCONF_ARCH_ARM)-$(PTXCONF_VALGRIND) += valgrind
+PACKAGES-$(PTXCONF_ARCH_ARM64)-$(PTXCONF_VALGRIND) += valgrind
 
 #
 # Paths and names
-- 
2.20.1


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

[ptxdist] [PATCH 1/2] valgrind: version bump 3.14.0 -> 3.16.1

[Michael Tretter]

Also switch to the new download URL that is referenced on the valgrind
Current Releases page.

Signed-off-by: Michael Tretter 
---
 rules/valgrind.make | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rules/valgrind.make b/rules/valgrind.make
index dd168fb54228..aeabf825e64b 100644
--- a/rules/valgrind.make
+++ b/rules/valgrind.make
@@ -17,11 +17,11 @@ PACKAGES-$(PTXCONF_ARCH_ARM)-$(PTXCONF_VALGRIND) += valgrind
 #
 # Paths and names
 #
-VALGRIND_VERSION   := 3.14.0
-VALGRIND_MD5   := 74175426afa280184b62591b58c671b3
+VALGRIND_VERSION   := 3.16.1
+VALGRIND_MD5   := d1b153f1ab17cf1f311705e7a83ef589
 VALGRIND   := valgrind-$(VALGRIND_VERSION)
 VALGRIND_SUFFIX:= tar.bz2
-VALGRIND_URL   := 
http://valgrind.org/downloads/$(VALGRIND).$(VALGRIND_SUFFIX)
+VALGRIND_URL   := 
https://sourceware.org/pub/valgrind/$(VALGRIND).$(VALGRIND_SUFFIX)
 VALGRIND_SOURCE:= $(SRCDIR)/$(VALGRIND).$(VALGRIND_SUFFIX)
 VALGRIND_DIR   := $(BUILDDIR)/$(VALGRIND)
 VALGRIND_LICENSE   := GPL-2.0-only
-- 
2.20.1


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

[ptxdist] [PATCH] uvc-gadget: version bump 58f5ddeb -> 105134f9

[Michael Tretter]

The update adds MJPG support to the uvc-gadget.

Furthermore, document that the version is just a fake commitish.

Signed-off-by: Michael Tretter 
---
 rules/uvc-gadget.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/uvc-gadget.make b/rules/uvc-gadget.make
index 17ec1bd97c5f..b13ecbf19bef 100644
--- a/rules/uvc-gadget.make
+++ b/rules/uvc-gadget.make
@@ -14,8 +14,9 @@ PACKAGES-$(PTXCONF_UVC_GADGET) += uvc-gadget
 #
 # Paths and names
 #
-UVC_GADGET_VERSION := 2019-02-13-g58f5ddeb
-UVC_GADGET_MD5 := aabd91acafd035a85c2151b67e1491ca
+# No tags: use a fake descriptive commit-ish to include the date
+UVC_GADGET_VERSION := 2019-05-02-g105134f9
+UVC_GADGET_MD5 := cd61b910844f1d95534a8773bf63f248
 UVC_GADGET := uvc-gadget-$(UVC_GADGET_VERSION)
 UVC_GADGET_SUFFIX  := tar.xz
 UVC_GADGET_URL := 
git://git.ideasonboard.org/uvc-gadget.git;tag=$(UVC_GADGET_VERSION)
-- 
2.20.1


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

[ptxdist] [PATCH] apitrace: new package

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 ...E_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch | 49 +
 patches/apitrace-9.0/series   |  4 ++
 rules/apitrace.in | 11 +++
 rules/apitrace.make   | 72 +++
 4 files changed, 136 insertions(+)
 create mode 100644 
patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch
 create mode 100644 patches/apitrace-9.0/series
 create mode 100644 rules/apitrace.in
 create mode 100644 rules/apitrace.make

diff --git 
a/patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch 
b/patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch
new file mode 100644
index ..f2bf4d46b62f
--- /dev/null
+++ 
b/patches/apitrace-9.0/0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch
@@ -0,0 +1,49 @@
+From: Mike Frysinger 
+Date: Mon, 29 Apr 2019 20:32:04 +0200
+Subject: [PATCH] Use CMAKE_INSTALL_LIBDIR for LIB_INSTALL_DIR
+
+Respect the libdir cmake already set up for us instead of using
+debian-specific multiarch paths.
+
+Patch was rebased multiple times from 4.0 to 9.0 now.
+
+Signed-off-by: Andreas Sturmlechner 
+---
+ CMakeLists.txt | 17 ++---
+ 1 file changed, 2 insertions(+), 15 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 19316e604286..6c3c4b85c19c 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -438,15 +438,6 @@ endif ()
+ ##
+ # Installation directories
+ 
+-if (CMAKE_SYSTEM_NAME STREQUAL "Linux")
+-# Debian multiarch support
+-execute_process(COMMAND dpkg-architecture -qDEB_HOST_MULTIARCH
+-OUTPUT_VARIABLE ARCH_SUBDIR
+-ERROR_QUIET
+-OUTPUT_STRIP_TRAILING_WHITESPACE
+-)
+-endif()
+-
+ if (WIN32 OR APPLE)
+ # On Windows/MacOSX, applications are usually installed on a directory of
+ # their own
+@@ -455,12 +446,8 @@ if (WIN32 OR APPLE)
+ set (LIB_ARCH_INSTALL_DIR lib)
+ else ()
+ set (DOC_DEFAULT_INSTALL_DIR share/doc/${CMAKE_PROJECT_NAME})
+-set (LIB_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+-if (ARCH_SUBDIR)
+-set (LIB_ARCH_INSTALL_DIR lib/${ARCH_SUBDIR}/${CMAKE_PROJECT_NAME})
+-else ()
+-set (LIB_ARCH_INSTALL_DIR lib${LIB_SUFFIX}/${CMAKE_PROJECT_NAME})
+-endif ()
++set (LIB_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/${CMAKE_PROJECT_NAME})
++set (LIB_ARCH_INSTALL_DIR ${LIB_INSTALL_DIR})
+ endif ()
+ 
+ # Allow customization of the doc installation dir (Slackware uses different
diff --git a/patches/apitrace-9.0/series b/patches/apitrace-9.0/series
new file mode 100644
index ..c75669299f04
--- /dev/null
+++ b/patches/apitrace-9.0/series
@@ -0,0 +1,4 @@
+# generated by git-ptx-patches
+#tag:base --start-number 1
+0001-Use-CMAKE_INSTALL_LIBDIR-for-LIB_INSTALL_DIR.patch
+# e6b6e6297e24d182be6d8261d1509250  - git-ptx-patches magic
diff --git a/rules/apitrace.in b/rules/apitrace.in
new file mode 100644
index ..2bac254d002c
--- /dev/null
+++ b/rules/apitrace.in
@@ -0,0 +1,11 @@
+## SECTION=debug_tools
+
+config APITRACE
+   tristate
+   select HOST_CMAKE
+   select HOST_SYSTEM_PYTHON3
+   select ZLIB
+   select LIBPNG
+   prompt "apitrace"
+   help
+ Tools for tracing OpenGL, Direct3D, and other graphics APIs.
diff --git a/rules/apitrace.make b/rules/apitrace.make
new file mode 100644
index ..d98771d4b8f3
--- /dev/null
+++ b/rules/apitrace.make
@@ -0,0 +1,72 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2020 by Michael Tretter 
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_APITRACE) += apitrace
+
+#
+# Paths and names
+#
+APITRACE_VERSION   := 9.0
+APITRACE_MD5   := 83bacfb35f4f339571702099d283f571
+APITRACE   := apitrace-$(APITRACE_VERSION)
+APITRACE_SUFFIX:= tar.gz
+APITRACE_URL   := 
https://github.com/apitrace/apitrace/archive/$(APITRACE_VERSION).$(APITRACE_SUFFIX)
+APITRACE_SOURCE:= $(SRCDIR)/$(APITRACE).$(APITRACE_SUFFIX)
+APITRACE_DIR   := $(BUILDDIR)/$(APITRACE)
+APITRACE_LICENSE   := MIT AND BSD-3-CLAUSE
+APITRACE_LICENSE_FILES := file://LICENSE;md5=aeb969185a143c3c25130bc2c3ef9a50 \
+  
file://thirdparty/snappy/COPYING;md5=f62f3080324a97b3159a7a7e61812d0c
+
+# 
+# Prepare
+# 
+
+APITRACE_CONF_TOOL := cmake
+APITRACE_CONF_OPT  :=  \
+   $(CROSS_CMAKE_USR) \
+   -DCMAKE_BUILD_TYPE=Release \
+   -DCMAKE_INSTALL_LIBDIR=/usr/lib \
+   -DENABLE_ASAN=OFF \
+   -DENABLE_CLI=ON \
+   -DENABLE_EGL=ON \
+   -DENABLE_FRAME_POINTER=ON \
+   

[ptxdist] [PATCH] host-dtc: add missing dependency host-flex

[Michael Tretter]

Building the dtc fails if flex is not installed. As ptxdist requires
flex as build dependency, the host usually already has flex and the
missing dependency is hidden.

Add host-flex as a explicit dependency for host-dtc.

Signed-off-by: Michael Tretter 
---
 platforms/host-dtc.in | 1 +
 1 file changed, 1 insertion(+)

diff --git a/platforms/host-dtc.in b/platforms/host-dtc.in
index 5f6fb0f48872..4567464c3d6b 100644
--- a/platforms/host-dtc.in
+++ b/platforms/host-dtc.in
@@ -2,6 +2,7 @@
 
 menuconfig HOST_DTC
tristate "dtc   "
+   select HOST_FLEX
help
  Select this if the HOST_DTC tool is required without
  building a device tree. (It is also used for building
-- 
2.20.1


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

Re: [ptxdist] [PATCH] binutils: add license information

[Michael Tretter]

On Fri, Apr 17, 2020 at 08:47:34AM +0200, Michael Olbrich wrote:
> On Thu, Apr 16, 2020 at 10:43:19AM +0200, Michael Tretter wrote:
> > Signed-off-by: Michael Tretter 
> > ---
> >  rules/binutils.make | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/rules/binutils.make b/rules/binutils.make
> > index ca1080bc811d..094347e3f8bf 100644
> > --- a/rules/binutils.make
> > +++ b/rules/binutils.make
> > @@ -22,6 +22,7 @@ BINUTILS_SUFFIX   := tar.bz2
> >  BINUTILS_URL   := $(call ptx/mirror, GNU, 
> > binutils/$(BINUTILS).$(BINUTILS_SUFFIX))
> >  BINUTILS_SOURCE:= $(SRCDIR)/$(BINUTILS).$(BINUTILS_SUFFIX)
> >  BINUTILS_DIR   := $(BUILDDIR)/$(BINUTILS)
> > +BINUTILS_LICENSE   := GPL-2.0-or-later AND GPL-3.0-or-later AND 
> > LGPL-2.0-or-later AND LGPL-3.0-or-later
> 
> No. The version is derived from the toolchain, so we cannot be sure that
> this is always correct. What we need to do is export the license
> information in the toolchain and import it here when possible. We already
> do the same thing for glibc and gcclibs.

Hm. The difference between glibc/gcclibs and the binutils is that for binutils
only the version is extracted from the toolchain and the binutils are build
from source in the BSP. Thus, we could also extract the license information
from the downloaded source code, which would be the same license as in the
toolchain. I'm not sure if this is actually simpler than exporting the
license information in the toolchain.

Michael

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] binutils: add license information

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/binutils.make | 1 +
 1 file changed, 1 insertion(+)

diff --git a/rules/binutils.make b/rules/binutils.make
index ca1080bc811d..094347e3f8bf 100644
--- a/rules/binutils.make
+++ b/rules/binutils.make
@@ -22,6 +22,7 @@ BINUTILS_SUFFIX   := tar.bz2
 BINUTILS_URL   := $(call ptx/mirror, GNU, 
binutils/$(BINUTILS).$(BINUTILS_SUFFIX))
 BINUTILS_SOURCE:= $(SRCDIR)/$(BINUTILS).$(BINUTILS_SUFFIX)
 BINUTILS_DIR   := $(BUILDDIR)/$(BINUTILS)
+BINUTILS_LICENSE   := GPL-2.0-or-later AND GPL-3.0-or-later AND 
LGPL-2.0-or-later AND LGPL-3.0-or-later
 
 # 
 # Prepare
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] u-boot-tools: version bump 2019.01 -> 2020.04

[Michael Tretter]

The new U-Boot version has a tools-only_defconfig for building the
tools. Switch from the sandbox_defconfig to the tools-only defconfig.

The U-Boot tools do not actually build the sandbox U-Boot and therefore
SDL support (for display/keyboard) is definitely not needed. Disable SDL
to prevent the "sdl2-config: Command not found" messages when building
the tools.

Use the documented envtools top-level command to build the target tools
instead of calling the Makefile in the tools/env directory.

Signed-off-by: Michael Tretter 
---
 rules/host-u-boot-tools.make |  2 +-
 rules/u-boot-tools.make  | 17 +
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/rules/host-u-boot-tools.make b/rules/host-u-boot-tools.make
index c16f4b03fac2..3a980dd76667 100644
--- a/rules/host-u-boot-tools.make
+++ b/rules/host-u-boot-tools.make
@@ -17,7 +17,7 @@ HOST_PACKAGES-$(PTXCONF_HOST_U_BOOT_TOOLS) += 
host-u-boot-tools
 # 
 
 HOST_U_BOOT_TOOLS_CONF_TOOL:= NO
-HOST_U_BOOT_TOOLS_MAKE_OPT := sandbox_config tools-only
+HOST_U_BOOT_TOOLS_MAKE_OPT := tools-only_defconfig tools-only NO_SDL=1
 
 # 
 # Install
diff --git a/rules/u-boot-tools.make b/rules/u-boot-tools.make
index 154040ff5510..21b17c527052 100644
--- a/rules/u-boot-tools.make
+++ b/rules/u-boot-tools.make
@@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_U_BOOT_TOOLS) += u-boot-tools
 #
 # Paths and names
 #
-U_BOOT_TOOLS_VERSION   := 2019.01
-U_BOOT_TOOLS_MD5   := 0adbc6c755768f0b78a2a0decf0b253a
+U_BOOT_TOOLS_VERSION   := 2020.04
+U_BOOT_TOOLS_MD5   := 51113d2288c55110e33a895c65ab9f60
 U_BOOT_TOOLS   := u-boot-$(U_BOOT_TOOLS_VERSION)
 U_BOOT_TOOLS_SUFFIX:= tar.bz2
 U_BOOT_TOOLS_URL   := 
https://ftp.denx.de/pub/u-boot/$(U_BOOT_TOOLS).$(U_BOOT_TOOLS_SUFFIX)
@@ -31,19 +31,12 @@ U_BOOT_TOOLS_LICENSE_FILES := \
 # Prepare
 # 
 
-
-# just pick sandbox as a dummy target config
-U_BOOT_TOOLS_CONFIG:= sandbox_config
-ifdef PTXCONF_ARCH_PPC
-# the sandbox is not supported by PPC so just some random PPC config
-U_BOOT_TOOLS_CONFIG:= MPC8308RDB_defconfig
-endif
-
 U_BOOT_TOOLS_CONF_TOOL := NO
 U_BOOT_TOOLS_MAKE_OPT  := \
CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
-   $(U_BOOT_TOOLS_CONFIG) \
-   tools/env/
+   tools-only_defconfig \
+   envtools \
+   NO_SDL=1
 
 # 
 # Install
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v3] tf-a: new package for ARM trusted firmware A

[Michael Tretter]

On Wed, 19 Feb 2020 11:42:29 +0100, Ahmad Fatoum wrote:
> Trusted Firmware-A (TF-A) is a reference implementation of secure world
> software for Arm A-Profile architectures (Armv8-A and Armv7-A).
> 
> Cc: Alejandro Vazquez 
> Signed-off-by: Rouven Czerwinski 
> Signed-off-by: Ahmad Fatoum 

Tested-by: Michael Tretter 

> ---
> v2 -> v3:
>   - sorted version and md5 Kconfig options to top (mol)
>   - Added trailing spaces to align arrow after main prompt (mol)
>   - Changed TF_A_VERSION help text to indicate that the version can be any
> git commitsh
>   - Removed default value for TF_A_ARTIFACTS (mol)
>   - integrated TF_A_VERSION into BUILD_STRING of resulting artifacts
> (Guillermo, mtr)
>   - unconditional error if TF_A_ARTIFACTS is empty instead of warning later on
> (mol)
>   - removed diplicate Prepare header (mol)
>   - resorted make variable definitions
>   - avoid unportable install --target-directory (Guillermo)
>   - documented support for globbing in TF_A_ARTIFACTS
>   - don't glob delete in IMAGEDIR, instead expand the glob in the build
> directory first
> v1 -> v2:
>   - Made TF_A_ARCH_MAJOR configurable to support 32 bit ARMv8 (Guillermo)
>   - Replaces stm32mp-specific TF_A_DTB with TF_A_EXTRA_ARGS to contain
> all board/vendor specific options
>   - removed reference to no longer existing CREDITS file
>   - removed TF_A_MAKE_OPT contents that are set elsewhere
>   - reduced uses of += in favor of directly appending to the string
>   - delete old build directory in prepare instead of compile
>   - use default compile stage (Guillermo)
>   - install artifacts to sysroot /usr/lib/firmware in install stage
>   - install artifacts to IMAGEDIR in targetinstall
>   - fix clean stage to delete proper artifacts
> ---
>  platforms/tf-a.in | 140 ++
>  rules/tf-a.make   | 118 ++
>  2 files changed, 258 insertions(+)
>  create mode 100644 platforms/tf-a.in
>  create mode 100644 rules/tf-a.make
> 
> diff --git a/platforms/tf-a.in b/platforms/tf-a.in
> new file mode 100644
> index ..75dad9d159f4
> --- /dev/null
> +++ b/platforms/tf-a.in
> @@ -0,0 +1,140 @@
> +## SECTION=bootloader
> +
> +menuconfig TF_A
> + select BOOTLOADER
> + prompt "ARM Trusted Firmware-A"
> + depends on ARCH_ARM || ARCH_ARM64
> + bool
> +
> +if TF_A
> +
> +config TF_A_VERSION
> + string
> + default "v2.2"
> + prompt "TF-A version"
> + help
> +   Enter the TF-A git commitsh you want to build. Usally a tagged release
> +   like "v2.2"
> +
> +config TF_A_MD5
> + string
> + default "bb300e5a62c911e189c80d935d497a4b"
> + prompt "TF-A source md5"
> +
> +config TF_A_ARCH_STRING
> +string
> +default "aarch32" if ARCH_ARM
> +default "aarch64" if ARCH_ARM64
> +
> +choice
> + prompt "TF-A Architecture"
> + default TF_A_ARM_ARCH_MAJOR_7 if ARCH_ARM
> + default TF_A_ARM_ARCH_MAJOR_8 if ARCH_ARM64
> + help
> +   Architecture version major number
> +
> + config TF_A_ARM_ARCH_MAJOR_7
> + depends on ARCH_ARM
> + prompt "ARMv7"
> + bool
> +
> + config TF_A_ARM_ARCH_MAJOR_8_32_BIT
> + depends on ARCH_ARM
> + prompt "ARMv8 32-bit"
> + bool
> +
> + config TF_A_ARM_ARCH_MAJOR_8
> + depends on ARCH_ARM64
> + prompt "ARMv8"
> + bool
> +
> +endchoice
> +
> +config TF_A_ARM_ARCH_MAJOR
> +int
> +default 7 if TF_A_ARM_ARCH_MAJOR_7
> +default 8 if TF_A_ARM_ARCH_MAJOR_8_32_BIT
> +default 8 if TF_A_ARM_ARCH_MAJOR_8
> +
> +
> +config TF_A_PLATFORM
> + string
> + prompt "TF-A target platform"
> + help
> +   The TF-A target platform.
> +
> +config TF_A_ARM_ARCH_MINOR
> + depends on TF_A_ARM_ARCH_MAJOR_8 || TF_A_ARM_ARCH_MAJOR_8_32_BIT
> + int
> + default 0
> + prompt "TF-A target ARMv8.MINOR version"
> + help
> +   The minor version of the ARMv8 architecture targeted. Defaults to 0.
> +
> +config TF_A_EXTRA_ARGS
> + string
> + prompt "TF-A extra build arguments"
> + help
> +   Extra platform-specific build arguments to pass to the TF-A build
> +   process, e.g. DTB_FILE_NAME= for the stm32mp1
> +
> +config TF_A_ARTIFACTS
> + string
> + prompt "TF-A artifact file names"
> 

Re: [ptxdist] [PATCH v2] tf-a: new package for ARM trusted firmware A

[Michael Tretter]

On Tue, 18 Feb 2020 10:02:57 +0100, Guillermo Rodriguez Garcia wrote:
> El mar., 18 feb. 2020 a las 8:36, Michael Olbrich
> () escribió:
> >
> > On Mon, Feb 17, 2020 at 05:33:57PM +0100, Guillermo Rodriguez Garcia wrote: 
> >  
> > > El lun., 17 feb. 2020 a las 17:26, Michael Tretter
> > > () escribió:  
> > > >
> > > > On Wed, 12 Feb 2020 17:40:33 +0100, Ahmad Fatoum wrote:  
> > > > > Trusted Firmware-A (TF-A) is a reference implementation of secure 
> > > > > world
> > > > > software for Arm A-Profile architectures (Armv8-A and Armv7-A).  
> > > >
> > > > I successfully built the TF-A BL31 for the ZynqMP using this rule.
> > > >
> > > > However, I saw that the TF-A build uses the current git commitish for
> > > > BUILD_STRING, which will be written into the binary. If I build the
> > > > TF-A with this rule, this ends up to be the commitish of the BSP. I'm
> > > > not sure if I actually want this, but I don't know what to put there
> > > > instead.  
> > >
> > > Since we finally agreed to keep TF_A_EXTRA_ARGS in the final TF-A rule
> > > files, you can actually set BUILD_STRING to anything you want. Just
> > > include BUILD_STRING=whatever in the TF_A_EXTRA_ARGS parameter.  
> >
> > There should always be a default BUILD_STRING that does not depend on the
> > BSP commit-ish. $(TF_A_VERSION) probably.  
> 
> OK, then we could add this to the .make file:
> 
> TF_A_MAKE_OPT:= \
> CROSS_COMPILE=$(BOOTLOADER_CROSS_COMPILE) \
> HOSTCC=$(HOSTCC) \
> PLAT=$(PTXCONF_TF_A_PLATFORM) \
> ARCH=$(PTXCONF_TF_A_ARCH_STRING) \
> ARM_ARCH_MAJOR=$(PTXCONF_TF_A_ARM_ARCH_MAJOR) \
> BUILD_STRING=$(PTXCONF_TF_A_VERSION) \

The version string that is printed during the boot will then be
something like "v2.2(Release):v2.2". The first version is the hard
coded version in the makefile and the second is the git commitish that
was used to build the tf-a. Seems OK to me.

Michael

> $(call remove_quotes,$(PTXCONF_TF_A_EXTRA_ARGS)) \
> all
> 
> BUILD_STRING can still be overriden in TF_A_EXTRA_ARGS if needed.
> 
> Guillermo
> 
> ___
> ptxdist mailing list
> ptxdist@pengutronix.de

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH v2] tf-a: new package for ARM trusted firmware A

[Michael Tretter]

On Wed, 12 Feb 2020 17:40:33 +0100, Ahmad Fatoum wrote:
> Trusted Firmware-A (TF-A) is a reference implementation of secure world
> software for Arm A-Profile architectures (Armv8-A and Armv7-A).

I successfully built the TF-A BL31 for the ZynqMP using this rule.

However, I saw that the TF-A build uses the current git commitish for
BUILD_STRING, which will be written into the binary. If I build the
TF-A with this rule, this ends up to be the commitish of the BSP. I'm
not sure if I actually want this, but I don't know what to put there
instead.

Michael

> 
> Cc: Alejandro Vazquez 
> Signed-off-by: Rouven Czerwinski 
> Signed-off-by: Ahmad Fatoum 
> ---
> v1 -> v2:
>  - Made TF_A_ARCH_MAJOR configurable to support 32 bit ARMv8 (Guillermo)
>  - Replaces stm32mp-specific TF_A_DTB with TF_A_EXTRA_ARGS to contain
>all board/vendor specific options
>  - removed reference to no longer existing CREDITS file
>  - removed TF_A_MAKE_OPT contents that are set elsewhere
>  - reduced uses of += in favor of directly appending to the string
>  - delete old build directory in prepare instead of compile
>  - use default compile stage (Guillermo)
>  - install artifacts to sysroot /usr/lib/firmware in install stage
>  - install artifacts to IMAGEDIR in targetinstall
>  - fix clean stage to delete proper artifacts
> ---
>  platforms/tf-a.in | 138 ++
>  rules/tf-a.make   | 114 ++
>  2 files changed, 252 insertions(+)
>  create mode 100644 platforms/tf-a.in
>  create mode 100644 rules/tf-a.make

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] pkg-config-wrapper: remove sysroot only from specified variables

[Michael Tretter]

The PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT variable allows to specify
pkg-config variable that shall be relative to the target rootfs and not
contain the sysroot path. This is important for variables that are used
for writing files to the target rootfs, e.g., systemduserunitdir.

Currently, the sysroot is removed from all pkg-config variables, if
PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT is set, but packages already specify
the name of the variable that must not include the sysroot.

Add a check to remove the sysroot only from variables that are actually
contained in PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT.

Signed-off-by: Michael Tretter 
---
 scripts/pkg-config-wrapper | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/scripts/pkg-config-wrapper b/scripts/pkg-config-wrapper
index d9e111d6c..79018c63c 100755
--- a/scripts/pkg-config-wrapper
+++ b/scripts/pkg-config-wrapper
@@ -41,7 +41,7 @@ IFS="${orig_IFS}"
 for ((i = 1; i <= ${#}; i++)); do
 case "${!i}" in
--variable*)
-   found_var=true
+   found_var=${!i#"--variable="}
break
;;
*)
@@ -61,8 +61,8 @@ args=( \
 "-e" "s~/lib/pkgconfig/\.\./\.\.~~g" \
 )
 
-if [ -n "${PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT}" -a \
--n "${found_var}" ]; then
+if [ -n "${found_var}" -a \
+"${PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT#*${found_var}}" != 
"${PTXDIST_PKG_CONFIG_VAR_NO_SYSROOT}" ]; then
 #
 # remove sysroot for variables that return a path
 #
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 20/73] xorg-app-xrandr: version bump 1.3.5 -> 1.5.1

[Michael Tretter]

On Tue, 24 Sep 2019 12:43:11 +0200, Björn Esser wrote:
> Signed-off-by: Björn Esser 
> ---
>  rules/xorg-app-xrandr.make | 6 +++---
>  1 file changed, 3 insertions(+), 3 deletions(-)
> 
> diff --git a/rules/xorg-app-xrandr.make b/rules/xorg-app-xrandr.make
> index 9ff8caf42..ab82da033 100644
> --- a/rules/xorg-app-xrandr.make
> +++ b/rules/xorg-app-xrandr.make
> @@ -14,10 +14,10 @@ PACKAGES-$(PTXCONF_XORG_APP_XRANDR) += xorg-app-xrandr
>  #
>  # Paths and names
>  #
> -XORG_APP_XRANDR_VERSION  := 1.3.5
> -XORG_APP_XRANDR_MD5  := 9735173a84dca9b05e06fd4686196b07
> +XORG_APP_XRANDR_VERSION  := 1.5.1
> +XORG_APP_XRANDR_MD5  := fe40f7a4fd39dd3a02248d3e0b1972e4
>  XORG_APP_XRANDR  := xrandr-$(XORG_APP_XRANDR_VERSION)
> -XORG_APP_XRANDR_SUFFIX   := tar.bz2
> +XORG_APP_XRANDR_SUFFIX   := tar.xz

Is this change intentional? Why did the suffix change only for xrandr,
but not the other packages?

Michael

>  XORG_APP_XRANDR_URL  := $(call ptx/mirror, XORG, 
> individual/app/$(XORG_APP_XRANDR).$(XORG_APP_XRANDR_SUFFIX))
>  XORG_APP_XRANDR_SOURCE   := 
> $(SRCDIR)/$(XORG_APP_XRANDR).$(XORG_APP_XRANDR_SUFFIX)
>  XORG_APP_XRANDR_DIR  := $(BUILDDIR)/$(XORG_APP_XRANDR)

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 06/73] host-xorg-lib-x11: enable xthreads

[Michael Tretter]

On Tue, 24 Sep 2019 12:42:57 +0200, Björn Esser wrote:
> Signed-off-by: Björn Esser 
> ---
>  rules/host-xorg-lib-X11.make | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/rules/host-xorg-lib-X11.make b/rules/host-xorg-lib-X11.make
> index 638ef6272..7c43738cd 100644
> --- a/rules/host-xorg-lib-X11.make
> +++ b/rules/host-xorg-lib-X11.make
> @@ -27,7 +27,7 @@ HOST_XORG_LIB_X11_CONF_OPT  := \
>   --disable-specs \
>   --disable-loadable-i18n \
>   --disable-loadable-xcursor \
> - --disable-xthreads \
> + --enable-xthreads \

Please document the reasons for the flipped switch in the commit
message.

Michael

>   --disable-xcms \
>   --enable-xlocale \
>   --enable-xlocaledir \

___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 70/73] xorg-server: version bump 1.17.2 -> 1.20.5

[Michael Tretter]

On Tue, 24 Sep 2019 12:44:01 +0200, Björn Esser wrote:
> Also drop configuration options, that are
> not available anymore.

There are a few patches in patches/xorg-server-1.17.2. Please check if
they are still required and either port them to 1.20.5 or remove them.

Furthermore, compilation fails with

In file included from lnx_init.c:33:
 
../../../../hw/xfree86/common/compiler.h:767:10: fatal error: sys/io.h: 
No such file or directory compilation terminated.   
   

I guess that this is related to compilation with gcc9.

Michael

> 
> Signed-off-by: Björn Esser 
> ---
>  rules/xorg-server.in   | 71 ++
>  rules/xorg-server.make | 20 ++--
>  2 files changed, 4 insertions(+), 87 deletions(-)
> 
> diff --git a/rules/xorg-server.in b/rules/xorg-server.in
> index fd4fcd5d1..e91d982ba 100644
> --- a/rules/xorg-server.in
> +++ b/rules/xorg-server.in
> @@ -8,6 +8,7 @@ menuconfig XORG_SERVER
>   select HOST_XORG_UTIL_MACROS
>   select HOST_XORG_LIB_XTRANS # needed for autoreconf
>   select HOST_XORG_FONT_UTIL  # needed for autoreconf
> +
>   #
>   # required dependencies, according to REQUIRED_MODULES
>   # and REQUIRED_LIBS in conrigure.ac:
> @@ -32,10 +33,6 @@ menuconfig XORG_SERVER
>  
>   select LIBDRM   if XORG_SERVER_LIBDRM
>  
> - # input hotplug with udev
> - select UDEV if XORG_SERVER_UDEV
> - select UDEV_LIBUDEV if XORG_SERVER_UDEV
> -
>   # glx triggered
>   select XORG_LIB_X11 if XORG_SERVER_EXT_GLX
>   select MESALIB  if XORG_SERVER_EXT_GLX
> @@ -84,7 +81,7 @@ menuconfig XORG_SERVER
>   select XORG_LIB_XRESif XORG_SERVER_EXT_XRES
>  
>   # for kdrive
> - select TSLIBif XORG_SERVER_TSLIB
> + select TSLIB
>  
>   # FIXME: unclear dependencies
>   #select XORG_LIB_XXF86VMif XORG_SERVER_EXT_XV
> @@ -196,20 +193,6 @@ config XORG_SERVER_XEPHYR
> Xnest this kind of server supports all new features (extensions). It
> doesn't depend on the features of the underlying X server.
>  
> -config XORG_SERVER_XFAKE
> - bool
> - depends on BROKEN
> - prompt "fake server"
> - help
> -   FIXME
> -
> -config XORG_SERVER_XFBDEV
> - bool
> - select XORG_SERVER_KDRIVE
> - prompt "xfbdev server"
> - help
> -   FIXME
> -
>  endmenu
>  
>  # 
> 
> @@ -231,11 +214,6 @@ endmenu
>  
>  menu "xorg options  "
>  
> -config XORG_SERVER_OPT_AIGLX
> - bool
> - depends on BROKEN
> - prompt "aiglx"
> -
>  config XORG_SERVER_OPT_INSTALL_SETUID
>   bool
>   prompt "install server suid root"
> @@ -248,47 +226,8 @@ config XORG_SERVER_OPT_SECURE_RPC
>   help
> Use secure RPC authentication (SUN-DES-1)
>  
> -config XORG_SERVER_UDEV
> - bool
> - select XORG_SERVER_LIBDRM
> - prompt "detect input devices via udev"
> - help
> -   FIXME
> -
> -endmenu
> -
> -if XORG_SERVER_KDRIVE
> -
> -menu "kdrive options"
> -
> -config XORG_SERVER_TSLIB
> - bool
> - prompt "tslib support"
> - help
> -   Build kdrive tslib touchscreen support
> -
> -config XORG_SERVER_KDRIVE_KBD
> - bool
> - prompt "kbd driver"
> - help
> -   Build kbd driver for kdrive
> -
> -config XORG_SERVER_KDRIVE_MOUSE
> - bool
> - prompt "mouse driver"
> - help
> -   Build mouse driver for kdrive
> -
> -config XORG_SERVER_KDRIVE_EVDEV
> - bool
> - prompt "evdev driver"
> - help
> -   Build evdev driver for kdrive
> -
>  endmenu
>  
> -endif
> -
>  # 
> 
>  
>  menu "xorg extensions   "
> @@ -383,11 +322,6 @@ config XORG_SERVER_EXT_GLX
>   help
> --enable-glx
>  
> -config XORG_SERVER_OPT_GLX_TLS
> - bool
> - depends on XORG_SERVER_EXT_GLX
> - prompt "tls support for glx"
> -
>  config XORG_SERVER_EXT_DRI
>   bool
>   select XORG_SERVER_LIBDRM
> @@ -485,4 +419,3 @@ endmenu
>  # 
> 
>  
>  endif
> -
> diff --git a/rules/xorg-server.make b/rules/xorg-server.make
> index 462e598be..a6f124285 100644
> --- a/rules/xorg-server.make
> +++ b/rules/xorg-server.make
> @@ -14,8 +14,8 @@ PACKAGES-$(PTXCONF_XORG_SERVER) += xorg-server
>  #
>  # Paths and names
>  #
> -XORG_SERVER_VERSION  := 1.17.2
> -XORG_SERVER_MD5  := 397e405566651150490ff493e463f1ad
> +XORG_SERVER_VERSION  := 1.20.5
> +XORG_SERVER_MD5  := c9fc7e21e11286dbedd22c00df652130
>  XORG_SERVER  := xorg-server-$(XORG_SERVER_VERSION)
>  XORG_SERVER_SUFFIX 

Re: [ptxdist] [PATCH] README: update

[Michael Tretter]

On Sun, 01 Sep 2019 23:04:56 +0200, Roland Hieber wrote:
> When reading this README, the tarball was obviously already extracted,
> so remove the very unclear section about how to get it. Anyway, anything
> important is in the manual, which is linked later.

I agree that the section is unclear, but the README can be read from
the git webview, too. Maybe this section should be rewritten for the
viewpoint of a git user?

Michael

> 
> TODO is no longer there since commit b710f8cdf410a91b4298 ("PTXdist:
> remove useless and unmaintained files").
> 
> Link to the new documentation directly instead of through a redirected
> URL, and fix incorrect use of "refer" in the section heading.
> 
> Signed-off-by: Roland Hieber 
> ---
>  README | 20 +---
>  1 file changed, 5 insertions(+), 15 deletions(-)
> 
> diff --git a/README b/README
> index 33cf90e0bc19..608b4749bdcd 100644
> --- a/README
> +++ b/README
> @@ -1,15 +1,6 @@
>  PTXdist
>  ===
>  
> -Necessary Packages
> ---
> -
> -In order to build ptxdist, you need this archive:
> -
> - ptxdist-.tgz
> -
> -Extract this archive into some build directory.
> -
>  Installation
>  
>  
> @@ -107,15 +98,14 @@ Bugs
>  
>  
>  - search for FIXMEs
> -- see TODO
>  
> -For documentation please refer:
> 
> +For documentation please refer to:
> +--
>  
> -http://www.pengutronix.de/software/ptxdist/documentation_en.html
> +https://www.ptxdist.org/doc
>  
> -For Patch Tagging please refer:
> 
> +For Patch Tagging please refer to:
> +--
>  
>  http://dep.debian.net/deps/dep3/
>  

___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] gcc: aarch64: fix multi-os-directory

[Michael Tretter]

The multi-os-directory, which can be printed with

aarch64-v8a-linux-gnu-gcc -print-multi-os-directory

is ../lib for aarch64, but must be . to ensure a correct search path for
libraries that use multi-os-directory.

Without this fix, for example, libffi might add /usr/lib/../lib to the
libs search directory, which is not filtered by ptxdist and will cause
compile errors on programs that link against libffi.

Signed-off-by: Michael Tretter 
---
 .../0202-aarch64-change-paths-for-pure64.patch  | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/patches/gcc-8-20181130/0202-aarch64-change-paths-for-pure64.patch 
b/patches/gcc-8-20181130/0202-aarch64-change-paths-for-pure64.patch
index 5681c21..0cfb04f 100644
--- a/patches/gcc-8-20181130/0202-aarch64-change-paths-for-pure64.patch
+++ b/patches/gcc-8-20181130/0202-aarch64-change-paths-for-pure64.patch
@@ -3,12 +3,14 @@ Date: Sun, 7 Dec 2014 21:07:28 +0100
 Subject: [PATCH] aarch64: change paths for pure64
 
 Signed-off-by: Michael Olbrich 
+[michael.tret...@posteo.net: replace ../lib with .]
+Signed-off-by: Michael Tretter 
 ---
  gcc/config/aarch64/t-aarch64-linux | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/gcc/config/aarch64/t-aarch64-linux 
b/gcc/config/aarch64/t-aarch64-linux
-index b9897785a892..bfea371dfa7e 100644
+index b9897785a892..7cc175c879e3 100644
 --- a/gcc/config/aarch64/t-aarch64-linux
 +++ b/gcc/config/aarch64/t-aarch64-linux
 @@ -22,7 +22,7 @@ LIB1ASMSRC   = aarch64/lib1funcs.asm
@@ -16,7 +18,7 @@ index b9897785a892..bfea371dfa7e 100644
  
  AARCH_BE = $(if $(findstring TARGET_BIG_ENDIAN_DEFAULT=1, $(tm_defines)),_be)
 -MULTILIB_OSDIRNAMES = mabi.lp64=../lib64$(call 
if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
-+MULTILIB_OSDIRNAMES = mabi.lp64=../lib$(call 
if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
++MULTILIB_OSDIRNAMES = mabi.lp64=.$(call 
if_multiarch,:aarch64$(AARCH_BE)-linux-gnu)
  MULTIARCH_DIRNAME = $(call if_multiarch,aarch64$(AARCH_BE)-linux-gnu)
  
  MULTILIB_OSDIRNAMES += mabi.ilp32=../libilp32$(call 
if_multiarch,:aarch64$(AARCH_BE)-linux-gnu_ilp32)
-- 
2.22.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] wlroots: add new package

[Michael Tretter]

wlroots is a modular Wayland compositor library, which is for example
used by sway or the phosh and ships with the rootston example
compositor.

Signed-off-by: Michael Tretter 
---
 rules/wlroots.in   | 31 ++
 rules/wlroots.make | 64 ++
 2 files changed, 95 insertions(+)
 create mode 100644 rules/wlroots.in
 create mode 100644 rules/wlroots.make

diff --git a/rules/wlroots.in b/rules/wlroots.in
new file mode 100644
index 0..cee1e8ed0
--- /dev/null
+++ b/rules/wlroots.in
@@ -0,0 +1,31 @@
+## SECTION=multimedia_wayland
+
+config WLROOTS
+   tristate
+   select HOST_MESON
+   select WAYLAND
+   select WAYLAND_PROTOCOLS
+   select LIBDRM
+   select MESALIB
+   select MESALIB_EGL
+   select MESALIB_GBM
+   select MESALIB_GLES2
+   select LIBINPUT
+   select LIBXKBCOMMON
+   select UDEV
+   select XCB_UTIL
+   select UDEV_LIBUDEV
+   select PIXMAN
+   prompt "wlroots"
+   help
+ wlroots provides pluggable, composable, unopinionated modules for
+ building a Wayland compositor.
+
+if WLROOTS
+
+config WLROOTS_ROOTSTON
+   bool
+   default y
+   prompt "install Rootston example compositor"
+
+endif
diff --git a/rules/wlroots.make b/rules/wlroots.make
new file mode 100644
index 0..937039087
--- /dev/null
+++ b/rules/wlroots.make
@@ -0,0 +1,64 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Michael Tretter 
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_WLROOTS) += wlroots
+
+#
+# Paths and names
+#
+WLROOTS_VERSION:= 0.5.0
+WLROOTS_MD5:= d186d57cd7aeca3d8af10e2d88575875
+WLROOTS:= wlroots-$(WLROOTS_VERSION)
+WLROOTS_SUFFIX := tar.gz
+WLROOTS_URL:= 
https://github.com/swaywm/wlroots/archive/$(WLROOTS_VERSION).$(WLROOTS_SUFFIX)
+WLROOTS_SOURCE := $(SRCDIR)/$(WLROOTS).$(WLROOTS_SUFFIX)
+WLROOTS_DIR:= $(BUILDDIR)/$(WLROOTS)
+WLROOTS_LICENSE:= MIT
+
+# 
+# Prepare
+# 
+
+WLROOTS_CONF_TOOL := meson
+WLROOTS_CONF_OPT := \
+   $(CROSS_MESON_USR) \
+   -Denable-enable-examples=false \
+   -Denable-enable-rootston=$(call ptx/truefalse,PTXCONF_WLROOTS_ROOTSTON) 
\
+   -Denable-x11_backend=false \
+   -Denable-xwayland=false
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/wlroots.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, wlroots)
+   @$(call install_fixup, wlroots,PRIORITY,optional)
+   @$(call install_fixup, wlroots,SECTION,base)
+   @$(call install_fixup, wlroots,AUTHOR,"Michael Tretter 
")
+   @$(call install_fixup, wlroots,DESCRIPTION,missing)
+
+   @$(call install_lib, wlroots, 0, 0, 0644, libwlroots)
+
+ifdef PTXCONF_WLROOTS_ROOTSTON
+   @$(call install_copy, wlroots, 0, 0, 0755, \
+   $(WLROOTS_DIR)-build/rootston/rootston, /usr/bin/rootston)
+endif
+
+   @$(call install_finish, wlroots)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] uvc-gadget: add new package

[Michael Tretter]

The uvc-gadget application is a test application for streaming video
data from a v4l2 capture device to a UVC gadget device that has been
configured in the ConfigFS.

Signed-off-by: Michael Tretter 
---
 rules/uvc-gadget.in   |  8 +++
 rules/uvc-gadget.make | 55 +++
 2 files changed, 63 insertions(+)
 create mode 100644 rules/uvc-gadget.in
 create mode 100644 rules/uvc-gadget.make

diff --git a/rules/uvc-gadget.in b/rules/uvc-gadget.in
new file mode 100644
index 0..9a69e40e5
--- /dev/null
+++ b/rules/uvc-gadget.in
@@ -0,0 +1,8 @@
+## SECTION=multimedia_tools
+
+config UVC_GADGET
+   tristate
+   select HOST_CMAKE
+   prompt "uvc-gadget"
+   help
+ UVC gadget userspace sample application
diff --git a/rules/uvc-gadget.make b/rules/uvc-gadget.make
new file mode 100644
index 0..900a6388b
--- /dev/null
+++ b/rules/uvc-gadget.make
@@ -0,0 +1,55 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2019 by Michael Tretter 
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+PACKAGES-$(PTXCONF_UVC_GADGET) += uvc-gadget
+
+#
+# Paths and names
+#
+UVC_GADGET_VERSION := 2019-02-13-g58f5ddeb
+UVC_GADGET_MD5 := aabd91acafd035a85c2151b67e1491ca
+UVC_GADGET := uvc-gadget-$(UVC_GADGET_VERSION)
+UVC_GADGET_SUFFIX  := tar.xz
+UVC_GADGET_URL := 
git://git.ideasonboard.org/uvc-gadget.git;tag=$(UVC_GADGET_VERSION)
+UVC_GADGET_SOURCE  := $(SRCDIR)/$(UVC_GADGET).$(UVC_GADGET_SUFFIX)
+UVC_GADGET_DIR := $(BUILDDIR)/$(UVC_GADGET)
+UVC_GADGET_LICENSE := GPL-2.0-or-later AND LGPL-2.1-or-later AND MIT
+
+# 
+# Prepare
+# 
+
+UVC_GADGET_CONF_TOOL   := cmake
+UVC_GADGET_CONF_OPT:= \
+   $(CROSS_CMAKE_USR)
+
+# 
+# Target-Install
+# 
+
+$(STATEDIR)/uvc-gadget.targetinstall:
+   @$(call targetinfo)
+
+   @$(call install_init, uvc-gadget)
+   @$(call install_fixup, uvc-gadget,PRIORITY,optional)
+   @$(call install_fixup, uvc-gadget,SECTION,base)
+   @$(call install_fixup, uvc-gadget,AUTHOR,"Michael Tretter 
")
+   @$(call install_fixup, uvc-gadget,DESCRIPTION,missing)
+
+   @$(call install_copy, uvc-gadget, 0, 0, 0755, -, /usr/bin/uvc-gadget)
+
+   @$(call install_finish, uvc-gadget)
+
+   @$(call touch)
+
+# vim: syntax=make
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] gstreamer1: optionally install gstcheck library

[Michael Tretter]

The GStreamer unit test library provides helpers for writing unit tests
for GStreamer elements. The library include GstCheck for building a test
suite and GstHarness for feeding test data to elements.

Notably, gst-check does not enable the internal GStreamer unit tests.

Signed-off-by: Michael Tretter 
---
 rules/gstreamer1.in   | 5 +
 rules/gstreamer1.make | 5 -
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/rules/gstreamer1.in b/rules/gstreamer1.in
index 9fea4a903..0ce231133 100644
--- a/rules/gstreamer1.in
+++ b/rules/gstreamer1.in
@@ -29,6 +29,11 @@ if GSTREAMER1
default y
prompt "enable debug support"
 
+   config GSTREAMER1_CHECK
+   bool
+   default n
+   prompt "install gst-check library"
+
config GSTREAMER1_INSTALL_TOOLS
bool
default y
diff --git a/rules/gstreamer1.make b/rules/gstreamer1.make
index 82742482f..c11ece086 100644
--- a/rules/gstreamer1.make
+++ b/rules/gstreamer1.make
@@ -82,7 +82,7 @@ GSTREAMER1_CONF_OPT   := \
--disable-poisoning \
--$(call ptx/endis, PTXCONF_GSTREAMER1_INTROSPECTION)-introspection \
\
-   --disable-check \
+   --$(call ptx/endis, PTXCONF_GSTREAMER1_CHECK)-check \
--with-ptp-helper-setuid-user=nobody \
--with-ptp-helper-setuid-group=nogroup \
--with-ptp-helper-permissions=setuid-root \
@@ -121,6 +121,9 @@ endif
@$(call install_lib, gstreamer1, 0, 0, 0644, libgstcontroller-1.0)
@$(call install_lib, gstreamer1, 0, 0, 0644, libgstnet-1.0)
@$(call install_lib, gstreamer1, 0, 0, 0644, libgstreamer-1.0)
+ifdef PTXCONF_GSTREAMER1_CHECK
+   @$(call install_lib, gstreamer1, 0, 0, 0644, libgstcheck-1.0)
+endif
 
@$(call install_lib, gstreamer1, 0, 0, 0644, \
gstreamer-1.0/libgstcoreelements)
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

Re: [ptxdist] [PATCH 1/4] weston: bump version 5.0.0 -> 6.0.0

[Michael Tretter]

On Thu, 28 Mar 2019 10:32:07 +0100, Philipp Zabel wrote:
> - switch build system to Meson
> - weston-screenshooter is now installed in /usr/bin
> - build and install debug tool
> 
> Signed-off-by: Philipp Zabel 
> ---
>  rules/weston.make | 90 +++
>  1 file changed, 45 insertions(+), 45 deletions(-)
> 
> diff --git a/rules/weston.make b/rules/weston.make
> index fa0577d92650..73c16a607479 100644
> --- a/rules/weston.make
> +++ b/rules/weston.make
> @@ -17,9 +17,9 @@ PACKAGES-$(PTXCONF_WESTON) += weston
>  #
>  # Paths and names
>  #
> -WESTON_VERSION   := 5.0.0
> -LIBWESTON_MAJOR := 5
> -WESTON_MD5   := 752a04ce3c65af4884cfac4e57231bdb
> +WESTON_VERSION   := 6.0.0
> +LIBWESTON_MAJOR := 6
> +WESTON_MD5   := 7c634e262f8a464a076c97fd50ad36b3
>  WESTON   := weston-$(WESTON_VERSION)
>  WESTON_SUFFIX:= tar.xz
>  WESTON_URL   := 
> http://wayland.freedesktop.org/releases/$(WESTON).$(WESTON_SUFFIX)
> @@ -31,48 +31,47 @@ WESTON_LICENSE:= MIT
>  # Prepare
>  # 
> 
>  
> -#
> -# autoconf
> -#
> -WESTON_CONF_TOOL := autoconf
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_INTEL) += intel
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_FREEDRENO) += freedreno
> +WESTON_SIMPLE_DMABUF_DRM-$(PTXCONF_LIBDRM_ETNAVIV) += etnaviv
> +
> +WESTON_SIMPLE_CLIENTS-y := damage im shm touch
> +WESTON_SIMPLE_CLIENTS-$(PTXCONF_WESTON_GL) += egl dmabuf-egl
> +
> +WESTON_CONF_TOOL := meson
>  WESTON_CONF_OPT  := \
> - $(CROSS_AUTOCONF_USR) \
> - $(GLOBAL_LARGE_FILE_OPTION) \
> - --disable-static \
> - --enable-shared \
> - --disable-devdocs \
> - --$(call ptx/endis, PTXCONF_WESTON_GL)-egl \
> - --disable-setuid-install \
> - --$(call ptx/endis, PTXCONF_WESTON_XWAYLAND)-xwayland \
> - --disable-xwayland-test \
> - --disable-x11-compositor \
> - --$(call ptx/endis, PTXCONF_WESTON_DRM_COMPOSITOR)-drm-compositor \
> - --$(call ptx/endis, PTXCONF_WESTON_GL)-wayland-compositor \
> - --$(call ptx/endis, 
> PTXCONF_WESTON_HEADLESS_COMPOSITOR)-headless-compositor \
> - --$(call ptx/endis, PTXCONF_WESTON_FBDEV_COMPOSITOR)-fbdev-compositor \
> - --disable-rdp-compositor \
> - --disable-screen-sharing \
> - --disable-vaapi-recorder \
> - --enable-simple-clients \
> - --$(call ptx/endis, PTXCONF_WESTON_GL)-simple-egl-clients \
> - --disable-simple-dmabuf-drm-client \
> - --disable-simple-dmabuf-v4l-client \
> - --enable-clients \
> - --enable-resize-optimization \
> - --$(call ptx/endis, PTXCONF_WESTON_LAUNCH)-weston-launch \
> - --enable-fullscreen-shell \
> - --disable-colord \
> - --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
> - --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
> - --disable-junit-xml \
> - --$(call ptx/endis, PTXCONF_WESTON_IVISHELL)-ivi-shell \
> - --$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
> - --$(call ptx/endis, 
> PTXCONF_WESTON_IVISHELL_EXAMPLE)-demo-clients-install \
> - --disable-lcms \
> - --$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
> - --with-cairo=$(call ptx/ifdef, PTXCONF_WESTON_GL,glesv2,image) \
> - --with-jpeg \
> - --without-webp
> + $(CROSS_MESON_USR) \
> + -Dbackend-drm=$(call ptx/truefalse,PTXCONF_WESTON_DRM_COMPOSITOR) \
> + -Dbackend-drm-screencast-vaapi=false \
> + -Dbackend-headless=$(call 
> ptx/truefalse,PTXCONF_WESTON_HEADLESS_COMPOSITOR) \
> + -Dbackend-rdp=false \
> + -Dscreenshare=false \
> + -Dbackend-wayland=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> + -Dbackend-x11=false \
> + -Dbackend-fbdev=$(call ptx/truefalse,PTXCONF_WESTON_FBDEV_COMPOSITOR) \
> + -Dbackend-default=drm \
> + -Drenderer-gl=$(call ptx/truefalse,PTXCONF_WESTON_GL) \
> + -Dweston-launch=$(call ptx/truefalse,PTXCONF_WESTON_LAUNCH) \
> + -Dxwayland=$(call ptx/truefalse,PTXCONF_WESTON_XWAYLAND) \
> + -Dxwayland-path=/usr/bin/Xwayland \
> + -Dsystemd=$(call ptx/truefalse,PTXCONF_WESTON_SYSTEMD) \
> + -Dremoting=false \
> + -Dshell-desktop=true \
> + -Dshell-fullscreen=true \
> + -Dshell-ivi=false \

-Dshell-ivi=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL) \

> + -Ddesktop-shell-client-default=weston-desktop-shell \
> + -Dcolor-management-lcms=false \
> + -Dcolor-management-colord=false \
> + -Dlauncher-logind=$(call ptx/truefalse,PTXCONF_SYSTEMD_LOGIND) \
> + -Dimage-jpeg=true \
> + -Dimage-webp=false \
> + -Dtools=calibrator,debug,info,terminal,touch-calibrator \
> + -Dsimple-dmabuf-drm=$(subst 
> $(space),$(comma),$(WESTON_SIMPLE_DMABUF_DRM-y)) \
> + -Ddemo-clients=false \

-Ddemo-clients=$(call ptx/truefalse,PTXCONF_WESTON_IVISHELL_EXAMPLE) \

As the demo clients depend on pangocairo, PANGO must be selected if

[ptxdist] [PATCH] gst-plugins-bad1: fix installation of y4mdec plugin

[Michael Tretter]

The variable for plugins that shall be installed is
GST_PLUGINS_BAD1_ENABLEP-y. Due to typo in the variable name, the y4mdec
plugin is built, but not installed into the rootfs.

Fix the typo to fix the installation of this plugin.

Signed-off-by: Michael Tretter 
---
 rules/gst-plugins-bad1.make | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rules/gst-plugins-bad1.make b/rules/gst-plugins-bad1.make
index 4b777ddae..52125348f 100644
--- a/rules/gst-plugins-bad1.make
+++ b/rules/gst-plugins-bad1.make
@@ -108,7 +108,7 @@ 
GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_VIDEOPARSERS)   += 
videoparser
 GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_VIDEOSIGNAL)
+= videosignal
 GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_VMNC)   += vmnc
 GST_PLUGINS_BAD1_ENABLEC-$(PTXCONF_GST_PLUGINS_BAD1_Y4M)   += y4m
-GST_PLUGINS_BAD1_ENABLED-$(PTXCONF_GST_PLUGINS_BAD1_Y4M)   += 
y4mdec
+GST_PLUGINS_BAD1_ENABLEP-$(PTXCONF_GST_PLUGINS_BAD1_Y4M)   += 
y4mdec
 GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_YADIF)  += yadif
 GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_BLUEZ)  += bluez
 GST_PLUGINS_BAD1_ENABLE-$(PTXCONF_GST_PLUGINS_BAD1_AVC)
+= avc
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] nfs-utils: add patch to fix building with glibc 2.28

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 ...003-fix-building-w-newer-C-libraries.patch | 79 +++
 patches/nfs-utils-1.3.3/series|  3 +-
 2 files changed, 81 insertions(+), 1 deletion(-)
 create mode 100644 
patches/nfs-utils-1.3.3/0003-fix-building-w-newer-C-libraries.patch

diff --git 
a/patches/nfs-utils-1.3.3/0003-fix-building-w-newer-C-libraries.patch 
b/patches/nfs-utils-1.3.3/0003-fix-building-w-newer-C-libraries.patch
new file mode 100644
index 0..c0d974c9c
--- /dev/null
+++ b/patches/nfs-utils-1.3.3/0003-fix-building-w-newer-C-libraries.patch
@@ -0,0 +1,79 @@
+From 4ac4b4f74dcec30dcb23aab827eed152db08daea Mon Sep 17 00:00:00 2001
+From: Mike Frysinger 
+Date: Wed, 27 Apr 2016 12:57:08 -0400
+Subject: [PATCH] fix building w/newer C libraries
+
+Linux C libraries are moving away from implicitly including the header
+sys/sysmacros.h via sys/types.h.  We would like to do this for glibc
+now, but others (musl/etc...) have been doing it already.  This means
+any code using major/minor/makedevs functions will fail to build when
+they don't include that header.
+
+Leverage the AC_HEADER_MAJOR macro that configure is already using to
+pull in the right header.
+
+Signed-off-by: Mike Frysinger 
+Signed-off-by: Steve Dickson 
+---
+ support/include/xcommon.h| 6 ++
+ support/nfs/nfsexport.c  | 1 +
+ utils/blkmapd/device-discovery.c | 1 +
+ utils/mountd/cache.c | 1 +
+ 4 files changed, 9 insertions(+)
+
+diff --git a/support/include/xcommon.h b/support/include/xcommon.h
+index d1a4b18..23c9a13 100644
+--- a/support/include/xcommon.h
 b/support/include/xcommon.h
+@@ -17,6 +17,12 @@
+ #include 
+ #include 
+ 
++#ifdef MAJOR_IN_MKDEV
++#include 
++#elif defined(MAJOR_IN_SYSMACROS)
++#include 
++#endif
++
+ #define streq(s, t)   (strcmp ((s), (t)) == 0)
+ 
+ /* Functions in sundries.c that are used in mount.c and umount.c  */ 
+diff --git a/support/nfs/nfsexport.c b/support/nfs/nfsexport.c
+index afd7c90..4b13265 100644
+--- a/support/nfs/nfsexport.c
 b/support/nfs/nfsexport.c
+@@ -19,6 +19,7 @@
+ 
+ #include "nfslib.h"
+ #include "misc.h"
++#include "xcommon.h"
+ 
+   /* if /proc/net/rpc/... exists, then 
+* write to it, as that interface is more stable.
+diff --git a/utils/blkmapd/device-discovery.c 
b/utils/blkmapd/device-discovery.c
+index b010628..052d582 100644
+--- a/utils/blkmapd/device-discovery.c
 b/utils/blkmapd/device-discovery.c
+@@ -51,6 +51,7 @@
+ #include 
+ 
+ #include "device-discovery.h"
++#include "xcommon.h"
+ 
+ #define EVENT_SIZE (sizeof(struct inotify_event))
+ #define EVENT_BUFSIZE (1024 * EVENT_SIZE)
+diff --git a/utils/mountd/cache.c b/utils/mountd/cache.c
+index 7847446..ec86a22 100644
+--- a/utils/mountd/cache.c
 b/utils/mountd/cache.c
+@@ -31,6 +31,7 @@
+ #include "mountd.h"
+ #include "fsloc.h"
+ #include "pseudoflavors.h"
++#include "xcommon.h"
+ 
+ #ifdef USE_BLKID
+ #include "blkid/blkid.h"
+-- 
+2.20.1
+
diff --git a/patches/nfs-utils-1.3.3/series b/patches/nfs-utils-1.3.3/series
index 22cb3322f..512cf9989 100644
--- a/patches/nfs-utils-1.3.3/series
+++ b/patches/nfs-utils-1.3.3/series
@@ -3,7 +3,8 @@
 #tag:upstream --start-number 1
 0001-systemd-Decouple-the-starting-and-stopping-of-rpcbin.patch
 0002-rpc.c-added-include-file-so-UINT16_MAX-is-defined.patch
+0003-fix-building-w-newer-C-libraries.patch
 #tag:ptxdist --start-number 100
 0100-rpcgen-don-t-link-to-libtirpc.patch
 0101-allow-installing-all-tools-in-usr.patch
-# 9e2fa6772abb1fdd36012b23950e5d18  - git-ptx-patches magic
+# 97af92530acbf1a38d73438665f8e71d  - git-ptx-patches magic
-- 
2.20.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] v4l-utils: version bump 1.14.0 -> 1.16.0

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/v4l-utils.make | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/rules/v4l-utils.make b/rules/v4l-utils.make
index 79b69db36..29b105c83 100644
--- a/rules/v4l-utils.make
+++ b/rules/v4l-utils.make
@@ -16,8 +16,8 @@ PACKAGES-$(PTXCONF_V4L_UTILS) += v4l-utils
 #
 # Paths and names
 #
-V4L_UTILS_VERSION  := 1.14.0
-V4L_UTILS_MD5  := ef7a0eaadf85a06ec0df272ddca6f5f7
+V4L_UTILS_VERSION  := 1.16.0
+V4L_UTILS_MD5  := 21a6ec3605a1c3114c8ccb70a963c871
 V4L_UTILS  := v4l-utils-$(V4L_UTILS_VERSION)
 V4L_UTILS_SUFFIX   := tar.bz2
 V4L_UTILS_URL  := 
http://linuxtv.org/downloads/v4l-utils/$(V4L_UTILS).$(V4L_UTILS_SUFFIX)
@@ -55,6 +55,7 @@ V4L_UTILS_CONF_OPT:= \
--enable-v4l2-ctl-libv4l \
--enable-v4l2-ctl-stream-to \
--disable-qv4l2 \
+   --disable-qvidcap \
--disable-gconv \
--$(call ptx/wwo, PTXCONF_V4L_UTILS_LIBV4LCONVERT)-jpeg
 
-- 
2.19.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] kernel: fix download url for release candidates

[Michael Tretter]

The check, if the release candidate needs to be downloaded from the git
url, compares major and minor version numbers. It fails for Linux 5.0,
because the minor is smaller than the minor of 4.12.

Check for the minor version only if the major version is 4.

Signed-off-by: Michael Tretter 
---
 rules/pre/kernel.make | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/rules/pre/kernel.make b/rules/pre/kernel.make
index dc42a212c..f051718f8 100644
--- a/rules/pre/kernel.make
+++ b/rules/pre/kernel.make
@@ -38,10 +38,10 @@ endif
 # by cgit.
 #
 ifneq ($(findstring -rc,$(KERNEL_VERSION)),)
-KERNEL_NEEDS_GIT_URL := $(call ptx/force-shell, test $(KERNEL_VERSION_MAJOR) 
-ge 4 -a $(KERNEL_VERSION_MINOR) -ge 12 && echo y)
+KERNEL_NEEDS_GIT_URL := $(call ptx/force-shell, test $(KERNEL_VERSION_MAJOR) 
-ge 5 -o \( $(KERNEL_VERSION_MAJOR) -eq 4 -a $(KERNEL_VERSION_MINOR) -ge 12 \) 
&& echo y)
 endif
 ifneq ($(findstring -rc,$(KERNEL_HEADER_VERSION)),)
-KERNEL_HEADER_NEEDS_GIT_URL := $(call ptx/force-shell, test 
$(KERNEL_HEADER_VERSION_MAJOR) -ge 4 -a $(KERNEL_HEADER_VERSION_MINOR) -ge 12 
&& echo y)
+KERNEL_HEADER_NEEDS_GIT_URL := $(call ptx/force-shell, test 
$(KERNEL_HEADER_VERSION_MAJOR) -ge 5 -o \( $(KERNEL_HEADER_VERSION_MAJOR) -eq 4 
-a $(KERNEL_HEADER_VERSION_MINOR) -ge 12 \) && echo y)
 endif
 
 KERNEL_HEADERS_DIR := $(PTXDIST_SYSROOT_TARGET)/kernel-headers
-- 
2.19.1


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 3/3] weston: add IVI-Shell support

[Michael Tretter]

The IVI-Shell is a shell for in-vehicle-infotainment systems. Allow to
build the ivi shell module and separately also build the ivi-shell user
interface example.

Signed-off-by: Michael Tretter 
---

Changes since v1:
- move depends on before select in configuration
- move mkdir in front of ifndef
- fix indentation
---
 rules/weston.in   | 14 ++
 rules/weston.make | 40 ++--
 2 files changed, 52 insertions(+), 2 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 2e760740c..36ab6257b 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -87,4 +87,18 @@ config WESTON_INSTALL_CONFIG
help
  Install the Weston configuration file into /etc/xdg/weston
 
+config WESTON_IVISHELL
+   bool
+   prompt "IVI-Shell"
+
+config WESTON_IVISHELL_EXAMPLE
+   bool
+   depends on WESTON_IVISHELL
+   select WESTON_INSTALL_CONFIG
+   prompt "install example IVI-Shell user interface"
+   help
+ Install the example hmi-controller, the IVI-Shell user interface
+ application, a few demo clients and the weston.ini configuration for
+ the IVI-Shell.
+
 endif
diff --git a/rules/weston.make b/rules/weston.make
index c33d0814c..a60fa62b4 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -65,9 +65,9 @@ WESTON_CONF_OPT   := \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
--disable-junit-xml \
-   --disable-ivi-shell \
+   --$(call ptx/endis, PTXCONF_WESTON_IVISHELL)-ivi-shell \
--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
-   --disable-demo-clients-install \
+   --$(call ptx/endis, 
PTXCONF_WESTON_IVISHELL_EXAMPLE)-demo-clients-install \
--disable-lcms \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
--with-cairo=$(call ptx/ifdef, PTXCONF_WESTON_GL,glesv2,image) \
@@ -83,11 +83,18 @@ $(STATEDIR)/weston.install:
@$(call world/install, WESTON)
 
@mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston
+ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
@bindir="/usr/bin" \
abs_top_builddir="/usr/bin" \
libexecdir="/usr/libexec" \
ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
"$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+else
+   @bindir="/usr/bin" \
+   westondatadir="/usr/share/weston" \
+   ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
+   "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+endif
 
@$(call touch)
 
@@ -135,6 +142,9 @@ ifdef PTXCONF_WESTON_GL
 endif
@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
+ifdef PTXCONF_WESTON_IVISHELL
+   @$(call install_lib, weston, 0, 0, 0644, weston/ivi-shell)
+endif
 ifdef PTXCONF_WESTON_SYSTEMD
@$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify)
 endif
@@ -161,6 +171,32 @@ ifdef PTXCONF_WESTON_INSTALL_CONFIG
@$(call install_alternative, weston, 0, 0, 0644, 
/etc/xdg/weston/weston.ini)
 endif
 
+ifdef PTXCONF_WESTON_IVISHELL_EXAMPLE
+   @$(call install_lib, weston, 0, 0, 0644, weston/hmi-controller)
+   @$(call install_copy, weston, 0, 0, 0755, -, 
/usr/libexec/weston-ivi-shell-user-interface)
+
+   @$(foreach image, \
+   background.png \
+   fullscreen.png \
+   home.png \
+   icon_ivi_clickdot.png \
+   icon_ivi_flower.png \
+   icon_ivi_simple-egl.png \
+   icon_ivi_simple-shm.png \
+   icon_ivi_smoke.png \
+   panel.png \
+   random.png \
+   sidebyside.png \
+   tiling.png, \
+   $(call install_copy, weston, 0, 0, 0644, -, 
/usr/share/weston/$(image))$(ptx/nl))
+
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-clickdot)
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-flower)
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-egl)
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-shm)
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-smoke)
+endif
+
@$(call install_finish, weston)
 
@$(call touch)
-- 
2.18.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 1/3] weston: remove empty clean stage

[Michael Tretter]

Signed-off-by: Michael Tretter 
---

Changes since v1:
- none
---
 rules/weston.make | 8 
 1 file changed, 8 deletions(-)

diff --git a/rules/weston.make b/rules/weston.make
index f5d748897..1817a94f3 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -146,12 +146,4 @@ endif
 
@$(call touch)
 
-# 
-# Clean
-# 
-
-#$(STATEDIR)/weston.clean:
-#  @$(call targetinfo)
-#  @$(call clean_pkg, WESTON)
-
 # vim: syntax=make
-- 
2.18.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH v2 2/3] weston: install weston.ini into /etc

[Michael Tretter]

Weston brings an example weston.ini file, which is not installed by
default. Use the shipped template to generate a weston.ini for the
target system and install it to the default system global path.

Allow to disable weston.ini to use the build-in default configuration or
to override it in the projectroot.

Signed-off-by: Michael Tretter 
---

Changes since v1:
- remove && between mkdir and ptxd_replace_magic
- fix indentation
---
 rules/weston.in   |  6 ++
 rules/weston.make | 19 +++
 2 files changed, 25 insertions(+)

diff --git a/rules/weston.in b/rules/weston.in
index 1c0ebff98..2e760740c 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -81,4 +81,10 @@ config WESTON_WCAP_TOOLS
help
  Weston CAPture Tools
 
+config WESTON_INSTALL_CONFIG
+   bool
+   prompt "install configuration file"
+   help
+ Install the Weston configuration file into /etc/xdg/weston
+
 endif
diff --git a/rules/weston.make b/rules/weston.make
index 1817a94f3..c33d0814c 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -74,6 +74,22 @@ WESTON_CONF_OPT  := \
--with-jpeg \
--without-webp
 
+# 
+# Install
+# 
+
+$(STATEDIR)/weston.install:
+   @$(call targetinfo)
+   @$(call world/install, WESTON)
+
+   @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston
+   @bindir="/usr/bin" \
+   abs_top_builddir="/usr/bin" \
+   libexecdir="/usr/libexec" \
+   ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
+   "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+
+   @$(call touch)
 
 # 
 # Target-Install
@@ -141,6 +157,9 @@ endif
wayland.svg, \
$(call install_copy, weston, 0, 0, 0644, -, 
/usr/share/weston/$(image))$(ptx/nl))
 
+ifdef PTXCONF_WESTON_INSTALL_CONFIG
+   @$(call install_alternative, weston, 0, 0, 0644, 
/etc/xdg/weston/weston.ini)
+endif
 
@$(call install_finish, weston)
 
-- 
2.18.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 2/3] weston: install weston.ini into /etc

[Michael Tretter]

Weston brings an example weston.ini file, which is not installed by
default. Use the shipped template to generate a weston.ini for the
target system and install it to the default system global path.

Allow to disable weston.ini to use the build-in default configuration or
to override it in the projectroot.

Signed-off-by: Michael Tretter 
---
 rules/weston.in   |  6 ++
 rules/weston.make | 19 +++
 2 files changed, 25 insertions(+)

diff --git a/rules/weston.in b/rules/weston.in
index 1c0ebff98..2e760740c 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -81,4 +81,10 @@ config WESTON_WCAP_TOOLS
help
  Weston CAPture Tools
 
+config WESTON_INSTALL_CONFIG
+   bool
+   prompt "install configuration file"
+   help
+ Install the Weston configuration file into /etc/xdg/weston
+
 endif
diff --git a/rules/weston.make b/rules/weston.make
index 1817a94f3..1e08b8c80 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -74,6 +74,22 @@ WESTON_CONF_OPT  := \
--with-jpeg \
--without-webp
 
+# 
+# Install
+# 
+
+$(STATEDIR)/weston.install:
+   @$(call targetinfo)
+   @$(call world/install, WESTON)
+
+   @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
+bindir="/usr/bin" \
+abs_top_builddir="/usr/bin" \
+libexecdir="/usr/libexec" \
+   ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
+   "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+
+   @$(call touch)
 
 # 
 # Target-Install
@@ -141,6 +157,9 @@ endif
wayland.svg, \
$(call install_copy, weston, 0, 0, 0644, -, 
/usr/share/weston/$(image))$(ptx/nl))
 
+ifdef PTXCONF_WESTON_INSTALL_CONFIG
+   @$(call install_alternative, weston, 0, 0, 0644, 
/etc/xdg/weston/weston.ini)
+endif
 
@$(call install_finish, weston)
 
-- 
2.18.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 3/3] weston: add IVI-Shell support

[Michael Tretter]

The IVI-Shell is a shell for in-vehicle-infotainment systems. Allow to
build the ivi shell module and separately also build the ivi-shell user
interface example.

Signed-off-by: Michael Tretter 
---
 rules/weston.in   | 14 ++
 rules/weston.make | 41 +++--
 2 files changed, 53 insertions(+), 2 deletions(-)

diff --git a/rules/weston.in b/rules/weston.in
index 2e760740c..77789a23b 100644
--- a/rules/weston.in
+++ b/rules/weston.in
@@ -87,4 +87,18 @@ config WESTON_INSTALL_CONFIG
help
  Install the Weston configuration file into /etc/xdg/weston
 
+config WESTON_IVISHELL
+   bool
+   prompt "IVI-Shell"
+
+config WESTON_IVISHELL_EXAMPLE
+   bool
+   select WESTON_INSTALL_CONFIG
+   depends on WESTON_IVISHELL
+   prompt "install example IVI-Shell user interface"
+   help
+ Install the example hmi-controller, the IVI-Shell user interface
+ application, a few demo clients and the weston.ini configuration for
+ the IVI-Shell.
+
 endif
diff --git a/rules/weston.make b/rules/weston.make
index 1e08b8c80..8f208c4d2 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -65,9 +65,9 @@ WESTON_CONF_OPT   := \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-dbus \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD_LOGIND)-systemd-login \
--disable-junit-xml \
-   --disable-ivi-shell \
+   --$(call ptx/endis, PTXCONF_WESTON_IVISHELL)-ivi-shell \
--$(call ptx/endis, PTXCONF_WESTON_WCAP_TOOLS)-wcap-tools \
-   --disable-demo-clients-install \
+   --$(call ptx/endis, 
PTXCONF_WESTON_IVISHELL_EXAMPLE)-demo-clients-install \
--disable-lcms \
--$(call ptx/endis, PTXCONF_WESTON_SYSTEMD)-systemd-notify \
--with-cairo=$(call ptx/ifdef, PTXCONF_WESTON_GL,glesv2,image) \
@@ -82,12 +82,20 @@ $(STATEDIR)/weston.install:
@$(call targetinfo)
@$(call world/install, WESTON)
 
+ifndef PTXCONF_WESTON_IVISHELL_EXAMPLE
@mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
 bindir="/usr/bin" \
 abs_top_builddir="/usr/bin" \
 libexecdir="/usr/libexec" \
ptxd_replace_magic "$(WESTON_DIR)/weston.ini.in" > \
"$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+else
+   @mkdir -p $(WESTON_PKGDIR)/etc/xdg/weston && \
+westondatadir="/usr/share/weston" \
+bindir="/usr/bin" \
+   ptxd_replace_magic "$(WESTON_DIR)/ivi-shell/weston.ini.in" > \
+   "$(WESTON_PKGDIR)/etc/xdg/weston/weston.ini"
+endif
 
@$(call touch)
 
@@ -135,6 +143,9 @@ ifdef PTXCONF_WESTON_GL
 endif
@$(call install_lib, weston, 0, 0, 0644, weston/desktop-shell)
@$(call install_lib, weston, 0, 0, 0644, weston/fullscreen-shell)
+ifdef PTXCONF_WESTON_IVISHELL
+   @$(call install_lib, weston, 0, 0, 0644, weston/ivi-shell)
+endif
 ifdef PTXCONF_WESTON_SYSTEMD
@$(call install_lib, weston, 0, 0, 0644, weston/systemd-notify)
 endif
@@ -161,6 +172,32 @@ ifdef PTXCONF_WESTON_INSTALL_CONFIG
@$(call install_alternative, weston, 0, 0, 0644, 
/etc/xdg/weston/weston.ini)
 endif
 
+ifdef PTXCONF_WESTON_IVISHELL_EXAMPLE
+   @$(call install_lib, weston, 0, 0, 0644, weston/hmi-controller)
+   @$(call install_copy, weston, 0, 0, 0755, -, 
/usr/libexec/weston-ivi-shell-user-interface)
+
+   @$(foreach image, \
+   background.png \
+   fullscreen.png \
+   home.png \
+   icon_ivi_clickdot.png \
+   icon_ivi_flower.png \
+   icon_ivi_simple-egl.png \
+   icon_ivi_simple-shm.png \
+   icon_ivi_smoke.png \
+   panel.png \
+   random.png \
+   sidebyside.png \
+   tiling.png, \
+   $(call install_copy, weston, 0, 0, 0644, -, 
/usr/share/weston/$(image))$(ptx/nl))
+
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-clickdot)
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-flower)
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-egl)
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-simple-shm)
+   @$(call install_copy, weston, 0, 0, 0755, -, /usr/bin/weston-smoke)
+endif
+
@$(call install_finish, weston)
 
@$(call touch)
-- 
2.18.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH 1/3] weston: remove empty clean stage

[Michael Tretter]

Signed-off-by: Michael Tretter 
---
 rules/weston.make | 8 
 1 file changed, 8 deletions(-)

diff --git a/rules/weston.make b/rules/weston.make
index f5d748897..1817a94f3 100644
--- a/rules/weston.make
+++ b/rules/weston.make
@@ -146,12 +146,4 @@ endif
 
@$(call touch)
 
-# 
-# Clean
-# 
-
-#$(STATEDIR)/weston.clean:
-#  @$(call targetinfo)
-#  @$(call clean_pkg, WESTON)
-
 # vim: syntax=make
-- 
2.18.0


___
ptxdist mailing list
ptxdist@pengutronix.de

[ptxdist] [PATCH] crda: extend rule to download versioned regulatory.bin

[Michael Tretter]

The crda reads the regulatory database information from regulatory.bin,
which is updated upon regulatory changes and is versioned.

Extend the crda.make to download a specified version of the database to
document the used database version. This allows to drop the copy of the
regulatory.bin from the projectroot.

Still allow to override the database in a BSP projectroot if necessary.

Signed-off-by: Michael Tretter 
---
 projectroot/usr/lib/crda/regulatory.bin | Bin 4968 -> 0 bytes
 rules/crda.make |  40 ++--
 2 files changed, 38 insertions(+), 2 deletions(-)
 delete mode 100644 projectroot/usr/lib/crda/regulatory.bin

diff --git a/projectroot/usr/lib/crda/regulatory.bin 
b/projectroot/usr/lib/crda/regulatory.bin
deleted file mode 100644
index 
4f466e8ae1670c8ce779d83404955446f044e5fa..
GIT binary patch
literal 0
HcmV?d1

literal 4968
zcmZ`+YiwLs5kC8{_wL@CV1$9R31~q!by0p;B$P;T8}Gy3b@q|X?)9?NJV!sv9ZLKoZI~bLQM^
zBDm7o`R<@!sxt|b>!$+%MLJxV#3VV_mX2SZP2L0h}3ZRCKq?>eGw<1^ZZN3^xB
zYTK|^-mhsJIInHU($@S&_G{GekhacQZ6h^p-`%cl)4Xaqx}aKLEhshBsrnxsP=nTG
z<=Zl@@~;(CVf_MQvOC=ZHUBX@r^q9J&_cLy|}7U^vHu~MyPH){Uxx2v5`?_pee
zxSe$nr_n~Zb+$=;WNkaw-Tuam%C-Q5GdsIS<$kt6I53f%_4>+#^M*NqpXwTZ>bLc4
z(|U#^X9M%wJ9#ENhr~f|ZlsWjye^MKy>RwXf<6t}gpR|BkA_noj1~
z|7qq4z#2}nfj76!dNc2R5Z8+I(79kH)QdMynVWk}}Js5Z~g+yR+Y?|IAw
znBx&+X4p5eN9(6rxC8Zd2`k?y?o~4u?xTnC%6J2S!LHySEXCvT5tbPLG_d#;eGB4e
zT<=d}50CFWe{9;w6l@O($$H}S{o@SKjfNHbx?0A9z&@7DPVlYb8afw|u%
z*v(jYe1u0CYTPWC_Up04tCQMKoQykkEyndRqRopRmw3cbs__$K3=N(ix%`+~c=6F(
zNhkC+PUELs!kw_jPgvsBDPZEFz6m47GMF?NO#XEeQ=bd|`WTM~G4+1yAT%r>
z-_<;frIv@m~7`Rz9rxa7W6PSeUZOK`~9R(V*C@plItG|3sbNsq@bR
zLl4IgHvCy&!;kODV0HQ?Eb;7@x{Rf+=SP}vAAXFUavff|j@2r#;UsK036oCDlVgO(
zH*h_MvEhfCb7B01DVLthSXo9Ik7?{DUaE`7KZ~DwOd9a`r|=`#*9I({j7`km>oICZ
zV#Z+!3#aFYi*W}5JQQPiT7W08nozeL*63db-iT#k5uU=LXBmt9c>Kh7fT8kTf)zjG
zviPg8!y5b3u!jV@u#&49!BtZ#@QhLo$ZG%%51NN?B@3ib46n{|sr{Et^suBBM
z>`958zRnRqAAuS8F}H>(#3PUE61S-f?#9)d_?HnsAwK-A3^XGzbYty?6L9UrIwWz>
z9N4H-a5Hi{zzP1)n6AhEEc`9-k86Ku0eg}YK>grx>Yq!eXTsMLx_Qo~XCK}N@J@XQ2gNi-
zv6iuSq;6008%ZP8IF3DNlu!K<_a4A@@HXEVXL|JFHY2VBYXx!0
z;TlPpy8gUaqbVw!rq%|;FQFFBF4S44!NgM!h%x&4KFq;~+TJWo>&*T|RQS6f*n%^j3y`Gz6iOcx1h;6~TD*4#+@{>}_+##vu^*#E3>VTW>
zdkFn|y`T@s(>)koGrvyktwZk>sVDyb`R$TE(Ht6UZzsxdM+}TgMJ8fhG%KeZ>!w-R
zwOEhXtk@jcNF|n+_oBp?$XZJ=m-iQAy=0watY6}W_>3HU2LlvJ`cN=(f7;B@P7DE
zhWR4N4BsbbI5SB4?Mh~dblXc=eV@wN1ovrW<=$p9Jcs!#>#%EC(UFxtvVD4vIlh<9
za8Bpfa!Ea}9QS9}ax(&($@%7ZPIe`y!mopnBNfDfv7<2
z-Gvm-pj
zk@K8#iRWt9N^(z1qNBv;6Im?D97}TFN;0ofAJw&^CBB#TlFQ$VU2)}HT%J$3>PkN@
z-xp`tmHX}TeRayN)?aq@Jz42xJ(knUI_yfX{=0Rlm-};8di6Yq`{W+<@f;&_eR2+c
zTIY#AK1ZkAFZ1o^{=?P5E`1*dd46_nNZ+dsLvqeXzv`^H^4q6A_0r`FlXFiVtF8aS
z@c!SNSU)TRe7zFujXdwb+#<<`@Iy9R#v^dqn;l!byp4_zJIKF)5m}Q
z$v4B*KV6yH{larQhmKy!d^vr=`NP2O+Y{(AHHn9Q`nQEmuk5https://www.kernel.org/pub/software/network/wireless-regdb/$(CRDA_REGDB).$(CRDA_REGDB_SUFFIX)
+CRDA_REGDB_SOURCE  := $(SRCDIR)/$(CRDA_REGDB).$(CRDA_REGDB_SUFFIX)
+$(CRDA_REGDB_SOURCE)   := CRDA_REGDB
+CRDA_REGDB_DIR := $(CRDA_DIR)
+CRDA_REGDB_STRIP_LEVEL := 0
+
+CRDA_SOURCES   += $(CRDA_SOURCE) $(CRDA_REGDB_SOURCE)
+
+# 
+# Extract
+# 
+
+$(STATEDIR)/crda.extract:
+   @$(call targetinfo)
+   @$(call clean, $(CRDA_DIR))
+   @$(call extract, CRDA)
+   @$(call extract, CRDA_REGDB)
+   @$(call patchin, CRDA)
+   @$(call touch)
+
 # 
 # Prepare
 # 
@@ -54,6 +80,18 @@ CRDA_MAKE_ENV:= \
 
 CRDA_MAKE_OPT  := all_noverify
 
+# 
+# Install
+# 
+
+$(STATEDIR)/crda.install:
+   @$(call targetinfo)
+   @$(call world/install, CRDA)
+   @install -v -d $(CRDA_PKGDIR)/usr/lib/crda
+   @install -v -m 644 -t $(CRDA_PKGDIR)/usr/lib/crda \
+   $(CRDA_REGDB_DIR)/$(CRDA_REGDB)/regulatory.bin
+   @$(call touch)
+
 # 
 # Target-Install
 # 
@@ -73,8 +111,6 @@ $(STATEDIR)/crda.targetinstall:
/usr/lib/udev/rules.d/85-regulatory.rules)
@$(call install_lib, crda, 0, 0, 0644, libreg)
 
-   # regulatory.bin was downloaded from:
-   # 
https://git.kernel.org/cgit/linux/kernel/git/sforshee/wireless-regdb.git/plain/regulatory.bin
@$(call install_alternative, crda, 0, 0, 0644, \
/usr/lib/crda/regulatory.bin)
 
-- 
2.18.0


___
ptxdist mailing list
ptxdist@pengutronix.de