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 6D6BE1388C1 for ; Fri, 4 Mar 2016 02:28:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B92BBE05C1; Fri, 4 Mar 2016 02:28:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 65701E05C1 for ; Fri, 4 Mar 2016 02:28:42 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 59BFC340C9F for ; Fri, 4 Mar 2016 02:28:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7285B16C4 for ; Fri, 4 Mar 2016 02:28:38 +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: <1457059122.ed422ec6fbe0d9dc8b4af8463541d0a18c820ec9.blueness@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: tools-hardened/ X-VCS-Repository: proj/releng X-VCS-Files: tools-hardened/run-systemd.sh tools-hardened/stage-all.conf.template X-VCS-Directories: tools-hardened/ X-VCS-Committer: blueness X-VCS-Committer-Name: Anthony G. Basile X-VCS-Revision: ed422ec6fbe0d9dc8b4af8463541d0a18c820ec9 X-VCS-Branch: master Date: Fri, 4 Mar 2016 02:28:38 +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: 7d714829-5529-42c3-82c6-6a65b3c75289 X-Archives-Hash: 83e266b38fb2fba16caf9d03e7302ca7 commit: ed422ec6fbe0d9dc8b4af8463541d0a18c820ec9 Author: Anthony G. Basile gentoo org> AuthorDate: Fri Mar 4 02:38:42 2016 +0000 Commit: Anthony G. Basile gentoo org> CommitDate: Fri Mar 4 02:38:42 2016 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ed422ec6 tools-hardened: fix stage names in template tools-hardened/run-systemd.sh | 5 +++-- tools-hardened/stage-all.conf.template | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tools-hardened/run-systemd.sh b/tools-hardened/run-systemd.sh old mode 100644 new mode 100755 index 94c57d1..1160d42 --- a/tools-hardened/run-systemd.sh +++ b/tools-hardened/run-systemd.sh @@ -13,11 +13,12 @@ prepare_confs() { local pstage=stage${p} local parch="${arch}" - [[ "${arch}" == "i686" ]] && parch="x86" + [[ "${arch}" == "i686" ]] && parch="x86" cat stage-all.conf.template | \ sed -e "s:\(^version_stamp.*$\):\1-${mydate}:" \ - -e "s:STAGE:${cstage}:g" \ + -e "s:CSTAGE:${cstage}:g" \ + -e "s:PSTAGE:${pstage}:g" \ -e "s:SARCH:${arch}:g" \ -e "s:PARCH:${parch}:g" \ > stage${s}-${arch}-systemd.conf diff --git a/tools-hardened/stage-all.conf.template b/tools-hardened/stage-all.conf.template index 942ddc7..5e4cb39 100644 --- a/tools-hardened/stage-all.conf.template +++ b/tools-hardened/stage-all.conf.template @@ -1,7 +1,7 @@ subarch: SARCH -target: STAGE +target: CSTAGE version_stamp: systemd rel_type: systemd/SARCH profile: default/linux/PARCH/13.0/systemd snapshot: current -source_subpath: systemd/SARCH/STAGE-SARCH-systemd +source_subpath: systemd/SARCH/PSTAGE-SARCH-systemd