From 32812d8a918a9cd029f1b4fe09d1d8d8927f3e15 Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Thu, 4 Feb 2021 12:38:32 +0100 Subject: [PATCH] coreos-base/gmerge: Pull in a python3 version of emerge-gitclone --- .../{gmerge-0.0.1-r584.ebuild => gmerge-0.0.1-r585.ebuild} | 0 .../coreos-overlay/coreos-base/gmerge/gmerge-9999.ebuild | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/{gmerge-0.0.1-r584.ebuild => gmerge-0.0.1-r585.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r584.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r585.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r584.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/gmerge/gmerge-0.0.1-r585.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 26b4b4ae5f..8db911b518 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 @@ -1,7 +1,7 @@ # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 CROS_WORKON_PROJECT="flatcar-linux/dev-util" CROS_WORKON_REPO="git://github.com" CROS_WORKON_LOCALNAME="dev" @@ -10,11 +10,11 @@ CROS_WORKON_LOCALDIR="src/platform" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~arm64 ~x86" else - CROS_WORKON_COMMIT="636b1ee0d2bbc5b69ca45484e9cbd4f8b0aea581" # flatcar-master + CROS_WORKON_COMMIT="c0634204f62262288735efe069c6365ed31a5c54" # flatcar-master KEYWORDS="amd64 arm arm64 x86" fi -PYTHON_COMPAT=( python2_7 ) +PYTHON_COMPAT=( python3_6 ) inherit cros-workon python-single-r1