From 2cc662aa38aa94834ec34a724bab448e561632db Mon Sep 17 00:00:00 2001 From: Reto Schneider Date: Tue, 23 Apr 2024 13:31:41 +0200 Subject: [PATCH] Open source release for internal tag release/linux-system-8.4.3 --- .github/workflows/build.yaml | 1 + .gitmodules | 9 --------- scripts/bbwrapper.sh | 6 +++--- yocto/bitbake | 2 +- yocto/meta-atmel | 1 - yocto/meta-aws | 2 +- yocto/meta-distribution | 2 +- yocto/meta-gardena | 2 +- yocto/meta-lemonbeat-firmware/conf/layer.conf | 2 +- yocto/meta-mediatek | 1 - yocto/meta-openembedded | 2 +- yocto/meta-readonly-rootfs-overlay | 2 +- yocto/meta-rust | 1 - yocto/meta-swupdate | 2 +- yocto/openembedded-core | 2 +- 15 files changed, 13 insertions(+), 24 deletions(-) delete mode 160000 yocto/meta-atmel delete mode 160000 yocto/meta-mediatek delete mode 160000 yocto/meta-rust diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 174b6cf..b660ef4 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -38,6 +38,7 @@ jobs: iputils-ping \ libegl1-mesa \ libsdl1.2-dev \ + lz4 \ pylint \ python3 \ python3-git \ diff --git a/.gitmodules b/.gitmodules index f5a3aab..dbefe47 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,9 +7,6 @@ [submodule "yocto/meta-distribution"] path = yocto/meta-distribution url = ../smart-garden-gateway-yocto-meta-distribution -[submodule "yocto/meta-mediatek"] - path = yocto/meta-mediatek - url = ../smart-garden-gateway-yocto-meta-mediatek [submodule "yocto/meta-readonly-rootfs-overlay"] path = yocto/meta-readonly-rootfs-overlay url = ../smart-garden-gateway-yocto-meta-readonly-rootfs-overlay @@ -22,12 +19,6 @@ [submodule "yocto/bitbake"] path = yocto/bitbake url = ../smart-garden-gateway-yocto-bitbake -[submodule "yocto/meta-rust"] - path = yocto/meta-rust - url = ../smart-garden-gateway-yocto-meta-rust -[submodule "yocto/meta-atmel"] - path = yocto/meta-atmel - url = ../smart-garden-gateway-yocto-meta-atmel [submodule "yocto/meta-aws"] path = yocto/meta-aws url = ../smart-garden-gateway-yocto-meta-aws diff --git a/scripts/bbwrapper.sh b/scripts/bbwrapper.sh index 653cecf..b862ad5 100755 --- a/scripts/bbwrapper.sh +++ b/scripts/bbwrapper.sh @@ -14,7 +14,7 @@ cd "$gitroot" # If BitBake (and therefore the build directory) was not set up before, then do it now. if ! type bitbake >/dev/null 2>&1; then - TEMPLATECONF="${gitroot}/yocto/meta-distribution/conf" + TEMPLATECONF="${gitroot}/yocto/meta-distribution/conf/templates/default" export TEMPLATECONF source yocto/openembedded-core/oe-init-build-env "${BUILD_DIR}" sed -i 's/\(^MACHINE ??= "\).*\(".*\)/\1'gardena-sg-${MACHINE}'\2/g' conf/local.conf @@ -27,7 +27,7 @@ DISTRO_UPDATE_URL="${DISTRO_UPDATE_URL:-http://10.42.0.1:8000/gardena-update-ima DISTRO_UPDATE_URL_BASE="${DISTRO_UPDATE_URL_BASE:-http://gateway.iot.sg.dss.husqvarnagroup.net/images}" PACKAGE_FEED_URIS="${PACKAGE_FEED_URIS:-http://gateway.iot.sg.dss.husqvarnagroup.net/archive/${DISTRO_VERSION}/gardena-sg-${MACHINE}}" -BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE \ +BB_ENV_PASSTHROUGH_ADDITIONS="$BB_ENV_PASSTHROUGH_ADDITIONS \ DISTRO_UPDATE_URL \ DISTRO_UPDATE_URL_BASE \ DISTRO_VERSION \ @@ -35,7 +35,7 @@ BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE \ PACKAGE_FEED_URIS \ " export \ - BB_ENV_EXTRAWHITE \ + BB_ENV_PASSTHROUGH_ADDITIONS \ DISTRO_UPDATE_URL \ DISTRO_UPDATE_URL_BASE \ DISTRO_VERSION \ diff --git a/yocto/bitbake b/yocto/bitbake index b60c708..5419a84 160000 --- a/yocto/bitbake +++ b/yocto/bitbake @@ -1 +1 @@ -Subproject commit b60c7085ec370473bea9b3b4b65826a17638837f +Subproject commit 5419a8473d6d4cd1d01537de68ad8d72cf5be0b2 diff --git a/yocto/meta-atmel b/yocto/meta-atmel deleted file mode 160000 index 8c497f5..0000000 --- a/yocto/meta-atmel +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 8c497f55b635b90ddd9cd6b698190125f1d74a4c diff --git a/yocto/meta-aws b/yocto/meta-aws index f0a11c7..36501de 160000 --- a/yocto/meta-aws +++ b/yocto/meta-aws @@ -1 +1 @@ -Subproject commit f0a11c7830789c7ebbf523794b458c94fdc7c89e +Subproject commit 36501ded9307d40d1cdc3f3dbdaafd4f34e4cffa diff --git a/yocto/meta-distribution b/yocto/meta-distribution index f1c7d8e..a6cccee 160000 --- a/yocto/meta-distribution +++ b/yocto/meta-distribution @@ -1 +1 @@ -Subproject commit f1c7d8e6ae58f2120201d384c319ab7579379ef2 +Subproject commit a6cccee4996de078434d4e6b34ebd21870351500 diff --git a/yocto/meta-gardena b/yocto/meta-gardena index e23267c..32064c2 160000 --- a/yocto/meta-gardena +++ b/yocto/meta-gardena @@ -1 +1 @@ -Subproject commit e23267c1b5bafbc54bd8c51cb86e73b6a2b816be +Subproject commit 32064c21ee9a5abbba8a315c554c10dd9d87314f diff --git a/yocto/meta-lemonbeat-firmware/conf/layer.conf b/yocto/meta-lemonbeat-firmware/conf/layer.conf index 55c170d..a4890e6 100644 --- a/yocto/meta-lemonbeat-firmware/conf/layer.conf +++ b/yocto/meta-lemonbeat-firmware/conf/layer.conf @@ -8,4 +8,4 @@ BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ BBFILE_COLLECTIONS += "meta-lemonbeat-firmware" BBFILE_PATTERN_meta-lemonbeat-firmware = "^${LAYERDIR}/" BBFILE_PRIORITY_meta-lemonbeat-firmware = "6" -LAYERSERIES_COMPAT_meta-lemonbeat-firmware = "dunfell zeus" +LAYERSERIES_COMPAT_meta-lemonbeat-firmware = "nanbield" diff --git a/yocto/meta-mediatek b/yocto/meta-mediatek deleted file mode 160000 index fb349f6..0000000 --- a/yocto/meta-mediatek +++ /dev/null @@ -1 +0,0 @@ -Subproject commit fb349f6c36dda8f082cb95a856845b5f6310d1ab diff --git a/yocto/meta-openembedded b/yocto/meta-openembedded index e42d1e7..1750c66 160000 --- a/yocto/meta-openembedded +++ b/yocto/meta-openembedded @@ -1 +1 @@ -Subproject commit e42d1e758f9f08b98c0e8c6f0532316951bb276f +Subproject commit 1750c66ae8e4268c472c0b2b94748a59d6ef866d diff --git a/yocto/meta-readonly-rootfs-overlay b/yocto/meta-readonly-rootfs-overlay index f3e93d2..9e0cc7e 160000 --- a/yocto/meta-readonly-rootfs-overlay +++ b/yocto/meta-readonly-rootfs-overlay @@ -1 +1 @@ -Subproject commit f3e93d2ef2508a6dffc731b2d71429f30bfde147 +Subproject commit 9e0cc7e6494cf9270373d87045f57f1b6a151da7 diff --git a/yocto/meta-rust b/yocto/meta-rust deleted file mode 160000 index c654f5c..0000000 --- a/yocto/meta-rust +++ /dev/null @@ -1 +0,0 @@ -Subproject commit c654f5cb928bd4f4c7da7d74a8356fd2a94283f6 diff --git a/yocto/meta-swupdate b/yocto/meta-swupdate index 817b6ad..0c84450 160000 --- a/yocto/meta-swupdate +++ b/yocto/meta-swupdate @@ -1 +1 @@ -Subproject commit 817b6ad42156b33d3b2ac72a75b8b656ff4a3467 +Subproject commit 0c84450bd184d0c16d24fd51ab589106cdc68507 diff --git a/yocto/openembedded-core b/yocto/openembedded-core index 8980a61..f1ec791 160000 --- a/yocto/openembedded-core +++ b/yocto/openembedded-core @@ -1 +1 @@ -Subproject commit 8980a61f7256297562eaa1a62423837d74a97fbc +Subproject commit f1ec7916e2455a6bfe79ba6085fd91eb0426d663