From a5f3e5d3f486dadb540173f4678ad685bdf99b65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20L=C3=BCke?= Date: Mon, 16 Sep 2019 19:45:30 +0200 Subject: [PATCH] Use mantle/ignition versions which have the opt/org.flatcar-linux Ignition var The mantle and ignition build should always use vendoring because it's done in a sandbox without internet access. --- coreos-devel/mantle/mantle-9999.ebuild | 4 ++-- sys-apps/ignition/ignition-9999.ebuild | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coreos-devel/mantle/mantle-9999.ebuild b/coreos-devel/mantle/mantle-9999.ebuild index 3cba2616a86..23379901610 100644 --- a/coreos-devel/mantle/mantle-9999.ebuild +++ b/coreos-devel/mantle/mantle-9999.ebuild @@ -6,12 +6,12 @@ CROS_WORKON_PROJECT="flatcar-linux/mantle" CROS_WORKON_LOCALNAME="mantle" CROS_WORKON_REPO="git://github.com" COREOS_GO_PACKAGE="github.com/coreos/mantle" +COREOS_GO_MOD="vendor" if [[ "${PV}" == 9999 ]]; then - COREOS_GO_MOD="vendor" KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="e7983fc86fae0b77e24611c6f96da3765dc81d1d" # v0.12.0 + CROS_WORKON_COMMIT="54ee38b425c6f493232cc75be003bbee50148504" # v0.13.0+54ee38b KEYWORDS="amd64 arm64" fi diff --git a/sys-apps/ignition/ignition-9999.ebuild b/sys-apps/ignition/ignition-9999.ebuild index 0abbbf5d36d..f254b380929 100644 --- a/sys-apps/ignition/ignition-9999.ebuild +++ b/sys-apps/ignition/ignition-9999.ebuild @@ -11,7 +11,7 @@ inherit coreos-go cros-workon systemd udev if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="c65e95cdaecd7268e1d345c804557a1990a66314" # tag v0.33.0 + CROS_WORKON_COMMIT="cf4f871aec3c1b9d429e5703fb4feab25ea14fd5" # tag v0.33.0 KEYWORDS="amd64 arm64" fi