gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

kernel-headers: remove 2.6.20-22 variants and outdated impi/lzma patches

Browse Source
This commit is contained in:
Peter Korsgaard 2009-02-25 14:26:03 +00:00
parent 895cf9e27d
commit 8259f1529a
14 changed files with 0 additions and 61750 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
target/linux/Makefile.in
View File

@ -126,14 +126,6 @@ endif
$(LINUX26_DIR)/.patched: $(LINUX26_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
ifeq ($(BR2_KERNEL_HEADERS_IPMI),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers/ipmi \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
endif
ifeq ($(BR2_KERNEL_HEADERS_LZMA),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers/lzma \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
endif
ifeq ($(BR2_KERNEL_HEADERS_RT),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
endif

8
target/linux/Makefile.in.advanced
View File

@ -260,14 +260,6 @@ ifneq ($(LINUX26_BSP_PATCH),)
endif
toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
ifeq ($(BR2_KERNEL_HEADERS_IPMI),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers/ipmi \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
endif
ifeq ($(BR2_KERNEL_HEADERS_LZMA),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) toolchain/kernel-headers/lzma \
linux-$(LINUX26_VERSION)-\*.patch{,.gz,.bz2}
endif
ifeq ($(BR2_KERNEL_HEADERS_RT),y)
toolchain/patch-kernel.sh $(LINUX26_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
endif

45
toolchain/kernel-headers/Config.in
View File

@ -16,30 +16,6 @@ choice
For the snapshot, you have to provide the
linux-2.6.tar.bz2 tarball in your download dir.
config BR2_KERNEL_HEADERS_2_6_20_4
depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
bool "Linux 2.6.20.4 kernel headers"
config BR2_KERNEL_HEADERS_2_6_20
depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
bool "Linux 2.6.20.x kernel headers"
config BR2_KERNEL_HEADERS_2_6_21_5
depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
bool "Linux 2.6.21.5 kernel headers"
config BR2_KERNEL_HEADERS_2_6_21
depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
bool "Linux 2.6.21.x kernel headers"
config BR2_KERNEL_HEADERS_2_6_22_1
depends on !BR2_avr32 && !BR2_nios2 && BR2_DEPRECATED
bool "Linux 2.6.22.1 kernel headers"
config BR2_KERNEL_HEADERS_2_6_22_10
depends on !BR2_nios2 && BR2_DEPRECATED
bool "Linux 2.6.22.10 kernel headers"
config BR2_KERNEL_HEADERS_2_6_22
depends on BR2_DEPRECATED
bool "Linux 2.6.22.x kernel headers"
@ -72,20 +48,6 @@ choice
endchoice
config BR2_KERNEL_HEADERS_IPMI
bool "use ipmi kernel patches"
depends on BR2_KERNEL_HEADERS_2_6_20_4 || BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
help
Apply patches which add IPMI sensor support.
config BR2_KERNEL_HEADERS_LZMA
bool "use lzma initramfs kernel patches"
depends on BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
help
Apply patches which allow for lzma compressed
initramfs filesystems. This requires the lzma
program in your development environment.
config BR2_KERNEL_HEADERS_RT
bool "use realtime (-rt) kernel patches"
depends on BR2_KERNEL_HEADERS_2_6_21_5 || BR2_KERNEL_HEADERS_2_6_22_1
@ -101,13 +63,6 @@ config BR2_KERNEL_HEADERS_PATCH_DIR
config BR2_DEFAULT_KERNEL_HEADERS
string
default "2.4.31" if BR2_KERNEL_HEADERS_2_4_31
default "2.6.20.4" if BR2_KERNEL_HEADERS_2_6_20_4
default "2.6.20.20" if BR2_KERNEL_HEADERS_2_6_20
default "2.6.21.5" if BR2_KERNEL_HEADERS_2_6_21_5
default "2.6.21.7" if BR2_KERNEL_HEADERS_2_6_21
default "2.6.22.1" if BR2_KERNEL_HEADERS_2_6_22_1
default "2.6.22.10" if BR2_KERNEL_HEADERS_2_6_22_10
default "2.6.22.10" if BR2_KERNEL_HEADERS_2_6_22
default "2.6.23" if BR2_KERNEL_HEADERS_2_6_23
default "2.6.24.7" if BR2_KERNEL_HEADERS_2_6_24

0
toolchain/kernel-headers/empty/.empty
View File

1914
toolchain/kernel-headers/ipmi/linux-2.6.20.4-ipmisensors-20070314-1214.patch
View File

File diff suppressed because it is too large Load Diff

1914
toolchain/kernel-headers/ipmi/linux-2.6.21.5-007-ipmisensors-20070314-1214.patch
View File

File diff suppressed because it is too large Load Diff

1914
toolchain/kernel-headers/ipmi/linux-2.6.22.1-007-ipmisensors-20070314-1214.patch
View File

File diff suppressed because it is too large Load Diff

1914
toolchain/kernel-headers/ipmi/linux-2.6.22.9-007-ipmisensors-20070314-1214.patch
View File

File diff suppressed because it is too large Load Diff

8
toolchain/kernel-headers/kernel-headers-new.makefile
View File

@ -53,14 +53,6 @@ $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE)
$(LINUX_HEADERS_UNPACK_DIR)/.patched: $(LINUX_HEADERS_UNPACK_DIR)/.unpacked $(LINUX_HEADERS_DEPENDS)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers \
linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
ifeq ($(BR2_KERNEL_HEADERS_IPMI),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers/ipmi \
linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
endif
ifeq ($(BR2_KERNEL_HEADERS_LZMA),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) toolchain/kernel-headers/lzma \
linux-$(LINUX_HEADERS_VERSION)-\*.patch{,.gz,.bz2}
endif
ifeq ($(BR2_KERNEL_HEADERS_RT),y)
toolchain/patch-kernel.sh $(LINUX_HEADERS_UNPACK_DIR) $(DL_DIR) $(LINUX_RT_SOURCE)
endif

27017
toolchain/kernel-headers/lzma/linux-2.6.21.5-001-lzma-vmlinuz.00.patch
View File

File diff suppressed because it is too large Load Diff

54
toolchain/kernel-headers/lzma/linux-2.6.21.5-002-lzma-vmlinuz.01.patch
View File

@ -1,54 +0,0 @@
diff -rdup linux-2.6.21.5.oorig/arch/i386/boot/compressed/Makefile linux-2.6.21.5/arch/i386/boot/compressed/Makefile
--- linux-2.6.21.5.oorig/arch/i386/boot/compressed/Makefile 2007-07-24 13:08:51.000000000 +0200
+++ linux-2.6.21.5/arch/i386/boot/compressed/Makefile 2007-07-24 14:54:38.000000000 +0200
@@ -4,7 +4,7 @@
# create a compressed vmlinux image from the original vmlinux
#
-tragets := head.o lzma_misc.o piggy.o \
+targets := head.o lzma_misc.o piggy.o \
vmlinux.bin.all vmlinux.relocs \
vmlinux vmlinux.bin vmlinux.bin.gz
EXTRA_AFLAGS := -traditional
diff -rdup linux-2.6.21.5.oorig/scripts/gen_lzma_initramfs_list.sh linux-2.6.21.5/scripts/gen_lzma_initramfs_list.sh
--- linux-2.6.21.5.oorig/scripts/gen_lzma_initramfs_list.sh 2007-07-24 13:08:51.000000000 +0200
+++ linux-2.6.21.5/scripts/gen_lzma_initramfs_list.sh 2007-07-24 15:12:10.000000000 +0200
@@ -253,7 +253,7 @@ while [ $# -gt 0 ]; do
shift
;;
"-s")
- opt="-d16"
+ #opt="-d16" ? what was that supposed to do?
;;
"-d") # display default initramfs list
default_list="$arg"
@@ -286,7 +286,7 @@ if [ ! -z ${output_file} ]; then
cpio_tfile=${cpio_file}
fi
rm ${cpio_list}
- lzma e ${cpio_tfile} ${output_file} ${opt}
+ lzma -z ${cpio_tfile} ${opt} -c > ${output_file}
[ -z ${cpio_file} ] && rm ${cpio_tfile}
fi
exit 0
--- linux-2.6.21.5.oorig/arch/i386/boot/compressed/lzma_misc.c 2007-07-24 15:24:44.000000000 +0200
+++ linux-2.6.21.5/arch/i386/boot/compressed/lzma_misc.c 2007-07-24 17:09:40.000000000 +0200
@@ -241,7 +241,6 @@ static int lzma_unzip(uch* output)
static int read_byte(void *object, const unsigned char **buffer, SizeT *bufferSize)
{
- static unsigned int i = 0;
static unsigned char val;
*bufferSize = 1;
val = get_byte();
--- linux-2.6.21.5.oorig/scripts/Makefile.lib 2007-07-24 15:24:44.000000000 +0200
+++ linux-2.6.21.5/scripts/Makefile.lib 2007-07-24 18:03:57.000000000 +0200
@@ -165,6 +165,7 @@ cmd_gzip = gzip -f -9 < $< > $@
# LZMA
#
quiet_cmd_lzma = LZMA $@
-cmd_lzma = lzma e $< $@ -lc7 -lp0 -pb0 2>/dev/null
+#cmd_lzma = lzma e $< $@ -lc7 -lp0 -pb0 2>/dev/null
+cmd_lzma = lzma -z $< -c > $@

26856
toolchain/kernel-headers/lzma/linux-2.6.22.1-001-lzma-vmlinuz.00.patch
View File

File diff suppressed because it is too large Load Diff

54
toolchain/kernel-headers/lzma/linux-2.6.22.1-002-lzma-vmlinuz.01.patch
View File

@ -1,54 +0,0 @@
diff -rdup linux-2.6.21.5.oorig/arch/i386/boot/compressed/Makefile linux-2.6.21.5/arch/i386/boot/compressed/Makefile
--- linux-2.6.21.5.oorig/arch/i386/boot/compressed/Makefile 2007-07-24 13:08:51.000000000 +0200
+++ linux-2.6.21.5/arch/i386/boot/compressed/Makefile 2007-07-24 14:54:38.000000000 +0200
@@ -4,7 +4,7 @@
# create a compressed vmlinux image from the original vmlinux
#
-tragets := head.o lzma_misc.o piggy.o \
+targets := head.o lzma_misc.o piggy.o \
vmlinux.bin.all vmlinux.relocs \
vmlinux vmlinux.bin vmlinux.bin.gz
EXTRA_AFLAGS := -traditional
diff -rdup linux-2.6.21.5.oorig/scripts/gen_lzma_initramfs_list.sh linux-2.6.21.5/scripts/gen_lzma_initramfs_list.sh
--- linux-2.6.21.5.oorig/scripts/gen_lzma_initramfs_list.sh 2007-07-24 13:08:51.000000000 +0200
+++ linux-2.6.21.5/scripts/gen_lzma_initramfs_list.sh 2007-07-24 15:12:10.000000000 +0200
@@ -253,7 +253,7 @@ while [ $# -gt 0 ]; do
shift
;;
"-s")
- opt="-d16"
+ #opt="-d16" ? what was that supposed to do?
;;
"-d") # display default initramfs list
default_list="$arg"
@@ -286,7 +286,7 @@ if [ ! -z ${output_file} ]; then
cpio_tfile=${cpio_file}
fi
rm ${cpio_list}
- lzma e ${cpio_tfile} ${output_file} ${opt}
+ lzma -z ${cpio_tfile} ${opt} -c > ${output_file}
[ -z ${cpio_file} ] && rm ${cpio_tfile}
fi
exit 0
--- linux-2.6.21.5.oorig/arch/i386/boot/compressed/lzma_misc.c 2007-07-24 15:24:44.000000000 +0200
+++ linux-2.6.21.5/arch/i386/boot/compressed/lzma_misc.c 2007-07-24 17:09:40.000000000 +0200
@@ -241,7 +241,6 @@ static int lzma_unzip(uch* output)
static int read_byte(void *object, const unsigned char **buffer, SizeT *bufferSize)
{
- static unsigned int i = 0;
static unsigned char val;
*bufferSize = 1;
val = get_byte();
--- linux-2.6.21.5.oorig/scripts/Makefile.lib 2007-07-24 15:24:44.000000000 +0200
+++ linux-2.6.21.5/scripts/Makefile.lib 2007-07-24 18:03:57.000000000 +0200
@@ -165,6 +165,7 @@ cmd_gzip = gzip -f -9 < $< > $@
# LZMA
#
quiet_cmd_lzma = LZMA $@
-cmd_lzma = lzma e $< $@ -lc7 -lp0 -pb0 2>/dev/null
+#cmd_lzma = lzma e $< $@ -lc7 -lp0 -pb0 2>/dev/null
+cmd_lzma = lzma -z $< -c > $@

44
toolchain/kernel-headers/lzma/linux-2.6.22.1-003-lzma-vmlinuz.patch
View File

@ -1,44 +0,0 @@
diff -rdup linux-2.6.22.1.old/scripts/Makefile.lib linux-2.6.22.1/scripts/Makefile.lib
--- linux-2.6.22.1.old/scripts/Makefile.lib 2007-08-21 16:32:19.000000000 +0200
+++ linux-2.6.22.1/scripts/Makefile.lib 2007-08-21 16:43:20.000000000 +0200
@@ -166,6 +166,6 @@ cmd_gzip = gzip -f -9 < $< > $@
#
quiet_cmd_lzma = LZMA $@
#cmd_lzma = lzma e $< $@ -lc7 -lp0 -pb0 2>/dev/null
-cmd_lzma = lzma -z $< -c > $@
+cmd_lzma = $(LZMA) -z $< -c > $@
diff -rdup linux-2.6.22.1.old/scripts/gen_lzma_initramfs_list.sh linux-2.6.22.1/scripts/gen_lzma_initramfs_list.sh
--- linux-2.6.22.1.old/scripts/gen_lzma_initramfs_list.sh 2007-08-21 16:32:19.000000000 +0200
+++ linux-2.6.22.1/scripts/gen_lzma_initramfs_list.sh 2007-08-21 16:42:56.000000000 +0200
@@ -11,7 +11,7 @@
# error out on errors
set -e
-
+test "x$LZMA" = "x" && LZMA=lzma
usage() {
cat << EOF
Usage:
@@ -286,7 +286,7 @@ if [ ! -z ${output_file} ]; then
cpio_tfile=${cpio_file}
fi
rm ${cpio_list}
- lzma -z ${cpio_tfile} ${opt} -c > ${output_file}
+ $LZMA -z ${cpio_tfile} ${opt} -c > ${output_file}
[ -z ${cpio_file} ] && rm ${cpio_tfile}
fi
exit 0
diff -rdup linux-2.6.22.1.old/usr/Makefile linux-2.6.22.1/usr/Makefile
--- linux-2.6.22.1.old/usr/Makefile 2007-08-21 16:32:19.000000000 +0200
+++ linux-2.6.22.1/usr/Makefile 2007-08-21 16:46:22.000000000 +0200
@@ -19,7 +19,7 @@ $(obj)/initramfs_data.o: $(obj)/initramf
hostprogs-y := gen_init_cpio
initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_initramfs_list.sh
-lzma_initramfs := $(CONFIG_SHELL) $(srctree)/scripts/gen_lzma_initramfs_list.sh
+lzma_initramfs := LZMA=$(LZMA) $(CONFIG_SHELL) $(srctree)/scripts/gen_lzma_initramfs_list.sh
ramfs-input := $(if $(filter-out "",$(CONFIG_INITRAMFS_SOURCE)), \
$(shell echo $(CONFIG_INITRAMFS_SOURCE)),-d)
ramfs-args := \