1 |
commit: bf734239dbaa49231fd9082dc40dd32795c7bced |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jul 8 08:25:45 2021 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Jul 8 08:25:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bf734239 |
7 |
|
8 |
amd64: make flat upload directory, no subdirs |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
tools/catalyst-auto-amd64-demeter.conf | 5 ++--- |
13 |
1 file changed, 2 insertions(+), 3 deletions(-) |
14 |
|
15 |
diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf |
16 |
index 8f462ad9..ec8a2ae3 100644 |
17 |
--- a/tools/catalyst-auto-amd64-demeter.conf |
18 |
+++ b/tools/catalyst-auto-amd64-demeter.conf |
19 |
@@ -50,8 +50,9 @@ update_symlinks() { |
20 |
post_build() { |
21 |
local set=$1 spec=$2 |
22 |
|
23 |
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE} |
24 |
+ |
25 |
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit |
26 |
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}/x32 |
27 |
case ${spec} in |
28 |
x32/stage3-openrc.spec) |
29 |
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz* |
30 |
@@ -60,7 +61,6 @@ post_build() { |
31 |
popd >/dev/null || exit |
32 |
|
33 |
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit |
34 |
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl |
35 |
case ${spec} in |
36 |
musl/stage3.spec) |
37 |
upload stage3-amd64-musl-${TIMESTAMP}.tar.xz* |
38 |
@@ -69,7 +69,6 @@ post_build() { |
39 |
popd >/dev/null || exit |
40 |
|
41 |
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit |
42 |
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl |
43 |
case ${spec} in |
44 |
musl/stage3-hardened.spec) |
45 |
upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz* |