[gentoo-commits] proj/releng:master commit in: releases/weekly/specs/amd64/hardened/, tools-systemd/, tools-musl/, ... - gentoo-commits

From:	Matthew Thode <prometheanfire@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/releng:master commit in: releases/weekly/specs/amd64/hardened/, tools-systemd/, tools-musl/, ...
Date:	Wed, 20 Feb 2019 17:35:29
Message-Id:	`1550684109.035af9dd0a6e929e89595b11ae736c526101ceae.prometheanfire@gentoo`

1

commit:     035af9dd0a6e929e89595b11ae736c526101ceae

2

Author:     Matthew Thode <mthode <AT> mthode <DOT> org>

3

AuthorDate: Wed Feb 20 17:32:36 2019 +0000

4

Commit:     Matthew Thode <prometheanfire <AT> gentoo <DOT> org>

5

CommitDate: Wed Feb 20 17:35:09 2019 +0000

6

URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=035af9dd

7

8

add gentoo-keys to stage4 and set PORTAGE_GPG_DIR

9

10

Signed-off-by: Matthew Thode <mthode <AT> mthode.org>

11

12

 releases/weekly/scripts/cloud-prep.sh                               | 1 +

13

 releases/weekly/specs/amd64/hardened/stage4-minimal.spec            | 1 +

14

 releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec | 1 +

15

 releases/weekly/specs/amd64/stage4-minimal.spec                     | 1 +

16

 releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec          | 1 +

17

 releases/weekly/specs/arm64/stage4-minimal.spec                     | 1 +

18

 tools-musl/stage4-fsscript.sh                                       | 1 +

19

 tools-musl/stage4-hardened-amd64.spec                               | 1 +

20

 tools-systemd/stage4-amd64.spec                                     | 1 +

21

 9 files changed, 9 insertions(+)

22

23

diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh

24

index d1f98f32..699442fb 100644

25

--- a/releases/weekly/scripts/cloud-prep.sh

26

+++ b/releases/weekly/scripts/cloud-prep.sh

27

@@ -72,6 +72,7 @@ emaint all -f

28

 eselect news read all

29

 eclean-dist --destructive

30

 sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf

31

+echo 'PORTAGE_GPG_DIR="/var/lib/gentoo/gkeys/keyrings/gentoo/release"' >> /etc/portage/make.conf

32

33

 # clean up system

34

 passwd -d root

35

36

diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec

37

index 9a32315a..55d2434d 100644

38

--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec

39

+++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec

40

@@ -22,6 +22,7 @@ stage4/packages:

41

 	sys-apps/iproute2

42

 	sys-devel/bc

43

 	sys-power/acpid

44

+	app-crypt/gentoo-keys

45

 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh

46

 stage4/rcadd:

47

 	acpid|default

48

49

diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec

50

index 49aae2ad..46abe8f8 100644

51

--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec

52

+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec

53

@@ -22,6 +22,7 @@ stage4/packages:

54

 	sys-apps/iproute2

55

 	sys-devel/bc

56

 	sys-power/acpid

57

+	app-crypt/gentoo-keys

58

 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh

59

 stage4/rcadd:

60

 	acpid|default

61

62

diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/stage4-minimal.spec

63

index 3b7de47e..4cf8ee84 100644

64

--- a/releases/weekly/specs/amd64/stage4-minimal.spec

65

+++ b/releases/weekly/specs/amd64/stage4-minimal.spec

66

@@ -22,6 +22,7 @@ stage4/packages:

67

 	sys-apps/iproute2

68

 	sys-devel/bc

69

 	sys-power/acpid

70

+	app-crypt/gentoo-keys

71

 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh

72

 stage4/rcadd:

73

 	acpid|default

74

75

diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec

76

index 38a62dc6..a18edfb0 100644

77

--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec

78

+++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec

79

@@ -22,6 +22,7 @@ stage4/packages:

80

 	sys-apps/iproute2

81

 	sys-devel/bc

82

 	sys-power/acpid

83

+	app-crypt/gentoo-keys

84

 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh

85

 stage4/rcadd:

86

 	acpid|default

87

88

diff --git a/releases/weekly/specs/arm64/stage4-minimal.spec b/releases/weekly/specs/arm64/stage4-minimal.spec

89

index 5b79d4db..31c1aeb1 100644

90

--- a/releases/weekly/specs/arm64/stage4-minimal.spec

