From abfefda263b3caf814e9f8d3a7b69959c9c26588 Mon Sep 17 00:00:00 2001
From: Felix Janda <felix.janda@posteo.de>
Date: Fri, 23 May 2014 21:48:58 +0200
Subject: [PATCH] tools-musl/catalyst: add missing variants of amd64 and i686

Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
---
 tools-musl/catalyst/portage.amd64.hardened/bashrc | 15 +++++++++++++++
 .../portage.amd64.hardened/env/libintl.conf       |  2 ++
 .../portage.amd64.hardened/env/parallel.conf      |  1 +
 .../portage.amd64.hardened/make.profile/parent    |  1 +
 .../catalyst/portage.amd64.hardened/package.env   |  9 +++++++++
 .../portage.amd64.hardened/package.keywords       |  2 ++
 .../catalyst/portage.amd64.hardened/package.mask  |  3 +++
 .../portage.amd64.hardened/package.unmask         |  1 +
 .../catalyst/portage.amd64.hardened/package.use   |  1 +
 tools-musl/catalyst/portage.amd64.vanilla/bashrc  |  8 ++++----
 .../portage.amd64.vanilla/make.profile/use.mask   |  1 +
 tools-musl/catalyst/portage.i686.hardened/bashrc  | 15 +++++++++++++++
 .../portage.i686.hardened/env/libintl.conf        |  2 ++
 .../portage.i686.hardened/env/parallel.conf       |  1 +
 .../portage.i686.hardened/make.profile/parent     |  1 +
 .../catalyst/portage.i686.hardened/package.env    |  9 +++++++++
 .../portage.i686.hardened/package.keywords        |  2 ++
 .../catalyst/portage.i686.hardened/package.mask   |  3 +++
 .../catalyst/portage.i686.hardened/package.unmask |  1 +
 .../catalyst/portage.i686.hardened/package.use    |  1 +
 tools-musl/catalyst/portage.i686.vanilla/bashrc   | 15 +++++++++++++++
 .../portage.i686.vanilla/env/libintl.conf         |  2 ++
 .../portage.i686.vanilla/env/parallel.conf        |  1 +
 .../portage.i686.vanilla/make.profile/parent      |  1 +
 .../portage.i686.vanilla/make.profile/use.mask    |  1 +
 .../catalyst/portage.i686.vanilla/package.env     |  9 +++++++++
 .../portage.i686.vanilla/package.keywords         |  2 ++
 .../catalyst/portage.i686.vanilla/package.mask    |  3 +++
 .../catalyst/portage.i686.vanilla/package.unmask  |  1 +
 .../catalyst/portage.i686.vanilla/package.use     |  1 +
 tools-musl/catalyst/run.sh                        | 12 ++++--------
 31 files changed, 115 insertions(+), 12 deletions(-)
 create mode 100644 tools-musl/catalyst/portage.amd64.hardened/bashrc
 create mode 100644 tools-musl/catalyst/portage.amd64.hardened/env/libintl.conf
 create mode 100644 tools-musl/catalyst/portage.amd64.hardened/env/parallel.conf
 create mode 100644 tools-musl/catalyst/portage.amd64.hardened/make.profile/parent
 create mode 100644 tools-musl/catalyst/portage.amd64.hardened/package.env
 create mode 100644 tools-musl/catalyst/portage.amd64.hardened/package.keywords
 create mode 100644 tools-musl/catalyst/portage.amd64.hardened/package.mask
 create mode 100644 tools-musl/catalyst/portage.amd64.hardened/package.unmask
 create mode 100644 tools-musl/catalyst/portage.amd64.hardened/package.use
 create mode 100644 tools-musl/catalyst/portage.amd64.vanilla/make.profile/use.mask
 create mode 100644 tools-musl/catalyst/portage.i686.hardened/bashrc
 create mode 100644 tools-musl/catalyst/portage.i686.hardened/env/libintl.conf
 create mode 100644 tools-musl/catalyst/portage.i686.hardened/env/parallel.conf
 create mode 100644 tools-musl/catalyst/portage.i686.hardened/make.profile/parent
 create mode 100644 tools-musl/catalyst/portage.i686.hardened/package.env
 create mode 100644 tools-musl/catalyst/portage.i686.hardened/package.keywords
 create mode 100644 tools-musl/catalyst/portage.i686.hardened/package.mask
 create mode 100644 tools-musl/catalyst/portage.i686.hardened/package.unmask
 create mode 100644 tools-musl/catalyst/portage.i686.hardened/package.use
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/bashrc
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/env/parallel.conf
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/make.profile/parent
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/make.profile/use.mask
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/package.env
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/package.keywords
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/package.mask
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/package.unmask
 create mode 100644 tools-musl/catalyst/portage.i686.vanilla/package.use

