profiles/prefix: reorder to have base first, bug#574822

As the base profile does force or mask things for the Gentoo Linux
target, any Prefix specific profile should be inherited later.

This applies to the final BSD, Darwin and Solaris profiles, where the
arch-specific but os-version independent profile now comes just before
the final profile rather than before the base profile.

This also is part of bug#574822, for more natural profile inheritance.

diff --git a/profiles/prefix/bsd/freebsd/7.1/x64/parent b/profiles/prefix/bsd/freebsd/7.1/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/bsd/freebsd/7.1/x64/parent
+++ b/profiles/prefix/bsd/freebsd/7.1/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/bsd/freebsd/7.1/x86/parent b/profiles/prefix/bsd/freebsd/7.1/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/bsd/freebsd/7.1/x86/parent
+++ b/profiles/prefix/bsd/freebsd/7.1/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/bsd/freebsd/7.2/x64/parent b/profiles/prefix/bsd/freebsd/7.2/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/bsd/freebsd/7.2/x64/parent
+++ b/profiles/prefix/bsd/freebsd/7.2/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/bsd/freebsd/7.2/x86/parent b/profiles/prefix/bsd/freebsd/7.2/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/bsd/freebsd/7.2/x86/parent
+++ b/profiles/prefix/bsd/freebsd/7.2/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/bsd/freebsd/8.0/x64/parent b/profiles/prefix/bsd/freebsd/8.0/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/bsd/freebsd/8.0/x64/parent
+++ b/profiles/prefix/bsd/freebsd/8.0/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/bsd/freebsd/8.0/x86/parent b/profiles/prefix/bsd/freebsd/8.0/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/bsd/freebsd/8.0/x86/parent
+++ b/profiles/prefix/bsd/freebsd/8.0/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/bsd/freebsd/8.1/x64/parent b/profiles/prefix/bsd/freebsd/8.1/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/bsd/freebsd/8.1/x64/parent
+++ b/profiles/prefix/bsd/freebsd/8.1/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/bsd/freebsd/8.1/x86/parent b/profiles/prefix/bsd/freebsd/8.1/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/bsd/freebsd/8.1/x86/parent
+++ b/profiles/prefix/bsd/freebsd/8.1/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/bsd/freebsd/8.2/x64/parent b/profiles/prefix/bsd/freebsd/8.2/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/bsd/freebsd/8.2/x64/parent
+++ b/profiles/prefix/bsd/freebsd/8.2/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/bsd/freebsd/8.2/x86/parent b/profiles/prefix/bsd/freebsd/8.2/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/bsd/freebsd/8.2/x86/parent
+++ b/profiles/prefix/bsd/freebsd/8.2/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/bsd/freebsd/9.0/x64/parent b/profiles/prefix/bsd/freebsd/9.0/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/bsd/freebsd/9.0/x64/parent
+++ b/profiles/prefix/bsd/freebsd/9.0/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/bsd/freebsd/9.0/x86/parent b/profiles/prefix/bsd/freebsd/9.0/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/bsd/freebsd/9.0/x86/parent
+++ b/profiles/prefix/bsd/freebsd/9.0/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/bsd/freebsd/9.1/x64/parent b/profiles/prefix/bsd/freebsd/9.1/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/bsd/freebsd/9.1/x64/parent
+++ b/profiles/prefix/bsd/freebsd/9.1/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/bsd/freebsd/9.1/x86/parent b/profiles/prefix/bsd/freebsd/9.1/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/bsd/freebsd/9.1/x86/parent
+++ b/profiles/prefix/bsd/freebsd/9.1/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/darwin/macos/10.10/x64/parent b/profiles/prefix/darwin/macos/10.10/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/darwin/macos/10.10/x64/parent
+++ b/profiles/prefix/darwin/macos/10.10/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/darwin/macos/10.10/x86/parent b/profiles/prefix/darwin/macos/10.10/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/darwin/macos/10.10/x86/parent
+++ b/profiles/prefix/darwin/macos/10.10/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/darwin/macos/10.11/x64/parent b/profiles/prefix/darwin/macos/10.11/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/darwin/macos/10.11/x64/parent
+++ b/profiles/prefix/darwin/macos/10.11/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/darwin/macos/10.11/x86/parent b/profiles/prefix/darwin/macos/10.11/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/darwin/macos/10.11/x86/parent
+++ b/profiles/prefix/darwin/macos/10.11/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/darwin/macos/10.4/ppc/parent b/profiles/prefix/darwin/macos/10.4/ppc/parent
index 6cb6381b777942e87b85841b89fcd69e55f112f7..59ddeb924a6dc18d8b96fd49e449861a4f9bf7ac 100644 (file)
--- a/profiles/prefix/darwin/macos/10.4/ppc/parent
+++ b/profiles/prefix/darwin/macos/10.4/ppc/parent
@@ -1,2 +1,2 @@
-../../arch/ppc
 ..
