From 76964594988908b6957df6a0ec91064fe286f5d6 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 26 Jul 2013 19:10:03 -0400 Subject: [PATCH] fix(profiles): Enable lbzip2 for both SDK and targets, move to profiles It has been long enough since adding lbzip2 to the system set, time to put it to work for all our binary package needs! --- .../coreos-overlay/coreos/config/make.conf.amd64-host | 5 ----- .../coreos-overlay/coreos/config/make.conf.common-target | 4 ---- .../coreos-overlay/profiles/default/linux/make.defaults | 4 ++++ 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host index 1a2c8bf9d1..ca25b96f1f 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-host @@ -26,11 +26,6 @@ PORTDIR_OVERLAY=" # of the ChromiumOS set. You can use "--select" to override this. 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. PKGDIR="/var/lib/portage/pkgs" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target index 77c7844678..52298043f2 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.common-target @@ -37,10 +37,6 @@ PORTDIR_OVERLAY=" # of the ChromiumOS set. You can use "--select" to override this. 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}\"'" RESUMECOMMAND_GS="bash -c 'BOTO_CONFIG=/home/\${PORTAGE_USERNAME}/.boto gsutil cp \"${URI}\" \"${DISTDIR}/${FILE}\"'" 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 index 7b40b63b3f..8d535ccfdd 100644 --- 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 @@ -48,3 +48,7 @@ LDFLAGS="-Wl,-O1 -Wl,--as-needed" # 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"