[DistroKit] [PATCH 1/6] v8a: sync platformconfig

[DistroKit] [PATCH 1/6] v8a: sync platformconfig

[Roland Hieber]

The v8a platformconfig was not updated when the firmware-nxp-wifi recipe
was added.

Fixes: 4ab46d4f662eea0141d2 (2026-01-20, "v8a: add firmware nxp wifi package")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-v8a/platformconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index 989fb0e14d45..604bba9cfed1 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -374,6 +374,7 @@ PTXCONF_FIRMWARE_IMX=y
 # PTXCONF_FIRMWARE_IMX_VPU_IMX6Q is not set
 PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX8=y
 # PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX9 is not set
+# PTXCONF_FIRMWARE_NXP_WIFI is not set
 PTXCONF_FIRMWARE_ROCKCHIP=y
 # PTXCONF_FIRMWARE_ROCKCHIP_RK3566_SDRAM is not set
 PTXCONF_FIRMWARE_ROCKCHIP_RK3568_SDRAM=y
-- 
2.47.3

[DistroKit] [PATCH 2/6] v8a: sync barebox-r5.config

[Roland Hieber]

CONFIG_CONSOLE_FLUSH_LINE_BREAK is a no-prompt (default inactive) option
unless CONFIG_COMPILE_TEST is set, which is disabled on barebox-r5.

CONFIG_DEBUG_PROBES also selects CONFIG_CONSOLE_FLUSH_LINE_BREAK, but
CONFIG_DEBUG_PROBES was disabled recently, and the barebox-r5.config was
not synced accordingly.

Fixes: e5ea8bd8673b5c390eb5 (2026-01-21, "barebox: r5: disable CONFIG_DEBUG_PROBES")
Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-v8a/barebox-r5.config | 1 -
 1 file changed, 1 deletion(-)

diff --git a/configs/platform-v8a/barebox-r5.config b/configs/platform-v8a/barebox-r5.config
index b4d975a01e8b..82188c377ded 100644
--- a/configs/platform-v8a/barebox-r5.config
+++ b/configs/platform-v8a/barebox-r5.config
@@ -171,7 +171,6 @@ CONFIG_CONSOLE_FULL=y
 # CONFIG_CONSOLE_ACTIVATE_ALL_FALLBACK is not set
 CONFIG_CONSOLE_ACTIVATE_NONE=y
 # CONFIG_CONSOLE_ALLOW_COLOR is not set
-CONFIG_CONSOLE_FLUSH_LINE_BREAK=y
 # CONFIG_CONSOLE_DISABLE_INPUT is not set
 CONFIG_PBL_CONSOLE=y
 CONFIG_BUG=y
-- 
2.47.3

[DistroKit] [PATCH 3/6] ptxdist: migrate 2025.11.0 -> 2026.03.0 with default options

[Roland Hieber]

Migrate to new PTXdist version and choose default settings for all new
options.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-v7a/platformconfig        |  5 +--
 configs/platform-v7a_noneon/platformconfig |  5 +--
 configs/platform-v8a/platformconfig        |  5 +--
 configs/platform-x86_64/platformconfig     |  5 +--
 configs/ptxconfig                          | 39 +++++++++++-----------
 5 files changed, 31 insertions(+), 28 deletions(-)

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index 5156e51b5c61..66ff694ec41f 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2025.11.0
+# PTXdist 2026.03.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -22,7 +22,7 @@ PTXCONF_BUILDTIME=y
 PTXCONF_VIRTUAL=y
 PTXCONF_VIRTUAL_HOST_TOOLS=y
 PTXCONF_VIRTUAL_AUTOGEN_TOOLS=y
-PTXCONF_PLATFORMCONFIG_VERSION="2025.11.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2026.03.0"
 
 #
 # architecture                  
@@ -150,6 +150,7 @@ PTXCONF_KERNEL_LZOP=y
 # PTXCONF_KERNEL_OPENSSL is not set
 # PTXCONF_KERNEL_LIBELF is not set
 PTXCONF_KERNEL_GCC_PLUGINS=y
+# PTXCONF_KERNEL_RUST is not set
 PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
 
 #
diff --git a/configs/platform-v7a_noneon/platformconfig b/configs/platform-v7a_noneon/platformconfig
index f59271f3ced1..3168417c06b2 100644
--- a/configs/platform-v7a_noneon/platformconfig
+++ b/configs/platform-v7a_noneon/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2025.11.0
+# PTXdist 2026.03.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -20,7 +20,7 @@ PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
 PTXCONF_VIRTUAL=y
-PTXCONF_PLATFORMCONFIG_VERSION="2025.11.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2026.03.0"
 
 #
 # architecture                  
@@ -147,6 +147,7 @@ PTXCONF_KERNEL_LZOP=y
 # PTXCONF_KERNEL_OPENSSL is not set
 # PTXCONF_KERNEL_LIBELF is not set
 PTXCONF_KERNEL_GCC_PLUGINS=y
+# PTXCONF_KERNEL_RUST is not set
 PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
 
 #
diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index 604bba9cfed1..be5ee7732893 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2025.11.0
+# PTXdist 2026.03.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -22,7 +22,7 @@ PTXCONF_BUILDTIME=y
 PTXCONF_VIRTUAL=y
 PTXCONF_VIRTUAL_HOST_TOOLS=y
 PTXCONF_VIRTUAL_AUTOGEN_TOOLS=y
-PTXCONF_PLATFORMCONFIG_VERSION="2025.11.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2026.03.0"
 
 #
 # architecture                  
@@ -147,6 +147,7 @@ PTXCONF_KERNEL_DTS="armada-3720-community.dts freescale/imx8mm-evk.dts freescale
 PTXCONF_KERNEL_OPENSSL=y
 # PTXCONF_KERNEL_LIBELF is not set
 # PTXCONF_KERNEL_GCC_PLUGINS is not set
+# PTXCONF_KERNEL_RUST is not set
 PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
 
 #
diff --git a/configs/platform-x86_64/platformconfig b/configs/platform-x86_64/platformconfig
index 7223975c128d..b53c6fa52656 100644
--- a/configs/platform-x86_64/platformconfig
+++ b/configs/platform-x86_64/platformconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2025.11.0
+# PTXdist 2026.03.0
 #
 PTXCONF__platformconfig_MAGIC__=y
 
@@ -20,7 +20,7 @@ PTXCONF_PLATFORM_VERSION="-${PTXDIST_BSP_AUTOVERSION}"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
 PTXCONF_VIRTUAL=y
