profiles: Inline features/32bit-userland

diff --git a/profiles/arch/powerpc/ppc64/32ul/parent b/profiles/arch/powerpc/ppc64/32ul/parent
index feb40253cb2776c1cd448d7d7032d9a152d74687..0cd1f96e318117f9b5f548938e7ce0473225710d 100644 (file)
--- a/profiles/arch/powerpc/ppc64/32ul/parent
+++ b/profiles/arch/powerpc/ppc64/32ul/parent
@@ -1,3 +1,3 @@
-../../../../features/32bit-userland
+../../../../features/multilib
 ..
 ../../ppc32

diff --git a/profiles/default/linux/sparc/13.0/parent b/profiles/default/linux/sparc/13.0/parent
index 222c2cf5693083466156397e050f810c067d9a0f..483b02751681af624e3533f86e13db7875f425e4 100644 (file)
--- a/profiles/default/linux/sparc/13.0/parent
+++ b/profiles/default/linux/sparc/13.0/parent
@@ -1,3 +1,3 @@
 ..
 ../../../../releases/13.0
-../../../../features/32bit-userland
+../../../../features/multilib

diff --git a/profiles/features/32bit-userland/eapi b/profiles/features/32bit-userland/eapi
deleted file mode 100644 (file)
index 7ed6ff8..0000000
--- a/profiles/features/32bit-userland/eapi
+++ /dev/null
@@ -1 +0,0 @@
-5

diff --git a/profiles/features/32bit-userland/parent b/profiles/features/32bit-userland/parent
deleted file mode 100644 (file)
index ef64da6..0000000
--- a/profiles/features/32bit-userland/parent
+++ /dev/null
@@ -1 +0,0 @@
-../multilib

diff --git a/profiles/features/32bit-userland/profile.bashrc b/profiles/features/32bit-userland/profile.bashrc
deleted file mode 100644 (file)
index 9eebc76..0000000
--- a/profiles/features/32bit-userland/profile.bashrc
+++ /dev/null
@@ -1,9 +0,0 @@
-# Here we remove any ABI that isn't 32-bit.
-case ${PROFILE_ARCH} in
-       mips64)
-               # This is for o32 (64-bit kernel, 32-bit userland) so we force -mabi=32
-               export CHOST="mips-unknown-linux-gnu"
-               export CFLAGS="${CFLAGS/-mabi=*/-mabi=32}"
-               export CXXFLAGS="${CFLAGS}"
-               ;;
-esac

diff --git a/profiles/features/32bit-userland/packages b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages
similarity index 100%
rename from profiles/features/32bit-userland/packages
rename to profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages

diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
index 926c3281b8626beaadc56256bb0ccd3a653394aa..97dffb64c4d19551d35a23eb25413c4a472ccc05 100644 (file)
--- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
+++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
@@ -1,2 +1,2 @@
 ..
-../../../../../features/32bit-userland
+../../../../../features/multilib