From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id F0A411381FA for ; Fri, 30 May 2014 20:19:35 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DFF96E09FF; Fri, 30 May 2014 20:19:25 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 686C9E09FE for ; Fri, 30 May 2014 20:19:25 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3391533FDC2 for ; Fri, 30 May 2014 20:19:22 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id D68ED181A9 for ; Fri, 30 May 2014 20:19:20 +0000 (UTC) From: "Anthony G. Basile" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Anthony G. Basile" Message-ID: <1401481276.abfefda263b3caf814e9f8d3a7b69959c9c26588.blueness@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-musl/catalyst/portage.i686.vanilla/, ... X-VCS-Repository: proj/releng X-VCS-Files: tools-musl/catalyst/portage.amd64.hardened/bashrc tools-musl/catalyst/portage.amd64.hardened/env/libintl.conf tools-musl/catalyst/portage.amd64.hardened/env/parallel.conf tools-musl/catalyst/portage.amd64.hardened/make.profile/parent tools-musl/catalyst/portage.amd64.hardened/package.env tools-musl/catalyst/portage.amd64.hardened/package.keywords tools-musl/catalyst/portage.amd64.hardened/package.mask tools-musl/catalyst/portage.amd64.hardened/package.unmask tools-musl/catalyst/portage.amd64.hardened/package.use tools-musl/catalyst/portage.amd64.vanilla/bashrc tools-musl/catalyst/portage.amd64.vanilla/make.profile/use.mask tools-musl/catalyst/portage.i686.hardened/bashrc tools-musl/catalyst/portage.i686.hardened/env/libintl.conf tools-musl/catalyst/portage.i686.hardened/env/parallel.conf tools-musl/catalyst/portage.i686.hardened/make.profile/parent tools-musl/catalyst/portage.i686.hardened/package.env tools-musl/catalyst/portage.i686.hardened/package.keywords tools-musl/ catalyst/portage.i686.hardened/package.mask tools-musl/catalyst/portage.i686.hardened/package.unmask tools-musl/catalyst/portage.i686.hardened/package.use tools-musl/catalyst/portage.i686.vanilla/bashrc tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf tools-musl/catalyst/portage.i686.vanilla/env/parallel.conf tools-musl/catalyst/portage.i686.vanilla/make.profile/parent tools-musl/catalyst/portage.i686.vanilla/make.profile/use.mask tools-musl/catalyst/portage.i686.vanilla/package.env tools-musl/catalyst/portage.i686.vanilla/package.keywords tools-musl/catalyst/portage.i686.vanilla/package.mask tools-musl/catalyst/portage.i686.vanilla/package.unmask tools-musl/catalyst/portage.i686.vanilla/package.use tools-musl/catalyst/run.sh X-VCS-Directories: tools-musl/catalyst/portage.i686.vanilla/ tools-musl/catalyst/portage.i686.vanilla/env/ tools-musl/catalyst/portage.amd64.vanilla/make.profile/ tools-musl/catalyst/ tools-musl/catalyst/portage.i686.hardened/env/ tools-musl/catalyst/portage.amd64.hardened/env/ tools-musl/catalyst/portage.i686.vanilla/make.profile/ tools-musl/catalyst/portage.i686.hardened/make.profile/ tools-musl/catalyst/portage.i686.hardened/ tools-musl/catalyst/portage.amd64.vanilla/ tools-musl/catalyst/portage.amd64.hardened/make.profile/ tools-musl/catalyst/portage.amd64.hardened/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: abfefda263b3caf814e9f8d3a7b69959c9c26588 X-VCS-Branch: master Date: Fri, 30 May 2014 20:19:20 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 2af807fe-afb7-42d7-9bc5-9997889ef8a3 X-Archives-Hash: f9a839c3674bb2d5088b6bb330f36e39 commit: abfefda263b3caf814e9f8d3a7b69959c9c26588 Author: Felix Janda posteo de> AuthorDate: Fri May 23 19:48:58 2014 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri May 30 20:21:16 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=abfefda2 tools-musl/catalyst: add missing variants of amd64 and i686 Signed-off-by: Anthony G. Basile gentoo.org> --- tools-musl/catalyst/portage.amd64.hardened/bashrc | 15 +++++++++++++++ .../catalyst/portage.amd64.hardened/env/libintl.conf | 2 ++ .../catalyst/portage.amd64.hardened/env/parallel.conf | 1 + .../catalyst/portage.amd64.hardened/make.profile/parent | 1 + tools-musl/catalyst/portage.amd64.hardened/package.env | 9 +++++++++ .../catalyst/portage.amd64.hardened/package.keywords | 2 ++ tools-musl/catalyst/portage.amd64.hardened/package.mask | 3 +++ tools-musl/catalyst/portage.amd64.hardened/package.unmask | 1 + tools-musl/catalyst/portage.amd64.hardened/package.use | 1 + tools-musl/catalyst/portage.amd64.vanilla/bashrc | 8 ++++---- .../catalyst/portage.amd64.vanilla/make.profile/use.mask | 1 + tools-musl/catalyst/portage.i686.hardened/bashrc | 15 +++++++++++++++ .../catalyst/portage.i686.hardened/env/libintl.conf | 2 ++ .../catalyst/portage.i686.hardened/env/parallel.conf | 1 + .../catalyst/portage.i686.hardened/make.profile/parent | 1 + tools-musl/catalyst/portage.i686.hardened/package.env | 9 +++++++++ .../catalyst/portage.i686.hardened/package.keywords | 2 ++ tools-musl/catalyst/portage.i686.hardened/package.mask | 3 +++ tools-musl/catalyst/portage.i686.hardened/package.unmask | 1 + tools-musl/catalyst/portage.i686.hardened/package.use | 1 + tools-musl/catalyst/portage.i686.vanilla/bashrc | 15 +++++++++++++++ tools-musl/catalyst/portage.i686.vanilla/env/libintl.conf | 2 ++ .../catalyst/portage.i686.vanilla/env/parallel.conf | 1 + .../catalyst/portage.i686.vanilla/make.profile/parent | 1 + .../catalyst/portage.i686.vanilla/make.profile/use.mask | 1 + tools-musl/catalyst/portage.i686.vanilla/package.env | 9 +++++++++ tools-musl/catalyst/portage.i686.vanilla/package.keywords | 2 ++ tools-musl/catalyst/portage.i686.vanilla/package.mask | 3 +++ tools-musl/catalyst/portage.i686.vanilla/package.unmask | 1 + tools-musl/catalyst/portage.i686.vanilla/package.use | 1 + tools-musl/catalyst/run.sh | 12 ++++-------- 31 files changed, 115 insertions(+), 12 deletions(-) diff --git a/tools-musl/catalyst/portage.amd64.hardened/bashrc b/tools-musl/catalyst/portage.amd64.hardened/bashrc new file mode 100644 index 0000000..70b67d2 --- /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 0000000..6aabccd --- /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 0000000..4ef695a --- /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 dac928d..70b67d2 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 0000000..6aabccd --- /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 0000000..4ef695a --- /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 0000000..70b67d2 --- /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 0000000..6aabccd --- /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 0000000..4ef695a --- /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 f72f925..4cfb5b3 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