diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r534.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r534.ebuild deleted file mode 120000 index 96a86df10d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-0.0.1-r534.ebuild +++ /dev/null @@ -1 +0,0 @@ -cros-devutils-9999.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild deleted file mode 100644 index 7317baa630..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/cros-devutils-9999.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -EAPI="4" -CROS_WORKON_PROJECT="flatcar-linux/dev-util" -CROS_WORKON_REPO="git://github.com" -CROS_WORKON_LOCALNAME="dev" -CROS_WORKON_LOCALDIR="src/platform" - -if [[ "${PV}" == 9999 ]]; then - KEYWORDS="~amd64 ~arm64 ~arm ~x86" -else - CROS_WORKON_COMMIT="7b48efb82f5acfe135ea6e0ec2c9c5ee957d64d2" # flatcar-master - KEYWORDS="amd64 arm arm64 x86" -fi - -inherit cros-workon multilib python-utils-r1 - -DESCRIPTION="Development utilities for CoreOS" -HOMEPAGE="https://github.com/coreos/dev-util" - -LICENSE="GPL-2" -SLOT="0" -IUSE="cros_host test" - -RDEPEND="cros_host? ( app-emulation/qemu ) - app-portage/gentoolkit - cros_host? ( app-shells/bash ) - !cros_host? ( !chromeos-base/gmerge ) - dev-lang/python - dev-util/shflags - cros_host? ( dev-util/crosutils ) - app-crypt/efitools - !coreos-base/coreos-installer - " -# These are all either bash / python scripts. No actual builds DEPS. -DEPEND="" - -src_install() { - # Run the devserver Makefile. - emake install DESTDIR="$D" - - dosym /build /var/lib/devserver/static/pkgroot - dosym /var/lib/devserver/static /usr/lib/devserver/static - - if ! use cros_host; then - dobin gmerge stateful_update - else - local host_tools - host_tools=( - cros_bundle_firmware - cros_choose_profile - cros_chrome_make - cros_fetch_image - cros_sign_bootstub - cros_start_vm - cros_stop_vm - cros_workon - cros_workon_make - cros_write_firmware - dump_i2c - dump_tpm - gdb_remote - gdb_x86_local - gmergefs - image_to_live.sh - strip_package - ssh_no_update - willis - ) - - dobin "${host_tools[@]/#/host/}" - - # Payload generation scripts. - dobin host/cros_generate_update_payload - - # Repo and git bash completion. - insinto /usr/share/bash-completion - newins host/repo_bash_completion repo - dosym /usr/share/bash-completion/git /etc/bash_completion.d/git - dosym /usr/share/bash-completion/repo /etc/bash_completion.d/repo - - insinto "$(python_get_sitedir python2_7 PYTHON)" - doins host/lib/*.py - - insinto "/usr/lib/crosutils" - doins host/lib/cros_archive.sh - fi -} - -src_test() { - cd "${S}" # Let's just run unit tests from ${S} rather than install and run. - - # Run bundle_firmware tests - pushd host/lib >/dev/null - local libfile - for libfile in *.py; do - einfo Running tests in ${libfile} - python ${libfile} --test || \ - die "Unit tests failed at ${libfile}!" - done - popd >/dev/null - - pushd host/tests >/dev/null - for ut_file in *.py; do - echo Running tests in ${ut_file} - PYTHONPATH=../lib python ${ut_file} || - die "Unit tests failed at ${ut_file}!" - done - popd >/dev/null - - local TESTS=() - if ! use cros_host; then - TESTS+=( gmerge_test.py ) - # FIXME(zbehan): import gmerge in gmerge_test.py won't work if we won't - # have the .py. - ln -sf gmerge gmerge.py - else - TESTS+=( autoupdate_unittest.py ) - TESTS+=( builder_test.py ) - TESTS+=( devserver_test.py ) - TESTS+=( common_util_unittest.py ) - TESTS+=( host/lib/cros_archive_unittest.sh ) - #FIXME(zbehan): update_test.py doesn't seem to work right now. - fi - - local test - for test in ${TESTS[@]} ; do - einfo "Running ${test}" - ./${test} || die "Failed in ${test}" - done -} - -pkg_preinst() { - # Handle pre-existing possibly problematic configurations of static - use cros_host || return 0 - if [[ -e ${ROOT}/usr/bin/static && ! -L ${ROOT}/usr/bin/static ]] ; then - einfo "/usr/bin/static detected, and is not a symlink, performing cleanup" - # Well, I don't know what else should be done about it. Moving the - # files has several issues: handling of all kinds of links, special - # files, permissions, etc. Autoremval is not a good idea, what if - # this ended up with accidental destruction of the system? - local newname="static-old-${RANDOM}" # In case this happens more than once. - mv "${ROOT}"/usr/bin/static "${ROOT}"/usr/bin/${newname} - ewarn "/usr/bin/${newname} has the previous contents of static." - ewarn "It can be safely deleted (or kept around forever)." - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/metadata.xml b/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/metadata.xml deleted file mode 100644 index 097975e3ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/cros-devutils/metadata.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - 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 1f855bbea4..d6c4f3078b 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 @@ -33,7 +32,6 @@ RDEPEND="${RDEPEND} app-arch/sharutils app-arch/unzip app-emulation/qemu - coreos-base/cros-devutils[cros_host] =dev-lang/python-2* dev-python/setuptools dev-lang/nasm diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild index 69c70de78c..1e0c327f0a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-devel/sdk-depends/sdk-depends-0.0.1.ebuild @@ -17,6 +17,8 @@ DEPEND=" app-admin/sudo app-admin/updateservicectl app-arch/pbzip2 + app-crypt/efitools + app-crypt/sbsigntools app-emulation/acbuild app-emulation/actool app-emulation/open-vmdk 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 @@ - - - - diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords index 1ea5b7ef5c..ee1212125a 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/arm64/package.accept_keywords @@ -46,7 +46,6 @@ dev-util/checkbashisms * =dev-util/ninja-1.8.2 ~arm64 =dev-util/re2c-0.16 ~arm64 dev-util/patchelf * -dev-util/shflags * =net-analyzer/nmap-7.40 ~arm64 =net-analyzer/tcpdump-4.9.2 ~arm64 =net-dialup/minicom-2.7.1 ~arm64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 8d925d9748..d6e85cd49f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -2,7 +2,6 @@ # Copyright (c) 2013 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -=dev-util/shflags-1.0.3 ~amd64 =dev-util/perf-4.9.13 ~amd64 # Everything needed for the boot engine