Gentoo Archives: gentoo-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-dev] [PATCH 7/8] profiles: Inline features/32bit-userland
Date: Sat, 21 Jan 2017 23:04:49
Message-Id: 20170121225947.11433-8-mgorny@gentoo.org
In Reply to: [gentoo-dev] [PATCH] Profile cleanup, pt. 2: multilib mess by "Michał Górny"
1 ---
2 profiles/arch/powerpc/ppc64/32ul/parent | 2 +-
3 profiles/default/linux/sparc/13.0/parent | 2 +-
4 profiles/features/32bit-userland/eapi | 1 -
5 profiles/features/32bit-userland/parent | 1 -
6 profiles/features/32bit-userland/profile.bashrc | 9 ---------
7 .../linux/powerpc/ppc64}/32bit-userland/packages | 0
8 profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent | 2 +-
9 7 files changed, 3 insertions(+), 14 deletions(-)
10 delete mode 100644 profiles/features/32bit-userland/eapi
11 delete mode 100644 profiles/features/32bit-userland/parent
12 delete mode 100644 profiles/features/32bit-userland/profile.bashrc
13 rename profiles/{features => hardened/linux/powerpc/ppc64}/32bit-userland/packages (100%)
14
15 diff --git a/profiles/arch/powerpc/ppc64/32ul/parent b/profiles/arch/powerpc/ppc64/32ul/parent
16 index feb40253cb27..0cd1f96e3181 100644
17 --- a/profiles/arch/powerpc/ppc64/32ul/parent
18 +++ b/profiles/arch/powerpc/ppc64/32ul/parent
19 @@ -1,3 +1,3 @@
20 -../../../../features/32bit-userland
21 +../../../../features/multilib
22 ..
23 ../../ppc32
24 diff --git a/profiles/default/linux/sparc/13.0/parent b/profiles/default/linux/sparc/13.0/parent
25 index 222c2cf56930..483b02751681 100644
26 --- a/profiles/default/linux/sparc/13.0/parent
27 +++ b/profiles/default/linux/sparc/13.0/parent
28 @@ -1,3 +1,3 @@
29 ..
30 ../../../../releases/13.0
31 -../../../../features/32bit-userland
32 +../../../../features/multilib
33 diff --git a/profiles/features/32bit-userland/eapi b/profiles/features/32bit-userland/eapi
34 deleted file mode 100644
35 index 7ed6ff82de6b..000000000000
36 --- a/profiles/features/32bit-userland/eapi
37 +++ /dev/null
38 @@ -1 +0,0 @@
39 -5
40 diff --git a/profiles/features/32bit-userland/parent b/profiles/features/32bit-userland/parent
41 deleted file mode 100644
42 index ef64da6e1d20..000000000000
43 --- a/profiles/features/32bit-userland/parent
44 +++ /dev/null
45 @@ -1 +0,0 @@
46 -../multilib
47 diff --git a/profiles/features/32bit-userland/profile.bashrc b/profiles/features/32bit-userland/profile.bashrc
48 deleted file mode 100644
49 index 9eebc767690d..000000000000
50 --- a/profiles/features/32bit-userland/profile.bashrc
51 +++ /dev/null
52 @@ -1,9 +0,0 @@
53 -# Here we remove any ABI that isn't 32-bit.
54 -case ${PROFILE_ARCH} in
55 - mips64)
56 - # This is for o32 (64-bit kernel, 32-bit userland) so we force -mabi=32
57 - export CHOST="mips-unknown-linux-gnu"
58 - export CFLAGS="${CFLAGS/-mabi=*/-mabi=32}"
59 - export CXXFLAGS="${CFLAGS}"
60 - ;;
61 -esac
62 diff --git a/profiles/features/32bit-userland/packages b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages
63 similarity index 100%
64 rename from profiles/features/32bit-userland/packages
65 rename to profiles/hardened/linux/powerpc/ppc64/32bit-userland/packages
66 diff --git a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
67 index 926c3281b862..97dffb64c4d1 100644
68 --- a/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
69 +++ b/profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent
70 @@ -1,2 +1,2 @@
71 ..
72 -../../../../../features/32bit-userland
73 +../../../../../features/multilib
74 --
75 2.11.0