diff options
author | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
---|---|---|
committer | takeshi_hoshina <takeshi_hoshina@mail.toyota.co.jp> | 2020-11-02 11:07:33 +0900 |
commit | 1c7d6584a7811b7785ae5c1e378f14b5ba0971cf (patch) | |
tree | cd70a267a5ef105ba32f200aa088e281fbd85747 /external/meta-virtualization/recipes-kernel/linux | |
parent | 4204309872da5cb401cbb2729d9e2d4869a87f42 (diff) |
basesystem-jjsandbox/ToshikazuOhiwa/master-jj
recipes
Diffstat (limited to 'external/meta-virtualization/recipes-kernel/linux')
-rw-r--r-- | external/meta-virtualization/recipes-kernel/linux/linux-%.bbappend | 10 | ||||
-rw-r--r-- | external/meta-virtualization/recipes-kernel/linux/linux-yocto-dev.bbappend (renamed from external/meta-virtualization/recipes-kernel/linux/linux-yocto_4.14.bbappend) | 2 | ||||
-rw-r--r-- | external/meta-virtualization/recipes-kernel/linux/linux-yocto/docker.cfg | 2 | ||||
-rw-r--r-- | external/meta-virtualization/recipes-kernel/linux/linux-yocto/lxc.cfg | 21 | ||||
-rw-r--r-- | external/meta-virtualization/recipes-kernel/linux/linux-yocto/xen.cfg | 3 | ||||
-rw-r--r-- | external/meta-virtualization/recipes-kernel/linux/linux-yocto_4.18.bbappend | 1 | ||||
-rw-r--r-- | external/meta-virtualization/recipes-kernel/linux/linux-yocto_5.4_virtualization.inc | 4 | ||||
-rw-r--r-- | external/meta-virtualization/recipes-kernel/linux/linux-yocto_virtualization.inc | 2 |
8 files changed, 23 insertions, 22 deletions
diff --git a/external/meta-virtualization/recipes-kernel/linux/linux-%.bbappend b/external/meta-virtualization/recipes-kernel/linux/linux-%.bbappend new file mode 100644 index 00000000..2a2335bc --- /dev/null +++ b/external/meta-virtualization/recipes-kernel/linux/linux-%.bbappend @@ -0,0 +1,10 @@ +# any kernel recipe with fragment support, that sets LINUX_VERSION to one of the tested +# values, will get the appropriate fragments included in their SRC_URI + +LINUX_MAJOR = "${@(d.getVar('LINUX_VERSION') or "x.y").split('.')[0]}" +LINUX_MINOR = "${@(d.getVar('LINUX_VERSION') or "x.y").split('.')[1]}" + +include ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-yocto_${LINUX_MAJOR}.${LINUX_MINOR}_virtualization.inc', '', d)} + + + diff --git a/external/meta-virtualization/recipes-kernel/linux/linux-yocto_4.14.bbappend b/external/meta-virtualization/recipes-kernel/linux/linux-yocto-dev.bbappend index 617caccb..20eeba95 100644 --- a/external/meta-virtualization/recipes-kernel/linux/linux-yocto_4.14.bbappend +++ b/external/meta-virtualization/recipes-kernel/linux/linux-yocto-dev.bbappend @@ -1 +1 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}_virtualization.inc', '', d)} +require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-yocto_virtualization.inc', '', d)} 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 diff --git a/external/meta-virtualization/recipes-kernel/linux/linux-yocto_4.18.bbappend b/external/meta-virtualization/recipes-kernel/linux/linux-yocto_4.18.bbappend deleted file mode 100644 index 617caccb..00000000 --- a/external/meta-virtualization/recipes-kernel/linux/linux-yocto_4.18.bbappend +++ /dev/null @@ -1 +0,0 @@ -require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', '${BPN}_virtualization.inc', '', d)} diff --git a/external/meta-virtualization/recipes-kernel/linux/linux-yocto_5.4_virtualization.inc b/external/meta-virtualization/recipes-kernel/linux/linux-yocto_5.4_virtualization.inc new file mode 100644 index 00000000..59311487 --- /dev/null +++ b/external/meta-virtualization/recipes-kernel/linux/linux-yocto_5.4_virtualization.inc @@ -0,0 +1,4 @@ +# include the baseline meta virtualization configuration options +# after this include, we can do version specific things + +include linux-yocto_virtualization.inc diff --git a/external/meta-virtualization/recipes-kernel/linux/linux-yocto_virtualization.inc b/external/meta-virtualization/recipes-kernel/linux/linux-yocto_virtualization.inc index 5d3cbc66..f050b3fa 100644 --- a/external/meta-virtualization/recipes-kernel/linux/linux-yocto_virtualization.inc +++ b/external/meta-virtualization/recipes-kernel/linux/linux-yocto_virtualization.inc @@ -14,5 +14,7 @@ KERNEL_MODULE_AUTOLOAD += "${@bb.utils.contains('DISTRO_FEATURES', 'kvm', 'kvm', # aufs kernel support required for xen-image-minimal KERNEL_FEATURES_append += "${@bb.utils.contains('DISTRO_FEATURES', 'aufs', ' features/aufs/aufs-enable.scc', '', d)}" +KERNEL_FEATURES_append = " cfg/virtio.scc" + # xen kernel support SRC_URI += "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' file://xen.scc', '', d)}" |