From 61aa37234c80ac4898ccd51cf667a38903ff6409 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Tue, 3 Oct 2023 20:31:56 +0200 Subject: [PATCH 1/4] ci: free-disk-space: Account for package name change google-cloud-sdk is now google-cloud-cli. Signed-off-by: Jan Kiszka --- .github/workflows/free-disk-space/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/free-disk-space/action.yml b/.github/workflows/free-disk-space/action.yml index 1b614dc1f..55c129993 100644 --- a/.github/workflows/free-disk-space/action.yml +++ b/.github/workflows/free-disk-space/action.yml @@ -5,7 +5,7 @@ runs: steps: - name: Free disk space run: | - sudo apt-get purge 'dotnet*' google-chrome-stable 'temurin*' google-cloud-sdk azure-cli 'mongodb*' powershell firefox chromium 'llvm*' 'libllvm*' 'mysql*' libgl1-mesa-dri apache2 'mono*' 'swift*' microsoft-edge-stable default-jre-headless 'aspnetcore*' + sudo apt-get purge 'dotnet*' google-chrome-stable 'temurin*' google-cloud-cli azure-cli 'mongodb*' powershell firefox chromium 'llvm*' 'libllvm*' 'mysql*' libgl1-mesa-dri apache2 'mono*' 'swift*' microsoft-edge-stable default-jre-headless 'aspnetcore*' sudo rm -rf /usr/local/* /opt/hostedtoolcache /opt/pipx* /opt/az shell: bash - name: Show disk space usage From 2c08293478c8a804d662361a4aa8b71405facb09 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Tue, 3 Oct 2023 20:26:03 +0200 Subject: [PATCH 2/4] Drop obsolete bullseye-backports from apt sources We are on bookworm now. Signed-off-by: Jan Kiszka --- conf/distro/iot2050-debian.conf | 4 ---- 1 file changed, 4 deletions(-) diff --git a/conf/distro/iot2050-debian.conf b/conf/distro/iot2050-debian.conf index 6a321c51b..2ea92af1f 100644 --- a/conf/distro/iot2050-debian.conf +++ b/conf/distro/iot2050-debian.conf @@ -35,10 +35,6 @@ PACKAGES_SELECTION ?= "packages-mainline" DISTRO_APT_SOURCES_MAINLINE_LIST := "${DISTRO_APT_SOURCES}" DISTRO_APT_SOURCES_SNAPSHOT_LIST ?= "conf/distro/debian-snapshot.list" -# needed for SWUpdate 2022.12 -DISTRO_APT_SOURCES:append = " conf/distro/debian-bullseye-backports.list" -DISTRO_APT_PREFERENCES:append = " conf/distro/preferences.swupdate-bullseye-backports.conf" - DISTRO_APT_SOURCES:append:packages-snapshot = " ${DISTRO_APT_SOURCES_SNAPSHOT_LIST}" DISTRO_APT_SOURCES:remove:packages-snapshot = "${DISTRO_APT_SOURCES_MAINLINE_LIST}" From 80cfd1761f3978e5d500f1fd8206c5845a94d24a Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 4 Oct 2023 07:24:26 +0200 Subject: [PATCH 3/4] Fix native build of optee-client This allows to build images natively on arm64 hosts again by fixing an issue in optee-client via Isar. See also #482. Signed-off-by: Jan Kiszka --- ...-optee-client-Fix-native-arm64-build.patch | 31 +++++++++++++++++++ kas/iot2050.yml | 3 ++ 2 files changed, 34 insertions(+) create mode 100644 isar-patches/0001-optee-client-Fix-native-arm64-build.patch diff --git a/isar-patches/0001-optee-client-Fix-native-arm64-build.patch b/isar-patches/0001-optee-client-Fix-native-arm64-build.patch new file mode 100644 index 000000000..3a671428c --- /dev/null +++ b/isar-patches/0001-optee-client-Fix-native-arm64-build.patch @@ -0,0 +1,31 @@ +From fce7e3667affe5fce82381baeb473dd7342bf00d Mon Sep 17 00:00:00 2001 +From: Jan Kiszka +Date: Tue, 3 Oct 2023 21:42:55 +0200 +Subject: [PATCH] optee-client: Fix native arm64 build + +optee-client sets CROSS_COMPILE to arm-linux-gnueabihf- by default, +causing breakages when building natively, e.g. on arm64. Fix this by +simply setting CROSS_COMPILE unconditionally. + +Signed-off-by: Jan Kiszka +--- + meta/recipes-bsp/optee-client/files/debian/rules.tmpl | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/meta/recipes-bsp/optee-client/files/debian/rules.tmpl b/meta/recipes-bsp/optee-client/files/debian/rules.tmpl +index 1b7920d0..7d1b335b 100755 +--- a/meta/recipes-bsp/optee-client/files/debian/rules.tmpl ++++ b/meta/recipes-bsp/optee-client/files/debian/rules.tmpl +@@ -7,9 +7,7 @@ + # + # SPDX-License-Identifier: MIT + +-ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) + export CROSS_COMPILE=$(DEB_HOST_GNU_TYPE)- +-endif + + %: + dh $@ --exclude=.a +-- +2.35.3 + diff --git a/kas/iot2050.yml b/kas/iot2050.yml index 2191defd8..6ea6486a1 100644 --- a/kas/iot2050.yml +++ b/kas/iot2050.yml @@ -30,6 +30,9 @@ repos: commit: ecc7cae423a828d294575301c1584fbe303cba3e layers: meta: + patches: + 01: + path: isar-patches/0001-optee-client-Fix-native-arm64-build.patch cip-core: url: https://gitlab.com/cip-project/cip-core/isar-cip-core.git From 78662ef53c154e7a483ff694a2e6795db94f0ba3 Mon Sep 17 00:00:00 2001 From: Jan Kiszka Date: Wed, 4 Oct 2023 14:53:38 +0200 Subject: [PATCH 4/4] iot2050-image-example: Fix Node-RED inclusion control In kas/opt/no-node-red.yml, this was already correctly spelled, but the image recipe got it wrong, effectively preventing the disabling. Reported-by: Diogo Ivo Signed-off-by: Jan Kiszka --- recipes-core/images/iot2050-image-example.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes-core/images/iot2050-image-example.bb b/recipes-core/images/iot2050-image-example.bb index d3d9f28ef..7581d94c2 100644 --- a/recipes-core/images/iot2050-image-example.bb +++ b/recipes-core/images/iot2050-image-example.bb @@ -43,10 +43,10 @@ IMAGE_INSTALL += " \ tee-supplicant \ " -IOT2050_NOD_RED_SUPPORT ?= "1" +IOT2050_NODE_RED_SUPPORT ?= "1" IMAGE_INSTALL += "${@ ' \ node-red \ node-red-gpio \ node-red-preinstalled-nodes \ - ' if d.getVar('IOT2050_NOD_RED_SUPPORT') == '1' else ''}" + ' if d.getVar('IOT2050_NODE_RED_SUPPORT') == '1' else ''}"