-PTXCONF_PLATFORMCONFIG_VERSION="2025.11.0"
+PTXCONF_PLATFORMCONFIG_VERSION="2026.03.0"
 
 #
 # architecture                  
@@ -147,6 +147,7 @@ PTXCONF_KERNEL_LZOP=y
 # PTXCONF_KERNEL_OPENSSL is not set
 PTXCONF_KERNEL_LIBELF=y
 # PTXCONF_KERNEL_GCC_PLUGINS is not set
+# PTXCONF_KERNEL_RUST is not set
 PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
 
 #
diff --git a/configs/ptxconfig b/configs/ptxconfig
index c679131a4d3b..f44521558431 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# PTXdist 2025.11.0
+# PTXdist 2026.03.0
 #
 
 #
@@ -80,7 +80,7 @@ PTXCONF_VIRTUAL=y
 PTXCONF_VIRTUAL_HOST_TOOLS=y
 PTXCONF_VIRTUAL_CROSS_TOOLS=y
 PTXCONF_VIRTUAL_AUTOGEN_TOOLS=y
-PTXCONF_CONFIGFILE_VERSION="2025.11.0"
+PTXCONF_CONFIGFILE_VERSION="2026.03.0"
 PTXCONF__ptxconfig_MAGIC__=y
 
 #
@@ -249,6 +249,7 @@ PTXCONF_ROOTFS_VAR_CACHE=y
 PTXCONF_ROOTFS_VAR_SPOOL=y
 # PTXCONF_ROOTFS_VAR_SPOOL_CRON is not set
 PTXCONF_ROOTFS_VAR_TMP=y
+# PTXCONF_ROOTFS_VAR_WWW is not set
 # end of /var                        
 # end of directories in rootfs         
 
@@ -1383,7 +1384,7 @@ PTXCONF_I2C_TOOLS=y
 # PTXCONF_JQ is not set
 # PTXCONF_KBD is not set
 # PTXCONF_KEXEC_TOOLS is not set
-# PTXCONF_KILLPROC is not set
+# PTXCONF_KMSCON is not set
 PTXCONF_LESS=y
 PTXCONF_LESS_BIN=y
 # PTXCONF_LESS_KEY is not set
@@ -1690,6 +1691,7 @@ PTXCONF_UTIL_LINUX_MOUNT=y
 # PTXCONF_UTIL_LINUX_READPROFILE is not set
 # PTXCONF_UTIL_LINUX_RFKILL is not set
 # PTXCONF_UTIL_LINUX_SWAPON is not set
+# PTXCONF_UTIL_LINUX_SETPRIV is not set
 # PTXCONF_UTIL_LINUX_SETSID is not set
 # PTXCONF_UTIL_LINUX_SWITCH_ROOT is not set
 PTXCONF_UTIL_LINUX_UMOUNT=y
@@ -1743,6 +1745,8 @@ PTXCONF_ZSTD=y
 # PTXCONF_PYTHON3_AIOMQTT is not set
 # PTXCONF_PYTHON3_AIOSIGNAL is not set
 # PTXCONF_PYTHON3_AIOSQLITE is not set
+# PTXCONF_PYTHON3_ASGIREF is not set
+# PTXCONF_PYTHON3_ASTTOKENS is not set
 # PTXCONF_PYTHON3_ASYNC_TIMEOUT is not set
 # PTXCONF_PYTHON3_ASYNCUA is not set
 # PTXCONF_PYTHON3_ATTRS is not set
@@ -1756,6 +1760,7 @@ PTXCONF_ZSTD=y
 # PTXCONF_PYTHON3_DATEUTIL is not set
 # PTXCONF_PYTHON3_DECORATOR is not set
 # PTXCONF_PYTHON3_DULWICH is not set
+# PTXCONF_PYTHON3_EXECUTING is not set
 # PTXCONF_PYTHON3_FALCON is not set
 # PTXCONF_PYTHON3_FLASK is not set
 # PTXCONF_PYTHON3_FROZENLIST is not set
@@ -1794,21 +1799,26 @@ PTXCONF_ZSTD=y
 # PTXCONF_PYTHON3_PLUGGY is not set
 # PTXCONF_PYTHON3_PLY is not set
 # PTXCONF_PYTHON3_POSIX_IPC is not set
+# PTXCONF_PYTHON3_PROMPT_TOOLKIT is not set
 # PTXCONF_PYTHON3_PROTOBUF is not set
 # PTXCONF_PYTHON3_PSUTIL is not set
 # PTXCONF_PYTHON3_PTYPROCESS is not set
+# PTXCONF_PYTHON3_PURE_EVAL is not set
 # PTXCONF_PYTHON3_PY is not set
 # PTXCONF_PYTHON3_PYALSAAUDIO is not set
 # PTXCONF_PYTHON3_PYASN1 is not set
 # PTXCONF_PYTHON3_PYBIND11 is not set
 # PTXCONF_PYTHON3_PYCPARSER is not set
 # PTXCONF_PYTHON3_PYCRYPTODOMEX is not set
+# PTXCONF_PYTHON3_PYDOT is not set
+# PTXCONF_PYTHON3_PYGMENTS is not set
 # PTXCONF_PYTHON3_PYMODBUS is not set
 # PTXCONF_PYTHON3_PYOPENSSL is not set
 # PTXCONF_PYTHON3_PYPARSING is not set
 # PTXCONF_PYTHON3_PYPERF is not set
 # PTXCONF_PYTHON3_PYPERFORMANCE is not set
 # PTXCONF_PYTHON3_PYRO is not set
+# PTXCONF_PYTHON3_PYSERIAL_ASYNCIO is not set
 # PTXCONF_PYTHON3_PYSMI is not set
 # PTXCONF_PYTHON3_PYSNMP is not set
 # PTXCONF_PYTHON3_PYTEST is not set
@@ -1824,8 +1834,11 @@ PTXCONF_ZSTD=y
 # PTXCONF_PYTHON3_SNMPCLITOOLS is not set
 # PTXCONF_PYTHON3_SORTEDCONTAINERS is not set
 # PTXCONF_PYTHON3_SQLPARSE is not set
+# PTXCONF_PYTHON3_STACK_DATA is not set
+# PTXCONF_PYTHON3_STATEMACHINE is not set
 # PTXCONF_PYTHON3_SYSTEMD is not set
 # PTXCONF_PYTHON3_TABULATE is not set
+# PTXCONF_PYTHON3_TELNETLIB3 is not set
 # PTXCONF_PYTHON3_TEXT_UNIDECODE is not set
 # PTXCONF_PYTHON3_THREADPOOLCTL is not set
 # PTXCONF_PYTHON3_TORNADO is not set
