From bb77f51e652dac4a39da3da496e72bf205945b66 Mon Sep 17 00:00:00 2001 From: Mark Asselstine Date: Wed, 11 Nov 2015 21:50:29 -0500 Subject: linux-yocto: carry forward kernel configuration Yocto master uses linux-yocto 4.1 so we need to create the proper bbappend to ensure we are setting up the kernel correctly. We reuse the bbappend for the previous kernel version but enable CONFIG_IP_NF_NAT to allow nova to define the desired iptables. Signed-off-by: Mark Asselstine Signed-off-by: Bruce Ashfield --- meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg | 1 + meta-openstack/recipes-kernel/linux/linux-yocto_4.1.bbappend | 9 +++++++++ 2 files changed, 10 insertions(+) create mode 100644 meta-openstack/recipes-kernel/linux/linux-yocto_4.1.bbappend diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg index 9160ffe..223210c 100644 --- a/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg +++ b/meta-openstack/recipes-kernel/linux/linux-yocto/nf.cfg @@ -5,3 +5,4 @@ CONFIG_NF_NAT_PROTO_SCTP=m CONFIG_NF_CONNTRACK_IPV4=y CONFIG_NF_CONNTRACK_PROC_COMPAT=y CONFIG_NF_NAT_IPV4=m +CONFIG_IP_NF_NAT=m diff --git a/meta-openstack/recipes-kernel/linux/linux-yocto_4.1.bbappend b/meta-openstack/recipes-kernel/linux/linux-yocto_4.1.bbappend new file mode 100644 index 0000000..843546c --- /dev/null +++ b/meta-openstack/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -0,0 +1,9 @@ +FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:" + +SRC_URI += "file://enable-veth.cfg \ + file://enable-iscsi-tcp.cfg \ + file://enable-nbd.cfg \ + file://enable-rtlink.cfg \ + file://nf.scc \ + file://nfs.scc \ + " -- cgit v1.2.3-54-g00ecf