From ee81b6b5ebaf081ad971482bd162b83e8435c3ed Mon Sep 17 00:00:00 2001 From: Krzesimir Nowak Date: Fri, 20 Aug 2021 19:21:34 +0200 Subject: [PATCH] dev-util/crosutils: Drop the package It contained some chromium version of flatcar scripts, from which we were using the common.sh script in the cros-workon script (from the now-removed coreos-base/cros-devutils package). It's not used any more - we updated flatcar scripts to call into its internal copy of cros-workon. --- .../hard-host-depends-0.0.1.ebuild | 1 - .../coreos-overlay/coreos/config/.bashrc | 2 - .../crosutils/crosutils-0.0.1-r1290.ebuild | 38 ------------------- .../dev-util/crosutils/crosutils-9999.ebuild | 36 ------------------ .../dev-util/crosutils/metadata.xml | 4 -- 5 files changed, 81 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/crosutils-0.0.1-r1290.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/crosutils-9999.ebuild delete mode 100644 sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/metadata.xml diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild index 98d9ac1e4a..aa3b525a81 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/hard-host-depends/hard-host-depends-0.0.1.ebuild @@ -18,7 +18,6 @@ RDEPEND="${RDEPEND} app-admin/sudo sys-apps/less dev-embedded/u-boot-tools - dev-util/crosutils !arm64? ( sys-boot/syslinux ) sys-devel/crossdev sys-devel/sysroot-wrappers diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/.bashrc b/sdk_container/src/third_party/coreos-overlay/coreos/config/.bashrc index 7cd730a2a1..96eb997b24 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/.bashrc +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/.bashrc @@ -22,5 +22,3 @@ fi # outside the chroot. export PS1="(cros-chroot) ${PS1}" -[[ -f /usr/share/crosutils/bash_completion ]] && - . /usr/share/crosutils/bash_completion diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/crosutils-0.0.1-r1290.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/crosutils-0.0.1-r1290.ebuild deleted file mode 100644 index c474b0bfd1..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/crosutils-0.0.1-r1290.ebuild +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -CROS_WORKON_COMMIT="c1fd42203b778dc7a4950a4422a01f839b84bc04" -CROS_WORKON_TREE="fac7e77188abf62a8c29d1aab875e6bc72d892b2" -CROS_WORKON_PROJECT="chromiumos/platform/crosutils" -CROS_WORKON_LOCALNAME="../scripts/" - -inherit python-utils-r1 cros-workon - -DESCRIPTION="Chromium OS build utilities" -HOMEPAGE="http://www.chromium.org/chromium-os" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="amd64 arm64" -IUSE="" - -src_configure() { - find . -type l -exec rm {} \; && - rm -fr WATCHLISTS inherit-review-settings-ok lib/shflags || - die "Couldn't clean directory." -} - -src_install() { - # Install package files - exeinto /usr/lib/crosutils - doexe * || die "Could not install shared files." - - insinto "$(python_get_sitedir python2_7 PYTHON)" - doins lib/*.py || die "Could not install python files." - rm -f lib/*.py - - # Install libraries - insinto /usr/lib/crosutils/lib - doins lib/* || die "Could not install library files" -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/crosutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/crosutils-9999.ebuild deleted file mode 100644 index 66d96b9cd3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/crosutils-9999.ebuild +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -CROS_WORKON_PROJECT="chromiumos/platform/crosutils" -CROS_WORKON_LOCALNAME="../scripts/" - -inherit python-utils-r1 cros-workon - -DESCRIPTION="Chromium OS build utilities" -HOMEPAGE="http://www.chromium.org/chromium-os" - -LICENSE="BSD" -SLOT="0" -KEYWORDS="~amd64" -IUSE="" - -src_configure() { - find . -type l -exec rm {} \; && - rm -fr WATCHLISTS inherit-review-settings-ok lib/shflags || - die "Couldn't clean directory." -} - -src_install() { - # Install package files - exeinto /usr/lib/crosutils - doexe * || die "Could not install shared files." - - insinto "$(python_get_sitedir python2_7 PYTHON)" - doins lib/*.py || die "Could not install python files." - rm -f lib/*.py - - # Install libraries - insinto /usr/lib/crosutils/lib - doins lib/* || die "Could not install library files" -} diff --git a/sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/dev-util/crosutils/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - -