From 238e88e4357b9637fa52c9cf765b7458c8e4045e Mon Sep 17 00:00:00 2001 From: Dongsu Park Date: Fri, 5 Mar 2021 10:17:39 +0100 Subject: [PATCH] app-admin/toolbox: update to use docker instead of rkt Since rkt will be deprecated soon, we should make toolbox run docker instead of rkt. Also delete dependency on `app-emulation/rkt`, and update hyperlinks. It pulls in https://github.com/kinvolk/toolbox/pull/1 . --- ...{toolbox-0.0.0-r13.ebuild => toolbox-0.0.0-r14.ebuild} | 0 .../coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild | 8 +++----- 2 files changed, 3 insertions(+), 5 deletions(-) rename sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/{toolbox-0.0.0-r13.ebuild => toolbox-0.0.0-r14.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r13.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r14.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r13.ebuild rename to sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-0.0.0-r14.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild index 6459ebe293..16abb4c25d 100644 --- a/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/app-admin/toolbox/toolbox-9999.ebuild @@ -2,29 +2,27 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=4 -CROS_WORKON_PROJECT="flatcar-linux/toolbox" +CROS_WORKON_PROJECT="kinvolk/toolbox" CROS_WORKON_LOCALNAME="toolbox" CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm64" else - CROS_WORKON_COMMIT="44993456e236b28c9f8d85776d6c3fe4c430b0ea" # flatcar-master + CROS_WORKON_COMMIT="9a2919e95acbf2e8e10634d09f45c774db3c97bf" # flatcar-master KEYWORDS="amd64 arm64" fi inherit cros-workon DESCRIPTION="toolbox" -HOMEPAGE="https://github.com/coreos/toolbox" +HOMEPAGE="https://github.com/kinvolk/toolbox" SRC_URI="" LICENSE="Apache-2.0" SLOT="0" IUSE="" -RDEPEND="app-emulation/rkt" - src_install() { dobin ${S}/toolbox }