From 0bb9c4b961c8c146f51c4bf59663cda4fd27f1b2 Mon Sep 17 00:00:00 2001 From: Brandon Philips Date: Thu, 21 Feb 2013 17:12:16 -0800 Subject: [PATCH] chore(profiles/chromeos): delete unneeded chromeos profiles --- .../profiles/targets/chromeos/make.defaults | 9 -- .../targets/chromeos/package.keywords | 125 ------------------ .../profiles/targets/chromeos/package.mask | 45 ------- .../targets/chromeos/package.provided | 91 ------------- .../profiles/targets/chromeos/package.unmask | 4 - .../profiles/targets/chromeos/package.use | 74 ----------- .../targets/chromeos/package.use.mask | 26 ---- .../profiles/targets/chromeos/profile.bashrc | 27 ---- .../profiles/targets/chromeos/virtuals | 2 - 9 files changed, 403 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.provided delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.unmask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/profile.bashrc delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/virtuals diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/make.defaults deleted file mode 100644 index e40fdc9c03..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/make.defaults +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -USE="acpi bluetooth cairo opengl usb X pam" - -USE="${USE} -acl -cracklib -gpm -ipv6 -openmp -python -sha512" -USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls" - -CONFIG_PROTECT="/etc/make.globals" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords deleted file mode 100644 index f958d00aab..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.keywords +++ /dev/null @@ -1,125 +0,0 @@ -# Copyright (c) 2012 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -=app-admin/rsyslog-3.22.1 amd64 arm x86 -=app-arch/tar-1.23-r4 amd64 arm x86 -=app-benchmarks/i7z-0.27-r1 amd64 x86 -=app-editors/nano-2.2.5 amd64 arm x86 -=app-i18n/libhangul-0.0.10 amd64 arm x86 -=app-i18n/zinnia-0.06-r1 amd64 arm x86 -=app-misc/ddccontrol-0.4.2 amd64 arm x86 -=app-misc/ddccontrol-db-20061014 amd64 arm x86 -=dev-cpp/gflags-1.2 amd64 arm x86 -=dev-db/m17n-contrib-1.1.10-r1 amd64 arm x86 -=dev-db/m17n-db-1.6.1-r2 amd64 arm x86 -=dev-db/sqlite-3.6.22-r2 amd64 arm x86 -=dev-libs/atk-1.32.0-r1 amd64 arm x86 -=dev-libs/check-0.9.8 amd64 arm x86 -=dev-libs/dbus-c++-0.0.1 amd64 arm x86 -=dev-libs/dbus-glib-0.92 amd64 arm x86 -=dev-libs/eggdbus-0.5 amd64 arm x86 -=dev-libs/engine_pkcs11-0.1.8 amd64 arm x86 -=dev-libs/glib-2.30.2-r1 amd64 arm x86 -=dev-libs/libchewing-0.3.2-r1 amd64 arm x86 -=dev-libs/libffi-3.0.9-r2 amd64 arm x86 -=dev-libs/libgpg-error-1.10-r1 amd64 arm x86 -=dev-libs/libp11-0.2.7 amd64 arm x86 -=dev-libs/m17n-lib-1.6.1-r1 amd64 arm x86 -=dev-libs/protobuf-2.2.0 amd64 arm x86 -=dev-libs/libusb-1.0.6 amd64 arm x86 -=dev-python/numpy-1.4.0 amd64 arm x86 -=dev-python/python-xlib-0.14 amd64 arm x86 -=dev-python/pyudev-0.12 amd64 arm x86 -=dev-python/pyusb-0.4.3 amd64 arm x86 -=dev-python/pyxdg-0.17-r1 amd64 arm x86 -=dev-python/pyyaml-3.09 amd64 arm x86 -=dev-util/gdbus-codegen-2.30.2 amd64 arm x86 -=dev-util/intltool-0.41.0 amd64 arm x86 -=dev-util/strace-4.5.20-r2 amd64 arm x86 -=dev-util/xxd-1.10 amd64 arm x86 -=gnome-base/orbit-2.14.17 amd64 arm x86 -=media-fonts/ja-ipafonts-003.02 amd64 arm x86 -=media-gfx/perceptualdiff-1.1.1 amd64 arm x86 -=media-libs/freeglut-2.4.0-r2 amd64 arm x86 -=media-libs/freeimage-3.13.1 amd64 arm x86 -=media-libs/jpeg-6b-r9 amd64 arm x86 -=media-sound/alsa-headers-1.0.24 amd64 arm x86 -=net-analyzer/netperf-2.4.4 amd64 arm x86 -=net-dialup/ppp-2.4.5-r3 amd64 arm x86 -=net-dialup/xl2tpd-1.3.0-r1 amd64 arm x86 -=net-libs/gnutls-2.9.5 amd64 arm x86 -=net-libs/libsoup-2.28.2 amd64 arm x86 -=net-libs/libtirpc-0.2.0 amd64 arm x86 -=net-misc/dhcp-4.2.2-r1 amd64 arm x86 -=net-misc/dhcpcd-5.1.1 amd64 arm x86 -=net-misc/iperf-2.0.4 amd64 arm x86 -=net-misc/modemmanager-0.2_p20090925 amd64 arm x86 -=net-misc/wget-1.12-r2 amd64 arm x86 -=sys-auth/pam_pwdfile-0.99-r1 amd64 arm x86 -=sys-apps/baselayout-2.0.1 amd64 arm x86 -=sys-apps/busybox-1.15.3 amd64 arm x86 -=sys-apps/dbus-1.2.20-r4 amd64 arm x86 -=sys-apps/fakeroot-1.12.4 amd64 arm x86 -=sys-apps/flashrom-0.9.1 amd64 x86 -=sys-apps/i2c-tools-3.0.2 amd64 arm x86 -=sys-apps/keyutils-1.1 amd64 arm x86 -=sys-apps/net-tools-1.60_p20090728014017-r1 amd64 arm x86 -=sys-apps/openrc-0.4.3-r4 amd64 arm x86 -=sys-apps/rescan-scsi-bus-1.29 amd64 arm x86 -=sys-apps/sg3_utils-1.27.20090411 amd64 arm x86 -=sys-apps/sysvinit-2.86-r12 amd64 arm x86 -=sys-apps/usbutils-0.86-r1 amd64 arm x86 -=sys-apps/util-linux-2.16.1 amd64 arm x86 -=sys-auth/consolekit-0.3.0-r3 amd64 arm x86 -=sys-auth/polkit-0.100 amd64 x86 arm -=sys-devel/clang-2.8-r3 amd64 arm x86 -=sys-devel/gdb-7.1 amd64 arm x86 -=sys-fs/ecryptfs-utils-91 amd64 arm x86 -=sys-fs/fuse-2.7.4-r2 amd64 arm x86 -=sys-fs/avfs-1.0.0 amd64 arm x86 -=sys-fs/lvm2-2.02.73-r1 amd64 arm x86 -=sys-fs/squashfs-4.2 amd64 arm x86 -=sys-fs/udev-171-r2 amd64 arm x86 -=sys-block/btrace-1.0.0 amd64 arm x86 -=x11-libs/libdrm-2.4.24 amd64 arm x86 -=sys-libs/libhx-3.1 amd64 arm x86 -=sys-libs/zlib-1.2.5-r2 amd64 arm x86 -=sys-power/powertop-1.98 amd64 arm x86 -=x11-apps/xinput_calibrator-0.7.5 arm -=x11-libs/gtk+-2.20.1 amd64 arm x86 -=x11-libs/pixman-0.17.2 amd64 arm x86 -=x11-misc/shared-mime-info-0.70 amd64 arm x86 -=x11-misc/slim-1.3.1-r5 amd64 arm x86 -=x11-misc/xkeyboard-config-1.7 amd64 arm x86 -=x11-proto/glproto-1.4.14-r1 amd64 arm x86 - -# Needed for curl >= 7.23.1 -=net-dns/c-ares-1.7.5 amd64 arm x86 - -# Needed for xorg server >=1.7.x -=x11-libs/libX11-1.3.3 amd64 arm x86 -=x11-libs/libxcb-1.5-r1 amd64 arm x86 -=x11-libs/libXext-1.1.1 amd64 arm x86 -=x11-libs/libXi-1.3 amd64 arm x86 -=x11-libs/libXinerama-1.1 amd64 arm x86 -=x11-libs/libXtst-1.1.0 amd64 arm x86 -=x11-libs/libXxf86vm-1.1.0 amd64 arm x86 -=x11-proto/dri2proto-2.3 amd64 arm x86 -=x11-proto/fixesproto-4.1.1 amd64 arm x86 -=x11-proto/inputproto-2.0 amd64 arm x86 -=x11-proto/recordproto-1.14 amd64 arm x86 -=x11-proto/xextproto-7.1.1 amd64 arm x86 -=x11-proto/xineramaproto-1.2 amd64 arm x86 -=x11-proto/xf86dgaproto-2.1 amd64 arm x86 -=x11-proto/xf86vidmodeproto-2.3 amd64 arm x86 - -# TODO: Remove when we have a proper chrome package. -=www-client/chromium-bin-4.0.222.4_p28661 amd64 arm x86 - -# If a newer version of chrome causes flaky failure, you can add -# something like below, which assumes 15.0.859.0_rc-r1 was the -# last non-flaky version. -# This pins Chrome to the version below by marking more recent versions as unstable. -#>chromeos-base/chromeos-chrome-22.0.1229.1_rc-r1 -amd64 -arm -x86 ~amd64 ~arm ~x86 - -=dev-embedded/openocd-0.4.0 amd64 x86 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask deleted file mode 100644 index 9e653c1810..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.mask +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# TODO: ARM is temporarily stuck on mesa-7.5.1-r1 but x86 uses a newer -# version so we mask out only mesa-7.5.2 here. This is a temporary measure -# until we can get per-board cascading profile support. -=media-libs/mesa-7.5.2 - -# TODO: Fix lsof to cross compile on ARM ->sys-process/lsof-4.81-r2 - -# libpng security vulnerability fix -net-dialup/ppp-2.4.5-r3 - -# Cross compile fix in the ebuild (Icedtea -> cups -> libgcrypt). ->dev-libs/libgcrypt-1.4.6 - -# Masked all upstream ebuilds, unupstreamable work in local copy ->=net-misc/dhcpcd-5.1.5 - -# Masked all upstream ebuilds ->=net-wireless/wpa_supplicant-0.7.3 - -# Masked old packages that had old ${PV} numbering scheme ->=app-i18n/ibus-mozc-29 - -# Custom patches ->=sys-boot/syslinux-3.84 - -# chromeos-chrome-14.0.787.0_rc-1 causes test failures, so block it. -# TODO(davidjames): Remove this once the bug is fixed. -=chromeos-base/chromeos-chrome-14.0.787.0_rc-r1 - -# This is unloved by mesa, and should never be pulled into the targets. -# It is actually for clang and ASAN that we want to have edge versions. -=sys-devel/llvm-3.2_pre* diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.provided b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.provided deleted file mode 100644 index 8ecce477c7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.provided +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# This file lists packages that ebuilds DEPEND on, sometimes implicitly, -# but really are only needed on the build host. This allows us to use -# --root-deps without "--rootdeps=rdeps" to install package DEPEND into -# the sysroot as part of the build process without also having to cross- -# compile and drag in the below packages as dependencies. See "man portage". - -# NOTE: Toolchain packages (gcc, glibc, binutils) are specified in the -# dynamically generated ${BOARD_DIR}/etc/portage/profile/package.provided -# created by the setup_board script. - -app-admin/eselect-1.2.9 -app-admin/eselect-esd-20060719 -app-admin/eselect-fontconfig-1.0 -app-admin/eselect-opengl-1.0.8-r1 -app-admin/eselect-mesa-0.0.8 -app-admin/eselect-vi-1.1.5 - -app-arch/cabextract-1.2-r1 -app-arch/rpm2targz-9.0.0.3g -app-arch/unzip-6.0-r1 - -# Needed for building Icedtea -app-arch/zip-3.0 - -# For board targets we get the root certificate list -# from chromeos-base/root-certificates. -app-misc/ca-certificates-20090709-r6 - -app-portage/portage-utils-0.1.29 - -app-text/build-docbook-catalog-1.4 -app-text/docbook-xsl-stylesheets-1.75.2 -app-text/texi2html-1.76 - -dev-lang/nasm-2.07 -dev-lang/perl-5.8.8-r5 - -# Needed for building Icedtea -dev-java/ant-core-1.7.1-r4 -dev-java/xalan-2.7.1 -dev-java/xerces-2.9.1 - -# Needed for the xsltproc command line tool -dev-libs/libxslt-1.1.24-r1 - -dev-perl/Crypt-PasswdMD5-1.3 -dev-perl/Digest-SHA1-2.11 -dev-perl/XML-Parser-2.36 - -dev-util/cmake-2.8.6 -dev-util/ctags-5.7 -dev-util/gperf-3.0.3 -dev-util/gtk-doc-1.13-r3 -dev-util/gtk-doc-am-1.13-r2 -dev-util/pkgconfig-0.23 - -dev-vcs/git-1.6.4.4 -dev-vcs/subversion-1.6.9 - -perl-core/digest-base-1.16 -perl-core/MIME-Base64-3.08 - -sys-apps/debianutils-3.1.3-r1 -sys-apps/help2man-1.36.4 - -# Needed for building Icedtea -sys-apps/lsb-release-1.4 - -sys-apps/texinfo-4.13 - -sys-devel/autoconf-2.63-r1 -sys-devel/automake-1.10.2 -sys-devel/bc-1.06.95 -sys-devel/bison-2.3 -sys-devel/gettext-0.18.1-r1 -sys-devel/gnuconfig-20090203 -sys-devel/m4-1.4.12 - -sys-kernel/gentoo-sources-2.6.30-r6 - -x11-apps/mkfontscale-1.0.6 -x11-misc/makedepend-1.0.1 - -# Legacy font map encodings which we don't care about. http://crosbug.com/25001 -media-fonts/encodings-1.0.3 - -# Our chromeos-base package takes care of this. -app-misc/editor-wrapper-4 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.unmask deleted file mode 100644 index 815efd4d1e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.unmask +++ /dev/null @@ -1,4 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - ->=net-misc/dhcp-4.2.2-r1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use deleted file mode 100644 index acb94c3ca2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use +++ /dev/null @@ -1,74 +0,0 @@ -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -app-admin/rsyslog -ssl -app-benchmarks/i7z -X -app-crypt/tpm-tools pkcs11 -app-i18n/zinnia -perl -app-editors/qemacs -X -app-editors/vim minimal -dev-cpp/glog gflags -dev-lang/python -berkdb gdbm -dev-libs/dbus-glib tools -dev-libs/elfutils -utils -dev-libs/glib -doc -dev-libs/nss -utils -dev-libs/opencryptoki tpmtok -dev-libs/opensc ssl -pcsc-lite -dev-libs/openssl pkcs11 -dev-libs/protobuf python -dev-python/pyudev pygobject -dev-util/dialog -unicode minimal -dev-util/perf -doc -demangle -tui -ncurses -perl -python -dev-util/perf-next -doc -demangle -tui -ncurses -perl -python -chromeos-base/chromeos-chrome build_tests -chromeos-base/vboot_reference minimal -media-gfx/imagemagick png -media-libs/freeimage png -media-libs/libdvdread -css -media-libs/libsndfile minimal -# disabled in profiles/default/linux/package.use -media-libs/mesa llvm gallium classic -media-libs/opencv gtk python png jpeg tiff v4l -media-sound/pulseaudio bluetooth dbus -esd -media-video/mplayer cpudetection fbcon -encode -ass -a52 -cdio -dirac -dts -dv -dvd -dvdnav -enca -faac -faad -live -quicktime -mp3 -rar -real -speex -schroedinger -theora -tremor -toolame -twolame -vorbis -xscreensaver -x264 -xv -xvid -net-analyzer/tcpdump -chroot -net-firewall/iptables ipv6 -net-libs/libsoup -ssl -# for curl-7.19.6 turning on ipv6 use flag will turn off ares -net-misc/curl ares -net-misc/dhcpcd crash -net-misc/dhcp ipv6 -server -net-misc/iperf threads -net-misc/iputils ipv6 -net-misc/ntp caps -net-misc/openssh -X -net-misc/openvpn pkcs11 -net-misc/strongswan cisco nat-transport -net-nds/openldap minimal -net-proxy/tsocks tordns -net-wireless/bluez alsa -consolekit -readline -net-wireless/bluez-test alsa -consolekit -readline test-programs -net-wireless/wpa_supplicant dbus debug -readline ssl -sci-geosciences/gpsd -python -ntp -X dbus garmin minimal ocean tntc usb -sockets -sys-apps/busybox -pam -selinux -sys-apps/dbus -X -sys-apps/iproute2 ipv6 -# mosys: crosbug.com/p/11630 -sys-apps/mosys static -sys-apps/smartmontools minimal -sys-auth/consolekit policykit -sys-auth/polkit -introspection -sys-block/parted device-mapper -sys-fs/lvm2 -lvm1 -readline -static -sys-fs/ntfs3g -crypt -external-fuse ntfsprogs suid -sys-fs/udev -devfs-compat -rule_generator hwdb acl gudev -sys-fs/squashfs lzo -sys-libs/gdbm -berkdb -sys-libs/ncurses minimal -sys-libs/pam -berkdb -sys-libs/zlib static-libs -x11-apps/xinit minimal -x11-base/xorg-server -suid -x11-libs/libdrm libkms -x11-libs/libdrm-tests libkms diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use.mask deleted file mode 100644 index 3023e13059..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/package.use.mask +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2010 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -# Brian Stell (27 August 2010) -# For Chromium OS enable FreeType sub-pixel anti-aliasing and bytecode -# interpreter -media-libs/freetype bindist - -# Jungshik Shin (14 Feb 2011) -# ACPI support is currently disabled in laptop-mode-tools. -# TODO(davidjames): Should it be enabled? -app-laptop/laptop-mode-tools acpi - -# Allow hardened glibc on the target. -sys-libs/glibc -hardened diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/profile.bashrc b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/profile.bashrc deleted file mode 100644 index 9726a6cd20..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/profile.bashrc +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Locate all the old style config scripts this package installs. Do it here -# here so we can search the temp $D which has only this pkg rather than the -# full ROOT which has everyone's files. -cros_pre_pkg_preinst_wrap_old_config_scripts() { - # Only wrap when installing into a board sysroot. - [[ $(cros_target) != "board_sysroot" ]] && return 0 - - local wrappers=$( - find "${D}"/usr/bin -name '*-config' -printf '%P ' 2>/dev/null - ) - - local wdir="${CROS_BUILD_BOARD_TREE}/bin" - mkdir -p "${wdir}" - - local c w - for w in ${wrappers} ; do - w="${wdir}/${CHOST}-${w}" - c="${CROS_ADDONS_TREE}/scripts/config_wrapper" - if [[ ! -e ${w} ]] ; then - ln -s "${c}" "${w}" - fi - done -} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/virtuals b/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/virtuals deleted file mode 100644 index 2d1c9ba662..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/chromeos/virtuals +++ /dev/null @@ -1,2 +0,0 @@ -# Add virtual packages for this profile -virtual/chromeos-bsp-dev chromeos-base/chromeos-bsp-dev-null