@@ -1871,15 +1884,12 @@ PTXCONF_CA_CERTIFICATES_SELECT_BUNDLE=y
 PTXCONF_CA_CERTIFICATES_BUNDLE=y
 # PTXCONF_CANFESTIVAL is not set
 # PTXCONF_CHRONY is not set
-# PTXCONF_COMGT is not set
 # PTXCONF_CONNMAN is not set
 # PTXCONF_CPPZMQ is not set
 # PTXCONF_CRDA is not set
 # PTXCONF_DHCP_HELPER is not set
-# PTXCONF_DHCP is not set
 # PTXCONF_DNSMASQ is not set
 # PTXCONF_DROPBEAR is not set
-# PTXCONF_DUMP1090FA is not set
 # PTXCONF_ETHERWAKE is not set
 # PTXCONF_ETHTOOL is not set
 # PTXCONF_FCGI is not set
@@ -1895,8 +1905,6 @@ PTXCONF_GNUTLS=y
 # PTXCONF_HOSTAPD is not set
 # PTXCONF_IFPLUGD is not set
 # PTXCONF_IFTOP is not set
-# PTXCONF_INADYN is not set
-# PTXCONF_INETUTILS is not set
 PTXCONF_IPROUTE2=y
 # PTXCONF_IPROUTE2_ARPD is not set
 # PTXCONF_IPROUTE2_BRIDGE is not set
@@ -1984,7 +1992,6 @@ PTXCONF_LIBCURL_SSL_CABUNDLE_PATH="/etc/ssl/certs/ca-certificates.crt"
 #
 # busybox' netcat is selected!
 #
-# PTXCONF_NETKIT_FTP is not set
 # PTXCONF_NETSNIFF_NG is not set
 PTXCONF_NETTLE=y
 # PTXCONF_NETTLE_GMP is not set
@@ -2035,12 +2042,12 @@ PTXCONF_OPENSSL=y
 # PTXCONF_OPENSSL_KTLS is not set
 # PTXCONF_OPENSSL_LEGACY is not set
 # PTXCONF_OPENVPN is not set
+# PTXCONF_PHYTOOL is not set
 # PTXCONF_PPP is not set
 # PTXCONF_PUREFTPD is not set
 # PTXCONF_PYTHON3_DJANGO is not set
 # PTXCONF_RADVD is not set
 # PTXCONF_RPCBIND is not set
-# PTXCONF_RSYNC is not set
 # PTXCONF_RSYNC3 is not set
 # PTXCONF_RSYSLOG is not set
 # PTXCONF_SMCROUTE is not set
@@ -2138,7 +2145,6 @@ PTXCONF_E2FSPROGS_INSTALL_RESIZE2FS=y
 # PTXCONF_LOGROTATE is not set
 # PTXCONF_LVM2 is not set
 # PTXCONF_MMC_UTILS is not set
-# PTXCONF_NCDU is not set
 # PTXCONF_NTFS_3G is not set
 # PTXCONF_OPKG is not set
 # PTXCONF_QUOTA_TOOLS is not set
@@ -2167,7 +2173,6 @@ PTXCONF_SQUASHFS_TOOLS_UNSQUASHFS=y
 #
 # PTXCONF_BERLIOS_CAN_UTILS is not set
 # PTXCONF_BLUEZ is not set
-# PTXCONF_CKERMIT is not set
 # PTXCONF_EFAX is not set
 # PTXCONF_HEIRLOOM_MAILX is not set
 # PTXCONF_IMX_UUC is not set
@@ -2177,7 +2182,6 @@ PTXCONF_SQUASHFS_TOOLS_UNSQUASHFS=y
 # PTXCONF_OPEN62541 is not set
 # PTXCONF_OPENSC is not set
 # PTXCONF_PCSC_LITE is not set
-# PTXCONF_POP3SPAM is not set
 # PTXCONF_SJINN is not set
 # end of Communication Utilities       
 
@@ -2215,7 +2219,6 @@ PTXCONF_RAUC_BAREBOX=y
 # Editors                       
 #
 # PTXCONF_HEXEDIT is not set
-# PTXCONF_JOE is not set
 # PTXCONF_NANO is not set
 # PTXCONF_POKE is not set
 # PTXCONF_VIM is not set
@@ -2331,10 +2334,10 @@ PTXCONF_LIBSECCOMP=y
 # PTXCONF_LIBSOLV is not set
 # PTXCONF_LIBSYSFS is not set
 # PTXCONF_LIBTAHU is not set
-# PTXCONF_LIBTAR is not set
 PTXCONF_LIBTASN1=y
 # PTXCONF_LIBTRACEEVENT is not set
 # PTXCONF_LIBTRACEFS is not set
+# PTXCONF_LIBTSM is not set
 # PTXCONF_LIBUBOOTENV is not set
 # PTXCONF_LIBUCDAEMON is not set
 # PTXCONF_LIBUNWIND is not set
@@ -2478,7 +2481,6 @@ PTXCONF_DBUS_SYSTEMD_UNIT=y
 # Test Suites                   
 #
 # PTXCONF_CATCH2 is not set
-# PTXCONF_CBENCHSUITE is not set
 # PTXCONF_CMOCKA is not set
 # PTXCONF_CPPUTEST is not set
 # PTXCONF_CPUBURN_ARM is not set
@@ -2488,11 +2490,9 @@ PTXCONF_DBUS_SYSTEMD_UNIT=y
 # PTXCONF_GLMARK2 is not set
 # PTXCONF_GOOGLETEST is not set
 # PTXCONF_HOST_PELTS is not set
-# PTXCONF_IOZONE is not set
 # PTXCONF_IPERF is not set
 # PTXCONF_IPERF3 is not set
 # PTXCONF_LINUX_SERIAL_TEST is not set
-# PTXCONF_LMBENCH is not set
 # PTXCONF_MBW is not set
 # PTXCONF_PELTS_TESTS is not set
 # PTXCONF_PIGLIT is not set
@@ -2604,6 +2604,7 @@ PTXCONF_DBUS_SYSTEMD_UNIT=y
 # PTXCONF_WAFFLE is not set
 # PTXCONF_WPEBACKEND_FDO is not set
 # PTXCONF_WPEWEBKIT is not set
+# PTXCONF_X264 is not set
 # PTXCONF_XKEYBOARD_CONFIG is not set
 # PTXCONF_ZBAR is not set
 # PTXCONF_ZINT is not set
