diff options
author | Michael Ellerman <michael@ellerman.id.au> | 2007-04-30 01:34:15 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2007-05-02 14:58:11 -0400 |
commit | eda890af7959a79ab10a7a8ae979dadcdba41c58 (patch) | |
tree | b8dcf31559d74686bc5caac00f8c29f28f1901f4 /scripts/gen_initramfs_list.sh | |
parent | 9ae57004ca9c38ff8292c38a475c98b0ebbc0d74 (diff) |
kbuild: propagate errors from find in scripts/gen_initramfs_list.sh
If the find(1) in scripts/gen_initramfs_list.sh generates any errors, it
will cause gen_initramfs_list.sh to fail (because of "set -e"), however
the errors from find are not printed to the user. This is rather confusing:
~/src/powerpc$ make O=~/build/powerpc-cell32/
make[2]: *** [usr/initramfs_data.cpio.gz] Error 1
make[1]: *** [usr] Error 2
make[1]: *** Waiting for unfinished jobs....
make[1]: *** wait: No child processes. Stop.
make: *** [_all] Error 2
It is much easier to work out what the problem is if we let the errors
from find hit the console, eg:
~/src/powerpc$ make O=~/build/powerpc-cell32/
find: /home/michael/initramfs-source/home: Permission denied
find: /home/michael/initramfs-source/lost+found: Permission denied
find: /home/michael/initramfs-source/opt: Permission denied
find: /home/michael/initramfs-source/root: Permission denied
make[2]: *** [usr/initramfs_data.cpio.gz] Error 1
make[1]: *** [usr] Error 2
make[1]: *** Waiting for unfinished jobs....
make[1]: *** wait: No child processes. Stop.
make: *** [_all] Error 2
Signed-off-by: Michael Ellerman <michael@ellerman.id.au>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'scripts/gen_initramfs_list.sh')
-rw-r--r-- | scripts/gen_initramfs_list.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh index 3111f4ac23c4..683eb12babbb 100644 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh | |||
@@ -171,7 +171,7 @@ dir_filelist() { | |||
171 | ${dep_list}header "$1" | 171 | ${dep_list}header "$1" |
172 | 172 | ||
173 | srcdir=$(echo "$1" | sed -e 's://*:/:g') | 173 | srcdir=$(echo "$1" | sed -e 's://*:/:g') |
174 | dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n" 2>/dev/null) | 174 | dirlist=$(find "${srcdir}" -printf "%p %m %U %G\n") |
175 | 175 | ||
176 | # If $dirlist is only one line, then the directory is empty | 176 | # If $dirlist is only one line, then the directory is empty |
177 | if [ "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then | 177 | if [ "$(echo "${dirlist}" | wc -l)" -gt 1 ]; then |