update kernel 3.4.x, fix netfilter nat modules

16 files changed, 21 insertions, 6 deletions

diff --git a/target/linux/config/Config.in.netfilter.ip4 b/target/linux/config/Config.in.netfilter.ip4
index e960a22ac..89d070c23 100644
--- a/target/linux/config/Config.in.netfilter.ip4
+++ b/target/linux/config/Config.in.netfilter.ip4
@@ -34,9 +34,24 @@ config ADK_KPACKAGE_KMOD_IP_NF_FILTER
 	  rules for simple packet filtering at local input, forwarding and
 	  local output.  See the man page for iptables(8).
 
+config ADK_KPACKAGE_KMOD_FULL_NAT
+	tristate "Meta package for Full NAT"
+	select ADK_KPACKAGE_KMOD_NF_NAT if ADK_KERNEL_VERSION_3_4_52
+	select ADK_KPACKAGE_KMOD_NF_NAT_IPV4 if ADK_KERNEL_VERSION_3_9_9
+
+config ADK_KPACKAGE_KMOD_NF_NAT
+	tristate 'Full NAT'
+	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
+	depends on ADK_KERNEL_VERSION_3_4_52
+	help
+	  The Full NAT option allows masquerading, port forwarding and other
+	  forms of full Network Address Port Translation.  It is controlled by
+	  the `nat' table in iptables: see the man page for iptables(8).
+
 config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 	tristate 'Full NAT'
 	depends on ADK_KPACKAGE_KMOD_IP_NF_IPTABLES
+	depends on ADK_KERNEL_VERSION_3_9_9
 	help
 	  The Full NAT option allows masquerading, port forwarding and other
 	  forms of full Network Address Port Translation.  It is controlled by
@@ -44,7 +59,7 @@ config ADK_KPACKAGE_KMOD_NF_NAT_IPV4
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_MASQUERADE
 	tristate 'MASQUERADE target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  Masquerading is a special case of NAT: all outgoing connections are
 	  changed to seem to come from a particular interface's address, and
@@ -78,7 +93,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_ULOG
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT
 	tristate 'REDIRECT target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  REDIRECT is a special case of NAT: all incoming connections are
 	  mapped onto the incoming interface's address, causing the packets to
@@ -87,7 +102,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_REDIRECT
 
 config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP
 	tristate 'NETMAP target support'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  NETMAP is an implementation of static 1:1 NAT mapping of network
 	  addresses. It maps the network address part, while keeping the host
@@ -96,7 +111,7 @@ config ADK_KPACKAGE_KMOD_IP_NF_TARGET_NETMAP
 
 config ADK_KPACKAGE_KMOD_IP_NF_MANGLE
 	tristate 'Packet mangling'
-	depends on ADK_KPACKAGE_KMOD_NF_NAT_IPV4
+	depends on ADK_KPACKAGE_KMOD_FULL_NAT
 	help
 	  This option adds a `mangle' table to iptables: see the man page for
 	  iptables(8).  This table is used for various packet alterations
