sys-apps/ignition: bump commit ID

this commit ID pulls the following PR: * flatcar/ignition#23 it mainly brings V3 support on top of V2 support for Ignition and ensure backward compatibility with existing integration. Signed-off-by: Mathieu Tortuyaux <[email protected]>
flatcar-archive · Sep 9, 2021 · bd1e006 · bd1e006
1 parent f53b63b
commit bd1e006
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/sys-apps/ignition/ignition-0.34.0-r4.ebuild → sys-apps/ignition/ignition-2.2.0.ebuild b/sys-apps/ignition/ignition-0.34.0-r4.ebuild → sys-apps/ignition/ignition-2.2.0.ebuild
diff --git 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="git://github.com"
-COREOS_GO_PACKAGE="github.com/coreos/ignition"
+COREOS_GO_PACKAGE="github.com/coreos/ignition/v2"
 COREOS_GO_GO111MODULE="off"
 inherit coreos-go cros-workon systemd udev
 
 if [[ "${PV}" == 9999 ]]; then
 	KEYWORDS="~amd64 ~arm64"
 else
-	CROS_WORKON_COMMIT="a070efe79edba7541b33ffd80e82dffe557ebf74" # flatcar-master
+	CROS_WORKON_COMMIT="6964a0ac09b84d3a75914cbaa75bb2314c6a2f85" # tormath1/convert-v2-v3
 	KEYWORDS="amd64 arm64"
 fi
 
@@ -46,7 +46,7 @@ PATCHES=(
 
 src_compile() {
 	export GO15VENDOREXPERIMENT="1"
-	GO_LDFLAGS="-X github.com/coreos/ignition/internal/version.Raw=$(git describe --dirty)" || die
+	GO_LDFLAGS="-X github.com/coreos/ignition/v2/internal/version.Raw=${PV} -X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=false -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false" || die
 	go_build "${COREOS_GO_PACKAGE}/internal"
 }