Re: [GIT PULL (updated)] kbuild updates

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]
From: Sam Ravnborg
Date: Tuesday, October 16, 2007 - 3:04 pm

On Tue, Oct 16, 2007 at 11:11:01PM +0200, Markus Trippelsdorf wrote:
Thanks for this excellent report!
Following patch fixes the issue.
The target specific assignmnet used in x86/boot fooled kbuild.
I have audited the kernel for similar uses and found no
other places this was used.

Linus please pull the fix below from:

	ssh://master.kernel.org/pub/scm/linux/kernel/git/sam/kbuild.git

	Sam

diff --git a/Documentation/kbuild/makefiles.txt b/Documentation/kbuild/makefiles.txt
diff --git a/arch/x86/boot/Makefile b/arch/x86/boot/Makefile
index d6ed8e5..e8756e5 100644
--- a/arch/x86/boot/Makefile
+++ b/arch/x86/boot/Makefile
@@ -64,10 +64,10 @@ KBUILD_CFLAGS	:= $(LINUXINCLUDE) -g -Os -D_SETUP -D__KERNEL__ \
 KBUILD_AFLAGS	:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
 
 $(obj)/zImage:  IMAGE_OFFSET := 0x1000
-$(obj)/zImage:  EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK)
+$(obj)/zImage:  asflags-y := $(SVGA_MODE) $(RAMDISK)
 $(obj)/bzImage: IMAGE_OFFSET := 0x100000
-$(obj)/bzImage: EXTRA_CFLAGS := -D__BIG_KERNEL__
-$(obj)/bzImage: EXTRA_AFLAGS := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
+$(obj)/bzImage: ccflags-y := -D__BIG_KERNEL__
+$(obj)/bzImage: asflags-y := $(SVGA_MODE) $(RAMDISK) -D__BIG_KERNEL__
 $(obj)/bzImage: BUILDFLAGS   := -b
 
 quiet_cmd_image = BUILD   $@
-
Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:
[GIT PULL (updated)] kbuild updates, Sam Ravnborg, (Mon Oct 15, 1:50 pm)
Re: [GIT PULL (updated)] kbuild updates, Markus Trippelsdorf, (Tue Oct 16, 2:11 pm)
Re: [GIT PULL (updated)] kbuild updates, Randy Dunlap, (Tue Oct 16, 2:23 pm)
Re: [GIT PULL (updated)] kbuild updates, Ismail , (Tue Oct 16, 2:34 pm)
Re: [GIT PULL (updated)] kbuild updates, Sam Ravnborg, (Tue Oct 16, 3:04 pm)
[PATCH] x86 boot: Build a bzImage again, Eric W. Biederman, (Tue Oct 16, 4:24 pm)