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>

SVN-Revision: 290

diff --git a/openwrt/Makefile b/openwrt/Makefile
index 92137eac20c4e5e2b06b9440e200060e1624ff15..dfa272120bb2a02061c30ae82f7cfdd38792ada1 100644 (file)
--- a/openwrt/Makefile
+++ b/openwrt/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/openwrt/README b/openwrt/README
index c79070cfa37496f4da4842868bf01fc89ea16172..7d937e76d39d68aa238126ff9dbcaba53d03ecde 100644 (file)
--- a/openwrt/README
+++ b/openwrt/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/openwrt/flash.sh b/openwrt/flash.sh
deleted file mode 100644 (file)
index aedb250..0000000
--- a/openwrt/flash.sh
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/bin/bash
-
-# flash script for linksys and asus routers 
-#
-# Copyright (C) 2004 by Oleg I. Vdovikin <oleg@cs.msu.su>
-# Copyright (C) 2005 by Waldemar Brodkorb <wbx@dass-it.de>
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-#
-
-if [ -z "$1" ] || [ ! -f $1 ] || [ -z $2 ]; then
-    echo Usage: $0 firmware vendor
-cat << EOF
-IMPORTANT:
-Notes for Linksys Routers: 
-   be sure you have set boot_wait to yes. Power on your router
-   after executing this script.
-   Use openwrt-gs-code.bin or openwrt-g-code.bin as firmware.
- 
-Notes for Asus Routers:
-   be sure POWER led is flashing (If this is not a case
-   poweroff the device, push the reset button & power on
-   it again, then release button)
-   Use openwrt-linux.trx as firmware.
-
-1) connect your pc to the LAN port
-2) be sure your link is up and has an address in the
-   192.168.1.0/24 address range (and not the 192.168.1.1)
-EOF
-    exit 0
-fi
-if [ "$2" == "asus" ]; then
-echo Confirming IP address setting...
-echo -en "get ASUSSPACELINK\x01\x01\xa8\xc0 /dev/null\nquit\n" | tftp 192.168.1.1
-echo Flashing 192.168.1.1 using $1...
-echo -en "binary\nput $1 ASUSSPACELINK\nquit\n" | tftp 192.168.1.1
-echo Please wait until leds stops flashing. 
-elif [ "$2" == "linksys" ]; then
-echo Flashing 192.168.1.1 using $1...
-echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.1.1
-echo Please wait until power led stops flashing. Then you can login via telnet 192.168.1.1
-fi

diff --git a/openwrt/package/config/mconf.c b/openwrt/package/config/mconf.c
index 659e49cd64183ecbda497e7e546c668a233daf87..0db6f8f6c8a8d1d76e660194b0f924d1b82eeb22 100644 (file)
--- a/openwrt/package/config/mconf.c
+++ b/openwrt/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/openwrt/scripts/configtest.pl b/openwrt/scripts/configtest.pl
new file mode 100755 (executable)
index 0000000..61fe8a7
--- /dev/null
+++ b/openwrt/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/openwrt/scripts/flash.sh b/openwrt/scripts/flash.sh
new file mode 100644 (file)
index 0000000..aedb250
--- /dev/null
+++ b/openwrt/scripts/flash.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+
+# flash script for linksys and asus routers 
+#
+# Copyright (C) 2004 by Oleg I. Vdovikin <oleg@cs.msu.su>
+# Copyright (C) 2005 by Waldemar Brodkorb <wbx@dass-it.de>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+#
+
+if [ -z "$1" ] || [ ! -f $1 ] || [ -z $2 ]; then
+    echo Usage: $0 firmware vendor
+cat << EOF
+IMPORTANT:
+Notes for Linksys Routers: 
+   be sure you have set boot_wait to yes. Power on your router
+   after executing this script.
+   Use openwrt-gs-code.bin or openwrt-g-code.bin as firmware.
+ 
+Notes for Asus Routers:
+   be sure POWER led is flashing (If this is not a case
+   poweroff the device, push the reset button & power on
+   it again, then release button)
+   Use openwrt-linux.trx as firmware.
+
+1) connect your pc to the LAN port
+2) be sure your link is up and has an address in the
+   192.168.1.0/24 address range (and not the 192.168.1.1)
+EOF
+    exit 0
+fi
+if [ "$2" == "asus" ]; then
+echo Confirming IP address setting...
+echo -en "get ASUSSPACELINK\x01\x01\xa8\xc0 /dev/null\nquit\n" | tftp 192.168.1.1
+echo Flashing 192.168.1.1 using $1...
+echo -en "binary\nput $1 ASUSSPACELINK\nquit\n" | tftp 192.168.1.1
+echo Please wait until leds stops flashing. 
+elif [ "$2" == "linksys" ]; then
+echo Flashing 192.168.1.1 using $1...
+echo -en "rexmt 1\ntrace\nbinary\nput $1\nquit\n" | tftp 192.168.1.1
+echo Please wait until power led stops flashing. Then you can login via telnet 192.168.1.1
+fi

diff --git a/openwrt/target/Config.in b/openwrt/target/Config.in
index 0fe83857c9e49d1b8cc63dbb4be23fa6817df30b..36616f07b8d61e2b0a275bc2bf218a7189819f83 100644 (file)
--- a/openwrt/target/Config.in
+++ b/openwrt/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"