[prev in list] [next in list] [prev in thread] [next in thread] 

List:       freewrt-commits
Subject:    [FreeWRT-commits] r3879 - in trunk/freewrt: scripts
From:       tg () freewrt ! org
Date:       2009-10-03 22:17:00
Message-ID: 20091003221700.D792A1C003 () frozenfish ! freewrt ! org
[Download RAW message or body]

Author: tg
Date: 2009-10-04 00:16:57 +0200 (Sun, 04 Oct 2009)
New Revision: 3879

Added:
   trunk/freewrt/target/linux/generic-2.4/patches/061-configure-bash4.patch
Modified:
   trunk/freewrt/scripts/scan-tools.sh
Log:
Apply http://article.gmane.org/gmane.linux.kernel/897084
which may fix neclimdul's GNU bash4 problem (please test)


Modified: trunk/freewrt/scripts/scan-tools.sh
===================================================================
--- trunk/freewrt/scripts/scan-tools.sh	2009-09-18 15:27:27 UTC (rev 3878)
+++ trunk/freewrt/scripts/scan-tools.sh	2009-10-03 22:16:57 UTC (rev 3879)
@@ -411,8 +411,9 @@
 fi
 
 if [[ ${BASH_VERSION%%.*} -lt 2 || ${BASH_VERSION%%.*} -gt 3 ]]; then
-	echo At this time, only GNU bash 2 or 3 are supported.
-	out=1
+	echo '*WARNING* Your GNU bash is not version 2 or 3, which'
+	echo may lead to errors.
+	echo
 fi
 
 if ! which ed >/dev/null 2>&1; then

Added: trunk/freewrt/target/linux/generic-2.4/patches/061-configure-bash4.patch
===================================================================
--- trunk/freewrt/target/linux/generic-2.4/patches/061-configure-bash4.patch	         \
                (rev 0)
+++ trunk/freewrt/target/linux/generic-2.4/patches/061-configure-bash4.patch	2009-10-03 \
22:16:57 UTC (rev 3879) @@ -0,0 +1,15 @@
+$FreeWRT$
+--- linux-2.4.34/scripts/Configure~	2008-10-13 22:40:27.000000000 +0200
++++ linux-2.4.34/scripts/Configure	2009-10-04 00:02:04.000000000 +0200
+@@ -540,9 +540,9 @@ if [ -f $DEFAULTS ]; then
+   echo "#"
+   echo "# Using defaults found in" $DEFAULTS
+   echo "#"
+-  . $DEFAULTS
++  . ./$DEFAULTS
+   sed -e 's/# \(CONFIG_[^ ]*\) is not.*/\1=n/' <$DEFAULTS >.config-is-not.$$
+-  . .config-is-not.$$
++  . ./.config-is-not.$$
+   rm .config-is-not.$$
+ else
+   echo "#"


Property changes on: \
trunk/freewrt/target/linux/generic-2.4/patches/061-configure-bash4.patch \
                ___________________________________________________________________
Name: svn:keywords
   + FreeWRT=Id

_______________________________________________
freewrt-commits mailing list
freewrt-commits@freewrt.org
https://www.freewrt.org/lists/listinfo/freewrt-commits


[prev in list] [next in list] [prev in thread] [next in thread]