From f2c0730ab70537beba5d6a7e93d4750b84c6661c Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Tue, 2 Aug 2022 14:08:00 +0200 Subject: [PATCH] coreos-base/coreos-cloudinit: pull in AWS IMDSv2 and go-module support This pulls in these PRs: - https://github.com/flatcar-linux/coreos-cloudinit/pull/13 (imdsv2) - https://github.com/flatcar-linux/coreos-cloudinit/pull/14 (go.mod) Since go.mod is now present, rework the ebuild to remove unused bits and enable go module support. --- ...-1.14.0-r2.ebuild => coreos-cloudinit-1.14.0-r3.ebuild} | 0 .../coreos-cloudinit/coreos-cloudinit-9999.ebuild | 7 ++----- 2 files changed, 2 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/{coreos-cloudinit-1.14.0-r2.ebuild => coreos-cloudinit-1.14.0-r3.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r2.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r3.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r2.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r3.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild index e76e85df86..345f6af511 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild @@ -6,13 +6,13 @@ CROS_WORKON_PROJECT="flatcar-linux/coreos-cloudinit" CROS_WORKON_LOCALNAME="coreos-cloudinit" CROS_WORKON_REPO="https://github.com" COREOS_GO_PACKAGE="github.com/coreos/coreos-cloudinit" -COREOS_GO_GO111MODULE="off" +COREOS_GO_GO111MODULE="on" inherit cros-workon systemd toolchain-funcs udev coreos-go if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="4de1033b7a0600c84ea86f8fac8b580116f4f8f1" # flatcar-master + CROS_WORKON_COMMIT="6e1b14aa51b0a19bf7150bfd4cd0e03ab82aca43" # flatcar-master KEYWORDS="amd64 arm64" fi @@ -32,15 +32,12 @@ RDEPEND=" src_prepare() { coreos-go_src_prepare - GOPATH+=":${S}/third_party" - if gcc-specs-pie; then CGO_LDFLAGS+=" -fno-PIC" fi } src_compile() { - export GO15VENDOREXPERIMENT="1" GO_LDFLAGS="-X main.version=$(git describe --dirty)" || die coreos-go_src_compile }