From 46c86fa00073690d12614fc3be5c806b14fae9e1 Mon Sep 17 00:00:00 2001
From: Kai Lueke <kailuke@microsoft.com>
Date: Tue, 31 Aug 2021 16:56:22 +0200
Subject: [PATCH] coreos-base/coreos/coreos: add user binaries to explicit list

The image contents are defined by the list in this package and the
dependencies pulled in. Once we would lose some dependency due to
a package change, that would also meant that this dependency's
binaries are not available to the user anymore. To prevent user
binaries from being lost we have to explicitly list them in this
package.
Add the packages that have binaries relevant to the user and are
currently installed (seen in flatcar_production_image_packages.txt
and checked manually). Also add sys-apps/acl which got lost when
removing rkt.
---
 ...0.1-r299.ebuild => coreos-0.0.1-r300.ebuild} |  0
 .../coreos-base/coreos/coreos-0.0.1.ebuild      | 17 +++++++++++++++++
 2 files changed, 17 insertions(+)
 rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r299.ebuild => coreos-0.0.1-r300.ebuild} (100%)

diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r299.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r300.ebuild
similarity index 100%
rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r299.ebuild
rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r300.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 b12ba6ad8d..acac5e1000 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
@@ -95,7 +95,11 @@ RDEPEND="${RDEPEND}
 	app-admin/sudo
 	app-admin/toolbox
 	app-arch/gzip
+	app-arch/bzip2
 	app-arch/lbzip2
+	app-arch/lz4
+	app-arch/xz-utils
+	app-arch/zstd
 	app-arch/tar
 	app-arch/torcx
 	app-arch/unzip
@@ -107,6 +111,7 @@ RDEPEND="${RDEPEND}
 	app-emulation/cri-tools
 	app-misc/ca-certificates
 	app-misc/jq
+	app-misc/pax-utils
 	app-shells/bash
 	coreos-base/afterburn
 	coreos-base/coreos-cloudinit
@@ -114,7 +119,9 @@ RDEPEND="${RDEPEND}
 	coreos-base/update-ssh-keys
 	coreos-base/update_engine
 	dev-db/etcdctl
+	dev-libs/openssl
 	dev-util/strace
+	dev-util/bsdiff
 	dev-vcs/git
 	net-analyzer/nmap
 	net-analyzer/tcpdump
@@ -126,6 +133,7 @@ RDEPEND="${RDEPEND}
 	net-firewall/nftables
 	net-fs/nfs-utils
 	net-misc/bridge-utils
+	net-misc/curl
 	net-misc/iputils
 	net-misc/ntp
 	net-misc/rsync
@@ -133,20 +141,25 @@ RDEPEND="${RDEPEND}
 	net-misc/wget
 	net-misc/whois
 	net-vpn/wireguard-tools
+	sys-apps/acl
+	sys-apps/attr
 	sys-apps/coreutils
 	sys-apps/dbus
 	sys-apps/diffutils
 	sys-apps/ethtool
 	sys-apps/findutils
 	sys-apps/gawk
+	sys-apps/gptfdisk
 	sys-apps/grep
 	sys-apps/iproute2
 	sys-apps/kexec-tools
+	sys-apps/keyutils
 	sys-apps/less
 	sys-apps/lshw
 	sys-apps/net-tools
 	sys-apps/nvme-cli
 	sys-apps/pciutils
+	sys-apps/policycoreutils
 	sys-apps/rng-tools
 	sys-apps/sed
 	sys-apps/seismograph
@@ -155,10 +168,14 @@ RDEPEND="${RDEPEND}
 	sys-apps/util-linux
 	sys-apps/which
 	sys-block/open-iscsi
+	sys-block/parted
 	sys-cluster/ipvsadm
 	sys-fs/btrfs-progs
+	sys-fs/cryptsetup
 	sys-fs/dosfstools
 	sys-fs/e2fsprogs
+	sys-fs/lsscsi
+	sys-fs/lvm2
 	sys-fs/mdadm
 	sys-fs/multipath-tools
 	sys-fs/quota