diff options
| author | Nicolas Thill <nico@openwrt.org> | 2009-08-16 10:18:07 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2009-08-16 10:18:07 +0000 |
| commit | f891ad8357367c670197b8f688916fb7f6b5414b (patch) | |
| tree | bab245ca0004c262fa32f8082dfb787e5a096181 /target/linux | |
| parent | 77c2228dbe050657ca62861ac1c79e9b8256de72 (diff) | |
| download | master-187ad058-f891ad8357367c670197b8f688916fb7f6b5414b.tar.gz master-187ad058-f891ad8357367c670197b8f688916fb7f6b5414b.tar.bz2 master-187ad058-f891ad8357367c670197b8f688916fb7f6b5414b.zip | |
[uml] bump to 2.6.30.4, apply fix from [15119] to x86_64
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17285 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/uml/Makefile | 2 | ||||
| -rw-r--r-- | target/linux/uml/config/i386 | 1 | ||||
| -rw-r--r-- | target/linux/uml/config/x86_64 | 2 | ||||
| -rw-r--r-- | target/linux/uml/patches/002-gcc4_unfortify_source.patch | 10 | ||||
| -rw-r--r-- | target/linux/uml/patches/901-lib_zlib_deflate_visible.patch | 2 |
5 files changed, 15 insertions, 2 deletions
diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile index 57148a986c..e1525eb279 100644 --- a/target/linux/uml/Makefile +++ b/target/linux/uml/Makefile @@ -23,7 +23,7 @@ BOARDNAME:=User Mode Linux FEATURES:=ext2 LINUX_CONFIG:=$(CURDIR)/config/$(ARCH) -LINUX_VERSION:=2.6.28.10 +LINUX_VERSION:=2.6.30.4 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/uml/config/i386 b/target/linux/uml/config/i386 index bc55df4dcd..b8f78dc7e6 100644 --- a/target/linux/uml/config/i386 +++ b/target/linux/uml/config/i386 @@ -93,6 +93,7 @@ CONFIG_MPENTIUMII=y # CONFIG_MWINCHIP3D is not set # CONFIG_MWINCHIPC6 is not set CONFIG_NAMESPACES=y +# CONFIG_NET_NS is not set CONFIG_NLS=y # CONFIG_NLS_CODEPAGE_850 is not set # CONFIG_NLS_ISO8859_15 is not set diff --git a/target/linux/uml/config/x86_64 b/target/linux/uml/config/x86_64 index 2801074e2c..6df42ff3ab 100644 --- a/target/linux/uml/config/x86_64 +++ b/target/linux/uml/config/x86_64 @@ -13,6 +13,7 @@ CONFIG_BLK_DEV_UBD_SYNC=y CONFIG_CON_CHAN="xterm" CONFIG_CON_ZERO_CHAN="fd:0,fd:1" CONFIG_CRAMFS=y +# CONFIG_CRYPTO_AES_NI_INTEL is not set # CONFIG_CRYPTO_AES_X86_64 is not set # CONFIG_CRYPTO_SALSA20_X86_64 is not set # CONFIG_CRYPTO_TWOFISH_X86_64 is not set @@ -60,6 +61,7 @@ CONFIG_MCORE2=y CONFIG_MK8=y CONFIG_MODE_SKAS=y CONFIG_NEST_LEVEL=0 +# CONFIG_NET_NS is not set CONFIG_NET_SCH_FIFO=y CONFIG_NLS=y # CONFIG_NLS_CODEPAGE_850 is not set diff --git a/target/linux/uml/patches/002-gcc4_unfortify_source.patch b/target/linux/uml/patches/002-gcc4_unfortify_source.patch index b13e5df521..2be33d02a3 100644 --- a/target/linux/uml/patches/002-gcc4_unfortify_source.patch +++ b/target/linux/uml/patches/002-gcc4_unfortify_source.patch @@ -9,3 +9,13 @@ +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/901-lib_zlib_deflate_visible.patch b/target/linux/uml/patches/901-lib_zlib_deflate_visible.patch index bac8fcfa97..b71a673314 100644 --- a/target/linux/uml/patches/901-lib_zlib_deflate_visible.patch +++ b/target/linux/uml/patches/901-lib_zlib_deflate_visible.patch @@ -3,7 +3,7 @@ or as a module --- a/lib/Kconfig +++ b/lib/Kconfig -@@ -83,7 +83,7 @@ config ZLIB_INFLATE +@@ -92,7 +92,7 @@ config ZLIB_INFLATE tristate config ZLIB_DEFLATE |