diff --git a/target/linux/patches/3.4.51/bsd-compatibility.patch b/target/linux/patches/3.4.52/bsd-compatibility.patch
index 9e91a62de..9e91a62de 100644
--- a/target/linux/patches/3.4.51/bsd-compatibility.patch
+++ b/target/linux/patches/3.4.52/bsd-compatibility.patch
diff --git a/target/linux/patches/3.4.51/cris-etrax.patch b/target/linux/patches/3.4.52/cris-etrax.patch
index a80d9a8b8..a80d9a8b8 100644
--- a/target/linux/patches/3.4.51/cris-etrax.patch
+++ b/target/linux/patches/3.4.52/cris-etrax.patch
diff --git a/target/linux/patches/3.4.51/defaults.patch b/target/linux/patches/3.4.52/defaults.patch
index 58aae610b..58aae610b 100644
--- a/target/linux/patches/3.4.51/defaults.patch
+++ b/target/linux/patches/3.4.52/defaults.patch
diff --git a/target/linux/patches/3.4.51/gemalto.patch b/target/linux/patches/3.4.52/gemalto.patch
index 65f7af1d7..65f7af1d7 100644
--- a/target/linux/patches/3.4.51/gemalto.patch
+++ b/target/linux/patches/3.4.52/gemalto.patch
diff --git a/target/linux/patches/3.4.51/lemote-rfkill.patch b/target/linux/patches/3.4.52/lemote-rfkill.patch
index a61488434..a61488434 100644
--- a/target/linux/patches/3.4.51/lemote-rfkill.patch
+++ b/target/linux/patches/3.4.52/lemote-rfkill.patch
diff --git a/target/linux/patches/3.4.51/module-alloc-size-check.patch b/target/linux/patches/3.4.52/module-alloc-size-check.patch
index a792ac60a..a792ac60a 100644
--- a/target/linux/patches/3.4.51/module-alloc-size-check.patch
+++ b/target/linux/patches/3.4.52/module-alloc-size-check.patch
diff --git a/target/linux/patches/3.4.51/non-static.patch b/target/linux/patches/3.4.52/non-static.patch
index a967703d0..a967703d0 100644
--- a/target/linux/patches/3.4.51/non-static.patch
+++ b/target/linux/patches/3.4.52/non-static.patch
diff --git a/target/linux/patches/3.4.51/sparc-include.patch b/target/linux/patches/3.4.52/sparc-include.patch
index 2f8ffd061..2f8ffd061 100644
--- a/target/linux/patches/3.4.51/sparc-include.patch
+++ b/target/linux/patches/3.4.52/sparc-include.patch
diff --git a/target/linux/patches/3.4.51/startup.patch b/target/linux/patches/3.4.52/startup.patch
index 68e8987b0..68e8987b0 100644
--- a/target/linux/patches/3.4.51/startup.patch
+++ b/target/linux/patches/3.4.52/startup.patch
diff --git a/target/linux/patches/3.4.51/usb-defaults-off.patch b/target/linux/patches/3.4.52/usb-defaults-off.patch
index 31367108a..31367108a 100644
--- a/target/linux/patches/3.4.51/usb-defaults-off.patch
+++ b/target/linux/patches/3.4.52/usb-defaults-off.patch
diff --git a/target/linux/patches/3.4.51/uuid.patch b/target/linux/patches/3.4.52/uuid.patch
index ca23accdf..ca23accdf 100644
--- a/target/linux/patches/3.4.51/uuid.patch
+++ b/target/linux/patches/3.4.52/uuid.patch
diff --git a/target/linux/patches/3.4.51/vga-cons-default-off.patch b/target/linux/patches/3.4.52/vga-cons-default-off.patch
index 178aeeeb9..178aeeeb9 100644
--- a/target/linux/patches/3.4.51/vga-cons-default-off.patch
+++ b/target/linux/patches/3.4.52/vga-cons-default-off.patch
diff --git a/target/linux/patches/3.4.51/wlan-cf.patch b/target/linux/patches/3.4.52/wlan-cf.patch
index fc20759e2..fc20759e2 100644
--- a/target/linux/patches/3.4.51/wlan-cf.patch
+++ b/target/linux/patches/3.4.52/wlan-cf.patch
diff --git a/target/linux/patches/3.4.51/zlib-inflate.patch b/target/linux/patches/3.4.52/zlib-inflate.patch
index 58e1f6d21..58e1f6d21 100644
--- a/target/linux/patches/3.4.51/zlib-inflate.patch
+++ b/target/linux/patches/3.4.52/zlib-inflate.patch
diff --git a/target/mips/Makefile b/target/mips/Makefile
index a378db4c7..eab6be597 100644
--- a/target/mips/Makefile
+++ b/target/mips/Makefile
@@ -110,10 +110,10 @@ imageinstall: kernel-install $(BIN_DIR)/$(ROOTFSTARBALL)
 endif
 ifeq ($(ADK_TARGET_FS),archive)
 imageinstall: $(BIN_DIR)/$(ROOTFSTARBALL)
-	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
-	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "The RootFS tarball is: $(BIN_DIR)/$(ROOTFSTARBALL)"
 ifneq ($(ADK_HARDWARE_QEMU),)
+	@cp $(KERNEL) $(BIN_DIR)/$(TARGET_KERNEL)
+	@echo 'The kernel file is: $(BIN_DIR)/${TARGET_KERNEL}'
 	@echo "Use following command to create a QEMU Image:"
 	@echo "./scripts/create.sh +g qemu-${CPU_ARCH}.img $(BIN_DIR)/$(ROOTFSTARBALL)"
 	@echo "Start qemu with following options:"