aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Dietze <mdietze@gmail.com>2013-02-23 10:26:40 +0100
committerMartin Dietze <mdietze@gmail.com>2013-03-02 17:26:56 +0100
commit28ab364e992dfde404b73fd047cb22525696ce0b (patch)
treea345762e95af55bf7c09aaf571b558674e56d301
parent73b9083202bdd93d19b853d4080d153443fd96d8 (diff)
downloadopenembedded-28ab364e992dfde404b73fd047cb22525696ce0b.zip
openembedded-28ab364e992dfde404b73fd047cb22525696ce0b.tar.gz
openembedded-28ab364e992dfde404b73fd047cb22525696ce0b.tar.bz2
linux-mtx-[12]: fixed patch from c5bada13d58d5a6a99f59d84e2b1cb8802a01695 - not all sourcing of config files was fixed in Configure
-rw-r--r--recipes/linux/linux-mtx-1-2.4.27/49-bash4-configure.patch21
-rw-r--r--recipes/linux/linux-mtx-2-2.4.27/49-bash4-configure.patch21
2 files changed, 30 insertions, 12 deletions
diff --git a/recipes/linux/linux-mtx-1-2.4.27/49-bash4-configure.patch b/recipes/linux/linux-mtx-1-2.4.27/49-bash4-configure.patch
index 222567d..473c2cc 100644
--- a/recipes/linux/linux-mtx-1-2.4.27/49-bash4-configure.patch
+++ b/recipes/linux/linux-mtx-1-2.4.27/49-bash4-configure.patch
@@ -1,11 +1,20 @@
--- linux/scripts/Configure-orig 2009-11-29 19:12:02.000000000 +0100
+++ linux/scripts/Configure 2009-11-29 19:12:27.000000000 +0100
-@@ -543,7 +543,7 @@
+@@ -536,7 +536,7 @@
+
+ DEFAULTS=arch/$ARCH/defconfig
+ if [ -f .config ]; then
+- DEFAULTS=.config
++ DEFAULTS=./.config
+ fi
+
+ if [ -f $DEFAULTS ]; then
+@@ -545,7 +545,7 @@
echo "#"
- echo "# Using defaults found in" $DEFAULTS
- echo "#"
-- . $DEFAULTS
-+ . ./$DEFAULTS
+ . $DEFAULTS
sed -e 's/# \(CONFIG_[^ ]*\) is not.*/\1=n/' <$DEFAULTS >.config-is-not.$$
- . .config-is-not.$$
+- . .config-is-not.$$
++ . ./.config-is-not.$$
rm .config-is-not.$$
+ else
+ echo "#"
diff --git a/recipes/linux/linux-mtx-2-2.4.27/49-bash4-configure.patch b/recipes/linux/linux-mtx-2-2.4.27/49-bash4-configure.patch
index 222567d..473c2cc 100644
--- a/recipes/linux/linux-mtx-2-2.4.27/49-bash4-configure.patch
+++ b/recipes/linux/linux-mtx-2-2.4.27/49-bash4-configure.patch
@@ -1,11 +1,20 @@
--- linux/scripts/Configure-orig 2009-11-29 19:12:02.000000000 +0100
+++ linux/scripts/Configure 2009-11-29 19:12:27.000000000 +0100
-@@ -543,7 +543,7 @@
+@@ -536,7 +536,7 @@
+
+ DEFAULTS=arch/$ARCH/defconfig
+ if [ -f .config ]; then
+- DEFAULTS=.config
++ DEFAULTS=./.config
+ fi
+
+ if [ -f $DEFAULTS ]; then
+@@ -545,7 +545,7 @@
echo "#"
- echo "# Using defaults found in" $DEFAULTS
- echo "#"
-- . $DEFAULTS
-+ . ./$DEFAULTS
+ . $DEFAULTS
sed -e 's/# \(CONFIG_[^ ]*\) is not.*/\1=n/' <$DEFAULTS >.config-is-not.$$
- . .config-is-not.$$
+- . .config-is-not.$$
++ . ./.config-is-not.$$
rm .config-is-not.$$
+ else
+ echo "#"