On Sat, Mar 30, 2013 at 4:28 AM, Ben Hutchings <[email protected]> wrote:
> Daniel, this is an obvious fix but I noticed it still hasn't been
> applied. Please can you re-send with the proper Signed-off-by line?
Resending patch. It got lost somewhere. Thanks for pushing Ben.
>From 53864fe932aa87be62f1c70944c386cff9bb9130 Mon Sep 17 00:00:00 2001
From: Daniel Vacek <[email protected]>
Date: Thu, 18 Oct 2012 22:06:26 +0200
Subject: [PATCH] efi: fix typo in Makefile
Fix a little typo.
Signed-off-by: Daniel Vacek <[email protected]>
Acked-by: Matthew Garrett <[email protected]>
---
arch/x86/boot/compressed/Makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/boot/compressed/Makefile
b/arch/x86/boot/compressed/Makefile
index 8a84501..059a17f 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -29,7 +29,7 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds
$(obj)/head_$(BITS).o $(obj)/misc.o \
$(obj)/piggy.o
$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
-$(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone
+$(obj)/efi_stub_$(BITS).o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
ifeq ($(CONFIG_EFI_STUB), y)
VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o
--
1.7.10.4
On 30/03/13 10:04, Daniel Vacek wrote:
> On Sat, Mar 30, 2013 at 4:28 AM, Ben Hutchings <[email protected]> wrote:
>> Daniel, this is an obvious fix but I noticed it still hasn't been
>> applied. Please can you re-send with the proper Signed-off-by line?
>
> Resending patch. It got lost somewhere. Thanks for pushing Ben.
>
> From 53864fe932aa87be62f1c70944c386cff9bb9130 Mon Sep 17 00:00:00 2001
> From: Daniel Vacek <[email protected]>
> Date: Thu, 18 Oct 2012 22:06:26 +0200
> Subject: [PATCH] efi: fix typo in Makefile
>
> Fix a little typo.
>
> Signed-off-by: Daniel Vacek <[email protected]>
> Acked-by: Matthew Garrett <[email protected]>
> ---
> arch/x86/boot/compressed/Makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
I applied this by hand. Your patch appears to be whitespace damaged. Also, I
expanded the commit message and turned it into,
efi: fix typo in Makefile
commit 9dead5bbb825 ("efi: Build EFI stub with EFI-appropriate options")
contains a typo which means that the efi_stub_$(BITS).o code is still not
compiled with -fshort-wchar and -mno-red-zone.
Fix it with s/KBUILD_CLFAGS/KBUILD_CFLAGS/
--
Matt Fleming, Intel Open Source Technology Center
On 03/04/13 11:28, Matt Fleming wrote:
> I applied this by hand. Your patch appears to be whitespace damaged. Also, I
> expanded the commit message and turned it into,
>
> efi: fix typo in Makefile
>
> commit 9dead5bbb825 ("efi: Build EFI stub with EFI-appropriate options")
> contains a typo which means that the efi_stub_$(BITS).o code is still not
> compiled with -fshort-wchar and -mno-red-zone.
>
> Fix it with s/KBUILD_CLFAGS/KBUILD_CFLAGS/
I ended up dropping this patch because the following has been applied to -tip,
commit 918708245e92941df16a634dc201b407d12bcd91
Author: Jan Beulich <[email protected]>
Date: Wed Apr 3 15:47:33 2013 +0100
x86: Fix rebuild with EFI_STUB enabled
eboot.o and efi_stub_$(BITS).o didn't get added to "targets", and hence
their .cmd files don't get included by the build machinery, leading to
the files always getting rebuilt.
Rather than adding the two files individually, take the opportunity and
add $(VMLINUX_OBJS) to "targets" instead, thus allowing the assignment
at the top of the file to be shrunk quite a bit.
At the same time, remove a pointless flags override line - the variable
assigned to was misspelled anyway, and the options added are
meaningless for assembly sources.
[ hpa: the patch is not minimal, but I am taking it for -urgent anyway
since the excess impact of the patch seems to be small enough. ]
Signed-off-by: Jan Beulich <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Cc: Matthew Garrett <[email protected]>
Cc: Matt Fleming <[email protected]>
Signed-off-by: H. Peter Anvin <[email protected]>
diff --git a/arch/x86/boot/compressed/Makefile b/arch/x86/boot/compressed/Makefile
index 8a84501..5ef205c 100644
--- a/arch/x86/boot/compressed/Makefile
+++ b/arch/x86/boot/compressed/Makefile
@@ -4,7 +4,7 @@
# create a compressed vmlinux image from the original vmlinux
#
-targets := vmlinux.lds vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xz vmlinux.bin.lzo head_$(BITS).o misc.o string.o cmdline.o early_serial_console.o piggy.o
+targets := vmlinux vmlinux.bin vmlinux.bin.gz vmlinux.bin.bz2 vmlinux.bin.lzma vmlinux.bin.xz vmlinux.bin.lzo
KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
@@ -29,7 +29,6 @@ VMLINUX_OBJS = $(obj)/vmlinux.lds $(obj)/head_$(BITS).o $(obj)/misc.o \
$(obj)/piggy.o
$(obj)/eboot.o: KBUILD_CFLAGS += -fshort-wchar -mno-red-zone
-$(obj)/efi_stub_$(BITS).o: KBUILD_CLFAGS += -fshort-wchar -mno-red-zone
ifeq ($(CONFIG_EFI_STUB), y)
VMLINUX_OBJS += $(obj)/eboot.o $(obj)/efi_stub_$(BITS).o
@@ -43,7 +42,7 @@ OBJCOPYFLAGS_vmlinux.bin := -R .comment -S
$(obj)/vmlinux.bin: vmlinux FORCE
$(call if_changed,objcopy)
-targets += vmlinux.bin.all vmlinux.relocs
+targets += $(patsubst $(obj)/%,%,$(VMLINUX_OBJS)) vmlinux.bin.all vmlinux.relocs
CMD_RELOCS = arch/x86/tools/relocs
quiet_cmd_relocs = RELOCS $@
--
Matt Fleming, Intel Open Source Technology Center