From 76c5b603c8330fd2ed23f3baab5361e8bc4bbd4a Mon Sep 17 00:00:00 2001 From: Peter Korsgaard Date: Fri, 23 Jan 2009 13:12:51 +0000 Subject: kernel-headers: rename 2.6.25/2.6.28 patches to match current stable versions Otherwise they won't get applied. --- .../linux-2.6.25.15-export-linux-aout.patch | 24 ------------ .../linux-2.6.25.19-export-linux-aout.patch | 24 ++++++++++++ .../kernel-headers/linux-2.6.28-cris-headers.patch | 28 -------------- .../linux-2.6.28-cris-objcopy-flags.patch | 45 ---------------------- .../linux-2.6.28.1-cris-headers.patch | 28 ++++++++++++++ .../linux-2.6.28.1-cris-objcopy-flags.patch | 45 ++++++++++++++++++++++ 6 files changed, 97 insertions(+), 97 deletions(-) delete mode 100644 toolchain/kernel-headers/linux-2.6.25.15-export-linux-aout.patch create mode 100644 toolchain/kernel-headers/linux-2.6.25.19-export-linux-aout.patch delete mode 100644 toolchain/kernel-headers/linux-2.6.28-cris-headers.patch delete mode 100644 toolchain/kernel-headers/linux-2.6.28-cris-objcopy-flags.patch create mode 100644 toolchain/kernel-headers/linux-2.6.28.1-cris-headers.patch create mode 100644 toolchain/kernel-headers/linux-2.6.28.1-cris-objcopy-flags.patch diff --git a/toolchain/kernel-headers/linux-2.6.25.15-export-linux-aout.patch b/toolchain/kernel-headers/linux-2.6.25.15-export-linux-aout.patch deleted file mode 100644 index 972fa76b0..000000000 --- a/toolchain/kernel-headers/linux-2.6.25.15-export-linux-aout.patch +++ /dev/null @@ -1,24 +0,0 @@ -[PATCH] export linux/a.out.h - -Export linux/a.out.h like we do for asm/a.out.h. One minor complication is -that the interesting stuff is protected by an CONFIG_ARCH_SUPPORTS_AOUT ifdef, -so make sure this gets defined for unifdef. - -Signed-off-by: Peter Korsgaard ---- - include/linux/Kbuild | 2 ++ - 1 file changed, 2 insertions(+) - -Index: linux-2.6.25.6/include/linux/Kbuild -=================================================================== ---- linux-2.6.25.6.orig/include/linux/Kbuild -+++ linux-2.6.25.6/include/linux/Kbuild -@@ -159,6 +159,8 @@ - header-y += videotext.h - header-y += x25.h - -+UNIFDEF += -DCONFIG_ARCH_SUPPORTS_AOUT -+unifdef-y += a.out.h - unifdef-y += acct.h - unifdef-y += adb.h - unifdef-y += adfs_fs.h diff --git a/toolchain/kernel-headers/linux-2.6.25.19-export-linux-aout.patch b/toolchain/kernel-headers/linux-2.6.25.19-export-linux-aout.patch new file mode 100644 index 000000000..972fa76b0 --- /dev/null +++ b/toolchain/kernel-headers/linux-2.6.25.19-export-linux-aout.patch @@ -0,0 +1,24 @@ +[PATCH] export linux/a.out.h + +Export linux/a.out.h like we do for asm/a.out.h. One minor complication is +that the interesting stuff is protected by an CONFIG_ARCH_SUPPORTS_AOUT ifdef, +so make sure this gets defined for unifdef. + +Signed-off-by: Peter Korsgaard +--- + include/linux/Kbuild | 2 ++ + 1 file changed, 2 insertions(+) + +Index: linux-2.6.25.6/include/linux/Kbuild +=================================================================== +--- linux-2.6.25.6.orig/include/linux/Kbuild ++++ linux-2.6.25.6/include/linux/Kbuild +@@ -159,6 +159,8 @@ + header-y += videotext.h + header-y += x25.h + ++UNIFDEF += -DCONFIG_ARCH_SUPPORTS_AOUT ++unifdef-y += a.out.h + unifdef-y += acct.h + unifdef-y += adb.h + unifdef-y += adfs_fs.h diff --git a/toolchain/kernel-headers/linux-2.6.28-cris-headers.patch b/toolchain/kernel-headers/linux-2.6.28-cris-headers.patch deleted file mode 100644 index ff2fa49c5..000000000 --- a/toolchain/kernel-headers/linux-2.6.28-cris-headers.patch +++ /dev/null @@ -1,28 +0,0 @@ -diff -urN linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.28.my/arch/cris/include/arch-v10/arch/Kbuild ---- linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/include/arch-v10/arch/Kbuild 2009-01-12 12:59:06.000000000 +0100 -@@ -1,3 +1,5 @@ -+header-y += elf.h -+header-y += ptrace.h - header-y += user.h - header-y += svinto.h - header-y += sv_addr_ag.h -diff -urN linux-2.6.28/arch/cris/include/asm/Kbuild linux-2.6.28.my/arch/cris/include/asm/Kbuild ---- linux-2.6.28/arch/cris/include/asm/Kbuild 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/include/asm/Kbuild 2009-01-12 13:14:40.000000000 +0100 -@@ -1,11 +1,13 @@ - include include/asm-generic/Kbuild.asm - --header-y += arch-v10/ --header-y += arch-v32/ -+header-y += ../arch-v10/arch/ -+header-y += ../arch-v32/arch/ - -+header-y += elf.h - header-y += ethernet.h - header-y += rtc.h - header-y += sync_serial.h -+header-y += user.h - - unifdef-y += etraxgpio.h - unifdef-y += rs485.h diff --git a/toolchain/kernel-headers/linux-2.6.28-cris-objcopy-flags.patch b/toolchain/kernel-headers/linux-2.6.28-cris-objcopy-flags.patch deleted file mode 100644 index 32da2f087..000000000 --- a/toolchain/kernel-headers/linux-2.6.28-cris-objcopy-flags.patch +++ /dev/null @@ -1,45 +0,0 @@ ---- linux-2.6.28/arch/cris/Makefile 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/Makefile 2009-01-12 13:21:44.000000000 +0100 -@@ -40,7 +40,7 @@ - - LD = $(CROSS_COMPILE)ld -mcrislinux - --OBJCOPYFLAGS := -O binary -R .note -R .comment -S -+OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment - - CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) - -diff -urN linux-2.6.28/arch/cris/arch-v10/boot/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/Makefile ---- linux-2.6.28/arch/cris/arch-v10/boot/Makefile 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/arch-v10/boot/Makefile 2009-01-12 13:28:25.000000000 +0100 -@@ -2,8 +2,6 @@ - # arch/cris/arch-v10/boot/Makefile - # - --OBJCOPYFLAGS = -O binary --remove-section=.bss -- - subdir- := compressed rescue - targets := Image - -diff -urN linux-2.6.28/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/compressed/Makefile ---- linux-2.6.28/arch/cris/arch-v10/boot/compressed/Makefile 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/arch-v10/boot/compressed/Makefile 2009-01-12 13:28:33.000000000 +0100 -@@ -6,7 +6,6 @@ - ccflags-y += -O2 $(LINUXINCLUDE) - ldflags-y += -T $(srctree)/$(src)/decompress.lds - OBJECTS = $(obj)/head.o $(obj)/misc.o --OBJCOPYFLAGS = -O binary --remove-section=.bss - - quiet_cmd_image = BUILD $@ - cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@ -diff -urN linux-2.6.28/arch/cris/arch-v10/boot/rescue/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/rescue/Makefile ---- linux-2.6.28/arch/cris/arch-v10/boot/rescue/Makefile 2008-12-25 00:26:37.000000000 +0100 -+++ linux-2.6.28.my/arch/cris/arch-v10/boot/rescue/Makefile 2009-01-12 13:28:40.000000000 +0100 -@@ -5,7 +5,6 @@ - ccflags-y += -O2 $(LINUXINCLUDE) - asflags-y += $(LINUXINCLUDE) - ldflags-y += -T $(srctree)/$(src)/rescue.lds --OBJCOPYFLAGS = -O binary --remove-section=.bss - obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o - OBJECT := $(obj)/head.o - diff --git a/toolchain/kernel-headers/linux-2.6.28.1-cris-headers.patch b/toolchain/kernel-headers/linux-2.6.28.1-cris-headers.patch new file mode 100644 index 000000000..ff2fa49c5 --- /dev/null +++ b/toolchain/kernel-headers/linux-2.6.28.1-cris-headers.patch @@ -0,0 +1,28 @@ +diff -urN linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild linux-2.6.28.my/arch/cris/include/arch-v10/arch/Kbuild +--- linux-2.6.28/arch/cris/include/arch-v10/arch/Kbuild 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/include/arch-v10/arch/Kbuild 2009-01-12 12:59:06.000000000 +0100 +@@ -1,3 +1,5 @@ ++header-y += elf.h ++header-y += ptrace.h + header-y += user.h + header-y += svinto.h + header-y += sv_addr_ag.h +diff -urN linux-2.6.28/arch/cris/include/asm/Kbuild linux-2.6.28.my/arch/cris/include/asm/Kbuild +--- linux-2.6.28/arch/cris/include/asm/Kbuild 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/include/asm/Kbuild 2009-01-12 13:14:40.000000000 +0100 +@@ -1,11 +1,13 @@ + include include/asm-generic/Kbuild.asm + +-header-y += arch-v10/ +-header-y += arch-v32/ ++header-y += ../arch-v10/arch/ ++header-y += ../arch-v32/arch/ + ++header-y += elf.h + header-y += ethernet.h + header-y += rtc.h + header-y += sync_serial.h ++header-y += user.h + + unifdef-y += etraxgpio.h + unifdef-y += rs485.h diff --git a/toolchain/kernel-headers/linux-2.6.28.1-cris-objcopy-flags.patch b/toolchain/kernel-headers/linux-2.6.28.1-cris-objcopy-flags.patch new file mode 100644 index 000000000..32da2f087 --- /dev/null +++ b/toolchain/kernel-headers/linux-2.6.28.1-cris-objcopy-flags.patch @@ -0,0 +1,45 @@ +--- linux-2.6.28/arch/cris/Makefile 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/Makefile 2009-01-12 13:21:44.000000000 +0100 +@@ -40,7 +40,7 @@ + + LD = $(CROSS_COMPILE)ld -mcrislinux + +-OBJCOPYFLAGS := -O binary -R .note -R .comment -S ++OBJCOPYFLAGS := -O binary -R .note -R .note.gnu.build-id -R .comment + + CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE) + +diff -urN linux-2.6.28/arch/cris/arch-v10/boot/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/Makefile +--- linux-2.6.28/arch/cris/arch-v10/boot/Makefile 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/arch-v10/boot/Makefile 2009-01-12 13:28:25.000000000 +0100 +@@ -2,8 +2,6 @@ + # arch/cris/arch-v10/boot/Makefile + # + +-OBJCOPYFLAGS = -O binary --remove-section=.bss +- + subdir- := compressed rescue + targets := Image + +diff -urN linux-2.6.28/arch/cris/arch-v10/boot/compressed/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/compressed/Makefile +--- linux-2.6.28/arch/cris/arch-v10/boot/compressed/Makefile 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/arch-v10/boot/compressed/Makefile 2009-01-12 13:28:33.000000000 +0100 +@@ -6,7 +6,6 @@ + ccflags-y += -O2 $(LINUXINCLUDE) + ldflags-y += -T $(srctree)/$(src)/decompress.lds + OBJECTS = $(obj)/head.o $(obj)/misc.o +-OBJCOPYFLAGS = -O binary --remove-section=.bss + + quiet_cmd_image = BUILD $@ + cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@ +diff -urN linux-2.6.28/arch/cris/arch-v10/boot/rescue/Makefile linux-2.6.28.my/arch/cris/arch-v10/boot/rescue/Makefile +--- linux-2.6.28/arch/cris/arch-v10/boot/rescue/Makefile 2008-12-25 00:26:37.000000000 +0100 ++++ linux-2.6.28.my/arch/cris/arch-v10/boot/rescue/Makefile 2009-01-12 13:28:40.000000000 +0100 +@@ -5,7 +5,6 @@ + ccflags-y += -O2 $(LINUXINCLUDE) + asflags-y += $(LINUXINCLUDE) + ldflags-y += -T $(srctree)/$(src)/rescue.lds +-OBJCOPYFLAGS = -O binary --remove-section=.bss + obj-$(CONFIG_ETRAX_AXISFLASHMAP) = head.o + OBJECT := $(obj)/head.o + -- cgit v1.2.3