From 033aae586188d696f5be8dd38f312c2af0035339 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Tue, 6 Jan 2015 13:45:15 -0800 Subject: [PATCH 1/2] profiles: update to latest ccache The current ccache has some sort of locking bug that causes build failures when the cache directory is being created for the first time. This typically results in the first build in a fresh SDK failing. --- .../profiles/coreos/base/package.accept_keywords | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords index 8814d6f761..280ba1d25e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.accept_keywords @@ -112,3 +112,6 @@ dev-util/checkbashisms # >=3.16 required by docker 1.4 =sys-fs/btrfs-progs-3.17.1 + +# ccache 3.1.9 (current stable) has a locking bug +=dev-util/ccache-3.2.1-r1 From 7660a15208618f6387400bcf8fede09b1605ba16 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Wed, 7 Jan 2015 13:22:04 -0800 Subject: [PATCH 2/2] coreos-init: fix for coreos-install, add support for /etc/motd.d --- ...eos-init-0.0.1-r105.ebuild => coreos-init-0.0.1-r106.ebuild} | 0 .../coreos-base/coreos-init/coreos-init-9999.ebuild | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/{coreos-init-0.0.1-r105.ebuild => coreos-init-0.0.1-r106.ebuild} (100%) diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r105.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r106.ebuild similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r105.ebuild rename to sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-0.0.1-r106.ebuild diff --git a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild index 9e45532bff..6fbddea438 100644 --- a/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild +++ b/sdk_container/src/third_party/coreos-overlay/coreos-base/coreos-init/coreos-init-9999.ebuild @@ -10,7 +10,7 @@ CROS_WORKON_REPO="git://github.com" if [[ "${PV}" == 9999 ]]; then KEYWORDS="~amd64 ~arm ~x86" else - CROS_WORKON_COMMIT="1a32fb31473faa263a96084e920b6b6427cbcded" + CROS_WORKON_COMMIT="dd60f41e724e931596d4d7a6dc0c8821b528eefc" KEYWORDS="amd64 arm x86" fi