@@ -2632,7 +2633,6 @@ PTXCONF_DBUS_SYSTEMD_UNIT=y
 # PTXCONF_GST_PLUGINS_UGLY1 is not set
 # PTXCONF_GST_PYTHON1 is not set
 # PTXCONF_GST_RTSP_SERVER1 is not set
-# PTXCONF_GSTREAMER_VAAPI1 is not set
 # PTXCONF_GSTREAMER1 is not set
 # end of gstreamer 1.0                 
 
@@ -2694,7 +2694,6 @@ PTXCONF_JSON_GLIB=y
 # PTXCONF_LIBMAD is not set
 # PTXCONF_LIBTREMOR is not set
 # PTXCONF_MADPLAY is not set
-# PTXCONF_MPG123 is not set
 # PTXCONF_PULSEAUDIO is not set
 # PTXCONF_RAWREC is not set
 # PTXCONF_SETMIXER is not set
-- 
2.47.3

[DistroKit] [PATCH 4/6] scripts: remove forked ptxd_make_world_inject.sh

[Roland Hieber]

Our changes got merged in PTXdist commit 6b2f811a0403948a5475
(2025-08-01, "ptxd_make_world_inject: create target path before
copying"), so we can remove our forked version of the script.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 scripts/lib/ptxd_make_world_inject.sh | 61 ---------------------------
 1 file changed, 61 deletions(-)
 delete mode 100644 scripts/lib/ptxd_make_world_inject.sh

diff --git a/scripts/lib/ptxd_make_world_inject.sh b/scripts/lib/ptxd_make_world_inject.sh
deleted file mode 100644
index a31184dced70..000000000000
--- a/scripts/lib/ptxd_make_world_inject.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2021 by Michael Riesch <michael.riesch@wolfvision.net>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-ptxd_make_inject() {
-    local source target
-
-    source="$(echo ${inject_file} | cut -d ":" -f 1)"
-    target="${inject_dest}/$(echo ${inject_file} | cut -d ":" -f 2)"
-
-    if [[ "${source}" =~ ^/.* ]]; then
-	ptxd_bailout "'${source}' must not be an absolute path!" \
-	    "Use <PKG>_INJECT_PATH to specify the search path."
-    fi
-
-    if ! ptxd_in_path pkg_inject_path "${source}"; then
-	ptxd_bailout "Blob '${source}' not found in '${pkg_inject_path}'."
-    fi
-    source="${ptxd_reply}"
-
-    echo -e "\nInject file $(ptxd_print_path ${source}) into" \
-	 "$(ptxd_print_path ${target})..."
-    mkdir -p "$(dirname "${target}")"
-    cp ${source} ${target}
-}
-export -f ptxd_make_inject
-
-
-ptxd_make_world_inject() {
-    ptxd_make_world_init || return
-
-    if [ -z "${pkg_inject_oot}" ]; then
-	pkg_inject_oot=NO
-    fi
-
-    case "${pkg_inject_oot}" in
-	"YES") inject_dest="${pkg_build_dir}" ;;
-	"NO")  inject_dest="${pkg_dir}" ;;
-	*)     ptxd_bailout "<PKG>_INJECT_OOT: please set to YES or NO" ;;
-    esac
-
-    if [ "${pkg_build_oot:-NO}" = 'NO' ] && [ "${pkg_inject_oot}" != 'NO' ]; then
-	ptxd_warning "<PKG>_BUILD_OOT and <PKG>_INJECT_OOT contradict each other." \
-	    "Using $(ptxd_print_path ${inject_dest}) as inject destination anyways."
-    fi
-
-    if [ ! -d "${inject_dest}" ]; then
-	ptxd_bailout "<PKG> inject destination dir missing." \
-	    "Correct placement of world/inject depends on <PKG>_BUILD_OOT and <PKG>_INJECT_OOT." \
-	    "Check order of calls in prepare stage!"
-    fi
-
-    for inject_file in ${pkg_inject_files}; do
-	ptxd_make_inject || return
-    done
-}
-export -f ptxd_make_world_inject
-- 
2.47.3

[DistroKit] [PATCH 5/6] kernel: remove forked recipe

[Roland Hieber]

