summaryrefslogtreecommitdiffstats
path: root/scripts/diffconfig.sh
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-18 12:05:16 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-04-18 12:05:16 +0000
commitf6a0204436d51e2227a1b9c8f0463936a9c03f0a (patch)
tree0cf2e21dbb0e93a4300184f3aedde745ef27c277 /scripts/diffconfig.sh
parent976215a02136bd8bbc7df77c2880ac3ce1e4eedc (diff)
build: add new menuconfig code based on linux 3.9
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36361 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'scripts/diffconfig.sh')
-rwxr-xr-xscripts/diffconfig.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/diffconfig.sh b/scripts/diffconfig.sh
index c7e8c1e7f..350886bff 100755
--- a/scripts/diffconfig.sh
+++ b/scripts/diffconfig.sh
@@ -3,9 +3,9 @@ grep \^CONFIG_TARGET_ .config | head -n3 > tmp/.diffconfig.head
grep '^CONFIG_ALL=y' .config >> tmp/.diffconfig.head
grep '^CONFIG_DEVEL=y' .config >> tmp/.diffconfig.head
grep '^CONFIG_TOOLCHAINOPTS=y' .config >> tmp/.diffconfig.head
-./scripts/config/conf -D tmp/.diffconfig.head -w tmp/.diffconfig.stage1 Config.in >/dev/null
+./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