diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 11:55:52 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-06-01 11:55:52 -0400 |
commit | 1f73897861b8ef0be64ff4b801f8d6f830f683b5 (patch) | |
tree | b4bae8f12e1422113910d8cb00a19d010dc4a52f /scripts/gen_initramfs_list.sh | |
parent | b904d7131d116900524bd36ec170dcd97846bfd3 (diff) | |
parent | 64ffc9ff424c65adcffe7d590018cc75e2d5d42a (diff) |
Merge branch 'for-35' of git://repo.or.cz/linux-kbuild
* 'for-35' of git://repo.or.cz/linux-kbuild: (81 commits)
kbuild: Revert part of e8d400a to resolve a conflict
kbuild: Fix checking of scm-identifier variable
gconfig: add support to show hidden options that have prompts
menuconfig: add support to show hidden options which have prompts
gconfig: remove show_debug option
gconfig: remove dbg_print_ptype() and dbg_print_stype()
kconfig: fix zconfdump()
kconfig: some small fixes
add random binaries to .gitignore
kbuild: Include gen_initramfs_list.sh and the file list in the .d file
kconfig: recalc symbol value before showing search results
.gitignore: ignore *.lzo files
headerdep: perlcritic warning
scripts/Makefile.lib: Align the output of LZO
kbuild: Generate modules.builtin in make modules_install
Revert "kbuild: specify absolute paths for cscope"
kbuild: Do not unnecessarily regenerate modules.builtin
headers_install: use local file handles
headers_check: fix perl warnings
export_report: fix perl warnings
...
Diffstat (limited to 'scripts/gen_initramfs_list.sh')
-rw-r--r-- | scripts/gen_initramfs_list.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh index a932ae52f921..5958fffb2114 100644 --- a/scripts/gen_initramfs_list.sh +++ b/scripts/gen_initramfs_list.sh | |||
@@ -202,6 +202,7 @@ input_file() { | |||
202 | print_mtime "$1" >> ${output} | 202 | print_mtime "$1" >> ${output} |
203 | cat "$1" >> ${output} | 203 | cat "$1" >> ${output} |
204 | else | 204 | else |
205 | echo "$1 \\" | ||
205 | cat "$1" | while read type dir file perm ; do | 206 | cat "$1" | while read type dir file perm ; do |
206 | if [ "$type" == "file" ]; then | 207 | if [ "$type" == "file" ]; then |
207 | echo "$file \\"; | 208 | echo "$file \\"; |
@@ -231,7 +232,7 @@ arg="$1" | |||
231 | case "$arg" in | 232 | case "$arg" in |
232 | "-l") # files included in initramfs - used by kbuild | 233 | "-l") # files included in initramfs - used by kbuild |
233 | dep_list="list_" | 234 | dep_list="list_" |
234 | echo "deps_initramfs := \\" | 235 | echo "deps_initramfs := $0 \\" |
235 | shift | 236 | shift |
236 | ;; | 237 | ;; |
237 | "-o") # generate compressed cpio image named $1 | 238 | "-o") # generate compressed cpio image named $1 |