Skip to contentSkip to conversation

kbuild: Re-enable Makefile generation in a new O=... directory

PATCH In review Guillaume Chazarain 2 participants 2 messages Dec 11, 2007 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: Re-enable Makefile generation in a new O=... directory

The patch kbuild: fix building with O=.. options
http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=18c32dac75b187d1a4e858f3cfdf03e844129f5e
disabled the creation of a Makefile in a new O=... directory. Restore it.

---

 scripts/mkmakefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/mkmakefile +1 -1
index 9ad1bd7..e0f54b9 100644
@@ -13,7 +13,7 @@
 test ! -r $2/Makefile -o -O $2/Makefile || exit 0
 # Only overwrite automatically generated Makefiles
 # (so we do not overwrite kernel Makefile)
-if ! grep -q Automatically $2/Makefile
+if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
 then
 	exit 0
 fi
#1 lore raw
Quoted 5 lines · Guillaume Chazarain

The patch kbuild: fix building with O=.. options
http://git.kernel.org/gitweb.cgi?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=18c32dac75b187d1a4e858f3cfdf03e844129f5e
disabled the creation of a Makefile in a new O=... directory. Restore it.

Crap - thanks for noticing this.
I will push this fix.

Sam

Quoted 18 lines

---

 scripts/mkmakefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
scripts/mkmakefile +1 -1
index 9ad1bd7..e0f54b9 100644
@@ -13,7 +13,7 @@
 test ! -r $2/Makefile -o -O $2/Makefile || exit 0
 # Only overwrite automatically generated Makefiles
 # (so we do not overwrite kernel Makefile)
-if ! grep -q Automatically $2/Makefile
+if test -e $2/Makefile && ! grep -q Automatically $2/Makefile
 then
 	exit 0
 fi