diff --git a/tools-musl/catalyst/portage.amd64.hardened/bashrc b/tools-musl/catalyst/portage.amd64.hardened/bashrc
new file mode 100644
index 00000000..70b67d2f
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.hardened/bashrc
@@ -0,0 +1,15 @@
+post_src_install() {
+	[[ $PN != musl ]] && return 0
+
+	local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
+	mkdir "${D}"/usr/etc
+	cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
+/lib
+/usr/lib
+/usr/local/lib
+/usr/lib/opengl/xorg-x11/lib
+/usr/lib/gcc/${CHOST}/4.7.3
+/usr/${CHOST}/lib
+/usr/games/lib
+EOF
+}
diff --git a/tools-musl/catalyst/portage.amd64.hardened/env/libintl.conf b/tools-musl/catalyst/portage.amd64.hardened/env/libintl.conf
new file mode 100644
index 00000000..06356b5d
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.hardened/env/libintl.conf
@@ -0,0 +1,2 @@
+CFLAGS="-Wl,-lintl"
+LDFLAGS="-lintl"
diff --git a/tools-musl/catalyst/portage.amd64.hardened/env/parallel.conf b/tools-musl/catalyst/portage.amd64.hardened/env/parallel.conf
new file mode 100644
index 00000000..c67232a0
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.hardened/env/parallel.conf
@@ -0,0 +1 @@
+MAKEOPTS=-j1
diff --git a/tools-musl/catalyst/portage.amd64.hardened/make.profile/parent b/tools-musl/catalyst/portage.amd64.hardened/make.profile/parent
new file mode 100644
index 00000000..d224f931
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.hardened/make.profile/parent
@@ -0,0 +1 @@
+/usr/portage/profiles/hardened/linux/musl/amd64
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.env b/tools-musl/catalyst/portage.amd64.hardened/package.env
new file mode 100644
index 00000000..35748774
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.env
@@ -0,0 +1,9 @@
+dev-libs/glib libintl.conf
+dev-libs/libelf libintl.conf
+sys-apps/attr libintl.conf
+sys-apps/kbd libintl.conf
+sys-apps/man-db parallel.conf
+sys-apps/net-tools libintl.conf
+sys-fs/e2fsprogs libintl.conf
+sys-fs/eudev libintl.conf
+sys-process/procps libintl.conf
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.keywords b/tools-musl/catalyst/portage.amd64.hardened/package.keywords
new file mode 100644
index 00000000..9a9769cb
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.keywords
@@ -0,0 +1,2 @@
+=sys-libs/musl-1.1.0 ~*
+=sys-apps/getent-0 ~*
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.mask b/tools-musl/catalyst/portage.amd64.hardened/package.mask
new file mode 100644
index 00000000..794369ed
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.mask
@@ -0,0 +1,3 @@
+>sys-devel/gcc-4.7.3-r99
+sys-apps/systemd
+sys-fs/udev
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.unmask b/tools-musl/catalyst/portage.amd64.hardened/package.unmask
new file mode 100644
index 00000000..6aabccd9
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.unmask
@@ -0,0 +1 @@
+=dev-libs/openssl-1.0.1g-r99::hardened-dev
diff --git a/tools-musl/catalyst/portage.amd64.hardened/package.use b/tools-musl/catalyst/portage.amd64.hardened/package.use
new file mode 100644
index 00000000..4ef695a6
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.hardened/package.use
@@ -0,0 +1 @@
+sys-libs/musl nls
diff --git a/tools-musl/catalyst/portage.amd64.vanilla/bashrc b/tools-musl/catalyst/portage.amd64.vanilla/bashrc
index dac928d2..70b67d2f 100644
--- a/tools-musl/catalyst/portage.amd64.vanilla/bashrc
+++ b/tools-musl/catalyst/portage.amd64.vanilla/bashrc
@@ -1,15 +1,15 @@
 post_src_install() {
 	[[ $PN != musl ]] && return 0
 
-	local arch=$(basename "${D}"/lib/ld-musl-*.so.1)
+	local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
 	mkdir "${D}"/usr/etc
-	cat > "${D}"/usr/etc/${arch%so.1}path <<EOF
+	cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
 /lib
 /usr/lib
 /usr/local/lib
 /usr/lib/opengl/xorg-x11/lib
-/usr/lib/gcc/x86_64-gentoo-linux-musl/4.7.3
-/usr/x86_64-gentoo-linux-musl/lib
+/usr/lib/gcc/${CHOST}/4.7.3
+/usr/${CHOST}/lib
 /usr/games/lib
 EOF
 }
