From 177487956be3026ad515a84c4b3b3645fff12799 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 8 Jan 2015 16:08:33 -0800 Subject: [PATCH 1/2] Revert recent ccache changes The workaround for using the new ccache version with a hardened compiler in commit 923a6b17 was insufficient and produced a broken kernel. Roll back that commit along with the ccache version update, 0ba2d4d4. --- .../third_party/coreos-overlay/eclass/coreos-kernel.eclass | 5 ----- .../profiles/coreos/base/package.accept_keywords | 3 --- 2 files changed, 8 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass index 7c6fafd41f..4cd4833821 100644 --- a/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass +++ b/sdk_container/src/third_party/coreos-overlay/eclass/coreos-kernel.eclass @@ -84,11 +84,6 @@ update_bootengine_cpio() { kmake() { local kernel_arch=$(tc-arch-kernel) - # Disable hardened PIE explicitly, >=ccache-3.2 breaks the hardened - # compiler's auto-detection of kernel builds. - if gcc-specs-pie; then - set -- KCFLAGS=-nopie "$@" - fi emake ARCH="${kernel_arch}" CROSS_COMPILE="${CHOST}-" "$@" } 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 280ba1d25e..8814d6f761 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,6 +112,3 @@ 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 7ea6838b7add29bf0a4197a7ec572bbcb6855caa Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Thu, 8 Jan 2015 16:13:13 -0800 Subject: [PATCH 2/2] profiles: disable ccache by default The current stable version has a locking bug that can cause failures when building in a chroot. The current unstable version breaks building kernels with the hardened compiler. Just disable ccache all-together... --- .../coreos-overlay/profiles/coreos/base/make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults index dfb3293614..ca6a9918e0 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults @@ -73,7 +73,7 @@ PORTAGE_BUNZIP2_COMMAND="lbunzip2" CCACHE_SIZE="2.5G" # Always build binary packages, remove old build logs, avoid running as root. -FEATURES="buildpkg ccache clean-logs compressdebug parallel-install splitdebug +FEATURES="buildpkg clean-logs compressdebug parallel-install splitdebug userfetch userpriv usersandbox ipc-sandbox network-sandbox -merge-sync"