[gentoo-commits] proj/releng:master commit in: tools/ - gentoo-commits

From:	Matt Turner <mattst88@g.o>
To:	gentoo-commits@l.g.o
Subject:	[gentoo-commits] proj/releng:master commit in: tools/
Date:	Mon, 01 Feb 2021 04:04:53
Message-Id:	`1612058203.8f478fe30ba9f3a43df0753fc8369f93b509f4af.mattst88@gentoo`

1

commit:     8f478fe30ba9f3a43df0753fc8369f93b509f4af

2

Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>

3

AuthorDate: Sun Jan 31 01:00:37 2021 +0000

4

Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>

5

CommitDate: Sun Jan 31 01:56:43 2021 +0000

6

URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f478fe3

7

8

tools: Add UPLOAD_DEST

9

10

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

11

12

 tools/catalyst-auto-alpha.conf      |  2 +-

13

 tools/catalyst-auto-amd64.conf      | 18 +++---------------

14

 tools/catalyst-auto-arm.conf        |  2 +-

15

 tools/catalyst-auto-arm64.conf      |  2 +-

16

 tools/catalyst-auto-hppa.conf       |  2 +-

17

 tools/catalyst-auto-ia64.conf       |  2 +-

18

 tools/catalyst-auto-ppc.conf        |  2 +-

19

 tools/catalyst-auto-ppc64le.conf    |  2 +-

20

 tools/catalyst-auto-qemu-arm.conf   |  2 +-

21

 tools/catalyst-auto-qemu-riscv.conf |  2 +-

22

 tools/catalyst-auto-s390.conf       |  2 +-

23

 tools/catalyst-auto-s390x.conf      |  2 +-

24

 tools/catalyst-auto-sparc64.conf    |  2 +-

25

 tools/catalyst-auto-x86.conf        | 18 +++---------------

26

 14 files changed, 18 insertions(+), 42 deletions(-)

27

28

diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf

29

index 6a233900..c2359f59 100644

30

--- a/tools/catalyst-auto-alpha.conf

31

+++ b/tools/catalyst-auto-alpha.conf

32

@@ -48,7 +48,7 @@ upload() {

33

 		--omit-dir-times

34

 		--delay-updates

35

)

36

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

37

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

38

}

39

40

 post_build() {

41

42

diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf

43

index 363c80cb..0b07c988 100644

44

--- a/tools/catalyst-auto-amd64.conf

45

+++ b/tools/catalyst-auto-amd64.conf

46

@@ -80,26 +80,14 @@ upload() {

47

 		--omit-dir-times

48

 		--delay-updates

49

)

50

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}

51

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

52

}

53

54

 post_build() {

55

 	local set=$1 spec=$2

56

57

-	case $HOSTNAME in

58

-		# If you ever need to ensure it's copied somewhere local, drop a hostname in here!

59

-		LOCAL)

60

-			DEST_DEFAULT=${BUILD_DESTDIR_BASE}

61

-			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened

62

-			;;

63

-		*)

64

-			DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}

65

-			DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened

66

-			;;

67

-	esac

68

-

69

 	pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit

70

-	UPLOAD_DEST=${DEST_DEFAULT}

71

+	UPLOAD_DEST=${BUILD_DESTDIR_BASE}

72

 	case ${spec} in

73

 	stage3.spec)

74

 		upload stage3-amd64-${TIMESTAMP}.tar.xz*

75

@@ -126,7 +114,7 @@ post_build() {

76

 	popd >/dev/null || exit

77

78

 	pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit

79

-	UPLOAD_DEST=${DEST_HARDENED}

80

+	UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened

81

 	case ${spec} in

82

 	hardened/stage3.spec)

83

 		upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*

84

85

diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf

86

index 5c78ab99..b15d3569 100644

87

--- a/tools/catalyst-auto-arm.conf

88

+++ b/tools/catalyst-auto-arm.conf

89

@@ -70,7 +70,7 @@ upload() {

90

 		--omit-dir-times

91

 		--delay-updates

92

)

93

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

94

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

95

     else

96

 	echo Would now upload "$@"

97

 	ls -l $@

98

99

diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf

100

index f1ce7ab1..c14cb56b 100644

101

--- a/tools/catalyst-auto-arm64.conf

102

+++ b/tools/catalyst-auto-arm64.conf

103

@@ -42,7 +42,7 @@ upload() {

104

 		--omit-dir-times

105

 		--delay-updates

106

)

