@@ -165,9 +165,9 @@ tisdk_image_build () {
do
for type in ${TARGET_IMAGE_TYPES}
do
- if [ -e ${DEPLOY_DIR_IMAGE}/${image}-${MACHINE}.${type} ]
+ if [ -e ${DEPLOY_DIR_IMAGE}/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.${type} ]
then
- cp ${DEPLOY_DIR_IMAGE}/${image}-${MACHINE}.${type} ${IMAGE_ROOTFS}/filesystem/
+ cp ${DEPLOY_DIR_IMAGE}/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.${type} ${IMAGE_ROOTFS}/filesystem/
fi
done
done
@@ -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}.tar.xz ]
+ if [ -e ${IMAGE_ROOTFS}/filesystem/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.tar.xz ]
then
- tar xJf ${IMAGE_ROOTFS}/filesystem/${image}-${MACHINE}.tar.xz -C ${IMAGE_ROOTFS}/filesystem --wildcards *.control
- elif [ -e ${IMAGE_ROOTFS}/filesystem/${image}-${MACHINE}.tar.gz ]
+ tar xJf ${IMAGE_ROOTFS}/filesystem/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.tar.xz -C ${IMAGE_ROOTFS}/filesystem --wildcards *.control
+ elif [ -e ${IMAGE_ROOTFS}/filesystem/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.tar.gz ]
then
- tar xzf ${IMAGE_ROOTFS}/filesystem/${image}-${MACHINE}.tar.gz -C ${IMAGE_ROOTFS}/filesystem --wildcards *.control
+ tar xzf ${IMAGE_ROOTFS}/filesystem/${image}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.tar.gz -C ${IMAGE_ROOTFS}/filesystem --wildcards *.control
fi
done
@@ -147,10 +147,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"
@@ -14,7 +14,7 @@ TARGET = "bootstrap-rootfs-${MACHINE}.cpio"
do_install() {
install -d ${D}/boot
- install -m 0644 ${DEPLOY_DIR_IMAGE}/${BOOSTRAP_IMAGE}-${MACHINE}.cpio ${D}/boot/${TARGET}
+ install -m 0644 ${DEPLOY_DIR_IMAGE}/${BOOSTRAP_IMAGE}${ARAGO_IMAGE_SUFFIX}-${MACHINE}.cpio ${D}/boot/${TARGET}
}
FILES:${PN} = "/boot"
@@ -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 = ""
@@ -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}"
@@ -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}"
@@ -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}"
@@ -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}"
@@ -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.
@@ -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"
@@ -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}"
@@ -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.
@@ -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}"
@@ -22,7 +22,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 = ""
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. Backport from master: 9e10acff265c4dfcd150329641a71a6cd55c6572 Signed-off-by: Ryan Eatmon <reatmon@ti.com> --- v2: Fix "--" copy/paste error in tisdk-sw-manifest.bbclass. 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(-)