From 84c8a45a8dfda1218d151030f155498ca5949280 Mon Sep 17 00:00:00 2001 From: Michael Haubenwallner Date: Tue, 19 Apr 2016 16:43:08 +0200 Subject: [PATCH] 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. --- profiles/prefix/bsd/freebsd/7.1/x64/parent | 2 +- profiles/prefix/bsd/freebsd/7.1/x86/parent | 2 +- profiles/prefix/bsd/freebsd/7.2/x64/parent | 2 +- profiles/prefix/bsd/freebsd/7.2/x86/parent | 2 +- profiles/prefix/bsd/freebsd/8.0/x64/parent | 2 +- profiles/prefix/bsd/freebsd/8.0/x86/parent | 2 +- profiles/prefix/bsd/freebsd/8.1/x64/parent | 2 +- profiles/prefix/bsd/freebsd/8.1/x86/parent | 2 +- profiles/prefix/bsd/freebsd/8.2/x64/parent | 2 +- profiles/prefix/bsd/freebsd/8.2/x86/parent | 2 +- profiles/prefix/bsd/freebsd/9.0/x64/parent | 2 +- profiles/prefix/bsd/freebsd/9.0/x86/parent | 2 +- profiles/prefix/bsd/freebsd/9.1/x64/parent | 2 +- profiles/prefix/bsd/freebsd/9.1/x86/parent | 2 +- profiles/prefix/darwin/macos/10.10/x64/parent | 2 +- profiles/prefix/darwin/macos/10.10/x86/parent | 2 +- profiles/prefix/darwin/macos/10.11/x64/parent | 2 +- profiles/prefix/darwin/macos/10.11/x86/parent | 2 +- profiles/prefix/darwin/macos/10.4/ppc/parent | 2 +- profiles/prefix/darwin/macos/10.4/ppc64/parent | 2 +- profiles/prefix/darwin/macos/10.4/x86/parent | 2 +- profiles/prefix/darwin/macos/10.5/ppc/parent | 2 +- profiles/prefix/darwin/macos/10.5/ppc64/parent | 2 +- profiles/prefix/darwin/macos/10.5/x64/parent | 2 +- profiles/prefix/darwin/macos/10.5/x86/parent | 2 +- profiles/prefix/darwin/macos/10.6/x64/parent | 2 +- profiles/prefix/darwin/macos/10.6/x86/parent | 2 +- profiles/prefix/darwin/macos/10.7/x64/parent | 2 +- profiles/prefix/darwin/macos/10.7/x86/parent | 2 +- profiles/prefix/darwin/macos/10.8/x64/parent | 2 +- profiles/prefix/darwin/macos/10.8/x86/parent | 2 +- profiles/prefix/darwin/macos/10.9/x64/parent | 2 +- profiles/prefix/darwin/macos/10.9/x86/parent | 2 +- profiles/prefix/sunos/solaris/5.10/sparc/parent | 2 +- profiles/prefix/sunos/solaris/5.10/sparc64/parent | 2 +- profiles/prefix/sunos/solaris/5.10/x64/parent | 2 +- profiles/prefix/sunos/solaris/5.10/x86/parent | 2 +- profiles/prefix/sunos/solaris/5.11/sparc/parent | 2 +- profiles/prefix/sunos/solaris/5.11/sparc64/parent | 2 +- profiles/prefix/sunos/solaris/5.11/x64/parent | 2 +- profiles/prefix/sunos/solaris/5.11/x86/parent | 2 +- profiles/prefix/sunos/solaris/5.9/sparc/parent | 2 +- profiles/prefix/sunos/solaris/5.9/sparc64/parent | 2 +- 43 files changed, 43 insertions(+), 43 deletions(-) diff --git a/profiles/prefix/bsd/freebsd/7.1/x64/parent b/profiles/prefix/bsd/freebsd/7.1/x64/parent index fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 6cb6381b7779..59ddeb924a6d 100644 --- 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 4d64089b7bd3..0317d7bdb005 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 6cb6381b7779..59ddeb924a6d 100644 --- 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 4d64089b7bd3..0317d7bdb005 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 133d186d15d3..356d2b757b15 100644 --- 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 9dbef0db89b4..6321d7e3ecda 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 133d186d15d3..356d2b757b15 100644 --- 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 9dbef0db89b4..6321d7e3ecda 100644 --- 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 fc24616eeda4..269f6f48bb15 100644 --- 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 4a6aa36b18d9..93220d096824 100644 --- 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 133d186d15d3..356d2b757b15 100644 --- 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 9dbef0db89b4..6321d7e3ecda 100644 --- 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 -- 2.26.2