diff options
| author |   Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | 2016-04-01 17:31:19 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-04-03 15:51:36 +0100 |
| commit | 5cabf3b061fd7f3d17d734a1c9ffb831fff15587 (patch) | |
| tree | 96f4d806c820747c540806db67a8b93ad5bbfc6f | |
| parent | 5c60c3621487248920d7229b9a19848752af4480 (diff) | |
| download | openembedded-core-contrib-5cabf3b061fd7f3d17d734a1c9ffb831fff15587.tar.gz | |
wic/isoimage-isohybrid.py: use glob to find initramfs location
Some filenames can omit 'initramfs', or use other names. This makes
detection more flexible by using only the image name, machine arch and
image type in a glob wildcard.
(From OE-Core rev: ca516f5907a661606c35e1ca5c2ece9fc79c77ea)
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 31dc9b6ce6..de99ad8495 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -23,6 +23,7 @@ import os import re import shutil +import glob from wic import msger from wic.pluginbase import SourcePlugin @@ -150,8 +151,7 @@ class IsoImagePlugin(SourcePlugin): if not machine_arch: msger.error("Couldn't find MACHINE_ARCH, exiting.\n") - initrd = "%s/%s-initramfs-%s.%s" \ - % (initrd_dir, image_name, machine_arch, image_type) + initrd = glob.glob('%s/%s*%s.%s' % (initrd_dir, image_name, machine_arch, image_type))[0] if not os.path.exists(initrd): # Create initrd from rootfs directory |