From 97e608f538c5da53998858aeb52582556d26e78a Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Mon, 21 Mar 2022 17:28:49 +0100 Subject: [PATCH] coreos-base/emerge-gitclone: Pull PRs properly This usually doesn't happen for releases, but for development dev-containers it might be the case that portage-stable or coreos-overlay commit is specified as some pull request reference - these need to be fetched differently, as refs from refs/pull usually are not fetched by default. --- ...lone-0.0.1-r588.ebuild => emerge-gitclone-0.0.1-r589.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-r588.ebuild => emerge-gitclone-0.0.1-r589.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r588.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r589.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r588.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/emerge-gitclone/emerge-gitclone-0.0.1-r589.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 ff5c141a75..c5ddbe7750 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="e3cc627a3d2ef3433fa15f18cb1fdfeb72857541" # flatcar-master + CROS_WORKON_COMMIT="1854226f7c06a261e577a5761b6a0b7ccec085e7" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi