From b775a7fe17eb60bd0b58ac242f27339a20077a6d Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 6 Jun 2023 15:38:23 +0100 Subject: [PATCH 1/2] distro: Fix cassini-dev distro feature builds When building with `cassini-dev` as DISTRO_FEATURE, the appropriate image features are not turned on due to typo named as `cassini-devel` This patch fixes the following: * Remove `cassini-devel.inc` * Add `cassini-dev.inc` to include `debug-tweaks` as IMAGE_FEATURE * Update `cassini-distro-feature.bbclass` to reflect the above change Changelog: bug Signed-off-by: Vikas Katariya --- .../classes/cassini-distro-features.bbclass | 5 +++-- meta-cassini-distro/conf/distro/include/cassini-dev.inc | 6 ++++++ meta-cassini-distro/conf/distro/include/cassini-devel.inc | 8 -------- 3 files changed, 9 insertions(+), 10 deletions(-) create mode 100644 meta-cassini-distro/conf/distro/include/cassini-dev.inc delete mode 100644 meta-cassini-distro/conf/distro/include/cassini-devel.inc diff --git a/meta-cassini-distro/classes/cassini-distro-features.bbclass b/meta-cassini-distro/classes/cassini-distro-features.bbclass index 89f1e12..392aab9 100644 --- a/meta-cassini-distro/classes/cassini-distro-features.bbclass +++ b/meta-cassini-distro/classes/cassini-distro-features.bbclass @@ -1,4 +1,5 @@ -# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved. +# Copyright (c) 2022-2023 Arm Limited and/or its affiliates. +# # # SPDX-License-Identifier: MIT @@ -7,7 +8,7 @@ # Require inc file for development DISTRO_FEATURE require ${@bb.utils.contains(\ -'DISTRO_FEATURES','cassini-devel','conf/distro/include/cassini-devel.inc', '', d)} +'DISTRO_FEATURES','cassini-dev','conf/distro/include/cassini-dev.inc', '', d)} # Require inc file for testing DISTRO_FEATURE require ${@bb.utils.contains(\ diff --git a/meta-cassini-distro/conf/distro/include/cassini-dev.inc b/meta-cassini-distro/conf/distro/include/cassini-dev.inc new file mode 100644 index 0000000..4902cfc --- /dev/null +++ b/meta-cassini-distro/conf/distro/include/cassini-dev.inc @@ -0,0 +1,6 @@ +# Copyright (c) 2023 Arm Limited and/or its affiliates. +# +# +# SPDX-License-Identifier: MIT + +IMAGE_FEATURES:append = " debug-tweaks" diff --git a/meta-cassini-distro/conf/distro/include/cassini-devel.inc b/meta-cassini-distro/conf/distro/include/cassini-devel.inc deleted file mode 100644 index 0abfd2d..0000000 --- a/meta-cassini-distro/conf/distro/include/cassini-devel.inc +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2022 Arm Limited or its affiliates. All rights reserved. -# -# SPDX-License-Identifier: MIT - -# config specifc to the cassini-devel distro feature, enabled using -# DISTRO_FEATURES - -EXTRA_IMAGE_FEATURES:append = " debug-tweaks" -- GitLab From fdaae813c353385342bf15ad705b6a6ac949b102 Mon Sep 17 00:00:00 2001 From: Vikas Katariya Date: Tue, 6 Jun 2023 15:58:43 +0100 Subject: [PATCH 2/2] distro: Refactor `debug-tweaks` usage for DISTRO_FEATURES Inclusion of `EXTRA_IMAGE_FEATURES` complicates the build flow if `IMAGE_FEATURES` is already present, instead we should append to it. Therefore, refactor `cassini-sdk.inc` and `cassini-test.inc` to include required `debug-tweaks` feature for distro. This patch also fixes the typo. Signed-off-by: Vikas Katariya --- meta-cassini-distro/conf/distro/include/cassini-sdk.inc | 5 +++-- meta-cassini-distro/conf/distro/include/cassini-test.inc | 6 +++--- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/meta-cassini-distro/conf/distro/include/cassini-sdk.inc b/meta-cassini-distro/conf/distro/include/cassini-sdk.inc index f47db56..5fd666f 100644 --- a/meta-cassini-distro/conf/distro/include/cassini-sdk.inc +++ b/meta-cassini-distro/conf/distro/include/cassini-sdk.inc @@ -3,16 +3,17 @@ # # SPDX-License-Identifier: MIT -# Config specifc to the cassini-sdk distro feature, enabled using +# Config specific to the cassini-sdk distro feature, enabled using # DISTRO_FEATURES +include cassini-dev.inc + IMAGE_FEATURES:append:libc-glibc = " \ package-management \ dev-pkgs \ tools-sdk \ tools-debug \ tools-profile \ - debug-tweaks \ ssh-server-openssh" IMAGE_INSTALL:append:libc-glibc = " kernel-base kernel-devsrc kernel-modules" diff --git a/meta-cassini-distro/conf/distro/include/cassini-test.inc b/meta-cassini-distro/conf/distro/include/cassini-test.inc index 801c306..98e2fcb 100644 --- a/meta-cassini-distro/conf/distro/include/cassini-test.inc +++ b/meta-cassini-distro/conf/distro/include/cassini-test.inc @@ -3,12 +3,12 @@ # # SPDX-License-Identifier: MIT -# Config specifc to the cassini-test distro feature, enabled using +# Config specific to the cassini-test distro feature, enabled using # DISTRO_FEATURES -DISTRO_FEATURES:append:libc-glibc = " ptest" +include cassini-dev.inc -EXTRA_IMAGE_FEATURES:append:libc-glibc = " debug-tweaks" +DISTRO_FEATURES:append:libc-glibc = " ptest" IMAGE_INSTALL:append:libc-glibc = " jfrog-cli \ packagegroup-ts-tests-psa \ -- GitLab