From c51d533ec1388a56c61aee29b4809d895ae892ac Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 3 Apr 2020 15:28:41 +0200 Subject: [PATCH] coreos-base/gmerge: do not touch commit if it is of NoneType `emerge-gitclone`, should replace commit only if the commit is not of NoneType, so it could not crash. See also https://github.com/flatcar-linux/dev-util/pull/4. --- .../{gmerge-0.0.1-r582.ebuild => gmerge-0.0.1-r583.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-r582.ebuild => gmerge-0.0.1-r583.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r582.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r583.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r582.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r583.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 4a49a81241..4862733787 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="051db9cb4d2df8cc72bf01025dbc60ef7bc025f8" # flatcar-master + CROS_WORKON_COMMIT="636b1ee0d2bbc5b69ca45484e9cbd4f8b0aea581" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi