diff options
| author | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-09 16:31:21 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-09 16:31:21 +0100 |
| commit | e7b54d0fcce26fdbb0559728e317fb852c63e02b (patch) | |
| tree | 266048a59192347b3241206d69a2a8d564328ec8 /make_single_applets.sh | |
| parent | 590402bb55be940310f68d14a540f2d109420a98 (diff) | |
| download | busybox-w32-e7b54d0fcce26fdbb0559728e317fb852c63e02b.tar.gz busybox-w32-e7b54d0fcce26fdbb0559728e317fb852c63e02b.tar.bz2 busybox-w32-e7b54d0fcce26fdbb0559728e317fb852c63e02b.zip | |
make_single_applets.sh: show errors and warnings
While at it, fix one warning in modprobe-small.c
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'make_single_applets.sh')
| -rwxr-xr-x | make_single_applets.sh | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/make_single_applets.sh b/make_single_applets.sh index 00f502eda..03a5c324f 100755 --- a/make_single_applets.sh +++ b/make_single_applets.sh | |||
| @@ -28,6 +28,8 @@ for app in $apps; do | |||
| 28 | done | 28 | done |
| 29 | #echo "$allno" >.config_allno | 29 | #echo "$allno" >.config_allno |
| 30 | 30 | ||
| 31 | trap 'test -f .config.SV && mv .config.SV .config && touch .config' EXIT | ||
| 32 | |||
| 31 | # Turn on each applet individually and build single-applet executable | 33 | # Turn on each applet individually and build single-applet executable |
| 32 | fail=0 | 34 | fail=0 |
| 33 | for app in $apps; do | 35 | for app in $apps; do |
| @@ -54,16 +56,20 @@ for app in $apps; do | |||
| 54 | mv .config busybox_config_${app} | 56 | mv .config busybox_config_${app} |
| 55 | elif ! make $makeopts >>busybox_make_${app}.log 2>&1; then | 57 | elif ! make $makeopts >>busybox_make_${app}.log 2>&1; then |
| 56 | : $((fail++)) | 58 | : $((fail++)) |
| 59 | grep -i -e error: -e warning: busybox_make_${app}.log | ||
| 57 | echo "Build error for ${app}" | 60 | echo "Build error for ${app}" |
| 58 | mv .config busybox_config_${app} | 61 | mv .config busybox_config_${app} |
| 59 | elif ! grep -q '^#define NUM_APPLETS 1$' include/NUM_APPLETS.h; then | 62 | elif ! grep -q '^#define NUM_APPLETS 1$' include/NUM_APPLETS.h; then |
| 63 | grep -i -e error: -e warning: busybox_make_${app}.log | ||
| 60 | mv busybox busybox_${app} | 64 | mv busybox busybox_${app} |
| 61 | : $((fail++)) | 65 | : $((fail++)) |
| 62 | echo "NUM_APPLETS != 1 for ${app}: `cat include/NUM_APPLETS.h`" | 66 | echo "NUM_APPLETS != 1 for ${app}: `cat include/NUM_APPLETS.h`" |
| 63 | mv .config busybox_config_${app} | 67 | mv .config busybox_config_${app} |
| 64 | else | 68 | else |
| 69 | grep -i -e error: -e warning: busybox_make_${app}.log \ | ||
| 70 | || rm busybox_make_${app}.log | ||
| 65 | mv busybox busybox_${app} | 71 | mv busybox busybox_${app} |
| 66 | rm busybox_make_${app}.log | 72 | #mv .config busybox_config_${app} |
| 67 | fi | 73 | fi |
| 68 | mv .config.SV .config | 74 | mv .config.SV .config |
| 69 | #exit | 75 | #exit |