From c1e8a96cda712778071a0ddc49bcad455d19afcf Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sun, 5 Jan 2014 14:13:07 -0800 Subject: [PATCH] feat(profiles): Add coreos/amd64/usr profile. This profile enables the symlink-usr USE flag and target profiles have a new variable COREOS_DISK_LAYOUT_SUFFIX that allows the profile to switch to a different set of disk layouts. By default no suffix is used but the usr profile uses layouts with the suffix "-usr" such as "base-usr". --- .../coreos-overlay/profiles/coreos/amd64/usr/parent | 4 ++++ .../coreos-overlay/profiles/coreos/amd64/usr/use.force | 2 ++ .../profiles/coreos/targets/generic/make.defaults | 3 +++ .../profiles/coreos/targets/usr/make.defaults | 8 ++++++++ .../coreos-overlay/profiles/coreos/targets/usr/parent | 1 + 5 files changed, 18 insertions(+) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/parent create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/use.force create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/make.defaults create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/parent diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/parent new file mode 100644 index 0000000000..c5f53707cf --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/parent @@ -0,0 +1,4 @@ +.. +portage-stable:arch/amd64/no-multilib +portage-stable:features/64bit-native +:coreos/targets/usr diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/use.force b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/use.force new file mode 100644 index 0000000000..330bf8920a --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/usr/use.force @@ -0,0 +1,2 @@ +# We don't do multilib. +-multilib 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 ebc8533f3d..2f1fb8758c 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 @@ -36,3 +36,6 @@ PROD_INSTALL_MASK="${INSTALL_MASK} /usr/share/readline /usr/src " + +# No suffix for 'generic' (use base, not base-usr) +COREOS_DISK_LAYOUT_SUFFIX="" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/make.defaults new file mode 100644 index 0000000000..bb4a6de016 --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/make.defaults @@ -0,0 +1,8 @@ +# Copyright (c) 2014 The CoreOS Authors. All rights reserved. +# Distributed under the terms of the GNU General Public License v2 + +# Enable tweaks to install everything under /usr +USE="symlink-usr" + +# Append -usr to disk layout names (use base-usr, not base) +COREOS_DISK_LAYOUT_SUFFIX="-usr" diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/parent new file mode 100644 index 0000000000..aba360ddbe --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/targets/usr/parent @@ -0,0 +1 @@ +:coreos/targets/generic