conf/images: Add ARAGO_IMAGE_SUFFIX to image names
PATCH 1/1 conf/images: Add ARAGO_IMAGE_SUFFIX to image names
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 <[email protected]>
--- 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(-)
meta-arago-distro/classes/tisdk-bundle.bbclass +2 -2
@@ -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
meta-arago-distro/classes/tisdk-sw-manifest.bbclass +4 -4
@@ -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
meta-arago-distro/conf/distro/arago.conf +2 -0
@@ -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"
meta-arago-distro/recipes-bsp/bootstrap-initrd/bootstrap-initrd_1.0.bb +1 -1
@@ -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"
meta-arago-distro/recipes-core/images/arago-image.inc +1 -1
@@ -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 = ""
meta-arago-distro/recipes-core/images/tisdk-base-image.bb +1 -1
@@ -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}"
meta-arago-distro/recipes-core/images/tisdk-bootstrap-base-image.bb +1 -1
@@ -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}"
meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb +1 -1
@@ -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}"
meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb +1 -1
@@ -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}"
meta-arago-distro/recipes-core/images/tisdk-default-image.bb +1 -1
@@ -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.
meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb +1 -1
@@ -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"
meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb +1 -1
@@ -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}"
meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb +1 -1
@@ -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.
meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb +1 -1
@@ -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}"
meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb +1 -1
@@ -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 = ""
Signature · 1 line
2.17.1