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 6A5AD13877A for ; Fri, 8 Aug 2014 18:58:01 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0466EE094F; Fri, 8 Aug 2014 18:58:01 +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 95D33E094F for ; Fri, 8 Aug 2014 18:58:00 +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 545B13403AF for ; Fri, 8 Aug 2014 18:57:58 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id C3C3718810 for ; Fri, 8 Aug 2014 18:57:56 +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: <1407524268.a2d8ce38efcba97d6d61dcdb8de6e6d89df82594.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: a2d8ce38efcba97d6d61dcdb8de6e6d89df82594 X-VCS-Branch: master Date: Fri, 8 Aug 2014 18:57:56 +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: 499874e8-74c8-4d34-9c8e-7ace2822f2a0 X-Archives-Hash: 66f78be2e79816d7a201951704715d67 commit: a2d8ce38efcba97d6d61dcdb8de6e6d89df82594 Author: Sven Vermeulen siphos be> AuthorDate: Fri Aug 8 18:57:48 2014 +0000 Commit: Sven Vermeulen gentoo org> CommitDate: Fri Aug 8 18:57:48 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/hardened-refpolicy.git;a=commit;h=a2d8ce38 New releases can now be based on live ebuilds --- gentoo/release-prepare.sh | 29 +++++++++-------------------- 1 file changed, 9 insertions(+), 20 deletions(-) diff --git a/gentoo/release-prepare.sh b/gentoo/release-prepare.sh index 7f9ade2..c80fbc2 100644 --- a/gentoo/release-prepare.sh +++ b/gentoo/release-prepare.sh @@ -1,23 +1,21 @@ #!/bin/sh -# Copyright 2013 Sven Vermeulen +# Copyright 2013,2014 Sven Vermeulen # Licensed under the GPL-3 license # Prepare new policy release TRANSLATE="s:\(${HARDENEDREFPOL}\|${REFPOLRELEASE}\):refpolicy:g"; -OLDVERSION="${1}"; -NEWVERSION="${2}"; +NEWVERSION="${1}"; REMOTELOCATION="swift@dev.gentoo.org:public_html/patches/selinux-base-policy"; usage() { - echo "Usage: $0 "; + echo "Usage: $0 "; echo ""; - echo "Example: $0 2.20130424-r2 2.20130424-r3" + echo "Example: $0 2.20140311-r5" echo ""; - echo "The script will copy the ebuilds of the towards the"; - echo " and update the string occurrences of that version"; - echo "(mostly for the BASEPOL variable)."; + echo "The script will copy the live ebuilds towards the"; + echo "." echo ""; echo "The following environment variables must be declared correctly for the script"; echo "to function properly:"; @@ -85,20 +83,11 @@ createEbuilds() { done printf "done\n"; - printf "Creating new ebuilds based on old version... "; + printf "Creating new ebuilds based on 9999 version... "; for PKG in *; do - [[ -f "${PKG}/${PKG}-${OLDVERSION}.ebuild" ]] || continue; - cp ${PKG}/${PKG}-${OLDVERSION}.ebuild ${PKG}/${PKG}-${NEWVERSION}.ebuild; - sed -i -e "s/BASEPOL=\"${OLDVERSION}\"/BASEPOL=\"${NEWVERSION}\"/g" ${PKG}/${PKG}-${NEWVERSION}.ebuild; - done - printf "done\n"; - - printf "Marking ebuilds as ~arch... "; - for PKG in *; - do - [[ -f "${PKG}/${PKG}-${NEWVERSION}.ebuild" ]] || continue; - sed -i -e "s/KEYWORDS=\"amd64 x86\"/KEYWORDS=\"~amd64 ~x86\"/g" ${PKG}/${PKG}-${NEWVERSION}.ebuild; + [[ -f "${PKG}/${PKG}-9999.ebuild" ]] || continue; + cp ${PKG}/${PKG}-9999.ebuild ${PKG}/${PKG}-${NEWVERSION}.ebuild; done printf "done\n"; }