From 68e67c1806e9f3f7f6352718cd3ce2870ff156d6 Mon Sep 17 00:00:00 2001 From: Benda Xu Date: Fri, 12 Jan 2018 22:28:01 +0900 Subject: [PATCH] profiles/prefix: rename beyond-kernel-? to kernel-?+ In addition, mask python 3 USE flags for kernel-2.6.16+. --- .../{beyond-kernel-2.6.16 => kernel-2.6.16+}/make.defaults | 3 ++- .../{beyond-kernel-2.6.16 => kernel-2.6.16+}/package.mask | 0 .../package.unmask | 0 .../{beyond-kernel-2.6.16 => kernel-2.6.16+}/parent | 0 .../profile.bashrc | 0 .../features/prefix/standalone/kernel-2.6.16+/use.mask | 7 +++++++ .../{beyond-kernel-2.6.32 => kernel-2.6.32+}/package.mask | 0 .../package.unmask | 0 .../{beyond-kernel-2.6.32 => kernel-2.6.32+}/parent | 0 profiles/prefix/linux-standalone/amd64/legacy/parent | 2 +- profiles/prefix/linux-standalone/x86/legacy/parent | 2 +- 11 files changed, 11 insertions(+), 3 deletions(-) rename profiles/features/prefix/standalone/{beyond-kernel-2.6.16 => kernel-2.6.16+}/make.defaults (89%) rename profiles/features/prefix/standalone/{beyond-kernel-2.6.16 => kernel-2.6.16+}/package.mask (100%) rename profiles/features/prefix/standalone/{beyond-kernel-2.6.16 => kernel-2.6.16+}/package.unmask (100%) rename profiles/features/prefix/standalone/{beyond-kernel-2.6.16 => kernel-2.6.16+}/parent (100%) rename profiles/features/prefix/standalone/{beyond-kernel-2.6.16 => kernel-2.6.16+}/profile.bashrc (100%) create mode 100644 profiles/features/prefix/standalone/kernel-2.6.16+/use.mask rename profiles/features/prefix/standalone/{beyond-kernel-2.6.32 => kernel-2.6.32+}/package.mask (100%) rename profiles/features/prefix/standalone/{beyond-kernel-2.6.32 => kernel-2.6.32+}/package.unmask (100%) rename profiles/features/prefix/standalone/{beyond-kernel-2.6.32 => kernel-2.6.32+}/parent (100%) diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults similarity index 89% rename from profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults rename to profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults index 22044de87632..510e5e21b3ce 100644 --- a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/make.defaults +++ b/profiles/features/prefix/standalone/kernel-2.6.16+/make.defaults @@ -14,4 +14,5 @@ ac_cv_func_utimensat=no ac_cv_func_pipe2=no # >=python-3 is masked. -PYTHON_TARGETS="-python3_5" +PYTHON_TARGETS="-python3_*" +PYTHON_SINGLE_TARGET=python2_7 diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/package.mask similarity index 100% rename from profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.mask rename to profiles/features/prefix/standalone/kernel-2.6.16+/package.mask diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask b/profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask similarity index 100% rename from profiles/features/prefix/standalone/beyond-kernel-2.6.16/package.unmask rename to profiles/features/prefix/standalone/kernel-2.6.16+/package.unmask diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent b/profiles/features/prefix/standalone/kernel-2.6.16+/parent similarity index 100% rename from profiles/features/prefix/standalone/beyond-kernel-2.6.16/parent rename to profiles/features/prefix/standalone/kernel-2.6.16+/parent diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc b/profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc similarity index 100% rename from profiles/features/prefix/standalone/beyond-kernel-2.6.16/profile.bashrc rename to profiles/features/prefix/standalone/kernel-2.6.16+/profile.bashrc diff --git a/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask new file mode 100644 index 000000000000..2a1686418a8f --- /dev/null +++ b/profiles/features/prefix/standalone/kernel-2.6.16+/use.mask @@ -0,0 +1,7 @@ +# >=python-3 is masked +python_single_target_python3_6 +python_single_target_python3_5 +python_single_target_python3_4 +python_targets_python3_6 +python_targets_python3_5 +python_targets_python3_4 diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask b/profiles/features/prefix/standalone/kernel-2.6.32+/package.mask similarity index 100% rename from profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.mask rename to profiles/features/prefix/standalone/kernel-2.6.32+/package.mask diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask b/profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask similarity index 100% rename from profiles/features/prefix/standalone/beyond-kernel-2.6.32/package.unmask rename to profiles/features/prefix/standalone/kernel-2.6.32+/package.unmask diff --git a/profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent b/profiles/features/prefix/standalone/kernel-2.6.32+/parent similarity index 100% rename from profiles/features/prefix/standalone/beyond-kernel-2.6.32/parent rename to profiles/features/prefix/standalone/kernel-2.6.32+/parent diff --git a/profiles/prefix/linux-standalone/amd64/legacy/parent b/profiles/prefix/linux-standalone/amd64/legacy/parent index a0af85877726..f8002c688eb9 100644 --- a/profiles/prefix/linux-standalone/amd64/legacy/parent +++ b/profiles/prefix/linux-standalone/amd64/legacy/parent @@ -1,2 +1,2 @@ .. -../../../../features/prefix/standalone/beyond-kernel-2.6.16 +../../../../features/prefix/standalone/kernel-2.6.16+ diff --git a/profiles/prefix/linux-standalone/x86/legacy/parent b/profiles/prefix/linux-standalone/x86/legacy/parent index a0af85877726..f8002c688eb9 100644 --- a/profiles/prefix/linux-standalone/x86/legacy/parent +++ b/profiles/prefix/linux-standalone/x86/legacy/parent @@ -1,2 +1,2 @@ .. -../../../../features/prefix/standalone/beyond-kernel-2.6.16 +../../../../features/prefix/standalone/kernel-2.6.16+ -- 2.26.2