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
---
 .../recipes-container/lxc/files/lxc-net.service    | 15 -------------
 .../recipes-container/lxc/files/lxc.service        | 19 ----------------
 meta-agl-lxc/recipes-container/lxc/lxc_%.bbappend  | 25 ----------------------
 3 files changed, 59 deletions(-)
 delete mode 100644 meta-agl-lxc/recipes-container/lxc/files/lxc-net.service
 delete mode 100644 meta-agl-lxc/recipes-container/lxc/files/lxc.service
 delete mode 100644 meta-agl-lxc/recipes-container/lxc/lxc_%.bbappend

(limited to 'meta-agl-lxc/recipes-container/lxc')

diff --git a/meta-agl-lxc/recipes-container/lxc/files/lxc-net.service b/meta-agl-lxc/recipes-container/lxc/files/lxc-net.service
deleted file mode 100644
index 1b6e8451..00000000
--- a/meta-agl-lxc/recipes-container/lxc/files/lxc-net.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=LXC network bridge setup
-After=network-online.target systemd-resolved.service
-Before=lxc.service
-Documentation=man:lxc
-ConditionVirtualization=!lxc
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStart=@LIBEXECDIR@/lxc/lxc-net start
-ExecStop=@LIBEXECDIR@/lxc/lxc-net stop
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-agl-lxc/recipes-container/lxc/files/lxc.service b/meta-agl-lxc/recipes-container/lxc/files/lxc.service
deleted file mode 100644
index acf8da39..00000000
--- a/meta-agl-lxc/recipes-container/lxc/files/lxc.service
+++ /dev/null
@@ -1,19 +0,0 @@
-[Unit]
-Description=LXC Container Initialization and Autoboot Code
-After=network.target lxc-net.service remote-fs.target drm-lease-manager.service
-Wants=lxc-net.service
-Documentation=man:lxc-autostart man:lxc
-
-[Service]
-Type=oneshot
-RemainAfterExit=yes
-ExecStartPre=@LIBEXECDIR@/lxc/lxc-apparmor-load
-ExecStart=@LIBEXECDIR@/lxc/lxc-containers start
-ExecStop=@LIBEXECDIR@/lxc/lxc-containers stop
-ExecReload=@LIBEXECDIR@/lxc/lxc-apparmor-load
-# Environment=BOOTUP=serial
-# Environment=CONSOLETYPE=serial
-Delegate=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/meta-agl-lxc/recipes-container/lxc/lxc_%.bbappend b/meta-agl-lxc/recipes-container/lxc/lxc_%.bbappend
deleted file mode 100644
index 75ab98c0..00000000
--- a/meta-agl-lxc/recipes-container/lxc/lxc_%.bbappend
+++ /dev/null
@@ -1,25 +0,0 @@
-PACKAGECONFIG:remove = "templates"
-
-SYSTEMD_AUTO_ENABLE:${PN} = "enable"
-
-FILESEXTRAPATHS:prepend := "${THISDIR}/files:"
-
-SRC_URI += " \
-    file://lxc.service \
-    file://lxc-net.service \
-    "
-
-do_install:append () {
-    for service in lxc.service lxc-net.service; do
-        install -D -m 0644 ${WORKDIR}/$service ${D}${systemd_system_unitdir}/$service
-        sed -i -e 's,@LIBEXECDIR@,${libexecdir},g' ${D}${systemd_system_unitdir}/$service
-    done
-}
-
-# NOTE:
-# This needs to be replaced with a rework of the upstream packaging
-# to do a proper split of core from the template support.
-RDEPENDS:${PN} = ""
-
-
-
-- 
cgit 1.2.3-korg