From 4f29b029c17f448bbfd0587d3d228aff98dbce0c Mon Sep 17 00:00:00 2001 From: Oleksiy Protas Date: Thu, 8 Jan 2026 13:19:05 +0200 Subject: [PATCH 1/4] meta-freescale: move NXP-specific recipes into a dynamic layer Allows the layer to be included into non-NXP builds. --- conf/layer.conf | 10 ++++++++++ .../images/fsl-image-network-full-cmdline.bbappend | 0 .../recipes-kernel}/linux/linux-imx/mwifiex.config | 0 .../linux/linux-imx/os08a20-wlan.config | 0 .../recipes-kernel}/linux/linux-imx_%.bbappend | 0 .../recipes-fsl}/images/imx-image-base.bbappend | 0 6 files changed, 10 insertions(+) rename {recipes-fsl => dynamic-layers/meta-freescale-distro/recipes-fsl}/images/fsl-image-network-full-cmdline.bbappend (100%) rename {recipes-kernel => dynamic-layers/meta-freescale/recipes-kernel}/linux/linux-imx/mwifiex.config (100%) rename {recipes-kernel => dynamic-layers/meta-freescale/recipes-kernel}/linux/linux-imx/os08a20-wlan.config (100%) rename {recipes-kernel => dynamic-layers/meta-freescale/recipes-kernel}/linux/linux-imx_%.bbappend (100%) rename {recipes-fsl => dynamic-layers/meta-imx-sdk/recipes-fsl}/images/imx-image-base.bbappend (100%) diff --git a/conf/layer.conf b/conf/layer.conf index 04985e8..a97500f 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -5,6 +5,16 @@ BBPATH .= ":${LAYERDIR}" BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ ${LAYERDIR}/recipes-*/*/*.bbappend" +# Device-dependent locations +BBFILES_DYNAMIC += " \ + freescale-layer:${LAYERDIR}/dynamic-layers/meta-freescale/recipes-*/*/*.bb \ + freescale-layer:${LAYERDIR}/dynamic-layers/meta-freescale/recipes-*/*/*.bbappend \ + freescale-distro:${LAYERDIR}/dynamic-layers/meta-freescale-distro/recipes-*/*/*.bb \ + freescale-distro:${LAYERDIR}/dynamic-layers/meta-freescale-distro/recipes-*/*/*.bbappend \ + imx-frdm-sdk-release:${LAYERDIR}/dynamic-layers/meta-imx-sdk/recipes-*/*/*.bb \ + imx-frdm-sdk-release:${LAYERDIR}/dynamic-layers/meta-imx-sdk/recipes-*/*/*.bbappend \ +" + BBFILE_COLLECTIONS += "meta-openhd" BBFILE_PATTERN_meta-openhd = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-openhd = "6" diff --git a/recipes-fsl/images/fsl-image-network-full-cmdline.bbappend b/dynamic-layers/meta-freescale-distro/recipes-fsl/images/fsl-image-network-full-cmdline.bbappend similarity index 100% rename from recipes-fsl/images/fsl-image-network-full-cmdline.bbappend rename to dynamic-layers/meta-freescale-distro/recipes-fsl/images/fsl-image-network-full-cmdline.bbappend diff --git a/recipes-kernel/linux/linux-imx/mwifiex.config b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/mwifiex.config similarity index 100% rename from recipes-kernel/linux/linux-imx/mwifiex.config rename to dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/mwifiex.config diff --git a/recipes-kernel/linux/linux-imx/os08a20-wlan.config b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/os08a20-wlan.config similarity index 100% rename from recipes-kernel/linux/linux-imx/os08a20-wlan.config rename to dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/os08a20-wlan.config diff --git a/recipes-kernel/linux/linux-imx_%.bbappend b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend similarity index 100% rename from recipes-kernel/linux/linux-imx_%.bbappend rename to dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend diff --git a/recipes-fsl/images/imx-image-base.bbappend b/dynamic-layers/meta-imx-sdk/recipes-fsl/images/imx-image-base.bbappend similarity index 100% rename from recipes-fsl/images/imx-image-base.bbappend rename to dynamic-layers/meta-imx-sdk/recipes-fsl/images/imx-image-base.bbappend From 0f03b7786bdbe01205a2c58d9a46c8c8ba6d0abe Mon Sep 17 00:00:00 2001 From: Oleksiy Protas Date: Thu, 8 Jan 2026 15:28:21 +0200 Subject: [PATCH 2/4] openhd: make webui optional --- recipes-openhd/openhd/openhd_git.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes-openhd/openhd/openhd_git.bb b/recipes-openhd/openhd/openhd_git.bb index 7421d37..77f7249 100644 --- a/recipes-openhd/openhd/openhd_git.bb +++ b/recipes-openhd/openhd/openhd_git.bb @@ -15,6 +15,9 @@ S = "${WORKDIR}/git/OpenHD" inherit cmake pkgconfig systemd +PACKAGECONFIG ??= "webui" +PACKAGECONFIG[webui] = ",,,openhd-webui" + DEPENDS = "flac poco libsodium gstreamer1.0 gstreamer1.0-plugins-base libpcap libusb1 libv4l" RDEPENDS:${PN} += " \ @@ -25,7 +28,6 @@ RDEPENDS:${PN} += " \ gstreamer1.0-plugins-ugly \ gstreamer1.0-libav \ v4l-utils \ - openhd-webui \ " SYSTEMD_SERVICE:${PN} = "openhd_mod.service" From 26c64db2b1087de00054f6ef98e0afe86dbb74dc Mon Sep 17 00:00:00 2001 From: "elfy@ecognize.me" Date: Fri, 9 Jan 2026 13:12:49 +0200 Subject: [PATCH 3/4] poco: correct fetching branch The issue is solved in upstream meta-openembedded in both kirkstone and scarthgap, remove after update. --- recipes-support/poco/poco_%.bbappend | 9 +++++++++ recipes-support/poco/poco_1.12.5p2.bbappend | 3 --- 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 recipes-support/poco/poco_%.bbappend delete mode 100644 recipes-support/poco/poco_1.12.5p2.bbappend diff --git a/recipes-support/poco/poco_%.bbappend b/recipes-support/poco/poco_%.bbappend new file mode 100644 index 0000000..aacfab2 --- /dev/null +++ b/recipes-support/poco/poco_%.bbappend @@ -0,0 +1,9 @@ +# poco upstream changed from 'master' to 'main': +# - kirkstone uses 1.11.2, with the pinned SRCREV in 'main' +# - scarthgap uses 1.12.5, with the pinned SRCREV *NOT* in 'main', but in a leftover branch +# FIXME: Both are fixed in upstream meta-openembedded, remove this bbappend after updating + +POCO_FETCH_BRANCH = "${@bb.utils.contains('LAYERSERIES_CORENAMES', 'scarthgap', 'poco-1.12.5', 'main', d)}" + +SRC_URI:remove = "git://github.com/pocoproject/poco.git;branch=master;protocol=https" +SRC_URI:append = " git://github.com/pocoproject/poco.git;branch=${POCO_FETCH_BRANCH};protocol=https" diff --git a/recipes-support/poco/poco_1.12.5p2.bbappend b/recipes-support/poco/poco_1.12.5p2.bbappend deleted file mode 100644 index 30fbc17..0000000 --- a/recipes-support/poco/poco_1.12.5p2.bbappend +++ /dev/null @@ -1,3 +0,0 @@ -# Fix fetch: the pinned SRCREV is on branch 'poco-1.12.5', not 'master' -SRC_URI:remove = "git://github.com/pocoproject/poco.git;branch=master;protocol=https" -SRC_URI:append = " git://github.com/pocoproject/poco.git;branch=poco-1.12.5;protocol=https" From e181f721958a1855652b386e648d0d58d79605bb Mon Sep 17 00:00:00 2001 From: "elfy@ecognize.me" Date: Fri, 9 Jan 2026 13:32:06 +0200 Subject: [PATCH 4/4] linux-imx: cleanup --- conf/layer.conf | 5 +---- .../linux/linux-imx/{mwifiex.config => mwifiex.cfg} | 0 .../linux-imx/{os08a20-wlan.config => os08a20-wlan.cfg} | 0 .../meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend | 4 ++-- 4 files changed, 3 insertions(+), 6 deletions(-) rename dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/{mwifiex.config => mwifiex.cfg} (100%) rename dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/{os08a20-wlan.config => os08a20-wlan.cfg} (100%) diff --git a/conf/layer.conf b/conf/layer.conf index a97500f..ce7302d 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -20,7 +20,4 @@ BBFILE_PATTERN_meta-openhd = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-openhd = "6" LAYERDEPENDS_meta-openhd = "core" -LAYERSERIES_COMPAT_meta-openhd = "kirkstone scarthgap" - -# Prevent linux-imx customizations from affecting kirkstone-based BSPs -BBMASK:append:kirkstone = "|linux-imx_%.bbappend" +LAYERSERIES_COMPAT_meta-openhd = "kirkstone scarthgap" \ No newline at end of file diff --git a/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/mwifiex.config b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/mwifiex.cfg similarity index 100% rename from dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/mwifiex.config rename to dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/mwifiex.cfg diff --git a/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/os08a20-wlan.config b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/os08a20-wlan.cfg similarity index 100% rename from dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/os08a20-wlan.config rename to dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx/os08a20-wlan.cfg diff --git a/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend index bfba5d0..e480acf 100644 --- a/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend +++ b/dynamic-layers/meta-freescale/recipes-kernel/linux/linux-imx_%.bbappend @@ -1,4 +1,4 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/linux-imx:" -SRC_URI:append = " file://os08a20-wlan.config" -DELTA_KERNEL_DEFCONFIG:append = " os08a20-wlan.config" +SRC_URI:append = " file://os08a20-wlan.cfg" +