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

Merge pull request #129 from marineam/lbzip2

Browse Source 
fix(profiles): Enable lbzip2 for both SDK and targets, move to profiles
This commit is contained in:
Michael Marineau 2013-07-26 16:46:24 -07:00
commit 06ce63152f
3 changed files with 4 additions and 9 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

@ -26,11 +26,6 @@ PORTDIR_OVERLAY="
# of the ChromiumOS set. You can use "--select" to override this. # of the ChromiumOS set. You can use "--select" to override this.
EMERGE_DEFAULT_OPTS="--oneshot" EMERGE_DEFAULT_OPTS="--oneshot"
# Use parallel bzip2 for portage
# TODO(marineam): switch to lbzip2
PORTAGE_BZIP2_COMMAND="pbzip2"
PORTAGE_BUNZIP2_COMMAND="pbunzip2 --ignore-trailing-garbage=1"
# Where to store built packages. # Where to store built packages.
PKGDIR="/var/lib/portage/pkgs" PKGDIR="/var/lib/portage/pkgs"

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

@ -37,10 +37,6 @@ PORTDIR_OVERLAY="
# of the ChromiumOS set. You can use "--select" to override this. # of the ChromiumOS set. You can use "--select" to override this.
EMERGE_DEFAULT_OPTS="--oneshot" EMERGE_DEFAULT_OPTS="--oneshot"
# Use parallel bzip2 for portage
PORTAGE_BZIP2_COMMAND="lbzip2"
PORTAGE_BUNZIP2_COMMAND="lbunzip2"
FETCHCOMMAND_GS="bash -c 'BOTO_CONFIG=/home/\${PORTAGE_USERNAME}/.boto gsutil cp \"${URI}\" \"${DISTDIR}/${FILE}\"'" FETCHCOMMAND_GS="bash -c 'BOTO_CONFIG=/home/\${PORTAGE_USERNAME}/.boto gsutil cp \"${URI}\" \"${DISTDIR}/${FILE}\"'"
RESUMECOMMAND_GS="bash -c 'BOTO_CONFIG=/home/\${PORTAGE_USERNAME}/.boto gsutil cp \"${URI}\" \"${DISTDIR}/${FILE}\"'" RESUMECOMMAND_GS="bash -c 'BOTO_CONFIG=/home/\${PORTAGE_USERNAME}/.boto gsutil cp \"${URI}\" \"${DISTDIR}/${FILE}\"'"

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

@ -48,3 +48,7 @@ LDFLAGS="-Wl,-O1 -Wl,--as-needed"
# http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml # http://archives.gentoo.org/gentoo-dev/msg_dc705dc2c1a45e18a85aa62e8fb17009.xml
# Build kernel modules from linux-mod by default: # Build kernel modules from linux-mod by default:
USE="${USE} modules" USE="${USE} modules"
# Use parallel bzip2 for binary packages
PORTAGE_BZIP2_COMMAND="lbzip2"
PORTAGE_BUNZIP2_COMMAND="lbunzip2"