summaryrefslogtreecommitdiffstats
path: root/external/meta-virtualization/recipes-kernel/linux/linux-yocto
diff options
context:
space:
mode:
Diffstat (limited to 'external/meta-virtualization/recipes-kernel/linux/linux-yocto')
-rw-r--r--external/meta-virtualization/recipes-kernel/linux/linux-yocto/docker.cfg2
-rw-r--r--external/meta-virtualization/recipes-kernel/linux/linux-yocto/lxc.cfg21
-rw-r--r--external/meta-virtualization/recipes-kernel/linux/linux-yocto/xen.cfg3
3 files changed, 6 insertions, 20 deletions
diff --git a/external/meta-virtualization/recipes-kernel/linux/linux-yocto/docker.cfg b/external/meta-virtualization/recipes-kernel/linux/linux-yocto/docker.cfg
index 4ee8e369..79012a6a 100644
--- a/external/meta-virtualization/recipes-kernel/linux/linux-yocto/docker.cfg
+++ b/external/meta-virtualization/recipes-kernel/linux/linux-yocto/docker.cfg
@@ -1,7 +1,7 @@
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
CONFIG_IP_NF_FILTER=m
CONFIG_NF_NAT=m
-CONFIG_NF_CONNTRACK_IPV4=y
+CONFIG_NF_CONNTRACK=y
CONFIG_DM_THIN_PROVISIONING=m
diff --git a/external/meta-virtualization/recipes-kernel/linux/linux-yocto/lxc.cfg b/external/meta-virtualization/recipes-kernel/linux/linux-yocto/lxc.cfg
index c25d60f9..3fefc034 100644
--- a/external/meta-virtualization/recipes-kernel/linux/linux-yocto/lxc.cfg
+++ b/external/meta-virtualization/recipes-kernel/linux/linux-yocto/lxc.cfg
@@ -1,8 +1,7 @@
CONFIG_CGROUP_DEVICE=y
CONFIG_CPUSETS=y
CONFIG_PROC_PID_CPUSET=y
-CONFIG_RESOURCE_COUNTERS=y
-CONFIG_CGROUP_MEM_RES_CTLR=y
+CONFIG_MEMCG=y
CONFIG_CGROUP_SCHED=y
CONFIG_FAIR_GROUP_SCHED=y
CONFIG_RT_GROUP_SCHED=y
@@ -14,25 +13,12 @@ CONFIG_USER_NS=y
CONFIG_PID_NS=y
CONFIG_NET_NS=y
-CONFIG_CLS_CGROUP=m
+CONFIG_NET_CLS_CGROUP=m
CONFIG_BLK_CGROUP=y
-CONFIG_NETPRIO_CGROUP=m
-
-CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_CGROUP_NET_PRIO=y
# Virtual drivers
-CONFIG_VIRTIO_BLK=y
-CONFIG_SCSI_VIRTIO=y
-CONFIG_VIRTIO_NET=m
CONFIG_HVC_DRIVER=y
-CONFIG_VIRTIO_CONSOLE=y
-CONFIG_HW_RANDOM_VIRTIO=m
-CONFIG_VIRTIO=y
-CONFIG_VIRTIO_RING=y
-CONFIG_VIRTIO_PCI=y
-CONFIG_VIRTIO_BALLOON=y
-CONFIG_VIRTIO_MMIO=y
-
# Base support for live boot
CONFIG_BLK_DEV_LOOP=y
@@ -44,3 +30,4 @@ CONFIG_RD_GZIP=y
# Support for virtual ethernet and LXC
CONFIG_VETH=y
CONFIG_MACVLAN=y
+CONFIG_VXLAN=m
diff --git a/external/meta-virtualization/recipes-kernel/linux/linux-yocto/xen.cfg b/external/meta-virtualization/recipes-kernel/linux/linux-yocto/xen.cfg
index 4780311d..af821d2f 100644
--- a/external/meta-virtualization/recipes-kernel/linux/linux-yocto/xen.cfg
+++ b/external/meta-virtualization/recipes-kernel/linux/linux-yocto/xen.cfg
@@ -3,7 +3,6 @@ CONFIG_PARAVIRT=y
CONFIG_XEN=y
CONFIG_XEN_DOM0=y
CONFIG_XEN_PVHVM=y
-CONFIG_XEN_MAX_DOMAIN_MEMORY=500
CONFIG_XEN_SAVE_RESTORE=y
# CONFIG_XEN_DEBUG_FS is not set
CONFIG_XEN_PVH=y
@@ -30,7 +29,7 @@ CONFIG_FB_SYS_FOPS=y
CONFIG_FB_DEFERRED_IO=y
CONFIG_XEN_FBDEV_FRONTEND=y
CONFIG_XEN_BALLOON=y
-CONFIG_XEN_SCRUB_PAGES=y
+CONFIG_XEN_SCRUB_PAGES_DEFAULT=y
CONFIG_XEN_DEV_EVTCHN=y
CONFIG_XEN_BACKEND=y
CONFIG_XENFS=y