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 /scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |
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 'scripts/lib/wic/plugins/source/isoimage-isohybrid.py')
-rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 8 |
1 files changed, 4 insertions, 4 deletions
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 |