Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linux-virtualization: fix compilation 

https://onedigi.atlassian.net/browse/DEL-8835
https://onedigi.atlassian.net/browse/DEL-8896

Signed-off-by: Mike Engel <Mike.Engel@digi.com>
Signed-off-by: Isaac Hermida <isaac.hermida@digi.com>
This commit is contained in:
Isaac Hermida 2024-02-13 13:57:32 +01:00
parent 46a3f7b529
commit 48f7e9f79e
3 changed files with 51 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta-digi-arm/recipes-kernel/linux/linux-dey.inc
View File

@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46"
inherit kernel
inherit ${@oe.utils.conditional('DEY_SOC_VENDOR', 'NXP', 'fsl-kernel-localversion', '', d)}
require ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'linux-virtualization.inc', '', d)}
require ${@oe.utils.conditional('TRUSTFENCE_SIGN', '1', 'recipes-kernel/linux/linux-trustfence.inc', '', d)}
# CONFIG_KERNEL_LZO in defconfig
@ -18,6 +17,7 @@ LINUX_GIT_URI ?= "${@oe.utils.conditional('DIGI_INTERNAL_GIT', '1', '${LINUX_URI
SRC_URI = " \
${LINUX_GIT_URI};branch=${SRCBRANCH} \
${@oe.utils.conditional('KERNEL_DEFCONFIG', '', 'file://defconfig', '', d)} \
${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'file://docker_conf.cfg', '', d)} \
"
S = "${WORKDIR}/git"

50
meta-digi-arm/recipes-kernel/linux/linux-dey/docker_conf.cfg Normal file
View File

@ -0,0 +1,50 @@
..........................................................................
. WARNING
.
. This file is a kernel configuration fragment, and not a full kernel
. configuration file. The final kernel configuration is made up of
. an assembly of processed fragments, each of which is designed to
. capture a specific part of the final configuration (e.g. platform
. configuration, feature configuration, and board specific hardware
. configuration). For more information on kernel configuration, please
. consult the product documentation.
.
..........................................................................
CONFIG_COMPAT=y
CONFIG_NETFILTER_NETLINK=y
CONFIG_NF_CONNTRACK=m
CONFIG_NF_CONNTRACK_EVENTS=y
CONFIG_NF_NAT=y
CONFIG_NF_TABLES=y
CONFIG_NFT_NAT=y
CONFIG_NETFILTER_XTABLES=y
CONFIG_NETFILTER_XTABLES_COMPAT=y
CONFIG_NETFILTER_XT_NAT=y
CONFIG_NETFILTER_XT_TARGET_NETMAP=y
CONFIG_NETFILTER_XT_TARGET_REDIRECT=y
CONFIG_NETFILTER_XT_TARGET_MASQUERADE=y
CONFIG_NETFILTER_XT_MARK=m
CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
CONFIG_IP_NF_IPTABLES=y
CONFIG_IP6_NF_IPTABLES=y
CONFIG_IP_NF_NAT=y
CONFIG_IP_NF_TARGET_MASQUERADE=y
CONFIG_IP_NF_TARGET_NETMAP=y
CONFIG_IP_NF_TARGET_REDIRECT=y
CONFIG_VETH=y
CONFIG_CGROUPS=y
CONFIG_CGROUP_CPUACCT=y
CONFIG_CGROUP_DEVICE=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_SCHED=y
CONFIG_CGROUP_BPF=y
CONFIG_CGROUP_NS=y
CONFIG_CGROUP_FREEZER=y
CONFIG_CGROUP_DEVICE=y
CONFIG_BLK_CGROUP=y
CONFIG_NETFILTER=y
CONFIG_BRIDGE_NETFILTER=m
CONFIG_BRIDGE=m
CONFIG_BRIDGE_VLAN_FILTERING=y
CONFIG_CHECKPOINT_RESTORE=y

50
meta-digi-arm/recipes-kernel/linux/linux-virtualization.inc
View File

@ -1,50 +0,0 @@
# Copyright (C) 2019 Digi International
# Apply kernel configuration required for Docker
do_configure:prepend() {
mkdir -p ${B}
kernel_conf_variable NAMESPACES y
kernel_conf_variable MULTIUSER y
kernel_conf_variable NET_NS y
kernel_conf_variable NET y
kernel_conf_variable PID_NS y
kernel_conf_variable IPC_NS y
kernel_conf_variable POSIX_MQUEUE y
kernel_conf_variable UTS_NS y
kernel_conf_variable CGROUPS y
kernel_conf_variable CGROUP_CPUACCT y
kernel_conf_variable CGROUP_DEVICE y
kernel_conf_variable CGROUP_FREEZER y
kernel_conf_variable CGROUP_SCHED y
kernel_conf_variable CPUSETS y
kernel_conf_variable SMP y
kernel_conf_variable MEMCG y
kernel_conf_variable KEYS y
kernel_conf_variable VETH y
kernel_conf_variable NETDEVICES y
kernel_conf_variable NET_CORE y
kernel_conf_variable BRIDGE y
kernel_conf_variable BRIDGE_NETFILTER y
kernel_conf_variable NETFILTER y
kernel_conf_variable INET y
kernel_conf_variable NETFILTER_ADVANCED y
kernel_conf_variable NF_NAT_IPV4 y
kernel_conf_variable NF_CONNTRACK_IPV4 y
kernel_conf_variable NF_CONNTRACK y
kernel_conf_variable IP_NF_FILTER y
kernel_conf_variable IP_NF_IPTABLES y
kernel_conf_variable IP_NF_TARGET_MASQUERADE y
kernel_conf_variable IP_NF_NAT y
kernel_conf_variable NETFILTER_XT_MATCH_ADDRTYPE y
kernel_conf_variable NETFILTER_XT_MATCH_CONNTRACK y
kernel_conf_variable NETFILTER_XT_MATCH_IPVS y
kernel_conf_variable IP_VS y
kernel_conf_variable IP_NF_NAT y
kernel_conf_variable POSIX_MQUEUE y
kernel_conf_variable OVERLAY_FS y
sed -e "${CONF_SED_SCRIPT}" < '${WORKDIR}/defconfig' >> '${B}/.config'
}
KERNEL_MODULE_AUTOLOAD += "nf_conntrack_ipv6 openvswitch"