From 77fd5be8b6ca186af543e9ea0550b46630e1c396 Mon Sep 17 00:00:00 2001 From: brian avery Date: Fri, 7 Jul 2017 16:38:51 -0700 Subject: docker: add NETFILTER_XT_MATCH_ADDRTYPE=m Docker needs ths _NETFILTER_XT_MATCH_ADDRTYPE module in order to start up successfully. This patch adds it to the supported kernels. Signed-off-by: brian avery Signed-off-by: Bruce Ashfield --- recipes-kernel/linux/linux-yocto/docker.cfg | 1 + recipes-kernel/linux/linux-yocto/docker.scc | 4 ++++ recipes-kernel/linux/linux-yocto_4.1.bbappend | 1 + recipes-kernel/linux/linux-yocto_4.10.bbappend | 1 + recipes-kernel/linux/linux-yocto_4.4.bbappend | 1 + recipes-kernel/linux/linux-yocto_4.9.bbappend | 1 + 6 files changed, 9 insertions(+) create mode 100644 recipes-kernel/linux/linux-yocto/docker.cfg create mode 100644 recipes-kernel/linux/linux-yocto/docker.scc diff --git a/recipes-kernel/linux/linux-yocto/docker.cfg b/recipes-kernel/linux/linux-yocto/docker.cfg new file mode 100644 index 00000000..d0ebb666 --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/docker.cfg @@ -0,0 +1 @@ +CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m diff --git a/recipes-kernel/linux/linux-yocto/docker.scc b/recipes-kernel/linux/linux-yocto/docker.scc new file mode 100644 index 00000000..e317456c --- /dev/null +++ b/recipes-kernel/linux/linux-yocto/docker.scc @@ -0,0 +1,4 @@ +define KFEATURE_DESCRIPTION "Enable Features needed by docker in addition to LXC features" +define KFEATURE_COMPATIBILITY board + +kconf non-hardware docker.cfg diff --git a/recipes-kernel/linux/linux-yocto_4.1.bbappend b/recipes-kernel/linux/linux-yocto_4.1.bbappend index f3be89ed..f163fdfc 100644 --- a/recipes-kernel/linux/linux-yocto_4.1.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.1.bbappend @@ -4,6 +4,7 @@ SRC_URI += "file://xt-checksum.scc \ file://ebtables.scc \ file://vswitch.scc \ file://lxc.scc \ + file://docker.scc \ " KERNEL_FEATURES_append = " features/kvm/qemu-kvm-enable.scc" diff --git a/recipes-kernel/linux/linux-yocto_4.10.bbappend b/recipes-kernel/linux/linux-yocto_4.10.bbappend index f3be89ed..f163fdfc 100644 --- a/recipes-kernel/linux/linux-yocto_4.10.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.10.bbappend @@ -4,6 +4,7 @@ SRC_URI += "file://xt-checksum.scc \ file://ebtables.scc \ file://vswitch.scc \ file://lxc.scc \ + file://docker.scc \ " KERNEL_FEATURES_append = " features/kvm/qemu-kvm-enable.scc" diff --git a/recipes-kernel/linux/linux-yocto_4.4.bbappend b/recipes-kernel/linux/linux-yocto_4.4.bbappend index f3be89ed..f163fdfc 100644 --- a/recipes-kernel/linux/linux-yocto_4.4.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.4.bbappend @@ -4,6 +4,7 @@ SRC_URI += "file://xt-checksum.scc \ file://ebtables.scc \ file://vswitch.scc \ file://lxc.scc \ + file://docker.scc \ " KERNEL_FEATURES_append = " features/kvm/qemu-kvm-enable.scc" diff --git a/recipes-kernel/linux/linux-yocto_4.9.bbappend b/recipes-kernel/linux/linux-yocto_4.9.bbappend index f3be89ed..f163fdfc 100644 --- a/recipes-kernel/linux/linux-yocto_4.9.bbappend +++ b/recipes-kernel/linux/linux-yocto_4.9.bbappend @@ -4,6 +4,7 @@ SRC_URI += "file://xt-checksum.scc \ file://ebtables.scc \ file://vswitch.scc \ file://lxc.scc \ + file://docker.scc \ " KERNEL_FEATURES_append = " features/kvm/qemu-kvm-enable.scc" -- cgit v1.2.3-54-g00ecf