mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-16 01:16:59 +02:00
Code Issues Packages Projects Releases Wiki Activity

coreos-base/coreos-cloudinit: pull in AWS IMDSv2 and go-module support

Browse Source 
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.
This commit is contained in:
Jeremi Piotrowski 2022-08-02 14:08:00 +02:00
parent 4c6debc989
commit f2c0730ab7
2 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r2.ebuild → sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-1.14.0-r3.ebuild vendored
View File

7
sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-cloudinit/coreos-cloudinit-9999.ebuild vendored
View File

@ -6,13 +6,13 @@ CROS_WORKON_PROJECT="flatcar-linux/coreos-cloudinit"
CROS_WORKON_LOCALNAME="coreos-cloudinit" CROS_WORKON_LOCALNAME="coreos-cloudinit"
CROS_WORKON_REPO="https://github.com" CROS_WORKON_REPO="https://github.com"
COREOS_GO_PACKAGE="github.com/coreos/coreos-cloudinit" 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 inherit cros-workon systemd toolchain-funcs udev coreos-go
if [[ "${PV}" == 9999 ]]; then if [[ "${PV}" == 9999 ]]; then
KEYWORDS="~amd64 ~arm64" KEYWORDS="~amd64 ~arm64"
else else
CROS_WORKON_COMMIT="4de1033b7a0600c84ea86f8fac8b580116f4f8f1" # flatcar-master CROS_WORKON_COMMIT="6e1b14aa51b0a19bf7150bfd4cd0e03ab82aca43" # flatcar-master
KEYWORDS="amd64 arm64" KEYWORDS="amd64 arm64"
fi fi
@ -32,15 +32,12 @@ RDEPEND="
src_prepare() { src_prepare() {
coreos-go_src_prepare coreos-go_src_prepare
GOPATH+=":${S}/third_party"
if gcc-specs-pie; then if gcc-specs-pie; then
CGO_LDFLAGS+=" -fno-PIC" CGO_LDFLAGS+=" -fno-PIC"
fi fi
} }
src_compile() { src_compile() {
export GO15VENDOREXPERIMENT="1"
GO_LDFLAGS="-X main.version=$(git describe --dirty)" || die GO_LDFLAGS="-X main.version=$(git describe --dirty)" || die
coreos-go_src_compile coreos-go_src_compile
} }