From 8e3935c20050d4ec2c99dd02b6d43b4f095d5737 Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Wed, 22 Jan 2020 14:37:22 +0100 Subject: [PATCH] coreos-base/gmerge: bump gmerge to update emerge-gitclone To make emerge-gitclone use correct flatcar strings in github URLs, we need to update gmerge. --- .../{gmerge-0.0.1-r579.ebuild => gmerge-0.0.1-r580.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-r579.ebuild => gmerge-0.0.1-r580.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r579.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r580.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r579.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r580.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 29743c54a5..500a460c34 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="7b48efb82f5acfe135ea6e0ec2c9c5ee957d64d2" # flatcar-master + CROS_WORKON_COMMIT="ce5afaebfd17f01e2aa151c2dc6d5c9949e42241" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi