[meta-arago][master][PATCH v2 5/5] arago-image.inc: Set IMAGE_BASENAME based on package name
Andrew Davis <[email protected]>
| Newsgroups | org.yoctoproject.lists.meta-arago |
|---|---|
| Message-ID | <[email protected]> |
All the image base names are just the package name, so use PN here. This is also common to all images that include arago-image.inc so drop it out of all the individual image recipes. Signed-off-by: Andrew Davis <[email protected]> --- 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 -- meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb | 2 -- meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb | 3 --- meta-arago-distro/recipes-core/images/tisdk-default-image.bb | 2 -- meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb | 2 -- .../recipes-core/images/tisdk-jailhouse-inmate.bb | 2 -- meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb | 2 -- meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb | 2 -- meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb | 2 -- 11 files changed, 1 insertion(+), 22 deletions(-) diff --git a/meta-arago-distro/recipes-core/images/arago-image.inc b/meta-arago-distro/recipes-core/images/arago-image.inc index c6e79118..f085fa23 100644 --- a/meta-arago-distro/recipes-core/images/arago-image.inc +++ b/meta-arago-distro/recipes-core/images/arago-image.inc @@ -9,7 +9,7 @@ IMAGE_INSTALL = " \ ${CORE_IMAGE_EXTRA_INSTALL} \ " -export IMAGE_BASENAME = "arago-image${ARAGO_IMAGE_SUFFIX}" +export IMAGE_BASENAME = "${PN}${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 f6a33f13..25738059 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-base-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-base-image.bb @@ -17,5 +17,3 @@ IMAGE_INSTALL += "\ ${@oe.utils.conditional('ARAGO_BRAND', 'mainline', 'ti-test', '', d)} \ ${ARAGO_BASE_IMAGE_EXTRA_INSTALL} \ " - -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 12ea697a..ed964415 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 @@ -20,5 +20,3 @@ IMAGE_INSTALL += " \ packagegroup-arago-bootstrap \ ${ARAGO_BOOTSTRAP_IMAGE_EXTRA_INSTALL} \ " - -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 f39e2e35..d0aef0de 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-bootstrap-image.bb @@ -20,5 +20,3 @@ IMAGE_INSTALL += " \ bootstrap-initrd \ ${ARAGO_BOOTSTRAP_IMAGE_EXTRA_INSTALL} \ " - -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 ed2eb5ae..0711ec10 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-core-bundle.bb @@ -18,6 +18,3 @@ 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" DEPLOY_IMAGES_NAME:append:ti33x = " extlinux.conf" DEPLOY_IMAGES_NAME:append:ti43x = " extlinux.conf" - -ARAGO_TISDK_IMAGE ?= "tisdk-core-bundle" -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 077fe05f..27c5671c 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-default-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-default-image.bb @@ -30,8 +30,6 @@ IMAGE_INSTALL += "\ packagegroup-arago-tisdk-sysrepo \ " -export IMAGE_BASENAME = "tisdk-default-image${ARAGO_IMAGE_SUFFIX}" - DEVTOOLS = " \ linux-libc-headers-dev \ build-essential \ 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 1f96781a..b7bfc825 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-jailhouse-image.bb @@ -10,5 +10,3 @@ require recipes-core/images/tisdk-default-image.bb COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx" IMAGE_INSTALL += " jailhouse" - -export IMAGE_BASENAME = "tisdk-jailhouse-image${ARAGO_IMAGE_SUFFIX}" 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 1a051161..bcde33d6 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-jailhouse-inmate.bb @@ -12,5 +12,3 @@ COMPATIBLE_MACHINE = "am62xx|am62pxx|am62lxx" IMAGE_FSTYPES += "cpio" PACKAGE_INSTALL += "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 1eb864a6..477986e4 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-thinlinux-image.bb @@ -22,5 +22,3 @@ IMAGE_INSTALL += "\ docker \ ${ARAGO_THIN_IMAGE_EXTRA_INSTALL} \ " - -export IMAGE_BASENAME = "tisdk-thinlinux-image${ARAGO_IMAGE_SUFFIX}" 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 8e7712a8..40c58e99 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-tiny-image.bb @@ -17,5 +17,3 @@ IMAGE_INSTALL += " \ " DEPENDS += " tisdk-tiny-initramfs" - -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 c1c1f358..8a4262b1 100644 --- a/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb +++ b/meta-arago-distro/recipes-core/images/tisdk-tiny-initramfs.bb @@ -14,8 +14,6 @@ INITRAMFS_FSTYPES = "cpio cpio.xz" INITRAMFS_MAXSIZE = "65536" -export IMAGE_BASENAME = "tisdk-tiny-initramfs${ARAGO_IMAGE_SUFFIX}" - INITRAMFS_SCRIPTS ?= "initramfs-framework-base initramfs-module-udev" PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS} ${VIRTUAL-RUNTIME_base-utils} base-passwd" -- 2.39.2