91

+++ b/releases/weekly/specs/arm64/stage4-minimal.spec

92

@@ -22,6 +22,7 @@ stage4/packages:

93

 	sys-apps/iproute2

94

 	sys-devel/bc

95

 	sys-power/acpid

96

+	app-crypt/gentoo-keys

97

 #stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh

98

 stage4/rcadd:

99

 	acpid|default

100

101

diff --git a/tools-musl/stage4-fsscript.sh b/tools-musl/stage4-fsscript.sh

102

index 18017c7d..1a134ff9 100755

103

--- a/tools-musl/stage4-fsscript.sh

104

+++ b/tools-musl/stage4-fsscript.sh

105

@@ -76,6 +76,7 @@ emaint all -f

106

 eselect news read all

107

 eclean-dist --destructive

108

 sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf

109

+echo 'PORTAGE_GPG_DIR="/var/lib/gentoo/gkeys/keyrings/gentoo/release"' >> /etc/portage/make.conf

110

 sed -i '/dev-util\/pkgconf/d' /var/lib/portage/world

111

112

 # clean up system

113

114

diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec

115

index 40546b02..de305778 100644

116

--- a/tools-musl/stage4-hardened-amd64.spec

117

+++ b/tools-musl/stage4-hardened-amd64.spec

118

@@ -28,6 +28,7 @@ stage4/packages:

119

 	sys-devel/bc

120

 	sys-power/acpid

121

 	sys-process/cronie

122

+	app-crypt/gentoo-keys

123

 stage4/fsscript: @REPO_DIR@/stage4-fsscript.sh

124

 stage4/rcadd:

125

 	acpid|default

126

127

diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec

128

index 880db3ad..61aad32d 100644

129

--- a/tools-systemd/stage4-amd64.spec

130

+++ b/tools-systemd/stage4-amd64.spec

131

@@ -26,6 +26,7 @@ stage4/packages:

132

 	sys-apps/iproute2

133

 	sys-devel/bc

134

 	sys-power/acpid

135

+	app-crypt/gentoo-keys

136

 stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh

137

 stage4/rcadd:

138

 	acpid|default

1	commit: 035af9dd0a6e929e89595b11ae736c526101ceae
2	Author: Matthew Thode <mthode <AT> mthode <DOT> org>
3	AuthorDate: Wed Feb 20 17:32:36 2019 +0000
4	Commit: Matthew Thode <prometheanfire <AT> gentoo <DOT> org>
5	CommitDate: Wed Feb 20 17:35:09 2019 +0000
6	URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=035af9dd
7
8	add gentoo-keys to stage4 and set PORTAGE_GPG_DIR
9
10	Signed-off-by: Matthew Thode <mthode <AT> mthode.org>
11
12	releases/weekly/scripts/cloud-prep.sh \| 1 +
13	releases/weekly/specs/amd64/hardened/stage4-minimal.spec \| 1 +
14	releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec \| 1 +
15	releases/weekly/specs/amd64/stage4-minimal.spec \| 1 +
16	releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec \| 1 +
17	releases/weekly/specs/arm64/stage4-minimal.spec \| 1 +
18	tools-musl/stage4-fsscript.sh \| 1 +
19	tools-musl/stage4-hardened-amd64.spec \| 1 +
20	tools-systemd/stage4-amd64.spec \| 1 +
21	9 files changed, 9 insertions(+)
22
23	diff --git a/releases/weekly/scripts/cloud-prep.sh b/releases/weekly/scripts/cloud-prep.sh
24	index d1f98f32..699442fb 100644
25	--- a/releases/weekly/scripts/cloud-prep.sh
26	+++ b/releases/weekly/scripts/cloud-prep.sh
27	@@ -72,6 +72,7 @@ emaint all -f
28	eselect news read all
29	eclean-dist --destructive
30	sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf
31	+echo 'PORTAGE_GPG_DIR="/var/lib/gentoo/gkeys/keyrings/gentoo/release"' >> /etc/portage/make.conf
32
33	# clean up system
34	passwd -d root
35
36	diff --git a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
37	index 9a32315a..55d2434d 100644
38	--- a/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
39	+++ b/releases/weekly/specs/amd64/hardened/stage4-minimal.spec
40	@@ -22,6 +22,7 @@ stage4/packages:
41	sys-apps/iproute2
42	sys-devel/bc
43	sys-power/acpid
44	+ app-crypt/gentoo-keys
45	stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
46	stage4/rcadd:
47	acpid\|default
48
49	diff --git a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
50	index 49aae2ad..46abe8f8 100644
51	--- a/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
52	+++ b/releases/weekly/specs/amd64/hardened/stage4-nomultilib-minimal.spec
53	@@ -22,6 +22,7 @@ stage4/packages:
54	sys-apps/iproute2
55	sys-devel/bc
56	sys-power/acpid
57	+ app-crypt/gentoo-keys
58	stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
59	stage4/rcadd:
60	acpid\|default
61
62	diff --git a/releases/weekly/specs/amd64/stage4-minimal.spec b/releases/weekly/specs/amd64/stage4-minimal.spec
63	index 3b7de47e..4cf8ee84 100644
64	--- a/releases/weekly/specs/amd64/stage4-minimal.spec
65	+++ b/releases/weekly/specs/amd64/stage4-minimal.spec
66	@@ -22,6 +22,7 @@ stage4/packages:
67	sys-apps/iproute2
68	sys-devel/bc
69	sys-power/acpid
70	+ app-crypt/gentoo-keys
71	stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
72	stage4/rcadd:
73	acpid\|default
74
75	diff --git a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
76	index 38a62dc6..a18edfb0 100644
77	--- a/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
78	+++ b/releases/weekly/specs/amd64/stage4-nomultilib-minimal.spec
79	@@ -22,6 +22,7 @@ stage4/packages:
80	sys-apps/iproute2
81	sys-devel/bc
82	sys-power/acpid
83	+ app-crypt/gentoo-keys
84	stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
85	stage4/rcadd:
86	acpid\|default
87
88	diff --git a/releases/weekly/specs/arm64/stage4-minimal.spec b/releases/weekly/specs/arm64/stage4-minimal.spec
89	index 5b79d4db..31c1aeb1 100644
90	--- a/releases/weekly/specs/arm64/stage4-minimal.spec
91	+++ b/releases/weekly/specs/arm64/stage4-minimal.spec
92	@@ -22,6 +22,7 @@ stage4/packages:
93	sys-apps/iproute2
94	sys-devel/bc
95	sys-power/acpid
96	+ app-crypt/gentoo-keys
97	#stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
98	stage4/rcadd:
99	acpid\|default
100
101	diff --git a/tools-musl/stage4-fsscript.sh b/tools-musl/stage4-fsscript.sh
102	index 18017c7d..1a134ff9 100755
103	--- a/tools-musl/stage4-fsscript.sh
104	+++ b/tools-musl/stage4-fsscript.sh
105	@@ -76,6 +76,7 @@ emaint all -f
106	eselect news read all
107	eclean-dist --destructive
108	sed -i '/^USE=\"\${USE}\ \ build\"$/d' /etc/portage/make.conf
109	+echo 'PORTAGE_GPG_DIR="/var/lib/gentoo/gkeys/keyrings/gentoo/release"' >> /etc/portage/make.conf
110	sed -i '/dev-util\/pkgconf/d' /var/lib/portage/world
111
112	# clean up system
113
114	diff --git a/tools-musl/stage4-hardened-amd64.spec b/tools-musl/stage4-hardened-amd64.spec
115	index 40546b02..de305778 100644
116	--- a/tools-musl/stage4-hardened-amd64.spec
117	+++ b/tools-musl/stage4-hardened-amd64.spec
118	@@ -28,6 +28,7 @@ stage4/packages:
119	sys-devel/bc
120	sys-power/acpid
121	sys-process/cronie
122	+ app-crypt/gentoo-keys
123	stage4/fsscript: @REPO_DIR@/stage4-fsscript.sh
124	stage4/rcadd:
125	acpid\|default
126
127	diff --git a/tools-systemd/stage4-amd64.spec b/tools-systemd/stage4-amd64.spec
128	index 880db3ad..61aad32d 100644
129	--- a/tools-systemd/stage4-amd64.spec
130	+++ b/tools-systemd/stage4-amd64.spec
131	@@ -26,6 +26,7 @@ stage4/packages:
132	sys-apps/iproute2
133	sys-devel/bc
134	sys-power/acpid
135	+ app-crypt/gentoo-keys
136	stage4/fsscript: @REPO_DIR@/releases/weekly/scripts/cloud-prep.sh
137	stage4/rcadd:
138	acpid\|default

Gentoo Archives: gentoo-commits