mirrors/flatcar-scripts
1
0
Fork 0
mirror of https://github.com/flatcar/scripts.git synced 2026-05-04 11:51:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(profiles): Move default INSTALL_MASK to profiles.

Browse Source 
The INSTALL_MASK is altered all over the place, clean it up by moving
all of it to profiles. Add /usr/share/{i18n,locales} to exclude those
installed by glibc since it doesn't have a nls use flag to disable them.
This commit is contained in:
Michael Marineau 2013-11-29 21:11:52 -08:00
parent 485f519a51
commit da1f605863
4 changed files with 23 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -37,16 +37,6 @@ PORTAGE_BINHOST="
http://storage.core-os.net/coreos/sdk/${ARCH}/${COREOS_SDK_VERSION}/toolchain/
"
# Remove all .la files for non-plugin libraries.
# Remove Gentoo init files since we use upstart.
# Remove logrotate.d files since we don't use logrotate.
INSTALL_MASK="
/usr/lib*/*.la
/etc/init.d /etc/conf.d
/etc/logrotate.d
"
PKG_INSTALL_MASK="${INSTALL_MASK}"
# This is used by profiles/base/profile.bashrc to figure out that we
# are targeting the cros-sdk (in all its various modes). It should
# be utilized nowhere else!

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

@ -60,20 +60,3 @@ ac_cv_func_wait3_rusage=yes
# When building packages for the target, we need to search the target's
# sysroot for additional m4 files. The autotools.eclass uses this.
AT_SYS_M4DIR="\${SYSROOT}/usr/share/aclocal"
# Native language support is handled inside Chrome itself.
LINGUAS="en"
# Remove all .la files for non-plugin libraries.
# Remove Gentoo init files since we use upstart.
# Remove logrotate.d files since we don't use logrotate.
# Remove sandbox files since we don't use that in the sysroot.
# Remove bash-completion files as we don't install bash-completion.
INSTALL_MASK="
/usr/lib*/*.la
/etc/init.d /etc/conf.d
/etc/logrotate.d
/etc/sandbox.d
/usr/share/bash-completion
"
PKG_INSTALL_MASK="${INSTALL_MASK}"

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

@ -47,6 +47,19 @@ CONFIG_PROTECT="
/etc/make.conf
"
# Remove libtool .la files for non-plugin libraries.
# Remove Gentoo init files since we use systemd.
# Remove logrotate.d files since we don't use logrotate.
INSTALL_MASK="
/usr/lib*/*.la
/etc/init.d /etc/conf.d
/etc/logrotate.d
"
# Keep the default languages small.
# (not many things respect this though)
LINGUAS="en"
# Use parallel bzip2 for binary packages
PORTAGE_BZIP2_COMMAND="lbzip2"
PORTAGE_BUNZIP2_COMMAND="lbunzip2"

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

@ -8,3 +8,13 @@ USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"
# Exclude documentation
FEATURES="nodoc noinfo noman"
# Remove sandbox files since we don't use that in the sysroot.
# Remove bash-completion files as we don't install bash-completion.
# Remove alternate locales, we only need the standard LANG=C
INSTALL_MASK="${INSTALL_MASK}
/etc/sandbox.d
/usr/share/bash-completion
/usr/share/i18n
/usr/share/locale
"