From 159d4d7c5ea583189fd63459f78d37a90b7b9fe4 Mon Sep 17 00:00:00 2001 From: Luciano Gomes Date: Tue, 9 Jun 2026 09:51:40 -0300 Subject: [PATCH 1/5] ossystems-factory-defaults: Update classes and recipes Update recipes to version 1.0 and use recipe-local MIT license files. Align factory-defaults documentation with the current hyphenated class names. --- classes/ossystems-factory-defaults.bbclass | 3 +- .../net-persistent-mac/net-persistent-mac.bb | 28 --------------- .../net-persistent-mac/COPYING.MIT | 23 ++++++++++++ .../net-persistent-mac_1.0.bb | 35 +++++++++++++++++++ .../ossystems-factory-defaults/COPYING.MIT | 23 ++++++++++++ ...s.bb => ossystems-factory-defaults_1.0.bb} | 10 +++++- 6 files changed, 92 insertions(+), 30 deletions(-) delete mode 100644 recipes-core/net-persistent-mac/net-persistent-mac.bb create mode 100644 recipes-core/net-persistent-mac/net-persistent-mac/COPYING.MIT create mode 100644 recipes-core/net-persistent-mac/net-persistent-mac_1.0.bb create mode 100644 recipes-core/ossystems-factory-defaults/ossystems-factory-defaults/COPYING.MIT rename recipes-core/ossystems-factory-defaults/{ossystems-factory-defaults.bb => ossystems-factory-defaults_1.0.bb} (71%) diff --git a/classes/ossystems-factory-defaults.bbclass b/classes/ossystems-factory-defaults.bbclass index afde1a6..f3c3a06 100644 --- a/classes/ossystems-factory-defaults.bbclass +++ b/classes/ossystems-factory-defaults.bbclass @@ -32,6 +32,7 @@ inherit ossystems-factory-defaults-base +member[doc] = "Return success if the first argument is present in the remaining arguments." member() { elt=$1 shift @@ -65,7 +66,7 @@ do_install:append() { local dir for file in $no_leading_slash; do dir="${D}/`dirname $file`" - mkdir -p $dir + install -d $dir cd $dir ln -sf ${OSSYSTEMS_FACTORY_DEFAULTS_RUNTIME_DIR}/$file `basename $file` done diff --git a/recipes-core/net-persistent-mac/net-persistent-mac.bb b/recipes-core/net-persistent-mac/net-persistent-mac.bb deleted file mode 100644 index 5c6a777..0000000 --- a/recipes-core/net-persistent-mac/net-persistent-mac.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Network device MAC persistency" -DESCRIPTION = "Provides support to store/restore the MAC of a specific network device" -SECTION = "base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" - -SRC_URI = "\ - file://${BPN} \ - file://${BPN}.default \ - file://${BPN}.service \ -" - -OSSYSTEMS_FACTORY_DEFAULTS_HOOKS = "file://${BPN}.factory-defaults-hook" - -inherit ossystems-factory-defaults systemd - -SYSTEMD_SERVICE:${PN} = "${PN}.service" - -do_configure[noexec] = "1" -do_compile[noexec] = "1" - -do_install() { - install -Dm 0644 ${WORKDIR}/${PN}.service ${D}${systemd_system_unitdir}/${PN}.service - install -Dm 0644 ${WORKDIR}/${PN}.default ${D}${sysconfdir}/default/${PN} - install -Dm 0755 ${WORKDIR}/${PN} ${D}${bindir}/${PN} -} - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-core/net-persistent-mac/net-persistent-mac/COPYING.MIT b/recipes-core/net-persistent-mac/net-persistent-mac/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/recipes-core/net-persistent-mac/net-persistent-mac/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/recipes-core/net-persistent-mac/net-persistent-mac_1.0.bb b/recipes-core/net-persistent-mac/net-persistent-mac_1.0.bb new file mode 100644 index 0000000..26fa560 --- /dev/null +++ b/recipes-core/net-persistent-mac/net-persistent-mac_1.0.bb @@ -0,0 +1,35 @@ +SUMMARY = "Network device MAC persistency" +DESCRIPTION = "Provides support to store/restore the MAC of a specific network device" +HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "base" +CVE_PRODUCT = "net-persistent-mac" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "\ + file://COPYING.MIT \ + file://${BPN} \ + file://${BPN}.default \ + file://${BPN}.service \ +" +S = "${UNPACKDIR}" + +OSSYSTEMS_FACTORY_DEFAULTS_HOOKS = "file://${BPN}.factory-defaults-hook" + +inherit ossystems-factory-defaults systemd + +SYSTEMD_SERVICE:${PN} = "${PN}.service" + +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -Dm 0644 ${UNPACKDIR}/${PN}.service ${D}${systemd_system_unitdir}/${PN}.service + install -Dm 0644 ${UNPACKDIR}/${PN}.default ${D}${sysconfdir}/default/${PN} + install -Dm 0755 ${UNPACKDIR}/${PN} ${D}${bindir}/${PN} +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +BBCLASSEXTEND = "" diff --git a/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults/COPYING.MIT b/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults.bb b/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults_1.0.bb similarity index 71% rename from recipes-core/ossystems-factory-defaults/ossystems-factory-defaults.bb rename to recipes-core/ossystems-factory-defaults/ossystems-factory-defaults_1.0.bb index 04b8e1b..f690bc8 100644 --- a/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults.bb +++ b/recipes-core/ossystems-factory-defaults/ossystems-factory-defaults_1.0.bb @@ -1,8 +1,14 @@ SUMMARY = "Tool to restore image state to factory defaults" +DESCRIPTION = "Installs the factory-defaults utility and service for restoring configured files to factory defaults." +HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "base" +CVE_PRODUCT = "ossystems-factory-defaults" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "\ + file://COPYING.MIT \ file://factory-defaults \ file://${BPN}.service \ " @@ -33,3 +39,5 @@ do_install() { install -Dm 0755 ${UNPACKDIR}/factory-defaults ${D}${sysconfdir}/init.d/factory-defaults fi } + +BBCLASSEXTEND = "" From bde1a62f4388e059e9e88f2159662771475a69f4 Mon Sep 17 00:00:00 2001 From: Luciano Gomes Date: Tue, 9 Jun 2026 09:51:54 -0300 Subject: [PATCH 2/5] release-bundle: Update generation recipe metadata Update the release bundle generation recipe to version 1.0 and use a recipe-local MIT license file. --- classes/release-bundle-generation.bbclass | 34 +++++++++---------- recipes-core/release/files/COPYING.MIT | 17 ++++++++++ .../release/generate-release-bundle.bb | 6 ---- .../release/generate-release-bundle_1.0.bb | 16 +++++++++ 4 files changed, 50 insertions(+), 23 deletions(-) create mode 100644 recipes-core/release/files/COPYING.MIT delete mode 100644 recipes-core/release/generate-release-bundle.bb create mode 100644 recipes-core/release/generate-release-bundle_1.0.bb diff --git a/classes/release-bundle-generation.bbclass b/classes/release-bundle-generation.bbclass index 4a3964d..aaadfed 100644 --- a/classes/release-bundle-generation.bbclass +++ b/classes/release-bundle-generation.bbclass @@ -20,11 +20,12 @@ do_configure[noexec] = "1" do_compile[noexec] = "1" do_install[noexec] = "1" do_populate_sysroot[noexec] = "1" +do_packagedata[noexec] = "1" do_package[noexec] = "1" do_package_qa[noexec] = "1" -do_packagedata[noexec] = "1" -LICENSE = "MIT" +SRC_URI = "file://bundle-shar-extract.sh" + PACKAGES = "" INHIBIT_DEFAULT_DEPS = "1" @@ -35,25 +36,18 @@ RELEASE_BUNDLE_VERSION ?= "${DISTRO_VERSION}" RELEASE_BUNDLE_DEPLOY = "${DEPLOY_DIR}/release-bundle" RELEASE_BUNDLE_WORKDIR = "${TMPDIR}/release-bundle/workdir" +RELEASE_BUNDLE_TMP_DOWNLOAD_CACHE ?= "${TMPDIR}/release-bundle/download-cache" RELEASE_BUNDLE_OUTPUTNAME ?= "${RELEASE_BUNDLE_NAME}-release-${RELEASE_BUNDLE_VERSION}" RELEASE_BUNDLE_RECIPES_WITH_SOURCE ?= "" -SRC_URI = "file://bundle-shar-extract.sh" - -python() { - recipes = d.getVar('RELEASE_BUNDLE_RECIPES_WITH_SOURCE', True).split() - d.appendVarFlag('do_release_bundle_finalize', - 'depends', - " ".join(map(lambda x: - x + ":do_collect_recipe_source", - recipes))) - - d.delVarFlag('do_build', 'recrdeptask') - d.delVarFlag('do_build', 'depends') -} +do_build[depends] = "" +do_build[recrdeptask] = "" +do_release_bundle_finalize[depends] += "${@' '.join('%s:do_collect_recipe_source' % recipe for recipe in d.getVar('RELEASE_BUNDLE_RECIPES_WITH_SOURCE').split())}" addtask collect_platform_source before do_release_bundle_finalize do_collect_platform_source[cleandirs] = "${RELEASE_BUNDLE_WORKDIR}" +do_collect_platform_source[depends] += "repo-native:do_populate_sysroot " +do_collect_platform_source[doc] = "Collect platform repositories into the release bundle work directory." do_collect_platform_source[nostamp] = "1" do_collect_platform_source() { cd "${PLATFORM_ROOT_DIR}" @@ -77,6 +71,7 @@ RELEASE_BUNDLE_TAR_OPTS = "--owner=root --group=root" RELEASE_BUNDLE_OLDEST_KERNEL = "3.2.0" RELEASE_BUNDLE_PATH = "\$HOME/src/${RELEASE_BUNDLE_NAME}/${RELEASE_BUNDLE_VERSION}" +tar_release_bundle[doc] = "Create the compressed release bundle archive." fakeroot tar_release_bundle() { mkdir -p ${RELEASE_BUNDLE_DEPLOY} cd ${RELEASE_BUNDLE_WORKDIR} @@ -86,13 +81,18 @@ fakeroot tar_release_bundle() { addtask release_bundle_finalize after do_unpack do_collect_platform_source before do_build do_release_bundle_finalize[dirs] = "${RELEASE_BUNDLE_WORKDIR}/download" do_release_bundle_finalize[depends] += "pbzip2-native:do_populate_sysroot " +do_release_bundle_finalize[doc] = "Finalize and emit the self-extracting release bundle." do_release_bundle_finalize() { - cp --archive -L ${RELEASE_BUNDLE_TMP_DOWNLOAD_CACHE}/*/* ${RELEASE_BUNDLE_WORKDIR}/ + for bundle_dir in ${RELEASE_BUNDLE_TMP_DOWNLOAD_CACHE}/*/*; do + [ -e "$bundle_dir" ] || continue + cp --archive -L "$bundle_dir" ${RELEASE_BUNDLE_WORKDIR}/ + done + find ${RELEASE_BUNDLE_WORKDIR} -type d -empty -delete tar_release_bundle - cp "${WORKDIR}/bundle-shar-extract.sh" ${RELEASE_BUNDLE_DEPLOY}/${RELEASE_BUNDLE_OUTPUTNAME}.sh + cp "${UNPACKDIR}/bundle-shar-extract.sh" ${RELEASE_BUNDLE_DEPLOY}/${RELEASE_BUNDLE_OUTPUTNAME}.sh # substitute variables sed -e "s#@RELEASE_BUNDLE_PATH@#${RELEASE_BUNDLE_PATH}#g" \ diff --git a/recipes-core/release/files/COPYING.MIT b/recipes-core/release/files/COPYING.MIT new file mode 100644 index 0000000..fb950dc --- /dev/null +++ b/recipes-core/release/files/COPYING.MIT @@ -0,0 +1,17 @@ +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/recipes-core/release/generate-release-bundle.bb b/recipes-core/release/generate-release-bundle.bb deleted file mode 100644 index fa45482..0000000 --- a/recipes-core/release/generate-release-bundle.bb +++ /dev/null @@ -1,6 +0,0 @@ -SUMMARY = "Generate release bundle" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -inherit release-bundle-generation diff --git a/recipes-core/release/generate-release-bundle_1.0.bb b/recipes-core/release/generate-release-bundle_1.0.bb new file mode 100644 index 0000000..95a644a --- /dev/null +++ b/recipes-core/release/generate-release-bundle_1.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Generate release bundle" +DESCRIPTION = "Generates self-extracting release bundles from the configured platform source tree." +HOMEPAGE = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base" +BUGTRACKER = "https://github.com/OSSystemsEmbeddedLinux/meta-ossystems-base/issues" +SECTION = "devel" +CVE_PRODUCT = "meta-ossystems-base" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" + +inherit release-bundle-generation + +SRC_URI += "file://COPYING.MIT" +S = "${UNPACKDIR}" + +BBCLASSEXTEND = "" From d1807491ceb08ac21480dbaf050c91a65ad0057d Mon Sep 17 00:00:00 2001 From: Luciano Gomes Date: Tue, 9 Jun 2026 09:52:10 -0300 Subject: [PATCH 3/5] chromium-ozone-wayland-init: Update to 1.0 - Update recipe to version 1.0. - Use recipe-local MIT license. Signed-off-by: Luciano Gomes --- .../chromium-ozone-wayland-init/COPYING.MIT | 23 +++++++++++++++++++ ....bb => chromium-ozone-wayland-init_1.0.bb} | 21 ++++++++++++----- 2 files changed, 38 insertions(+), 6 deletions(-) create mode 100644 dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/COPYING.MIT rename dynamic-layers/chromium-browser-layer/recipes-browser/chromium/{chromium-ozone-wayland-init.bb => chromium-ozone-wayland-init_1.0.bb} (62%) diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/COPYING.MIT b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init.bb b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb similarity index 62% rename from dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init.bb rename to dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb index f85a8bc..021c1da 100644 --- a/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init.bb +++ b/dynamic-layers/chromium-browser-layer/recipes-browser/chromium/chromium-ozone-wayland-init_1.0.bb @@ -1,19 +1,26 @@ SUMMARY = "Startup script and service for the Chromium Browser using Ozone" +DESCRIPTION = "Installs init scripts, systemd unit files, and default configuration for launching Chromium Ozone Wayland." +HOMEPAGE = "https://www.chromium.org" +BUGTRACKER = "https://issues.chromium.org/issues" +SECTION = "graphics" +CVE_PRODUCT = "chromium" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" SRC_URI = "\ + file://COPYING.MIT \ file://${BPN}.default \ file://${BPN}.initd \ file://${BPN}.service \ " +S = "${UNPACKDIR}" inherit systemd update-rc.d ## Configuration variables # URL to load when start. -CHROMIUM_URL ?= "https://ossystems.com.br" +CHROMIUM_URL ?= "https://ossystems.com.br" # Extra arguments to pass to 'chromium' application. CHROMIUM_EXTRA_ARGS ?= "" @@ -34,13 +41,13 @@ do_compile[noexec] = "1" do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then - install -Dm 0755 ${WORKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/chromium-ozone-wayland + install -Dm 0755 ${UNPACKDIR}/${BPN}.initd ${D}${sysconfdir}/init.d/chromium-ozone-wayland fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/chromium-ozone-wayland.service + install -Dm 0644 ${UNPACKDIR}/${BPN}.service ${D}${systemd_system_unitdir}/chromium-ozone-wayland.service fi - install -Dm 0644 ${WORKDIR}/${BPN}.default ${D}${sysconfdir}/default/chromium-ozone-wayland + install -Dm 0644 ${UNPACKDIR}/${BPN}.default ${D}${sysconfdir}/default/chromium-ozone-wayland echo ${CHROMIUM_ENV} >> ${D}${sysconfdir}/default/chromium-ozone-wayland @@ -49,6 +56,8 @@ do_install() { -i ${D}${sysconfdir}/default/chromium-ozone-wayland } +PACKAGE_ARCH = "${MACHINE_ARCH}" + RDEPENDS:${PN} += "chromium-ozone-wayland" -PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "" From 4d99daa38103966dd69028515b9931fd549949b5 Mon Sep 17 00:00:00 2001 From: Luciano Gomes Date: Tue, 9 Jun 2026 09:52:26 -0300 Subject: [PATCH 4/5] dnsmasq: Align recipe with current OE-Core defaults - Drop LICENSE override as it's no longer needed. - Restrict SYSTEMD_AUTO_ENABLE override to the oel distro. Signed-off-by: Luciano Gomes --- .../recipes-support/dnsmasq/dnsmasq_%.bbappend | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/dynamic-layers/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend b/dynamic-layers/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend index 923677b..87adda8 100644 --- a/dynamic-layers/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend +++ b/dynamic-layers/networking-layer/recipes-support/dnsmasq/dnsmasq_%.bbappend @@ -1,6 +1,2 @@ -# Upstream is dual licensed on GPLv2 | GPLv3, so force GPLv2 in order -# to allow safe checks via image-license-checker -LICENSE = "GPL-2.0-only" - # Disabled by default to avoid conflicts with NM/systemd -SYSTEMD_AUTO_ENABLE = "disable" +SYSTEMD_AUTO_ENABLE:oel = "disable" From f7e4ab673e4ec534c346272aeb0d7b725880cf4e Mon Sep 17 00:00:00 2001 From: Luciano Gomes Date: Tue, 9 Jun 2026 09:52:39 -0300 Subject: [PATCH 5/5] qt-kiosk-browser: Update init recipe and metadata - Update init recipe to version 1.0. - Use recipe-local MIT license for init recipe. - Update package metadata in bbappend. Signed-off-by: Luciano Gomes --- .../qt-kiosk-browser/files/COPYING.MIT | 23 ++++++++++++++++++ ...r-init.bb => qt-kiosk-browser-init_1.0.bb} | 24 ++++++++++++------- .../qt-kiosk-browser_%.bbappend | 4 ++-- 3 files changed, 41 insertions(+), 10 deletions(-) create mode 100644 dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/COPYING.MIT rename dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/{qt-kiosk-browser-init.bb => qt-kiosk-browser-init_1.0.bb} (61%) diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/COPYING.MIT b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/COPYING.MIT new file mode 100644 index 0000000..33f8bef --- /dev/null +++ b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/files/COPYING.MIT @@ -0,0 +1,23 @@ + +MIT License + +Copyright (c) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. + diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init.bb b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb similarity index 61% rename from dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init.bb rename to dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb index fb79172..b3c0a2b 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init.bb +++ b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser-init_1.0.bb @@ -1,13 +1,20 @@ SUMMARY = "Startup script and service for the Kiosk Browser" +DESCRIPTION = "Installs init scripts, systemd unit files, and default configuration for launching Qt Kiosk Browser." +HOMEPAGE = "https://github.com/OSSystems/qt-kiosk-browser" +BUGTRACKER = "https://github.com/OSSystems/qt-kiosk-browser/issues" +SECTION = "graphics" +CVE_PRODUCT = "qt-kiosk-browser" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" +LIC_FILES_CHKSUM = "file://COPYING.MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = " \ +SRC_URI = "\ + file://COPYING.MIT \ file://${BPN}.default \ file://${BPN}.initd \ file://${BPN}.service \ file://${BPN}.conf \ " +S = "${UNPACKDIR}" inherit systemd update-rc.d @@ -21,7 +28,6 @@ QT_KIOSK_SCREENSAVER_TIME ?= "0" # Defines the time to restart the browser after entering in screen saving mode (0 to disable). QT_KIOSK_RESTART_TIME ?= "0" - SYSTEMD_SERVICE:${PN} = "qt-kiosk-browser.service" # Start after weston-init @@ -34,15 +40,15 @@ INITSCRIPT_NAME = "qt-kiosk-browser" do_install() { if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then - install -Dm 0755 ${WORKDIR}/${PN}.initd ${D}${sysconfdir}/init.d/kiosk + install -Dm 0755 ${UNPACKDIR}/${PN}.initd ${D}${sysconfdir}/init.d/kiosk fi if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -Dm 0644 ${WORKDIR}/${PN}.service ${D}${systemd_system_unitdir}/qt-kiosk-browser.service + install -Dm 0644 ${UNPACKDIR}/${PN}.service ${D}${systemd_system_unitdir}/qt-kiosk-browser.service fi - install -Dm 0644 ${WORKDIR}/${PN}.default ${D}${sysconfdir}/default/qt-kiosk-browser + install -Dm 0644 ${UNPACKDIR}/${PN}.default ${D}${sysconfdir}/default/qt-kiosk-browser - install -Dm 0644 ${WORKDIR}/${PN}.conf ${D}${sysconfdir}/qt-kiosk-browser.conf + install -Dm 0644 ${UNPACKDIR}/${PN}.conf ${D}${sysconfdir}/qt-kiosk-browser.conf sed -e 's,@QT_KIOSK_URL@,${QT_KIOSK_URL},g' \ -e 's,@QT_KIOSK_RESTART_TIME@,${QT_KIOSK_RESTART_TIME},g' \ @@ -50,6 +56,8 @@ do_install() { -i ${D}${sysconfdir}/qt-kiosk-browser.conf } +PACKAGE_ARCH = "${MACHINE_ARCH}" + RDEPENDS:${PN} += "qt-kiosk-browser" -PACKAGE_ARCH = "${MACHINE_ARCH}" +BBCLASSEXTEND = "" diff --git a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_%.bbappend b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_%.bbappend index 45680e0..c80c5eb 100644 --- a/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_%.bbappend +++ b/dynamic-layers/qt5-layer/recipes-qt/qt-kiosk-browser/qt-kiosk-browser_%.bbappend @@ -1,6 +1,6 @@ -FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:" +FILESEXTRAPATHS:prepend:oel := "${THISDIR}/${PN}:" #The default config file is removed to allow the generation of a new one with the proper parameters -do_install:append() { +do_install:append:oel() { rm ${D}${sysconfdir}/${PN}.conf }