From 6a307e5ae39fba5e1b1b5275717b5efd843c3f2e Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 18 Feb 2021 16:30:01 +0100 Subject: [PATCH 1/2] coreos-base: delete dhcpcd Now that dhcpcd was removed from portage-stable, we can simply delete dependency on dhcpcd. --- .../{coreos-0.0.1-r298.ebuild => coreos-0.0.1-r299.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 1 - ...nds-0.0.1-r196.ebuild => hard-host-depends-0.0.1-r197.ebuild} | 0 .../coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild | 1 - 4 files changed, 2 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r298.ebuild => coreos-0.0.1-r299.ebuild} (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/{hard-host-depends-0.0.1-r196.ebuild => hard-host-depends-0.0.1-r197.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r298.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r299.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r298.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r299.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild index 8201dae7d7..be78847cdb 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild @@ -127,7 +127,6 @@ RDEPEND="${RDEPEND} net-firewall/nftables net-fs/nfs-utils net-misc/bridge-utils - net-misc/dhcpcd net-misc/iputils net-misc/ntp net-misc/rsync diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r196.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r197.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r196.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1-r197.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index 02884ca17a..40fe118552 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -129,6 +129,5 @@ RDEPEND="${RDEPEND} # Uninstall these packages. RDEPEND="${RDEPEND} - !net-misc/dhcpcd !coreos-base/google-breakpad " From 5ad450acf10702c65a96372ab96f2830ca6eca35 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 18 Feb 2021 16:33:01 +0100 Subject: [PATCH 2/2] app-emulation/containerd: delete containerd-stress Each Flatcar production image includes a binary `containerd-stress`, as a part of torcx tarballs. However it does not seem to be used anywhere. It looks like a stress testing tool for containerd, so I don't see a good reason to keep it. The binary was there since the beginning, via commit [fdd926949a10](https://github.com/kinvolk/coreos-overlay/commit/fdd926949a10c3011746a57a04fc36f451fb8009), but there is no comment or messages why it was needed. We can simply remove `containerd-stress`. --- .../{containerd-1.4.3.ebuild => containerd-1.4.3-r1.ebuild} | 0 .../app-emulation/containerd/containerd-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/{containerd-1.4.3.ebuild => containerd-1.4.3-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.3.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.3-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.3.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-1.4.3-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild index f946face7a..96ddc07898 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-emulation/containerd/containerd-9999.ebuild @@ -58,7 +58,7 @@ src_compile() { } src_install() { - dobin bin/containerd{-shim,-shim-runc-v*,-stress,} bin/ctr + dobin bin/containerd{-shim,-shim-runc-v*,} bin/ctr systemd_newunit "${FILESDIR}/${PN}-1.0.0.service" "${PN}.service" insinto /usr/share/containerd doins "${FILESDIR}/config.toml"