summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-02-23 21:50:10 +0000
committerwbx <wbx@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-02-23 21:50:10 +0000
commitb7a5a29ecb22d80d8a68951f207967c8437dc2e1 (patch)
tree8f61b47b0b29fddcbe428f40731f1d4560d98c52
parenta1701ecb013364609652dc2208cc53528bf3959e (diff)
I do not believe that users will cleanup kernelsource, when switching
rootfs. force it with scripts and Makefile changes from Felix Fietkau <nbd@vd-s.ath.cx> git-svn-id: svn://svn.openwrt.org/openwrt/trunk/openwrt@290 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--Makefile21
-rw-r--r--README2
-rw-r--r--package/config/mconf.c1
-rwxr-xr-xscripts/configtest.pl11
-rw-r--r--scripts/flash.sh (renamed from flash.sh)0
-rw-r--r--target/Config.in2
6 files changed, 33 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 92137eac20..dfa272120b 100644
--- a/Makefile
+++ b/Makefile
@@ -166,27 +166,48 @@ $(CONFIG)/mconf:
fi
menuconfig: $(CONFIG)/mconf
+ -touch .config
+ -cp .config .config.test
@$(CONFIG)/mconf $(CONFIG_CONFIG_IN)
+ -./scripts/configtest.pl
config: $(CONFIG)/conf
+ -touch .config
+ -cp .config .config.test
@$(CONFIG)/conf $(CONFIG_CONFIG_IN)
+ -./scripts/configtest.pl
oldconfig: $(CONFIG)/conf
+ -touch .config
+ -cp .config .config.test
@$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
+ -./scripts/configtest.pl
randconfig: $(CONFIG)/conf
+ -touch .config
+ -cp .config .config.test
@$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)
+ -./scripts/configtest.pl
allyesconfig: $(CONFIG)/conf
#@$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
#sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config
+ -touch .config
+ -cp .config .config.test
@$(CONFIG)/conf -o $(CONFIG_CONFIG_IN)
+ -./scripts/configtest.pl
allnoconfig: $(CONFIG)/conf
+ -touch .config
+ -cp .config .config.test
@$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
+ -./scripts/configtest.pl
defconfig: $(CONFIG)/conf
+ -touch .config
+ -cp .config .config.test
@$(CONFIG)/conf -d $(CONFIG_CONFIG_IN)
+ -./scripts/configtest.pl
#############################################################
#
diff --git a/README b/README
index c79070cfa3..7d937e76d3 100644
--- a/README
+++ b/README
@@ -8,7 +8,7 @@ Simply running 'make' will build your firmware and a tarball
of kernel modules. It will download all sources, build the
cross-compile toolchain, the kernel and all choosen applications.
-You can use flash.sh for remotely updating your embedded system
+You can use scripts/flash.sh for remotely updating your embedded system
via tftp.
diff --git a/package/config/mconf.c b/package/config/mconf.c
index 659e49cd64..0db6f8f6c8 100644
--- a/package/config/mconf.c
+++ b/package/config/mconf.c
@@ -705,7 +705,6 @@ int main(int ac, char **av)
conf_write(NULL);
printf("\n\n"
"*** End of Buildroot configuration.\n"
- "*** After changing root fs, use make linux-dirclean.\n"
"*** Check the top-level Makefile for additional configuration options.\n\n");
} else
printf("\n\nYour Buildroot configuration changes were NOT saved.\n\n");
diff --git a/scripts/configtest.pl b/scripts/configtest.pl
new file mode 100755
index 0000000000..61fe8a7b62
--- /dev/null
+++ b/scripts/configtest.pl
@@ -0,0 +1,11 @@
+#!/usr/bin/perl
+
+my %change = (
+ 'ROOTFS' => 'make linux-dirclean'
+);
+
+foreach my $change (keys %change) {
+ my $v1 = `grep '$change' .config.test`;
+ my $v2 = `grep '$change' .config`;
+ $v1 eq $v2 or system($change{$change});
+}
diff --git a/flash.sh b/scripts/flash.sh
index aedb25072c..aedb25072c 100644
--- a/flash.sh
+++ b/scripts/flash.sh
diff --git a/target/Config.in b/target/Config.in
index 0fe83857c9..36616f07b8 100644
--- a/target/Config.in
+++ b/target/Config.in
@@ -1,5 +1,3 @@
-comment "after changing root fs, use make linux-dirclean"
-
choice
prompt "Target Root Filesystem"
source "target/jffs2/Config.in"