107

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

108

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

109

}

110

111

 post_build() {

112

113

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf

114

index 6ba59c81..d93a1370 100644

115

--- a/tools/catalyst-auto-hppa.conf

116

+++ b/tools/catalyst-auto-hppa.conf

117

@@ -48,7 +48,7 @@ upload() {

118

 		--omit-dir-times

119

 		--delay-updates

120

)

121

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

122

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

123

}

124

125

 post_build() {

126

127

diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf

128

index 1d123d2a..852be0d4 100644

129

--- a/tools/catalyst-auto-ia64.conf

130

+++ b/tools/catalyst-auto-ia64.conf

131

@@ -41,7 +41,7 @@ upload() {

132

 		--omit-dir-times

133

 		--delay-updates

134

)

135

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

136

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

137

}

138

139

 post_build() {

140

141

diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf

142

index 61354d22..68f49290 100644

143

--- a/tools/catalyst-auto-ppc.conf

144

+++ b/tools/catalyst-auto-ppc.conf

145

@@ -47,7 +47,7 @@ upload() {

146

 		--omit-dir-times

147

 		--delay-updates

148

)

149

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

150

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

151

}

152

153

 post_build() {

154

155

diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf

156

index a8e438e1..ecd4a738 100644

157

--- a/tools/catalyst-auto-ppc64le.conf

158

+++ b/tools/catalyst-auto-ppc64le.conf

159

@@ -48,7 +48,7 @@ upload() {

160

 		--omit-dir-times

161

 		--delay-updates

162

)

163

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

164

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

165

}

166

167

 post_build() {

168

169

diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf

170

index 68f583ef..68b51a2d 100644

171

--- a/tools/catalyst-auto-qemu-arm.conf

172

+++ b/tools/catalyst-auto-qemu-arm.conf

173

@@ -71,7 +71,7 @@ upload() {

174

 		--omit-dir-times

175

 		--delay-updates

176

)

177

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

178

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

179

     else

180

 	echo Would now upload "$@"

181

 	ls -l $@

182

183

diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf

184

index 035c0ee7..ce73642b 100644

185

--- a/tools/catalyst-auto-qemu-riscv.conf

186

+++ b/tools/catalyst-auto-qemu-riscv.conf

187

@@ -58,7 +58,7 @@ upload() {

188

 		--omit-dir-times

189

 		--delay-updates

190

)

191

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

192

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

193

fi

194

}

195

196

197

diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf

198

index e442414c..11bdf6cc 100644

199

--- a/tools/catalyst-auto-s390.conf

200

+++ b/tools/catalyst-auto-s390.conf

201

@@ -41,7 +41,7 @@ upload() {

202

 		--omit-dir-times

203

 		--delay-updates

204

)

205

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

206

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

207

}

208

209

 post_build() {

210

211

diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf

212

index 980b721d..1a5ea91d 100644

213

--- a/tools/catalyst-auto-s390x.conf

214

+++ b/tools/catalyst-auto-s390x.conf

215

@@ -41,7 +41,7 @@ upload() {

216

 		--omit-dir-times

217

 		--delay-updates

218

)

219

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

220

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

221

}

222

223

 post_build() {

224

225

diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf

226

index 1b730c54..77dd62ee 100644

227

--- a/tools/catalyst-auto-sparc64.conf

228

+++ b/tools/catalyst-auto-sparc64.conf

229

@@ -43,7 +43,7 @@ upload() {

230

 		--omit-dir-times

231

 		--delay-updates

232

)

233

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:

234

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

235

}

236

237

 post_build() {

238

239

diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf

240

index 1c809465..bb779d7e 100644

241

--- a/tools/catalyst-auto-x86.conf

242

+++ b/tools/catalyst-auto-x86.conf

243

@@ -67,26 +67,14 @@ upload() {

244

 		--omit-dir-times

245

 		--delay-updates

246

)

247

-	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}

248

+	rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}

249

}

250

251

 post_build() {

252

 	local set=$1 spec=$2

253

254

-	case $HOSTNAME in

255

-		# If you ever need to ensure it's copied somewhere local, drop a hostname in here!

256

-		LOCAL)

257

-			DEST_DEFAULT=${BUILD_DESTDIR_BASE}

258

-			DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened

259

-			;;

260

-		*)

261

-			DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}

262

-			DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened

263

-			;;

264

-	esac

265

-

266

 	pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit

267

-	UPLOAD_DEST=${DEST_DEFAULT}

268

+	UPLOAD_DEST=${BUILD_DESTDIR_BASE}

269

 	case ${spec} in

270

 	stage3.spec)

271

 		upload stage3-i486-${TIMESTAMP}.tar.xz*

272

@@ -104,7 +92,7 @@ post_build() {

273

 	popd >/dev/null || exit

274

275

 	pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit

276

-	UPLOAD_DEST=${DEST_HARDENED}

277

+	UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened

278

 	case ${spec} in

279

 	hardened/stage3.spec)

280

 		upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*

1	commit: 8f478fe30ba9f3a43df0753fc8369f93b509f4af
2	Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
3	AuthorDate: Sun Jan 31 01:00:37 2021 +0000
4	Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
5	CommitDate: Sun Jan 31 01:56:43 2021 +0000
6	URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f478fe3
7
8	tools: Add UPLOAD_DEST
9
10	Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
11
12	tools/catalyst-auto-alpha.conf \| 2 +-
13	tools/catalyst-auto-amd64.conf \| 18 +++---------------
14	tools/catalyst-auto-arm.conf \| 2 +-
15	tools/catalyst-auto-arm64.conf \| 2 +-
16	tools/catalyst-auto-hppa.conf \| 2 +-
17	tools/catalyst-auto-ia64.conf \| 2 +-
18	tools/catalyst-auto-ppc.conf \| 2 +-
19	tools/catalyst-auto-ppc64le.conf \| 2 +-
20	tools/catalyst-auto-qemu-arm.conf \| 2 +-
21	tools/catalyst-auto-qemu-riscv.conf \| 2 +-
22	tools/catalyst-auto-s390.conf \| 2 +-
23	tools/catalyst-auto-s390x.conf \| 2 +-
24	tools/catalyst-auto-sparc64.conf \| 2 +-
25	tools/catalyst-auto-x86.conf \| 18 +++---------------
26	14 files changed, 18 insertions(+), 42 deletions(-)
27
28	diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
29	index 6a233900..c2359f59 100644
30	--- a/tools/catalyst-auto-alpha.conf
31	+++ b/tools/catalyst-auto-alpha.conf
32	@@ -48,7 +48,7 @@ upload() {
33	--omit-dir-times
34	--delay-updates
35	)
36	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
37	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
38	}
39
40	post_build() {
41
42	diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
43	index 363c80cb..0b07c988 100644
44	--- a/tools/catalyst-auto-amd64.conf
45	+++ b/tools/catalyst-auto-amd64.conf
46	@@ -80,26 +80,14 @@ upload() {
47	--omit-dir-times
48	--delay-updates
49	)
50	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
51	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
52	}
53
54	post_build() {
55	local set=$1 spec=$2
56
57	- case $HOSTNAME in
58	- # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
59	- LOCAL)
60	- DEST_DEFAULT=${BUILD_DESTDIR_BASE}
61	- DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
62	- ;;
63	- *)
64	- DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
65	- DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
66	- ;;
67	- esac
68	-
69	pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null \|\| exit
70	- UPLOAD_DEST=${DEST_DEFAULT}
71	+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}
72	case ${spec} in
73	stage3.spec)
74	upload stage3-amd64-${TIMESTAMP}.tar.xz*
75	@@ -126,7 +114,7 @@ post_build() {
76	popd >/dev/null \|\| exit
77
78	pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null \|\| exit
79	- UPLOAD_DEST=${DEST_HARDENED}
80	+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
81	case ${spec} in
82	hardened/stage3.spec)
83	upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
84
85	diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
86	index 5c78ab99..b15d3569 100644
87	--- a/tools/catalyst-auto-arm.conf
88	+++ b/tools/catalyst-auto-arm.conf
89	@@ -70,7 +70,7 @@ upload() {
90	--omit-dir-times
91	--delay-updates
92	)
93	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
94	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
95	else
96	echo Would now upload "$@"
97	ls -l $@
98
99	diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
100	index f1ce7ab1..c14cb56b 100644
101	--- a/tools/catalyst-auto-arm64.conf
102	+++ b/tools/catalyst-auto-arm64.conf
103	@@ -42,7 +42,7 @@ upload() {
104	--omit-dir-times
105	--delay-updates
106	)
107	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
108	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
109	}
110
111	post_build() {
112
113	diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
114	index 6ba59c81..d93a1370 100644
115	--- a/tools/catalyst-auto-hppa.conf
116	+++ b/tools/catalyst-auto-hppa.conf
117	@@ -48,7 +48,7 @@ upload() {
118	--omit-dir-times
119	--delay-updates
120	)
121	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
122	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
123	}
124
125	post_build() {
126
127	diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
128	index 1d123d2a..852be0d4 100644
129	--- a/tools/catalyst-auto-ia64.conf
130	+++ b/tools/catalyst-auto-ia64.conf
131	@@ -41,7 +41,7 @@ upload() {
132	--omit-dir-times
133	--delay-updates
134	)
135	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
136	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
137	}
138
139	post_build() {
140
141	diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
142	index 61354d22..68f49290 100644
143	--- a/tools/catalyst-auto-ppc.conf
144	+++ b/tools/catalyst-auto-ppc.conf
145	@@ -47,7 +47,7 @@ upload() {
146	--omit-dir-times
147	--delay-updates
148	)
149	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
150	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
151	}
152
153	post_build() {
154
155	diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
156	index a8e438e1..ecd4a738 100644
157	--- a/tools/catalyst-auto-ppc64le.conf
158	+++ b/tools/catalyst-auto-ppc64le.conf
159	@@ -48,7 +48,7 @@ upload() {
160	--omit-dir-times
161	--delay-updates
162	)
163	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
164	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
165	}
166
167	post_build() {
168
169	diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
170	index 68f583ef..68b51a2d 100644
171	--- a/tools/catalyst-auto-qemu-arm.conf
172	+++ b/tools/catalyst-auto-qemu-arm.conf
173	@@ -71,7 +71,7 @@ upload() {
174	--omit-dir-times
175	--delay-updates
176	)
177	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
178	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
179	else
180	echo Would now upload "$@"
181	ls -l $@
182
183	diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
184	index 035c0ee7..ce73642b 100644
185	--- a/tools/catalyst-auto-qemu-riscv.conf
186	+++ b/tools/catalyst-auto-qemu-riscv.conf
187	@@ -58,7 +58,7 @@ upload() {
188	--omit-dir-times
189	--delay-updates
190	)
191	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
192	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
193	fi
194	}
195
196
197	diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
198	index e442414c..11bdf6cc 100644
199	--- a/tools/catalyst-auto-s390.conf
200	+++ b/tools/catalyst-auto-s390.conf
201	@@ -41,7 +41,7 @@ upload() {
202	--omit-dir-times
203	--delay-updates
204	)
205	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
206	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
207	}
208
209	post_build() {
210
211	diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
212	index 980b721d..1a5ea91d 100644
213	--- a/tools/catalyst-auto-s390x.conf
214	+++ b/tools/catalyst-auto-s390x.conf
215	@@ -41,7 +41,7 @@ upload() {
216	--omit-dir-times
217	--delay-updates
218	)
219	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
220	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
221	}
222
223	post_build() {
224
225	diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
226	index 1b730c54..77dd62ee 100644
227	--- a/tools/catalyst-auto-sparc64.conf
228	+++ b/tools/catalyst-auto-sparc64.conf
229	@@ -43,7 +43,7 @@ upload() {
230	--omit-dir-times
231	--delay-updates
232	)
233	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
234	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
235	}
236
237	post_build() {
238
239	diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
240	index 1c809465..bb779d7e 100644
241	--- a/tools/catalyst-auto-x86.conf
242	+++ b/tools/catalyst-auto-x86.conf
243	@@ -67,26 +67,14 @@ upload() {
244	--omit-dir-times
245	--delay-updates
246	)
247	- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
248	+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
249	}
250
251	post_build() {
252	local set=$1 spec=$2
253
254	- case $HOSTNAME in
255	- # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
256	- LOCAL)
257	- DEST_DEFAULT=${BUILD_DESTDIR_BASE}
258	- DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
259	- ;;
260	- *)
261	- DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
262	- DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
263	- ;;
264	- esac
265	-
266	pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null \|\| exit
267	- UPLOAD_DEST=${DEST_DEFAULT}
268	+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}
269	case ${spec} in
270	stage3.spec)
271	upload stage3-i486-${TIMESTAMP}.tar.xz*
272	@@ -104,7 +92,7 @@ post_build() {
273	popd >/dev/null \|\| exit
274
275	pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null \|\| exit
276	- UPLOAD_DEST=${DEST_HARDENED}
277	+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
278	case ${spec} in
279	hardened/stage3.spec)
280	upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*

Gentoo Archives: gentoo-commits