From c589fb8e562e55da3ae1451c1cb690d4d9e13579 Mon Sep 17 00:00:00 2001 From: Thilo Fromm Date: Fri, 6 Oct 2023 11:41:56 +0200 Subject: [PATCH] coreos-overlay: removed all remaining app-torcx artifacts Signed-off-by: Thilo Fromm --- .../app-torcx/docker/docker-20.10.ebuild | 32 ------------------- .../docker/files/docker-17.03-manifest.json | 29 ----------------- .../docker/files/docker-19.03-manifest.json | 29 ----------------- .../docker/files/docker-20.10-manifest.json | 30 ----------------- .../coreos-overlay/profiles/categories | 1 - .../bootengine/bootengine-9999.ebuild | 1 - 6 files changed, 122 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-17.03-manifest.json delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-19.03-manifest.json delete mode 100644 sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild deleted file mode 100644 index 54a268670b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/docker-20.10.ebuild +++ /dev/null @@ -1,32 +0,0 @@ -# Copyright (c) 2017-2018 CoreOS, Inc.. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DESCRIPTION="Packages to be installed in a torcx image for Docker" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 arm64" - -# Explicitly list all packages that will be built into the image. -RDEPEND=" - ~app-containers/docker-20.10.24 - ~app-containers/docker-cli-20.10.24 - ~app-containers/containerd-1.7.7 - ~app-containers/docker-proxy-0.8.0_p20230118 - ~app-containers/runc-1.1.9 - ~dev-libs/libltdl-2.4.7 - ~sys-process/tini-0.19.0 -" - -S="${WORKDIR}" - -src_install() { - insinto /.torcx - newins "${FILESDIR}/${P}-manifest.json" manifest.json - - # Enable the Docker socket by default. - local unitdir=/usr/lib/systemd/system - dosym ../docker.socket "${unitdir}/sockets.target.wants/docker.socket" -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-17.03-manifest.json b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-17.03-manifest.json deleted file mode 100644 index 190f9e8538..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-17.03-manifest.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "kind": "image-manifest-v0", - "value": { - "bin": [ - "/bin/containerd", - "/bin/containerd-shim", - "/bin/ctr", - "/bin/docker", - "/bin/docker-containerd", - "/bin/docker-containerd-shim", - "/bin/docker-init", - "/bin/docker-proxy", - "/bin/docker-runc", - "/bin/dockerd", - "/bin/runc", - "/bin/tini" - ], - "network": [ - "/lib/systemd/network/50-docker.network", - "/lib/systemd/network/90-docker-veth.network" - ], - "units": [ - "/lib/systemd/system/containerd.service", - "/lib/systemd/system/docker.service", - "/lib/systemd/system/docker.socket", - "/lib/systemd/system/sockets.target.wants" - ] - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-19.03-manifest.json b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-19.03-manifest.json deleted file mode 100644 index 190f9e8538..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-19.03-manifest.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "kind": "image-manifest-v0", - "value": { - "bin": [ - "/bin/containerd", - "/bin/containerd-shim", - "/bin/ctr", - "/bin/docker", - "/bin/docker-containerd", - "/bin/docker-containerd-shim", - "/bin/docker-init", - "/bin/docker-proxy", - "/bin/docker-runc", - "/bin/dockerd", - "/bin/runc", - "/bin/tini" - ], - "network": [ - "/lib/systemd/network/50-docker.network", - "/lib/systemd/network/90-docker-veth.network" - ], - "units": [ - "/lib/systemd/system/containerd.service", - "/lib/systemd/system/docker.service", - "/lib/systemd/system/docker.socket", - "/lib/systemd/system/sockets.target.wants" - ] - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json b/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json deleted file mode 100644 index 418acbdcd9..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/app-torcx/docker/files/docker-20.10-manifest.json +++ /dev/null @@ -1,30 +0,0 @@ -{ - "kind": "image-manifest-v0", - "value": { - "bin": [ - "/bin/containerd", - "/bin/containerd-shim", - "/bin/ctr", - "/bin/docker", - "/bin/docker-containerd", - "/bin/docker-containerd-shim", - "/bin/docker-init", - "/bin/docker-proxy", - "/bin/docker-runc", - "/bin/dockerd", - "/bin/runc", - "/bin/tini" - ], - "network": [ - "/lib/systemd/network/50-docker.network", - "/lib/systemd/network/90-docker-veth.network" - ], - "units": [ - "/lib/systemd/system/containerd.service", - "/lib/systemd/system/docker.service", - "/lib/systemd/system/docker.socket", - "/lib/systemd/system/sockets.target.wants", - "/lib/systemd/system/multi-user.target.wants" - ] - } -} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/categories b/sdk_container/src/third_party/coreos-overlay/profiles/categories index 8afb9b905b..2d661545c2 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/categories +++ b/sdk_container/src/third_party/coreos-overlay/profiles/categories @@ -1,3 +1,2 @@ -app-torcx coreos-base coreos-devel diff --git a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild index 637cb31b83..fed305a3e3 100644 --- a/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/sys-kernel/bootengine/bootengine-9999.ebuild @@ -37,7 +37,6 @@ src_install() { "${D}"/usr/lib/dracut/modules.d/30ignition/ignition-setup.sh \ "${D}"/usr/lib/dracut/modules.d/30ignition/ignition-kargs-helper \ "${D}"/usr/lib/dracut/modules.d/30ignition/retry-umount.sh \ - "${D}"/usr/lib/dracut/modules.d/35torcx/torcx-profile-populate-generator \ "${D}"/usr/lib/dracut/modules.d/99setup-root/initrd-setup-root \ "${D}"/usr/lib/dracut/modules.d/99setup-root/initrd-setup-root-after-ignition \ "${D}"/usr/lib/dracut/modules.d/99setup-root/gpg-agent-wrapper \