diff options
| author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2017-01-16 14:23:08 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 14:38:32 +0000 |
| commit | 6740b8fdbbc639a261dc914392a4ddab7bacf6b2 (patch) | |
| tree | 796f6c638f285f6962cf43b85f9376138e9faa4b /meta | |
| parent | 66d08e0fdad5deb0d5228a0fadb1a1ef5d0142cc (diff) | |
| download | poky-6740b8fdbbc639a261dc914392a4ddab7bacf6b2.tar.gz | |
isoimage-isohybrid: use TRANSLATED_TARGET_ARCH instead of MACHINE_ARCH
isoimage-sihybrid plugin uses MACHINE_ARCH to get the name of initrd image.
It doesn't work for all machines, for example for quemux86-64 machine
MACHINE_ARCH is quemux86_64 and initrd name is
core-image-minimal-initramfs-qemux86-64.cpio.gz
Used TRANSLATED_TARGET_ARCH variable to get the initrd image name.
Replaced MACHINE_ARCH->TRANSLATED_TARGET_ARCH in WICVARS variable to
make it available from <image>.env file.
(From OE-Core rev: edf0830412de66eada9ef3f3947ca42e301c5377)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/image-wic.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/classes/image-wic.bbclass b/meta/classes/image-wic.bbclass index bd79073b76..3e98959ed1 100644 --- a/meta/classes/image-wic.bbclass +++ b/meta/classes/image-wic.bbclass | |||
| @@ -2,8 +2,8 @@ | |||
| 2 | # variables from this list is written to <image>.env file | 2 | # variables from this list is written to <image>.env file |
| 3 | WICVARS ?= "\ | 3 | WICVARS ?= "\ |
| 4 | BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ | 4 | BBLAYERS IMGDEPLOYDIR DEPLOY_DIR_IMAGE FAKEROOTCMD IMAGE_BASENAME IMAGE_BOOT_FILES \ |
| 5 | IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR MACHINE_ARCH \ | 5 | IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ |
| 6 | RECIPE_SYSROOT_NATIVE ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS" | 6 | ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH" |
| 7 | 7 | ||
| 8 | WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" | 8 | WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" |
| 9 | WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" | 9 | WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" |