From a45845e1e6bc415ccbd0530f9504a080d18d4724 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Tue, 12 Aug 2014 11:11:29 -0700 Subject: [PATCH 1/2] profiles: Remove USE flags for systemd-213 --- .../coreos-overlay/profiles/coreos/base/package.use.force | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force index 164c019aee..bd6530bb7e 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use.force @@ -1,6 +1,2 @@ # Copyright (c) 2014 The CoreOS Authors. All rights reserved. # Distributed under the terms of the GNU General Public License v2 - -# Make sure stage1 bootstrapping does not disable kmod, -# systemd 213 does not properly build without it. -~sys-apps/systemd-213 kmod From 27d3a6455807fcae49d7ed4b23616e8bc2f1a436 Mon Sep 17 00:00:00 2001 From: Alex Crawford Date: Wed, 20 Aug 2014 16:33:25 -0700 Subject: [PATCH 2/2] profiles: Remove PIC and PIE default USE flags --- .../coreos-overlay/profiles/coreos/base/make.defaults | 2 +- .../profiles/coreos/targets/generic/make.defaults | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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 7c7f8c84d3..128abbd91c 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 @@ -10,7 +10,7 @@ USE_EXPAND="${USE_EXPAND} BOARD_USE CROS_WORKON_TREE TESTS U_BOOT_CONFIG_USE U_B USE_EXPAND_HIDDEN="${USE_EXPAND_HIDDEN} CROS_WORKON_TREE" # Extra use flags for CoreOS SDK -USE="${USE} cros_host pic pie expat -introspection -cups -tcpd -pcre -berkdb" +USE="${USE} cros_host expat -introspection -cups -tcpd -pcre -berkdb" # Enable bindist for both SDK and targets USE="${USE} bindist" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults index 48a93350cf..da6df7e100 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/generic/make.defaults @@ -2,7 +2,7 @@ # Distributed under the terms of the GNU General Public License v2 USE="cros-debug acpi usb symlink-usr cryptsetup policykit -pam" -USE="${USE} -cros_host -expat -pic -pie -cairo -X" +USE="${USE} -cros_host -expat -cairo -X" USE="${USE} -acl -cracklib -gpm -openmp -python -sha512" USE="${USE} -fortran -abiword -perl -cups -poppler-data -nls"