diff options
-rw-r--r-- | meta/classes/image_types_wic.bbclass | 2 | ||||
-rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/meta/classes/image_types_wic.bbclass b/meta/classes/image_types_wic.bbclass index 4711c24593..5cd1c0802d 100644 --- a/meta/classes/image_types_wic.bbclass +++ b/meta/classes/image_types_wic.bbclass | |||
@@ -3,7 +3,7 @@ | |||
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 RECIPE_SYSROOT_NATIVE \ | 5 | IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD INITRD_LIVE ISODIR RECIPE_SYSROOT_NATIVE \ |
6 | ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS TRANSLATED_TARGET_ARCH" | 6 | ROOTFS_SIZE STAGING_DATADIR STAGING_DIR STAGING_LIBDIR TARGET_SYS" |
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" |
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 1ceba62be0..b464263c3d 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |||
@@ -162,11 +162,9 @@ class IsoImagePlugin(SourcePlugin): | |||
162 | if not image_type: | 162 | if not image_type: |
163 | raise WicError("Couldn't find INITRAMFS_FSTYPES, exiting.") | 163 | raise WicError("Couldn't find INITRAMFS_FSTYPES, exiting.") |
164 | 164 | ||
165 | target_arch = get_bitbake_var("TRANSLATED_TARGET_ARCH") | 165 | machine = os.path.basename(initrd_dir) |
166 | if not target_arch: | ||
167 | raise WicError("Couldn't find TRANSLATED_TARGET_ARCH, exiting.") | ||
168 | 166 | ||
169 | initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, target_arch, image_type))[0] | 167 | initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, machine, image_type))[0] |
170 | 168 | ||
171 | if not os.path.exists(initrd): | 169 | if not os.path.exists(initrd): |
172 | # Create initrd from rootfs directory | 170 | # Create initrd from rootfs directory |