From 09fda60f5ddc49b1d8b1b453e1589207b0f29f50 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Fri, 13 Sep 2013 22:13:49 -0400 Subject: [PATCH] churn(profiles): Move default/linux/amd64/10.0 Merge the remaining bits of default/linux/amd64/10.0 into the coreos tree. default/linux/amd64/10.0 is now an alias for coreos/amd64/sdk for compatibility with existing configs. --- .../coreos-overlay/profiles/coreos/amd64/generic/parent | 6 ++++-- .../third_party/coreos-overlay/profiles/coreos/amd64/parent | 5 +++++ .../coreos-overlay/profiles/coreos/amd64/sdk/parent | 3 ++- .../{default/linux/amd64/10.0 => coreos/base}/make.defaults | 0 .../{default/linux/amd64/10.0 => coreos/base}/package.use | 0 .../coreos-overlay/profiles/default/linux/amd64/10.0/eapi | 1 - .../profiles/default/linux/amd64/10.0/no-multilib/parent | 3 --- .../coreos-overlay/profiles/default/linux/amd64/10.0/parent | 3 +-- .../coreos-overlay/profiles/default/linux/amd64/parent | 3 --- 9 files changed, 12 insertions(+), 12 deletions(-) create mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent rename sdk_container/src/third_party/coreos-overlay/profiles/{default/linux/amd64/10.0 => coreos/base}/make.defaults (100%) rename sdk_container/src/third_party/coreos-overlay/profiles/{default/linux/amd64/10.0 => coreos/base}/package.use (100%) delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/eapi delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent delete mode 100644 sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/parent diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent index d0670acced..489787307b 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/generic/parent @@ -1,2 +1,4 @@ -coreos:default/linux/amd64/10.0/no-multilib -coreos:coreos/targets/generic +.. +:arch/amd64/no-multilib +portage-stable:features/64bit-native +:coreos/targets/generic diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent new file mode 100644 index 0000000000..d3f67d305c --- /dev/null +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/parent @@ -0,0 +1,5 @@ +:base +:default/linux +:arch/amd64 +portage-stable:releases/10.0 +:coreos/base diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/parent b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/parent index ce282c2139..f0c938676d 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/amd64/sdk/parent @@ -1 +1,2 @@ -:default/linux/amd64/10.0 +.. +:coreos/targets/sdk diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/make.defaults b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/make.defaults rename to sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/make.defaults diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/package.use b/sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use similarity index 100% rename from sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/package.use rename to sdk_container/src/third_party/coreos-overlay/profiles/coreos/base/package.use diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/eapi b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/eapi deleted file mode 100644 index 0cfbf08886..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/eapi +++ /dev/null @@ -1 +0,0 @@ -2 diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent deleted file mode 100644 index fa03b78cac..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/no-multilib/parent +++ /dev/null @@ -1,3 +0,0 @@ -.. -../../../../../arch/amd64/no-multilib -portage-stable:features/64bit-native diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/parent index df2732bccd..5449615cdd 100644 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/parent +++ b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/10.0/parent @@ -1,2 +1 @@ -.. -portage-stable:releases/10.0 +coreos:coreos/amd64/sdk diff --git a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/parent b/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/parent deleted file mode 100644 index 158dd88c5c..0000000000 --- a/sdk_container/src/third_party/coreos-overlay/profiles/default/linux/amd64/parent +++ /dev/null @@ -1,3 +0,0 @@ -../../../base -.. -../../../arch/amd64