From: Ryan Eatmon <reatmon@ti.com>
To: Praneeth Bajjuri <praneeth@ti.com>,
Denys Dmytriyenko <denys@konsulko.com>,
<meta-arago@lists.yoctoproject.org>
Subject: [meta-arago][master/scarthgap][PATCH] conf/images: Add ARAGO_IMAGE_SUFFIX to image names
Date: Sat, 13 Apr 2024 16:11:13 -0500 [thread overview]
Message-ID: <20240413211113.16233-1-reatmon@ti.com> (raw)
When attempting to merge the build artifacts from bitbake into a new release
tarball coupled with running multiple bitbake builds for non-RT and RT kernels,
the common naming for the image files poses an issue that requires a manual rename
of the RT image file to make it unique.
This patch adds a new ARAGO_IMAGE_SUFFIX variable that is normally "", but for RT
builds is set to "-rt" so that the image files are different.
Signed-off-by: Ryan Eatmon <reatmon@ti.com>
---
meta-arago-distro/classes/tisdk-bundle.bbclass | 4 ++--
meta-arago-distro/classes/tisdk-sw-manifest.bbclass | 8 ++++----
meta-arago-distro/conf/distro/arago.conf | 2 ++
.../recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb | 2 +-
meta-arago-distro/recipes-core/images/arago-image.inc | 2 +-
meta-arago-distro/recipes-core/images/tisdk-base-image.bb | 2 +-
.../recipes-core/images/tisdk-bootstrap-base-image.bb | 2 +-
.../recipes-core/images/tisdk-bootstrap-image.bb | 2 +-
.../recipes-core/images/tisdk-core-bundle.bb | 2 +-
.../recipes-core/images/tisdk-default-image.bb | 2 +-
.../recipes-core/images/tisdk-jailhouse-image.bb | 2 +-
.../recipes-core/images/tisdk-jailhouse-inmate.bb | 2 +-
.../recipes-core/images/tisdk-thinlinux-image.bb | 2 +-
meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb | 2 +-
.../recipes-core/images/tisdk-tiny-initramfs.bb | 2 +-
15 files changed, 20 insertions(+), 18 deletions(-)
diff --git a/meta-arago-distro/classes/tisdk-bundle.bbclass b/meta-arago-distro/classes/tisdk-bundle.bbclass
index 029f5328..c2abc056 100644
--- a/meta-arago-distro/classes/tisdk-bundle.bbclass
+++ b/meta-arago-distro/classes/tisdk-bundle.bbclass
@@ -165,9 +165,9 @@ tisdk_image_build () {
do
for type in ${TARGET_IMAGE_TYPES}
do
- if [ -e ${DEPLOY_DIR_IMAGE}/${image}-${MACHINE}.rootfs.${type} ]
+ if [ -e ${DEPLOY_DIR_IMAGE}/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.rootfs.${type} ]
then
- cp ${DEPLOY_DIR_IMAGE}/${image}-${MACHINE}.rootfs.${type} ${IMAGE_ROOTFS}/filesystem/
+ cp ${DEPLOY_DIR_IMAGE}/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.rootfs.${type} ${IMAGE_ROOTFS}/filesystem/
fi
done
done
diff --git a/meta-arago-distro/classes/tisdk-sw-manifest.bbclass b/meta-arago-distro/classes/tisdk-sw-manifest.bbclass
index b44dcf60..e4733657 100644
--- a/meta-arago-distro/classes/tisdk-sw-manifest.bbclass
+++ b/meta-arago-distro/classes/tisdk-sw-manifest.bbclass
@@ -403,12 +403,12 @@ sw_manifest_target() {
for image in ${TARGET_IMAGES}
do
# Only extract tar.gz or tar.bz2 types
- if [ -e ${IMAGE_ROOTFS}/filesystem/${image}-${MACHINE}.rootfs.tar.xz ]
+ if [ -e ${IMAGE_ROOTFS}/filesystem/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.rootfs.tar.xz ]
then
- tar xJf ${IMAGE_ROOTFS}/filesystem/${image}-${MACHINE}.rootfs.tar.xz -C ${IMAGE_ROOTFS}/filesystem --wildcards *.control
- elif [ -e ${IMAGE_ROOTFS}/filesystem/${image}-${MACHINE}.rootfs.tar.gz ]
+ tar xJf ${IMAGE_ROOTFS}/filesystem/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.rootfs.tar.xz -C ${IMAGE_ROOTFS}/filesystem --wildcards *.control
+ elif [ -e ${IMAGE_ROOTFS}/filesystem/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.rootfs.tar.gz ]
then
- tar xzf ${IMAGE_ROOTFS}/filesystem/${image}-${MACHINE}.rootfs.tar.gz -C ${IMAGE_ROOTFS}/filesystem --wildcards *.control
+ tar xzf ${IMAGE_ROOTFS}/filesystem/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.rootfs.tar.gz -C ${IMAGE_ROOTFS}/filesystem --wildcards *.control
fi
done
diff --git a/meta-arago-distro/conf/distro/arago.conf b/meta-arago-distro/conf/distro/arago.conf
index 00295d6c..b82fa76b 100644
--- a/meta-arago-distro/conf/distro/arago.conf
+++ b/meta-arago-distro/conf/distro/arago.conf
@@ -144,10 +144,12 @@ PERF_FEATURES_ENABLE ?= "perf-scripting perf-tui"
SKIP_META_GNOME_SANITY_CHECK = "1"
ARAGO_KERNEL_SUFFIX ?= ""
+ARAGO_IMAGE_SUFFIX ?= ""
# Set real-time kernel suffix
ARAGO_RT_ENABLE ?= "0"
ARAGO_KERNEL_SUFFIX:append = "${@oe.utils.conditional("ARAGO_RT_ENABLE", "1", "-rt", "", d)}"
+ARAGO_IMAGE_SUFFIX:append = "${@oe.utils.conditional("ARAGO_RT_ENABLE", "1", "-rt", "", d)}"
# Set systest kernel suffix
ARAGO_SYSTEST_ENABLE ?= "0"
diff --git a/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb b/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb
index 121cba61..0eaf9314 100644
--- a/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb
+++ b/meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb
@@ -14,7 +14,7 @@ TARGET = "bootstrap-rootfs-${MACHINE}.cpio"
do_install() {
install -d ${D}/boot
- install -m 0644 ${DEPLOY_DIR_IMAGE}/${BOOSTRAP_IMAGE}-${MACHINE}.rootfs.cpio ${D}/boot/${TARGET}
+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${BOOSTRAP_IMAGE}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.rootfs.cpio ${D}/boot/${TARGET}
}
FILES:${PN} = "/boot"
diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc
index 00308b57..17325619 100644
--- a/meta-arago-distro/recipes-core/images/arago-image.inc
+++ b/meta-arago-distro/recipes-core/images/arago-image.inc
@@ -14,7 +14,7 @@ IMAGE_INSTALL = " \
${CORE_IMAGE_EXTRA_INSTALL} \
"
-export IMAGE_BASENAME = "arago-image"
+export IMAGE_BASENAME = "arago-image${ARAGO_IMAGE_SUFFIX}"
IMAGE_LINGUAS = ""
diff --git a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb
index 83f1899b..f5d5f29b 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb
@@ -16,4 +16,4 @@ IMAGE_INSTALL += "\
${ARAGO_BASE_IMAGE_EXTRA_INSTALL} \
"
-export IMAGE_BASENAME = "tisdk-base-image"
+export IMAGE_BASENAME = "tisdk-base-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb b/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb
index 8b7f10c9..ce3b008e 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb
@@ -19,4 +19,4 @@ IMAGE_INSTALL += " \
${ARAGO_BOOTSTRAP_IMAGE_EXTRA_INSTALL} \
"
-export IMAGE_BASENAME = "tisdk-bootstrap-base-image"
+export IMAGE_BASENAME = "tisdk-bootstrap-base-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb b/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb
index b41f09fb..5fe0463d 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb
@@ -19,4 +19,4 @@ IMAGE_INSTALL += " \
${ARAGO_BOOTSTRAP_IMAGE_EXTRA_INSTALL} \
"
-export IMAGE_BASENAME = "tisdk-bootstrap-image"
+export IMAGE_BASENAME = "tisdk-bootstrap-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
index 9adb4f93..9c2bb015 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb
@@ -17,4 +17,4 @@ DEPLOY_IMAGES_NAME:append:am65xx-evm = " sysfw-am65x_sr2-gp-evm.itb"
DEPLOY_IMAGES_NAME:append:am65xx-hs-evm = " sysfw-am65x_sr2-hs-evm.itb"
ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle"
-export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}"
+export IMAGE_BASENAME = "${ARAGO_TISDK_IMAGE}${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
index 9c3446f3..858a10d4 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb
@@ -33,7 +33,7 @@ IMAGE_INSTALL += "\
packagegroup-arago-tisdk-sysrepo \
"
-export IMAGE_BASENAME = "tisdk-default-image"
+export IMAGE_BASENAME = "tisdk-default-image${ARAGO_IMAGE_SUFFIX}"
# Disable ubi/ubifs as the filesystem requires more space than is
# available on the HW.
diff --git a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb b/meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb
index 339e4895..9240e0b9 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb
@@ -11,6 +11,6 @@ COMPATIBLE_MACHINE = "am62xx|am62pxx"
IMAGE_INSTALL += " jailhouse"
-export IMAGE_BASENAME = "tisdk-jailhouse-image"
+export IMAGE_BASENAME = "tisdk-jailhouse-image${ARAGO_IMAGE_SUFFIX}"
WIC_CREATE_EXTRA_ARGS:append = " --no-fstab-update"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb b/meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb
index 57efd009..aba5ee13 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb
@@ -13,4 +13,4 @@ IMAGE_FSTYPES += "cpio"
PACKAGE_INSTALL += "jailhouse-inmate"
-export IMAGE_BASENAME = "tisdk-jailhouse-inmate"
+export IMAGE_BASENAME = "tisdk-jailhouse-inmate${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb b/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb
index 13e86902..34494976 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb
@@ -21,7 +21,7 @@ IMAGE_INSTALL += "\
${ARAGO_THIN_IMAGE_EXTRA_INSTALL} \
"
-export IMAGE_BASENAME = "tisdk-thinlinux-image"
+export IMAGE_BASENAME = "tisdk-thinlinux-image${ARAGO_IMAGE_SUFFIX}"
# Disable ubi/ubifs as the filesystem requires more space than is
# available on the HW.
diff --git a/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb b/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb
index c8a584bd..0bb6b798 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb
@@ -20,4 +20,4 @@ IMAGE_INSTALL += " \
DEPENDS += " tisdk-tiny-initramfs"
-export IMAGE_BASENAME = "tisdk-tiny-image"
+export IMAGE_BASENAME = "tisdk-tiny-image${ARAGO_IMAGE_SUFFIX}"
diff --git a/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb b/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb
index a47964bf..37b777f6 100644
--- a/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb
+++ b/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb
@@ -23,7 +23,7 @@ IMAGE_FSTYPES = "${INITRAMFS_FSTYPES}"
PACKAGE_INSTALL = "packagegroup-arago-initramfs"
-export IMAGE_BASENAME = "tisdk-tiny-initramfs"
+export IMAGE_BASENAME = "tisdk-tiny-initramfs${ARAGO_IMAGE_SUFFIX}"
# To further reduce the size of the rootfs, remove the /boot directory from
# the final image this is usually done by adding RDEPENDS_kernel-base = ""
--
2.17.1
reply other threads:[~2024-04-13 21:11 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240413211113.16233-1-reatmon@ti.com \
--to=reatmon@ti.com \
--cc=denys@konsulko.com \
--cc=meta-arago@lists.yoctoproject.org \
--cc=praneeth@ti.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).