[uml] bump to 2.6.30.4, apply fix from [15119] to x86_64

SVN-Revision: 17285

diff --git a/target/linux/uml/Makefile b/target/linux/uml/Makefile
index 57148a986cbb11e50502b8180e1519f9bf12a97d..e1525eb2790708a6ce535e3721fab8685d2f4a56 100644 (file)
--- 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 bc55df4dcdd81299833d0be5e2e194ef20b3352b..b8f78dc7e6a49bea541a5c005447f442eccef9b8 100644 (file)
--- 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 2801074e2cd4689931757ffdb86d32ed30b4682e..6df42ff3ab9466fb5a51a608f84a565cdb07369e 100644 (file)
--- 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 b13e5df5218235ed7a6215ae59523f36592b9ee6..2be33d02a36f307d61c45eaab05384d46915b34f 100644 (file)
--- 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 bac8fcfa9763e79ad266771c231db879badf63da..b71a673314cf996b5ebbf26d4cdb01a24aeafbce 100644 (file)
--- 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