From 48b79af0883f992289e278b7a4c4df04d17c11ad Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 16 Sep 2022 11:37:58 +0200 Subject: [PATCH] coreos-base/emerge-gitclone: Bring in a fix for developer channel and builds MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit For the main branch (so for nightly builds) the group in `/usr/share/flatcar/update.conf` is not "main", but "developer". This needs a small translation when turning it into a channel information. Without that, we are trying to checkout a nonexistent tag named `developer-3363.0.0-…` instead of `main-3363.0.0-…`, which fails. In developer builds version string contains version numbers and a build ID with plus symbol sitting between them. Git tags are formatted in similar way, but with a dash, instead of plus. Thus the plus needs to be replaced to obtain a proper git tag. --- ...lone-0.0.1-r589.ebuild => emerge-gitclone-0.0.1-r590.ebuild} | 0 .../coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/{emerge-gitclone-0.0.1-r589.ebuild => emerge-gitclone-0.0.1-r590.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r589.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r590.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r589.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r590.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild index 83c32b72a2..a91a84bdba 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="7752d81eba5cfc380962e189468b80940d8d2a6d" # flatcar-master + CROS_WORKON_COMMIT="ce789b660ecd42043312329a4b2f7ddcc2a8c033" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi