From 4587876cfa1db53aba829dc364c32d6bc60c1f35 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Sep 2013 19:32:19 -0400 Subject: [PATCH] chrun(profiles): Remove cruft from targets/coreos This removes settings that either do not apply to packages we install or duplicate settings that are provided elsewhere. No functional changes. --- .../profiles/targets/coreos/make.defaults | 2 - .../targets/coreos/package.accept_keywords | 129 ------------------ .../profiles/targets/coreos/package.mask | 21 --- .../profiles/targets/coreos/package.unmask | 6 - .../profiles/targets/coreos/package.use | 40 ------ .../profiles/targets/coreos/package.use.mask | 16 --- .../profiles/targets/coreos/virtuals | 2 - 7 files changed, 216 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.unmask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/virtuals diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults index 288a5915c4..1a79c47761 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults @@ -5,5 +5,3 @@ USE="cros-debug acpi usb pam" USE="${USE} -cros_host -expat -pic -pie -cairo -X" 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/coreos/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords index 04665bebc6..495f02bc7f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.accept_keywords @@ -1,130 +1 @@ -# 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.7.14.1 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.4 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.6.0 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/rescan-scsi-bus-1.29 amd64 arm x86 -=sys-apps/sg3_utils-1.27.20090411 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-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 - -=dev-embedded/openocd-0.4.0 amd64 x86 -=dev-libs/libxml2-2.9.0-r1 ~amd64 -=dev-libs/libxml2-2.9.0 ~amd64 -=dev-libs/libxml2-2.8.0-r4 ~amd64 -=dev-libs/libxml2-2.8.0-r3 ~amd64 -=sys-process/lsof-4.87 ~amd64 - -=dev-db/m17n-db-1.6.4 ~amd64 -=dev-libs/engine_pkcs11-0.1.8 ~amd64 -=app-i18n/libhangul-0.0.10 ~amd64 -=sys-fs/ecryptfs-utils-91 ~amd64 -=dev-libs/libchewing-0.3.2-r1 ~amd64 -=net-dialup/xl2tpd-1.3.0-r1 ~amd64 -=sys-apps/keyutils-1.1 ~amd64 -=net-dialup/ppp-2.4.5-r3 ~amd64 -=dev-python/pyxenstore-9999 ~amd64 ~x86 -=coreos-base/motd-http-9999 ~amd64 ~x86 =app-emulation/lxc-0.8.0-r1 ~amd64 ~x86 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.mask index 2acebbfc7f..70ab25c124 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.mask @@ -1,11 +1,6 @@ # 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 @@ -18,21 +13,5 @@ # version of these packages even if a newer stable version becomes # available in portage: -# Required patch; pending work to upstream. ->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 ->=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 - -# 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/coreos/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.unmask deleted file mode 100644 index 9da1ecc719..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.unmask +++ /dev/null @@ -1,6 +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 -=sys-process/lsof-4.87 - diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use index e4f55a738c..4bf3142941 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use @@ -2,75 +2,35 @@ # Distributed under the terms of the GNU General Public License v2 app-admin/rsyslog -ssl -app-benchmarks/i7z -X -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/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 -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 -systemd 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 -thin -sys-fs/ntfs3g -crypt -external-fuse ntfsprogs suid 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 sys-libs/gdbm berkdb dev-libs/libxml2 python -x11-libs/cairo X sys-boot/syslinux -custom-cflags # only needed on build hosts diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask index 1b9fce6201..7de6ed2169 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/package.use.mask @@ -1,21 +1,5 @@ # Copyright (c) 2010 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# 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/coreos/virtuals b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/virtuals deleted file mode 100644 index 2d1c9ba662..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/virtuals +++ /dev/null @@ -1,2 +0,0 @@ -# Add virtual packages for this profile -virtual/chromeos-bsp-dev chromeos-base/chromeos-bsp-dev-null