From: "Michał Górny" <mgorny@gentoo.org>
To: gentoo-dev@lists.gentoo.org
Cc: "Michał Górny" <mgorny@gentoo.org>
Subject: [gentoo-dev] [PATCH 7/8] profiles: Inline features/32bit-userland
Date: Sat, 21 Jan 2017 23:59:46 +0100 [thread overview]
Message-ID: <20170121225947.11433-8-mgorny@gentoo.org> (raw)
In-Reply-To: <20170121225947.11433-1-mgorny@gentoo.org>
---
profiles/arch/powerpc/ppc64/32ul/parent | 2 +-
profiles/default/linux/sparc/13.0/parent | 2 +-
profiles/features/32bit-userland/eapi | 1 -
profiles/features/32bit-userland/parent | 1 -
profiles/features/32bit-userland/profile.bashrc | 9 ---------
.../linux/powerpc/ppc64}/32bit-userland/packages | 0
profiles/hardened/linux/powerpc/ppc64/32bit-userland/parent | 2 +-
7 files changed, 3 insertions(+), 14 deletions(-)
delete mode 100644 profiles/features/32bit-userland/eapi
delete mode 100644 profiles/features/32bit-userland/parent
delete mode 100644 profiles/features/32bit-userland/profile.bashrc
rename profiles/{features => hardened/linux/powerpc/ppc64}/32bit-userland/packages (100%)
diff --git a/profiles/arch/powerpc/ppc64/32ul/parent b/profiles/arch/powerpc/ppc64/32ul/parent
index feb40253cb27..0cd1f96e3181 100644
--- 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 222c2cf56930..483b02751681 100644
--- 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
index 7ed6ff82de6b..000000000000
--- 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
index ef64da6e1d20..000000000000
--- 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
index 9eebc767690d..000000000000
--- 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 926c3281b862..97dffb64c4d1 100644
--- 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
--
2.11.0
next prev parent reply other threads:[~2017-01-21 23:04 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-21 22:59 [gentoo-dev] [PATCH] Profile cleanup, pt. 2: multilib mess Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 1/8] profiles/hardened: Include base amd64-multilib profile in subprofile Michał Górny
2017-03-02 14:09 ` [gentoo-dev] profiles/arch/amd64/no-multilib cleanup WAS: " Michael Haubenwallner
2017-03-02 16:40 ` Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 2/8] profiles: Move amd64-specific masks to amd64 where they belong Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 3/8] profiles/*/amd64/*/no-multilib: stop using features/64bit-native Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 4/8] profiles/*/ppc64: " Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 5/8] profiles/features: Remove unused *bit-native Michał Górny
2017-01-21 22:59 ` [gentoo-dev] [PATCH 6/8] profiles: Inline features/multilib/lib32 Michał Górny
2017-01-21 22:59 ` Michał Górny [this message]
2017-01-21 22:59 ` [gentoo-dev] [PATCH 8/8] profiles: Move LIBDIR_* declarations into specific arches Michał Górny
2017-02-01 12:28 ` [gentoo-dev] [PATCH] Profile cleanup, pt. 2: multilib mess Michał Górny
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170121225947.11433-8-mgorny@gentoo.org \
--to=mgorny@gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox