summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortte_zheng_wenlong <wenlong_zheng_za@mail.toyota.co.jp>2016-11-10 10:33:37 +0900
committertte_zheng_wenlong <wenlong_zheng_za@mail.toyota.co.jp>2016-11-10 10:38:36 +0900
commitc53c52218ae71eb90be1fb950f4dc114a40b938f (patch)
tree10ae9b019fa1f688a29cb9c9c8993fda0381cc4b
parent2c595497e43fadd83ea155f632ba69a31fe923fa (diff)
Change renesas kernel configure to fragment configuration
Add iptables-rcar.cfg for renesas m2 kernel configuration, Delete configure items from linux-renesas_%.bbapend. Change-Id: I2a1e9883f908f17775ab829b93916c0f5011cf05 Signed-off-by: tte_zheng_wenlong <wenlong_zheng_za@mail.toyota.co.jp>
-rw-r--r--meta-renesas-kernel/recipes-kernel/linux/files/iptables-rcar.cfg18
-rw-r--r--meta-renesas-kernel/recipes-kernel/linux/linux-renesas_%.bbappend77
2 files changed, 20 insertions, 75 deletions
diff --git a/meta-renesas-kernel/recipes-kernel/linux/files/iptables-rcar.cfg b/meta-renesas-kernel/recipes-kernel/linux/files/iptables-rcar.cfg
new file mode 100644
index 00000000..7b59bfdf
--- /dev/null
+++ b/meta-renesas-kernel/recipes-kernel/linux/files/iptables-rcar.cfg
@@ -0,0 +1,18 @@
+CONFIG_NETFILTER=y
+CONFIG_NF_CONNTRACK=y
+CONFIG_NF_CONNTRACK_PROCFS=y
+CONFIG_NF_NAT=y
+CONFIG_NF_NAT_NEEDED=y
+CONFIG_NETFILTER_XTABLES=y
+CONFIG_NETFILTER_XT_TARGET_CT=y
+CONFIG_NETFILTER_XT_TARGET_DSCP=y
+CONFIG_NETFILTER_XT_TARGET_NOTRACK=y
+CONFIG_NF_DEFRAG_IPV4=y
+CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK_PROC_COMPAT=y
+CONFIG_IP_NF_IPTABLES=y
+CONFIG_IP_NF_FILTER=y
+CONFIG_NF_NAT_IPV4=y
+CONFIG_IP_NF_TARGET_MASQUERADE=y
+CONFIG_IP_NF_MANGLE=y
+CONFIG_IP_NF_RAW=y
diff --git a/meta-renesas-kernel/recipes-kernel/linux/linux-renesas_%.bbappend b/meta-renesas-kernel/recipes-kernel/linux/linux-renesas_%.bbappend
index 518482f8..671bc195 100644
--- a/meta-renesas-kernel/recipes-kernel/linux/linux-renesas_%.bbappend
+++ b/meta-renesas-kernel/recipes-kernel/linux/linux-renesas_%.bbappend
@@ -1,75 +1,2 @@
-do_configure_append_porter() {
- # Enable CONFIG_NETFILTER
- # kernel_configure_variable NETFILTER y
- # kernel_configure_variable NETFILTER_ADVANCED y
- #
- # Core Netfilter Configuration
- #
- # kernel_configure_variable NF_CONNTRACK y
- kernel_configure_variable NF_CONNTRACK_PROCFS y
- kernel_configure_variable NF_CT_PROTO_UDPLITE y
- kernel_configure_variable NF_CONNTRACK_BROADCAST y
- kernel_configure_variable NF_CONNTRACK_SNMP y
- kernel_configure_variable NF_NAT y
- kernel_configure_variable NF_NAT_NEEDED y
- kernel_configure_variable NF_NAT_PROTO_UDPLITE y
- # kernel_configure_variable NETFILTER_XTABLES y
- #
- # Xtables combined modules
- #
- kernel_configure_variable NETFILTER_XT_MARK y
- #
- # Xtables targets
- #
- kernel_configure_variable NETFILTER_XT_TARGET_CT y
- kernel_configure_variable NETFILTER_XT_TARGET_DSCP y
- kernel_configure_variable NETFILTER_XT_TARGET_LOG y
- kernel_configure_variable NETFILTER_XT_TARGET_MARK y
- kernel_configure_variable NETFILTER_XT_TARGET_NETMAP y
- kernel_configure_variable NETFILTER_XT_TARGET_NOTRACK y
- kernel_configure_variable NETFILTER_XT_TARGET_REDIRECT y
- kernel_configure_variable NETFILTER_XT_TARGET_TCPMSS y
- kernel_configure_variable NETFILTER_XT_TARGET_TCPOPTSTRIP y
- #
- # Xtables matches
- #
- kernel_configure_variable NETFILTER_XT_MATCH_HASHLIMIT y
- kernel_configure_variable NETFILTER_XT_MATCH_LENGTH y
- kernel_configure_variable NETFILTER_XT_MATCH_LIMIT y
- kernel_configure_variable NETFILTER_XT_MATCH_POLICY y
- kernel_configure_variable NETFILTER_XT_MATCH_STATE y
- kernel_configure_variable NETFILTER_XT_MATCH_TCPMSS y
- kernel_configure_variable NETFILTER_XT_MATCH_TIME y
- #
- # IP: Netfilter Configuration
- #
- # kernel_configure_variable NF_DEFRAG_IPV4 y
- # kernel_configure_variable NF_CONNTRACK_IPV4 y
- kernel_configure_variable NF_CONNTRACK_PROC_COMPAT y
- # kernel_configure_variable IP_NF_IPTABLES y
- kernel_configure_variable IP_NF_FILTER y
- kernel_configure_variable IP_NF_TARGET_REJECT y
- kernel_configure_variable IP_NF_TARGET_ULOG y
- # kernel_configure_variable NF_NAT_IPV4 y
- # kernel_configure_variable IP_NF_TARGET_MASQUERADE y
- kernel_configure_variable IP_NF_TARGET_NETMAP y
- kernel_configure_variable IP_NF_TARGET_REDIRECT y
- kernel_configure_variable NF_NAT_SNMP_BASIC y
- kernel_configure_variable IP_NF_MANGLE y
- kernel_configure_variable IP_NF_TARGET_ECN y
- kernel_configure_variable IP_NF_RAW y
- #
- # IPv6: Netfilter Configuration
- #
- # kernel_configure_variable NF_DEFRAG_IPV6 y
- kernel_configure_variable NF_CONNTRACK_IPV6 y
- # kernel_configure_variable IP6_NF_IPTABLES y
- kernel_configure_variable IP6_NF_FILTER y
- kernel_configure_variable IP6_NF_TARGET_REJECT y
- kernel_configure_variable IP6_NF_MANGLE y
- kernel_configure_variable IP6_NF_RAW y
- kernel_configure_variable NF_NAT_IPV6 y
- kernel_configure_variable IP6_NF_TARGET_MASQUERADE y
- kernel_configure_variable IP6_NF_TARGET_NPT y
-}
-
+FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
+SRC_URI_append_porter = " file://iptables-rcar.cfg"