diff options
| author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-09-16 14:54:49 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-09-17 09:47:45 +0100 |
| commit | 70aeecf62da7c0e3b2a0e4110b3c142f7eb374d9 (patch) | |
| tree | c707f4190b972a8cf1ea3a0beaf15045e95de2d0 /meta | |
| parent | a00ca02fbd20af5dcbc9ba6aff65645780195ebf (diff) | |
| download | poky-70aeecf62da7c0e3b2a0e4110b3c142f7eb374d9.tar.gz | |
*-initramfs: don't use .rootfs IMAGE_NAME_SUFFIX
* fixes the issue when image-live.bbclass expects the image
ending with just INITRAMFS_FSTYPES:
image-live.bbclass:INITRD_LIVE ?= "${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE_LIVE}-${MACHINE}.${INITRAMFS_FSTYPES}"
while by default it now was with .rootfs suffix:
-rw-r--r-- 2 bitbake bitbake 1.5K Oct 25 16:12 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs.env
-rw-r--r-- 4 bitbake bitbake 11M Oct 25 16:13 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64-1.0-r0-20191025154349.cpio.gz
-rw-r--r-- 4 bitbake bitbake 1.2K Oct 25 16:11 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64-1.0-r0-20191025154349.manifest
-rw-r--r-- 4 bitbake bitbake 1.3K Oct 25 16:12 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64-1.0-r0-20191025154349.qemuboot.conf
-rw-r--r-- 4 bitbake bitbake 196K Oct 25 16:11 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64-1.0-r0-20191025154349.testdata.json
-rw-r--r-- 4 bitbake bitbake 118M Oct 25 16:13 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64-1.0-r0-20191025154349.wic
-rw-r--r-- 4 bitbake bitbake 3.1K Oct 25 16:13 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64-1.0-r0-20191025154349.wic.bmap
-rw-r--r-- 4 bitbake bitbake 1.3K Oct 25 16:12 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64.qemuboot.conf
-rw-r--r-- 4 bitbake bitbake 11M Oct 25 16:13 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64.rootfs.cpio.gz
-rw-r--r-- 4 bitbake bitbake 1.2K Oct 25 16:11 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64.rootfs.manifest
-rw-r--r-- 4 bitbake bitbake 118M Oct 25 16:13 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64.rootfs.wic
-rw-r--r-- 4 bitbake bitbake 3.1K Oct 25 16:13 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64.rootfs.wic.bmap
-rw-r--r-- 4 bitbake bitbake 196K Oct 25 16:11 /OE/build/oe-core/tmp/deploy/images/genericx86-64/core-image-minimal-initramfs-genericx86-64.testdata.json
initramfs images aren't normally used for rootfs, so just set
the suffix to empty, people using different artifact names might
still need to set INITRD_LIVE (e.g. when their images don't end
with "-${MACHINE}" as well)
(From OE-Core rev: 431a7dfc6c1c86ead3e636d42e2bf1f1f906588c)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
3 files changed, 3 insertions, 0 deletions
diff --git a/meta/recipes-core/images/core-image-minimal-initramfs.bb b/meta/recipes-core/images/core-image-minimal-initramfs.bb index 83d0eaa8df..664fe7310e 100644 --- a/meta/recipes-core/images/core-image-minimal-initramfs.bb +++ b/meta/recipes-core/images/core-image-minimal-initramfs.bb | |||
| @@ -17,6 +17,7 @@ PACKAGE_INSTALL = "${INITRAMFS_SCRIPTS} ${VIRTUAL-RUNTIME_base-utils} udev base- | |||
| 17 | IMAGE_FEATURES = "" | 17 | IMAGE_FEATURES = "" |
| 18 | 18 | ||
| 19 | export IMAGE_BASENAME = "${MLPREFIX}core-image-minimal-initramfs" | 19 | export IMAGE_BASENAME = "${MLPREFIX}core-image-minimal-initramfs" |
| 20 | IMAGE_NAME_SUFFIX ?= "" | ||
| 20 | IMAGE_LINGUAS = "" | 21 | IMAGE_LINGUAS = "" |
| 21 | 22 | ||
| 22 | LICENSE = "MIT" | 23 | LICENSE = "MIT" |
diff --git a/meta/recipes-core/images/core-image-tiny-initramfs.bb b/meta/recipes-core/images/core-image-tiny-initramfs.bb index 0eca6d9944..5849900742 100644 --- a/meta/recipes-core/images/core-image-tiny-initramfs.bb +++ b/meta/recipes-core/images/core-image-tiny-initramfs.bb | |||
| @@ -13,6 +13,7 @@ PACKAGE_INSTALL = "initramfs-live-boot-tiny packagegroup-core-boot dropbear ${VI | |||
| 13 | IMAGE_FEATURES = "" | 13 | IMAGE_FEATURES = "" |
| 14 | 14 | ||
| 15 | export IMAGE_BASENAME = "core-image-tiny-initramfs" | 15 | export IMAGE_BASENAME = "core-image-tiny-initramfs" |
| 16 | IMAGE_NAME_SUFFIX ?= "" | ||
| 16 | IMAGE_LINGUAS = "" | 17 | IMAGE_LINGUAS = "" |
| 17 | 18 | ||
| 18 | LICENSE = "MIT" | 19 | LICENSE = "MIT" |
diff --git a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb b/meta/recipes-extended/images/core-image-testmaster-initramfs.bb index 09a6d16042..1a2e0af27b 100644 --- a/meta/recipes-extended/images/core-image-testmaster-initramfs.bb +++ b/meta/recipes-extended/images/core-image-testmaster-initramfs.bb | |||
| @@ -8,6 +8,7 @@ PACKAGE_INSTALL = "initramfs-live-boot initramfs-live-install-testfs initramfs-l | |||
| 8 | IMAGE_FEATURES = "" | 8 | IMAGE_FEATURES = "" |
| 9 | 9 | ||
| 10 | export IMAGE_BASENAME = "core-image-testmaster-initramfs" | 10 | export IMAGE_BASENAME = "core-image-testmaster-initramfs" |
| 11 | IMAGE_NAME_SUFFIX ?= "" | ||
| 11 | IMAGE_LINGUAS = "" | 12 | IMAGE_LINGUAS = "" |
| 12 | 13 | ||
| 13 | LICENSE = "MIT" | 14 | LICENSE = "MIT" |