From 2cc17b6eef00a8563f6037bb1317642e6fdbd66d Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Thu, 2 Apr 2020 17:32:37 +0200 Subject: [PATCH] coreos-base/gmerge: do not check out coreos branches Now that we started independent releases, we do not have to check out upstream coreos branches. Just check out the default branch for the repository, and rely on the revision commits/branches for our release branches. --- .../{gmerge-0.0.1-r581.ebuild => gmerge-0.0.1-r582.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-r581.ebuild => gmerge-0.0.1-r582.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r581.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r582.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r581.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r582.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 c56a34a8d9..4a49a81241 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="3fa4eedb76ac755ad48c582ae9c46a350fbf77cf" # flatcar-master + CROS_WORKON_COMMIT="051db9cb4d2df8cc72bf01025dbc60ef7bc025f8" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi