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 <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 < "${D}"/usr/etc/${LDSO_ARCH%so.1}path < "${D}"/usr/etc/${LDSO_ARCH%so.1}path <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 <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