Author: hawk Date: Thu May 8 18:49:37 2008 GMT
Module: SOURCES Tag: CRI
---- Log message:
- doh, Makefile changes were broken, should be fixed now
---- Files affected:
SOURCES:
kernel-CRI-lzma-vmlinuz.patch (1.1.2.3 -> 1.1.2.4)
---- Diffs:
================================================================
Index: SOURCES/kernel-CRI-lzma-vmlinuz.patch
diff -u SOURCES/kernel-CRI-lzma-vmlinuz.patch:1.1.2.3
SOURCES/kernel-CRI-lzma-vmlinuz.patch:1.1.2.4
--- SOURCES/kernel-CRI-lzma-vmlinuz.patch:1.1.2.3 Thu May 8 19:03:39 2008
+++ SOURCES/kernel-CRI-lzma-vmlinuz.patch Thu May 8 20:49:31 2008
@@ -1,6 +1,6 @@
diff -urNp linux-2.6.25.orig/arch/x86/boot/compressed/Makefile
linux-2.6.25/arch/x86/boot/compressed/Makefile
--- linux-2.6.25.orig/arch/x86/boot/compressed/Makefile 2008-05-08
14:47:45.000000000 +0200
-+++ linux-2.6.25/arch/x86/boot/compressed/Makefile 2008-05-08
17:15:11.000000000 +0200
++++ linux-2.6.25/arch/x86/boot/compressed/Makefile 2008-05-08
20:42:22.000000000 +0200
@@ -4,7 +4,7 @@
# create a compressed vmlinux image from the original vmlinux
#
@@ -10,61 +10,64 @@
KBUILD_CFLAGS := -m$(BITS) -D__KERNEL__ $(LINUX_INCLUDE) -O2
KBUILD_CFLAGS += -fno-strict-aliasing -fPIC
-@@ -17,10 +17,12 @@ KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__A
+@@ -17,10 +17,11 @@ KBUILD_AFLAGS := $(KBUILD_CFLAGS) -D__A
LDFLAGS := -m elf_$(UTS_MACHINE)
LDFLAGS_vmlinux := -T
+-
+-$(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o
$(obj)/misc.o $(obj)/piggy.o FORCE
+- $(call if_changed,ld)
+- @:
+ifeq ($(CONFIG_X86_32),y)
+LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T
+else
+LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T
+endif
--$(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o
$(obj)/misc.o $(obj)/piggy.o FORCE
-- $(call if_changed,ld)
-- @:
-
OBJCOPYFLAGS_vmlinux.bin := -O binary -R .note -R .comment -S
$(obj)/vmlinux.bin: vmlinux FORCE
-@@ -43,6 +45,13 @@ quiet_cmd_relocbin = BUILD $@
+@@ -42,7 +43,16 @@ quiet_cmd_relocbin = BUILD $@
+ cmd_relocbin = cat $(filter-out FORCE,$^) > $@
$(obj)/vmlinux.bin.all: $(vmlinux.bin.all-y) FORCE
$(call if_changed,relocbin)
-
++endif
++
+ifeq ($(CONFIG_KERNEL_GZIP),y)
+targets += vmlinux.bin.gz misc.o
+
+$(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o
$(obj)/misc.o $(obj)/piggy.o FORCE
+ $(call if_changed,ld)
+ @:
-+
+
++ifeq ($(CONFIG_X86_32),y)
ifdef CONFIG_RELOCATABLE
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin.all FORCE
$(call if_changed,gzip)
-@@ -50,15 +59,38 @@ else
+@@ -50,15 +60,35 @@ else
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
$(call if_changed,gzip)
endif
-LDFLAGS_piggy.o := -r --format binary --oformat elf32-i386 -T
-
+-
else
$(obj)/vmlinux.bin.gz: $(obj)/vmlinux.bin FORCE
$(call if_changed,gzip)
--
++endif
+
-LDFLAGS_piggy.o := -r --format binary --oformat elf64-x86-64 -T
++$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
++ $(call if_changed,ld)
endif
-
- $(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
- $(call if_changed,ld)
-+endif
-+
+ifeq ($(CONFIG_KERNEL_LZMA),y)
+targets += vmlinux.bin.lzma misc_lzma.o
-+
+
+-$(obj)/piggy.o: $(obj)/vmlinux.scr $(obj)/vmlinux.bin.gz FORCE
+$(obj)/vmlinux: $(src)/vmlinux_$(BITS).lds $(obj)/head_$(BITS).o
$(obj)/misc_lzma.o $(obj)/piggy.o FORCE
-+ $(call if_changed,ld)
+ $(call if_changed,ld)
+ @:
+
++ifeq ($(CONFIG_X86_32),y)
+ifdef CONFIG_RELOCATABLE
+$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin.all FORCE
+ $(call if_changed,lzma)
@@ -72,13 +75,11 @@
+$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
+ $(call if_changed,lzma)
+endif
-+
+else
+$(obj)/vmlinux.bin.lzma: $(obj)/vmlinux.bin FORCE
+ $(call if_changed,lzma)
+endif
+
-+
+$(obj)/piggy.o: $(obj)/vmlinux_lzma.scr $(obj)/vmlinux.bin.lzma FORCE
+ $(call if_changed,ld)
+endif
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SOURCES/kernel-CRI-lzma-vmlinuz.patch?r1=1.1.2.3&r2=1.1.2.4&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
