From 7c9a447541ff74731b0d3837da579661827caf42 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 20 Jun 2013 01:49:50 -0400 Subject: [PATCH 01/11] add(profiles): Add profiles.desc to identify valid profiles --- .../src/third_party/coreos-overlay/profiles/profiles.desc | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc new file mode 100644 index 0000000000..5d76eea29c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/profiles.desc @@ -0,0 +1,2 @@ +amd64 default/linux/amd64/10.0 dev +amd64 default/linux/amd64/10.0/coreos dev From 9b53896653c75cfb2694a55c6681b8670edd76bc Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 20 Jun 2013 02:03:53 -0400 Subject: [PATCH 02/11] fix(profiles): Drop references to virtual/portage The old-style virtual/portage is gone and replaced by a new-style virtual/package-manager in Gentoo. For now just use sys-apps/portage since that's all we want anyway. --- .../src/third_party/coreos-overlay/profiles/base/packages | 3 +-- .../coreos-overlay/profiles/default/linux/packages.build | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/packages b/sdk_container/src/third_party/coreos-overlay/profiles/base/packages index c8cfbb1778..c084acd8eb 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/packages +++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/packages @@ -43,7 +43,7 @@ *sys-apps/gawk *sys-apps/grep *sys-apps/net-tools -#*>=sys-apps/portage-2.0.51.22 +*sys-apps/portage *sys-process/procps *sys-process/psmisc *sys-apps/sed @@ -71,5 +71,4 @@ *virtual/modutils *virtual/os-headers *virtual/pager -*virtual/portage *virtual/ssh diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build index 8e556faa6e..0ae2369c65 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build @@ -28,6 +28,7 @@ sys-apps/less sys-apps/net-tools sys-apps/sed sys-apps/texinfo +sys-apps/portage sys-devel/binutils sys-devel/bison sys-devel/flex @@ -39,4 +40,3 @@ sys-devel/patch virtual/editor virtual/libc virtual/os-headers -virtual/portage From 2e4405c3ec9741809496d14aa852d0170f83addb Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 20 Jun 2013 02:18:00 -0400 Subject: [PATCH 03/11] fix(profiles): Add 'threads' to the bootstrap use flags This works around a dependency issue caused by our newer portage ebuilds depending on +threads in our older python ebuilds. Will go away later. --- .../src/third_party/coreos-overlay/profiles/base/make.defaults | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults index 9cb50de537..8b1bab4509 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults @@ -119,7 +119,8 @@ PYTHONDONTWRITEBYTECODE="1" # Jorge Manuel B. S. Vicetto (16 Nov 2011) # Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE -BOOTSTRAP_USE="cxx unicode" +# threads is included to work around a use dep issue in our old python ebuilds +BOOTSTRAP_USE="cxx unicode threads" # Mike Gilbert (15 May 2012) # Default target(s) for python-r1.eclass From 3f94c8ab1ecd307933ef34a113a7d404c31dcb7b Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 20 Jun 2013 17:49:40 -0400 Subject: [PATCH 04/11] fix(profiles): Add 'curl' to bootstrap use flags. We are still using the Google toolchain which is in git, so add curl support the bootstrapped git package so it can fetch the toolchain. --- .../src/third_party/coreos-overlay/profiles/base/make.defaults | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults index 8b1bab4509..0ade1c57d1 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults @@ -120,7 +120,8 @@ PYTHONDONTWRITEBYTECODE="1" # Jorge Manuel B. S. Vicetto (16 Nov 2011) # Add default USE value for bootstrap and rename it from STAGE1_USE to BOOTSTRAP_USE # threads is included to work around a use dep issue in our old python ebuilds -BOOTSTRAP_USE="cxx unicode threads" +# curl is included to let stage2 fetch toolchains from git +BOOTSTRAP_USE="cxx unicode threads curl" # Mike Gilbert (15 May 2012) # Default target(s) for python-r1.eclass From 18db4d8f8675616563ef6182adad2a64a373efe7 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 20 Jun 2013 17:50:17 -0400 Subject: [PATCH 05/11] add(sys-apps/efunctions): Replace coreos-base version with generic one. This version of efunctions does not depend on cros workon and git to install and thus is suitable for bootstrapping. It also uses the original author as the upstream rather than a coreos mirror. Since it is not coreos specific any more I've moved it to sys-apps. Added to both system and bootstrap package sets. For extra fun it is also in my new systemd-only Gentoo overlay: https://github.com/marineam/systemd-only-overlay --- .../efunctions/efunctions-9999.ebuild | 39 ------------------- .../default/linux/package.accept_keywords | 2 +- .../profiles/default/linux/package.mask | 3 ++ .../profiles/default/linux/packages | 1 + .../profiles/default/linux/packages.build | 1 + .../sys-apps/efunctions/Manifest | 1 + .../sys-apps/efunctions/efunctions-1.ebuild | 39 +++++++++++++++++++ 7 files changed, 46 insertions(+), 40 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/Manifest create mode 100644 sdk_container/src/third_party/coreos-overlay/sys-apps/efunctions/efunctions-1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild deleted file mode 100644 index e4f0d0463e..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/efunctions/efunctions-9999.ebuild +++ /dev/null @@ -1,39 +0,0 @@ -# -# Copyright (c) 2013 Brandon Philips. All rights reserved. -# Distributed under the terms of the GNU General Public License v2 -# $Header:$ -# - -EAPI=3 -CROS_WORKON_PROJECT="coreos/efunctions" -CROS_WORKON_LOCALNAME="efunctions" -inherit eutils cros-workon - -DESCRIPTION="standalone replacement for functions.sh" -HOMEPAGE="https://bitbucket.org/coreos/efunctions" -SRC_URI="" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="" - -src_install() { - emake DESTDIR="${D}" install || die - - # make functions.sh available in /etc/init.d - # Note: we cannot replace the symlink with a file here, or Portage will - # config-protect it, and etc-update can't handle symlink to file updates - dodir etc/init.d - dosym ../../usr/lib/efunctions/functions.sh /etc/init.d/functions.sh - - local dst_dir=/usr/lib/${PN} - dodir $dst_dir || die - insinto $dst_dir - - doins ${S}/functions.sh - doins -r ${S}/efunctions - - fperms -R +x $dst_dir - -} diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords index 7cef49f6cf..1506117e7d 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords @@ -84,7 +84,7 @@ =dev-lang/go-1.1 ~amd64 # Replace the function.sh script in baselayout -=coreos-base/efunctions-9999 ~amd64 ~x86 +=sys-apps/efunctions-1 ~amd64 ~x86 # Projects we are actively hacking on in coreos =coreos-base/update_engine-9999 ~amd64 ~x86 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask index 01622cffaf..4a1e4af959 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.mask @@ -13,3 +13,6 @@ # libpng security vulnerability fix Date: Fri, 21 Jun 2013 16:34:08 -0400 Subject: [PATCH 06/11] fix(profiles): Move USE from make.conf to make.defaults in profiles. Moving more things into the profiles means we eventually reduce the magic around generating make.conf and aids bootstrapping. --- .../coreos-overlay/coreos/config/make.conf.amd64-host | 5 +---- .../coreos-overlay/coreos/config/make.conf.amd64-target | 3 --- .../coreos-overlay/coreos/config/make.conf.common-target | 1 - .../third_party/coreos-overlay/profiles/base/make.defaults | 4 ++++ .../coreos-overlay/profiles/targets/coreos/make.defaults | 4 ++-- 5 files changed, 7 insertions(+), 10 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 d0b74f78ee..a131645e91 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 @@ -7,7 +7,7 @@ LDFLAGS="-Wl,-O2 -Wl,--as-needed" FEATURES="allow-missing-manifests buildpkg clean-logs -collision-protect -ebuild-locks parallel-install sandbox -strict userfetch userpriv usersandbox -unknown-features-warn" -USE="-openrc" + # Since our portage comes from version control, we redirect distfiles DISTDIR="/var/lib/portage/distfiles" @@ -43,9 +43,6 @@ source /usr/local/portage/coreos/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.con FULL_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/amd64-host/chroot-2013.02.04.090227/packages/" PORTAGE_BINHOST="$PREFLIGHT_BINHOST $FULL_BINHOST" -# expat needed for XML parsing in GDB, but enable globally as overhead is tiny. -USE="${USE} -cups hardened cros_host multilib pic pie -introspection expat" - GENTOO_MIRRORS=" http://gentoo.osuosl.org/ https://commondatastorage.googleapis.com/chromeos-mirror/gentoo diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target index 6f52f288da..75eb28c028 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target +++ b/sdk_container/src/third_party/coreos-overlay/coreos/config/make.conf.amd64-target @@ -10,9 +10,6 @@ ACCEPT_KEYWORDS="amd64" # Common settings across all board targets. source make.conf.common -# Recommended x86-specific USE flags. -USE="${USE} mmx sse sse2 dri hardened" - # Recommended MARCH_TUNE, CFLAGS, etc. MARCH_TUNE="" 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 9665e0bb0a..7240076555 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 @@ -13,7 +13,6 @@ HOSTCC=x86_64-pc-linux-gnu-gcc LDFLAGS="-Wl,-O2 -Wl,--as-needed" ACCEPT_KEYWORDS="${ARCH}" -USE="${ARCH} zlib bindist cros-debug -introspection cmt" # Be sure we don't overwrite pkgs from another sysroot. PKGDIR=${ROOT}packages/ diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults index 0ade1c57d1..ae189e38fe 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/base/make.defaults @@ -136,6 +136,10 @@ PYTHON_SINGLE_TARGET="python2_6" USE_EXPAND="${USE_EXPAND} BOARD_USE CROS_WORKON_TREE TESTS U_BOOT_CONFIG_USE U_BOOT_FDT_USE" USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" +# Extra use flags for Core OS SDK (and possibly targets) +# Previously defined in make.conf +USE="${USE} hardened cros_host pic pie expat -introspection -cups -openrc" + # Default licenses that are accepted for ChromiumOS builds. # If you want to accept more, use the --accept_licenses flag # when running setup_board. diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults index 44228db967..19221eb07a 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/targets/coreos/make.defaults @@ -1,8 +1,8 @@ # Copyright (c) 2012 The Chromium OS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 -USE="acpi usb pam -cairo -X" - +USE="bindist cros-debug acpi usb pam" +USE="${USE} -cros_host -expat -pic -pie -cairo -X" USE="${USE} -acl -cracklib -gpm -ipv6 -openmp -python -sha512" USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls" From 19ceed57abc9d63000fc6c5d7527f11b72c13797 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 21 Jun 2013 16:34:08 -0400 Subject: [PATCH 07/11] fix(profiles): Add shadow to the bootstrap package list Despite the big scary warning saying otherwise upstream Gentoo has actually included shadow in this list since 2011 (while also forgetting to delete the warning, cute!). Not having it here runs the risk of causing a failure during catalyst builds if something tries to add a system user or group before shadow gets installed. Upstream commit: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/profiles/default/linux/packages.build?r1=1.5&r2=1.6 --- .../coreos-overlay/profiles/default/linux/packages.build | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build index b017c84c62..f2d85b0b28 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/packages.build @@ -5,9 +5,6 @@ # This file describes the packages needed to build a stage1 based on this # profile. Packages in this file are built in order. -# While shadow could be in here, it breaks stage 1 and stage 2 building for the -# releases. PLEASE DO NOT ENABLE THIS UNLESS YOU HAVE THOROUGHLY TESTED IT! - app-arch/bzip2 app-arch/gzip app-arch/tar @@ -27,9 +24,10 @@ sys-apps/gawk sys-apps/grep sys-apps/less sys-apps/net-tools -sys-apps/sed -sys-apps/texinfo sys-apps/portage +sys-apps/sed +sys-apps/shadow +sys-apps/texinfo sys-devel/binutils sys-devel/bison sys-devel/flex From b7bde0b21ce5c486a129873cfc9c7f708c6135be Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 21 Jun 2013 16:34:08 -0400 Subject: [PATCH 08/11] fix(profiles): Don't use live ebuilds by default. As-is catalyst and cros-workon's live ebuilds don't mix since the catalyst chroot does not provide /mnt/host like the sdk chroot does. Besides, only people actively working on a project should use the live versions since anyone else will install it one time and then never upgrade after that, even when the version marked stable is actually newer than their old live build. For SDK builds this means not accepting ~amd64 for core-admin and update_engine and adding a stable ebuild for core-admin. (update_engine already has a stable ebuild which is even up-to-date) --- .../core-admin/core-admin-0.0.1-r1.ebuild | 1 + .../core-admin/core-admin-0.0.1.ebuild | 33 +++++++++++++++++++ .../core-admin/core-admin-9999.ebuild | 1 + .../default/linux/package.accept_keywords | 6 ---- 4 files changed, 35 insertions(+), 6 deletions(-) create mode 120000 sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild create mode 100644 sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild new file mode 120000 index 0000000000..3187faa5c7 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1-r1.ebuild @@ -0,0 +1 @@ +core-admin-0.0.1.ebuild \ No newline at end of file diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild new file mode 100644 index 0000000000..425ac63652 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-0.0.1.ebuild @@ -0,0 +1,33 @@ +# +# Copyright (c) 2013 Brandon Philips. All rights reserved. +# Distributed under the terms of the MIT License +# $Header:$ +# + +EAPI=2 +CROS_WORKON_COMMIT="54aba86ecd7cd32c3488df9dc9beab27b37cec0b" +CROS_WORKON_PROJECT="coreos/core-admin" +CROS_WORKON_LOCALNAME="core-admin" +CROS_WORKON_REPO="git://github.com" +inherit toolchain-funcs cros-workon + +DESCRIPTION="systemd over rest" +HOMEPAGE="https://github.com/coreos/core-admin" +SRC_URI="" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64 arm x86" +IUSE="" + +DEPEND=">=dev-lang/go-1.0.2" + +src_compile() { + export GOPATH="${S}" + go get + go build -o ${PN} || die +} + +src_install() { + dobin ${S}/${PN} +} diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild index bd6fa74e23..084a98749a 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/core-admin/core-admin-9999.ebuild @@ -7,6 +7,7 @@ EAPI=2 CROS_WORKON_PROJECT="coreos/core-admin" CROS_WORKON_LOCALNAME="core-admin" +CROS_WORKON_REPO="git://github.com" inherit toolchain-funcs cros-workon DESCRIPTION="systemd over rest" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords index 1506117e7d..33981c6761 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/package.accept_keywords @@ -86,12 +86,6 @@ # Replace the function.sh script in baselayout =sys-apps/efunctions-1 ~amd64 ~x86 -# Projects we are actively hacking on in coreos -=coreos-base/update_engine-9999 ~amd64 ~x86 - -# Used on the host -=coreos-base/core-admin-9999 ~amd64 ~x86 - #=dev-libs/libxml2-2.9.0-r1 ~amd64 =sys-apps/util-linux-2.23 ~amd64 From 518bc10ded31fc84d07e398c514b5c998b747e4c Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 21 Jun 2013 17:05:35 -0400 Subject: [PATCH 09/11] fix(coreos-base/update_engine): Add missing dependency to stable ebuild. This fix previously made it into the live ebuild but not the stable one. --- .../coreos-base/update_engine/update_engine-0.0.1-r367.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild index c9c9e9c873..bb090c9be3 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/update_engine/update_engine-0.0.1-r367.ebuild @@ -38,7 +38,8 @@ RDEPEND="app-arch/bzip2 sys-apps/rootdev sys-fs/e2fsprogs virtual/udev" -DEPEND="dev-cpp/gmock +DEPEND="coreos-base/system_api + dev-cpp/gmock dev-cpp/gtest cros_host? ( dev-util/scons ) ${RDEPEND}" From ab0efd5d280bc840d49463a923182d8f82b04f0f Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 21 Jun 2013 16:42:02 -0400 Subject: [PATCH 10/11] fix(coreos/config): Replace old ChromiumOS SDK binhosts and tarball. Building our own packages so we don't want the old ones! This is just a first stage, automated builds aren't going yet and I'm not covering amd64-generic and its cross toolchain, just the sdk. The old binhost/host/*.conf files are just stubbed out until I'm positive nothing else is referring to them. --- .../host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf | 2 +- .../coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf | 2 +- .../coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf | 2 +- .../coreos/binhost/host/sdk_version.conf | 4 ++-- .../coreos-overlay/coreos/config/make.conf.amd64-host | 10 +++++++--- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf index 12364a8a0c..db55ee61b7 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf +++ b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf @@ -1 +1 @@ -LATEST_RELEASE_CHROME_BINHOST=http://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/chrome-27.05.11.033811/packages/ +LATEST_RELEASE_CHROME_BINHOST="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf index 45ade49817..b875cb5810 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf +++ b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf @@ -1 +1 @@ -PREFLIGHT_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/amd64-generic/paladin-R26-3659.0.0-rc7/packages/ https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/x86-generic/paladin-R26-3659.0.0-rc7/packages/" +PREFLIGHT_BINHOST="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf index c03d854246..bef59debb5 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf +++ b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf @@ -1 +1 @@ -TOT_CHROME_BINHOST="http://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/chrome-26.05.11.214444/packages/" +TOT_CHROME_BINHOST="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf index c267e59b2f..78fecc3128 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf +++ b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf @@ -1,3 +1,3 @@ -SDK_LATEST_VERSION="2013.03.07.000000" -BOOTSTRAP_LATEST_VERSION="20130130" +SDK_LATEST_VERSION="20130621235834" +BOOTSTRAP_LATEST_VERSION="20130621235834" TC_PATH="2013/03/%(target)s-2013.03.07.000000.tar.xz" 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 a131645e91..4b8d3cdd9e 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 @@ -39,9 +39,13 @@ PKGDIR="/var/lib/portage/pkgs" PORT_LOGDIR="/var/log/portage" -source /usr/local/portage/coreos/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf -FULL_BINHOST="https://commondatastorage.googleapis.com/chromeos-prebuilt/host/amd64/amd64-host/chroot-2013.02.04.090227/packages/" -PORTAGE_BINHOST="$PREFLIGHT_BINHOST $FULL_BINHOST" +# Our first round of binary packages! +# legacy contains the old x86_64-cros-linux-gnu toolchain since I haven't +# rebuilt it yet. 20130621235834 contains everything built by bootstrap_sdk +PORTAGE_BINHOST=" + http://commondatastorage.googleapis.com/storage.core-os.net/coreos/sdk/experimental/legacy/pkgs/ + http://commondatastorage.googleapis.com/storage.core-os.net/coreos/sdk/experimental/20130621235834/pkgs/ +" GENTOO_MIRRORS=" http://gentoo.osuosl.org/ From 84572f0e9ef1baac6651f40f0994d1b0c70947bd Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 22 Jun 2013 10:48:22 -0400 Subject: [PATCH 11/11] fix(coreos/config): Switch download host to our own CNAME We now have http://storage.core-os.net/ working so use that instead of the generic Google host name. --- .../coreos-overlay/coreos/config/make.conf.amd64-host | 4 ++-- 1 file changed, 2 insertions(+), 2 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 4b8d3cdd9e..530737c52c 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 @@ -43,8 +43,8 @@ PORT_LOGDIR="/var/log/portage" # legacy contains the old x86_64-cros-linux-gnu toolchain since I haven't # rebuilt it yet. 20130621235834 contains everything built by bootstrap_sdk PORTAGE_BINHOST=" - http://commondatastorage.googleapis.com/storage.core-os.net/coreos/sdk/experimental/legacy/pkgs/ - http://commondatastorage.googleapis.com/storage.core-os.net/coreos/sdk/experimental/20130621235834/pkgs/ + http://storage.core-os.net/coreos/sdk/experimental/legacy/pkgs/ + http://storage.core-os.net/coreos/sdk/experimental/20130621235834/pkgs/ " GENTOO_MIRRORS="