summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/image-wic.bbclass4
-rw-r--r--scripts/lib/wic/plugins/source/isoimage-isohybrid.py8
2 files changed, 6 insertions, 6 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
3WICVARS ?= "\ 3WICVARS ?= "\
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
8WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks" 8WKS_FILE ??= "${IMAGE_BASENAME}.${MACHINE}.wks"
9WKS_FILES ?= "${WKS_FILE} ${IMAGE_BASENAME}.wks" 9WKS_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 b54a2290d8..e4637a3283 100644
--- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
+++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py
@@ -158,11 +158,11 @@ class IsoImagePlugin(SourcePlugin):
158 if not image_type: 158 if not image_type:
159 msger.error("Couldn't find INITRAMFS_FSTYPES, exiting.\n") 159 msger.error("Couldn't find INITRAMFS_FSTYPES, exiting.\n")
160 160
161 machine_arch = get_bitbake_var("MACHINE_ARCH") 161 target_arch = get_bitbake_var("TRANSLATED_TARGET_ARCH")
162 if not machine_arch: 162 if not target_arch:
163 msger.error("Couldn't find MACHINE_ARCH, exiting.\n") 163 msger.error("Couldn't find TRANSLATED_TARGET_ARCH, exiting.\n")
164 164
165 initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, machine_arch, image_type))[0] 165 initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, target_arch, image_type))[0]
166 166
167 if not os.path.exists(initrd): 167 if not os.path.exists(initrd):
168 # Create initrd from rootfs directory 168 # Create initrd from rootfs directory