From cbb23a06aac457211dd793e17ca198525d071c49 Mon Sep 17 00:00:00 2001 From: Benjamin Gilbert Date: Thu, 28 Mar 2019 22:01:31 -0400 Subject: [PATCH] coreos-base/coreos-metadata: rename to afterburn Soft-block the old package. --- .../coreos-base/{coreos-metadata => afterburn}/Manifest | 0 .../coreos-base/afterburn/afterburn-3.0.2.ebuild | 1 + .../afterburn-9999.ebuild} | 7 ++++--- .../files/coreos-metadata-sshkeys@.service | 0 .../files/coreos-metadata.service | 0 .../{coreos-metadata => afterburn}/metadata.xml | 0 .../coreos-metadata/coreos-metadata-3.0.2.ebuild | 1 - .../{coreos-0.0.1-r292.ebuild => coreos-0.0.1-r293.ebuild} | 0 .../coreos-overlay/coreos-base/coreos/coreos-0.0.1.ebuild | 2 +- 9 files changed, 6 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/{coreos-metadata => afterburn}/Manifest (100%) create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-3.0.2.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/{coreos-metadata/coreos-metadata-9999.ebuild => afterburn/afterburn-9999.ebuild} (96%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/{coreos-metadata => afterburn}/files/coreos-metadata-sshkeys@.service (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/{coreos-metadata => afterburn}/files/coreos-metadata.service (100%) rename sdk_container/src/third_party/coreos-overlay/coreos-base/{coreos-metadata => afterburn}/metadata.xml (100%) delete mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-3.0.2.ebuild rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/{coreos-0.0.1-r292.ebuild => coreos-0.0.1-r293.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/Manifest b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/Manifest similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/Manifest rename to sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/Manifest diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-3.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-3.0.2.ebuild new file mode 120000 index 0000000000..a9c82b7799 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-3.0.2.ebuild @@ -0,0 +1 @@ +afterburn-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild similarity index 96% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild index dad9c3b9e3..2919654cee 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/afterburn-9999.ebuild @@ -3,8 +3,8 @@ EAPI=7 -CROS_WORKON_PROJECT="coreos/coreos-metadata" -CROS_WORKON_LOCALNAME="coreos-metadata" +CROS_WORKON_PROJECT="coreos/afterburn" +CROS_WORKON_LOCALNAME="afterburn" CROS_WORKON_REPO="git://github.com" if [[ ${PV} == 9999 ]]; then @@ -17,9 +17,10 @@ fi inherit cargo cros-workon systemd DESCRIPTION="A tool for collecting instance metadata from various providers" -HOMEPAGE="https://github.com/coreos/coreos-metadata" +HOMEPAGE="https://github.com/coreos/afterburn" LICENSE="Apache-2.0" SLOT="0" +RDEPEND="!coreos-base/coreos-metadata" # sed -n 's/^"checksum \([^ ]*\) \([^ ]*\) .*/\1-\2/p' Cargo.lock CRATES=" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata-sshkeys@.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata-sshkeys@.service similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata-sshkeys@.service rename to sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata-sshkeys@.service diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/files/coreos-metadata.service rename to sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/files/coreos-metadata.service diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/metadata.xml rename to sdk_container/src/third_party/coreos-overlay/coreos-base/afterburn/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-3.0.2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-3.0.2.ebuild deleted file mode 120000 index 7b803e7aa3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-metadata/coreos-metadata-3.0.2.ebuild +++ /dev/null @@ -1 +0,0 @@ -coreos-metadata-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r292.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r293.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r292.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos/coreos-0.0.1-r293.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 f00c751090..5954e07a99 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 @@ -107,9 +107,9 @@ RDEPEND="${RDEPEND} app-misc/ca-certificates app-misc/jq app-shells/bash + coreos-base/afterburn coreos-base/coreos-cloudinit coreos-base/coreos-init - coreos-base/coreos-metadata coreos-base/update-ssh-keys coreos-base/update_engine dev-db/etcdctl