diff options
5 files changed, 97 insertions, 0 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.34/997-lzo_decompressor_fix.patch b/target/linux/generic-2.6/patches-2.6.34/997-lzo_decompressor_fix.patch new file mode 100644 index 0000000000..450986538d --- /dev/null +++ b/target/linux/generic-2.6/patches-2.6.34/997-lzo_decompressor_fix.patch @@ -0,0 +1,11 @@ +--- a/usr/Kconfig ++++ b/usr/Kconfig +@@ -75,7 +75,7 @@ config RD_LZMA + config RD_LZO + bool "Support initial ramdisks compressed using LZO" if EMBEDDED + default !EMBEDDED +- depends on BLK_DEV_INITRD ++ depends on BLK_DEV_INITRD && HAVE_KERNEL_LZO + select DECOMPRESS_LZO + help + Support loading of a LZO encoded initial ramdisk or cpio buffer diff --git a/target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch b/target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch new file mode 100644 index 0000000000..442c0ec76e --- /dev/null +++ b/target/linux/uml/patches-2.6.34/001-gcc4_unit_at_a_time_i386_fix.patch @@ -0,0 +1,11 @@ +--- a/arch/um/Makefile-i386 ++++ b/arch/um/Makefile-i386 +@@ -35,7 +35,7 @@ cflags-y += -ffreestanding + # Disable unit-at-a-time mode on pre-gcc-4.0 compilers, it makes gcc use + # a lot more stack due to the lack of sharing of stacklots. Also, gcc + # 4.3.0 needs -funit-at-a-time for extern inline functions. +-KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0400 ] ; then \ ++KBUILD_CFLAGS += $(shell if [ $(call cc-version) -lt 0403 ] ; then \ + echo $(call cc-option,-fno-unit-at-a-time); \ + else echo $(call cc-option,-funit-at-a-time); fi ;) + diff --git a/target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch b/target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch new file mode 100644 index 0000000000..2be33d02a3 --- /dev/null +++ b/target/linux/uml/patches-2.6.34/002-gcc4_unfortify_source.patch @@ -0,0 +1,21 @@ +--- a/arch/um/Makefile-i386 ++++ b/arch/um/Makefile-i386 +@@ -39,4 +39,8 @@ KBUILD_CFLAGS += $(shell if [ $(call cc- + echo $(call cc-option,-fno-unit-at-a-time); \ + else echo $(call cc-option,-funit-at-a-time); fi ;) + ++# disable compile-time buffer checks, enabled by default on Ubuntu 8.10 ++# and later ++KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE) ++ + KBUILD_CFLAGS += $(cflags-y) +--- a/arch/um/Makefile-x86_64 ++++ b/arch/um/Makefile-x86_64 +@@ -24,3 +24,7 @@ LINK-y += -m64 + + # Do unit-at-a-time unconditionally on x86_64, following the host + KBUILD_CFLAGS += $(call cc-option,-funit-at-a-time) ++ ++# disable compile-time buffer checks, enabled by default on Ubuntu 8.10 ++# and later ++KBUILD_CFLAGS += $(call cc-option,-U_FORTIFY_SOURCE) diff --git a/target/linux/uml/patches-2.6.34/003-fix_text_section.patch b/target/linux/uml/patches-2.6.34/003-fix_text_section.patch new file mode 100644 index 0000000000..f973cfd604 --- /dev/null +++ b/target/linux/uml/patches-2.6.34/003-fix_text_section.patch @@ -0,0 +1,40 @@ +um: remove PAGE_SIZE alignment in linker script causing kernel segfault. + +The linker script cleanup that I did in commit +5d150a97f9391f5bcd7ba0d59d7a11c3de3cea80 accidentally introduced an +ALIGN(PAGE_SIZE) when converting to use INIT_TEXT_SECTION; Richard +Weinberger reported that this causes the kernel to segfault with +CONFIG_STATIC_LINK=y. + +I'm not certain why this extra alignment is a problem, but it seems likely +it is because previously + +__init_begin = _stext = _text = _sinittext + +and with the extra ALIGN(PAGE_SIZE), _sinittext becomes different from the +rest. So there is likely a bug here where something is assuming that +_sinittext is the same as one of those other symbols. But reverting the +accidental change fixes the regression, so it seems worth committing that +now. + +Signed-off-by: Tim Abbott <tabbott@ksplice.com> +Reported-by: richard -rw- weinberger <richard.weinberger@gmail.com> +Cc: Jeff Dike <jdike@addtoit.com> +Cc: user-mode-linux-devel@lists.sourceforge.net +--- + arch/um/kernel/uml.lds.S | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S +index e7a6cca..664f942 100644 +--- a/arch/um/kernel/uml.lds.S ++++ b/arch/um/kernel/uml.lds.S +@@ -22,7 +22,7 @@ SECTIONS + _text = .; + _stext = .; + __init_begin = .; +- INIT_TEXT_SECTION(PAGE_SIZE) ++ INIT_TEXT_SECTION(0) + . = ALIGN(PAGE_SIZE); + + .text : diff --git a/target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch new file mode 100644 index 0000000000..b71a673314 --- /dev/null +++ b/target/linux/uml/patches-2.6.34/901-lib_zlib_deflate_visible.patch @@ -0,0 +1,14 @@ +make ZLIB_DEFLATE visible, so that we can choose whether we want it built-in +or as a module + +--- a/lib/Kconfig ++++ b/lib/Kconfig +@@ -92,7 +92,7 @@ config ZLIB_INFLATE + tristate + + config ZLIB_DEFLATE +- tristate ++ tristate "Zlib compression" + + config LZO_COMPRESS + tristate |