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 ABEAE13877A for ; Sat, 9 Aug 2014 19:24:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D25CE086C; Sat, 9 Aug 2014 19:24:05 +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 DB689E086C for ; Sat, 9 Aug 2014 19:24:04 +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 1746334028C for ; Sat, 9 Aug 2014 19:24:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 0917118815 for ; Sat, 9 Aug 2014 19:24:02 +0000 (UTC) From: "Sven Vermeulen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sven Vermeulen" Message-ID: <1407612231.9cc2fb85e7f5aa934cb6b7d7ac564bdf5486b4b2.swift@gentoo> Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: gentoo/ X-VCS-Repository: proj/hardened-refpolicy X-VCS-Files: gentoo/release-prepare.sh X-VCS-Directories: gentoo/ X-VCS-Committer: swift X-VCS-Committer-Name: Sven Vermeulen X-VCS-Revision: 9cc2fb85e7f5aa934cb6b7d7ac564bdf5486b4b2 X-VCS-Branch: master Date: Sat, 9 Aug 2014 19:24:02 +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: b639ed61-8954-4244-a0a1-9316f0c84722 X-Archives-Hash: 6bc9307c47796eca3965635c7692a890 commit: 9cc2fb85e7f5aa934cb6b7d7ac564bdf5486b4b2 Author: Sven Vermeulen siphos be> AuthorDate: Sat Aug 9 19:23:51 2014 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Sat Aug 9 19:23:51 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=9cc2fb85 Add trailing slash for substitution, and set KEYWORDS when copying from live ebuilds to "regular" ones --- gentoo/release-prepare.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gentoo/release-prepare.sh b/gentoo/release-prepare.sh index c80fbc2..5d578d6 100644 --- a/gentoo/release-prepare.sh +++ b/gentoo/release-prepare.sh @@ -5,7 +5,7 @@ # Prepare new policy release -TRANSLATE="s:\(${HARDENEDREFPOL}\|${REFPOLRELEASE}\):refpolicy:g"; +TRANSLATE="s:\(${HARDENEDREFPOL}\|${REFPOLRELEASE}\):refpolicy/:g"; NEWVERSION="${1}"; REMOTELOCATION="swift@dev.gentoo.org:public_html/patches/selinux-base-policy"; @@ -88,6 +88,7 @@ createEbuilds() { do [[ -f "${PKG}/${PKG}-9999.ebuild" ]] || continue; cp ${PKG}/${PKG}-9999.ebuild ${PKG}/${PKG}-${NEWVERSION}.ebuild; + sed -i -e 's:^KEYWORDS="":KEYWORDS="~amd64 ~x86":g' ${PKG}/${PKG}-${NEWVERSION}.ebuild; done printf "done\n"; } @@ -101,7 +102,7 @@ tagRelease() { printf "done\n"; }; -if [ $# -ne 2 ]; +if [ $# -ne 1 ]; then usage; exit 3;