Using Chris' multi-inheritance goddess.

svn path=/; revision=404

11 files changed, 11 insertions, 11 deletions

diff --git a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage1.spec b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage1.spec
index 056d8d7..d5e3a23 100644
--- a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage1.spec
+++ b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage1.spec
@@ -2,7 +2,7 @@ subarch: amd64
 target: stage1
 version_stamp: hardened+nomultilib-2008.0_pre
 rel_type: default
-profile: hardened/amd64
+profile: hardened/linux/amd64/nomultilib
 snapshot: 2008.0
 source_subpath: stage3-amd64-hardened-2007.0
 cflags: -O2 -pipe -fforce-addr
diff --git a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage2.spec b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage2.spec
index 5f9890a..d185a00 100644
--- a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage2.spec
+++ b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage2.spec
@@ -2,7 +2,7 @@ subarch: amd64
 target: stage2
 version_stamp: hardened+nomultilib-2008.0_pre
 rel_type: default
-profile: hardened/amd64
+profile: hardened/linux/amd64/nomultilib
 snapshot: 2008.0
 source_subpath: default/stage1-amd64-hardened+nomultilib-2008.0_pre
 cflags: -O2 -pipe -fforce-addr
diff --git a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage3.spec b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage3.spec
index 7dd9b8c..43ec2c9 100644
--- a/catalyst/specs/glibc/amd64/hardened/nomultilib/stage3.spec
+++ b/catalyst/specs/glibc/amd64/hardened/nomultilib/stage3.spec
@@ -2,7 +2,7 @@ subarch: amd64
 target: stage3
 version_stamp: hardened+nomultilib-2008.0_pre
 rel_type: default
-profile: hardened/amd64
+profile: hardened/linux/amd64/nomultilib
 snapshot: 2008.0
 source_subpath: default/stage2-amd64-hardened+nomultilib-2008.0_pre
 cflags: -O2 -pipe -fforce-addr
diff --git a/catalyst/specs/glibc/amd64/hardened/stage1.spec b/catalyst/specs/glibc/amd64/hardened/stage1.spec
index 7b72d05..a0b0b61 100644
--- a/catalyst/specs/glibc/amd64/hardened/stage1.spec
+++ b/catalyst/specs/glibc/amd64/hardened/stage1.spec
@@ -2,7 +2,7 @@ subarch: amd64
 target: stage1
 version_stamp: hardened-2008.0_pre
 rel_type: default
-profile: hardened/amd64/multilib
+profile: hardened/linux/amd64
 snapshot: 2008.0
 source_subpath: stage3-amd64-hardened-multilib-2007.0
 cflags: -O2 -pipe -fforce-addr
diff --git a/catalyst/specs/glibc/amd64/hardened/stage2.spec b/catalyst/specs/glibc/amd64/hardened/stage2.spec
index 09b043b..a4af15e 100644
--- a/catalyst/specs/glibc/amd64/hardened/stage2.spec
+++ b/catalyst/specs/glibc/amd64/hardened/stage2.spec
@@ -2,7 +2,7 @@ subarch: amd64
 target: stage2
 version_stamp: hardened-2008.0_pre
 rel_type: default
-profile: hardened/amd64/multilib
+profile: hardened/linux/amd64
 snapshot: 2008.0
 source_subpath: default/stage1-amd64-hardened-2008.0_pre
 cflags: -O2 -pipe -fforce-addr
diff --git a/catalyst/specs/glibc/amd64/hardened/stage3.spec b/catalyst/specs/glibc/amd64/hardened/stage3.spec
index 778b71f..3130b81 100644
--- a/catalyst/specs/glibc/amd64/hardened/stage3.spec
+++ b/catalyst/specs/glibc/amd64/hardened/stage3.spec
@@ -2,7 +2,7 @@ subarch: amd64
 target: stage3
 version_stamp: hardened-2008.0_pre
 rel_type: default
