From 668755da31a780a469b6d718999b4aee942ce1a4 Mon Sep 17 00:00:00 2001 From: Mathieu Tortuyaux Date: Thu, 2 Sep 2021 10:45:07 +0200 Subject: [PATCH] sys-apps/ignition: bump commit ID it mainly brings V3 support on top of V2 support for Ignition and ensure backward compatibility with existing integration. Signed-off-by: Mathieu Tortuyaux --- sys-apps/ignition/ignition-2.2.0.ebuild | 1 + sys-apps/ignition/ignition-9999.ebuild | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) create mode 120000 sys-apps/ignition/ignition-2.2.0.ebuild diff --git a/sys-apps/ignition/ignition-2.2.0.ebuild b/sys-apps/ignition/ignition-2.2.0.ebuild new file mode 120000 index 00000000000..edd426c8cd1 --- /dev/null +++ b/sys-apps/ignition/ignition-2.2.0.ebuild @@ -0,0 +1 @@ +ignition-9999.ebuild \ No newline at end of file diff --git a/sys-apps/ignition/ignition-9999.ebuild b/sys-apps/ignition/ignition-9999.ebuild index 923cbced188..a1f411e8228 100644 --- a/sys-apps/ignition/ignition-9999.ebuild +++ b/sys-apps/ignition/ignition-9999.ebuild @@ -5,14 +5,14 @@ EAPI=7 CROS_WORKON_PROJECT="flatcar-linux/ignition" CROS_WORKON_LOCALNAME="ignition" CROS_WORKON_REPO="https://github.com" -COREOS_GO_PACKAGE="github.com/flatcar-linux/ignition" +COREOS_GO_PACKAGE="github.com/flatcar-linux/ignition/v2" COREOS_GO_GO111MODULE="off" inherit coreos-go cros-workon systemd udev if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="6d7b4401700c76492c8627030d9dde147f81d5cf" # flatcar-master + CROS_WORKON_COMMIT="390754d1de968ae47f60a7b308a43c76ac0af4ec" # tormath1/convert-v2-v3 KEYWORDS="amd64 arm64" fi @@ -46,7 +46,7 @@ PATCHES=( src_compile() { export GO15VENDOREXPERIMENT="1" - GO_LDFLAGS="-X github.com/flatcar-linux/ignition/internal/version.Raw=$(git describe --dirty)" || die + GO_LDFLAGS="-X github.com/flatcar-linux/ignition/v2/internal/version.Raw=${PV} -X github.com/flatcar-linux/ignition/v2/internal/distro.selinuxRelabel=false -X github.com/flatcar-linux/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false" || die go_build "${COREOS_GO_PACKAGE}/internal" }