diff options
author | Ed Bartosh <ed.bartosh@linux.intel.com> | 2016-01-19 18:51:07 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-01-20 17:07:13 +0000 |
commit | 15ea18041419fe239b64b388e429020153bb28ed (patch) | |
tree | 8ba0e39a1e4d65f3623857fecb129bb60a2e5446 /scripts/lib | |
parent | d304162269ccc93767439b3e80b57f6d33f8d9bc (diff) | |
download | openembedded-core-contrib-15ea18041419fe239b64b388e429020153bb28ed.tar.gz |
wic: refactor get_boot_config
This function is going to be used by ks parser to find include .wks
files. get_boot_config name is a bit confusing as function is quite
generic. It looks if file is present in the canned wks directories.
Renamed get_boot_config -> get_canned.
Renamed parameter file_boot -> file_name.
Updated description.
(From OE-Core rev: 8ea9a4c0422c9600cd33ec6e815ebcf2d0aad364)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib')
-rw-r--r-- | scripts/lib/wic/utils/misc.py | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/scripts/lib/wic/utils/misc.py b/scripts/lib/wic/utils/misc.py index d886d75b95..1415ae906c 100644 --- a/scripts/lib/wic/utils/misc.py +++ b/scripts/lib/wic/utils/misc.py @@ -58,25 +58,23 @@ def build_name(kscfg, release=None, prefix=None, suffix=None): return ret -def find_boot_config(scripts_path, boot_file): +def find_canned(scripts_path, file_name): """ - Find a config file with the given name in the canned files dir. + Find a file either by its path or by name in the canned files dir. - Return False if not found + Return None if not found """ - if os.path.exists(boot_file): - return boot_file + if os.path.exists(file_name): + return file_name layers_canned_wks_dir = wic.engine.build_canned_image_list(scripts_path) for canned_wks_dir in layers_canned_wks_dir: for root, dirs, files in os.walk(canned_wks_dir): for fname in files: - if fname == boot_file: + if fname == file_name: fullpath = os.path.join(canned_wks_dir, fname) return fullpath - return None - def get_custom_config(boot_file): """ Get the custom configuration to be used for the bootloader. @@ -88,7 +86,7 @@ def get_custom_config(boot_file): for x in range(0, 3): scripts_path = os.path.dirname(scripts_path) - cfg_file = find_boot_config(scripts_path, boot_file) + cfg_file = find_canned(scripts_path, boot_file) if cfg_file: with open(cfg_file, "r") as f: config = f.read() |