scripts: ipkg-remove: handle existing .ipk files without SourceName field

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

diff --git a/scripts/diffconfig.sh b/scripts/diffconfig.sh
index e1d605d6e51a24cebabbd59f13edd8518146bda5..5f9fec56000f85fb985115d3cb2f608c1fa62f7d 100755 (executable)
--- a/scripts/diffconfig.sh
+++ b/scripts/diffconfig.sh
@@ -1,8 +1,16 @@
 #!/bin/sh
 grep \^CONFIG_TARGET_ .config | head -n3 > tmp/.diffconfig.head
-./scripts/config/conf -D tmp/.diffconfig.head -w tmp/.diffconfig.stage1 Config.in >/dev/null
+grep \^CONFIG_TARGET_DEVICE_ .config >> tmp/.diffconfig.head
+grep '^CONFIG_ALL=y' .config >> tmp/.diffconfig.head
+grep '^CONFIG_ALL_KMODS=y' .config >> tmp/.diffconfig.head
+grep '^CONFIG_ALL_NONSHARED=y' .config >> tmp/.diffconfig.head
+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
+./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 -D tmp/.diffconfig.head -w tmp/.diffconfig.stage2 Config.in >/dev/null
+./scripts/config/conf --defconfig=tmp/.diffconfig.head -w tmp/.diffconfig.stage2 Config.in >/dev/null
 ./scripts/kconfig.pl '>' tmp/.diffconfig.stage2 .config >> tmp/.diffconfig.head
 cat tmp/.diffconfig.head
 rm -f tmp/.diffconfig tmp/.diffconfig.head