+../../arch/ppc

diff --git a/profiles/prefix/darwin/macos/10.4/ppc64/parent b/profiles/prefix/darwin/macos/10.4/ppc64/parent
index 4d64089b7bd39a59be0486cb0381f2bfd8c4f9e2..0317d7bdb0058aa09f23c96f7417a1cf3c950871 100644 (file)
--- a/profiles/prefix/darwin/macos/10.4/ppc64/parent
+++ b/profiles/prefix/darwin/macos/10.4/ppc64/parent
@@ -1,2 +1,2 @@
-../../arch/ppc64
 ..
+../../arch/ppc64

diff --git a/profiles/prefix/darwin/macos/10.4/x86/parent b/profiles/prefix/darwin/macos/10.4/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/darwin/macos/10.4/x86/parent
+++ b/profiles/prefix/darwin/macos/10.4/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/darwin/macos/10.5/ppc/parent b/profiles/prefix/darwin/macos/10.5/ppc/parent
index 6cb6381b777942e87b85841b89fcd69e55f112f7..59ddeb924a6dc18d8b96fd49e449861a4f9bf7ac 100644 (file)
--- a/profiles/prefix/darwin/macos/10.5/ppc/parent
+++ b/profiles/prefix/darwin/macos/10.5/ppc/parent
@@ -1,2 +1,2 @@
-../../arch/ppc
 ..
+../../arch/ppc

diff --git a/profiles/prefix/darwin/macos/10.5/ppc64/parent b/profiles/prefix/darwin/macos/10.5/ppc64/parent
index 4d64089b7bd39a59be0486cb0381f2bfd8c4f9e2..0317d7bdb0058aa09f23c96f7417a1cf3c950871 100644 (file)
--- a/profiles/prefix/darwin/macos/10.5/ppc64/parent
+++ b/profiles/prefix/darwin/macos/10.5/ppc64/parent
@@ -1,2 +1,2 @@
-../../arch/ppc64
 ..
+../../arch/ppc64

diff --git a/profiles/prefix/darwin/macos/10.5/x64/parent b/profiles/prefix/darwin/macos/10.5/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/darwin/macos/10.5/x64/parent
+++ b/profiles/prefix/darwin/macos/10.5/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/darwin/macos/10.5/x86/parent b/profiles/prefix/darwin/macos/10.5/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/darwin/macos/10.5/x86/parent
+++ b/profiles/prefix/darwin/macos/10.5/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/darwin/macos/10.6/x64/parent b/profiles/prefix/darwin/macos/10.6/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/darwin/macos/10.6/x64/parent
+++ b/profiles/prefix/darwin/macos/10.6/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/darwin/macos/10.6/x86/parent b/profiles/prefix/darwin/macos/10.6/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/darwin/macos/10.6/x86/parent
+++ b/profiles/prefix/darwin/macos/10.6/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/darwin/macos/10.7/x64/parent b/profiles/prefix/darwin/macos/10.7/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/darwin/macos/10.7/x64/parent
+++ b/profiles/prefix/darwin/macos/10.7/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/darwin/macos/10.7/x86/parent b/profiles/prefix/darwin/macos/10.7/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/darwin/macos/10.7/x86/parent
+++ b/profiles/prefix/darwin/macos/10.7/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/darwin/macos/10.8/x64/parent b/profiles/prefix/darwin/macos/10.8/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/darwin/macos/10.8/x64/parent
+++ b/profiles/prefix/darwin/macos/10.8/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/darwin/macos/10.8/x86/parent b/profiles/prefix/darwin/macos/10.8/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/darwin/macos/10.8/x86/parent
+++ b/profiles/prefix/darwin/macos/10.8/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/darwin/macos/10.9/x64/parent b/profiles/prefix/darwin/macos/10.9/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/darwin/macos/10.9/x64/parent
+++ b/profiles/prefix/darwin/macos/10.9/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/darwin/macos/10.9/x86/parent b/profiles/prefix/darwin/macos/10.9/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/darwin/macos/10.9/x86/parent
+++ b/profiles/prefix/darwin/macos/10.9/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/sunos/solaris/5.10/sparc/parent b/profiles/prefix/sunos/solaris/5.10/sparc/parent
index 133d186d15d329dce6d3733b2b1449cde8275811..356d2b757b15ae5ea6b90572c783e64adac392aa 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.10/sparc/parent
+++ b/profiles/prefix/sunos/solaris/5.10/sparc/parent
@@ -1,2 +1,2 @@
-../../arch/sparc
 ..
