scripts/rstrip.sh: ignore /lib/firmware

[openwrt/staging/stintel.git] / scripts / diffconfig.sh

diff --git a/scripts/diffconfig.sh b/scripts/diffconfig.sh
index ba5d8e8712cd923bdeab4aff3f21301fd4833489..7ffe9dd01ae27eb9cde7dc43879a88a7b2df359f 100755 (executable)
--- a/scripts/diffconfig.sh
+++ b/scripts/diffconfig.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+make ./scripts/config/conf >/dev/null || { make ./scripts/config/conf; exit 1; }
 grep \^CONFIG_TARGET_ .config | head -n3 > tmp/.diffconfig.head
 grep \^CONFIG_TARGET_DEVICE_ .config >> tmp/.diffconfig.head
 grep '^CONFIG_ALL=y' .config >> tmp/.diffconfig.head
@@ -8,7 +9,6 @@ grep '^CONFIG_DEVEL=y' .config >> tmp/.diffconfig.head
 grep '^CONFIG_TOOLCHAINOPTS=y' .config >> tmp/.diffconfig.head
 grep '^CONFIG_BUSYBOX_CUSTOM=y' .config >> tmp/.diffconfig.head
 grep '^CONFIG_TARGET_PER_DEVICE_ROOTFS=y' .config >> tmp/.diffconfig.head
-make -s ./scripts/config/conf
 ./scripts/config/conf --defconfig=tmp/.diffconfig.head -w tmp/.diffconfig.stage1 Config.in >/dev/null
 ./scripts/kconfig.pl '>+' tmp/.diffconfig.stage1 .config >> tmp/.diffconfig.head
 ./scripts/config/conf --defconfig=tmp/.diffconfig.head -w tmp/.diffconfig.stage2 Config.in >/dev/null