* [meta-arago][kirkstone][PATCH] meta-arago-distro: recipes-kernel: Remove docker configs
@ 2023-06-09 5:23 Chirag Shilwant
2023-06-09 13:31 ` Ryan Eatmon
0 siblings, 1 reply; 5+ messages in thread
From: Chirag Shilwant @ 2023-06-09 5:23 UTC (permalink / raw)
To: Praneeth Bajjuri, Denys Dmytriyenko, Ryan Eatmon, meta-arago
Cc: Sai Sree Kartheek Adivi, Paresh Bhagat, Gyan Gupta
The necessary configs required for running docker containers have been enabled in ti-linux-6.1
Ref - https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/patch/?id=ca7f239d0814e6a49804b76c0984d6ca5eea0924
Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
---
.../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"
--
2.34.1
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [meta-arago][kirkstone][PATCH] meta-arago-distro: recipes-kernel: Remove docker configs
2023-06-09 5:23 [meta-arago][kirkstone][PATCH] meta-arago-distro: recipes-kernel: Remove docker configs Chirag Shilwant
@ 2023-06-09 13:31 ` Ryan Eatmon
2023-06-09 14:42 ` Raghavendra, Vignesh
0 siblings, 1 reply; 5+ messages in thread
From: Ryan Eatmon @ 2023-06-09 13:31 UTC (permalink / raw)
To: Chirag Shilwant, Praneeth Bajjuri, Denys Dmytriyenko, meta-arago
Cc: Sai Sree Kartheek Adivi, Paresh Bhagat, Gyan Gupta
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 <c-shilwant@ti.com>
> ---
> .../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 reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [meta-arago][kirkstone][PATCH] meta-arago-distro: recipes-kernel: Remove docker configs
2023-06-09 13:31 ` Ryan Eatmon
@ 2023-06-09 14:42 ` Raghavendra, Vignesh
2023-06-09 15:39 ` Ryan Eatmon
0 siblings, 1 reply; 5+ messages in thread
From: Raghavendra, Vignesh @ 2023-06-09 14:42 UTC (permalink / raw)
To: reatmon, Chirag Shilwant, Praneeth Bajjuri, Denys Dmytriyenko,
meta-arago
Cc: Sai Sree Kartheek Adivi, Paresh Bhagat, Gyan Gupta
On 6/9/2023 7:01 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
>
>
> 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.
>
I dont know why this was needed in meta-arago-distro for 5.10 either.
ti_sdk_*_defconfigs include containers.cfg fragment that has all these
configs [0][1]
[0] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/ti_config_fragments/v8_defconfig_map.txt?h=ti-linux-5.10.y-cicd#n2
[1] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/ti_config_fragments/containers.cfg?h=ti-linux-5.10.y-cicd
IMO, this patch should not affect 5.10 either
>
>> Ref -
>> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/patch/?id=ca7f239d0814e6a49804b76c0984d6ca5eea0924
>>
>> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
>> ---
>> .../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"
>
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [meta-arago][kirkstone][PATCH] meta-arago-distro: recipes-kernel: Remove docker configs
2023-06-09 14:42 ` Raghavendra, Vignesh
@ 2023-06-09 15:39 ` Ryan Eatmon
2023-06-09 16:10 ` Denys Dmytriyenko
0 siblings, 1 reply; 5+ messages in thread
From: Ryan Eatmon @ 2023-06-09 15:39 UTC (permalink / raw)
To: Raghavendra, Vignesh, Chirag Shilwant, Praneeth Bajjuri,
Denys Dmytriyenko, meta-arago
Cc: Sai Sree Kartheek Adivi, Paresh Bhagat, Gyan Gupta
On 6/9/2023 9:42 AM, Raghavendra, Vignesh wrote:
>
>
> On 6/9/2023 7:01 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
>>
>>
>> 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.
>>
>
> I dont know why this was needed in meta-arago-distro for 5.10 either.
> ti_sdk_*_defconfigs include containers.cfg fragment that has all these
> configs [0][1]
>
> [0] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/ti_config_fragments/v8_defconfig_map.txt?h=ti-linux-5.10.y-cicd#n2
> [1] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/ti_config_fragments/containers.cfg?h=ti-linux-5.10.y-cicd
>
> IMO, this patch should not affect 5.10 either
If that is the case, then we just need to reword the commit message to
not be so 6.1 specific.
>>
>>> Ref -
>>> https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/patch/?id=ca7f239d0814e6a49804b76c0984d6ca5eea0924
>>>
>>> Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
>>> ---
>>> .../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 reatmon@ti.com
-----------------------------------------
Texas Instruments, Inc. - LCPD - MGTS
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [meta-arago][kirkstone][PATCH] meta-arago-distro: recipes-kernel: Remove docker configs
2023-06-09 15:39 ` Ryan Eatmon
@ 2023-06-09 16:10 ` Denys Dmytriyenko
0 siblings, 0 replies; 5+ messages in thread
From: Denys Dmytriyenko @ 2023-06-09 16:10 UTC (permalink / raw)
To: Ryan Eatmon
Cc: Raghavendra, Vignesh, Chirag Shilwant, Praneeth Bajjuri,
meta-arago, Sai Sree Kartheek Adivi, Paresh Bhagat, Gyan Gupta
On Fri, Jun 09, 2023 at 10:39:06AM -0500, Ryan Eatmon wrote:
>
>
> On 6/9/2023 9:42 AM, Raghavendra, Vignesh wrote:
> >
> >
> >On 6/9/2023 7:01 PM, Ryan Eatmon via lists.yoctoproject.org wrote:
> >>
> >>
> >>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.
> >>
> >
> >I dont know why this was needed in meta-arago-distro for 5.10 either.
Vignesh,
Docker support with kernel config fragment was in Processor SDK since 2018.
Later it got moved to meta-arago to be more generic and used in Core SDK. And
then eventually a similar config fragment got added to TI kernel about a year
ago for 5.10. I guess nobody went back and cleaned it up in meta-arago up
until now... Yes, it is not 6.1 specific.
> >ti_sdk_*_defconfigs include containers.cfg fragment that has all these
> >configs [0][1]
> >
> >[0] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/ti_config_fragments/v8_defconfig_map.txt?h=ti-linux-5.10.y-cicd#n2
> >[1] https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/tree/ti_config_fragments/containers.cfg?h=ti-linux-5.10.y-cicd
> >
> >IMO, this patch should not affect 5.10 either
>
> If that is the case, then we just need to reword the commit message
> to not be so 6.1 specific.
>
>
> >>
> >>>Ref -
> >>>https://git.ti.com/cgit/ti-linux-kernel/ti-linux-kernel/patch/?id=ca7f239d0814e6a49804b76c0984d6ca5eea0924
> >>>
> >>>Signed-off-by: Chirag Shilwant <c-shilwant@ti.com>
> >>>---
> >>> .../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"
> >>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-06-09 16:11 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-06-09 5:23 [meta-arago][kirkstone][PATCH] meta-arago-distro: recipes-kernel: Remove docker configs Chirag Shilwant
2023-06-09 13:31 ` Ryan Eatmon
2023-06-09 14:42 ` Raghavendra, Vignesh
2023-06-09 15:39 ` Ryan Eatmon
2023-06-09 16:10 ` Denys Dmytriyenko
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.