+../../arch/sparc

diff --git a/profiles/prefix/sunos/solaris/5.10/sparc64/parent b/profiles/prefix/sunos/solaris/5.10/sparc64/parent
index 9dbef0db89b48d91711026001eeac39de049e01b..6321d7e3ecda2dd600af4e4f518b1c1417ec13ad 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.10/sparc64/parent
+++ b/profiles/prefix/sunos/solaris/5.10/sparc64/parent
@@ -1,2 +1,2 @@
-../../arch/sparc64
 ..
+../../arch/sparc64

diff --git a/profiles/prefix/sunos/solaris/5.10/x64/parent b/profiles/prefix/sunos/solaris/5.10/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.10/x64/parent
+++ b/profiles/prefix/sunos/solaris/5.10/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/sunos/solaris/5.10/x86/parent b/profiles/prefix/sunos/solaris/5.10/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.10/x86/parent
+++ b/profiles/prefix/sunos/solaris/5.10/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/sunos/solaris/5.11/sparc/parent b/profiles/prefix/sunos/solaris/5.11/sparc/parent
index 133d186d15d329dce6d3733b2b1449cde8275811..356d2b757b15ae5ea6b90572c783e64adac392aa 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.11/sparc/parent
+++ b/profiles/prefix/sunos/solaris/5.11/sparc/parent
@@ -1,2 +1,2 @@
-../../arch/sparc
 ..
+../../arch/sparc

diff --git a/profiles/prefix/sunos/solaris/5.11/sparc64/parent b/profiles/prefix/sunos/solaris/5.11/sparc64/parent
index 9dbef0db89b48d91711026001eeac39de049e01b..6321d7e3ecda2dd600af4e4f518b1c1417ec13ad 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.11/sparc64/parent
+++ b/profiles/prefix/sunos/solaris/5.11/sparc64/parent
@@ -1,2 +1,2 @@
-../../arch/sparc64
 ..
+../../arch/sparc64

diff --git a/profiles/prefix/sunos/solaris/5.11/x64/parent b/profiles/prefix/sunos/solaris/5.11/x64/parent
index fc24616eeda4427bdd5a816418d03caa7f2e61cb..269f6f48bb150009ff901a41c5915f68c7a8d750 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.11/x64/parent
+++ b/profiles/prefix/sunos/solaris/5.11/x64/parent
@@ -1,2 +1,2 @@
-../../arch/x64
 ..
+../../arch/x64

diff --git a/profiles/prefix/sunos/solaris/5.11/x86/parent b/profiles/prefix/sunos/solaris/5.11/x86/parent
index 4a6aa36b18d9078bbb9985f0e9f141ac12eb93bb..93220d096824f4270f8a20f536ccd1cf79c13c0a 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.11/x86/parent
+++ b/profiles/prefix/sunos/solaris/5.11/x86/parent
@@ -1,2 +1,2 @@
-../../arch/x86
 ..
+../../arch/x86

diff --git a/profiles/prefix/sunos/solaris/5.9/sparc/parent b/profiles/prefix/sunos/solaris/5.9/sparc/parent
index 133d186d15d329dce6d3733b2b1449cde8275811..356d2b757b15ae5ea6b90572c783e64adac392aa 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.9/sparc/parent
+++ b/profiles/prefix/sunos/solaris/5.9/sparc/parent
@@ -1,2 +1,2 @@
-../../arch/sparc
 ..
+../../arch/sparc

diff --git a/profiles/prefix/sunos/solaris/5.9/sparc64/parent b/profiles/prefix/sunos/solaris/5.9/sparc64/parent
index 9dbef0db89b48d91711026001eeac39de049e01b..6321d7e3ecda2dd600af4e4f518b1c1417ec13ad 100644 (file)
--- a/profiles/prefix/sunos/solaris/5.9/sparc64/parent
+++ b/profiles/prefix/sunos/solaris/5.9/sparc64/parent
@@ -1,2 +1,2 @@
-../../arch/sparc64
 ..
+../../arch/sparc64