Date
1 - 2 of 2
[isar-cip-core][PATCH] Remove BASE_DISTRO_CODENAME from OVERRIDES variable list
|
Srinuvasan A
From: Srinuvasan A <srinuvasan_a@...>
In this commit "71039175" onwords ISAR supports additional overrides ie: BASE_DISTRO_CODENAME, hence remove the local one. Signed-off-by: Srinuvasan A <srinuvasan_a@...> --- kas/opt/ebg-swu.yml | 4 +--- recipes-core/images/cip-core-image-security.bb | 2 -- recipes-core/swupdate/swupdate.inc | 4 +--- 3 files changed, 2 insertions(+), 8 deletions(-) diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml index b534c50..62889fb 100644 --- a/kas/opt/ebg-swu.yml +++ b/kas/opt/ebg-swu.yml @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2021 +# Copyright (c) Siemens AG, 2022 # # Authors: # Quirin Gylstorff <quirin.gylstorff@...> @@ -27,10 +27,8 @@ local_conf_header: # Add ovmf binaries for qemu IMAGER_BUILD_DEPS_append_qemu-amd64 += "ovmf-binaries" # not needed for Debian 11 and later - OVERRIDES_append_qemu-amd64 = ":${BASE_DISTRO_CODENAME}" DISTRO_APT_SOURCES_append_qemu-amd64_buster = " conf/distro/debian-buster-backports.list" DISTRO_APT_PREFERENCES_append_qemu-amd64_buster = " conf/distro/preferences.ovmf-snakeoil.conf" # Add U-Boot for qemu IMAGER_BUILD_DEPS_append_qemu-arm64 += "u-boot-qemu-arm64" IMAGER_BUILD_DEPS_append_qemu-arm += "u-boot-qemu-arm" - diff --git a/recipes-core/images/cip-core-image-security.bb b/recipes-core/images/cip-core-image-security.bb index 8ea032c..58a0f98 100644 --- a/recipes-core/images/cip-core-image-security.bb +++ b/recipes-core/images/cip-core-image-security.bb @@ -40,8 +40,6 @@ IMAGE_PREINSTALL += " \ util-linux \ " -OVERRIDES_append = ":${BASE_DISTRO_CODENAME}" - # Package names based on the distro version IMAGE_PREINSTALL_append_buster = " libtss2-esys0" IMAGE_PREINSTALL_append_bullseye = " libtss2-esys-3.0.2-0" diff --git a/recipes-core/swupdate/swupdate.inc b/recipes-core/swupdate/swupdate.inc index f2d478d..72c116a 100644 --- a/recipes-core/swupdate/swupdate.inc +++ b/recipes-core/swupdate/swupdate.inc @@ -1,7 +1,7 @@ # # CIP Core, generic profile # -# Copyright (c) Siemens AG, 2021 +# Copyright (c) Siemens AG, 2022 # # Authors: # Quirin Gylstorff <quirin.gylstorff@...> @@ -13,8 +13,6 @@ HOMEPAGE= "https://github.com/sbabic/swupdate" LICENSE = "GPL-2.0" LIC_FILES_CHKSUM = "file://${LAYERDIR_isar}/licenses/COPYING.GPLv2;md5=751419260aa954499f7abaabaa882bbe" -OVERRIDES_append = ":${BASE_DISTRO_CODENAME}" - def get_bootloader_build_profile(d): bootloader = d.getVar("SWUPDATE_BOOTLOADER") or "" if bootloader == "efibootguard": -- 2.25.1 |
|
|
|
Jan Kiszka
On 07.10.22 14:56, Srinuvasan A wrote:
From: Srinuvasan A <srinuvasan_a@...>Ah, good cleanup! Signed-off-by: Srinuvasan A <srinuvasan_a@...>I prefer to convert this into "2021-2022". Will do that while merging. #Thanks, merged to next, Jan -- Siemens AG, Technology Competence Center Embedded Linux |
|
|