From 0303361b288366d1ab95a82097024f0694d76b11 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 16 Sep 2013 17:07:20 -0400 Subject: [PATCH 1/4] churn(profiles): Move default/linux to coreos/base Move all of the coreos stuff to coreos/base and a couple other places while switching to the upstream version of default/linux. This needs further cleanup but it sufficient for the transition. --- .../profiles/coreos/amd64/parent | 2 +- .../profiles/coreos/base/make.defaults | 7 ++ .../base}/package.accept_keywords | 42 ----------- .../profiles/coreos/base/package.keywords | 18 +++++ .../linux => coreos/base}/package.mask | 10 --- .../linux => coreos/base}/package.provided | 0 .../profiles/coreos/base/package.use | 72 +++++++++++++++++++ .../profiles/coreos/base/package.use.mask | 5 ++ .../profiles/coreos/base/packages | 2 + .../profiles/coreos/base/packages.build | 1 + .../profiles/coreos/base/parent | 1 + .../profiles/coreos/targets/sdk/make.defaults | 1 + .../profiles/coreos/targets/sdk/package.use | 2 + .../profiles/default/linux/make.defaults | 54 -------------- .../profiles/default/linux/package.keywords | 49 ------------- .../profiles/default/linux/package.use | 70 ------------------ .../profiles/default/linux/package.use.mask | 51 ------------- .../profiles/default/linux/packages | 16 ----- .../profiles/default/linux/packages.build | 42 ----------- .../profiles/default/linux/parent | 1 - .../profiles/default/linux/use.mask | 14 ---- .../profiles/features/systemd/packages | 1 + 22 files changed, 111 insertions(+), 350 deletions(-) rename sdk_container/src/third_party/coreos-overlay/profiles/{default/linux => coreos/base}/package.accept_keywords (59%) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.keywords rename sdk_container/src/third_party/coreos-overlay/profiles/{default/linux => coreos/base}/package.mask (68%) rename sdk_container/src/third_party/coreos-overlay/profiles/{default/linux => coreos/base}/package.provided (100%) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages.build create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.keywords delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/use.mask diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent index d3f67d305c..4df41ec34e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent @@ -1,5 +1,5 @@ :base -:default/linux +portage-stable:default/linux :arch/amd64 portage-stable:releases/10.0 :coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index 15cd73e777..ff59f24d0f 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -1,6 +1,9 @@ # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 +# Basic stuff we do/don't want +USE="-tcpd -pcre -berkdb" + # The following files are modified by make_chroot, and we do not want to # clobber them. All other config files should not be protected, so we # remove all existing protection (via the -*). @@ -11,3 +14,7 @@ CONFIG_PROTECT=" /etc/localtime /etc/make.conf " + +# Use parallel bzip2 for binary packages +PORTAGE_BZIP2_COMMAND="lbzip2" +PORTAGE_BUNZIP2_COMMAND="lbunzip2" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords similarity index 59% rename from sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords rename to sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 2999f70a2b..c831cf6a55 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -2,48 +2,6 @@ # Copyright (c) 2013 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -=app-emulation/qemu-kvm-0.15.1-r2 amd64 -=dev-cpp/gflags-1.2 amd64 x86 -=dev-libs/dbus-glib-0.92 amd64 x86 -=dev-libs/glib-2.30.2-r1 amd64 x86 -=dev-util/gdbus-codegen-2.30.2 amd64 x86 - -# Get a newer version of pylint -=dev-python/astng-0.21.1 amd64 -=dev-python/logilab-common-0.53.0 amd64 -=dev-python/pylint-0.23.0 amd64 -=dev-python/pyusb-0.4.3 amd64 - -=app-admin/eselect-opengl-1.2.4 amd64 arm x86 -=app-text/xmlto-0.0.24-r1 amd64 arm x86 -=dev-lang/nasm-2.09.10 amd64 x86 -=dev-util/lcov-1.7 amd64 x86 -=net-libs/libpcap-1.1.1-r1 amd64 arm x86 -=sys-apps/findutils-4.4.2-r1 amd64 arm x86 -=sys-apps/seabios-1.6.3 amd64 -=sys-boot/gnu-efi-3.0i amd64 -=sys-boot/os-prober-1.36 amd64 -=sys-devel/gettext-0.18.1.1-r3 amd64 arm x86 -=x11-libs/pixman-0.17.2 amd64 x86 -=x11-proto/glproto-1.4.14-r1 amd64 arm x86 - -# Needed for curl >= 7.2.1.4 -=net-dns/c-ares-1.7.4 amd64 x86 - -# Once we update past these versions, we should move the -# keywords to the ebuild itself and drop these. -=cross-arm-none-eabi/newlib-1.18.0 arm - -=sys-fs/squashfs-tools-4.2 amd64 x86 - -=dev-util/intltool-0.41.0 amd64 x86 - -# Needed for factory autotest. -=dev-python/pyudev-0.12 amd64 x86 - -# Required by dev-util/cmake-2.8.4-r1 -=app-arch/libarchive-2.8.1 amd64 x86 - # Requires custom patches before unmasking =dev-libs/nspr-4.9.2 -* ~arm ~x86 ~amd64 =dev-libs/nss-3.14 -* ~arm ~x86 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.keywords new file mode 100644 index 0000000000..833ca9f3b8 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.keywords @@ -0,0 +1,18 @@ +# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +#TODO: killme + +# Get a newer version of pylint +=dev-python/astng-0.21.1 amd64 +=dev-python/pylint-0.23.0 amd64 +=dev-python/pyusb-0.4.3 amd64 + +=app-text/xmlto-0.0.24-r1 amd64 arm x86 +=dev-lang/nasm-2.09.10 amd64 x86 +=net-libs/libpcap-1.1.1-r1 amd64 arm x86 + +# Requires custom patches before unmasking +=dev-libs/nspr-4.9.2 -* ~arm ~x86 ~amd64 +=dev-libs/nss-3.14 -* ~arm ~x86 ~amd64 +=app-crypt/nss-3.14 -* ~arm ~x86 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask similarity index 68% rename from sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask rename to sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask index 7718ea7fcd..1cb3b14ac7 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask @@ -10,13 +10,3 @@ # Use the 3.* series of syslinux, seems to work correctly with the # chromeos build system for now >=sys-boot/syslinux-3.90 - -# libpng security vulnerability fix -=sys-libs/libseccomp-1.0.1 static-libs +=app-text/ghostscript-gpl-9.05-r1 cups +=coreos-base/cros-devutils-0.0.1-r516 cros_host +=sys-libs/libcap-ng-0.6.6 static-libs +>=sys-libs/ncurses-5.9-r2 static-libs +>=media-libs/libjpeg-turbo-1.2.1 static-libs +>=dev-libs/openssl-1.0.1c static-libs +=x11-libs/cairo-1.10.2-r3 X +=media-libs/libpng-1.5.13-r1 static-libs +>=virtual/jpeg-0 static-libs +>=media-libs/libjpeg-turbo-1.2.0-r1 static-libs +sys-apps/gptfdisk -icu + +# for build hosts +dev-util/catalyst ccache +dev-lang/python sqlite + # for profile migration dev-lang/perl -gdbm dev-libs/apr-util -gdbm +sys-libs/gdbm berkdb diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask new file mode 100644 index 0000000000..57ed8872d4 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask @@ -0,0 +1,5 @@ +# We don't need integration with cvs, perl, or subversion in git, so we can +dev-vcs/git cvs perl subversion + +# not needed, requires cython +dev-lang/yasm python diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages new file mode 100644 index 0000000000..def41aa6c0 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages @@ -0,0 +1,2 @@ +-*sys-apps/busybox +*app-arch/lbzip2 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages.build new file mode 100644 index 0000000000..ce44347b43 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages.build @@ -0,0 +1 @@ +app-arch/lbzip2 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent new file mode 100644 index 0000000000..5ec03dee4d --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent @@ -0,0 +1 @@ +:features/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults new file mode 100644 index 0000000000..f457a03141 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults @@ -0,0 +1 @@ +USE="-pam python" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use new file mode 100644 index 0000000000..de69cc112e --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use @@ -0,0 +1,2 @@ +dev-vcs/git pcre +dev-lang/ruby berkdb diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults deleted file mode 100644 index 8d535ccfdd..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/make.defaults,v 1.3 2009/09/21 09:39:09 robbat2 Exp $ -# -# System-wide defaults for the Portage system -# See portage(5) manpage -# -# Please avoid enabling things by default in here if possible. Understand any -# implications with core packages. For example, if "java" is in USE and db -# has a conditional dependency on java (which it does,) then a JDK will be -# pulled in during *emerge system*! - -# Default starting set of USE flags for all default/linux profiles. -USE="crypt ipv6 ncurses nls python readline ssl zlib" - -# make sure toolchain has sane defaults -USE="${USE} fortran mudflap openmp" - -# 2006/03/07 - Donnie Berkholz -# Modular X: Support direct rendering by default -USE="${USE} dri" - -# 2006/04/21 - Donnie Berkholz -# Modular X: Build the Xorg X server by default -USE="${USE} xorg" - -# 2006/10/28 - Luca Barbato -# on glibc system you cannot turn it off -USE="${USE} iconv" - -# 2006/06/30 - Donnie Berkholz -# Sane defaults for input drivers -INPUT_DEVICES="keyboard mouse evdev" - -# 2006/08/18 - Donnie Berkholz -# Lowest common denominator defaults for video drivers, -# except hppa, which lacks v4l so removes it in the hppa profile -VIDEO_CARDS="dummy fbdev v4l" - -# 2008/07/09 - Doug Goldstein -# Adding LDFLAGS="-Wl,-O1 for all Linux profiles by default -# after discussion on the gentoo-dev ML. As we bang out a clear -# direction with how LDFLAGS will be set by default, this entry -# may move. -LDFLAGS="-Wl,-O1 -Wl,--as-needed" - -# 2009/09/21 Robin H. Johnson -# http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml -# Build kernel modules from linux-mod by default: -USE="${USE} modules" - -# Use parallel bzip2 for binary packages -PORTAGE_BZIP2_COMMAND="lbzip2" -PORTAGE_BUNZIP2_COMMAND="lbunzip2" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.keywords deleted file mode 100644 index ce24e2203f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.keywords +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (c) 2009 The Chromium OS Authors. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 - -=app-emulation/qemu-kvm-0.15.1-r2 amd64 -=dev-cpp/gflags-1.2 amd64 x86 -=dev-libs/dbus-glib-0.92 amd64 x86 -=dev-libs/glib-2.30.2-r1 amd64 x86 -=dev-util/gdbus-codegen-2.30.2 amd64 x86 - -# Get a newer version of pylint -=dev-python/astng-0.21.1 amd64 -=dev-python/logilab-common-0.53.0 amd64 -=dev-python/pylint-0.23.0 amd64 -=dev-python/pyusb-0.4.3 amd64 - -=app-admin/eselect-opengl-1.2.4 amd64 arm x86 -=app-text/xmlto-0.0.24-r1 amd64 arm x86 -=dev-lang/nasm-2.09.10 amd64 x86 -=dev-util/lcov-1.7 amd64 x86 -=net-libs/libpcap-1.1.1-r1 amd64 arm x86 -=sys-apps/findutils-4.4.2-r1 amd64 arm x86 -=sys-apps/seabios-1.6.3 amd64 -=sys-boot/gnu-efi-3.0i amd64 -=sys-boot/os-prober-1.36 amd64 -=sys-devel/gettext-0.18.1.1-r3 amd64 arm x86 -=x11-libs/pixman-0.17.2 amd64 x86 -=x11-proto/glproto-1.4.14-r1 amd64 arm x86 - -# Needed for curl >= 7.2.1.4 -=net-dns/c-ares-1.7.4 amd64 x86 - -# Once we update past these versions, we should move the -# keywords to the ebuild itself and drop these. -=cross-arm-none-eabi/newlib-1.18.0 arm - -=sys-fs/squashfs-tools-4.2 amd64 x86 - -=dev-util/intltool-0.41.0 amd64 x86 - -# Needed for factory autotest. -=dev-python/pyudev-0.12 amd64 x86 - -# Required by dev-util/cmake-2.8.4-r1 -=app-arch/libarchive-2.8.1 amd64 x86 - -# Requires custom patches before unmasking -=dev-libs/nspr-4.9.2 -* ~arm ~x86 ~amd64 -=dev-libs/nss-3.14 -* ~arm ~x86 ~amd64 -=app-crypt/nss-3.14 -* ~arm ~x86 ~amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use deleted file mode 100644 index f896ae9c45..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use +++ /dev/null @@ -1,70 +0,0 @@ -# The USE flags specified in this file are applied to packages -# for all linux targets. In ChromeOS, that means they are applied -# to the host packages in the chroot, as well as packages built for a -# target board. - -app-arch/tar minimal -app-crypt/mit-krb5 -keyutils -dev-embedded/libftdi -cxx -dev-libs/nss utils -dev-libs/dbus-glib tools -dev-libs/protobuf -python -dev-libs/libxml2 -python -dev-perl/GD png -dev-python/pyudev pygobject -dev-python/pygobject -cairo -dev-util/perf tui -doc -dev-vcs/git cvs subversion webdav curl bash-completion -dev-vcs/subversion -dso webdav-serf -media-libs/freeimage -cxx -media-libs/gd png -media-libs/libmtp -crypt -# We don't want any driver/hw rendering on the host -media-libs/mesa -llvm -gallium -classic -media-sound/alsa-utils -libsamplerate minimal -net-misc/curl ares static-libs -sci-geosciences/gpsd -cxx -# verity and other packages link statically with libuuid. -sys-apps/util-linux -perl static-libs -sys-boot/grub grub_platforms_pc grub_platforms_efi-64 grub_platforms_coreboot static -sys-devel/gettext -git -# Build emulation statically so that we can execute it within a chroot and -# still find the shared libraries. -net-misc/dhcpcd -crash -# Building qemu-kvm with static libraries and X/sdl does not work right now, -# with the likely problem in libsdl-1.2.13-r1 from upstream. Previously, -# this comment was here: -# build kvm with X and sdl so we have an option of running it with local -# display without VNC -app-emulation/qemu aio caps curl jpeg ncurses png python seccomp threads uuid vhost-net virtfs vnc xattr qemu_softmmu_targets_x86_64 -dev-libs/libaio static-libs -cross-armv7a-cros-linux-gnueabi/gcc hardfp -cross-armv6j-cros-linux-gnueabi/gcc hardfp -thumb -# we need aufs and bridging in the kernel for docker -sys-kernel/coreos-kernel aufs bridge -# pciutils is required by flashrom / mosys which is required to be statically -# compiled to reduce dependency during auto update. -sys-apps/pciutils static-libs -# xz-utils includes liblzma, which is picked by bmpblk_utility (vboot_reference) -# and may be executed outside chroot. -app-arch/xz-utils static-libs - -app-emulation/xen-tools -ocaml -hvm -xend -pygrub -qemu -flask -screen -doc amd64 - -=sys-libs/gdbm-1.8.3-r4 berkdb ->=sys-libs/libseccomp-1.0.1 static-libs -=app-text/ghostscript-gpl-9.05-r1 cups -=coreos-base/cros-devutils-0.0.1-r516 cros_host -=sys-libs/libcap-ng-0.6.6 static-libs ->=sys-libs/ncurses-5.9-r2 static-libs ->=media-libs/libjpeg-turbo-1.2.1 static-libs ->=dev-libs/openssl-1.0.1c static-libs -=x11-libs/cairo-1.10.2-r3 X -=media-libs/libpng-1.5.13-r1 static-libs ->=virtual/jpeg-0 static-libs ->=media-libs/libjpeg-turbo-1.2.0-r1 static-libs -sys-apps/gptfdisk -icu - -# for build hosts -dev-util/catalyst ccache -dev-lang/python sqlite diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use.mask deleted file mode 100644 index 4e4f19861f..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use.mask +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/package.use.mask,v 1.16 2009/08/20 18:55:43 flameeyes Exp $ - -sys-devel/gcc hardened -sys-libs/glibc hardened - -# Diego E. Pettenò (20 Aug 2009) -# -# Mask oss USE flag for PulseAudio; it's present for compatibility -# with FreeBSD and other operating systems that have no better -# interfaces, but people would probably abuse it with Linux as well. -# -# Older versions also had an OSS compatibility wrapper on that USE so -# they are excluded. ->=media-sound/pulseaudio-0.9.16_rc5 oss - -# If building dpkg with nls it pulls in a bunch of packages, including po4a -# which will hang if output is redirected. This was stalling our buildbots. -app-arch/dpkg nls - -# We don't need integration with cvs, perl, or subversion in git, so we can -# disable these for faster builds. -dev-vcs/git cvs perl subversion - -# We use asynchronous dns resolution instead of threaded dns resolution. -net-misc/curl threads - -# The qemu-kvm package is compiled statically now, and version 0.15.1 -# cannot handle USE=bluetooth and static compilation. We don't actually -# use bluetooth functionality for this package. -app-emulation/qemu-kvm bluetooth - -# Han Shen (16 Mar 2012) -# -# Disable hardened glibc for arm - current glibc for arm port has a bug in -# setjmp.S and __longjmp.S, this needs to be fixed before arm glibc could be -# hardened. -cross-armv7a-cros-linux-gnueabi/glibc hardened - -# Han Shen (21 Mar 2012) -# -# Disable hardened for arm-none-eabi toolchain. -cross-arm-none-eabi/gcc hardened -cross-arm-none-eabi/newlib hardened - -# yasm-python is blocked until we upgrade to python 2.7. -dev-lang/yasm python - -# We don't care about pam support in developer-only tool. -app-misc/screen pam diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages deleted file mode 100644 index 2ce8e2eb94..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages +++ /dev/null @@ -1,16 +0,0 @@ -# Copyright 2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/packages,v 1.1 2008/04/01 17:40:05 wolf31o2 Exp $ - -# This file extends the base packages file for the default profile that all -# architectures will enjoy. Please note that default is what most architectures -# will have. Some will have an selinux profile (see ${PORTDIR}/profiles/selinux). -# The idea is to only create a new family of profiles when absolutely necessary. - -# We don't need busybox in our chroot sdk as it is used in upstream Gentoo -# only as a static rescue shell, and that doesn't make sense for us -#*sys-apps/busybox -*sys-apps/man-pages -*sys-apps/util-linux -*sys-apps/efunctions -*app-arch/lbzip2 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build deleted file mode 100644 index e8d3c0feb2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright 2008 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/packages.build,v 1.2 2008/04/06 15:40:55 wolf31o2 Exp $ - -# This file describes the packages needed to build a stage1 based on this -# profile. Packages in this file are built in order. - -app-arch/bzip2 -app-arch/gzip -app-arch/lbzip2 -app-arch/tar -app-shells/bash -net-misc/rsync -net-misc/wget -sys-devel/autoconf -sys-devel/automake -sys-devel/libtool -sys-apps/baselayout -sys-apps/coreutils -sys-apps/diffutils -sys-apps/efunctions -sys-apps/file -sys-apps/findutils -sys-apps/gawk -sys-apps/grep -sys-apps/less -sys-apps/net-tools -sys-apps/portage -sys-apps/sed -sys-apps/shadow -sys-apps/texinfo -sys-devel/binutils -sys-devel/bison -sys-devel/flex -sys-devel/gcc -sys-devel/gettext -sys-devel/gnuconfig -sys-devel/make -sys-devel/patch -virtual/editor -virtual/libc -virtual/os-headers diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent deleted file mode 100644 index a243617a91..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent +++ /dev/null @@ -1 +0,0 @@ -../../features/systemd diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/use.mask deleted file mode 100644 index 7811db9ab7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/use.mask +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright 2004-2008 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/default/linux/use.mask,v 1.1 2008/04/01 17:40:05 wolf31o2 Exp $ - -# This file masks out USE flags that are simply NOT allowed in the default -# profile for any architecture. This works, for example, if a non-default -# profile (such as the selinux profiles) have a USE flag associated with -# them. - -# amd64 only: -emul-linux-x86 - -# ppc and x86/amd64 -x264 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages index b0731093a1..45dfc17937 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages @@ -1,2 +1,3 @@ # Add systemd to the 'system' set +*sys-apps/efunctions *sys-apps/systemd From 5959c42ec4c0195f51df00d9da90c73afc9ea840 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 16 Sep 2013 17:38:59 -0400 Subject: [PATCH 2/4] churn(profiles): Move arch/amd64 The only CoreOS specific things in this profile appear to have been a few use flags for the SDK. Switch to the upstream amd64 profile after moving these flags around in the appropriate target profiles. The one function change here is that the delta_generator use flag is now properly disabled outside of the SDK as it was in chromeos. --- .../profiles/arch/amd64/make.defaults | 41 ---- .../arch/amd64/no-multilib/make.defaults | 5 - .../arch/amd64/no-multilib/package.mask | 205 ------------------ .../arch/amd64/no-multilib/package.use.mask | 16 -- .../profiles/arch/amd64/no-multilib/parent | 1 - .../profiles/arch/amd64/no-multilib/use.mask | 21 -- .../profiles/arch/amd64/package.use | 23 -- .../profiles/arch/amd64/package.use.force | 11 - .../profiles/arch/amd64/package.use.mask | 154 ------------- .../coreos-overlay/profiles/arch/amd64/parent | 2 - .../profiles/arch/amd64/profile.bashrc | 38 ---- .../profiles/arch/amd64/use.force | 2 - .../profiles/arch/amd64/use.mask | 138 ------------ .../profiles/arch/amd64/x32/make.defaults | 11 - .../profiles/arch/amd64/x32/package.keywords | 9 - .../profiles/arch/amd64/x32/package.mask | 11 - .../profiles/arch/amd64/x32/package.unmask | 5 - .../profiles/arch/amd64/x32/package.use.mask | 10 - .../profiles/arch/amd64/x32/packages | 12 - .../profiles/arch/amd64/x32/parent | 3 - .../profiles/coreos/amd64/generic/package.use | 14 -- .../profiles/coreos/amd64/generic/parent | 2 +- .../profiles/coreos/amd64/parent | 2 +- .../profiles/coreos/base/package.use | 3 + .../coreos/targets/generic/package.use | 2 + .../profiles/coreos/targets/sdk/package.use | 10 + 26 files changed, 17 insertions(+), 734 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/package.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use.force delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/profile.bashrc delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/use.force delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.keywords delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.unmask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/packages delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/make.defaults deleted file mode 100644 index cf3278d16d..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/make.defaults +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/make.defaults,v 1.4 2009/08/16 22:06:33 remi Exp $ - -ARCH="amd64" -ACCEPT_KEYWORDS="${ARCH}" - -CHOST="x86_64-pc-linux-gnu" -CFLAGS="-O2 -pipe" -CXXFLAGS="${CFLAGS}" - -# 2006/06/07 - Danny van Dyk -# Multilib settings for all amd64 subprofiles. -MULTILIB_ABIS="amd64 x86" -DEFAULT_ABI="amd64" -# Do not remove this one, or all kinds of hell breaks loose. -ABI="amd64" - -# 64bit specific settings. -CHOST_amd64="x86_64-pc-linux-gnu" -CDEFINE_amd64="__x86_64__" - -# 32bit specific settings. -CFLAGS_x86="-m32" -LDFLAGS_x86="-m elf_i386" -ASFLAGS_x86="--32" -CHOST_x86="i686-pc-linux-gnu" -CDEFINE_x86="__i386__" - -# 2006/10/24 - Simon Stelling -# They are masked, but we can enable them anyway for those who have -# >=portage-2.1.2_pre3-r4 -USE="${USE} mmx sse sse2" - -# 2006/08/18 - Donnie Berkholz -# Defaults for video drivers -VIDEO_CARDS="fbdev glint intel mach64 mga neomagic nv r128 radeon savage sis tdfx trident vesa vga via vmware voodoo" - -# 2006/12/22 - Danny van Dyk -# Default for ALSA_CARDS USE_EXPAND variable. -ALSA_CARDS="ali5451 als4000 atiixp atiixp-modem bt87x ca0106 cmipci emu10k1x ens1370 ens1371 es1938 es1968 fm801 hda-intel intel8x0 intel8x0m maestro3 trident usb-audio via82xx via82xx-modem ymfpci" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/make.defaults deleted file mode 100644 index 5f5b0f7c16..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/make.defaults +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2008 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/make.defaults,v 1.1 2008/04/01 17:39:54 wolf31o2 Exp $ - -MULTILIB_ABIS="amd64" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/package.mask deleted file mode 100644 index dfde92e4b8..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/package.mask +++ /dev/null @@ -1,205 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/package.mask,v 1.51 2009/09/16 20:18:08 ulm Exp $ - -# AMD64 Team -# Mask packages that rely on amd64 multilib -app-accessibility/mbrola -app-accessibility/perlbox-voice -app-antivirus/bitdefender-console -app-antivirus/f-prot -=app-i18n/atokx3-3.0.0 -app-i18n/kurso-de-esperanto -app-office/mozilla-sunbird-bin -app-office/ooextras -app-office/openoffice-bin -app-pda/qtopia-desktop-bin -app-emulation/cedega -app-emulation/emul-linux-x86-baselibs -app-emulation/emul-linux-x86-compat -app-emulation/emul-linux-x86-gtklibs -app-emulation/emul-linux-x86-medialibs -app-emulation/emul-linux-x86-qtlibs -app-emulation/emul-linux-x86-sdl -app-emulation/emul-linux-x86-soundlibs -app-emulation/emul-linux-x86-xlibs -app-emulation/emul-linux-x86-java -app-emulation/ies4linux -app-emulation/transgaming-fontinstaller -app-emulation/transgaming-mozctlinstaller -app-emulation/wine -app-emulation/wine-doors -app-text/acroread -app-text/bibus -dev-embedded/libftd2xx -dev-lang/dmd-bin -dev-lang/icc -dev-lang/idb -dev-lang/ifc -dev-lang/realbasic -dev-lang/sunstudioexpress -dev-perl/Archive-Rar -dev-python/skype4py -dev-util/android-sdk -dev-util/biew -dev-util/dialogblocks -dev-util/helpblocks -dev-util/nvidia-cuda-profiler -games-action/descent3 -games-action/descent3-demo -games-action/heretic2 -games-action/heretic2-demo -games-action/lugaru-demo -games-action/mutantstorm-demo -games-action/phobiaii -games-action/rune -games-action/spacetripper-demo -games-arcade/barbarian-bin -games-arcade/jardinains -games-arcade/gish-demo -games-emulation/caps -games-emulation/goosnes -games-emulation/nestra -games-emulation/snes9express -games-emulation/snes9x -games-emulation/zinc -games-emulation/zsnes -games-emulation/mupen64 -games-fps/avp -games-fps/doom3-cdoom -games-fps/doom3-chextrek -games-fps/doom3-data -games-fps/doom3-demo -games-fps/doom3-ducttape -games-fps/doom3-dungeon -games-fps/doom3-eventhorizon -games-fps/doom3-hellcampaign -games-fps/doom3-inhell -games-fps/doom3-lms -games-fps/doom3-mitm -games-fps/doom3-opencoop -games-fps/doom3-phantasm -games-fps/doom3-roe -games-fps/doom3 -games-fps/enemy-territory-etpro -games-fps/enemy-territory-fortress -games-fps/enemy-territory-truecombat -games-fps/enemy-territory -games-fps/etqw-bin -games-fps/etqw-data -games-fps/etqw-demo -games-fps/fuhquake-bin -games-fps/glxquake-bin -games-fps/legends -games-fps/postal2 -games-fps/postal2mp-demo -games-fps/quake3-alliance -games-fps/quake3-alternatefire -games-fps/quake3-bfp -games-fps/quake3-bin -games-fps/quake3-brainworks -games-fps/quake3-cpma -games-fps/quake3-defrag -games-fps/quake3-demo -games-fps/quake3-matrix -games-fps/quake3-nsco -games-fps/quake3-osp -games-fps/quake3-ra3 -games-fps/quake3-ruinhunters -games-fps/quake3-teamarena -games-fps/quake3-threewave -games-fps/quake3-urbanterror -games-fps/quake4-bin -games-fps/quake4-data -games-fps/quake4-deltactf -games-fps/quake4-demo -games-fps/rtcw -games-fps/rtcwmp-demo -games-fps/rtcwsp-demo -games-fps/sauerbraten -games-fps/soldieroffortune -games-fps/soldieroffortune-demo -games-fps/unreal-tournament -games-fps/ut2003 -games-fps/ut2003-demo -games-fps/ut2004-demo -games-puzzle/hoh-bin -games-roguelike/adom -games-rpg/nwmouse -games-rpg/nwmovies -games-rpg/nwn -games-rpg/nwn-cep -games-rpg/nwn-data -games-rpg/rain-slick -games-rpg/sacred-gold -games-server/etqw-ded -games-server/greenhouse -games-server/nwn-ded -games-server/ut2003-ded -games-simulation/bcs-demo -games-simulation/secondlife-bin -games-simulation/simutrans -games-strategy/coldwar -games-strategy/coldwar-demo -games-strategy/darwinia -games-strategy/darwinia-demo -games-strategy/defcon-demo -games-strategy/dominions2 -games-strategy/heroes3 -games-strategy/heroes3-demo -games-strategy/majesty-demo -games-strategy/savage-bin -games-strategy/smac -games-strategy/x2 -games-strategy/x2-demo -mail-client/mozilla-thunderbird-bin -mail-filter/MailScanner -media-fonts/acroread-asianfonts -media-gfx/grender -media-gfx/maya -media-gfx/picasa -media-libs/realcodecs -media-libs/win32codecs -media-sound/shoutcast-server-bin -media-sound/shoutcast-trans-bin -media-sound/teamspeak2-client-bin -media-sound/teamspeak2-server-bin -media-sound/ventrilo-server-bin -media-tv/livestation -media-video/binkplayer -net-dialup/slmodem -net-im/skype -net-im/skysentials -net-libs/xulrunner-bin -net-misc/icaclient -net-p2p/sancho-bin -net-voip/wengophone-bin -sci-biology/foldingathome -sci-electronics/eagle -sys-apps/memtest86 -sys-apps/memtest86+ -sys-block/hpacucli -sys-libs/lib-compat-loki - -# ifc masked -sci-libs/acml ifc - -# 10 Jul, 2008 Thomas Anderson -# Remask ia32 since parent unmasks it, and no-multilib -# can't use this flag. -www-client/opera ia32 - -# Robert Buchholz (16 Aug 2008) -# SNES applications are masked in multilib -media-tv/freevo snes diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/parent b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/parent deleted file mode 100644 index f3229c5b98..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/parent +++ /dev/null @@ -1 +0,0 @@ -.. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/use.mask deleted file mode 100644 index 59a15334c6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/no-multilib/use.mask +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/no-multilib/use.mask,v 1.6 2009/09/15 18:21:56 ssuominen Exp $ - -# USE flags masked because providing packages have ABI=x86 - -# 2007/08/29 Christoph Mende -# app-accessibility/mbrola is x86 only -mbrola - -# 2006/05/04 Chris Gianelloni -# games-fps/quake3-teamarena is 32-bit -teamarena - -# 2007/08/24 Michael Marineau -# Xen HVM support requires building 32-bit binaries. -hvm - -# 2009/05/11 Doug Goldstein -# Mask 32bit since this will always require emulation packages -32bit diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use deleted file mode 100644 index 345b0da719..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use +++ /dev/null @@ -1,23 +0,0 @@ -# Note: Additions to this file affect not only the cros sdk -# chroot, but also any amd64 boards. So if you enable flags -# in here for the chroot, you needed to disable them in the -# cros profile: default/linux/amd64/10.0/chromeos/package.use - -# Since we execute pbzip2 outside of the chroot, we need to statically -# link this to avoid library mismatch errors. http://crosbug.com/32519 -app-arch/bzip2 static-libs -app-arch/pbzip2 static -# Same for pigz. -app-arch/pigz static -sys-libs/zlib static-libs - -coreos-base/update_engine delta_generator -dev-embedded/openocd ftdi -net-misc/openssh kerberos -sys-apps/flashrom dediprog ft2232_spi serprog -dev-lang/python gdbm - -# qemu-kvm is statically linked with glib when compiled for the host -# and thus requires glib to be compiled with static-libs. -# See http://crosbug.com/35162 for details. -dev-libs/glib static-libs diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use.force deleted file mode 100644 index 456ca66268..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use.force +++ /dev/null @@ -1,11 +0,0 @@ -# Oct 23th 2006; blubb@gentoo.org -# upstream forces sse2 on regardless of what the use flag is -dev-libs/openssl sse2 -media-libs/libsoundtouch sse - -# Gustavo Felisberto 19-06-2007 -net-im/skype qt-static - -# Santiago M. Mola (17 Sep 2008) -# x86emu is the only backend available for amd64 (bug #224987) -sys-apps/v86d x86emu diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use.mask deleted file mode 100644 index 7b59ba4460..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/package.use.mask +++ /dev/null @@ -1,154 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/package.use.mask,v 1.45 2009/10/01 15:26:34 ssuominen Exp $ - -# When you add an entry to the top of this file, add your name, the date, and -# an explanation of why something is getting masked. Please be extremely -# careful not to commit atoms that are not valid, as it can cause large-scale -# breakage, especially if it ends up in the daily snapshot. -# -## Example: -## -## # Dev E. Loper (28 Jun 2012) -## # Masking foo USE flag until we can get the -## # foo stuff to work properly again (bug 12345) -## =media-video/mplayer-0.90_pre5 foo -## =media-video/mplayer-0.90_pre5-r1 foo -# - -#--- END OF EXAMPLES --- - -# Samuli Suominen (01 Oct 2009) -# No support in emul-linux-x86-sdl, bug 286625 -app-emulation/wine openal - -# Samuli Suominen (30 Sep 2009) -# No support in emul-linux-x86-baselibs, bug 283089 -app-emulation/wine jpeg - -# Jean-Noël Rivasseau (23 Sep 2009) -# X use flag only for amd64/x86, bug 285951. -media-gfx/iscan -X - -# Jeremy Olexa (06 Sep 2009) -# Mask wine[mp3] because it fails to build. bug 283860 -# Mask wine[gsm] because it fails to build. bug 283875 -app-emulation/wine gsm mp3 - -# Dawid Węgliński -# Mask amarok2 useflag for net-im/kadu -# See bug #238487 for references -net-im/kadu amarok2 - -# Samuli Suominen (10 May 2009) -# Broken SSE2 detection for x86_64 wrt #262405 -media-libs/libsoundtouch sse2 - -# Bernard Cafarelli (20 Mar 2009) -# Depends on packages not yet keyworded for amd64, cf bug #22042 -app-backup/backup-manager s3 - -# Jeremy Olexa (07 Feb 2009) -# USE=mmx on imlib2 causes issues with other apps. See bug 218382 (comments -# 11-12) -media-libs/imlib2 mmx - -# Serkan Kaba (5 Feb 2009) -# finally a 64bit java plugin ->=dev-java/sun-jre-bin-1.6.0.12 -nsplugin - -# Jeremy Olexa (27 Dec 2008) -# Mask static USE flag because it just doesn't work on amd64. See bug 236591 ->=app-arch/p7zip-4.58 static - -# Jeremy Olexa (24 Dec 2008) -# unmask USE=bindist on amd64 - also unmasking the other flags that were under a -# bad comment heading. see bug #246144 -media-video/mplayer -cpudetection -custom-cpuopts -bindist -vdpau - -# Vlastimil Babka (12 Dec 2008) -# finally a 64bit java plugin ->=dev-java/sun-jdk-1.6.0.12_beta2 -nsplugin - -# Tomas Chvatal (31 Jan 2009) -# masked in base, unmaks for x86/amd64 -sci-misc/boinc -cuda - -# Serkan Kaba (20 Jul 2008) -app-text/enchant -zemberek - -# assembler-section - -# Oct 23th 2006; blubb@gentoo.org -# the asm is 64bit save, but it doesn't compile anyway -games-emulation/visualboyadvance mmx - -# Oct 23th 2006; blubb@gentoo.org -# upstream forces sse2 for amd64; mmx flag does nothing -app-crypt/johntheripper mmx - -# Oct 23th 2006; blubb@gentoo.org -# x86 asm only: -games-emulation/xmame mmx -games-emulation/xmess mmx -media-gfx/inkscape mmx -media-libs/allegro mmx sse -media-libs/libfame mmx -media-libs/libmovtar mmx -media-libs/sdl-gfx mmx -media-libs/smpeg mmx -media-video/mjpegtools mmx -net-irc/xchat mmx -net-irc/xchat-gnome mmx -net-misc/asterisk mmx -x11-terms/eterm mmx -media-tv/xawtv mmx - -# x86_64 opts are enabled with USE sse. so masking the rest -media-sound/mpg123 mmx 3dnow 3dnowext - -# Oct 24th 2006; blubb@gentoo.org -# bug 152646 -x11-themes/polymer mmx sse2 - -# Feb 17th 2007; drizzt@gentoo.org -# amd64 does not have an emul libao package -games-emulation/zsnes ao - -# Apr 25th 2007: Alexis Ballier -# Mask mmx for media-libs/mlt -# assembler is not 64bits compliant (yet) -media-libs/mlt mmx - -# 8 May 2007: Alistair Bush -# Mask doc flag for fop as nearly impossible to -# run javadoc target. see #177585 ->=dev-java/fop-0.93 doc - -# 31 Dec 2007: Peter Weller -# Mask dbus, hal, nas and scanner USE flags; -# Bug 203680 -# 28 Oct 2008: Diego Pettenò -# Mask GnuTLS (not available as 32-bit library) -app-emulation/wine dbus hal ldap nas scanner gnutls gphoto2 - -# missing the necessary linux-headers dep ->=net-fs/netatalk-2.0.3-r3 xfs - -# 28 Jan 2008: Wulf Krueger -# Mask bluetooth for the KDE 3.5.8 stabilisation. -app-pda/pilot-link bluetooth - -# 10 Jul 2008: Thomas Anderson -# Unmask ia32 flag for amd64 arches. -www-client/opera -ia32 - -# 8 Aug 2008: Alexis Ballier -# x86 asm only, it won't be built on amd64 if mmx useflag is enabled but that -# saves people from needlessly installing nasm -# Refs bug #93279 -media-sound/lame mmx - -# Robert Buchholz (16 Aug 2008) -# masked in base, unmask for x86/amd64 -dev-python/kaa-base -tls diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/parent deleted file mode 100644 index 6132d1714c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/parent +++ /dev/null @@ -1,2 +0,0 @@ -portage-stable:arch/base -portage-stable:features/multilib/lib32 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/profile.bashrc b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/profile.bashrc deleted file mode 100644 index 270ca72e26..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/profile.bashrc +++ /dev/null @@ -1,38 +0,0 @@ -get_sysroot_ld_paths() { - # Default library directories - local paths="$SYSROOT/usr/lib64:$SYSROOT/lib64:$SYSROOT/usr/lib:$SYSROOT/lib" - - # Only split on newlines - local IFS=" -" - - local line - for line in $(cat "$SYSROOT"/etc/ld.so.conf - "$SYSROOT"/etc/ld.so.conf.d/* 2>/dev/null); do - # Ignore lines not starting with '/', e.g. empty lines or comments - if [[ "${line:0:1}" != "/" ]]; then - continue - fi - - # Prepend $SYSROOT (/build/) to all library paths - # except for those already prefixed with $SYSROOT - if [[ "${line:0:${#SYSROOT}}" == "$SYSROOT" ]]; then - paths="$paths:$line" - else - paths="$paths:$SYSROOT$line" - fi - done - echo "$paths" -} - -cros_pre_src_test_ldpaths() { - # Set LD_LIBRARY_PATH to point to libraries in $SYSROOT, so that tests - # will load libraries from there first - if [[ -n "$SYSROOT" ]] && [[ "$SYSROOT" != "/" ]]; then - if [[ -n "$LD_LIBRARY_PATH" ]]; then - export LD_LIBRARY_PATH="$(get_sysroot_ld_paths):$LD_LIBRARY_PATH" - else - export LD_LIBRARY_PATH="$(get_sysroot_ld_paths)" - fi - fi -} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/use.force deleted file mode 100644 index b54bac8604..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/use.force +++ /dev/null @@ -1,2 +0,0 @@ -# Force the flag which corresponds to ARCH. -amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/use.mask deleted file mode 100644 index 0f1e9c8797..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/use.mask +++ /dev/null @@ -1,138 +0,0 @@ -# Copyright 2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/use.mask,v 1.8 2009/07/31 21:46:35 ssuominen Exp $ - -# Unmask the flag which corresponds to ARCH. --amd64 - -# SECTION: Unmask - -# Lilo works on amd64, so ... --lilo - -# 2007/10/09 - Steve Dibb -# Unmask support for SSSE3 (pni) for media-video/mplayer --ssse3 - -# 2007/08/19 - Christoph Mende -# Unmask support for dev-db/oracle-instantclient-basic --oci8-instant-client - -# 2007/03/10 - Mike Frysinger -# NVRAM works on x86/amd64 hosts --nvram - -# 2006/06/07 - Danny van Dyk -# Profile cleanup: Unmask emul-linux-x86 --emul-linux-x86 - -# 2005/09/14 - Diego Pettenò -# nVidia XvMC support works on amd64 --nvidia - -# 2005/12/01 - Daniel Gryniewicz -# There is now a kqemu that works and is stable on amd64 --kqemu - -# 2006/03/03 - Luca Barbato -# codec support x264 --x264 - -# 2006/01/28 - Donnie Berkholz -# Modular X: unmask for architectures on which they are available --input_devices_synaptics --input_devices_virtualbox --input_devices_vmmouse --input_devices_wacom --video_cards_nvidia --video_cards_fglrx --video_cards_via --video_cards_virtualbox --video_cards_vmware - -# Diego Pettenò (4 Jan 2007) -# Unmask the flags for PHP that are available only on x86/amd64 --oci8 --oracle7 --db2 - -# Feb 16th 2007; Simon Stelling -# Since this profile forces >=portage-2.1.2, we can unmask all -# SIMD assembler flags --mmx --mmxext --sse --sse2 --3dnow --3dnowext - -# George Shapovalov (8 Apr 2007) -# supported on amd64 --ada - -# Robert Buchholz (03 Jun 2007) -# Unmask as it works on amd64 --lcd_devices_luise - -# SECTION: Unavailable/Broken - -# 2007/04/07 - Petteri Räty -# libemf does not build on amd64 -emf - -# 2007/01/18 - Jeffrey Gardner -# Mask gamess support temporarily. -gamess - -# 2006/12/21 - Diego Pettenò -# Mask some ALSA cards that are known broken in AMD64 -alsa_cards_cs5535audio - -# 2006/09/05 - Tupone Alfredo -# doomsday ebuild is not available on this architecture -doomsday - -# 2006/06/07 - Danny van Dyk -# Profile cleanup: No info about these -asm -drac -vidix - -# 2006/06/07 - Danny van Dyk -# Masked due to bug #127328; prohibits DEPENDs on -# this flag makes media-gfx/inkscape dep on media-gfx/pstoedit -# which deps on libemf -plugin - -# 2006/02/05 - Donnie Berkholz -# Modular X: mask for architectures on which they aren't available -video_cards_i740 -video_cards_imstt -video_cards_newport -video_cards_nsc - -# 2005/09/19 - Olivier Fisette -# cmucl is not available on amd64. Masking to keep "sci-mathematics/maxima" -# happy. -cmucl - -# 2004/10/06 - Jeremy Huddleston -# sys-cluster/pvm won't build -pvm - -# 2004/06/22 - Taken from 2004.0 profile -# masked -3dfx - -# 2007/02/02 - Simon Stelling -# we don't have no gcc64; bug 144535 -gcc64 - -# 2007/02/04 - Simon Stelling -# games-emulation/caps is 32bit only, while app-emulation/e-uae is 64bit; bug 158416 -capslib - -# RealMagic Hollywood+/Creative DXR3 support --dxr3 - -# NOT NECESSARY - SECTION diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/make.defaults deleted file mode 100644 index 7951c757f6..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/make.defaults +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/make.defaults,v 1.2 2012/05/25 17:31:48 vapier Exp $ - -DEFAULT_ABI="x32" -ABI="x32" -MULTILIB_ABIS="amd64 x86 x32" - -FEATURES="collision-protect multilib-strict" - -SYMLINK_LIB="no" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.keywords b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.keywords deleted file mode 100644 index 04ad75ac5b..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.keywords +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/package.keywords,v 1.9 2012/08/29 21:56:14 vapier Exp $ - -# We need newer versions of toolchain packages. -~sys-apps/sandbox-2.6 amd64 -~sys-devel/gcc-4.7.1 amd64 -~sys-devel/gdb-7.5.1 amd64 -~sys-libs/glibc-2.16.0 amd64 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.mask deleted file mode 100644 index b68999fae2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.mask +++ /dev/null @@ -1,11 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/package.mask,v 1.1 2012/10/07 17:58:28 phajdan.jr Exp $ - -# Pawel Hajdan jr (07 Oct 2012) -# V8 upstream said they won't support x32, bug #423815 -# Masked V8 and reverse dependencies. -dev-lang/v8 -dev-lang/v8cgi -net-libs/nodejs -www-client/chromium diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.unmask deleted file mode 100644 index c613573b9a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.unmask +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/package.unmask,v 1.2 2012/08/29 21:55:02 vapier Exp $ - -~sys-devel/gcc-4.7.1 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.use.mask deleted file mode 100644 index d6b253b0a7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/package.use.mask +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/package.use.mask,v 1.1 2012/10/07 17:58:28 phajdan.jr Exp $ - -# This file requires >=portage-2.1.1 - -# Pawel Hajdan jr (07 Oct 2012) -# V8 upstream said they won't support x32, bug #423815 -# Masked V8 and reverse dependencies. -dev-db/mongodb v8 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/packages b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/packages deleted file mode 100644 index c3a8c143e3..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/packages +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/arch/amd64/x32/packages,v 1.7 2012/08/29 21:55:02 vapier Exp $ - -# Min versions that included x32 support ->=sys-apps/sandbox-2.6 ->=sys-devel/binutils-2.22 ->=sys-kernel/linux-headers-3.4 ->=sys-libs/glibc-2.16.0 ->=sys-devel/gcc-4.7.1 ->=sys-devel/gdb-7.5 ->=dev-util/strace-4.7 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/parent b/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/parent deleted file mode 100644 index 5e9dc95235..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/arch/amd64/x32/parent +++ /dev/null @@ -1,3 +0,0 @@ -.. -# Need to clobber amd64 pulling in lib32 on us. -portage-stable:features/multilib diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use deleted file mode 100644 index 30ffacc6f4..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/package.use +++ /dev/null @@ -1,14 +0,0 @@ -# Need to undo arch/amd64/package.use because that -# profile is shared between the cros sdk chroot and -# amd64 target boards. - -app-arch/bzip2 -static-libs -app-arch/pbzip2 -static -app-arch/pigz -static - -chromeos-base/update_engine -delta_generator -dev-embedded/openocd -ftdi -net-misc/openssh -kerberos -sys-apps/flashrom -dediprog -ft2232_spi -serprog - -dev-libs/glib -static-libs diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent index 489787307b..6fe462edfa 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent @@ -1,4 +1,4 @@ .. -:arch/amd64/no-multilib +portage-stable:arch/amd64/no-multilib portage-stable:features/64bit-native :coreos/targets/generic diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent index 4df41ec34e..84be6aaffb 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent @@ -1,5 +1,5 @@ :base portage-stable:default/linux -:arch/amd64 +portage-stable:arch/amd64 portage-stable:releases/10.0 :coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use index 64ef1ce510..9722bdb41e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use @@ -73,3 +73,6 @@ dev-lang/python sqlite dev-lang/perl -gdbm dev-libs/apr-util -gdbm sys-libs/gdbm berkdb + +# TODO: disable most static things +sys-libs/zlib static-libs diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use index 4bf3142941..d953012716 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/package.use @@ -35,3 +35,5 @@ sys-boot/syslinux -custom-cflags # only needed on build hosts dev-lang/python -sqlite + +sys-apps/flashrom -dediprog -ft2232_spi -serprog diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use index de69cc112e..c3efe96d31 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use @@ -1,2 +1,12 @@ +# TODO: remove static stuff +app-arch/bzip2 static-libs +app-arch/pbzip2 static +app-arch/pigz static +dev-libs/glib static-libs + +coreos-base/update_engine delta_generator +net-misc/openssh kerberos +sys-apps/flashrom dediprog ft2232_spi serprog + dev-vcs/git pcre dev-lang/ruby berkdb From 56ac86f0711ef781d7e3cb5045fd081aeab113ee Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 16 Sep 2013 18:21:05 -0400 Subject: [PATCH 3/4] churn(profiles): Move base to coreos/base. Switch to upstream's base profile, moving coreos specific stuff into coreos/base and elsewhere as needed. No significant changes but a lot of use flag nose in this since things like the list of available python targets changes. --- .../profiles/base/make.defaults | 160 ------------- .../profiles/base/package.unmask | 4 - .../profiles/base/package.use.force | 13 - .../profiles/base/package.use.mask | 166 ------------- .../profiles/base/package.use.mask.example | 25 -- .../coreos-overlay/profiles/base/packages | 75 ------ .../coreos-overlay/profiles/base/use.force | 9 - .../coreos-overlay/profiles/base/use.mask | 225 ------------------ .../profiles/coreos/amd64/parent | 2 +- .../profiles/coreos/base/make.defaults | 36 ++- .../profiles/coreos/base/packages | 1 + .../profiles/{ => coreos}/base/profile.bashrc | 19 -- .../profiles/features/systemd/packages | 1 + .../profiles/features/systemd/packages.build | 1 + 14 files changed, 38 insertions(+), 699 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/base/package.unmask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.force delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.mask delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.mask.example delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/base/packages delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/base/use.force delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/base/use.mask rename sdk_container/src/third_party/coreos-overlay/profiles/{ => coreos}/base/profile.bashrc (84%) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults deleted file mode 100644 index cf70f6b841..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults +++ /dev/null @@ -1,160 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/make.defaults,v 1.90 2012/11/24 21:08:09 mgorny Exp $ -# -# System-wide defaults for the Portage system -# See portage(5) manpage - -# Profile IUSE injection (applies only to ebuilds which use EAPI 5 or later) -IUSE_IMPLICIT="prefix" -USE_EXPAND_UNPREFIXED="ARCH" -USE_EXPAND_IMPLICIT="ARCH ELIBC KERNEL USERLAND" -USE_EXPAND_VALUES_ARCH="alpha amd64 amd64-fbsd amd64-linux arm arm-linux hppa hppa-hpux ia64 ia64-hpux ia64-linux m68k m68k-mint mips ppc ppc64 ppc64-linux ppc-aix ppc-macos ppc-openbsd s390 sh sparc sparc64-freebsd sparc64-solaris sparc-fbsd sparc-solaris x64-freebsd x64-macos x64-openbsd x64-solaris x86 x86-cygwin x86-fbsd x86-freebsd x86-interix x86-linux x86-macos x86-netbsd x86-openbsd x86-solaris x86-winnt" -USE_EXPAND_VALUES_ELIBC="AIX Cygwin Darwin FreeBSD glibc HPUX Interix mintlib NetBSD OpenBSD SunOS uclibc Winnt" -USE_EXPAND_VALUES_KERNEL="AIX Cygwin Darwin FreeBSD freemint HPUX Interix linux NetBSD OpenBSD SunOS Winnt" -USE_EXPAND_VALUES_USERLAND="BSD GNU" - -# Env vars to expand into USE vars. Modifying this requires prior -# discussion on gentoo-dev@gentoo.org. -USE_EXPAND="APACHE2_MODULES APACHE2_MPMS CALLIGRA_FEATURES ENLIGHTENMENT_MODULES FOO2ZJS_DEVICES MISDN_CARDS FRITZCAPI_CARDS FCDSL_CARDS VIDEO_CARDS DVB_CARDS LIRC_DEVICES INPUT_DEVICES LINGUAS USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS ALSA_CARDS ALSA_PCM_PLUGINS LCD_DEVICES CAMERAS NETBEANS_MODULES QEMU_SOFTMMU_TARGETS QEMU_USER_TARGETS SANE_BACKENDS RUBY_TARGETS PHP_TARGETS NGINX_MODULES_HTTP NGINX_MODULES_MAIL XFCE_PLUGINS XTABLES_ADDONS GPSD_PROTOCOLS COLLECTD_PLUGINS DRACUT_MODULES OFED_DRIVERS GRUB_PLATFORMS FFTOOLS PYTHON_TARGETS CURL_SSL OPENMPI_FABRICS OPENMPI_RM OPENMPI_OFED_FEATURES LIBREOFFICE_EXTENSIONS VOICEMAIL_STORAGE PYTHON_SINGLE_TARGET" - -# USE_EXPAND variables whose contents are not shown in package manager -# output. Changes need discussion on gentoo-dev. -USE_EXPAND_HIDDEN="USERLAND KERNEL ELIBC CROSSCOMPILE_OPTS" - -# Basic CONFIG_PROTECT is defined by portage make.globals in /usr/share. That is really bad, kill it here. -CONFIG_PROTECT="-/etc" -CONFIG_PROTECT_MASK="/etc/env.d /etc/gconf" - -# Variables that are set exclusively by the profile -# and not by user configuration files. -PROFILE_ONLY_VARIABLES="ARCH ELIBC IUSE_IMPLICIT KERNEL USERLAND USE_EXPAND_IMPLICIT USE_EXPAND_UNPREFIXED USE_EXPAND_VALUES_ARCH USE_EXPAND_VALUES_ELIBC USE_EXPAND_VALUES_KERNEL USE_EXPAND_VALUES_USERLAND" - -# 'Sane' defaults -ELIBC="glibc" -KERNEL="linux" -USERLAND="GNU" -INPUT_DEVICES="keyboard mouse" - -# Tomáš Chvátal (12 Aug 2011) -# By default do not build any grub platform and let it guess. -GRUB_PLATFORMS="" - -# Tomáš Chvátal (05 May 2013) -# By default enable all extensions with no dependencies -LIBREOFFICE_EXTENSIONS="presenter-console presenter-minimizer" - -# Tomáš Chvátal (15 May 2011) -# Andreas K. Hüttel (19 Aug 2011, 25 Mar 2012) -# By default build all koffice / calligra features. -CALLIGRA_FEATURES="kexi words flow plan sheets stage tables krita karbon braindump" - -# Pacho Ramos (14 Feb 2010) -# Enable 'ptp2' by default as it is available for most cameras. -CAMERAS="ptp2" - -# Ole Markus With (09 Oct 2010) -# Default PHP targets (should always be latest stable version) -PHP_TARGETS="php5-3" - -# Andreas K. Huettel (28 Sep 2010) -# Small default list of enabled plugins for collectd -COLLECTD_PLUGINS="df interface irq load memory rrdtool swap syslog" - -# Tomáš Chvátal (26 Oct 2010) -# By default enable all protocols for average GPS user -GPSD_PROTOCOLS="ashtech aivdm earthmate evermore fv18 garmin garmintxt gpsclock itrax mtk3301 nmea ntrip navcom oceanserver oldstyle oncore rtcm104v2 rtcm104v3 sirf superstar2 timing tsip tripmate tnt ubx" - -# Diego Pettenò (21 Dec 2006) -# Build everything for the average user -ALSA_PCM_PLUGINS="adpcm alaw asym copy dmix dshare dsnoop empty extplug file hooks iec958 ioplug ladspa lfloat linear meter mmap_emul mulaw multi null plug rate route share shm softvol" - -# Benedikt Böhm (27 Nov 2007) -# Sane defaults for built-in apache modules -# Patrick Lauer (12 Oct 2012) -# extend for apache 2.4 -APACHE2_MODULES="authn_core authz_core socache_shmcb unixd actions alias auth_basic authn_alias authn_anon authn_dbm authn_default authn_file authz_dbm authz_default authz_groupfile authz_host authz_owner authz_user autoindex cache cgi cgid dav dav_fs dav_lock deflate dir disk_cache env expires ext_filter file_cache filter headers include info log_config logio mem_cache mime mime_magic negotiation rewrite setenvif speling status unique_id userdir usertrack vhost_alias" - -# Peter Volkov (29 Apr 2010) -# Set some defaults or package will fail to build (Check mconfig in package sources) -XTABLES_ADDONS="quota2 psd pknock lscan length2 ipv4options ipset ipp2p iface geoip fuzzy condition tee tarpit sysrq steal rawnat logmark ipmark dhcpmac delude chaos account" - -# Robert Buchholz (17 Jan 2006) -# Some common lcd devices -LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses text" - -# 2006/10/17 - Daniel Drake -# cracklib is becoming optional in shadow (and removed from system) as of -# today. However, cracklib is very standard across the Linux world so we -# enable it by default. -# -# Diego Pettenò (14 Jul 2007) -# Moved to base/ profile from default-linux/ so that it also applies to -# embedded and hardened profiles. -USE="${USE} cracklib" - -# Miroslav Šulc (19 Nov 2008) -# Netbeans modules/clusters -NETBEANS="apisupport cnd groovy gsf harness ide identity j2ee java mobility nb php profiler soa visualweb webcommon websvccommon xml" - -# 2009/09/21 Robin H. Johnson -# http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml -# Build kernel modules from linux-mod by default: -USE="${USE} modules" - -# Alex Legler (30 Nov 2009) -# Default Ruby build targets -RUBY_TARGETS="ruby18 ruby19" - -# Samuli Suominen (03 Dec 2009) -# Enable USE cxx by default so base-system and toolchain pkgs can start using USE cxx -# instead of USE nocxx. -# http://archives.gentoo.org/gentoo-dev/msg_a181cd0d36600067b599f4b996c6989f.xml -USE="${USE} cxx" - -# Tiziano Müller (24 Jan 2010) -# We usually don't want python to (re)write .py[co] files during phase runs -# since it could cause sandbox violations -PYTHONDONTWRITEBYTECODE="1" - -# Jorge Manuel B. S. Vicetto (16 Nov 2011) -# Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE -# threads is included to work around a use dep issue in our old python ebuilds -# curl is included to let stage2 fetch toolchains from git -BOOTSTRAP_USE="cxx unicode threads curl" - -# Mike Gilbert (15 May 2012) -# Default target(s) for python-r1.eclass -PYTHON_TARGETS="python2_7" -PYTHON_SINGLE_TARGET="python2_7" - -# ChromeOS-specific: BOARD_USE for accessing board value in cros-board.eclass -# CROS_WORKON_TREE for cros-workon -# TESTS USE_EXPAND for autotest -# U_BOOT_CONFIG_USE for selecting U-Boot config -# U_BOOT_FDT_USE for selecting U-Boot device tree -USE_EXPAND="${USE_EXPAND} BOARD_USE CROS_WORKON_TREE TESTS U_BOOT_CONFIG_USE U_BOOT_FDT_USE" -USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" - -# Extra use flags for Core OS SDK (and possibly targets) -# Previously defined in make.conf -USE="${USE} hardened cros_host pic pie expat -introspection -cups" - -# Enable bindist for both SDK and targets -USE="${USE} bindist" - -# No need for zeroconf, that's a desktop world thing. -# Namely dhcpcd shoudln't make up random ipv4 addresses using ipv4ll -USE="${USE} -zeroconf" - -# Default licenses that are accepted for ChromiumOS builds. -# If you want to accept more, use the --accept_licenses flag -# when running setup_board. -ACCEPT_LICENSE="* -@EULA -@CHROMEOS" - -# Favor our own mirrors over Gentoo's -GENTOO_MIRRORS=" - http://storage.core-os.net/mirror/portage-stable/ - http://storage.core-os.net/mirror/coreos/ - http://distfiles.gentoo.org/ -" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/package.unmask b/sdk_container/src/third_party/coreos-overlay/profiles/base/package.unmask deleted file mode 100644 index e411156348..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/package.unmask +++ /dev/null @@ -1,4 +0,0 @@ -# Upstream portage blocks portage-9999 with package.mask, so we need to unmask -# it manually to allow us to build it. (It's still marked as unstable, so we -# won't use it by default.) -=sys-apps/portage-9999 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.force deleted file mode 100644 index 98f1d61918..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.force +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.force,v 1.8 2009/08/01 14:55:18 beandog Exp $ - -# Peter Alfredsen (11 Apr 2009) -# Forcing w.r.t. bug 265336. When unicode use-flag is -# turned off, ABI is broken without a .so bump. -dev-libs/libpcre unicode - -# Samuli Suominen (10 May 2009) -# USE X needs to be always enabled to force virtualx -# eclass usage for Xeconf. -media-sound/rubyripper X diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.mask deleted file mode 100644 index 0a6cb93822..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.mask +++ /dev/null @@ -1,166 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask,v 1.97 2009/10/11 20:12:53 ssuominen Exp $ - -# This file requires >=portage-2.1.1 -# New entries go on top. - -# Samuli Suominen (10 Oct 2009) -# Not ready for stable. Remove this mask when KDE 4.3.2 is stable. - (10 Oct 2009) -# Fix deptree because kopete-facebook is missing KEYWORDS -kde-base/kopete facebook - -# Samuli Suominen (09 Oct 2009) -# log4cxx has known memory leaking issues wrt bug #287697, -# unmask when log4cxx is fixed and stable. -app-misc/strigi log - -# Jean-Noël Rivasseau (23 Sep 2009) -# X use flag only for amd64/x86, bug 285951. -media-gfx/iscan X - -# Nirbheek Chauhan (22 Sep 2009) -# Broken with KDE4, mask for now ->=app-office/openoffice-3.1.1 kde - -# Alex Legler (16 Sep 2009) -# Maintainer of the kolab patch is not available (wrobel). -# Bump is needed for security bug 285052. ->=www-apps/horde-webmail-1.2.4 kolab - -# Tomáš Chvátal (10 Sep 2009) -# quakeforge has video_cards_tdfx enabled only for x86 -games-fps/quakeforge video_cards_tdfx - -# Marijn Schouten (03 Aug 2009) -# gcl is an old piece of crap that has a lot of problems -sci-mathematics/maxima gcl - -# Jeremy Olexa (31 Jul 2009) -# Mask the gnome USE flag globally for app-office/abiword-plugins-2.4.6 because -# it depends on a GLSA affected atom. bug 271708 -=app-office/abiword-plugins-2.4.6 gnome - -# Petteri Räty (14 Jul 2009) -# Open source Java plugin development happens in IcedTea -# these days. -dev-java/gnu-classpath nsplugin - -# Tristan Heaven (12 Jun 2009) -# media-libs/freeimage is masked for bug #269516 -dev-games/cegui freeimage -dev-games/ogre freeimage - -# Mounir Lamouri (21 Apr 2009) -# masking jingle because it's using an old ortp version -# which is blocking stabilization of new ones, bug 206047 -=kde-base/kdenetwork-3* jingle -=kde-base/kopete-3* jingle - -# Peter Alfredsen (20 Jan 2008) -# Pango is a Work-In-Progress for libgdiplus -# Bug 255623 -dev-dotnet/libgdiplus pango - -# Tomas Chvatal (31 Jan 2009) -# mask cuda for boinc. Works only on amd64 and x86 -sci-misc/boinc cuda - -# Robert Buchholz (16 Aug 2008) -# TLS needs dev-libs/cryptlib, which is x86 only -dev-python/kaa-base tls - -# Serkan Kaba (20 Jul 2008) -# Java is not supported in most of the arches enchant is keyworded -app-text/enchant zemberek - -# Thomas Anderson (04 Jul 2008) -# Mask ia32 USE flag on all architectures but amd64 -# as we're the only people who can make use of it. -www-client/opera ia32 - -# Peter Alfredsen (25 Jun 2008) -# Php module fails to build due to newer autotools. ->=media-libs/ming-0.4.0_beta5 php - -# Ben de Groot (22 Jun 2008) -# does not work with ffmpeg new headers yet - (21 Mar 2008) -# still work in progress -=net-irc/kvirc-3.4.0 qt4 - -# Michael Sterrett (09 Mar 2008) -# tcl version necessary has been masked so mask this for now. -~app-editors/nvi-1.81.6 tcl - -# Christian Faulhammer (03 Mar 2008) -# This feature is experimental and should be used by people willing to -# test it -app-portage/gatt libpaludis - -# Wulf Krueger (28 Jan 2008) -# Mask bluetooth for the KDE 3.5.8 stabilisation. -app-pda/pilot-link bluetooth - -# Christian Hoffmann (27 Dec 2007) -# Missing dev-php5/php-java-bridge -dev-lang/php java-external - -# Donnie Berkholz (12 Nov 2007) -# freedesktop.org bug #7459 committed fix breaks 3D apps -# but "fix" is only relevant on USE=nptl -=media-libs/mesa-7.0* nptl - -# Robert Buchholz (29 Aug 2007) -# PPTP Plugin doesn't work on amd64 -kde-misc/knetworkmanager pptp - -dev-java/sun-jdk nsplugin -dev-java/sun-jre-bin nsplugin -dev-java/ibm-jdk-bin nsplugin -dev-java/ibm-jre-bin nsplugin - -# Petteri Räty (27 Apr 2007) -# package.use.masked for security bug #161835 -# Not removed from ebuilds because this is the only 64 bit plugin -# on amd64. -dev-java/blackdown-jdk nsplugin -dev-java/blackdown-jre nsplugin - -# These are for BSD only -net-proxy/squid ipf-transparent pf-transparent -app-admin/sshguard ipfilter - -# Linking against libnfsidmap requires libs in /usr #149472 -sys-apps/acl nfs - -# Christian Faulhammer (14 Jan 2008) -# only works on x86, where this will be unmasked -dev-java/ibm-jdk-bin alsa -dev-java/ibm-jre-bin alsa - -# Raúl Porcel (09 Nov 2008) -# CPU opts: This needs amd64, x86 and ppc on some of them -# dvdnav: hard masked dependency -# vdpau: availble on x86, amd64 only -media-video/mplayer cpudetection custom-cpuopts bindist vdpau - -# Steve Dibb (26 Feb 2009) -# Unmask internal real player codec support on newer mplayer ->=media-video/mplayer-1.0_rc2_p20090226 -real - -# Alexis Ballier (07 Jul 2009) -# The pda interface doesnt build, bug #277037 ->=media-video/vlc-1.0.0 pda - -# Samuli Suominen (31 Jul 2009) -# Security issues wrt #190835 -games-fps/doom-data doomsday -games-fps/freedoom doomsday diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.mask.example b/sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.mask.example deleted file mode 100644 index 3c373150ad..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/package.use.mask.example +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/package.use.mask.example,v 1.2 2009/07/31 11:16:52 ssuominen Exp $ - -# This file requires >=portage-2.1.1 -# It's named example so portage doesn't open it and it doesn't do anything yet. -# The syntax is similar to /etc/portage/package.use - -### -### Examples! -### -### Masking - -# sys-devel/gcc hardened # mask hardened USE flag for sys-devel/gcc - - -### Unmasking -# sys-devel/gcc -hardened # unmask hardened USE flag for sys-devel/gcc - -# DO NOT DO -# -sys-devel/gcc hardened - -# This wrong example is here because someone did it (he blamed his copy -# and pasting program). - diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/packages b/sdk_container/src/third_party/coreos-overlay/profiles/base/packages deleted file mode 100644 index ed51b0cc64..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/packages +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 2004 Gentoo Foundation. -# Distributed under the terms of the GNU General Public License, v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/packages,v 1.45 2009/09/29 09:04:29 flameeyes Exp $ - -# Gentoo Base Profile - -# NOTE: THIS IS THE BASE PROFILE FOR *ANY* GENTOO BASED OPERATING SYSTEM. -# NO MODIFICATIONS MAY BE MADE TO THIS FILE WITHOUT PRIOR DISCUSSION. IF -# YOU ARE CREATING A NEW PROFILE, YOU SIMPLY NEED TO INHERIT THIS BASE -# PROFILE IN YOUR PROFILE DIRECTORY'S "parent" FILE. - - -# OK, you're staring at this file and you have no idea what these stars are -# for. Here's the scoop. An initial "*" marks a package that is part of -# the official BASE system profile. If there is a "*" then `emerge system` -# will use the line in its calculations of what should be installed for the -# base profile. Lines without a "*" prefix will be ignored for profile -# system calculations. - -# Please note that this file is rarely used as a package inclusion mask -# file, because it affects EVERY SINGLE gentoo profile. As can be seen, -# we've limited the inclusion mask to a version of portage which supports -# cascaded profiles, but apart from that, there should be no version -# specific information in here. This file serves as a high level description -# of the minimum set of packages needed for any Gentoo based system. - -*sys-apps/baselayout -*app-arch/bzip2 -*app-arch/cpio -*app-arch/gzip -*app-arch/tar -*app-arch/xz-utils -*app-shells/bash -#*dev-lang/perl -#*dev-lang/python -*net-misc/iputils -*net-misc/rsync -*net-misc/wget -*sys-apps/coreutils -#*sys-apps/debianutils -*sys-apps/diffutils -*sys-apps/file -*sys-apps/findutils -*sys-apps/gawk -*sys-apps/grep -*sys-apps/net-tools -*sys-apps/portage -*sys-process/procps -*sys-process/psmisc -*sys-apps/sed -*sys-apps/shadow -*sys-apps/texinfo -*sys-apps/which -*sys-devel/autoconf -*sys-devel/automake -*sys-devel/binutils -*sys-devel/bison -*sys-devel/flex -*sys-devel/gcc -*sys-devel/gnuconfig -*sys-devel/libtool -*sys-devel/m4 -*sys-devel/make -*>=sys-devel/patch-2.6.1 -*sys-fs/e2fsprogs -*sys-libs/ncurses -*sys-libs/readline -*sys-libs/zlib -*virtual/editor -*virtual/libc -*virtual/man -*virtual/modutils -*virtual/os-headers -*virtual/pager -*virtual/ssh diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/base/use.force deleted file mode 100644 index df19ac448a..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/use.force +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.force,v 1.3 2009/07/31 16:42:56 ssuominen Exp $ - -# Force the GNU/Linux ELIBC, KERNEL, and USERLAND -# flags that apply to the majority of profiles. -elibc_glibc -kernel_linux -userland_GNU diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/use.mask b/sdk_container/src/third_party/coreos-overlay/profiles/base/use.mask deleted file mode 100644 index 430a913cc2..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/use.mask +++ /dev/null @@ -1,225 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/use.mask,v 1.81 2009/09/10 12:03:43 scarabeus Exp $ - -# profile specific USE flags -# Don't put hardened in here. -selinux -uclibc -multilib - -# amd64/x86 arch specific USE flags -kqemu -3dnow -3dnowext -lilo -mmx -mmxext -sse -sse2 -ssse3 -svga -win32codecs -real -nvram - -# ppc arch specific USE flags -altivec -pbbuttonsd -ppcsha1 - -# mips arch specific USE flags -n32 -n64 -fixed-point - -# ppc64 arch specific USE flags -ibm - -# sparc arch specific USE flags -vis -ultra1 - -# nVidia XvMC requires nvidia-drivers/nvidia-legacy-drivers -nvidia - -# dev-db/oracle-instantclient-basic is only available on x86 -oci8-instant-client - -# net-libs/osptoolkit is only available on x86 (used by asterisk, bug 115798) -osp - -# yellownet is only avaible as a binary blob (bug 149970) -yellownet - -# not keyworded on non-x86 systems -video_cards_geode -video_cards_vermilion -video_cards_xgi -video_cards_voodoo - -# not needed on non-sparc systems -video_cards_sunbw2 -video_cards_suncg14 -video_cards_suncg3 -video_cards_suncg6 -video_cards_sunffb -video_cards_sunleo -video_cards_suntcx - -# not needed on non-mips system -video_cards_newport -video_cards_impact - -# not needed on non-x86, non-amd64 systems -input_devices_virtualbox -input_devices_vmmouse -video_cards_nvidia -video_cards_fglrx -video_cards_via -video_cards_vmware -video_cards_virtualbox - -# not needed on non-x86, non-amd64, non-ppc systems -input_devices_synaptics -input_devices_wacom - -# psyco only works on x86 -psyco - -# Mask ELIBC, KERNEL, and USERLAND flags that apply to specific profiles. -userland_BSD - -elibc_AIX -elibc_Darwin -elibc_DragonFly -elibc_FreeBSD -elibc_HPUX -elibc_Interix -elibc_IRIX -elibc_mintlib -elibc_NetBSD -elibc_OpenBSD -elibc_SunOS -elibc_uclibc - -kernel_AIX -kernel_Darwin -kernel_FreeBSD -kernel_freemint -kernel_HPUX -kernel_Interix -kernel_IRIX -kernel_NetBSD -kernel_OpenBSD -kernel_SunOS - -# Diego Pettenò (6 Dec 2006) -# Mask specific Apple drivers -alsa_cards_aoa -alsa_cards_aoa-fabric-layout -alsa_cards_aoa-onyx -alsa_cards_aoa-soundbus -alsa_cards_aoa-soundbus-i2s -alsa_cards_aoa-tas -alsa_cards_aoa-toonie -alsa_cards_powermac -# Mask specific Sun drivers -alsa_cards_sun-amd7930 -alsa_cards_sun-cs4231 -alsa_cards_sun-dbri -# Mask specific ARM drivers -alsa_cards_pxa2xx-i2sound -alsa_cards_pxa2xx-soc -alsa_cards_pxa2xx-soc-corgi -alsa_cards_pxa2xx-soc-poodle -alsa_cards_pxa2xx-soc-spitz -alsa_cards_pxa2xx-soc-tosa -alsa_cards_sa11xx-uda1341ts -alsa_cards_armaaci -alsa_cards_at91-soc -alsa_cards_at91-soc-eti-b1-wm8731 -# Mask specific HPPA drivers -alsa_cards_harmony -# Mask specific MIPS drivers -alsa_cards_au1x00 - -# Diego Pettenò (29 Dec 2006) -# Adobe FDF toolkit is x86 only. -fdftk - -# Diego Pettenò (30 Dec 2006) -# These are specific of Mac OS X -aqua -coreaudio - -# Diego Pettenò (4 Jan 2007) -# Mask the flags for PHP that are available only on x86 -sybase-ct -ingres -birdstep -adabas -filepro -pfpro -informix -empress -empress-bcs -sybase -frontbase -dbmaker -esoob -solid -# Shared with amd64 -oci8 -oracle7 -firebird -db2 - -# Robert Buchholz (03 Jun 2007) -# Only works on x86 or amd64 -lcd_devices_svga -lcd_devices_luise - -# Joseph Jezak (11 Mar 2007) -# Only for x86 and amd64 (in pbbuttonsd) -macbook - -# George Shapovalov (8 Apr 2007) -# Ada is supported only on x86, amd64 and ppc at present -ada - -# lvm2 clustered use flags (moved from default-linux) -clvm -gulm -cman - -# tcc is x86 only -tcc - -# Diego Pettenò (15 Nov 2007) -# pam_console was masked for removal for security issue. -# mask the flag too. -pam_console - -# Jeremy Olexa -# The prefix USE flag should never be used on non prefix profiles -prefix - -# Alexey Shvetsov -# Mask kdeprefix since its broken by now -kdeprefix - -# Diego E. Pettenò (6 Jul 2009) -# on behalf of QA Team -# Removal of cman is scheduled for 2009-10-06 -cman - -# Markus Duft (7 Jul 2009) -# This use flag only applies to _one_ version of interix (all -# versions share the same keyword, that's why i need a USE flag). -# Since this is meaningless for all others, it's globally masked. -i6fork - -# Samuli Suominen (01 Aug 2009) -# RealMagic Hollywood+/Creative DXR3 support -dxr3 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent index 84be6aaffb..09dff0fee8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent @@ -1,4 +1,4 @@ -:base +portage-stable:base portage-stable:default/linux portage-stable:arch/amd64 portage-stable:releases/10.0 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index ff59f24d0f..5ebf596172 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -1,8 +1,40 @@ # Copyright (c) 2011 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -# Basic stuff we do/don't want -USE="-tcpd -pcre -berkdb" +# ChromeOS-specific: BOARD_USE for accessing board value in cros-board.eclass +# CROS_WORKON_TREE for cros-workon +# TESTS USE_EXPAND for autotest +# U_BOOT_CONFIG_USE for selecting U-Boot config +# U_BOOT_FDT_USE for selecting U-Boot device tree +USE_EXPAND="${USE_EXPAND} BOARD_USE CROS_WORKON_TREE TESTS U_BOOT_CONFIG_USE U_BOOT_FDT_USE" +USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" + +# Extra use flags for CoreOS SDK +USE="${USE} hardened cros_host pic pie expat -introspection -cups -tcpd -pcre -berkdb" + +# Enable bindist for both SDK and targets +USE="${USE} bindist" + +# No need for zeroconf, that's a desktop world thing. +# Namely dhcpcd shoudln't make up random ipv4 addresses using ipv4ll +USE="${USE} -zeroconf" + +# Override upstream's python settings +USE="$USE python_targets_python2_7 python_single_target_python2_7" +USE="$USE -python_targets_python3_2 -python_single_target_python3_2" +BOOTSTRAP_USE="$BOOTSTRAP_USE -python_targets_python3_2" + +# Default licenses that are accepted for ChromiumOS builds. +# If you want to accept more, use the --accept_licenses flag +# when running setup_board. +ACCEPT_LICENSE="* -@EULA -@CHROMEOS" + +# Favor our own mirrors over Gentoo's +GENTOO_MIRRORS=" + http://storage.core-os.net/mirror/portage-stable/ + http://storage.core-os.net/mirror/coreos/ + http://distfiles.gentoo.org/ +" # The following files are modified by make_chroot, and we do not want to # clobber them. All other config files should not be protected, so we diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages index def41aa6c0..f785fb739c 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages @@ -1,2 +1,3 @@ -*sys-apps/busybox +-*sys-apps/kbd *app-arch/lbzip2 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/profile.bashrc b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc similarity index 84% rename from sdk_container/src/third_party/coreos-overlay/profiles/base/profile.bashrc rename to sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc index 831c1cbf99..89a2bf4d48 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/profile.bashrc +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/profile.bashrc @@ -1,22 +1,3 @@ -# Copyright 2006 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/profiles/base/profile.bashrc,v 1.3 2009/07/21 00:08:05 zmedico Exp $ - -# Set LANG=C globally because it speeds up build times, and we don't need -# localized messages inside of our builds. -export LANG=C - -# Since unittests on the buildbots don't automatically get access to an -# X server, don't let local dev stations get access either. If a test -# really needs an X server, they should launch their own with Xvfb. -unset DISPLAY - -if ! declare -F elog >/dev/null ; then - elog() { - einfo "$@" - } -fi - # Dumping ground for build-time helpers to utilize since SYSROOT/tmp/ # can be nuked at any time. CROS_BUILD_BOARD_TREE="${SYSROOT}/build" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages index 45dfc17937..2d4ed12f5b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages @@ -1,3 +1,4 @@ # Add systemd to the 'system' set *sys-apps/efunctions *sys-apps/systemd +-*sys-apps/openrc diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build index 0c10a6cd7a..12a43c51e8 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages.build @@ -1,2 +1,3 @@ sys-apps/dbus sys-apps/efunctions +-sys-apps/openrc From 89d1377d8d37647d0e469ab12fbb434a5d2cc0a8 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Mon, 16 Sep 2013 19:05:04 -0400 Subject: [PATCH 4/4] fix(profiles): Add udev to the stage1 use flags. Bootstrapping now pulls in udev which is provided by systemd, systemd pulls in hwids which must have the udev use flag enabled. Also add gentoo-systemd-integration which will be used with the next version of systemd. --- .../coreos-overlay/profiles/features/systemd/make.defaults | 1 + .../profiles/features/systemd/package.accept_keywords | 1 + 2 files changed, 2 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults index 31b1813175..76a820ac5b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/make.defaults @@ -1 +1,2 @@ USE="systemd" +BOOTSTRAP_USE="$BOOTSTRAP_USE udev" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords index f8ac58ccf3..e86ffbb508 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/package.accept_keywords @@ -2,6 +2,7 @@ sys-apps/systemd ~amd64 ~x86 sys-apps/systemd-ui ~amd64 ~x86 sys-apps/systemd-sysv-utils ~amd64 ~x86 sys-apps/efunctions ~amd64 ~x86 +sys-apps/gentoo-systemd-integration ~amd64 ~x86 # Various dependencies that also need to be up-to-date sys-apps/hwids ~amd64 ~x86