-profile: hardened/amd64/multilib
+profile: hardened/linux/amd64
 snapshot: 2008.0
 source_subpath: default/stage2-amd64-hardened-2008.0_pre
 cflags: -O2 -pipe -fforce-addr
diff --git a/catalyst/specs/glibc/x86/hardened/stage1.spec b/catalyst/specs/glibc/x86/hardened/stage1.spec
index 2200663..b0e3c14 100644
--- a/catalyst/specs/glibc/x86/hardened/stage1.spec
+++ b/catalyst/specs/glibc/x86/hardened/stage1.spec
@@ -2,7 +2,7 @@ subarch: x86
 target: stage1
 version_stamp: hardened-2008.0_pre
 rel_type: default
-profile: hardened/x86/2.6
+profile: hardened/linux/x86
 snapshot: 2008.0
 source_subpath: stage3-x86-hardened-2.6-2007.0
 chost: i486-pc-linux-gnu
diff --git a/catalyst/specs/glibc/x86/hardened/stage2.spec b/catalyst/specs/glibc/x86/hardened/stage2.spec
index 696fbbc..317a26f 100644
--- a/catalyst/specs/glibc/x86/hardened/stage2.spec
+++ b/catalyst/specs/glibc/x86/hardened/stage2.spec
@@ -2,7 +2,7 @@ subarch: x86
 target: stage2
 version_stamp: hardened-2008.0_pre
 rel_type: default
-profile: hardened/x86/2.6
+profile: hardened/linux/x86
 snapshot: 2008.0
 source_subpath: default/stage1-x86-hardened-2008.0_pre
 chost: i486-pc-linux-gnu
diff --git a/catalyst/specs/glibc/x86/hardened/stage3.spec b/catalyst/specs/glibc/x86/hardened/stage3.spec
index d6d5433..459d7ad 100644
--- a/catalyst/specs/glibc/x86/hardened/stage3.spec
+++ b/catalyst/specs/glibc/x86/hardened/stage3.spec
@@ -2,7 +2,7 @@ subarch: x86
 target: stage3
 version_stamp: hardened-2008.0_pre
 rel_type: default
-profile: hardened/x86/2.6
+profile: hardened/linux/x86
 snapshot: 2008.0
 source_subpath: default/stage2-x86-hardened-2008.0_pre
 cflags: -mtune=i486 -O2 -pipe -fforce-addr
diff --git a/catalyst/specs/glibc/x86/i686/hardened/stage2.spec b/catalyst/specs/glibc/x86/i686/hardened/stage2.spec
index 6c09f51..114d55f 100644
--- a/catalyst/specs/glibc/x86/i686/hardened/stage2.spec
+++ b/catalyst/specs/glibc/x86/i686/hardened/stage2.spec
@@ -2,7 +2,7 @@ subarch: i686
 target: stage2
 version_stamp: hardened-2008.0_pre
 rel_type: default
-profile: hardened/x86/2.6
+profile: hardened/linux/x86
 snapshot: 2008.0
 source_subpath: default/stage1-x86-hardened-2008.0_pre
 chost: i686-pc-linux-gnu
diff --git a/catalyst/specs/glibc/x86/i686/hardened/stage3.spec b/catalyst/specs/glibc/x86/i686/hardened/stage3.spec
index 8074c03..f5ba01e 100644
--- a/catalyst/specs/glibc/x86/i686/hardened/stage3.spec
+++ b/catalyst/specs/glibc/x86/i686/hardened/stage3.spec
@@ -2,7 +2,7 @@ subarch: i686
 target: stage3
 version_stamp: hardened-2008.0_pre
 rel_type: default
-profile: hardened/x86/2.6
+profile: hardened/linux/x86
 snapshot: 2008.0
 source_subpath: default/stage2-i686-hardened-2008.0_pre
 cflags: -mtune=i686 -O2 -pipe -fforce-addr