diff --git a/tools-musl/catalyst/portage.amd64.vanilla/make.profile/use.mask b/tools-musl/catalyst/portage.amd64.vanilla/make.profile/use.mask
new file mode 100644
index 00000000..cf56f2f6
--- /dev/null
+++ b/tools-musl/catalyst/portage.amd64.vanilla/make.profile/use.mask
@@ -0,0 +1 @@
+hardened
diff --git a/tools-musl/catalyst/portage.i686.hardened/bashrc b/tools-musl/catalyst/portage.i686.hardened/bashrc
new file mode 100644
index 00000000..70b67d2f
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.hardened/bashrc
@@ -0,0 +1,15 @@
+post_src_install() {
+	[[ $PN != musl ]] && return 0
+
+	local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
+	mkdir "${D}"/usr/etc
+	cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
+/lib
+/usr/lib
+/usr/local/lib
+/usr/lib/opengl/xorg-x11/lib
+/usr/lib/gcc/${CHOST}/4.7.3
+/usr/${CHOST}/lib
+/usr/games/lib
+EOF
+}
diff --git a/tools-musl/catalyst/portage.i686.hardened/env/libintl.conf b/tools-musl/catalyst/portage.i686.hardened/env/libintl.conf
new file mode 100644
index 00000000..06356b5d
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.hardened/env/libintl.conf
@@ -0,0 +1,2 @@
+CFLAGS="-Wl,-lintl"
+LDFLAGS="-lintl"
diff --git a/tools-musl/catalyst/portage.i686.hardened/env/parallel.conf b/tools-musl/catalyst/portage.i686.hardened/env/parallel.conf
new file mode 100644
index 00000000..c67232a0
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.hardened/env/parallel.conf
@@ -0,0 +1 @@
+MAKEOPTS=-j1
diff --git a/tools-musl/catalyst/portage.i686.hardened/make.profile/parent b/tools-musl/catalyst/portage.i686.hardened/make.profile/parent
new file mode 100644
index 00000000..b9abebd4
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.hardened/make.profile/parent
@@ -0,0 +1 @@
+/usr/portage/profiles/hardened/linux/musl/x86
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.env b/tools-musl/catalyst/portage.i686.hardened/package.env
new file mode 100644
index 00000000..35748774
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.hardened/package.env
@@ -0,0 +1,9 @@
+dev-libs/glib libintl.conf
+dev-libs/libelf libintl.conf
+sys-apps/attr libintl.conf
+sys-apps/kbd libintl.conf
+sys-apps/man-db parallel.conf
+sys-apps/net-tools libintl.conf
+sys-fs/e2fsprogs libintl.conf
+sys-fs/eudev libintl.conf
+sys-process/procps libintl.conf
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.keywords b/tools-musl/catalyst/portage.i686.hardened/package.keywords
new file mode 100644
index 00000000..9a9769cb
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.hardened/package.keywords
@@ -0,0 +1,2 @@
+=sys-libs/musl-1.1.0 ~*
+=sys-apps/getent-0 ~*
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.mask b/tools-musl/catalyst/portage.i686.hardened/package.mask
new file mode 100644
index 00000000..794369ed
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.hardened/package.mask
@@ -0,0 +1,3 @@
+>sys-devel/gcc-4.7.3-r99
+sys-apps/systemd
+sys-fs/udev
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.unmask b/tools-musl/catalyst/portage.i686.hardened/package.unmask
new file mode 100644
index 00000000..6aabccd9
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.hardened/package.unmask
@@ -0,0 +1 @@
+=dev-libs/openssl-1.0.1g-r99::hardened-dev
diff --git a/tools-musl/catalyst/portage.i686.hardened/package.use b/tools-musl/catalyst/portage.i686.hardened/package.use
new file mode 100644
index 00000000..4ef695a6
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.hardened/package.use
@@ -0,0 +1 @@
+sys-libs/musl nls
diff --git a/tools-musl/catalyst/portage.i686.vanilla/bashrc b/tools-musl/catalyst/portage.i686.vanilla/bashrc
new file mode 100644
index 00000000..70b67d2f
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/bashrc
@@ -0,0 +1,15 @@
+post_src_install() {
+	[[ $PN != musl ]] && return 0
+
+	local LDSO_ARCH=$(basename "${D}"/lib/ld-musl-*.so.1)
+	mkdir "${D}"/usr/etc
+	cat > "${D}"/usr/etc/${LDSO_ARCH%so.1}path <<EOF
+/lib
+/usr/lib
+/usr/local/lib
+/usr/lib/opengl/xorg-x11/lib
+/usr/lib/gcc/${CHOST}/4.7.3
+/usr/${CHOST}/lib
+/usr/games/lib
+EOF
+}
diff --git a/tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf b/tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf
new file mode 100644
index 00000000..06356b5d
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf
@@ -0,0 +1,2 @@
+CFLAGS="-Wl,-lintl"
+LDFLAGS="-lintl"
diff --git a/tools-musl/catalyst/portage.i686.vanilla/env/parallel.conf b/tools-musl/catalyst/portage.i686.vanilla/env/parallel.conf
new file mode 100644
index 00000000..c67232a0
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/env/parallel.conf
@@ -0,0 +1 @@
+MAKEOPTS=-j1
diff --git a/tools-musl/catalyst/portage.i686.vanilla/make.profile/parent b/tools-musl/catalyst/portage.i686.vanilla/make.profile/parent
new file mode 100644
index 00000000..b9abebd4
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/make.profile/parent
@@ -0,0 +1 @@
+/usr/portage/profiles/hardened/linux/musl/x86
diff --git a/tools-musl/catalyst/portage.i686.vanilla/make.profile/use.mask b/tools-musl/catalyst/portage.i686.vanilla/make.profile/use.mask
new file mode 100644
index 00000000..cf56f2f6
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/make.profile/use.mask
@@ -0,0 +1 @@
+hardened
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.env b/tools-musl/catalyst/portage.i686.vanilla/package.env
new file mode 100644
index 00000000..35748774
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.env
@@ -0,0 +1,9 @@
+dev-libs/glib libintl.conf
+dev-libs/libelf libintl.conf
+sys-apps/attr libintl.conf
+sys-apps/kbd libintl.conf
+sys-apps/man-db parallel.conf
+sys-apps/net-tools libintl.conf
+sys-fs/e2fsprogs libintl.conf
+sys-fs/eudev libintl.conf
+sys-process/procps libintl.conf
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.keywords b/tools-musl/catalyst/portage.i686.vanilla/package.keywords
new file mode 100644
index 00000000..9a9769cb
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.keywords
@@ -0,0 +1,2 @@
+=sys-libs/musl-1.1.0 ~*
+=sys-apps/getent-0 ~*
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.mask b/tools-musl/catalyst/portage.i686.vanilla/package.mask
new file mode 100644
index 00000000..794369ed
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.mask
@@ -0,0 +1,3 @@
+>sys-devel/gcc-4.7.3-r99
+sys-apps/systemd
+sys-fs/udev
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.unmask b/tools-musl/catalyst/portage.i686.vanilla/package.unmask
new file mode 100644
index 00000000..6aabccd9
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.unmask
@@ -0,0 +1 @@
+=dev-libs/openssl-1.0.1g-r99::hardened-dev
diff --git a/tools-musl/catalyst/portage.i686.vanilla/package.use b/tools-musl/catalyst/portage.i686.vanilla/package.use
new file mode 100644
index 00000000..4ef695a6
--- /dev/null
+++ b/tools-musl/catalyst/portage.i686.vanilla/package.use
@@ -0,0 +1 @@
+sys-libs/musl nls
diff --git a/tools-musl/catalyst/run.sh b/tools-musl/catalyst/run.sh
index f72f925e..4cfb5b33 100755
--- a/tools-musl/catalyst/run.sh
+++ b/tools-musl/catalyst/run.sh
@@ -106,18 +106,14 @@ main() {
 
   catalyst -s current | tee -a zzz.log >snapshot.log 2>snapshot.err
 
-#  for arch in amd64 i686; do
-#    for flavor in hardened vanilla; do
-  for arch in amd64; do
-    for flavor in vanilla; do
+  for arch in amd64 i686; do
+    for flavor in hardened vanilla; do
       prepare_confs ${arch} ${flavor}
     done
   done
   
-#  for arch in amd64 i686; do
-#    for flavor in hardened vanilla; do
-  for arch in amd64; do
-    for flavor in vanilla; do
+  for arch in amd64 i686; do
+    for flavor in hardened vanilla; do
       do_stages ${arch} ${flavor}
       ret=$?
       if [[ $? == 1 ]]; then