From 83dfaeae34b89995b8c72c61d159f1b43488aa76 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 19 Feb 2014 13:37:07 -0800 Subject: [PATCH] fix(make.conf): Remove custom fetch and tar commands. Switch to portage's default (wget) for fetching. wget is nice and reports the URL it is downloading while curl does not. This makes understanding errors like '404' actually somewhat possible. The --checkpoint arg to tar didn't serve much of a useful purpose as far as I know besides adding to the build noise. Just drop it. --- .../coreos-overlay/coreos/config/make.conf.common-target | 9 --------- 1 file changed, 9 deletions(-) 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 d1f36d9f64..857480ab07 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 @@ -35,15 +35,6 @@ PORTDIR_OVERLAY=" # of the ChromiumOS set. You can use "--select" to override this. EMERGE_DEFAULT_OPTS="--oneshot" -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}\"'" - -FETCHCOMMAND='curl -y 30 -f --retry 9 -L --output \${DISTDIR}/\${FILE} \${URI}' -RESUMECOMMAND='curl -y 30 -f -C - --retry 9 -L --output \${DISTDIR}/\${FILE} \${URI}' - -# Print a checkpoint message every 10MB while archiving. -PORTAGE_BINPKG_TAR_OPTS="--checkpoint=1000" - # Since our portage comes from version control, we redirect distfiles. DISTDIR="/var/lib/portage/distfiles-target"