diff options
| author | Ioan-Adrian Ratiu <adrian.ratiu@ni.com> | 2016-02-05 15:36:57 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-02-07 17:29:44 +0000 |
| commit | 07fa4783566d22d46ce719a621eee5404932dbbe (patch) | |
| tree | ed91f8566171e8f886ff602aa3fb670ea4721d77 | |
| parent | 365f4092070b2e7978b8db65298308f4e770a501 (diff) | |
| download | openembedded-core-07fa4783566d22d46ce719a621eee5404932dbbe.tar.gz openembedded-core-07fa4783566d22d46ce719a621eee5404932dbbe.tar.bz2 openembedded-core-07fa4783566d22d46ce719a621eee5404932dbbe.zip | |
isoimage-isohybrid.py: fix cpio working directory
Take `pwd` to be <initial-dir>. The %s path is relative to it. The value
of %s is "output_folder/build". The current code works as follows:
Changing directory to %s and finding the sources (after cd'ing) to cpio
with output redirection to %s/initrd.cpio triggers the following error
"Error: exec_cmd: cd output_folder/build/INITRD && find . | cpio -o -H
newc >output_folder/build/initrd.cpio returned '1' instead of 0"
This happens because after the cd, `pwd` is <initial-dir>/%s and by the
redirect we write the result to to <initial-dir>/%s/%s/initrd.cpio which
obviously does not exist.
Fix this by getting the sources with "find %s" instead of "cd && find ."
Signed-off-by: Ioan-Adrian Ratiu <adrian.ratiu@ni.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | scripts/lib/wic/plugins/source/isoimage-isohybrid.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py index 62385a223d..31dc9b6ce6 100644 --- a/scripts/lib/wic/plugins/source/isoimage-isohybrid.py +++ b/scripts/lib/wic/plugins/source/isoimage-isohybrid.py @@ -174,7 +174,7 @@ class IsoImagePlugin(SourcePlugin): else: msger.error("Couldn't find or build initrd, exiting.\n") - exec_cmd("cd %s && find . | cpio -o -H newc >%s/initrd.cpio " \ + exec_cmd("find %s | cpio -o -H newc >%s/initrd.cpio " \ % (initrd_dir, cr_workdir), as_shell=True) exec_cmd("gzip -f -9 -c %s/initrd.cpio > %s" \ % (cr_workdir, initrd), as_shell=True) |