Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Drop obsolete bullseye-backports / fix CI / fix arm64 native build / fix Node-RED disabling #490

Merged
merged 4 commits into from
Oct 7, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/free-disk-space/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 0 additions & 4 deletions conf/distro/iot2050-debian.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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}"

Expand Down
31 changes: 31 additions & 0 deletions isar-patches/0001-optee-client-Fix-native-arm64-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From fce7e3667affe5fce82381baeb473dd7342bf00d Mon Sep 17 00:00:00 2001
From: Jan Kiszka <[email protected]>
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 <[email protected]>
---
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

3 changes: 3 additions & 0 deletions kas/iot2050.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions recipes-core/images/iot2050-image-example.bb
Original file line number Diff line number Diff line change
Expand Up @@ -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 ''}"