Skip to contentSkip to conversation

2.6.24-rc5: Fix build with make O= if the top level Makefile is not present

PATCH In review Rafael J. Wysocki 2 participants 2 messages Dec 16, 2007 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 2.6.24-rc5: Fix build with make O= if the top level Makefile is not present

Hi,

IMHO, something like the patch below is needed to fix builds with "make O=", since after commit 18c32dac75b187d1a4e858f3cfdf03e844129f5e "kbuild: fix building with O=.. options" the top-level Makefile is no longer created automatically if it's not present at all.

Thanks,
Rafael

---
From: Rafael J. Wysocki <[email protected]>

Make the build system create the top-level Makefile for builds with "make O=" if it is not present already.

---
 scripts/mkmakefile |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
scripts/mkmakefile +1 -1
Index: linux-2.6/scripts/mkmakefile
===================================================================
@@ -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 -f $2/Makefile) && !(grep -q Automatically $2/Makefile)
 then
 	exit 0
 fi
#1 lore raw
Quoted 6 lines · Rafael J. Wysocki

Hi,

IMHO, something like the patch below is needed to fix builds with "make O=", since after commit 18c32dac75b187d1a4e858f3cfdf03e844129f5e "kbuild: fix building with O=.. options" the top-level Makefile is no longer created automatically if it's not present at all.

Similar patch already sent to Linus.
Can be seen in my fix-kbuild.git tree.

Sam