From 13169c3265ba75d783eb3723504298a08e768110 Mon Sep 17 00:00:00 2001
From: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Date: Tue, 9 Aug 2022 11:33:17 +0200
Subject: Rename Instrument Cluster Container layer

meta-agl-lxc is no longer reflecting the actual content and use of the layer.
Rename it to  'meta-agl-ic-container' and the feature to 'agl-ic-container'.

Also rename the main image to 'agl-cluster-demo-lxc-host' to match the pattern used
by all other images  e.g. agl-<ivi,cluster,telematics>-demo-* .
But keep the names of the underlying images as-is.

Bug-AGL: SPEC-4464
Signed-off-by: Jan-Simon Moeller <jsmoeller@linuxfoundation.org>
Change-Id: I898c786ca884331b302a3be8e150379fcf5bdc9b
---
 meta-agl-lxc/recipes-kernel/linux/linux-%.bbappend |  1 -
 .../recipes-kernel/linux/linux/lxc-net.cfg         |  5 -----
 meta-agl-lxc/recipes-kernel/linux/linux/lxc.cfg    | 26 ----------------------
 meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc    | 10 ---------
 4 files changed, 42 deletions(-)
 delete mode 100644 meta-agl-lxc/recipes-kernel/linux/linux-%.bbappend
 delete mode 100644 meta-agl-lxc/recipes-kernel/linux/linux/lxc-net.cfg
 delete mode 100644 meta-agl-lxc/recipes-kernel/linux/linux/lxc.cfg
 delete mode 100644 meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc

(limited to 'meta-agl-lxc/recipes-kernel/linux')

diff --git a/meta-agl-lxc/recipes-kernel/linux/linux-%.bbappend b/meta-agl-lxc/recipes-kernel/linux/linux-%.bbappend
deleted file mode 100644
index d50b5d66..00000000
--- a/meta-agl-lxc/recipes-kernel/linux/linux-%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-include ${@'linux_lxc.inc' if bb.data.inherits_class('kernel', d) else ''}
diff --git a/meta-agl-lxc/recipes-kernel/linux/linux/lxc-net.cfg b/meta-agl-lxc/recipes-kernel/linux/linux/lxc-net.cfg
deleted file mode 100644
index e9bd7b80..00000000
--- a/meta-agl-lxc/recipes-kernel/linux/linux/lxc-net.cfg
+++ /dev/null
@@ -1,5 +0,0 @@
-CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
-CONFIG_NETFILTER_XT_MATCH_MULTIPORT=m
-CONFIG_IP_NF_FILTER=m
-CONFIG_NF_NAT=m
-CONFIG_NF_CONNTRACK=y
diff --git a/meta-agl-lxc/recipes-kernel/linux/linux/lxc.cfg b/meta-agl-lxc/recipes-kernel/linux/linux/lxc.cfg
deleted file mode 100644
index fb87ea19..00000000
--- a/meta-agl-lxc/recipes-kernel/linux/linux/lxc.cfg
+++ /dev/null
@@ -1,26 +0,0 @@
-CONFIG_CGROUP_DEVICE=y
-CONFIG_CPUSETS=y
-CONFIG_PROC_PID_CPUSET=y
-CONFIG_MEMCG=y
-CONFIG_CGROUP_SCHED=y
-CONFIG_FAIR_GROUP_SCHED=y
-CONFIG_RT_GROUP_SCHED=y
-CONFIG_CHECKPOINT_RESTORE=y
-CONFIG_NAMESPACES=y
-CONFIG_UTS_NS=y
-CONFIG_IPC_NS=y
-CONFIG_USER_NS=y
-CONFIG_PID_NS=y
-CONFIG_NET_NS=y
-
-CONFIG_NET_CLS_CGROUP=m
-CONFIG_BLK_CGROUP=y
-CONFIG_CGROUP_NET_PRIO=y
-
-# Virtual drivers
-CONFIG_HVC_DRIVER=y
-
-# Support for virtual ethernet and LXC
-CONFIG_VETH=y
-CONFIG_MACVLAN=y
-CONFIG_VXLAN=m
diff --git a/meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc b/meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc
deleted file mode 100644
index 87e1edc5..00000000
--- a/meta-agl-lxc/recipes-kernel/linux/linux_lxc.inc
+++ /dev/null
@@ -1,10 +0,0 @@
-FILESEXTRAPATHS:prepend := "${THISDIR}/linux:"
-
-# Disable all other AGL provided kernel configuration (barring
-# base BSP provided configuration), and just enable a locally
-# provided fragment with minimal LXC required configuration.
-AGL_KCONFIG_FRAGMENTS += "lxc.cfg "
-AGL_KCONFIG_FRAGMENTS += "lxc-net.cfg "
-
-
-
-- 
cgit 1.2.3-korg