diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2016-07-12 16:50:03 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-31 14:38:32 +0000 |
commit | 66d08e0fdad5deb0d5228a0fadb1a1ef5d0142cc (patch) | |
tree | 0cf212338616759660db5c025e1bf81f3c6056cb /scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |
parent | 62310b3726cbbbd34da74f90e7de92ad831aa297 (diff) | |
download | poky-66d08e0fdad5deb0d5228a0fadb1a1ef5d0142cc.tar.gz |
wic: Look for image artifacts in a common location
Rather than have each image type look for artifacts in image-specific
locations, move towards having them look for artifacts in a common
location, in this case DEPLOY_DIR_IMAGE
Use the existing deploy.bbclass to have the bootloaders put their binaries
in DEPLOY_DIR_IMAGE and then wic will find them and place them in the image
(From OE-Core rev: 1c8acea91e775b1b6f8b25e774aaba3e790fc59b)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Saul Wold <sgw@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 | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index a637ce5025..b54a2290d8 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py | |||
@@ -249,6 +249,7 @@ class IsoImagePlugin(SourcePlugin): | |||
249 | part.rootfs_dir = rootfs_dir | 249 | part.rootfs_dir = rootfs_dir |
250 | 250 | ||
251 | # Prepare rootfs.img | 251 | # Prepare rootfs.img |
252 | hdd_dir = get_bitbake_var("DEPLOY_DIR_IMAGE") | ||
252 | img_iso_dir = get_bitbake_var("ISODIR") | 253 | img_iso_dir = get_bitbake_var("ISODIR") |
253 | rootfs_img = "%s/rootfs.img" % img_iso_dir | 254 | rootfs_img = "%s/rootfs.img" % img_iso_dir |
254 | if not os.path.isfile(rootfs_img): | 255 | if not os.path.isfile(rootfs_img): |
@@ -278,10 +279,19 @@ class IsoImagePlugin(SourcePlugin): | |||
278 | if os.path.isfile(part.source_file): | 279 | if os.path.isfile(part.source_file): |
279 | os.remove(part.source_file) | 280 | os.remove(part.source_file) |
280 | 281 | ||
281 | # Prepare initial ramdisk | 282 | # Support using a different initrd other than default |
282 | initrd = "%s/initrd" % img_iso_dir | 283 | if source_params.get('initrd'): |
283 | if not os.path.isfile(initrd): | 284 | initrd = source_params['initrd'] |
284 | initrd = cls._build_initramfs_path(rootfs_dir, cr_workdir) | 285 | if not hdd_dir: |
286 | msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n") | ||
287 | cp_cmd = "cp %s/%s %s" % (hdd_dir, initrd, cr_workdir) | ||
288 | else: | ||
289 | # Prepare initial ramdisk | ||
290 | initrd = "%s/initrd" % hdd_dir | ||
291 | if not os.path.isfile(initrd): | ||
292 | initrd = "%s/initrd" % img_iso_dir | ||
293 | if not os.path.isfile(initrd): | ||
294 | initrd = cls._build_initramfs_path(rootfs_dir, cr_workdir) | ||
285 | 295 | ||
286 | install_cmd = "install -m 0644 %s %s/initrd" \ | 296 | install_cmd = "install -m 0644 %s %s/initrd" \ |
287 | % (initrd, isodir) | 297 | % (initrd, isodir) |