From d9bfa7e1ac7b416d431a0b81642bf8fac0130bbb Mon Sep 17 00:00:00 2001 From: David Michael Date: Tue, 25 Apr 2017 11:20:02 -0700 Subject: [PATCH] build_image: do not use gs:// URLs in dev images When building dev images, the PORTAGE_BINHOST value during build time is written to the image's make.conf. This breaks the default binary package setup, since Jenkins is using gs:// URLs for signed package verification and authenticated downloads, and the make.conf doesn't inherit the GS_* variables to handle those schemes. This should be reverted when signed packages are properly supported by default in the dev images. --- build_library/dev_image_util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build_library/dev_image_util.sh b/build_library/dev_image_util.sh index 0d4d35b9cc..a597bab6ce 100755 --- a/build_library/dev_image_util.sh +++ b/build_library/dev_image_util.sh @@ -26,7 +26,7 @@ PKGDIR="/var/lib/portage/pkgs" PORT_LOGDIR="/var/log/portage" PORTDIR="/var/lib/portage/portage-stable" PORTDIR_OVERLAY="/var/lib/portage/coreos-overlay" -PORTAGE_BINHOST="$(get_board_binhost $BOARD $COREOS_VERSION_ID)" +PORTAGE_BINHOST="$(get_board_binhost $BOARD $COREOS_VERSION_ID | sed 's/^gs:/http:/')" EOF sudo_clobber "$1/etc/portage/repos.conf/coreos.conf" <