On 6/9/2023 12:23 AM, Chirag Shilwant wrote:
The necessary configs required for running docker containers have been enabled
in ti-linux-6.1
Generally speaking I support this patch, but from a practical point of
view we still have the 5.10 kernel in kirkstone/master. And applying
this patch as is will break docker support in those kernels.
We need to modify this patch to rename the bbappend files to just apply
to the 5.10 kernels instead of % (all) kernels.
Ref -
https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/patch/?id=ca7f239d0814e6a49804b76c0984d6ca5eea0924
Signed-off-by: Chirag Shilwant <[email protected]>
---
.../recipes-kernel/linux/docker.inc | 4 ----
.../recipes-kernel/linux/files/docker.cfg | 20 -------------------
.../linux/linux-ti-staging-rt_%.bbappend | 2 --
.../linux/linux-ti-staging-systest_%.bbappend | 2 --
.../linux/linux-ti-staging_%.bbappend | 2 --
5 files changed, 30 deletions(-)
delete mode 100644 meta-arago-distro/recipes-kernel/linux/docker.inc
delete mode 100644 meta-arago-distro/recipes-kernel/linux/files/docker.cfg
diff --git a/meta-arago-distro/recipes-kernel/linux/docker.inc
b/meta-arago-distro/recipes-kernel/linux/docker.inc
deleted file mode 100644
index e926b219..00000000
--- a/meta-arago-distro/recipes-kernel/linux/docker.inc
+++ /dev/null
@@ -1,4 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-SRC_URI += "file://docker.cfg"
-KERNEL_CONFIG_FRAGMENTS += "${WORKDIR}/docker.cfg"
diff --git a/meta-arago-distro/recipes-kernel/linux/files/docker.cfg
b/meta-arago-distro/recipes-kernel/linux/files/docker.cfg
deleted file mode 100644
index 9ac604b8..00000000
--- a/meta-arago-distro/recipes-kernel/linux/files/docker.cfg
+++ /dev/null
@@ -1,20 +0,0 @@
-CONFIG_VETH=m
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_CONNTRACK=m
-CONFIG_NETFILTER_XT_MATCH_IPVS=m
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_IP_VS=m
-CONFIG_IP_VS_RR=m
-CONFIG_VXLAN=m
-CONFIG_IPVLAN=m
-CONFIG_MACVLAN=m
-CONFIG_DUMMY=m
-CONFIG_NF_NAT_FTP=m
-CONFIG_NF_CONNTRACK_FTP=m
-CONFIG_NF_NAT_TFTP=m
-CONFIG_NF_CONNTRACK_TFTP=m
-CONFIG_AUFS_FS=m
-CONFIG_BTRFS_FS=m
-CONFIG_BLK_DEV_DM=m
-CONFIG_DM_THIN_PROVISIONING=m
-CONFIG_OVERLAY_FS=m
diff --git
a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
index df55594e..06f33291 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-rt_%.bbappend
@@ -2,6 +2,4 @@ MACHINE_KERNEL_PR:append = ".arago1"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-require docker.inc
-
ALLOW_EMPTY:kernel-devicetree = "1"
diff --git
a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
index df55594e..06f33291 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging-systest_%.bbappend
@@ -2,6 +2,4 @@ MACHINE_KERNEL_PR:append = ".arago1"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-require docker.inc
-
ALLOW_EMPTY:kernel-devicetree = "1"
diff --git a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
index 031a8b05..9d9a3593 100644
--- a/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
+++ b/meta-arago-distro/recipes-kernel/linux/linux-ti-staging_%.bbappend
@@ -2,6 +2,4 @@ MACHINE_KERNEL_PR:append = ".arago5"
FILESEXTRAPATHS:prepend := "${THISDIR}/${PN}:"
-require docker.inc
-
ALLOW_EMPTY:kernel-devicetree = "1"
--
Ryan Eatmon [email protected]
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#14572):
https://lists.yoctoproject.org/g/meta-arago/message/14572
Mute This Topic: https://lists.yoctoproject.org/mt/99422923/21656
Group Owner: [email protected]
Unsubscribe:
https://lists.yoctoproject.org/g/meta-arago/leave/10763299/21656/89520264/xyzzy
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
