commit:     dbda43d5c743d42aee14a9fdd2cbc04c6c985615
Author:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 19 14:41:36 2016 +0000
Commit:     Michael Haubenwallner <haubi <AT> gentoo <DOT> org>
CommitDate: Wed Apr 20 08:22:55 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbda43d5

profiles: fix prefix parents, bug#574822

As the final prefix/linux profiles inherit some default/linux profile,
the top-level prefix profile should not inherit the base profile.
Instead, each prefix/non-linux profile can do that.

This should fix bug#574822 and some related ones.

 profiles/prefix/aix/parent     | 1 +
 profiles/prefix/bsd/parent     | 1 +
 profiles/prefix/darwin/parent  | 1 +
 profiles/prefix/hpux/parent    | 1 +
 profiles/prefix/parent         | 1 -
 profiles/prefix/sunos/parent   | 1 +
 profiles/prefix/windows/parent | 1 +
 7 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/profiles/prefix/aix/parent b/profiles/prefix/aix/parent
index f3229c5b..cd11492 100644
--- a/profiles/prefix/aix/parent
+++ b/profiles/prefix/aix/parent
@@ -1 +1,2 @@
+../../base
 ..

diff --git a/profiles/prefix/bsd/parent b/profiles/prefix/bsd/parent
index f3229c5b..cd11492 100644
--- a/profiles/prefix/bsd/parent
+++ b/profiles/prefix/bsd/parent
@@ -1 +1,2 @@
+../../base
 ..

diff --git a/profiles/prefix/darwin/parent b/profiles/prefix/darwin/parent
index f3229c5b..cd11492 100644
--- a/profiles/prefix/darwin/parent
+++ b/profiles/prefix/darwin/parent
@@ -1 +1,2 @@
+../../base
 ..

diff --git a/profiles/prefix/hpux/parent b/profiles/prefix/hpux/parent
index f3229c5b..cd11492 100644
--- a/profiles/prefix/hpux/parent
+++ b/profiles/prefix/hpux/parent
@@ -1 +1,2 @@
+../../base
 ..

diff --git a/profiles/prefix/parent b/profiles/prefix/parent
index a88ecf6..8f0e9fd 100644
--- a/profiles/prefix/parent
+++ b/profiles/prefix/parent
@@ -1,2 +1 @@
-../base
 ../features/prefix/rpath

diff --git a/profiles/prefix/sunos/parent b/profiles/prefix/sunos/parent
index f3229c5b..cd11492 100644
--- a/profiles/prefix/sunos/parent
+++ b/profiles/prefix/sunos/parent
@@ -1 +1,2 @@
+../../base
 ..

diff --git a/profiles/prefix/windows/parent b/profiles/prefix/windows/parent
index f3229c5b..cd11492 100644
--- a/profiles/prefix/windows/parent
+++ b/profiles/prefix/windows/parent
@@ -1 +1,2 @@
+../../base
 ..

Reply via email to