diff mbox series

[isar-cip-core] cip-core-images: Make ISAR_RELEASE_CMD available to them all

Message ID 7eb6ec4e-fc57-4725-852e-1b1e1fcc1b86@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core] cip-core-images: Make ISAR_RELEASE_CMD available to them all | expand

Commit Message

Jan Kiszka May 23, 2024, 4:56 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

This was missing so far and was also impacting the reproducibility test.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---

Here, e.g., are the reproducibility improvements visible:
https://gitlab.com/cip-project/cip-core/isar-cip-core/-/jobs/6923388188

Still not green, though, but not longer rootfs issues.

 recipes-core/images/cip-core-image-kernelci.bb         |  2 +-
 recipes-core/images/cip-core-image-security.bb         |  2 +-
 recipes-core/images/cip-core-image.bb                  |  3 +--
 .../images/{cip-core-image.bb => cip-core-image.inc}   | 10 ++--------
 4 files changed, 5 insertions(+), 12 deletions(-)
 copy recipes-core/images/{cip-core-image.bb => cip-core-image.inc} (54%)
diff mbox series

Patch

diff --git a/recipes-core/images/cip-core-image-kernelci.bb b/recipes-core/images/cip-core-image-kernelci.bb
index 479c14c9..849c0761 100644
--- a/recipes-core/images/cip-core-image-kernelci.bb
+++ b/recipes-core/images/cip-core-image-kernelci.bb
@@ -9,7 +9,7 @@ 
 # SPDX-License-Identifier: MIT
 #
 
-inherit image
+require cip-core-image.inc
 
 DESCRIPTION = "CIP Core image for KernelCI"
 
diff --git a/recipes-core/images/cip-core-image-security.bb b/recipes-core/images/cip-core-image-security.bb
index 525a3464..eea50ee7 100644
--- a/recipes-core/images/cip-core-image-security.bb
+++ b/recipes-core/images/cip-core-image-security.bb
@@ -9,7 +9,7 @@ 
 # SPDX-License-Identifier: MIT
 #
 
-inherit image
+require cip-core-image.inc
 
 DESCRIPTION = "CIP Core image including security packages"
 
diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb
index 0ec72208..4a9cea9d 100644
--- a/recipes-core/images/cip-core-image.bb
+++ b/recipes-core/images/cip-core-image.bb
@@ -9,9 +9,8 @@ 
 # SPDX-License-Identifier: MIT
 #
 
-inherit image
+require cip-core-image.inc
 
-ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always --match 'v[0-9].[0-9]*'"
 DESCRIPTION = "CIP Core image"
 
 IMAGE_INSTALL += "customizations"
diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.inc
similarity index 54%
copy from recipes-core/images/cip-core-image.bb
copy to recipes-core/images/cip-core-image.inc
index 0ec72208..7b0f7b04 100644
--- a/recipes-core/images/cip-core-image.bb
+++ b/recipes-core/images/cip-core-image.inc
@@ -1,7 +1,7 @@ 
 #
-# CIP Core, generic profile
+# CIP Core
 #
-# Copyright (c) Siemens AG, 2019
+# Copyright (c) Siemens AG, 2019-2024
 #
 # Authors:
 #  Jan Kiszka <jan.kiszka@siemens.com>
@@ -12,9 +12,3 @@ 
 inherit image
 
 ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always --match 'v[0-9].[0-9]*'"
-DESCRIPTION = "CIP Core image"
-
-IMAGE_INSTALL += "customizations"
-
-CIP_IMAGE_OPTIONS ?= ""
-require ${CIP_IMAGE_OPTIONS}