From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 787B81382C5 for ; Fri, 2 Mar 2018 16:25:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9698AE0963; Fri, 2 Mar 2018 16:25:08 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 72CD8E0963 for ; Fri, 2 Mar 2018 16:25:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E7B39335C2C for ; Fri, 2 Mar 2018 16:25:06 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A6E431CC for ; Fri, 2 Mar 2018 16:25:05 +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: <1520007892.7df123192045450131da1073580bfc3ee6c3ce20.blueness@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-musl/ X-VCS-Repository: proj/releng X-VCS-Files: tools-musl/run.sh tools-musl/stage.conf.template X-VCS-Directories: tools-musl/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: 7df123192045450131da1073580bfc3ee6c3ce20 X-VCS-Branch: master Date: Fri, 2 Mar 2018 16:25:05 +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: 05039662-c2b5-49a9-9d5d-ca3a685c0bbf X-Archives-Hash: 2a85e0f3180384efbd7556b9bde0ac85 commit: 7df123192045450131da1073580bfc3ee6c3ce20 Author: Anthony G. Basile gentoo org> AuthorDate: Fri Mar 2 16:24:52 2018 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Mar 2 16:24:52 2018 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7df12319 tools-musl: use the new musl profiles tools-musl/run.sh | 14 ++++++++------ tools-musl/stage.conf.template | 12 ++++++++++++ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/tools-musl/run.sh b/tools-musl/run.sh index cda71d0f..9140ac35 100755 --- a/tools-musl/run.sh +++ b/tools-musl/run.sh @@ -20,9 +20,9 @@ prepare_confs() { [[ "${arch}" == "amd64" ]] && tarch="x86_64" local profile=${flavor} - [[ "${flavor}" == "vanilla" ]] && profile="default" + [[ "${flavor}" == "vanilla" ]] && profile="" || profile="/hardened" - cat stage-all.conf.template | \ + cat stage.conf.template | \ sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ -e "s:CSTAGE:${cstage}:g" \ -e "s:PSTAGE:${pstage}:g" \ @@ -61,10 +61,12 @@ main() { # if catalyst is using snapcache, bug #519656 for arch in amd64 i686; do for flavor in hardened vanilla; do - ( - do_stages ${arch} ${flavor} - [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log - ) & + do_stages ${arch} ${flavor} + [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log +# ( +# do_stages ${arch} ${flavor} +# [[ $? == 1 ]] && echo "FAILURE at ${arch} ${flavor} " | tee zzz.log +# ) & done done } diff --git a/tools-musl/stage.conf.template b/tools-musl/stage.conf.template new file mode 100644 index 00000000..38ac1adf --- /dev/null +++ b/tools-musl/stage.conf.template @@ -0,0 +1,12 @@ +subarch: SARCH +target: CSTAGE +version_stamp: musl-FLAVOR +rel_type: musl/FLAVOR/SARCH +profile: default/linux/PARCH/17.0/muslPROFILE +snapshot: current +source_subpath: musl/FLAVOR/SARCH/PSTAGE-SARCH-musl-FLAVOR +chost: TARCH-gentoo-linux-musl +cflags: -O2 -pipe +cxxflags: -O2 -pipe +portage_confdir: MYCATALYST/portage.SARCH.FLAVOR +portage_overlay: /var/lib/layman/musl