From f2464ad27b3ed011d90bf6389bc3510bb25a70d3 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 4 Feb 2022 11:00:42 +0100 Subject: [PATCH] coreos-base/emerge-gitclone: fetch correct commit in case of non-release When the given release string is for non-release like "2022.02.02+dev-flatcar-master-4742", we should fetch release.xml from a correct commit from e.g. https://raw.githubusercontent.com/kinvolk/manifest-builds/dev-flatcar-master-4742/dev-flatcar-master-4742.xml. Without that, as the default branch contains invalid source code that was deprecated many years ago, the build could sometimes fail, e.g. when trying to build perl 5.26.2 with gcc 10. This pulls in https://github.com/flatcar-linux/flatcar-dev-util/pull/7. --- ...-0.0.1-r587.ebuild => emerge-gitclone-0.0.1-r588.ebuild} | 0 .../coreos-base/emerge-gitclone/emerge-gitclone-9999.ebuild | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/{emerge-gitclone-0.0.1-r587.ebuild => emerge-gitclone-0.0.1-r588.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r587.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r588.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r587.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r588.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 b738e98ec3..ff5c141a75 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 @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -CROS_WORKON_PROJECT="kinvolk/flatcar-dev-util" +CROS_WORKON_PROJECT="flatcar-linux/flatcar-dev-util" CROS_WORKON_REPO="https://github.com" CROS_WORKON_LOCALNAME="dev" CROS_WORKON_LOCALDIR="src/platform" @@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="9d4cad835bf6c0b60c750f7e40e8497e4281bc78" # flatcar-master + CROS_WORKON_COMMIT="e3cc627a3d2ef3433fa15f18cb1fdfeb72857541" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi @@ -19,7 +19,7 @@ PYTHON_COMPAT=( python3_{6..10} ) inherit cros-workon python-single-r1 DESCRIPTION="emerge utilities for Flatcar developer images" -HOMEPAGE="https://github.com/kinvolk/flatcar-dev-util/" +HOMEPAGE="https://github.com/flatcar-linux/flatcar-dev-util/" LICENSE="GPL-2" SLOT="0"