From 481f9f79018a326f1bd3d045c5bf9f40f89c4e67 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 13 Jul 2013 20:55:28 -0400 Subject: [PATCH 1/2] fix(config): Include binary packages from current SDK version. Currently building new releases can fail during the 'update_chroot' step because the release it is building doesn't have any binary packages yet. To avoid this add the current built SDK version as a second source for chroot binary packages. --- .../coreos-overlay/coreos/config/make.conf.amd64-host | 1 + 1 file changed, 1 insertion(+) 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 e5763c6e5f..1a2c8bf9d1 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 @@ -38,6 +38,7 @@ PORT_LOGDIR="/var/log/portage" PORTAGE_BINHOST=" http://storage.core-os.net/coreos/sdk/${ARCH}/${COREOS_VERSION_STRING}/pkgs/ + http://storage.core-os.net/coreos/sdk/${ARCH}/${COREOS_SDK_VERSION}/pkgs/ " # Remove all .la files for non-plugin libraries. From f731726affdd16a869477462a8b757741fb1e146 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 13 Jul 2013 21:12:47 -0400 Subject: [PATCH 2/2] clean(binhost): All references to these files have been removed. --- .../binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf | 1 - .../coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf | 1 - .../coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf | 1 - .../coreos-overlay/coreos/binhost/host/sdk_version.conf | 3 --- .../target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf | 1 - .../coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf | 1 - 6 files changed, 8 deletions(-) delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf delete mode 100644 sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf 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 deleted file mode 100644 index db55ee61b7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-LATEST_RELEASE_CHROME_BINHOST.conf +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index b875cb5810..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-PREFLIGHT_BINHOST.conf +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index bef59debb5..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/amd64-TOT_CHROME_BINHOST.conf +++ /dev/null @@ -1 +0,0 @@ -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 deleted file mode 100644 index 3b6720c7ec..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/host/sdk_version.conf +++ /dev/null @@ -1,3 +0,0 @@ -SDK_LATEST_VERSION="0001.1.0" -BOOTSTRAP_LATEST_VERSION="0001.1.0" -TC_PATH="2013/03/%(target)s-2013.03.07.000000.tar.xz" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf deleted file mode 100644 index db55ee61b7..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-LATEST_RELEASE_CHROME_BINHOST.conf +++ /dev/null @@ -1 +0,0 @@ -LATEST_RELEASE_CHROME_BINHOST="" diff --git a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf b/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf deleted file mode 100644 index b875cb5810..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/coreos/binhost/target/amd64-generic-PREFLIGHT_BINHOST.conf +++ /dev/null @@ -1 +0,0 @@ -PREFLIGHT_BINHOST=""