diff options
author | Paulius Zaleckas <paulius.zaleckas@gmail.com> | 2012-01-30 02:34:56 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2012-01-30 02:34:56 +0100 |
commit | 1c7724bf2acb6ebe28b24bd6da3b740e716b46cf (patch) | |
tree | 4e988268c489c3229d5a7f1efe7a251e1587a1e4 | |
parent | e8758eaf4f994f679142563623713f62d87a74a3 (diff) | |
download | busybox-w32-1c7724bf2acb6ebe28b24bd6da3b740e716b46cf.tar.gz busybox-w32-1c7724bf2acb6ebe28b24bd6da3b740e716b46cf.tar.bz2 busybox-w32-1c7724bf2acb6ebe28b24bd6da3b740e716b46cf.zip |
gen_build_files.sh: exclude hidden directories
I am using quilt to manage patches internally. Quilt creates dir .pc
and stores unmodified files there. Since I made change in one of
Config.src quilt made a copy in .pc/xxx.patch/xxx/Config.src. When
I run make it calls gen_build_files.sh and it generates
.pc/xxx.patch/xxx/Config.in. Now when I want to pop patch quilt
thinks I have made changes to original xxx/Config.in.
IMO the best solution is just to ignore hidden directories in
gen_build_files.sh. This also results in shorter build time in case
busybox is under git/svn versioning, since it avoids searching
many directories for Config.src.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rwxr-xr-x | scripts/gen_build_files.sh | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/scripts/gen_build_files.sh b/scripts/gen_build_files.sh index c42fe9fbb..0989b2fe5 100755 --- a/scripts/gen_build_files.sh +++ b/scripts/gen_build_files.sh | |||
@@ -52,14 +52,17 @@ sed -n 's@^//applet:@@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \ | |||
52 | # We add line continuation backslash after each line, | 52 | # We add line continuation backslash after each line, |
53 | # and insert empty line before each line which doesn't start | 53 | # and insert empty line before each line which doesn't start |
54 | # with space or tab | 54 | # with space or tab |
55 | sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' "$srctree"/*/*.c "$srctree"/*/*/*.c \ | 55 | sed -n -e 's@^//usage:\([ \t].*\)$@\1 \\@p' -e 's@^//usage:\([^ \t].*\)$@\n\1 \\@p' \ |
56 | "$srctree"/*/*.c "$srctree"/*/*/*.c \ | ||
56 | | generate \ | 57 | | generate \ |
57 | "$srctree/include/usage.src.h" \ | 58 | "$srctree/include/usage.src.h" \ |
58 | "include/usage.h" \ | 59 | "include/usage.h" \ |
59 | "/* DO NOT EDIT. This file is generated from usage.src.h */" | 60 | "/* DO NOT EDIT. This file is generated from usage.src.h */" |
60 | 61 | ||
61 | # (Re)generate */Kbuild and */Config.in | 62 | # (Re)generate */Kbuild and */Config.in |
62 | { cd -- "$srctree" && find . -type d; } | while read -r d; do | 63 | # We skip .dotdirs - makes git/svn/etc users happier |
64 | { cd -- "$srctree" && find . -type d -not '(' -name '.?*' -prune ')'; } \ | ||
65 | | while read -r d; do | ||
63 | d="${d#./}" | 66 | d="${d#./}" |
64 | 67 | ||
65 | src="$srctree/$d/Kbuild.src" | 68 | src="$srctree/$d/Kbuild.src" |