Gentoo Archives: gentoo-commits

From: Jason Zaman <perfinion@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/hardened-refpolicy:master commit in: gentoo/
Date: Mon, 30 Nov 2020 04:10:21
Message-Id: 1606704841.51aae0778cb7c0a812c64654fe8f517a8a3450eb.perfinion@gentoo
1 commit: 51aae0778cb7c0a812c64654fe8f517a8a3450eb
2 Author: Jason Zaman <perfinion <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 30 02:47:19 2020 +0000
4 Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 30 02:54:01 2020 +0000
6 URL: https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=51aae077
7
8 Update gentoo release-prepare script
9
10 - Make the glob more specific on selinux-* so it does not match
11 sec-policy/apparmor-profiles
12 - Also update the test instructions
13 - Update copyright year automatically
14
15 Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
16
17 gentoo/release-prepare.sh | 17 +++++++++--------
18 1 file changed, 9 insertions(+), 8 deletions(-)
19
20 diff --git a/gentoo/release-prepare.sh b/gentoo/release-prepare.sh
21 index 243927b2..d8b69bbe 100644
22 --- a/gentoo/release-prepare.sh
23 +++ b/gentoo/release-prepare.sh
24 @@ -78,7 +78,7 @@ buildpatch() {
25 createEbuilds() {
26 cd ${GENTOOX86}/sec-policy;
27 printf "Removing old patchbundle references in Manifest (in case of rebuild)... ";
28 - for PKG in *;
29 + for PKG in selinux-*;
30 do
31 [[ -f "${PKG}/Manifest}" ]] || continue;
32 sed -i -e "/patchbundle-selinux-base-policy-${NEWVERSION}/d" ${PKG}/Manifest;
33 @@ -86,10 +86,11 @@ createEbuilds() {
34 printf "done\n";
35
36 printf "Creating new ebuilds based on 9999 version... ";
37 - for PKG in *;
38 + for PKG in selinux-*;
39 do
40 [[ -f "${PKG}/${PKG}-9999.ebuild" ]] || continue;
41 cp ${PKG}/${PKG}-9999.ebuild ${PKG}/${PKG}-${NEWVERSION}.ebuild;
42 + sed -i "s/Copyright 1999-201. Gentoo .*/Copyright 1999-$(date '+%Y') Gentoo Authors/" ${PKG}/${PKG}-${NEWVERSION}.ebuild;
43 done
44 printf "done\n";
45 }
46 @@ -129,19 +130,19 @@ The release has now been prepared.
47 Please go do the following to finish up:
48
49 In ${GENTOOX86}/sec-policy:
50 -git add .
51 -repoman --digest=y full
52 +$ git add .
53 +$ repoman --digest=y full
54
55 Then, before finally committing - do a run yourself, ensuring that the right
56 version is deployed of course:
57 -- "emerge -1 \$(qlist -IC sec-policy)"
58 +# emerge -v1 @selinux-rebuild
59
60 Only then do:
61 -repoman commit -m 'sec-policy: Release of SELinux policies ${NEWVERSION}'
62 -git push --sign
63 +$ repoman commit -m 'sec-policy: Release of SELinux policies ${NEWVERSION}'
64 +$ git push --sign
65
66 In ${HARDENEDREFPOL} do:
67 -git push origin --tags
68 +$ git push origin --tags
69 EOF
70
71 cleanTmp;