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

fix(profiles): Move FEATURES into profiles.

Browse Source 
Move all obviously safe features into the coreos profiles to further
reduce the magic in make.conf, leave the more fast-and-loose options in
make.conf to keep them kinda "special".
This commit is contained in:
Michael Marineau 2013-10-07 12:33:26 -07:00
parent e1b2acaf27
commit 72eb0ed866
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host vendored
View File

@ -4,9 +4,8 @@
source "/mnt/host/source/.repo/manifests/version.txt"
COREOS_VERSION_STRING="${COREOS_BUILD}.${COREOS_BRANCH}.${COREOS_PATCH}"
FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
-ebuild-locks parallel-install sandbox -strict userfetch userpriv
usersandbox -unknown-features-warn"
# Tolerate collisions (for now), disable extra locking, ignore missing digests.
FEATURES="-collision-protect -ebuild-locks -strict"
# Since our portage comes from version control, we redirect distfiles
DISTDIR="/var/lib/portage/distfiles"

6
sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target vendored
View File

@ -16,10 +16,8 @@ PORTAGE_TMPDIR=${ROOT}tmp/
PORT_LOGDIR=${ROOT}tmp/portage/logs/
FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect
-ebuild-locks -force-mirror nodoc noinfo noman parallel-install
sandbox splitdebug -strict userfetch userpriv usersandbox
-unknown-features-warn"
# Tolerate collisions (for now), disable extra locking, ignore missing digests.
FEATURES="-collision-protect -ebuild-locks -strict"
PORTAGE_WORKDIR_MODE="0755"
PKG_CONFIG_PATH="${ROOT}usr/lib/pkgconfig/:${ROOT}usr/share/pkgconfig/"

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

@ -50,3 +50,7 @@ CONFIG_PROTECT="
# Use parallel bzip2 for binary packages
PORTAGE_BZIP2_COMMAND="lbzip2"
PORTAGE_BUNZIP2_COMMAND="lbunzip2"
# Always build binary packages, remove old build logs, avoid running as root.
FEATURES="buildpkg clean-logs compressdebug parallel-install splitdebug
userfetch userpriv usersandbox"

3
sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults vendored
View File

@ -5,3 +5,6 @@ USE="cros-debug acpi usb pam"
USE="${USE} -cros_host -expat -pic -pie -cairo -X"
USE="${USE} -acl -cracklib -gpm -ipv6 -openmp -python -sha512"
USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"
# Exclude documentation
FEATURES="nodoc noinfo noman"