mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2025-08-15 08:56:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

churn(profiles): Move default/linux to coreos/base

Browse Source 
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.
This commit is contained in:
Michael Marineau 2013-09-16 17:07:20 -04:00
parent c9192683d4
commit 0303361b28
22 changed files with 111 additions and 350 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent vendored
View File

@ -1,5 +1,5 @@
:base
:default/linux
portage-stable:default/linux
:arch/amd64
portage-stable:releases/10.0
:coreos/base

7
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults vendored
View File

@ -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"

42
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords → sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords vendored
View File

@ -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

18
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.keywords vendored Normal file
View File

@ -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

10
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask → sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.mask vendored
View File

@ -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
<media-libs/libpng-1.2.44
# Replaced by sys-apps/efunctions
coreos-base/efunctions
# There is a "new" sdk toolchain, which can properly build kexec-tools,
# so mask the "binary" ebuild.
=sys-apps/kexec-tools-2.0.99

0
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.provided → sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.provided vendored
View File

72
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use vendored
View File

@ -1,3 +1,75 @@
# 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
# for profile migration
dev-lang/perl -gdbm
dev-libs/apr-util -gdbm
sys-libs/gdbm berkdb

5
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.mask vendored Normal file
View File

@ -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

2
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages vendored Normal file
View File

@ -0,0 +1,2 @@
-*sys-apps/busybox
*app-arch/lbzip2

1
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/packages.build vendored Normal file
View File

@ -0,0 +1 @@
app-arch/lbzip2

1
sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/parent vendored Normal file
View File

@ -0,0 +1 @@
:features/systemd

1
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/make.defaults vendored Normal file
View File

@ -0,0 +1 @@
USE="-pam python"

2
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/sdk/package.use vendored Normal file
View File

@ -0,0 +1,2 @@
dev-vcs/git pcre
dev-lang/ruby berkdb

54
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/make.defaults vendored
View File

@ -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 <tooclhain@gentoo.org>
USE="${USE} fortran mudflap openmp"
# 2006/03/07 - Donnie Berkholz <dberkholz@gentoo.org>
# Modular X: Support direct rendering by default
USE="${USE} dri"
# 2006/04/21 - Donnie Berkholz <dberkholz@gentoo.org>
# Modular X: Build the Xorg X server by default
USE="${USE} xorg"
# 2006/10/28 - Luca Barbato <lu_zero@gentoo.org>
# on glibc system you cannot turn it off
USE="${USE} iconv"
# 2006/06/30 - Donnie Berkholz <dberkholz@gentoo.org>
# Sane defaults for input drivers
INPUT_DEVICES="keyboard mouse evdev"
# 2006/08/18 - Donnie Berkholz <dberkholz@gentoo.org>
# 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 <cardoe@gentoo.org>
# 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 <robbat2@gentoo.org>
# 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"

49
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.keywords vendored
View File

@ -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

70
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use vendored
View File

@ -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

51
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.use.mask vendored
View File

@ -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ò <flameeyes@gentoo.org> (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 <shenhan@chromium.org> (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 <shenhan@chromium.org> (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

16
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages vendored
View File

@ -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

42
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build vendored
View File

@ -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

1
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/parent vendored
View File

@ -1 +0,0 @@
../../features/systemd

14
sdk_container/src/third_party/coreos-overlay/profiles/default/linux/use.mask vendored
View File

@ -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

1
sdk_container/src/third_party/coreos-overlay/profiles/features/systemd/packages vendored
View File

@ -1,2 +1,3 @@
# Add systemd to the 'system' set
*sys-apps/efunctions
*sys-apps/systemd