From 562e0670bc3378882ebd1c8cba2a0bd50ef55af5 Mon Sep 17 00:00:00 2001 From: Stephen Demos Date: Fri, 20 Oct 2017 16:38:29 -0700 Subject: [PATCH] coreos-base/update-ssh-keys: req newer coreos-init coreos-init versions older than 0.0.1-r152 still have the update-ssh-keys shell script which means the update-ssh-keys package fails to install. to fix this, we make coreos-base/update-ssh-keys block on versions of coreos-init that are too old. --- ...-ssh-keys-0.1.0.ebuild => update-ssh-keys-0.1.0-r1.ebuild} | 0 .../coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild | 4 ++++ 2 files changed, 4 insertions(+) rename sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/{update-ssh-keys-0.1.0.ebuild => update-ssh-keys-0.1.0-r1.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.1.0.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.1.0-r1.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.1.0.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-0.1.0-r1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild index cff884696e..16fef9b339 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update-ssh-keys/update-ssh-keys-9999.ebuild @@ -21,6 +21,10 @@ HOMEPAGE="https://github.com/coreos/update-ssh-keys" LICENSE="Apache-2.0" SLOT="0" +# make sure we have a new enough coreos-init that we won't conflict with the +# old bash script +RDEPEND="!