Our changes from BSP commit 973abf2fd9b1 were backported from PTXdist
commit 844408110d04 ("kernel: backport modules.builtin.modinfo
permission fix"), which was merged in PTXdist 2026.01.0.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 rules/kernel.make | 380 ----------------------------------------------
 1 file changed, 380 deletions(-)
 delete mode 100644 rules/kernel.make

diff --git a/rules/kernel.make b/rules/kernel.make
deleted file mode 100644
index e974304043f6..000000000000
--- a/rules/kernel.make
+++ /dev/null
@@ -1,380 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2002-2009 by Pengutronix e.K., Hildesheim, Germany
-#               2010 by Marc Kleine-Budde <mkl@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_KERNEL) += kernel
-
-#
-# Paths and names
-#
-KERNEL			:= linux-$(KERNEL_VERSION)
-KERNEL_MD5		:= $(call ptx/config-md5, PTXCONF_KERNEL)
-ifneq ($(KERNEL_NEEDS_GIT_URL),y)
-KERNEL_SUFFIX		:= tar.xz
-KERNEL_URL		:= $(call kernel-url, KERNEL)
-else
-KERNEL_SUFFIX		:= tar.gz
-KERNEL_URL		:= https://git.kernel.org/torvalds/t/$(KERNEL).$(KERNEL_SUFFIX)
-endif
-KERNEL_DIR		:= $(BUILDDIR)/$(KERNEL)
-KERNEL_BUILD_DIR	:= $(KERNEL_DIR)-build
-KERNEL_CONFIG		:= $(call ptx/in-platformconfigdir, $(call remove_quotes, $(PTXCONF_KERNEL_CONFIG)))
-KERNEL_DTS_PATH		:= $(call remove_quotes,$(PTXCONF_KERNEL_DTS_PATH))
-KERNEL_DTS		:= $(call remove_quotes,$(PTXCONF_KERNEL_DTS))
-KERNEL_DTSO_PATH	:= $(call remove_quotes,$(PTXCONF_KERNEL_DTSO_PATH))
-KERNEL_DTSO		:= $(call remove_quotes,$(PTXCONF_KERNEL_DTSO))
-KERNEL_DTB_FILES	:= $(addsuffix .dtb,$(basename $(notdir $(KERNEL_DTS))))
-KERNEL_DTBO_FILES	:= $(addsuffix .dtbo,$(basename $(notdir $(KERNEL_DTSO))))
-KERNEL_DTBO_DIR		:= /boot/overlays
-KERNEL_LICENSE		:= GPL-2.0-only
-KERNEL_SOURCE		:= $(SRCDIR)/$(KERNEL).$(KERNEL_SUFFIX)
-KERNEL_DEVPKG		:= NO
-KERNEL_BUILD_OOT	:= KEEP
-KERNEL_CVE_PRODUCT	:= linux:linux_kernel
-
-# track changes to devices-trees in the BSP
-$(call world/dts-cfghash-file, KERNEL)
-
-# in case we migrate some old syntax
-ifneq ($(filter /%,$(KERNEL_DTS)),)
-$(call ptx/error, the device trees in PTXCONF_KERNEL_DTS must be specified without an)
-$(call ptx/error, absolute path. Use PTXCONF_KERNEL_DTS_PATH to provide a list of direcories)
-$(call ptx/error, that will be searched.)
-endif
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-# use CONFIG_CC_STACKPROTECTOR if available. The rest makes no sense for the kernel
-KERNEL_WRAPPER_BLACKLIST := \
-	$(PTXDIST_LOWLEVEL_WRAPPER_BLACKLIST)
-
-# Note: for some reason, the error is not visible without the dummy '$(shell :)'
-# when running 'ptxdist -j -q go'.
-define kernel/deprecated
-$(if $(strip \
-$(filter $(STATEDIR)/%, \
-$(filter-out $(STATEDIR)/kernel.%,$@)) \
-),$(shell :)$(error $(notdir $@): \
-	use KERNEL_MODULE_OPT instead of $(1) for kernel module packages))
-endef
-
-# check for old kernel modules rules
-KERNEL_MAKEVARS = $(call kernel/deprecated, KERNEL_MAKEVARS)
-
-# like kernel-opts but with different CROSS_COMPILE=
-KERNEL_BASE_OPT		= \
-	$(call kernel-opts, KERNEL,$(KERNEL_CROSS_COMPILE)) \
-	$(call remove_quotes,$(PTXCONF_KERNEL_EXTRA_MAKEVARS))
-
-# Intermediate option. This will be used by kernel module packages.
-KERNEL_MODULE_OPT	= \
-	-C $(KERNEL_DIR) \
-	O=$(KERNEL_BUILD_DIR) \
-	$(KERNEL_BASE_OPT)
-
-KERNEL_SHARED_OPT	= \
-	$(KERNEL_MODULE_OPT) \
-	PAHOLE=false
-
-ifndef PTXCONF_KERNEL_GCC_PLUGINS
-# no gcc plugins; avoid config changes depending on the host compiler
-KERNEL_SHARED_OPT	+= \
-	HOSTCXX="$(HOSTCXX) -DGENERATOR_FILE" \
-	HOSTCC="$(HOSTCC) -DGENERATOR_FILE"
-KERNEL_CONF_ENV		:= \
-	PTXDIST_NO_GCC_PLUGINS=1
-KERNEL_MAKE_ENV		:= \
-	PTXDIST_NO_GCC_PLUGINS=1
-endif
-
-ifneq ($(PTXCONF_KERNEL_CODE_SIGNING)$(PTXCONF_KERNEL_MODULES_SIGN),)
-KERNEL_MAKE_ENV		+= \
-	$(CODE_SIGNING_ENV)
-endif
-
-KERNEL_CONF_TOOL	:= kconfig
-KERNEL_CONF_OPT		= \
-	$(KERNEL_SHARED_OPT)
-
-ifdef PTXCONF_KERNEL_CONFIG_BASE_VERSION
-# force using KERNEL_VERSION in the kernelconfig
-KERNEL_CONF_OPT		+= \
-	KERNELVERSION=$(KERNEL_VERSION)
-endif
-
-#
-# support the different kernel image formats
-#
-KERNEL_IMAGE		:= $(call remove_quotes, $(PTXCONF_KERNEL_IMAGE))
-
-# these are sane defaults
-KERNEL_IMAGE_PATH_y	:= $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/$(KERNEL_IMAGE)
-
-# vmlinux and vmlinuz are special
-KERNEL_IMAGE_PATH_$(PTXCONF_KERNEL_IMAGE_VMLINUX) := $(KERNEL_BUILD_DIR)/vmlinux
-KERNEL_IMAGE_PATH_$(PTXCONF_KERNEL_IMAGE_VMLINUZ) := $(KERNEL_BUILD_DIR)/vmlinuz
-# avr32 is also special
-KERNEL_IMAGE_PATH_$(PTXCONF_ARCH_AVR32) := $(KERNEL_BUILD_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/images/$(KERNEL_IMAGE)
-
-
-ifdef PTXCONF_KERNEL
-$(KERNEL_CONFIG):
-	@echo
-	@echo "*************************************************************************"
-	@echo "**** Please generate a kernelconfig with 'ptxdist menuconfig kernel' ****"
-	@echo "*************************************************************************"
-	@echo
-	@echo
-	@exit 1
-endif
-
-
-#
-# when compiling the rootfs into the kernel, we just include an empty
-# file for now. the rootfs isn't build yet.
-#
-KERNEL_INITRAMFS_SOURCE_$(PTXCONF_IMAGE_KERNEL_INITRAMFS) += $(STATEDIR)/empty.cpio
-
-$(STATEDIR)/kernel.prepare:
-	@$(call targetinfo)
-#
-# Make sure there is a non empty INITRAMFS_SOURCE in $(KERNEL_CONFIG), but
-# not the real expanded path because it contains local workdir path which
-# is not relevant to other developers.
-#
-ifdef KERNEL_INITRAMFS_SOURCE_y
-	@sed -i -e 's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"# Automatically set by PTXDist\",g' \
-		"$(KERNEL_CONFIG)"
-endif
-ifdef PTXCONF_KERNEL_IMAGE_SIMPLE
-	cp $(PTXCONF_KERNEL_IMAGE_SIMPLE_DTS) \
-		$(KERNEL_DIR)/arch/$(GENERIC_KERNEL_ARCH)/boot/dts/$(PTXCONF_KERNEL_IMAGE_SIMPLE_TARGET).dts
-endif
-
-	@$(call world/prepare, KERNEL)
-
-#
-# Use an existing dummy INITRAMFS_SOURCE for the first 'make' call. The
-# kernel image will be rebuilt in the image-kernel package with the real
-# initramfs.
-#
-ifdef KERNEL_INITRAMFS_SOURCE_y
-	@touch "$(KERNEL_INITRAMFS_SOURCE_y)"
-	@sed -i -e 's,^CONFIG_INITRAMFS_SOURCE.*$$,CONFIG_INITRAMFS_SOURCE=\"$(KERNEL_INITRAMFS_SOURCE_y)\",g' \
-		"$(KERNEL_BUILD_DIR)/.config"
-endif
-ifdef PTXCONF_KERNEL_CODE_SIGNING
-	if [ -n "`cs_get_ca kernel-trusted`" ]; then \
-		sed -i -e "s'^\(CONFIG_SYSTEM_TRUSTED_KEYS\)=.*'\1=\"`cs_get_ca kernel-trusted`\"'" \
-			"$(KERNEL_BUILD_DIR)/.config"; \
-	fi
-endif
-ifdef PTXCONF_KERNEL_MODULES_SIGN
-	sed -i -e "s'^\(CONFIG_MODULE_SIG_KEY\)=.*'\1=\"`cs_get_uri kernel-modules`\"'" \
-		"$(KERNEL_BUILD_DIR)/.config"
-endif
-	@$(call touch)
-
-
-# ----------------------------------------------------------------------------
-# tags
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/kernel.tags:
-	@$(call targetinfo)
-	@$(MAKE) -C $(KERNEL_DIR) $(KERNEL_MAKE_OPT) tags TAGS cscope
-
-# ----------------------------------------------------------------------------
-# Compile
-# ----------------------------------------------------------------------------
-
-KERNEL_MAKE_OPT		= \
-	$(call kernel/deprecated, KERNEL_MAKE_OPT) \
-	$(KERNEL_SHARED_OPT) \
-	$(KERNEL_IMAGE) \
-	$(call ptx/ifdef, PTXCONF_KERNEL_MODULES,modules)
-
-KERNEL_TOOL_PERF_OPTS	:= \
-	-C $(KERNEL_DIR)/tools/perf \
-	O=$(KERNEL_BUILD_DIR)/tools/perf \
-	$(KERNEL_BASE_OPT) \
-	prefix=/usr \
-	WERROR=0 \
-	NO_LIBPERL=1 \
-	NO_LIBPYTHON=1 \
-	NO_DWARF= \
-	NO_SLANG= \
-	NO_GTK2=1 \
-	NO_DEMANGLE= \
-	NO_LIBELF= \
-	NO_LIBUNWIND=1 \
-	NO_BACKTRACE= \
-	NO_LIBNUMA=1 \
-	NO_LIBAUDIT=1 \
-	NO_LIBBIONIC=1 \
-	NO_LIBCRYPTO=1 \
-	NO_LIBDW_DWARF_UNWIND= \
-	NO_PERF_READ_VDSO32=1 \
-	NO_PERF_READ_VDSOX32=1 \
-	NO_ZLIB= \
-	NO_LIBBABELTRACE=1 \
-	NO_LZMA=1 \
-	NO_LIBZSTD= \
-	NO_AUXTRACE= \
-	NO_LIBBPF=1 \
-	NO_SDT=1 \
-	NO_LIBCAP=1
-
-# manual make to handle CPPFLAGS and broken parallel building for some
-# kernel versions
-KERNEL_TOOL_IIO_OPTS	:= \
-	PTXDIST_ICECC=$(PTXDIST_ICERUN) \
-	CPPFLAGS="-D__EXPORTED_HEADERS__ -I$(KERNEL_DIR)/include/uapi -I$(KERNEL_DIR)/include" \
-	-C $(KERNEL_DIR)/tools/iio \
-	O=$(KERNEL_BUILD_DIR)/tools/iio \
-	$(KERNEL_BASE_OPT) \
-	$(PARALLELMFLAGS_BROKEN)
-
-$(STATEDIR)/kernel.compile:
-	@$(call targetinfo)
-	@rm -f \
-		$(KERNEL_BUILD_DIR)/usr/initramfs_data.cpio.* \
-		$(KERNEL_BUILD_DIR)/usr/.initramfs_data.cpio.*
-	@$(call world/compile, KERNEL)
-ifdef PTXCONF_KERNEL_TOOL_PERF
-	@mkdir -p $(KERNEL_BUILD_DIR)/tools/perf
-	@$(call compile, KERNEL, $(KERNEL_TOOL_PERF_OPTS))
-endif
-ifdef PTXCONF_KERNEL_TOOL_IIO
-	@mkdir -p $(KERNEL_BUILD_DIR)/tools/iio
-	@$(call world/execute, KERNEL, \
-		$(MAKE) $(KERNEL_TOOL_IIO_OPTS))
-endif
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Install
-# ----------------------------------------------------------------------------
-
-KERNEL_INSTALL_OPT = \
-	$(KERNEL_BASE_OPT) \
-	modules_install
-
-$(STATEDIR)/kernel.install:
-	@$(call targetinfo)
-ifdef PTXCONF_KERNEL_MODULES_INSTALL
-	@$(call world/install, KERNEL)
-	@chmod -x $(KERNEL_PKGDIR)/lib/modules/*/modules.builtin.modinfo
-endif
-	@$(call world/dtb, KERNEL)
-	@$(call world/dtbo, KERNEL)
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-ifneq ($(KERNEL_DTB_FILES),)
-$(addprefix $(IMAGEDIR)/,$(KERNEL_DTB_FILES)): $(STATEDIR)/kernel.targetinstall
-endif
-
-$(STATEDIR)/kernel.targetinstall:
-	@$(call targetinfo)
-
-	@$(foreach dtb, $(KERNEL_DTB_FILES), \
-		$(call ptx/image-install, KERNEL, \
-			$(KERNEL_PKGDIR)/boot/$(dtb), $(dtb))$(ptx/nl))
-
-ifdef PTXCONF_KERNEL_XPKG
-	@$(call install_init,  kernel)
-	@$(call install_fixup, kernel, PRIORITY,optional)
-	@$(call install_fixup, kernel, SECTION,base)
-	@$(call install_fixup, kernel, AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
-	@$(call install_fixup, kernel, DESCRIPTION,missing)
-
-	@$(call install_copy, kernel, 0, 0, 0755, /boot);
-
-ifdef PTXCONF_KERNEL_INSTALL
-	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_IMAGE_PATH_y), /boot/$(KERNEL_IMAGE), n)
-
-	@$(foreach dtb, $(KERNEL_DTB_FILES), \
-		$(call install_copy, kernel, 0, 0, 0644, -, \
-			/boot/$(dtb), n)$(ptx/nl))
-
-	@$(foreach dtbo, $(KERNEL_DTBO_FILES), \
-		$(call install_copy, kernel, 0, 0, 0644, -, \
-			$(KERNEL_DTBO_DIR)/$(dtbo), n)$(ptx/nl))
-endif
-
-# install the ELF kernel image for debugging purpose
-ifdef PTXCONF_KERNEL_VMLINUX
-	@$(call install_copy, kernel, 0, 0, 0644, $(KERNEL_BUILD_DIR)/vmlinux, /boot/vmlinux, n)
-endif
-
-ifdef PTXCONF_KERNEL_TOOL_PERF
-	@$(call install_copy, kernel, 0, 0, 0755, $(KERNEL_BUILD_DIR)/tools/perf/perf, \
-		/usr/bin/perf)
-endif
-
-ifdef PTXCONF_KERNEL_TOOL_IIO
-	@$(call install_copy, kernel, 0, 0, 0755, $(wildcard $(KERNEL_BUILD_DIR)/tools/iio/*generic_buffer), \
-		/usr/bin/iio_generic_buffer)
-	@$(call install_copy, kernel, 0, 0, 0755, $(KERNEL_BUILD_DIR)/tools/iio/lsiio, \
-		/usr/bin/lsiio)
-	@$(call install_copy, kernel, 0, 0, 0755, $(KERNEL_BUILD_DIR)/tools/iio/iio_event_monitor, \
-		/usr/bin/iio_event_monitor)
-endif
-
-	@$(call install_finish, kernel)
-endif
-
-	@$(call touch)
-
-
-# ----------------------------------------------------------------------------
-# Target-Install-post
-# ----------------------------------------------------------------------------
-
-ifdef PTXCONF_IMAGE_KERNEL_INSTALL_EARLY
-$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage
-ifdef PTXCONF_IMAGE_KERNEL_LZOP
-$(STATEDIR)/kernel.targetinstall.post: $(IMAGEDIR)/linuximage.lzo
-endif
-endif
-
-$(STATEDIR)/kernel.targetinstall.post:
-	@$(call targetinfo)
-
-ifdef PTXCONF_KERNEL_MODULES_INSTALL
-	@$(call install_init,  kernel-modules)
-	@$(call install_fixup, kernel-modules, PRIORITY,optional)
-	@$(call install_fixup, kernel-modules, SECTION,base)
-	@$(call install_fixup, kernel-modules, AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
-	@$(call install_fixup, kernel-modules, DESCRIPTION,missing)
-
-	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules, *.ko,, n)
-	@$(call install_glob, kernel-modules, 0, 0, -, /lib/modules,, *.ko */build */source, n)
-
-	@$(call install_finish, kernel-modules)
-endif
-
-	@$(call touch)
-
-# ----------------------------------------------------------------------------
-# oldconfig / menuconfig
-# ----------------------------------------------------------------------------
-
-$(call ptx/kconfig-targets, kernel): $(STATEDIR)/kernel.extract
-	@$(call world/kconfig, KERNEL, $(subst kernel_,,$@))
-
-# vim: syntax=make
-- 
2.47.3

[DistroKit] [PATCH 6/6] v8a: remove outdated barebox.rockchip.make

[Roland Hieber]

The fix was already included in PTXdist 2023.07.0 commit 1abf368ea3fbe
(2023-06-02, "barebox: add rk-usb-loader to the host tools").

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---
 configs/platform-v8a/rules/barebox.rockchip.make | 12 ------------
 1 file changed, 12 deletions(-)
 delete mode 100644 configs/platform-v8a/rules/barebox.rockchip.make

diff --git a/configs/platform-v8a/rules/barebox.rockchip.make b/configs/platform-v8a/rules/barebox.rockchip.make
deleted file mode 100644
index 17092a9b728c..000000000000
--- a/configs/platform-v8a/rules/barebox.rockchip.make
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2023 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-# TODO: remove this when it is added in PTXdist upstream
-BAREBOX_PROGS_HOST += rk-usb-loader
-
-# vim: syntax=make
-- 
2.47.3

Re: [DistroKit] [PATCH 1/6] v8a: sync platformconfig

[Robert Schwebel]

Applied series to next.

On Mon, Mar 16, 2026 at 01:49:16PM +0100, Roland Hieber wrote:
> The v8a platformconfig was not updated when the firmware-nxp-wifi recipe
> was added.
> 
> Fixes: 4ab46d4f662eea0141d2 (2026-01-20, "v8a: add firmware nxp wifi package")
> Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> ---
>  configs/platform-v8a/platformconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
> index 989fb0e14d45..604bba9cfed1 100644
> --- a/configs/platform-v8a/platformconfig
> +++ b/configs/platform-v8a/platformconfig
> @@ -374,6 +374,7 @@ PTXCONF_FIRMWARE_IMX=y
>  # PTXCONF_FIRMWARE_IMX_VPU_IMX6Q is not set
>  PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX8=y
>  # PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX9 is not set
> +# PTXCONF_FIRMWARE_NXP_WIFI is not set
>  PTXCONF_FIRMWARE_ROCKCHIP=y
>  # PTXCONF_FIRMWARE_ROCKCHIP_RK3566_SDRAM is not set
>  PTXCONF_FIRMWARE_ROCKCHIP_RK3568_SDRAM=y
> -- 
> 2.47.3
> 
> 
> 

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

Re: [DistroKit] [PATCH 1/6] v8a: sync platformconfig

[Roland Hieber]

On Mon, Mar 16, 2026 at 03:09:31PM +0100, Robert Schwebel wrote:
> Applied series to next.

Thanks. Looking at the Jenkins output, it seems I should've run
'./scripts/p-all oldconfig all'… Will send fixups.

 - Roland

> On Mon, Mar 16, 2026 at 01:49:16PM +0100, Roland Hieber wrote:
> > The v8a platformconfig was not updated when the firmware-nxp-wifi recipe
> > was added.
> > 
> > Fixes: 4ab46d4f662eea0141d2 (2026-01-20, "v8a: add firmware nxp wifi package")
> > Signed-off-by: Roland Hieber <rhi@pengutronix.de>
> > ---
> >  configs/platform-v8a/platformconfig | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
> > index 989fb0e14d45..604bba9cfed1 100644
> > --- a/configs/platform-v8a/platformconfig
> > +++ b/configs/platform-v8a/platformconfig
> > @@ -374,6 +374,7 @@ PTXCONF_FIRMWARE_IMX=y
> >  # PTXCONF_FIRMWARE_IMX_VPU_IMX6Q is not set
> >  PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX8=y
> >  # PTXCONF_FIRMWARE_IMX_BOOTIMAGE_IMX9 is not set
> > +# PTXCONF_FIRMWARE_NXP_WIFI is not set
> >  PTXCONF_FIRMWARE_ROCKCHIP=y
> >  # PTXCONF_FIRMWARE_ROCKCHIP_RK3566_SDRAM is not set
> >  PTXCONF_FIRMWARE_ROCKCHIP_RK3568_SDRAM=y
> > -- 
> > 2.47.3
> > 
> > 
> > 
> 
> -- 
> Pengutronix e.K.                           | Dipl.-Ing. Robert Schwebel  |
> Steuerwalder Str. 21                       | https://www.pengutronix.de/ |
> 31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
> Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-9    |
> 

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

[DistroKit] [PATCH] squash! kernel: remove forked recipe

[Roland Hieber]

The upstream kernel recipe has support to build rust code included in
the kernel, which was previously enabled in our rule, so enable that
too.

Signed-off-by: Roland Hieber <rhi@pengutronix.de>
---

This should take care of the resulting diff in the platformconfigs; when
we don't enable PTXCONF_KERNEL_RUST, all the CONFIG_RUSTC_VERSION=0 etc.
symbols in the kernel config get set to 0.

 - Roland

 configs/platform-v7a/platformconfig        | 3 ++-
 configs/platform-v7a_noneon/platformconfig | 3 ++-
 configs/platform-v8a/platformconfig        | 3 ++-
 configs/platform-x86_64/platformconfig     | 3 ++-
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/configs/platform-v7a/platformconfig b/configs/platform-v7a/platformconfig
index cc9567cb2592..03295be72f5f 100644
--- a/configs/platform-v7a/platformconfig
+++ b/configs/platform-v7a/platformconfig
@@ -150,7 +150,7 @@ PTXCONF_KERNEL_LZOP=y
 # PTXCONF_KERNEL_OPENSSL is not set
 # PTXCONF_KERNEL_LIBELF is not set
 PTXCONF_KERNEL_GCC_PLUGINS=y
-# PTXCONF_KERNEL_RUST is not set
+PTXCONF_KERNEL_RUST=y
 PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
 
 #
@@ -343,6 +343,7 @@ PTXCONF_CODE_SIGNING=y
 PTXCONF_CODE_SIGNING_PROVIDER="devel"
 PTXCONF_CODE_SIGNING_PROVIDER_DEVEL=y
 PTXCONF_HOST_PTX_CODE_SIGNING_DEV=y
+PTXCONF_HOST_BINDGEN_CLI=y
 PTXCONF_HOST_CMAKE=y
 PTXCONF_HOST_DOSFSTOOLS=y
 PTXCONF_HOST_DTC=y
diff --git a/configs/platform-v7a_noneon/platformconfig b/configs/platform-v7a_noneon/platformconfig
index 3168417c06b2..9924449d6e60 100644
--- a/configs/platform-v7a_noneon/platformconfig
+++ b/configs/platform-v7a_noneon/platformconfig
@@ -147,7 +147,7 @@ PTXCONF_KERNEL_LZOP=y
 # PTXCONF_KERNEL_OPENSSL is not set
 # PTXCONF_KERNEL_LIBELF is not set
 PTXCONF_KERNEL_GCC_PLUGINS=y
-# PTXCONF_KERNEL_RUST is not set
+PTXCONF_KERNEL_RUST=y
 PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
 
 #
@@ -260,6 +260,7 @@ PTXCONF_CODE_SIGNING=y
 PTXCONF_CODE_SIGNING_PROVIDER="devel"
 PTXCONF_CODE_SIGNING_PROVIDER_DEVEL=y
 PTXCONF_HOST_PTX_CODE_SIGNING_DEV=y
+PTXCONF_HOST_BINDGEN_CLI=y
 PTXCONF_HOST_CMAKE=y
 PTXCONF_HOST_DOSFSTOOLS=y
 PTXCONF_HOST_E2FSPROGS=y
diff --git a/configs/platform-v8a/platformconfig b/configs/platform-v8a/platformconfig
index be5ee7732893..1a9de1f3f65f 100644
--- a/configs/platform-v8a/platformconfig
+++ b/configs/platform-v8a/platformconfig
@@ -147,7 +147,7 @@ PTXCONF_KERNEL_DTS="armada-3720-community.dts freescale/imx8mm-evk.dts freescale
 PTXCONF_KERNEL_OPENSSL=y
 # PTXCONF_KERNEL_LIBELF is not set
 # PTXCONF_KERNEL_GCC_PLUGINS is not set
-# PTXCONF_KERNEL_RUST is not set
+PTXCONF_KERNEL_RUST=y
 PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
 
 #
@@ -316,6 +316,7 @@ PTXCONF_CODE_SIGNING=y
 PTXCONF_CODE_SIGNING_PROVIDER="devel"
 PTXCONF_CODE_SIGNING_PROVIDER_DEVEL=y
 PTXCONF_HOST_PTX_CODE_SIGNING_DEV=y
+PTXCONF_HOST_BINDGEN_CLI=y
 PTXCONF_HOST_CMAKE=y
 PTXCONF_HOST_DOSFSTOOLS=y
 PTXCONF_HOST_DTC=y
diff --git a/configs/platform-x86_64/platformconfig b/configs/platform-x86_64/platformconfig
index b53c6fa52656..7fe00f002209 100644
--- a/configs/platform-x86_64/platformconfig
+++ b/configs/platform-x86_64/platformconfig
@@ -147,7 +147,7 @@ PTXCONF_KERNEL_LZOP=y
 # PTXCONF_KERNEL_OPENSSL is not set
 PTXCONF_KERNEL_LIBELF=y
 # PTXCONF_KERNEL_GCC_PLUGINS is not set
-# PTXCONF_KERNEL_RUST is not set
+PTXCONF_KERNEL_RUST=y
 PTXCONF_KERNEL_CONFIG_BASE_VERSION=y
 
 #
@@ -243,6 +243,7 @@ PTXCONF_CODE_SIGNING=y
 PTXCONF_CODE_SIGNING_PROVIDER="devel"
 PTXCONF_CODE_SIGNING_PROVIDER_DEVEL=y
 PTXCONF_HOST_PTX_CODE_SIGNING_DEV=y
+PTXCONF_HOST_BINDGEN_CLI=y
 PTXCONF_HOST_CMAKE=y
 PTXCONF_HOST_E2FSPROGS=y
 PTXCONF_HOST_EXTRACT_CERT=y
-- 
2.47.3