From 0fe7963a36ff286eac5ad848c360de3062aa44ec Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 4 Mar 2020 09:36:51 +0100 Subject: [PATCH] coreos-base/gmerge: use correct branch name format for commit We need to make emerge-gitclone check out its exact remote branch name, like `refs/remotes/origin/x`, in case of the branch name being specified as a revision. See also https://github.com/flatcar-linux/dev-util/pull/2 --- .../{gmerge-0.0.1-r580.ebuild => gmerge-0.0.1-r581.ebuild} | 0 .../coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/{gmerge-0.0.1-r580.ebuild => gmerge-0.0.1-r581.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r580.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r581.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r580.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r581.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild index 500a460c34..c56a34a8d9 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_LOCALDIR="src/platform" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="ce5afaebfd17f01e2aa151c2dc6d5c9949e42241" # flatcar-master + CROS_WORKON_COMMIT="3fa4eedb76ac755ad48c582ae9c46a350fbf77cf" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi