* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-24 22:16 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-24 22:16 UTC (permalink / raw
To: gentoo-commits
commit: ad059f3264c7c339892c68fb6551da7e4e7d0026
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 24 22:15:37 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 22:15:37 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ad059f32
Upload x86 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 38b49922..fa9f9b73 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -21,14 +21,10 @@ SETS="
SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage3-openrc.spec"
SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd-stage2-minimal-openrc.spec"
-SET_i486_systemd_SPECS="i486/stage1-systemd.spec i486/stage3-systemd.spec"
-
SET_i486_systemd_mu_SPECS="i486/stage1-systemd-mu.spec i486/stage3-systemd-mu.spec"
SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage3-openrc.spec"
-SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage3-systemd.spec"
-
SET_i686_systemd_mu_SPECS="i686/stage1-systemd-mu.spec i686/stage3-systemd-mu.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec"
@@ -70,9 +66,6 @@ post_build() {
case ${spec} in
i486/stage3-openrc.spec)
upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
- ;;
- i486/stage3-systemd.spec)
- upload stage3-i486-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i486" x86/17.0/i486
;;
i486/installcd-stage2-minimal-openrc.spec)
@@ -80,9 +73,6 @@ post_build() {
;;
i686/stage3-openrc.spec)
upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
- ;;
- i686/stage3-systemd.spec)
- upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i686" x86/17.0/i686
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-11-08 20:24 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-11-08 20:24 UTC (permalink / raw
To: gentoo-commits
commit: 260e61e60eb517e156c1c3d838cb6485394b0080
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 8 20:23:56 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Nov 8 20:23:56 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=260e61e6
Enable experimental diskimage builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index da417c16..45350a8e 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -16,6 +16,7 @@ SETS="
systemd_23
nomultilib_openrc_23
nomultilib_systemd_23
+ diskimage_23
llvm_openrc_23
llvm_systemd_23
hardened_openrc_23
@@ -54,6 +55,8 @@ SET_nomultilib_openrc_23_SPECS="nomultilib/stage1-openrc-23.spec nomultilib/stag
SET_nomultilib_systemd_23_SPECS="nomultilib/stage1-systemd-23.spec nomultilib/stage3-systemd-23.spec"
+SET_diskimage_23_SPECS="diskimage-stage1.spec diskimage-stage2-console.spec"
+
SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec llvm/stage3-openrc-23.spec"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec llvm/stage3-systemd-23.spec"
@@ -130,6 +133,9 @@ post_build() {
nomultilib/stage3-systemd-23.spec)
upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
;;
+ diskimage-stage2-console.spec)
+ upload di-amd64-console-${TIMESTAMP}.qcow2*
+ ;;
x32/stage3-openrc-23.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-11-02 15:12 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-11-02 15:12 UTC (permalink / raw
To: gentoo-commits
commit: 85bed990ed1bc82fa1ee030cbf2f23d684be056c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 2 15:12:39 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 2 15:12:39 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=85bed990
Fix filenames for ssemath
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index cfa7d825..ea4b78d8 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -104,11 +104,11 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-time64 >/dev/null || exit
case ${spec} in
i686-t64/stage3-openrc-23.spec)
- upload stage3-i686-t64-openrc-${TIMESTAMP}.tar.xz*
+ upload stage3-i686-ssemath-t64-openrc-${TIMESTAMP}.tar.xz*
;;
i686-t64/stage3-systemd-23.spec)
- upload stage3-i686-t64-systemd-${TIMESTAMP}.tar.xz*
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-time64/stage3-i686-t64" x86/23.0/i686-t64
+ upload stage3-i686-ssemath-t64-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-time64/stage3-i686-ssemath" x86/23.0/i686-ssemath-t64
;;
esac
popd >/dev/null || exit
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-09-15 0:44 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-09-15 0:44 UTC (permalink / raw
To: gentoo-commits
commit: 3930b076a9b182d1cc61e998af34a0d7de3d3e4e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 15 00:44:02 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 15 00:44:02 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3930b076
Add missing backslash (for less backslash)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cc532c3d..015dd5ed 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -440,7 +440,7 @@ run_catalyst_commands() {
# Expand vars that the spec expects us to.
sed -i \
-e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
- -e "s:@DATESTAMP@:${DATESTAMP}:g"
+ -e "s:@DATESTAMP@:${DATESTAMP}:g" \
-e "s:@REPO_DIR@:${REPO_DIR}:g" \
-e "s:@TREEISH@:${TREEISH}:g" \
"${i}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-09-14 12:07 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2024-09-14 12:07 UTC (permalink / raw
To: gentoo-commits
commit: f1c2b6d186ec30fb3c634875e1d7eafc2f63f044
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 14 12:06:36 2024 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 12:06:36 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f1c2b6d1
tools/catalyst-auto: replace DATESTAMP in specs as well
We started using this variable in specs but it's not in the sed list
yet.
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index d1a72d91..cc532c3d 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -440,6 +440,7 @@ run_catalyst_commands() {
# Expand vars that the spec expects us to.
sed -i \
-e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
+ -e "s:@DATESTAMP@:${DATESTAMP}:g"
-e "s:@REPO_DIR@:${REPO_DIR}:g" \
-e "s:@TREEISH@:${TREEISH}:g" \
"${i}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-07-29 21:44 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-07-29 21:44 UTC (permalink / raw
To: gentoo-commits
commit: bbcfddf456fdf1fca2b36cb0386df93cbc211305
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 29 21:43:53 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 29 21:44:20 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bbcfddf4
catalyst-auto: Replace more than one / with _ in logfile name
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 04db65e7..d1a72d91 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -483,7 +483,7 @@ run_catalyst_commands() {
fi
for i in ${!specs_var}; do
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:g' -e 's:\.spec$::').log"
specpath=$(readlink -f "${i}")
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
if [[ $? != 0 ]]; then
@@ -496,7 +496,7 @@ run_catalyst_commands() {
done
for i in ${!optional_specs_var}; do
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:g' -e 's:\.spec$::').log"
specpath=$(readlink -f "${i}")
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
if [[ $? != 0 ]]; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-06-11 18:29 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-06-11 18:29 UTC (permalink / raw
To: gentoo-commits
commit: 35d58c3943b1a0f29d5508acd7fbe4b97c45bf67
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 11 18:28:58 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 11 18:28:58 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=35d58c39
Enable x86 i686-ssemath builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index b3fbb54a..1560c2f7 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -14,6 +14,8 @@ SETS="
i486_systemd_23
i686_openrc_23
i686_systemd_23
+ i686_ssemath_openrc_23
+ i686_ssemath_systemd_23
hardened_openrc_23
musl_23
"
@@ -27,6 +29,10 @@ SET_i686_openrc_23_SPECS="i686/stage1-openrc-23.spec i686/stage3-openrc-23.spec"
SET_i686_systemd_23_SPECS="i686/stage1-systemd-23.spec i686/stage3-systemd-23.spec"
+SET_i686_ssemath_openrc_23_SPECS="i686-ssemath/stage1-openrc-23.spec i686-ssemath/stage3-openrc-23.spec"
+
+SET_i686_ssemath_systemd_23_SPECS="i686-ssemath/stage1-systemd-23.spec i686-ssemath/stage3-systemd-23.spec"
+
SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec hardened/stage3-openrc-23.spec"
SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec hardened/admincd-stage2-openrc.spec"
@@ -82,6 +88,13 @@ post_build() {
upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i686" x86/23.0/i686
;;
+ i686-ssemath/stage3-openrc-23.spec)
+ upload stage3-i686-ssemath-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ i686-ssemath/stage3-systemd-23.spec)
+ upload stage3-i686-ssemath-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i686-ssemath" x86/23.0/i686-ssemath
+ ;;
esac
popd >/dev/null || exit
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-06-01 15:48 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-06-01 15:48 UTC (permalink / raw
To: gentoo-commits
commit: d7d6f5a75f3a1cdc868065e6bf618391a2f87c3b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 15:48:16 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 15:48:16 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7d6f5a7
Clean up catalyst-auto configurations
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 73 -------------------------
tools/catalyst-auto-arm.conf | 69 ------------------------
tools/catalyst-auto-arm64.conf | 42 ---------------
tools/catalyst-auto-hppa.conf | 15 ------
tools/catalyst-auto-ia64.conf | 5 --
tools/catalyst-auto-ppc.conf | 20 -------
tools/catalyst-auto-ppc64le.conf | 21 --------
tools/catalyst-auto-qemu-alpha.conf | 10 ----
tools/catalyst-auto-qemu-arm64.conf | 10 ----
tools/catalyst-auto-qemu-loong.conf | 10 ----
tools/catalyst-auto-qemu-m68k.conf | 14 -----
tools/catalyst-auto-qemu-mips-common | 102 -----------------------------------
tools/catalyst-auto-qemu-riscv.conf | 17 ------
tools/catalyst-auto-s390x.conf | 15 ------
tools/catalyst-auto-sparc64.conf | 15 ------
tools/catalyst-auto-x86.conf | 35 ------------
16 files changed, 473 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 788f0f1b..da417c16 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -29,31 +29,6 @@ SETS="
x32_systemd_23
"
-# 17.0
-
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec"
-
-SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec"
-
-SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec hardened-selinux/stage3-openrc.spec"
-
-SET_hardened_nomultilib_selinux_openrc_SPECS="hardened-nomultilib-selinux/stage1-openrc.spec hardened-nomultilib-selinux/stage3-openrc.spec"
-
-SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec hardened-nomultilib/stage3-openrc.spec"
-
-SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage3-openrc.spec"
-
-SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
-
-SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
-
-SET_musl_llvm_SPECS="musl-clang/stage1.spec musl-clang/stage3.spec"
-
-SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
-
-SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
-
# 23.0
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -124,14 +99,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
- case ${spec} in
- x32/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-default >/dev/null || exit
case ${spec} in
stage3-openrc-23.spec)
@@ -181,14 +148,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
- case ${spec} in
- clang/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-llvm >/dev/null || exit
case ${spec} in
llvm/stage3-openrc-23.spec)
@@ -201,14 +160,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/hardened >/dev/null || exit
- case ${spec} in
- hardened/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc-23.spec)
@@ -236,14 +187,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
- case ${spec} in
- musl/stage3.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-amd64" amd64/17.1/x86-64_musl
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl >/dev/null || exit
case ${spec} in
musl/stage3-23.spec)
@@ -253,14 +196,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/musl-clang >/dev/null || exit
- case ${spec} in
- musl-clang/stage3.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-clang/stage3-amd64" amd64/17.1/x86-64_musl_llvm
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-llvm >/dev/null || exit
case ${spec} in
musl-llvm/stage3-23.spec)
@@ -270,14 +205,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
- case ${spec} in
- musl-hardened/stage3.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-amd64" amd64/17.1/x86-64_musl_hardened
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-hardened >/dev/null || exit
case ${spec} in
musl-hardened/stage3-23.spec)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index d530c5ea..b1590fa3 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -29,24 +29,6 @@ SETS="
armv7a_hf_musl_hardened_openrc_23
"
-SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec"
-
-SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec armv5tel/stage3-openrc.spec"
-
-SET_armv6j_hf_openrc_SPECS="armv6j/stage1-hardfloat-openrc.spec armv6j/stage3-hardfloat-openrc.spec"
-
-SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec armv6j/stage3-openrc.spec"
-
-SET_armv6j_hf_musl_openrc_SPECS="armv6j-musl/stage1-hardfloat.spec armv6j-musl/stage3-hardfloat.spec"
-SET_armv6j_hf_musl_hardened_openrc_SPECS="armv6j-musl-hardened/stage1-hardfloat.spec armv6j-musl-hardened/stage3-hardfloat.spec"
-
-SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec"
-
-SET_armv7a_hf_musl_openrc_SPECS="armv7a-musl/stage1-hardfloat.spec armv7a-musl/stage3-hardfloat.spec"
-SET_armv7a_hf_musl_hardened_openrc_SPECS="armv7a-musl-hardened/stage1-hardfloat.spec armv7a-musl-hardened/stage3-hardfloat.spec"
-
-SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec armv7a/stage3-openrc.spec"
-
SET_armv4tl_openrc_23_SPECS="armv4tl/stage1-openrc-23.spec armv4tl/stage3-openrc-23.spec"
SET_armv4tl_systemd_23_SPECS="armv4tl/stage1-systemd-23.spec armv4tl/stage3-systemd-23.spec"
@@ -89,31 +71,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-
- case ${spec} in
- armv4tl/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv4tl" arm/17.0/armv4tl
- ;;
- armv5tel/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv5tel" arm/17.0/armv5tel
- ;;
- armv6j/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j" arm/17.0/armv6j
- ;;
- armv6j/stage3-hardfloat-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j_hardfp" arm/17.0/armv6j_hardfp
- ;;
- armv7a/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a" arm/17.0/armv7a
- ;;
- armv7a/stage3-hardfloat-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a_hardfp" arm/17.0/armv7a_hardfp
- ;;
- esac
-
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
@@ -163,19 +120,6 @@ post_build() {
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
-
- case ${spec} in
- armv7a-musl/stage3-hardfloat.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-armv7a_hardfp_musl" arm/17.0/armv7a_hardfp_musl
- ;;
- armv6j-musl/stage3-hardfloat.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-armv6j_hardfp_musl" arm/17.0/armv6j_hardfp_musl
- ;;
- esac
-
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
@@ -191,19 +135,6 @@ post_build() {
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
-
- case ${spec} in
- armv7a-musl-hardened/stage3-hardfloat.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-armv7a_hardfp_musl" arm/17.0/armv7a_hardfp_musl_hardened
- ;;
- armv6j-musl-hardened/stage3-hardfloat.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-armv6j_hardfp_musl" arm/17.0/armv6j_hardfp_musl_hardened
- ;;
- esac
-
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
case ${spec} in
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index e32763e3..908012d3 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -17,8 +17,6 @@ SETS="
musl_llvm_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec stage3d-openrc-23.spec"
SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -26,18 +24,10 @@ SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec stage3d-systemd-23.spec"
-SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec"
-
SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec llvm/stage3-openrc-23.spec"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec llvm/stage3-systemd-23.spec"
-SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
-
-SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
-
-SET_musl_llvm_SPECS="musl-llvm/stage1.spec musl-llvm/stage3.spec"
-
SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
SET_musl_hardened_23_SPECS="musl-hardened/stage1-23.spec musl-hardened/stage3-23.spec"
@@ -98,14 +88,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/llvm" >/dev/null
- case ${spec} in
- llvm/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/llvm/stage3-arm64" arm64/17.0/arm64_llvm
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-llvm" >/dev/null
case ${spec} in
llvm/stage3-openrc-23.spec)
@@ -118,14 +100,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- case ${spec} in
- musl/stage3.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-arm64" arm64/17.0/arm64_musl
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
musl/stage3-23.spec)
@@ -135,14 +109,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
- case ${spec} in
- musl-hardened/stage3.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-arm64" arm64/17.0/arm64_musl_hardened
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
case ${spec} in
musl-hardened/stage3-23.spec)
@@ -152,14 +118,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl-llvm" >/dev/null
- case ${spec} in
- musl-llvm/stage3.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-llvm/stage3-arm64" arm64/17.0/arm64_musl_llvm
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-llvm" >/dev/null
case ${spec} in
musl-llvm/stage3-23.spec)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index a040f876..42d73618 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -12,10 +12,6 @@ SETS="
hppa20_systemd_23
"
-SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
-
-SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
-
SET_hppa11_openrc_23_SPECS="hppa1.1/stage1-openrc-23.spec hppa1.1/stage3-openrc-23.spec"
SET_hppa11_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
@@ -52,17 +48,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- hppa1.1/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa1.1" hppa/17.0/hppa1.1
- ;;
- hppa2.0/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa2.0" hppa/17.0/hppa2.0
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
hppa1.1/stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 6527141e..c9f1290a 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -10,8 +10,6 @@ SETS="
systemd_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -42,9 +40,6 @@ post_build() {
installcd-stage2*)
upload builds/23.0-default/*${TIMESTAMP}*.iso*
;;
- stage3-openrc.spec)
- upsync_binpackages packages/default/stage3-ia64 ia64/17.0/ia64
- ;;
stage3-openrc-23.spec)
upload builds/23.0-default/stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
;;
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index b62aaa84..fb671487 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -14,14 +14,6 @@ SETS="
musl_hardened_64_23
"
-SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
-
-SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec"
-
-SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec"
-
-SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec"
-
SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec"
SET_openrc_23_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
@@ -64,18 +56,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds" >/dev/null
case ${spec} in
- ppc32/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc" ppc/17.0/ppc
- ;;
- ppc32/stage3-musl-hardened-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc" ppc/17.0/ppc_musl_hardened
- ;;
- ppc64/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64" ppc/17.0/ppc64
- ;;
- ppc64/stage3-musl-hardened-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64" ppc/17.0/ppc64_musl_hardened
- ;;
ppc32/stage3-openrc-23.spec)
upload 23.0-default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
;;
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index a6d46bd9..9349cc46 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -14,15 +14,6 @@ SETS="
musl_hardened_power9le_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
-SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
-
-SET_musl_hardened_SPECS="stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
-
-SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
-
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -66,18 +57,6 @@ post_build() {
installcd-stage2-minimal.spec)
upload 23.0-default/*${TIMESTAMP}*.iso*
;;
- stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64le" ppc/17.0/ppc64le
- ;;
- stage3-openrc-power9le.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/power9le/stage3-power9le" ppc/17.0/power9le
- ;;
- stage3-musl-hardened-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64le" ppc/17.0/ppc64le_musl_hardened
- ;;
- stage3-musl-hardened-openrc-power9le.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/power9le-musl-hardened/stage3-power9le" ppc/17.0/power9le_musl_hardened
- ;;
stage3-openrc-23.spec)
upload 23.0-default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
;;
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index b2946afc..eede9315 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -11,8 +11,6 @@ SETS="
systemd23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_openrc23_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -36,14 +34,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-alpha" alpha/17.0/alpha
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-qemu-arm64.conf b/tools/catalyst-auto-qemu-arm64.conf
index 0fa4f46a..fdee79e7 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -11,8 +11,6 @@ SETS="
systemd_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -39,14 +37,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-aarch64_be" arm64/17.0/aarch64_be
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index 4146886f..2390be7d 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -15,8 +15,6 @@ SETS="
systemd23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -37,14 +35,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-loong" loong/22.0/loong
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 1dd80539..65c01527 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -16,10 +16,6 @@ SETS="
musl_23
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-
-SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -44,16 +40,6 @@ post_build() {
local set=$1 spec=$2
case ${spec} in
- stage3-openrc.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k
- popd >/dev/null
- ;;
- stage3-musl.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
- popd >/dev/null
- ;;
stage3-openrc-23.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index b65ddd23..bc4a96bc 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -6,15 +6,6 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS_O32_17="
- mipsel2_softfloat_o32_openrc
- mipsel2_o32_openrc
- mipsel2_o32_musl
- mips2_softfloat_o32_openrc
- mips2_o32_openrc
- mips2_o32_musl
-"
-
SETS_O32_23="
mipsel2_softfloat_o32_openrc_23
mipsel2_softfloat_o32_systemd_23
@@ -30,11 +21,6 @@ SETS_O32_23="
SETS_O32="${SETS_O32_23}"
-SETS_N32_17="
- mipsel3_n32_openrc
- mips3_n32_openrc
-"
-
SETS_N32_23="
mipsel3_n32_openrc_23
mipsel3_n32_systemd_23
@@ -44,11 +30,6 @@ SETS_N32_23="
SETS_N32="${SETS_N32_23}"
-SETS_N64_17="
- mipsel3_n64_openrc
- mips3_n64_openrc
-"
-
SETS_N64_23="
mipsel3_n64_openrc_23
mipsel3_n64_systemd_23
@@ -58,11 +39,6 @@ SETS_N64_23="
SETS_N64="${SETS_N64_23}"
-SETS_MULTI_17="
- mipsel3_multilib_openrc
- mips3_multilib_openrc
-"
-
SETS_MULTI_23="
mipsel3_multilib_openrc_23
mipsel3_multilib_systemd_23
@@ -73,20 +49,6 @@ SETS_MULTI_23="
SETS_MULTI="${SETS_MULTI_23}"
-# 17.0 O32
-
-SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
-
-SET_mips2_softfloat_o32_openrc_SPECS="stage1-mips2_softfloat-o32-openrc.spec stage3-mips2_softfloat-o32-openrc.spec"
-
-SET_mips2_o32_musl_SPECS="stage1-mips2-o32-musl.spec stage3-mips2-o32-musl.spec"
-
-SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
-
-SET_mipsel2_softfloat_o32_openrc_SPECS="stage1-mipsel2_softfloat-o32-openrc.spec stage3-mipsel2_softfloat-o32-openrc.spec"
-
-SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec stage3-mipsel2-o32-musl.spec"
-
# 23.0 O32
SET_mips2_o32_openrc_23_SPECS="o32/stage1-mips2-o32-openrc-23.spec o32/stage3-mips2-o32-openrc-23.spec"
@@ -105,12 +67,6 @@ SET_mipsel2_softfloat_o32_systemd_23_SPECS="o32/stage1-mipsel2_softfloat-o32-sys
SET_mipsel2_o32_musl_23_SPECS="o32/stage1-mipsel2-o32-musl-23.spec o32/stage3-mipsel2-o32-musl-23.spec"
-# 17.0 N32
-
-SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
-
-SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
-
# 23.0 N32
SET_mips3_n32_openrc_23_SPECS="n32/stage1-mips3-n32-openrc-23.spec n32/stage3-mips3-n32-openrc-23.spec"
@@ -119,12 +75,6 @@ SET_mips3_n32_systemd_23_SPECS="n32/stage1-mips3-n32-systemd-23.spec n32/stage3-
SET_mipsel3_n32_openrc_23_SPECS="n32/stage1-mipsel3-n32-openrc-23.spec n32/stage3-mipsel3-n32-openrc-23.spec"
SET_mipsel3_n32_systemd_23_SPECS="n32/stage1-mipsel3-n32-systemd-23.spec n32/stage3-mipsel3-n32-systemd-23.spec"
-# 17.0 N64
-
-SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec"
-
-SET_mipsel3_n64_openrc_SPECS="stage1-mipsel3-n64-openrc.spec stage3-mipsel3-n64-openrc.spec"
-
# 23.0 N64
SET_mips3_n64_openrc_23_SPECS="n64/stage1-mips3-n64-openrc-23.spec n64/stage3-mips3-n64-openrc-23.spec"
@@ -133,12 +83,6 @@ SET_mips3_n64_systemd_23_SPECS="n64/stage1-mips3-n64-systemd-23.spec n64/stage3-
SET_mipsel3_n64_openrc_23_SPECS="n64/stage1-mipsel3-n64-openrc-23.spec n64/stage3-mipsel3-n64-openrc-23.spec"
SET_mipsel3_n64_systemd_23_SPECS="n64/stage1-mipsel3-n64-systemd-23.spec n64/stage3-mipsel3-n64-systemd-23.spec"
-# 17.0 multilib
-
-SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
-
-SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
-
# 23.0 multilib
SET_mips3_multilib_openrc_23_SPECS="multilib/stage1-mips3-multilib-openrc-23.spec multilib/stage3-mips3-multilib-openrc-23.spec"
@@ -168,41 +112,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- stage3-mips2-o32-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2" mips/17.0/mips2_o32
- ;;
- stage3-mips2_softfloat-o32-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2_softfloat" mips/17.0/mips2_o32_softfloat
- ;;
- stage3-mipsel2-o32-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2" mips/17.0/mipsel2_o32
- ;;
- stage3-mipsel2_softfloat-o32-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2_softfloat" mips/17.0/mipsel2_o32_softfloat
- ;;
- stage3-mips3-n32-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n32" mips/17.0/mips3_n32
- ;;
- stage3-mipsel3-n32-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n32" mips/17.0/mipsel3_n32
- ;;
- stage3-mips3-n64-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n64" mips/17.0/mips3_n64
- ;;
- stage3-mipsel3-n64-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n64" mips/17.0/mipsel3_n64
- ;;
- stage3-mips3-multilib-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_multilib" mips/17.0/mips3_multilib
- ;;
- stage3-mipsel3-multilib-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_multilib" mips/17.0/mipsel3_multilib
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
o32/stage3-mips2-o32-openrc-23.spec)
@@ -278,17 +187,6 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- case ${spec} in
- stage3-mips2-o32-musl.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-mips2_musl" mips/17.0/mips2_o32_musl
- ;;
- stage3-mipsel2-o32-musl.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-mipsel2_musl" mips/17.0/mipsel2_o32_musl
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
o32/stage3-mips2-o32-musl-23.spec)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 5b7bdb94..894248aa 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -27,14 +27,6 @@ SETS="
ilp32_musl_23
"
-SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
-SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
-
-SET_lp64_musl_SPECS="stage1-lp64-musl.spec stage3-lp64-musl.spec"
-SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
-
-SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec stage3-multilib-openrc.spec"
-
SET_lp64d_musl_23_SPECS="stage1-lp64d-musl-23.spec stage3-lp64d-musl-23.spec"
SET_lp64d_openrc_23_SPECS="stage1-lp64d-openrc-23.spec stage3-lp64d-openrc-23.spec"
SET_lp64d_systemd_23_SPECS="stage1-lp64d-systemd-23.spec stage3-lp64d-systemd-23.spec"
@@ -124,15 +116,6 @@ post_build() {
upload builds/23.0-musl/stage3-rv32_ilp32_musl-${TIMESTAMP}*.xz*
upsync_binpackages packages/23.0-musl/stage3-rv32_ilp32_musl riscv/23.0/rv32_ilp32_musl
;;
- stage3*openrc.spec)
- upsync_binpackages packages/default/stage3-rv64_lp64d riscv/20.0/rv64_lp64d
- upsync_binpackages packages/default/stage3-rv64_lp64 riscv/20.0/rv64_lp64
- upsync_binpackages packages/default/stage3-rv64_multilib riscv/20.0/rv64_multilib
- ;;
- stage3*musl.spec)
- upsync_binpackages packages/musl/stage3-rv64_lp64d_musl riscv/20.0/rv64_lp64d_musl
- upsync_binpackages packages/musl/stage3-rv64_lp64_musl riscv/20.0/rv64_lp64_musl
- ;;
*)
echo "Finished ${spec}"
;;
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index ee4297c2..3f5b9eac 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -12,15 +12,11 @@ SETS="
systemd_32_23
"
-SET_openrc_64_SPECS="s390x/stage1-openrc.spec s390x/stage3-openrc.spec"
-
SET_openrc_64_23_SPECS="s390x/stage1-openrc-23.spec s390x/stage3-openrc-23.spec"
SET_openrc_64_23_OPTIONAL_SPECS="s390x/netboot/netboot.spec"
SET_systemd_64_23_SPECS="s390x/stage1-systemd-23.spec s390x/stage3-systemd-23.spec"
-SET_openrc_32_SPECS="s390/stage1-openrc.spec s390/stage3-openrc.spec"
-
SET_openrc_32_23_SPECS="s390/stage1-openrc-23.spec s390/stage3-openrc-23.spec"
SET_openrc_32_23_OPTIONAL_SPECS="s390/netboot/netboot.spec"
@@ -47,17 +43,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- s390x/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
- ;;
- s390/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
s390x/stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index f7f243e0..bb93275a 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -12,10 +12,6 @@ SETS="
systemd_64_23
"
-SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
-
-SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
-
SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec sparc/stage3-openrc-23.spec"
SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec sparc/stage3-systemd-23.spec"
@@ -49,17 +45,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- sparc/stage3.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
- ;;
- sparc64/stage3.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
sparc/stage3-openrc-23.spec)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 8cfd0b1e..b3fbb54a 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -18,26 +18,18 @@ SETS="
musl_23
"
-SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage3-openrc.spec"
-
SET_i486_openrc_23_SPECS="i486/stage1-openrc-23.spec i486/stage3-openrc-23.spec"
SET_i486_openrc_23_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd-stage2-minimal-openrc.spec"
SET_i486_systemd_23_SPECS="i486/stage1-systemd-23.spec i486/stage3-systemd-23.spec"
-SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage3-openrc.spec"
-
SET_i686_openrc_23_SPECS="i686/stage1-openrc-23.spec i686/stage3-openrc-23.spec"
SET_i686_systemd_23_SPECS="i686/stage1-systemd-23.spec i686/stage3-systemd-23.spec"
-SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec"
-
SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec hardened/stage3-openrc-23.spec"
SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec hardened/admincd-stage2-openrc.spec"
-SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
-
SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
@@ -71,17 +63,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd ${BUILD_SRCDIR_BASE}/builds/default >/dev/null || exit
- case ${spec} in
- i486/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i486" x86/17.0/i486
- ;;
- i686/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i686" x86/17.0/i686
- ;;
- esac
- popd >/dev/null || exit
-
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-default >/dev/null || exit
case ${spec} in
i486/stage3-openrc-23.spec)
@@ -104,14 +85,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd ${BUILD_SRCDIR_BASE}/builds/hardened >/dev/null || exit
- case ${spec} in
- hardened/stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-i686" x86/17.0/i686_hardened
- ;;
- esac
- popd >/dev/null || exit
-
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc-23.spec)
@@ -124,14 +97,6 @@ post_build() {
esac
popd >/dev/null || exit
- pushd ${BUILD_SRCDIR_BASE}/builds/musl >/dev/null || exit
- case ${spec} in
- musl/stage3.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-i686" x86/17.0/i686_musl
- ;;
- esac
- popd >/dev/null || exit
-
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-musl >/dev/null || exit
case ${spec} in
musl/stage3-23.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-06-01 14:22 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-06-01 14:22 UTC (permalink / raw
To: gentoo-commits
commit: 3b62d92a9e034ec3cb8a750a8313474f19700e41
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 1 14:21:51 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun 1 14:21:51 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3b62d92a
Stop all 17.0 / 20.0 / 22.0 profile builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 11 -----------
tools/catalyst-auto-arm.conf | 10 ----------
tools/catalyst-auto-arm64.conf | 5 -----
tools/catalyst-auto-ia64.conf | 1 -
tools/catalyst-auto-ppc.conf | 4 ----
tools/catalyst-auto-ppc64le.conf | 4 ----
tools/catalyst-auto-qemu-alpha.conf | 1 -
tools/catalyst-auto-qemu-arm64.conf | 1 -
tools/catalyst-auto-qemu-loong.conf | 1 -
tools/catalyst-auto-qemu-m68k.conf | 2 --
tools/catalyst-auto-qemu-mips-common | 8 ++++----
tools/catalyst-auto-qemu-riscv.conf | 5 -----
tools/catalyst-auto-s390x.conf | 2 --
tools/catalyst-auto-sparc64.conf | 2 --
tools/catalyst-auto-x86.conf | 4 ----
15 files changed, 4 insertions(+), 57 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 933b04df..788f0f1b 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -27,17 +27,6 @@ SETS="
musl_llvm_23
x32_openrc_23
x32_systemd_23
- openrc
- nomultilib_openrc
- llvm_openrc
- hardened_openrc
- hardened_nomultilib_openrc
- hardened_selinux_openrc
- hardened_nomultilib_selinux_openrc
- musl
- musl_hardened
- musl_llvm
- x32_openrc
"
# 17.0
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index cce9a0f8..d530c5ea 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -27,16 +27,6 @@ SETS="
armv7a_sf_systemd_23
armv7a_hf_musl_openrc_23
armv7a_hf_musl_hardened_openrc_23
- armv4tl_openrc
- armv5tel_openrc
- armv6j_hf_openrc
- armv6j_sf_openrc
- armv6j_hf_musl_openrc
- armv6j_hf_musl_hardened_openrc
- armv7a_hf_openrc
- armv7a_sf_openrc
- armv7a_hf_musl_openrc
- armv7a_hf_musl_hardened_openrc
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec"
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 28e51b4b..e32763e3 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -15,11 +15,6 @@ SETS="
musl_23
musl_hardened_23
musl_llvm_23
- openrc
- llvm_openrc
- musl
- musl_hardened
- musl_llvm
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b4500e5a..6527141e 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -8,7 +8,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SETS="
openrc_23
systemd_23
- openrc
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 1a195805..b62aaa84 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -12,10 +12,6 @@ SETS="
openrc_64_23
systemd_64_23
musl_hardened_64_23
- openrc
- musl_hardened
- openrc_64
- musl_hardened_64
"
SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index aba6051a..a6d46bd9 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -12,10 +12,6 @@ SETS="
systemd_power9le_23
musl_hardened_23
musl_hardened_power9le_23
- openrc
- openrc_power9le
- musl_hardened
- musl_hardened_power9le
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index d62670b1..b2946afc 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -9,7 +9,6 @@ EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
SETS="
openrc23
systemd23
- openrc
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-arm64.conf b/tools/catalyst-auto-qemu-arm64.conf
index 2afa2c87..0fa4f46a 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -9,7 +9,6 @@ SUBARCH=aarch64_be
SETS="
openrc_23
systemd_23
- openrc
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index b35f9216..4146886f 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -13,7 +13,6 @@ EMAIL_SUBJECT_PREPEND="[loong-qemu-auto]"
SETS="
openrc23
systemd23
- openrc
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index a33c3ca9..1dd80539 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -14,8 +14,6 @@ SETS="
openrc_23
systemd_23
musl_23
- openrc
- musl
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 238bd89e..b65ddd23 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -28,7 +28,7 @@ SETS_O32_23="
mips2_o32_musl_23
"
-SETS_O32="${SETS_O32_17} ${SETS_O32_23}"
+SETS_O32="${SETS_O32_23}"
SETS_N32_17="
mipsel3_n32_openrc
@@ -42,7 +42,7 @@ SETS_N32_23="
mips3_n32_systemd_23
"
-SETS_N32="${SETS_N32_17} ${SETS_N32_23}"
+SETS_N32="${SETS_N32_23}"
SETS_N64_17="
mipsel3_n64_openrc
@@ -56,7 +56,7 @@ SETS_N64_23="
mips3_n64_systemd_23
"
-SETS_N64="${SETS_N64_17} ${SETS_N64_23}"
+SETS_N64="${SETS_N64_23}"
SETS_MULTI_17="
mipsel3_multilib_openrc
@@ -70,7 +70,7 @@ SETS_MULTI_23="
mips3_multilib_systemd_23
"
-SETS_MULTI="${SETS_MULTI_17} ${SETS_MULTI_23}"
+SETS_MULTI="${SETS_MULTI_23}"
# 17.0 O32
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index d88df515..5b7bdb94 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -25,11 +25,6 @@ SETS="
ilp32_openrc_23
ilp32_systemd_23
ilp32_musl_23
- lp64d_openrc
- lp64d_musl
- lp64_openrc
- lp64_musl
- multilib_openrc
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 9d2aa65e..ee4297c2 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -10,8 +10,6 @@ SETS="
systemd_64_23
openrc_32_23
systemd_32_23
- openrc_64
- openrc_32
"
SET_openrc_64_SPECS="s390x/stage1-openrc.spec s390x/stage3-openrc.spec"
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 3f797369..f7f243e0 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -10,8 +10,6 @@ SETS="
systemd_32_23
openrc_64_23
systemd_64_23
- openrc_32
- openrc_64
"
SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 1305eca7..8cfd0b1e 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -16,10 +16,6 @@ SETS="
i686_systemd_23
hardened_openrc_23
musl_23
- i486_openrc
- i686_openrc
- hardened_openrc
- musl
"
SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage3-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-05-06 11:17 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-05-06 11:17 UTC (permalink / raw
To: gentoo-commits
commit: 71cef86aea815fb2c0439bec8a35e930d0bc0574
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon May 6 11:16:36 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon May 6 11:16:36 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=71cef86a
Drop hppa 17.0 builds (hake is too slow for building both)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 0ddc5b80..a040f876 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -10,8 +10,6 @@ SETS="
hppa11_systemd_23
hppa20_openrc_23
hppa20_systemd_23
- hppa11_openrc
- hppa20_openrc
"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-05-02 7:32 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-05-02 7:32 UTC (permalink / raw
To: gentoo-commits
commit: a1f68f259d5d5954192b3a1497c960972e9be4fe
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu May 2 07:32:12 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu May 2 07:32:36 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a1f68f25
Enable riscv32 musl builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 63d79a05..d88df515 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -21,16 +21,16 @@ SETS="
multilib_systemd_23
ilp32d_openrc_23
ilp32d_systemd_23
+ ilp32d_musl_23
ilp32_openrc_23
ilp32_systemd_23
+ ilp32_musl_23
lp64d_openrc
lp64d_musl
lp64_openrc
lp64_musl
multilib_openrc
"
-# ilp32d_musl_23
-# ilp32_musl_23
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-04-06 14:35 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-04-06 14:35 UTC (permalink / raw
To: gentoo-commits
commit: fe65e350f95103437e322c9e149840760553561a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 6 14:35:19 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Apr 6 14:35:19 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fe65e350
Enable riscv RV32 ILP32D builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 30 ++++++++++++++++++++++++------
1 file changed, 24 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 328b500a..7114c491 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -19,12 +19,15 @@ SETS="
lp64_musl_23
multilib_openrc_23
multilib_systemd_23
+ ilp32d_openrc_23
+ ilp32d_systemd_23
lp64d_openrc
lp64d_musl
lp64_openrc
lp64_musl
multilib_openrc
"
+# ilp32d_musl_23
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
@@ -45,6 +48,10 @@ SET_lp64_systemd_23_SPECS="stage1-lp64-systemd-23.spec stage3-lp64-systemd-23.sp
SET_multilib_openrc_23_SPECS="stage1-multilib-openrc-23.spec stage3-multilib-openrc-23.spec"
SET_multilib_systemd_23_SPECS="stage1-multilib-systemd-23.spec stage3-multilib-systemd-23.spec"
+SET_ilp32d_musl_23_SPECS="rv32_ilp32d/stage1-ilp32d-musl-23.spec rv32_ilp32d/stage3-ilp32d-musl-23.spec"
+SET_ilp32d_openrc_23_SPECS="rv32_ilp32d/stage1-ilp32d-openrc-23.spec rv32_ilp32d/stage3-ilp32d-openrc-23.spec"
+SET_ilp32d_systemd_23_SPECS="rv32_ilp32d/stage1-ilp32d-systemd-23.spec rv32_ilp32d/stage3-ilp32d-systemd-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
@@ -71,6 +78,10 @@ post_build() {
upload builds/23.0-default/stage3-rv64_lp64d-systemd-${TIMESTAMP}*.xz*
upsync_binpackages packages/23.0-default/stage3-rv64_lp64d riscv/23.0/rv64_lp64d
;;
+ stage3-lp64d-musl-23.spec)
+ upload builds/23.0-musl/stage3-rv64_lp64d_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl
+ ;;
stage3-lp64-openrc-23.spec)
upload builds/23.0-default/stage3-rv64_lp64-openrc-${TIMESTAMP}*.xz*
;;
@@ -78,6 +89,10 @@ post_build() {
upload builds/23.0-default/stage3-rv64_lp64-systemd-${TIMESTAMP}*.xz*
upsync_binpackages packages/23.0-default/stage3-rv64_lp64 riscv/23.0/rv64_lp64
;;
+ stage3-lp64-musl-23.spec)
+ upload builds/23.0-musl/stage3-rv64_lp64_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl
+ ;;
stage3-multilib-openrc-23.spec)
upload builds/23.0-default/stage3-rv64_multilib-openrc-${TIMESTAMP}*.xz*
;;
@@ -85,13 +100,16 @@ post_build() {
upload builds/23.0-default/stage3-rv64_multilib-systemd-${TIMESTAMP}*.xz*
upsync_binpackages packages/23.0-default/stage3-rv64_multilib riscv/23.0/rv64_multilib
;;
- stage3-lp64d-musl-23.spec)
- upload builds/23.0-musl/stage3-rv64_lp64d_musl-${TIMESTAMP}*.xz*
- upsync_binpackages packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl
+ rv32_ilp32d/stage3-ilp32d-openrc-23.spec)
+ upload builds/23.0-default/stage3-rv32_ilp32d-openrc-${TIMESTAMP}*.xz*
;;
- stage3-lp64-musl-23.spec)
- upload builds/23.0-musl/stage3-rv64_lp64_musl-${TIMESTAMP}*.xz*
- upsync_binpackages packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl
+ rv32_ilp32d/stage3-ilp32d-systemd-23.spec)
+ upload builds/23.0-default/stage3-rv32_ilp32d-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-default/stage3-rv32_ilp32d riscv/23.0/rv32_ilp32d
+ ;;
+ rv32_ilp32d/stage3-ilp32d-musl-23.spec)
+ upload builds/23.0-musl/stage3-rv32_ilp32d_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-musl/stage3-rv32_ilp32d_musl riscv/23.0/rv32_ilp32d_musl
;;
stage3*openrc.spec)
upsync_binpackages packages/default/stage3-rv64_lp64d riscv/20.0/rv64_lp64d
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-04-02 11:53 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2024-04-02 11:53 UTC (permalink / raw
To: gentoo-commits
commit: e86116180e075f161fff1cc5b11ecd377137968a
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 2 11:52:05 2024 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 11:53:43 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e8611618
catalyst-auto: extra echo to debug CLST_AUTO_NOCLEAN
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 9624cebb..04db65e7 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -544,6 +544,7 @@ run_catalyst_commands() {
specpath=$(readlink -f "${i}")
# Bail out of cleaning (eg) stage3-openrc.spec failure if
# CLST_AUTO_NOCLEAN="stage3-openrc.spec" is set
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" echo "Testing ${i} against CLST_AUTO_NOCLEAN=${CLST_AUTO_NOCLEAN}"
[[ ${CLST_AUTO_NOCLEAN} == *${i}* ]] ||
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${specpath}"
done
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-31 12:05 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-31 12:05 UTC (permalink / raw
To: gentoo-commits
commit: 3a1a13decdb951cb5472d90736af8fce394f5e41
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 31 12:04:44 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 31 12:04:44 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a1a13de
Switch amd64 bootmedia uploads to 23.0
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 30 +++++++++++++++---------------
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5d45b13f..933b04df 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -11,6 +11,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
openrc_23
+ livegui_23
openrc_23_su
systemd_23
nomultilib_openrc_23
@@ -27,7 +28,6 @@ SETS="
x32_openrc_23
x32_systemd_23
openrc
- livegui
nomultilib_openrc
llvm_openrc
hardened_openrc
@@ -43,12 +43,9 @@ SETS="
# 17.0
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec"
-
-SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec"
+SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec"
-SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SET_hardened_selinux_openrc_SPECS="hardened-selinux/stage1-openrc.spec hardened-selinux/stage3-openrc.spec"
@@ -71,7 +68,9 @@ SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
# 23.0
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
-SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec installcd-stage1.spec installcd-stage2-minimal.spec"
+
+SET_livegui_23_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec"
SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
@@ -79,6 +78,7 @@ SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
SET_systemd_23_OPTIONAL_SPECS="stage3d-systemd-23.spec"
SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec hardened/stage3-openrc-23.spec"
+SET_hardened_openrc_23_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SET_hardened_systemd_23_SPECS="hardened/stage1-systemd-23.spec hardened/stage3-systemd-23.spec"
@@ -137,15 +137,9 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
case ${spec} in
- installcd-stage2-minimal.spec)
- upload install-amd64-minimal-${TIMESTAMP}.iso*
- ;;
x32/stage3-openrc.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
;;
- livegui/livegui-stage2.spec)
- upload livegui-amd64-${TIMESTAMP}.iso*
- ;;
esac
popd >/dev/null || exit
@@ -167,6 +161,12 @@ post_build() {
upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
# do not upsync_binpackages, done by extra builder
;;
+ installcd-stage2-minimal.spec)
+ upload install-amd64-minimal-${TIMESTAMP}.iso*
+ ;;
+ livegui/livegui-stage2.spec)
+ upload livegui-amd64-${TIMESTAMP}.iso*
+ ;;
nomultilib/stage3-openrc-23.spec)
upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
# do not upsync_binpackages, done by extra builder
@@ -217,9 +217,6 @@ post_build() {
hardened/stage3-openrc.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened
;;
- hardened/admincd-stage2.spec)
- upload admincd-amd64-${TIMESTAMP}.iso*
- ;;
esac
popd >/dev/null || exit
@@ -232,6 +229,9 @@ post_build() {
upload stage3-amd64-hardened-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-amd64" amd64/23.0/x86-64_hardened
;;
+ hardened/admincd-stage2.spec)
+ upload admincd-amd64-${TIMESTAMP}.iso*
+ ;;
hardened-nomultilib/stage3-openrc-23.spec)
upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-28 0:03 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-28 0:03 UTC (permalink / raw
To: gentoo-commits
commit: ff7b354f5ed617aa0ea04bbfde7de66b64efd51d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 28 00:03:11 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 28 00:03:33 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ff7b354f
Drop unused config file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-s390.conf | 67 -------------------------------------------
1 file changed, 67 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
deleted file mode 100644
index 8b9f1b3b..00000000
--- a/tools/catalyst-auto-s390.conf
+++ /dev/null
@@ -1,67 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-UPLOAD_USER=s390
-UPLOAD_KEY=/root/.ssh/id_rsa
-SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
-SUBARCH=s390
-
-SETS="
- openrc_23
- systemd_23
- openrc
-"
-
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-
-SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
-
-SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
-
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- local d f
- for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
- mkdir -p "${d}"
- pushd "${d}" >/dev/null
- for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
- local of=$(echo "${f}" | convert_filename)
- ln -sf "${f}" "${of}"
- done
- popd >/dev/null
- done
-}
-
-post_build() {
- local set=$1 spec=$2
-
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- netboot/netboot.spec)
- ls -l netboot-s390-${TIMESTAMP}/kernels/
- mv -v netboot-s390-${TIMESTAMP}/kernels/netboot netboot-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
- mv -v netboot-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
- upload netboot-s390-${TIMESTAMP}/netboot*
- ;;
- stage3-openrc.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
- ;;
- esac
- popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
- case ${spec} in
- stage3-openrc-23.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd-23.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390" s390/23.0/s390
- ;;
- esac
- popd >/dev/null
-}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-27 13:25 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-27 13:25 UTC (permalink / raw
To: gentoo-commits
commit: 9b41e1a51292a264959347d35ec1b35f7b1dd03f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 13:25:06 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 13:25:06 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9b41e1a5
Integrate 32bit stuff into s390x builder
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-s390x.conf | 30 ++++++++++++++++++++++++++++--
1 file changed, 28 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 355c7d82..dc4104de 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -4,12 +4,14 @@
UPLOAD_USER=s390
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390
-SUBARCH=s390x
SETS="
openrc_64_23
systemd_64_23
+ openrc_32_23
+ systemd_32_23
openrc_64
+ openrc_32
"
SET_openrc_64_SPECS="s390x/stage1-openrc.spec s390x/stage3-openrc.spec"
@@ -19,16 +21,24 @@ SET_openrc_64_23_SPECS="s390x/stage1-openrc-23.spec s390x/stage3-openrc-23.spec"
SET_systemd_64_23_SPECS="s390x/stage1-systemd-23.spec s390x/stage3-systemd-23.spec"
+SET_openrc_32_SPECS="s390/stage1-openrc.spec s390/stage3-openrc.spec"
+SET_openrc_32_OPTIONAL_SPECS="s390/netboot/netboot.spec"
+
+SET_openrc_32_23_SPECS="s390/stage1-openrc-23.spec s390/stage3-openrc-23.spec"
+
+SET_systemd_32_23_SPECS="s390/stage1-systemd-23.spec s390/stage3-systemd-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
- for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
+ for f in $(ls stage3-s390*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
@@ -47,9 +57,18 @@ post_build() {
mv -v netboot-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
upload netboot-s390x-${TIMESTAMP}/netboot*
;;
+ s390/netboot/netboot.spec)
+ ls -l netboot-s390-${TIMESTAMP}/kernels/
+ mv -v netboot-s390-${TIMESTAMP}/kernels/netboot netboot-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
+ mv -v netboot-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
+ upload netboot-s390-${TIMESTAMP}/netboot*
+ ;;
s390x/stage3-openrc.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
;;
+ s390/stage3-openrc.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
+ ;;
esac
popd >/dev/null
@@ -62,6 +81,13 @@ post_build() {
upload stage3-s390x-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
;;
+ s390/stage3-openrc-23.spec)
+ upload stage3-s390-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ s390/stage3-systemd-23.spec)
+ upload stage3-s390-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390" s390/23.0/s390
+ ;;
esac
popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-27 13:11 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-27 13:11 UTC (permalink / raw
To: gentoo-commits
commit: acbca0b011faf04a83c7e9e7d09a977ff2804586
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 27 13:10:52 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Mar 27 13:10:52 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=acbca0b0
Mark s390x specs as such, prepare for 32bit addition
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-s390x.conf | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 3bc474b9..355c7d82 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -3,21 +3,21 @@
UPLOAD_USER=s390
UPLOAD_KEY=/root/.ssh/id_rsa
-SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
+SPECS_DIR=${REPO_DIR}/releases/specs/s390
SUBARCH=s390x
SETS="
- openrc_23
- systemd_23
- openrc
+ openrc_64_23
+ systemd_64_23
+ openrc_64
"
-SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
+SET_openrc_64_SPECS="s390x/stage1-openrc.spec s390x/stage3-openrc.spec"
+SET_openrc_64_OPTIONAL_SPECS="s390x/netboot/netboot.spec"
-SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc_64_23_SPECS="s390x/stage1-openrc-23.spec s390x/stage3-openrc-23.spec"
-SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+SET_systemd_64_23_SPECS="s390x/stage1-systemd-23.spec s390x/stage3-systemd-23.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
@@ -41,13 +41,13 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- netboot/netboot.spec)
+ s390x/netboot/netboot.spec)
ls -l netboot-s390x-${TIMESTAMP}/
mv -v netboot-s390x-${TIMESTAMP}/kernels/netboot64 netboot-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
mv -v netboot-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
upload netboot-s390x-${TIMESTAMP}/netboot*
;;
- stage3-openrc.spec)
+ s390x/stage3-openrc.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
;;
esac
@@ -55,11 +55,11 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
- stage3-openrc-23.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+ s390x/stage3-openrc-23.spec)
+ upload stage3-s390x-openrc-${TIMESTAMP}.tar.xz*
;;
- stage3-systemd-23.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
+ s390x/stage3-systemd-23.spec)
+ upload stage3-s390x-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-23 14:21 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-23 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 5e3b3b971f7442c6b226b6ae9bc41a4f09fde8f4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 14:21:03 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 14:21:03 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5e3b3b97
Upload 23.0 stages for x86
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 31 ++++++++++---------------------
1 file changed, 10 insertions(+), 21 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 279d5e83..fd16762a 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -17,9 +17,7 @@ SETS="
hardened_openrc_23
musl_23
i486_openrc
- i486_systemd_mu
i686_openrc
- i686_systemd_mu
hardened_openrc
musl
"
@@ -29,16 +27,12 @@ SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd
SET_i486_openrc_23_SPECS="i486/stage1-openrc-23.spec i486/stage3-openrc-23.spec"
-SET_i486_systemd_mu_SPECS="i486/stage1-systemd-mu.spec i486/stage3-systemd-mu.spec"
-
SET_i486_systemd_23_SPECS="i486/stage1-systemd-23.spec i486/stage3-systemd-23.spec"
SET_i686_openrc_SPECS="i686/stage1-openrc.spec i686/stage3-openrc.spec"
SET_i686_openrc_23_SPECS="i686/stage1-openrc-23.spec i686/stage3-openrc-23.spec"
-SET_i686_systemd_mu_SPECS="i686/stage1-systemd-mu.spec i686/stage3-systemd-mu.spec"
-
SET_i686_systemd_23_SPECS="i686/stage1-systemd-23.spec i686/stage3-systemd-23.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec"
@@ -84,14 +78,12 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/default >/dev/null || exit
case ${spec} in
i486/stage3-openrc.spec)
- upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i486" x86/17.0/i486
;;
i486/installcd-stage2-minimal-openrc.spec)
upload install-x86-minimal-${TIMESTAMP}.iso*
;;
i686/stage3-openrc.spec)
- upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i686" x86/17.0/i686
;;
esac
@@ -99,30 +91,26 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-default >/dev/null || exit
case ${spec} in
+ i486/stage3-openrc-23.spec)
+ upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
+ ;;
i486/stage3-systemd-23.spec)
+ upload stage3-i486-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i486" x86/23.0/i486
;;
+ i686/stage3-openrc-23.spec)
+ upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
+ ;;
i686/stage3-systemd-23.spec)
+ upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-i686" x86/23.0/i686
;;
esac
popd >/dev/null || exit
- pushd ${BUILD_SRCDIR_BASE}/builds/mergedusr >/dev/null || exit
- case ${spec} in
- i486/stage3-systemd-mu.spec)
- upload stage3-i486-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- i686/stage3-systemd-mu.spec)
- upload stage3-i686-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null || exit
-
pushd ${BUILD_SRCDIR_BASE}/builds/hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc.spec)
- upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-i686" x86/17.0/i686_hardened
;;
hardened/admincd-stage2-openrc.spec)
@@ -134,6 +122,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc-23.spec)
+ upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-i686" x86/23.0/i686_hardened
;;
esac
@@ -142,7 +131,6 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/musl >/dev/null || exit
case ${spec} in
musl/stage3.spec)
- upload stage3-i686-musl-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-i686" x86/17.0/i686_musl
;;
esac
@@ -151,6 +139,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/builds/23.0-musl >/dev/null || exit
case ${spec} in
musl/stage3-23.spec)
+ upload stage3-i686-musl-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-i686" x86/23.0/i686_musl
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-23 14:16 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-23 14:16 UTC (permalink / raw
To: gentoo-commits
commit: 73b527f09bc993037cae0b480e8a19a78dfeda7d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 14:16:15 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 14:16:15 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=73b527f0
Upload 23.0 stages for sparc
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 25 ++++++++-----------------
1 file changed, 8 insertions(+), 17 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 34b7553d..d094f457 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -11,17 +11,13 @@ SETS="
openrc_64_23
systemd_64_23
openrc_32
- systemd_32_mu
openrc_64
- systemd_64_mu
"
SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
-SET_systemd_32_mu_SPECS="sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec"
SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
SET_openrc_64_OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
-SET_systemd_64_mu_SPECS="sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec"
SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec sparc/stage3-openrc-23.spec"
SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec sparc/stage3-systemd-23.spec"
@@ -61,11 +57,9 @@ post_build() {
upload *${TIMESTAMP}*.iso*
;;
sparc/stage3.spec)
- upload stage3-sparc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
;;
sparc64/stage3.spec)
- upload stage3-sparc64-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
;;
esac
@@ -73,23 +67,20 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ sparc/stage3-openrc-23.spec)
+ upload stage3-sparc-openrc-${TIMESTAMP}*.xz*
+ ;;
sparc/stage3-systemd-23.spec)
+ upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc" sparc/23.0/32
;;
+ sparc64/stage3-openrc-23.spec)
+ upload stage3-sparc64-openrc-${TIMESTAMP}*.xz*
+ ;;
sparc64/stage3-systemd-23.spec)
+ upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc64" sparc/23.0/64
;;
esac
popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- sparc/systemd-stage3-mu.spec)
- upload stage3-sparc-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- sparc64/systemd-stage3-mu.spec)
- upload stage3-sparc64-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- esac
- popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-23 14:11 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-23 14:11 UTC (permalink / raw
To: gentoo-commits
commit: b0e6c0a4f1193bf4160f96b48db62ae74fd855af
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 14:11:06 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 14:11:06 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b0e6c0a4
Upload 23.0 stages for s390
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-s390.conf | 16 ++++------------
tools/catalyst-auto-s390x.conf | 16 ++++------------
2 files changed, 8 insertions(+), 24 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index e442ccac..8b9f1b3b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -10,14 +10,11 @@ SETS="
openrc_23
systemd_23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -51,23 +48,18 @@ post_build() {
upload netboot-s390-${TIMESTAMP}/netboot*
;;
stage3-openrc.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390" s390/23.0/s390
;;
esac
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 99c5c3ef..3bc474b9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -10,14 +10,11 @@ SETS="
openrc_23
systemd_23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -51,7 +48,6 @@ post_build() {
upload netboot-s390x-${TIMESTAMP}/netboot*
;;
stage3-openrc.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
;;
esac
@@ -59,17 +55,13 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-s390x" s390/23.0/s390x
;;
esac
popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-23 13:01 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-23 13:01 UTC (permalink / raw
To: gentoo-commits
commit: f5f9577240a4cc84d5bb8c5d50d39a94be3a6987
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 13:01:30 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 13:01:30 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f5f95772
Upload 23.0 stages for riscv
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 67 +++++++++++++++++++------------------
1 file changed, 34 insertions(+), 33 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 46cdbddb..328b500a 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -20,25 +20,19 @@ SETS="
multilib_openrc_23
multilib_systemd_23
lp64d_openrc
- lp64d_systemd_mu
lp64d_musl
lp64_openrc
- lp64_systemd_mu
lp64_musl
multilib_openrc
- multilib_systemd_mu
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
-SET_lp64d_systemd_mu_SPECS="stage1-lp64d-systemd-mu.spec stage3-lp64d-systemd-mu.spec"
SET_lp64_musl_SPECS="stage1-lp64-musl.spec stage3-lp64-musl.spec"
SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
-SET_lp64_systemd_mu_SPECS="stage1-lp64-systemd-mu.spec stage3-lp64-systemd-mu.spec"
SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec stage3-multilib-openrc.spec"
-SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec stage3-multilib-systemd-mu.spec"
SET_lp64d_musl_23_SPECS="stage1-lp64d-musl-23.spec stage3-lp64d-musl-23.spec"
SET_lp64d_openrc_23_SPECS="stage1-lp64d-openrc-23.spec stage3-lp64d-openrc-23.spec"
@@ -68,42 +62,49 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
+ pushd "${BUILD_SRCDIR_BASE}" >/dev/null
case ${spec} in
- stage3*systemd-23.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64d" riscv/23.0/rv64_lp64d
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64" riscv/23.0/rv64_lp64
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_multilib" riscv/23.0/rv64_multilib
- popd >/dev/null
+ stage3-lp64d-openrc-23.spec)
+ upload builds/23.0-default/stage3-rv64_lp64d-openrc-${TIMESTAMP}*.xz*
;;
- stage3*musl-23.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64d_musl" riscv/23.0/rv64_lp64d_musl
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64_musl" riscv/23.0/rv64_lp64_musl
- popd >/dev/null
+ stage3-lp64d-systemd-23.spec)
+ upload builds/23.0-default/stage3-rv64_lp64d-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-default/stage3-rv64_lp64d riscv/23.0/rv64_lp64d
;;
- stage3*openrc.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64d" riscv/20.0/rv64_lp64d
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64" riscv/20.0/rv64_lp64
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_multilib" riscv/20.0/rv64_multilib
- popd >/dev/null
+ stage3-lp64-openrc-23.spec)
+ upload builds/23.0-default/stage3-rv64_lp64-openrc-${TIMESTAMP}*.xz*
+ ;;
+ stage3-lp64-systemd-23.spec)
+ upload builds/23.0-default/stage3-rv64_lp64-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-default/stage3-rv64_lp64 riscv/23.0/rv64_lp64
+ ;;
+ stage3-multilib-openrc-23.spec)
+ upload builds/23.0-default/stage3-rv64_multilib-openrc-${TIMESTAMP}*.xz*
+ ;;
+ stage3-multilib-systemd-23.spec)
+ upload builds/23.0-default/stage3-rv64_multilib-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-default/stage3-rv64_multilib riscv/23.0/rv64_multilib
;;
- stage3*systemd-mu.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
- popd >/dev/null
+ stage3-lp64d-musl-23.spec)
+ upload builds/23.0-musl/stage3-rv64_lp64d_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-musl/stage3-rv64_lp64d_musl riscv/23.0/rv64_lp64d_musl
+ ;;
+ stage3-lp64-musl-23.spec)
+ upload builds/23.0-musl/stage3-rv64_lp64_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages packages/23.0-musl/stage3-rv64_lp64_musl riscv/23.0/rv64_lp64_musl
+ ;;
+ stage3*openrc.spec)
+ upsync_binpackages packages/default/stage3-rv64_lp64d riscv/20.0/rv64_lp64d
+ upsync_binpackages packages/default/stage3-rv64_lp64 riscv/20.0/rv64_lp64
+ upsync_binpackages packages/default/stage3-rv64_multilib riscv/20.0/rv64_multilib
;;
stage3*musl.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:-:_:g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64d_musl" riscv/20.0/rv64_lp64d_musl
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64_musl" riscv/20.0/rv64_lp64_musl
- popd >/dev/null
+ upsync_binpackages packages/musl/stage3-rv64_lp64d_musl riscv/20.0/rv64_lp64d_musl
+ upsync_binpackages packages/musl/stage3-rv64_lp64_musl riscv/20.0/rv64_lp64_musl
;;
*)
echo "Finished ${spec}"
;;
esac
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-23 10:59 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-23 10:59 UTC (permalink / raw
To: gentoo-commits
commit: 2c33f8d4f4f6f9521874707db47762ac008793f9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 10:58:58 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 10:58:58 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2c33f8d4
Upload 23.0 stages for ppc64 (LE)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 35 +++++++++++++----------------------
1 file changed, 13 insertions(+), 22 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 8aa1e38c..75356aa0 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -13,9 +13,7 @@ SETS="
musl_hardened_23
musl_hardened_power9le_23
openrc
- systemd_mu
openrc_power9le
- systemd_power9le_mu
musl_hardened
musl_hardened_power9le
"
@@ -23,12 +21,8 @@ SETS="
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
-SET_systemd_power9le_mu_SPECS="stage1-systemd-mu-power9le.spec stage3-systemd-mu-power9le.spec stage3d-systemd-mu-power9le.spec"
-
SET_musl_hardened_SPECS="stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
@@ -77,43 +71,40 @@ post_build() {
upload default/*${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
- upload default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64le" ppc/17.0/ppc64le
;;
- stage3-systemd-mu.spec)
- upload mergedusr/stage3-ppc64le-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
stage3-openrc-power9le.spec)
- upload power9le/stage3-power9le-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/power9le/stage3-power9le" ppc/17.0/power9le
;;
- stage3d-openrc-power9le.spec)
- upload power9le/stage3-power9le-desktop-openrc-${TIMESTAMP}*.xz*
- ;;
- stage3-systemd-mu-power9le.spec)
- upload power9le-mergedusr/stage3-power9le-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- stage3d-systemd-mu-power9le.spec)
- upload power9le-mergedusr/stage3-power9le-desktop-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
stage3-musl-hardened-openrc.spec)
- upload musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64le" ppc/17.0/ppc64le_musl_hardened
;;
stage3-musl-hardened-openrc-power9le.spec)
- upload power9le-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/power9le-musl-hardened/stage3-power9le" ppc/17.0/power9le_musl_hardened
;;
+ stage3-openrc-23.spec)
+ upload 23.0-default/stage3-ppc64le-openrc-${TIMESTAMP}*.xz*
+ ;;
stage3-systemd-23.spec)
+ upload 23.0-default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64le" ppc/23.0/ppc64le
;;
+ stage3-openrc-power9le-23.spec)
+ upload 23.0-default/stage3-power9le-openrc-${TIMESTAMP}*.xz*
+ ;;
+ stage3d-openrc-power9le-23.spec)
+ upload 23.0-default/stage3-power9le-desktop-openrc-${TIMESTAMP}*.xz*
+ ;;
stage3-systemd-power9le-23.spec)
+ upload 23.0-default/stage3-power9le-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-power9le" ppc/23.0/power9le
;;
stage3-musl-hardened-openrc-23.spec)
+ upload 23.0-musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64le" ppc/23.0/ppc64le_musl_hardened
;;
stage3-musl-hardened-openrc-power9le-23.spec)
+ upload 23.0-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-power9le" ppc/23.0/power9le_musl_hardened
;;
*)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-23 10:23 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-23 10:23 UTC (permalink / raw
To: gentoo-commits
commit: 819fbf8a8a773d7018a995f6b92a751b3691a16f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 10:22:57 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 10:22:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=819fbf8a
Upload 23.0 stages for ppc and (BE) ppc64
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 27 +++++++++++----------------
1 file changed, 11 insertions(+), 16 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 4b5c5a43..1e1556e8 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -13,24 +13,18 @@ SETS="
systemd_64_23
musl_hardened_64_23
openrc
- systemd_mu
musl_hardened
openrc_64
- systemd_mu_64
musl_hardened_64
"
SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="ppc32/stage1-systemd-mu.spec ppc32/stage3-systemd-mu.spec"
-
SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec"
SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec"
-SET_systemd_mu_64_SPECS="ppc64/stage1-systemd-mu.spec ppc64/stage3-systemd-mu.spec"
-
SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec"
SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec"
@@ -78,37 +72,38 @@ post_build() {
upload default/*${TIMESTAMP}*.iso*
;;
ppc32/stage3-openrc.spec)
- upload default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc" ppc/17.0/ppc
;;
- ppc32/stage3-systemd-mu.spec)
- upload mergedusr/stage3-ppc-systemd-mergedusr-*${TIMESTAMP}*.xz*
- ;;
ppc32/stage3-musl-hardened-openrc.spec)
- upload musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc" ppc/17.0/ppc_musl_hardened
;;
ppc64/stage3-openrc.spec)
- upload default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ppc64" ppc/17.0/ppc64
;;
- ppc64/stage3-systemd-mu.spec)
- upload mergedusr/stage3-ppc64-systemd-mergedusr-*${TIMESTAMP}*.xz*
- ;;
ppc64/stage3-musl-hardened-openrc.spec)
- upload musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64" ppc/17.0/ppc64_musl_hardened
;;
+
+ ppc32/stage3-openrc-23.spec)
+ upload 23.0-default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
+ ;;
ppc32/stage3-systemd-23.spec)
+ upload 23.0-default/stage3-ppc-systemd-*${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc" ppc/23.0/ppc
;;
ppc32/stage3-musl-hardened-openrc-23.spec)
+ upload 23.0-musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc" ppc/23.0/ppc_musl_hardened
;;
+ ppc64/stage3-openrc-23.spec)
+ upload 23.0-default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz*
+ ;;
ppc64/stage3-systemd-23.spec)
+ upload 23.0-default/stage3-ppc64-systemd-*${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64" ppc/23.0/ppc64
;;
ppc64/stage3-musl-hardened-openrc-23.spec)
+ upload 23.0-musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64" ppc/23.0/ppc64_musl_hardened
;;
*)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-23 10:08 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-23 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 45c841bdd486b9a9f90d2af0963799d38568b176
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 10:08:20 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 10:08:20 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=45c841bd
Upload 23.0 stages for mips
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 112 +++++++++++++----------------------
1 file changed, 42 insertions(+), 70 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 96bd8b20..238bd89e 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -8,14 +8,10 @@ EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
SETS_O32_17="
mipsel2_softfloat_o32_openrc
- mipsel2_softfloat_o32_systemd_mu
mipsel2_o32_openrc
- mipsel2_o32_systemd_mu
mipsel2_o32_musl
mips2_softfloat_o32_openrc
- mips2_softfloat_o32_systemd_mu
mips2_o32_openrc
- mips2_o32_systemd_mu
mips2_o32_musl
"
@@ -36,9 +32,7 @@ SETS_O32="${SETS_O32_17} ${SETS_O32_23}"
SETS_N32_17="
mipsel3_n32_openrc
- mipsel3_n32_systemd_mu
mips3_n32_openrc
- mips3_n32_systemd_mu
"
SETS_N32_23="
@@ -52,9 +46,7 @@ SETS_N32="${SETS_N32_17} ${SETS_N32_23}"
SETS_N64_17="
mipsel3_n64_openrc
- mipsel3_n64_systemd_mu
mips3_n64_openrc
- mips3_n64_systemd_mu
"
SETS_N64_23="
@@ -68,9 +60,7 @@ SETS_N64="${SETS_N64_17} ${SETS_N64_23}"
SETS_MULTI_17="
mipsel3_multilib_openrc
- mipsel3_multilib_systemd_mu
mips3_multilib_openrc
- mips3_multilib_systemd_mu
"
SETS_MULTI_23="
@@ -86,18 +76,14 @@ SETS_MULTI="${SETS_MULTI_17} ${SETS_MULTI_23}"
# 17.0 O32
SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
-SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec stage3-mips2-o32-systemd-mu.spec"
SET_mips2_softfloat_o32_openrc_SPECS="stage1-mips2_softfloat-o32-openrc.spec stage3-mips2_softfloat-o32-openrc.spec"
-SET_mips2_softfloat_o32_systemd_mu_SPECS="stage1-mips2_softfloat-o32-systemd-mu.spec stage3-mips2_softfloat-o32-systemd-mu.spec"
SET_mips2_o32_musl_SPECS="stage1-mips2-o32-musl.spec stage3-mips2-o32-musl.spec"
SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
-SET_mipsel2_o32_systemd_mu_SPECS="stage1-mipsel2-o32-systemd-mu.spec stage3-mipsel2-o32-systemd-mu.spec"
SET_mipsel2_softfloat_o32_openrc_SPECS="stage1-mipsel2_softfloat-o32-openrc.spec stage3-mipsel2_softfloat-o32-openrc.spec"
-SET_mipsel2_softfloat_o32_systemd_mu_SPECS="stage1-mipsel2_softfloat-o32-systemd-mu.spec stage3-mipsel2_softfloat-o32-systemd-mu.spec"
SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec stage3-mipsel2-o32-musl.spec"
@@ -122,10 +108,8 @@ SET_mipsel2_o32_musl_23_SPECS="o32/stage1-mipsel2-o32-musl-23.spec o32/stage3-mi
# 17.0 N32
SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
-SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec stage3-mips3-n32-systemd-mu.spec"
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
-SET_mipsel3_n32_systemd_mu_SPECS="stage1-mipsel3-n32-systemd-mu.spec stage3-mipsel3-n32-systemd-mu.spec"
# 23.0 N32
@@ -138,10 +122,8 @@ SET_mipsel3_n32_systemd_23_SPECS="n32/stage1-mipsel3-n32-systemd-23.spec n32/sta
# 17.0 N64
SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec"
-SET_mips3_n64_systemd_mu_SPECS="stage1-mips3-n64-systemd-mu.spec stage3-mips3-n64-systemd-mu.spec"
SET_mipsel3_n64_openrc_SPECS="stage1-mipsel3-n64-openrc.spec stage3-mipsel3-n64-openrc.spec"
-SET_mipsel3_n64_systemd_mu_SPECS="stage1-mipsel3-n64-systemd-mu.spec stage3-mipsel3-n64-systemd-mu.spec"
# 23.0 N64
@@ -154,10 +136,8 @@ SET_mipsel3_n64_systemd_23_SPECS="n64/stage1-mipsel3-n64-systemd-23.spec n64/sta
# 17.0 multilib
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
-SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage3-mips3-multilib-systemd-mu.spec"
SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
-SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec stage3-mipsel3-multilib-systemd-mu.spec"
# 23.0 multilib
@@ -191,43 +171,33 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
stage3-mips2-o32-openrc.spec)
- upload stage3-mips2-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2" mips/17.0/mips2_o32
;;
stage3-mips2_softfloat-o32-openrc.spec)
- upload stage3-mips2_softfloat-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2_softfloat" mips/17.0/mips2_o32_softfloat
;;
stage3-mipsel2-o32-openrc.spec)
- upload stage3-mipsel2-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2" mips/17.0/mipsel2_o32
;;
stage3-mipsel2_softfloat-o32-openrc.spec)
- upload stage3-mipsel2_softfloat-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2_softfloat" mips/17.0/mipsel2_o32_softfloat
;;
stage3-mips3-n32-openrc.spec)
- upload stage3-mips3_n32-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n32" mips/17.0/mips3_n32
;;
stage3-mipsel3-n32-openrc.spec)
- upload stage3-mipsel3_n32-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n32" mips/17.0/mipsel3_n32
;;
stage3-mips3-n64-openrc.spec)
- upload stage3-mips3_n64-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n64" mips/17.0/mips3_n64
;;
stage3-mipsel3-n64-openrc.spec)
- upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n64" mips/17.0/mipsel3_n64
;;
stage3-mips3-multilib-openrc.spec)
- upload stage3-mips3_multilib-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_multilib" mips/17.0/mips3_multilib
;;
stage3-mipsel3-multilib-openrc.spec)
- upload stage3-mipsel3_multilib-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_multilib" mips/17.0/mipsel3_multilib
;;
esac
@@ -235,85 +205,85 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ o32/stage3-mips2-o32-openrc-23.spec)
+ upload stage3-mips2-openrc-${TIMESTAMP}.tar.xz*
+ ;;
o32/stage3-mips2-o32-systemd-23.spec)
+ upload stage3-mips2-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips2" mips/23.0/mips2_o32
;;
+ o32/stage3-mips2_softfloat-o32-openrc-23.spec)
+ upload stage3-mips2_softfloat-openrc-${TIMESTAMP}.tar.xz*
+ ;;
o32/stage3-mips2_softfloat-o32-systemd-23.spec)
+ upload stage3-mips2_softfloat-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips2_softfloat" mips/23.0/mips2_o32_sf
;;
+ o32/stage3-mipsel2-o32-openrc-23.spec)
+ upload stage3-mipsel2-openrc-${TIMESTAMP}.tar.xz*
+ ;;
o32/stage3-mipsel2-o32-systemd-23.spec)
+ upload stage3-mipsel2-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel2" mips/23.0/mipsel2_o32
;;
+ o32/stage3-mipsel2_softfloat-o32-openrc-23.spec)
+ upload stage3-mipsel2_softfloat-openrc-${TIMESTAMP}.tar.xz*
+ ;;
o32/stage3-mipsel2_softfloat-o32-systemd-23.spec)
+ upload stage3-mipsel2_softfloat-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel2_softfloat" mips/23.0/mipsel2_o32_sf
;;
+ n32/stage3-mips3-n32-openrc-23.spec)
+ upload stage3-mips3_n32-openrc-${TIMESTAMP}.tar.xz*
+ ;;
n32/stage3-mips3-n32-systemd-23.spec)
+ upload stage3-mips3_n32-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips3_n32" mips/23.0/mips3_n32
;;
+ n32/stage3-mipsel3-n32-openrc-23.spec)
+ upload stage3-mipsel3_n32-openrc-${TIMESTAMP}.tar.xz*
+ ;;
n32/stage3-mipsel3-n32-systemd-23.spec)
+ upload stage3-mipsel3_n32-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n32" mips/23.0/mipsel3_n32
;;
+ n64/stage3-mips3-n64-openrc-23.spec)
+ upload stage3-mips3_n64-openrc-${TIMESTAMP}.tar.xz*
+ ;;
n64/stage3-mips3-n64-systemd-23.spec)
+ upload stage3-mips3_n64-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips3_n64" mips/23.0/mips3_n64
;;
+ n64/stage3-mipsel3-n64-openrc-23.spec)
+ upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz*
+ ;;
n64/stage3-mipsel3-n64-systemd-23.spec)
+ upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n64" mips/23.0/mipsel3_n64
;;
+ multilib/stage3-mips3-multilib-openrc-23.spec)
+ upload stage3-mips3_multilib-openrc-${TIMESTAMP}.tar.xz*
+ ;;
multilib/stage3-mips3-multilib-systemd-23.spec)
+ upload stage3-mips3_multilib-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips3_multilib" mips/23.0/mips3_multilib
;;
+ multilib/stage3-mipsel3-multilib-openrc-23.spec)
+ upload stage3-mipsel3_multilib-openrc-${TIMESTAMP}.tar.xz*
+ ;;
multilib/stage3-mipsel3-multilib-systemd-23.spec)
+ upload stage3-mipsel3_multilib-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_multilib" mips/23.0/mipsel3_multilib
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-mips2-o32-systemd-mu.spec)
- upload stage3-mips2-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips2_softfloat-o32-systemd-mu.spec)
- upload stage3-mips2_softfloat-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips3-n32-systemd-mu.spec)
- upload stage3-mips3_n32-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips3-n64-systemd-mu.spec)
- upload stage3-mips3_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips3-multilib-systemd-mu.spec)
- upload stage3-mips3_multilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel2-o32-systemd-mu.spec)
- upload stage3-mipsel2-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel2_softfloat-o32-systemd-mu.spec)
- upload stage3-mipsel2_softfloat-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-o32-systemd-mu.spec)
- upload stage3-mipsel3-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-n32-systemd-mu.spec)
- upload stage3-mipsel3_n32-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-n64-systemd-mu.spec)
- upload stage3-mipsel3_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-multilib-systemd-mu.spec)
- upload stage3-mipsel3_multilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
case ${spec} in
stage3-mips2-o32-musl.spec)
- upload stage3-mips2_musl-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-mips2_musl" mips/17.0/mips2_o32_musl
;;
stage3-mipsel2-o32-musl.spec)
- upload stage3-mipsel2_musl-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-mipsel2_musl" mips/17.0/mipsel2_o32_musl
;;
esac
@@ -322,9 +292,11 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
o32/stage3-mips2-o32-musl-23.spec)
+ upload stage3-mips2_musl-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-mips2_musl" mips/23.0/mips2_o32_musl
;;
o32/stage3-mipsel2-o32-musl-23.spec)
+ upload stage3-mipsel2_musl-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-mipsel2_musl" mips/23.0/mipsel2_o32_musl
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-23 9:56 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-23 9:56 UTC (permalink / raw
To: gentoo-commits
commit: d90528242b367c73b16fb96a962823c5582f4a2b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 23 09:55:58 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 09:55:58 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d9052824
Also upload 23.0 split-usr amd64 and arm64 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 8 ++++++++
tools/catalyst-auto-arm64.conf | 8 ++++++++
2 files changed, 16 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 733b2b6c..5d45b13f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -184,6 +184,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-splitusr >/dev/null || exit
+ case ${spec} in
+ stage3-openrc-23-su.spec)
+ upload stage3-amd64-openrc-splitusr-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
case ${spec} in
clang/stage3-openrc.spec)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index b2f01a4a..dc572bab 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -100,6 +100,14 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-splitusr" >/dev/null
+ case ${spec} in
+ stage3-openrc-23-su.spec)
+ upload stage3-${SUBARCH}-openrc-splitusr-${TIMESTAMP}*.xz*
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/llvm" >/dev/null
case ${spec} in
llvm/stage3-openrc.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-22 22:11 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-22 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 799a9897e0b0fb55db142a9e56ad254f8242e9b9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 22:11:43 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 22:11:43 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=799a9897
Upload 23.0 stages for m68k
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-m68k.conf | 17 +++++++----------
1 file changed, 7 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 86d21356..a33c3ca9 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -15,14 +15,11 @@ SETS="
systemd_23
musl_23
openrc
- systemd_mu
musl
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -51,28 +48,28 @@ post_build() {
case ${spec} in
stage3-openrc.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k
popd >/dev/null
;;
- stage3-systemd-mu.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- upload stage3-m68k-systemd-mergedusr-${TIMESTAMP}*.xz*
- popd >/dev/null
- ;;
stage3-musl.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- upload stage3-m68k_musl-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
popd >/dev/null
;;
+ stage3-openrc-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
stage3-systemd-23.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ upload stage3-m68k-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-m68k" m68k/23.0/m68k
popd >/dev/null
;;
stage3-musl-23.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+ upload stage3-m68k_musl-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-m68k_musl" m68k/23.0/m68k_musl
popd >/dev/null
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-22 22:08 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-22 22:08 UTC (permalink / raw
To: gentoo-commits
commit: 7114a9599ada20816a3095d7e2dfe9e0b698f9db
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 22:08:06 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 22:08:06 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7114a959
Upload 23.0 stages for arm64 (2)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm64.conf | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/tools/catalyst-auto-qemu-arm64.conf b/tools/catalyst-auto-qemu-arm64.conf
index 28ce8dba..2afa2c87 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -10,13 +10,10 @@ SETS="
openrc_23
systemd_23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -46,23 +43,18 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
stage3-openrc.spec)
- upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-aarch64_be" arm64/17.0/aarch64_be
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-aarch64_be" arm64/23.0/aarch64_be
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-22 22:05 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-22 22:05 UTC (permalink / raw
To: gentoo-commits
commit: 9c279acd20257de46267d46256fd007b454cf626
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 22:05:14 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 22:05:14 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9c279acd
Upload 23.0 stages for loong
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-loong.conf | 16 ++++------------
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index 6854851c..b35f9216 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -14,13 +14,10 @@ SETS="
openrc23
systemd23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -44,23 +41,18 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
stage3-openrc.spec)
- upload stage3-loong-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-loong" loong/22.0/loong
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-loong-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-loong-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-loong-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-loong" loong/23.0/loong
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-22 22:01 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-22 22:01 UTC (permalink / raw
To: gentoo-commits
commit: 257fab1bb7806ebab3201707cb2f4bd9e0105f44
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 22:01:04 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 22:01:04 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=257fab1b
Upload 23.0 stages for ia64
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ia64.conf | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 90d9320f..124bad01 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -9,14 +9,11 @@ SETS="
openrc_23
systemd_23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -47,13 +44,13 @@ post_build() {
upload builds/default/*${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
- upload builds/default/stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages packages/default/stage3-ia64 ia64/17.0/ia64
;;
- stage3-systemd-mu.spec)
- upload builds/mergedusr/stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ stage3-openrc-23.spec)
+ upload builds/23.0-default/stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-systemd-23.spec)
+ upload builds/23.0-default/stage3-ia64-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages packages/23.0-default/stage3-ia64 ia64/23.0/ia64
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-22 21:58 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-22 21:58 UTC (permalink / raw
To: gentoo-commits
commit: 160dac9be23dfdf3ec6ae379c0df49b3b1dc1de5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 21:57:52 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 21:57:52 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=160dac9b
Upload 23.0 stages for hppa
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 27 ++++++++-------------------
1 file changed, 8 insertions(+), 19 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 7b3e9bb7..f07c6a39 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -11,21 +11,15 @@ SETS="
hppa20_openrc_23
hppa20_systemd_23
hppa11_openrc
- hppa11_systemd_mu
hppa20_openrc
- hppa20_systemd_mu
"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
-SET_hppa11_systemd_mu_SPECS="hppa1.1/stage1-systemd-mu.spec hppa1.1/stage3-systemd-mu.spec"
-
SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
-SET_hppa20_systemd_mu_SPECS="hppa2.0/stage1-systemd-mu.spec hppa2.0/stage3-systemd-mu.spec"
-
SET_hppa11_openrc_23_SPECS="hppa1.1/stage1-openrc-23.spec hppa1.1/stage3-openrc-23.spec"
SET_hppa11_systemd_23_SPECS="hppa1.1/stage1-systemd-23.spec hppa1.1/stage3-systemd-23.spec"
@@ -76,11 +70,9 @@ post_build() {
upload install-hppa-minimal-*${TIMESTAMP}*.iso*
;;
hppa1.1/stage3-openrc.spec)
- upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa1.1" hppa/17.0/hppa1.1
;;
hppa2.0/stage3-openrc.spec)
- upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa2.0" hppa/17.0/hppa2.0
;;
esac
@@ -88,23 +80,20 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ hppa1.1/stage3-openrc-23.spec)
+ upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
+ ;;
hppa1.1/stage3-systemd-23.spec)
+ upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa1.1" hppa/23.0/hppa1.1
;;
+ hppa2.0/stage3-openrc-23.spec)
+ upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
+ ;;
hppa2.0/stage3-systemd-23.spec)
+ upload stage3-hppa2.0-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa2.0" hppa/23.0/hppa2.0
;;
esac
popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- hppa1.1/stage3-systemd-mu.spec)
- upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- hppa2.0/stage3-systemd-mu.spec)
- upload stage3-hppa2.0-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-22 20:40 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-22 20:40 UTC (permalink / raw
To: gentoo-commits
commit: a08b60f67659b020a68b2e6e5a1dcf5136dd66e2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 20:40:25 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 20:40:25 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a08b60f6
Upload 23.0 stages for arm64
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 50 ++++++++++++++++++------------------------
1 file changed, 21 insertions(+), 29 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 5d2d1268..b2f01a4a 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -16,9 +16,7 @@ SETS="
musl_hardened_23
musl_llvm_23
openrc
- systemd_mu
llvm_openrc
- llvm_systemd_mu
musl
musl_hardened
musl_llvm
@@ -27,8 +25,6 @@ SETS="
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec stage3d-systemd-mu.spec"
-
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec stage3d-openrc-23.spec"
SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
@@ -37,8 +33,6 @@ SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec stage3d-syst
SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec"
-SET_llvm_systemd_mu_SPECS="llvm/stage1-systemd-mu.spec llvm/stage3-systemd-mu.spec"
-
SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec llvm/stage3-openrc-23.spec"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec llvm/stage3-systemd-23.spec"
@@ -82,23 +76,26 @@ post_build() {
installcd-stage2-minimal.spec)
upload install-arm64-*${TIMESTAMP}*.iso*
;;
- stage3-openrc.spec)
+ esac
+ popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ stage3-openrc-23.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
# do not upsync_binpackages, done by extra builder
;;
- stage3d-openrc.spec)
+ stage3d-openrc-23.spec)
upload stage3-${SUBARCH}-desktop-openrc-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- esac
- popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-systemd-mergedusr-${TIMESTAMP}*.xz*
+ stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- stage3d-systemd-mu.spec)
- upload stage3-${SUBARCH}-desktop-systemd-mergedusr-${TIMESTAMP}*.xz*
+ stage3d-systemd-23.spec)
+ upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
esac
popd >/dev/null
@@ -106,7 +103,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/llvm" >/dev/null
case ${spec} in
llvm/stage3-openrc.spec)
- upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/llvm/stage3-arm64" arm64/17.0/arm64_llvm
;;
esac
@@ -114,24 +110,19 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-llvm" >/dev/null
case ${spec} in
+ llvm/stage3-openrc-23.spec)
+ upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz*
+ ;;
llvm/stage3-systemd-23.spec)
+ upload stage3-${SUBARCH}-llvm-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-arm64" arm64/23.0/arm64_llvm
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" >/dev/null
- case ${spec} in
- llvm/stage3-systemd-mu.spec)
- upload stage3-${SUBARCH}-llvm-systemd-mergedusr-${TIMESTAMP}*.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
case ${spec} in
musl/stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-arm64" arm64/17.0/arm64_musl
;;
esac
@@ -140,6 +131,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
case ${spec} in
musl/stage3-23.spec)
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-arm64" arm64/23.0/arm64_musl
;;
esac
@@ -148,7 +140,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
case ${spec} in
musl-hardened/stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-arm64" arm64/17.0/arm64_musl_hardened
;;
esac
@@ -157,6 +148,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
case ${spec} in
musl-hardened/stage3-23.spec)
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-arm64" arm64/23.0/arm64_musl_hardened
;;
esac
@@ -165,7 +157,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/musl-llvm" >/dev/null
case ${spec} in
musl-llvm/stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-llvm/stage3-arm64" arm64/17.0/arm64_musl_llvm
;;
esac
@@ -174,6 +165,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-llvm" >/dev/null
case ${spec} in
musl-llvm/stage3-23.spec)
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-arm64" arm64/23.0/arm64_musl_llvm
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-22 20:31 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-22 20:31 UTC (permalink / raw
To: gentoo-commits
commit: 25c3771713eb4a911a808defff91ebb21c5db718
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 20:31:16 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 20:31:16 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=25c37717
Upload 23.0 stages for arm
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 100 ++++++++++++++++++-------------------------
1 file changed, 41 insertions(+), 59 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 7ebd1be3..cce9a0f8 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -28,46 +28,34 @@ SETS="
armv7a_hf_musl_openrc_23
armv7a_hf_musl_hardened_openrc_23
armv4tl_openrc
- armv4tl_systemd_mu
armv5tel_openrc
- armv5tel_systemd_mu
armv6j_hf_openrc
- armv6j_hf_systemd_mu
armv6j_sf_openrc
- armv6j_sf_systemd_mu
armv6j_hf_musl_openrc
armv6j_hf_musl_hardened_openrc
armv7a_hf_openrc
- armv7a_hf_systemd_mu
armv7a_sf_openrc
- armv7a_sf_systemd_mu
armv7a_hf_musl_openrc
armv7a_hf_musl_hardened_openrc
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec"
-SET_armv4tl_systemd_mu_SPECS="armv4tl/stage1-systemd-mu.spec armv4tl/stage3-systemd-mu.spec"
SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec armv5tel/stage3-openrc.spec"
-SET_armv5tel_systemd_mu_SPECS="armv5tel/stage1-systemd-mu.spec armv5tel/stage3-systemd-mu.spec"
SET_armv6j_hf_openrc_SPECS="armv6j/stage1-hardfloat-openrc.spec armv6j/stage3-hardfloat-openrc.spec"
-SET_armv6j_hf_systemd_mu_SPECS="armv6j/stage1-hardfloat-systemd-mu.spec armv6j/stage3-hardfloat-systemd-mu.spec"
SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec armv6j/stage3-openrc.spec"
-SET_armv6j_sf_systemd_mu_SPECS="armv6j/stage1-systemd-mu.spec armv6j/stage3-systemd-mu.spec"
SET_armv6j_hf_musl_openrc_SPECS="armv6j-musl/stage1-hardfloat.spec armv6j-musl/stage3-hardfloat.spec"
SET_armv6j_hf_musl_hardened_openrc_SPECS="armv6j-musl-hardened/stage1-hardfloat.spec armv6j-musl-hardened/stage3-hardfloat.spec"
SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec"
-SET_armv7a_hf_systemd_mu_SPECS="armv7a/stage1-hardfloat-systemd-mu.spec armv7a/stage3-hardfloat-systemd-mu.spec"
SET_armv7a_hf_musl_openrc_SPECS="armv7a-musl/stage1-hardfloat.spec armv7a-musl/stage3-hardfloat.spec"
SET_armv7a_hf_musl_hardened_openrc_SPECS="armv7a-musl-hardened/stage1-hardfloat.spec armv7a-musl-hardened/stage3-hardfloat.spec"
SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec armv7a/stage3-openrc.spec"
-SET_armv7a_sf_systemd_mu_SPECS="armv7a/stage1-systemd-mu.spec armv7a/stage3-systemd-mu.spec"
SET_armv4tl_openrc_23_SPECS="armv4tl/stage1-openrc-23.spec armv4tl/stage3-openrc-23.spec"
SET_armv4tl_systemd_23_SPECS="armv4tl/stage1-systemd-23.spec armv4tl/stage3-systemd-23.spec"
@@ -115,53 +103,71 @@ post_build() {
case ${spec} in
armv4tl/stage3-openrc.spec)
- upload stage3-armv4tl-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv4tl" arm/17.0/armv4tl
;;
armv5tel/stage3-openrc.spec)
- upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv5tel" arm/17.0/armv5tel
;;
armv6j/stage3-openrc.spec)
- upload stage3-armv6j-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j" arm/17.0/armv6j
;;
armv6j/stage3-hardfloat-openrc.spec)
- upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j_hardfp" arm/17.0/armv6j_hardfp
;;
armv7a/stage3-openrc.spec)
- upload stage3-armv7a-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a" arm/17.0/armv7a
;;
armv7a/stage3-hardfloat-openrc.spec)
- upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a_hardfp" arm/17.0/armv7a_hardfp
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
- armv4tl/stage3-systemd-mu.spec)
- upload stage3-armv4tl-systemd-mergedusr-${TIMESTAMP}*.xz*
+ armv4tl/stage3-openrc-23.spec)
+ upload stage3-armv4tl-openrc-${TIMESTAMP}*.xz*
+ ;;
+ armv4tl/stage3-systemd-23.spec)
+ upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv4tl" arm/23.0/armv4tl
+ ;;
+ armv5tel/stage3-openrc-23.spec)
+ upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/stage3-systemd-23.spec)
+ upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv5tel" arm/23.0/armv5tel
;;
- armv5tel/stage3-systemd-mu.spec)
- upload stage3-armv5tel-systemd-mergedusr-${TIMESTAMP}*.xz*
+ armv6j/stage3-openrc-23.spec)
+ upload stage3-armv6j-openrc-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-systemd-23.spec)
+ upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv6j" arm/23.0/armv6j_sf
+ ;;
+ armv6j/stage3-hardfloat-openrc-23.spec)
+ upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-hardfloat-systemd-23.spec)
+ upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv6j_hardfp" arm/23.0/armv6j_hf
;;
- armv6j/stage3-systemd-mu.spec)
- upload stage3-armv6j-systemd-mergedusr-${TIMESTAMP}*.xz*
+ armv7a/stage3-openrc-23.spec)
+ upload stage3-armv7a-openrc-${TIMESTAMP}*.xz*
;;
- armv6j/stage3-hardfloat-systemd-mu.spec)
- upload stage3-armv6j_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz*
+ armv7a/stage3-systemd-23.spec)
+ upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv7a" arm/23.0/armv7a_sf
;;
- armv7a/stage3-systemd-mu.spec)
- upload stage3-armv7a-systemd-mergedusr-${TIMESTAMP}*.xz*
+ armv7a/stage3-hardfloat-openrc-23.spec)
+ upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz*
;;
- armv7a/stage3-hardfloat-systemd-mu.spec)
- upload stage3-armv7a_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz*
+ armv7a/stage3-hardfloat-systemd-23.spec)
+ upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv7a_hardfp" arm/23.0/armv7a_hf
;;
esac
@@ -171,11 +177,9 @@ post_build() {
case ${spec} in
armv7a-musl/stage3-hardfloat.spec)
- upload stage3-armv7a_hardfp_musl-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-armv7a_hardfp_musl" arm/17.0/armv7a_hardfp_musl
;;
armv6j-musl/stage3-hardfloat.spec)
- upload stage3-armv6j_hardfp_musl-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-armv6j_hardfp_musl" arm/17.0/armv6j_hardfp_musl
;;
esac
@@ -186,9 +190,11 @@ post_build() {
case ${spec} in
armv7a-musl/stage3-hardfloat-23.spec)
+ upload stage3-armv7a_hardfp_musl-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv7a_hardfp_musl" arm/23.0/armv7a_hardfp_musl
;;
armv6j-musl/stage3-hardfloat-23.spec)
+ upload stage3-armv6j_hardfp_musl-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv6j_hardfp_musl" arm/23.0/armv6j_hardfp_musl
;;
esac
@@ -199,11 +205,9 @@ post_build() {
case ${spec} in
armv7a-musl-hardened/stage3-hardfloat.spec)
- upload stage3-armv7a_hardfp_musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-armv7a_hardfp_musl" arm/17.0/armv7a_hardfp_musl_hardened
;;
armv6j-musl-hardened/stage3-hardfloat.spec)
- upload stage3-armv6j_hardfp_musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-armv6j_hardfp_musl" arm/17.0/armv6j_hardfp_musl_hardened
;;
esac
@@ -214,37 +218,15 @@ post_build() {
case ${spec} in
armv7a-musl-hardened/stage3-hardfloat-23.spec)
+ upload stage3-armv7a_hardfp_musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv7a_hardfp_musl" arm/23.0/armv7a_hardfp_musl_hardened
;;
armv6j-musl-hardened/stage3-hardfloat-23.spec)
+ upload stage3-armv6j_hardfp_musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv6j_hardfp_musl" arm/23.0/armv6j_hardfp_musl_hardened
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
-
- case ${spec} in
- armv4tl/stage3-systemd-23.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv4tl" arm/23.0/armv4tl
- ;;
- armv5tel/stage3-systemd-23.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv5tel" arm/23.0/armv5tel
- ;;
- armv6j/stage3-systemd-23.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv6j" arm/23.0/armv6j_sf
- ;;
- armv6j/stage3-hardfloat-systemd-23.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv6j_hardfp" arm/23.0/armv6j_hf
- ;;
- armv7a/stage3-systemd-23.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv7a" arm/23.0/armv7a_sf
- ;;
- armv7a/stage3-hardfloat-systemd-23.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-armv7a_hardfp" arm/23.0/armv7a_hf
- ;;
- esac
-
- popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-22 20:18 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-22 20:18 UTC (permalink / raw
To: gentoo-commits
commit: f5a35a1e42a091a16b532b273d58aea09c6177d6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 20:18:37 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 20:18:37 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f5a35a1e
Upload 23.0 stages for amd64
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 110 ++++++++++++++++++-----------------------
1 file changed, 48 insertions(+), 62 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a57c8e14..733b2b6c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -27,12 +27,9 @@ SETS="
x32_openrc_23
x32_systemd_23
openrc
- systemd_mu
livegui
nomultilib_openrc
- nomultilib_systemd_mu
llvm_openrc
- llvm_systemd_mu
hardened_openrc
hardened_nomultilib_openrc
hardened_selinux_openrc
@@ -41,7 +38,6 @@ SETS="
musl_hardened
musl_llvm
x32_openrc
- x32_systemd_mu
"
# 17.0
@@ -51,9 +47,6 @@ SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-s
SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
-SET_systemd_mu_OPTIONAL_SPECS="stage3d-systemd-mu.spec"
-
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage3-openrc.spec"
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
@@ -65,12 +58,8 @@ SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec har
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage3-openrc.spec"
-SET_nomultilib_systemd_mu_SPECS="nomultilib/stage1-systemd-mu.spec nomultilib/stage3-systemd-mu.spec"
-
SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
-SET_llvm_systemd_mu_SPECS="clang/stage1-systemd-mu.spec clang/stage3-systemd-mu.spec"
-
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
SET_musl_llvm_SPECS="musl-clang/stage1.spec musl-clang/stage3.spec"
@@ -79,8 +68,6 @@ SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
-SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec x32/stage3-systemd-mu.spec"
-
# 23.0
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -150,22 +137,10 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
case ${spec} in
- stage3-openrc.spec)
- upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz*
- # do not upsync_binpackages, done by extra builder
- ;;
- stage3d-openrc.spec)
- upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
- ;;
installcd-stage2-minimal.spec)
upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
- nomultilib/stage3-openrc.spec)
- upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
- # do not upsync_binpackages, done by extra builder
- ;;
x32/stage3-openrc.spec)
- upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
;;
livegui/livegui-stage2.spec)
@@ -176,25 +151,35 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-default >/dev/null || exit
case ${spec} in
- x32/stage3-openrc-23.spec)
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-x32" amd64/23.0/x32
+ stage3-openrc-23.spec)
+ upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- esac
- popd >/dev/null || exit
-
- pushd "${BUILD_SRCDIR_BASE}"/builds/mergedusr >/dev/null || exit
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ stage3d-openrc-23.spec)
+ upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
+ ;;
+ stage3-systemd-23.spec)
+ upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
+ ;;
+ stage3d-systemd-23.spec)
+ upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- stage3d-systemd-mu.spec)
- upload stage3-amd64-desktop-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ nomultilib/stage3-openrc-23.spec)
+ upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
- nomultilib/stage3-systemd-mu.spec)
- upload stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ nomultilib/stage3-systemd-23.spec)
+ upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
;;
- x32/stage3-systemd-mu.spec)
- upload stage3-x32-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ x32/stage3-openrc-23.spec)
+ upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ x32/stage3-systemd-23.spec)
+ upload stage3-x32-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-x32" amd64/23.0/x32
;;
esac
popd >/dev/null || exit
@@ -202,7 +187,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
case ${spec} in
clang/stage3-openrc.spec)
- upload stage3-amd64-llvm-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm
;;
esac
@@ -210,53 +194,54 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-llvm >/dev/null || exit
case ${spec} in
+ llvm/stage3-openrc-23.spec)
+ upload stage3-amd64-llvm-openrc-${TIMESTAMP}.tar.xz*
+ ;;
llvm/stage3-systemd-23.spec)
+ upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-amd64" amd64/23.0/x86-64_llvm
;;
esac
popd >/dev/null || exit
- pushd "${BUILD_SRCDIR_BASE}"/builds/llvm-mergedusr >/dev/null || exit
- case ${spec} in
- clang/stage3-systemd-mu.spec)
- upload stage3-amd64-llvm-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null || exit
-
pushd "${BUILD_SRCDIR_BASE}"/builds/hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc.spec)
- upload stage3-amd64-hardened-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened
;;
hardened/admincd-stage2.spec)
upload admincd-amd64-${TIMESTAMP}.iso*
;;
- hardened-nomultilib/stage3-openrc.spec)
- upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz*
- ;;
- hardened-selinux/stage3-openrc.spec)
- upload stage3-amd64-hardened-selinux-openrc-${TIMESTAMP}.tar.xz*
- ;;
- hardened-nomultilib-selinux/stage3-openrc.spec)
- upload stage3-amd64-hardened-nomultilib-selinux-openrc-${TIMESTAMP}.tar.xz*
- ;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-hardened >/dev/null || exit
case ${spec} in
+ hardened/stage3-openrc-23.spec)
+ upload stage3-amd64-hardened-openrc-${TIMESTAMP}.tar.xz*
+ ;;
hardened/stage3-systemd-23.spec)
+ upload stage3-amd64-hardened-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-amd64" amd64/23.0/x86-64_hardened
;;
+ hardened-nomultilib/stage3-openrc-23.spec)
+ upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ hardened-nomultilib/stage3-systemd-23.spec)
+ upload stage3-amd64-hardened-nomultilib-systemd-${TIMESTAMP}.tar.xz*
+ ;;
+ hardened-selinux/stage3-openrc-23.spec)
+ upload stage3-amd64-hardened-selinux-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ hardened-nomultilib-selinux/stage3-openrc-23.spec)
+ upload stage3-amd64-hardened-nomultilib-selinux-openrc-${TIMESTAMP}.tar.xz*
+ ;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
case ${spec} in
musl/stage3.spec)
- upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-amd64" amd64/17.1/x86-64_musl
;;
esac
@@ -265,6 +250,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl >/dev/null || exit
case ${spec} in
musl/stage3-23.spec)
+ upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-amd64" amd64/23.0/x86-64_musl
;;
esac
@@ -273,7 +259,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-clang >/dev/null || exit
case ${spec} in
musl-clang/stage3.spec)
- upload stage3-amd64-musl-llvm-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-clang/stage3-amd64" amd64/17.1/x86-64_musl_llvm
;;
esac
@@ -282,6 +267,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-llvm >/dev/null || exit
case ${spec} in
musl-llvm/stage3-23.spec)
+ upload stage3-amd64-musl-llvm-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-amd64" amd64/23.0/x86-64_musl_llvm
;;
esac
@@ -290,7 +276,6 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
case ${spec} in
musl-hardened/stage3.spec)
- upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-amd64" amd64/17.1/x86-64_musl_hardened
;;
esac
@@ -299,6 +284,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-hardened >/dev/null || exit
case ${spec} in
musl-hardened/stage3-23.spec)
+ upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-amd64" amd64/23.0/x86-64_musl_hardened
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-22 19:59 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-22 19:59 UTC (permalink / raw
To: gentoo-commits
commit: 7cfc7ad757ff230b67849d7d11ab8a6c27db54c3
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 22 19:58:48 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 22 19:59:26 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7cfc7ad7
Upload 23.0 stages for alpha
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 15 ++++-----------
1 file changed, 4 insertions(+), 11 deletions(-)
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index 9b53185d..62a52805 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -10,12 +10,10 @@ SETS="
openrc23
systemd23
openrc
- systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
@@ -45,23 +43,18 @@ post_build() {
upload install-alpha-minimal-${TIMESTAMP}.iso*
;;
stage3-openrc.spec)
- upload stage3-alpha-openrc-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-alpha" alpha/17.0/alpha
;;
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- stage3-systemd-mu.spec)
- upload stage3-alpha-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
+ stage3-openrc-23.spec)
+ upload stage3-alpha-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-systemd-23.spec)
+ upload stage3-alpha-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-alpha" alpha/23.0/alpha
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-21 13:39 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-21 13:39 UTC (permalink / raw
To: gentoo-commits
commit: 312a54f59d99d245b8139c5d64764b3b3b3313aa
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 21 13:23:20 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 21 13:39:45 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=312a54f5
Enable x86 23.0 musl build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index c83047ad..279d5e83 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -15,6 +15,7 @@ SETS="
i686_openrc_23
i686_systemd_23
hardened_openrc_23
+ musl_23
i486_openrc
i486_systemd_mu
i686_openrc
@@ -22,7 +23,6 @@ SETS="
hardened_openrc
musl
"
-# musl_23
SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage3-openrc.spec"
SET_i486_openrc_OPTIONAL_SPECS="i486/installcd-stage1-openrc.spec i486/installcd-stage2-minimal-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-19 16:14 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2024-03-19 16:14 UTC (permalink / raw
To: gentoo-commits
commit: bd05aec8bee69ea770ca6b64d852a9fba3326a68
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 16:13:35 2024 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Mar 19 16:14:11 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bd05aec8
catalyst-auto: allow skipping cleaning with CLST_AUTO_NOCLEAN var
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 3ee19d15..9624cebb 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -542,6 +542,9 @@ run_catalyst_commands() {
for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
specpath=$(readlink -f "${i}")
+ # Bail out of cleaning (eg) stage3-openrc.spec failure if
+ # CLST_AUTO_NOCLEAN="stage3-openrc.spec" is set
+ [[ ${CLST_AUTO_NOCLEAN} == *${i}* ]] ||
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${specpath}"
done
update_symlinks
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-15 23:15 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-15 23:15 UTC (permalink / raw
To: gentoo-commits
commit: 84e4b0bde30a66bc2f6e40510c77d05350225f58
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 15 23:14:25 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 15 23:15:09 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=84e4b0bd
Build 23.0 first
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 30 +++++++++++++++---------------
tools/catalyst-auto-arm.conf | 32 ++++++++++++++++----------------
tools/catalyst-auto-arm64.conf | 14 +++++++-------
tools/catalyst-auto-ia64.conf | 4 ++--
tools/catalyst-auto-ppc.conf | 12 ++++++------
tools/catalyst-auto-ppc64le.conf | 12 ++++++------
tools/catalyst-auto-qemu-alpha.conf | 7 ++++++-
tools/catalyst-auto-qemu-arm64.conf | 4 ++--
tools/catalyst-auto-qemu-loong.conf | 4 ++--
tools/catalyst-auto-qemu-m68k.conf | 6 +++---
tools/catalyst-auto-qemu-riscv.conf | 16 ++++++++--------
tools/catalyst-auto-s390.conf | 4 ++--
tools/catalyst-auto-s390x.conf | 4 ++--
tools/catalyst-auto-sparc64.conf | 8 ++++----
tools/catalyst-auto-x86.conf | 10 +++++-----
15 files changed, 86 insertions(+), 81 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 75a0f9cc..4aa16c56 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -10,6 +10,21 @@ EMAIL_SUBJECT_PREPEND="[amd64-auto]"
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
+ openrc_23
+ systemd_23
+ nomultilib_openrc_23
+ nomultilib_systemd_23
+ llvm_openrc_23
+ llvm_systemd_23
+ hardened_openrc_23
+ hardened_systemd_23
+ hardened_selinux_openrc_23
+ hardened_selinux_systemd_23
+ musl_23
+ musl_hardened_23
+ musl_llvm_23
+ x32_openrc_23
+ x32_systemd_23
openrc
systemd_mu
livegui
@@ -26,21 +41,6 @@ SETS="
musl_llvm
x32_openrc
x32_systemd_mu
- openrc_23
- systemd_23
- nomultilib_openrc_23
- nomultilib_systemd_23
- llvm_openrc_23
- llvm_systemd_23
- hardened_openrc_23
- hardened_systemd_23
- hardened_selinux_openrc_23
- hardened_selinux_systemd_23
- musl_23
- musl_hardened_23
- musl_llvm_23
- x32_openrc_23
- x32_systemd_23
"
# 17.0
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 37a590fe..7ebd1be3 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -11,22 +11,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm
EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
- armv4tl_openrc
- armv4tl_systemd_mu
- armv5tel_openrc
- armv5tel_systemd_mu
- armv6j_hf_openrc
- armv6j_hf_systemd_mu
- armv6j_sf_openrc
- armv6j_sf_systemd_mu
- armv6j_hf_musl_openrc
- armv6j_hf_musl_hardened_openrc
- armv7a_hf_openrc
- armv7a_hf_systemd_mu
- armv7a_sf_openrc
- armv7a_sf_systemd_mu
- armv7a_hf_musl_openrc
- armv7a_hf_musl_hardened_openrc
armv4tl_openrc_23
armv4tl_systemd_23
armv5tel_openrc_23
@@ -43,6 +27,22 @@ SETS="
armv7a_sf_systemd_23
armv7a_hf_musl_openrc_23
armv7a_hf_musl_hardened_openrc_23
+ armv4tl_openrc
+ armv4tl_systemd_mu
+ armv5tel_openrc
+ armv5tel_systemd_mu
+ armv6j_hf_openrc
+ armv6j_hf_systemd_mu
+ armv6j_sf_openrc
+ armv6j_sf_systemd_mu
+ armv6j_hf_musl_openrc
+ armv6j_hf_musl_hardened_openrc
+ armv7a_hf_openrc
+ armv7a_hf_systemd_mu
+ armv7a_sf_openrc
+ armv7a_sf_systemd_mu
+ armv7a_hf_musl_openrc
+ armv7a_hf_musl_hardened_openrc
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec"
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 61c7d67f..27b70c7e 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -7,13 +7,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm64
SUBARCH=arm64
SETS="
- openrc
- systemd_mu
- llvm_openrc
- llvm_systemd_mu
- musl
- musl_hardened
- musl_llvm
openrc_23
systemd_23
llvm_openrc_23
@@ -21,6 +14,13 @@ SETS="
musl_23
musl_hardened_23
musl_llvm_23
+ openrc
+ systemd_mu
+ llvm_openrc
+ llvm_systemd_mu
+ musl
+ musl_hardened
+ musl_llvm
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index db010a8d..90d9320f 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -6,10 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SETS="
- openrc
- systemd_mu
openrc_23
systemd_23
+ openrc
+ systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 72de76b0..4b5c5a43 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -6,18 +6,18 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ppc
SETS="
- openrc
- systemd_mu
- musl_hardened
openrc_23
systemd_23
musl_hardened_23
- openrc_64
- systemd_mu_64
- musl_hardened_64
openrc_64_23
systemd_64_23
musl_hardened_64_23
+ openrc
+ systemd_mu
+ musl_hardened
+ openrc_64
+ systemd_mu_64
+ musl_hardened_64
"
SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 6589b7d6..8aa1e38c 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -6,18 +6,18 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
SETS="
- openrc
- systemd_mu
- openrc_power9le
- systemd_power9le_mu
- musl_hardened
- musl_hardened_power9le
openrc_23
systemd_23
openrc_power9le_23
systemd_power9le_23
musl_hardened_23
musl_hardened_power9le_23
+ openrc
+ systemd_mu
+ openrc_power9le
+ systemd_power9le_mu
+ musl_hardened
+ musl_hardened_power9le
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index 04d3d8c9..9b53185d 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -6,7 +6,12 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha
EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
-SETS="openrc systemd_mu openrc23 systemd23"
+SETS="
+ openrc23
+ systemd23
+ openrc
+ systemd_mu
+"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
diff --git a/tools/catalyst-auto-qemu-arm64.conf b/tools/catalyst-auto-qemu-arm64.conf
index cdd098b1..28ce8dba 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -7,10 +7,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm64/be
SUBARCH=aarch64_be
SETS="
- openrc
- systemd_mu
openrc_23
systemd_23
+ openrc
+ systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index 08470313..6854851c 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -11,10 +11,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/loong
EMAIL_SUBJECT_PREPEND="[loong-qemu-auto]"
SETS="
- openrc
- systemd_mu
openrc23
systemd23
+ openrc
+ systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 06afd027..86d21356 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -11,12 +11,12 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/m68k
EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
SETS="
- openrc
- systemd_mu
- musl
openrc_23
systemd_23
musl_23
+ openrc
+ systemd_mu
+ musl
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 3be768fb..46cdbddb 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -11,14 +11,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
SETS="
- lp64d_openrc
- lp64d_systemd_mu
- lp64d_musl
- lp64_openrc
- lp64_systemd_mu
- lp64_musl
- multilib_openrc
- multilib_systemd_mu
lp64d_openrc_23
lp64d_systemd_23
lp64d_musl_23
@@ -27,6 +19,14 @@ SETS="
lp64_musl_23
multilib_openrc_23
multilib_systemd_23
+ lp64d_openrc
+ lp64d_systemd_mu
+ lp64d_musl
+ lp64_openrc
+ lp64_systemd_mu
+ lp64_musl
+ multilib_openrc
+ multilib_systemd_mu
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 5c5884d7..e442ccac 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -7,10 +7,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
SUBARCH=s390
SETS="
- openrc
- systemd_mu
openrc_23
systemd_23
+ openrc
+ systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 8627b6fa..99c5c3ef 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -7,10 +7,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
SUBARCH=s390x
SETS="
- openrc
- systemd_mu
openrc_23
systemd_23
+ openrc
+ systemd_mu
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 24330c68..34b7553d 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -6,14 +6,14 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/sparc
SETS="
- openrc_32
- systemd_32_mu
openrc_32_23
systemd_32_23
- openrc_64
- systemd_64_mu
openrc_64_23
systemd_64_23
+ openrc_32
+ systemd_32_mu
+ openrc_64
+ systemd_64_mu
"
SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 896b9c2e..c83047ad 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -10,17 +10,17 @@ EMAIL_SUBJECT_PREPEND="[x86-auto]"
SPECS_DIR=${REPO_DIR}/releases/specs/x86
SETS="
+ i486_openrc_23
+ i486_systemd_23
+ i686_openrc_23
+ i686_systemd_23
+ hardened_openrc_23
i486_openrc
i486_systemd_mu
i686_openrc
i686_systemd_mu
hardened_openrc
musl
- i486_openrc_23
- i486_systemd_23
- i686_openrc_23
- i686_systemd_23
- hardened_openrc_23
"
# musl_23
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-14 10:22 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-14 10:22 UTC (permalink / raw
To: gentoo-commits
commit: 03a0041dcd5ffa7667b06444c593fcde28ce258f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 14 10:21:43 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 14 10:21:43 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=03a0041d
Upsync binpackages based on checksum
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index dac4deb5..3ee19d15 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -319,6 +319,7 @@ upsync_binpackages() {
--delay-updates
--mkpath
--min-size=1
+ --checksum
--stats
)
rsync "${RSYNC_OPTS[@]}" "$1"/* "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-13 20:19 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-13 20:19 UTC (permalink / raw
To: gentoo-commits
commit: eadc23f9494de6558f9a33ce9ebca48fa975fa7b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 13 20:19:34 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Mar 13 20:19:34 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=eadc23f9
hppa: build 23.0 first
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index f5ee4d2d..7b3e9bb7 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -6,14 +6,14 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
SETS="
- hppa11_openrc
- hppa11_systemd_mu
- hppa20_openrc
- hppa20_systemd_mu
hppa11_openrc_23
hppa11_systemd_23
hppa20_openrc_23
hppa20_systemd_23
+ hppa11_openrc
+ hppa11_systemd_mu
+ hppa20_openrc
+ hppa20_systemd_mu
"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-11 19:07 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-11 19:07 UTC (permalink / raw
To: gentoo-commits
commit: 742d47d26c87068a54f3c698646acf45548d5eab
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 19:06:52 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 19:06:52 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=742d47d2
Enable PPC64 LE musl builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index feaf8d49..6589b7d6 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -16,9 +16,9 @@ SETS="
systemd_23
openrc_power9le_23
systemd_power9le_23
+ musl_hardened_23
+ musl_hardened_power9le_23
"
-# musl_hardened_23
-# musl_hardened_power9le_23
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -42,6 +42,10 @@ SET_openrc_power9le_23_SPECS="stage1-openrc-power9le-23.spec stage3-openrc-power
SET_systemd_power9le_23_SPECS="stage1-systemd-power9le-23.spec stage3-systemd-power9le-23.spec stage3d-systemd-power9le-23.spec"
+SET_musl_hardened_23_SPECS="stage1-musl-hardened-openrc-23.spec stage3-musl-hardened-openrc-23.spec"
+
+SET_musl_hardened_power9le_23_SPECS="stage1-musl-hardened-openrc-power9le-23.spec stage3-musl-hardened-openrc-power9le-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -106,6 +110,12 @@ post_build() {
stage3-systemd-power9le-23.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-power9le" ppc/23.0/power9le
;;
+ stage3-musl-hardened-openrc-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64le" ppc/23.0/ppc64le_musl_hardened
+ ;;
+ stage3-musl-hardened-openrc-power9le-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-power9le" ppc/23.0/power9le_musl_hardened
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-11 12:47 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-11 12:47 UTC (permalink / raw
To: gentoo-commits
commit: b3bd1c85726e08638138c1b5a06346003db26d2b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 11 12:46:18 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 11 12:46:18 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b3bd1c85
Enable PPC BE musl builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 956a502a..72de76b0 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -11,14 +11,14 @@ SETS="
musl_hardened
openrc_23
systemd_23
+ musl_hardened_23
openrc_64
systemd_mu_64
musl_hardened_64
openrc_64_23
systemd_64_23
+ musl_hardened_64_23
"
-# musl_hardened_23
-# musl_hardened_64_23
SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
@@ -37,10 +37,13 @@ SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec"
SET_systemd_23_SPECS="ppc32/stage1-systemd-23.spec ppc32/stage3-systemd-23.spec"
+SET_musl_hardened_23_SPECS="ppc32/stage1-musl-hardened-openrc-23.spec ppc32/stage3-musl-hardened-openrc-23.spec"
+
SET_openrc_64_23_SPECS="ppc64/stage1-openrc-23.spec ppc64/stage3-openrc-23.spec"
SET_systemd_64_23_SPECS="ppc64/stage1-systemd-23.spec ppc64/stage3-systemd-23.spec"
+SET_musl_hardened_64_23_SPECS="ppc64/stage1-musl-hardened-openrc-23.spec ppc64/stage3-musl-hardened-openrc-23.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -99,9 +102,15 @@ post_build() {
ppc32/stage3-systemd-23.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc" ppc/23.0/ppc
;;
+ ppc32/stage3-musl-hardened-openrc-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc" ppc/23.0/ppc_musl_hardened
+ ;;
ppc64/stage3-systemd-23.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64" ppc/23.0/ppc64
;;
+ ppc64/stage3-musl-hardened-openrc-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-ppc64" ppc/23.0/ppc64_musl_hardened
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-09 0:52 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-09 0:52 UTC (permalink / raw
To: gentoo-commits
commit: f4169454f41ac260806ba8e52d5f259baee832a4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 9 00:52:36 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 9 00:52:36 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f4169454
Enable arm64 musl builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index ac015b05..61c7d67f 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -18,11 +18,10 @@ SETS="
systemd_23
llvm_openrc_23
llvm_systemd_23
+ musl_23
+ musl_hardened_23
+ musl_llvm_23
"
-# needs musl-1.2.4 stable and new catalyst logic
-# musl_23
-# musl_hardened_23
-# musl_llvm_23
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-08 15:31 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-08 15:31 UTC (permalink / raw
To: gentoo-commits
commit: 185b70cb332107f43203d7cee2d5d3b02ed01e8a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 15:30:47 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 15:30:47 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=185b70cb
Move mips multilib to milou
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-4.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-qemu-mips-4.conf b/tools/catalyst-auto-qemu-mips-4.conf
index 690ca4f9..f7b4921b 100644
--- a/tools/catalyst-auto-qemu-mips-4.conf
+++ b/tools/catalyst-auto-qemu-mips-4.conf
@@ -2,3 +2,4 @@
source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
SETS=${SETS_MULTI}
+UPLOAD_KEY=/root/.ssh/id_ed25519
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-08 13:49 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-08 13:49 UTC (permalink / raw
To: gentoo-commits
commit: 70cdfe10fd26d889f2738995d1aabdf5b6532e8d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 8 13:43:33 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 8 13:43:56 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=70cdfe10
Move mips n32 to milou
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-2.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-qemu-mips-2.conf b/tools/catalyst-auto-qemu-mips-2.conf
index c40c6bc9..aee8636a 100644
--- a/tools/catalyst-auto-qemu-mips-2.conf
+++ b/tools/catalyst-auto-qemu-mips-2.conf
@@ -2,3 +2,4 @@
source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
SETS=${SETS_N32}
+UPLOAD_KEY=/root/.ssh/id_ed25519
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-07 23:38 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-07 23:38 UTC (permalink / raw
To: gentoo-commits
commit: 0c270e053876525716cf6a6391385ea4aab79920
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 23:37:43 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 23:37:43 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0c270e05
Enable arm 23.0 musl builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index e8dd56e2..37a590fe 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -35,10 +35,14 @@ SETS="
armv6j_hf_systemd_23
armv6j_sf_openrc_23
armv6j_sf_systemd_23
+ armv6j_hf_musl_openrc_23
+ armv6j_hf_musl_hardened_openrc_23
armv7a_hf_openrc_23
armv7a_hf_systemd_23
armv7a_sf_openrc_23
armv7a_sf_systemd_23
+ armv7a_hf_musl_openrc_23
+ armv7a_hf_musl_hardened_openrc_23
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec"
@@ -77,12 +81,18 @@ SET_armv6j_hf_systemd_23_SPECS="armv6j/stage1-hardfloat-systemd-23.spec armv6j/s
SET_armv6j_sf_openrc_23_SPECS="armv6j/stage1-openrc-23.spec armv6j/stage3-openrc-23.spec"
SET_armv6j_sf_systemd_23_SPECS="armv6j/stage1-systemd-23.spec armv6j/stage3-systemd-23.spec"
+SET_armv6j_hf_musl_openrc_23_SPECS="armv6j-musl/stage1-hardfloat-23.spec armv6j-musl/stage3-hardfloat-23.spec"
+SET_armv6j_hf_musl_hardened_openrc_23_SPECS="armv6j-musl-hardened/stage1-hardfloat-23.spec armv6j-musl-hardened/stage3-hardfloat-23.spec"
+
SET_armv7a_hf_openrc_23_SPECS="armv7a/stage1-hardfloat-openrc-23.spec armv7a/stage3-hardfloat-openrc-23.spec"
SET_armv7a_hf_systemd_23_SPECS="armv7a/stage1-hardfloat-systemd-23.spec armv7a/stage3-hardfloat-systemd-23.spec"
SET_armv7a_sf_openrc_23_SPECS="armv7a/stage1-openrc-23.spec armv7a/stage3-openrc-23.spec"
SET_armv7a_sf_systemd_23_SPECS="armv7a/stage1-systemd-23.spec armv7a/stage3-systemd-23.spec"
+SET_armv7a_hf_musl_openrc_23_SPECS="armv7a-musl/stage1-hardfloat-23.spec armv7a-musl/stage3-hardfloat-23.spec"
+SET_armv7a_hf_musl_hardened_openrc_23_SPECS="armv7a-musl-hardened/stage1-hardfloat-23.spec armv7a-musl-hardened/stage3-hardfloat-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
@@ -172,6 +182,19 @@ post_build() {
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+
+ case ${spec} in
+ armv7a-musl/stage3-hardfloat-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv7a_hardfp_musl" arm/23.0/armv7a_hardfp_musl
+ ;;
+ armv6j-musl/stage3-hardfloat-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-armv6j_hardfp_musl" arm/23.0/armv6j_hardfp_musl
+ ;;
+ esac
+
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
case ${spec} in
@@ -187,6 +210,19 @@ post_build() {
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
+
+ case ${spec} in
+ armv7a-musl-hardened/stage3-hardfloat-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv7a_hardfp_musl" arm/23.0/armv7a_hardfp_musl_hardened
+ ;;
+ armv6j-musl-hardened/stage3-hardfloat-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-armv6j_hardfp_musl" arm/23.0/armv6j_hardfp_musl_hardened
+ ;;
+ esac
+
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-07 18:45 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-07 18:45 UTC (permalink / raw
To: gentoo-commits
commit: 9ef2ef41be26743ddcae0bcdafb898a5612c3a96
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 7 18:44:53 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 7 18:44:53 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9ef2ef41
Enable amd64 23.0 musl builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 33 +++++++++++++++++++++++++++++++++
1 file changed, 33 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index ad73c416..75a0f9cc 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -36,6 +36,9 @@ SETS="
hardened_systemd_23
hardened_selinux_openrc_23
hardened_selinux_systemd_23
+ musl_23
+ musl_hardened_23
+ musl_llvm_23
x32_openrc_23
x32_systemd_23
"
@@ -101,6 +104,12 @@ SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec llvm/stage3-openrc-23.spec"
SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec llvm/stage3-systemd-23.spec"
+SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
+
+SET_musl_llvm_23_SPECS="musl-llvm/stage1-23.spec musl-llvm/stage3-23.spec"
+
+SET_musl_hardened_23_SPECS="musl-hardened/stage1-23.spec musl-hardened/stage3-23.spec"
+
SET_x32_openrc_23_SPECS="x32/stage1-openrc-23.spec x32/stage3-openrc-23.spec"
SET_x32_systemd_23_SPECS="x32/stage1-systemd-23.spec x32/stage3-systemd-23.spec"
@@ -250,6 +259,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl >/dev/null || exit
+ case ${spec} in
+ musl/stage3-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-amd64" amd64/23.0/x86-64_musl
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-clang >/dev/null || exit
case ${spec} in
musl-clang/stage3.spec)
@@ -259,6 +276,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-llvm >/dev/null || exit
+ case ${spec} in
+ musl-llvm/stage3-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-amd64" amd64/23.0/x86-64_musl_llvm
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
case ${spec} in
musl-hardened/stage3.spec)
@@ -267,6 +292,14 @@ post_build() {
;;
esac
popd >/dev/null || exit
+
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-musl-hardened >/dev/null || exit
+ case ${spec} in
+ musl-hardened/stage3-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-amd64" amd64/23.0/x86-64_musl_hardened
+ ;;
+ esac
+ popd >/dev/null || exit
}
# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-04 23:06 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-04 23:06 UTC (permalink / raw
To: gentoo-commits
commit: dff9c4a41d67a7f3e7e023b918391d7be1b99e75
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 4 23:05:07 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 4 23:05:07 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=dff9c4a4
Adapt for mips n64 upload from milou
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-3.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-qemu-mips-3.conf b/tools/catalyst-auto-qemu-mips-3.conf
index 1321408b..8eec2676 100644
--- a/tools/catalyst-auto-qemu-mips-3.conf
+++ b/tools/catalyst-auto-qemu-mips-3.conf
@@ -2,3 +2,4 @@
source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
SETS=${SETS_N64}
+UPLOAD_KEY=/root/.ssh/id_ed25519
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-03-02 14:37 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-03-02 14:37 UTC (permalink / raw
To: gentoo-commits
commit: c876e6429a26e622761f2b5557b7ee385f152517
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 2 14:36:54 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 2 14:36:54 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c876e642
Enable hppa 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 2cddc6c5..f5ee4d2d 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -10,6 +10,10 @@ SETS="
hppa11_systemd_mu
hppa20_openrc
hppa20_systemd_mu
+ hppa11_openrc_23
+ hppa11_systemd_23
+ hppa20_openrc_23
+ hppa20_systemd_23
"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
@@ -22,6 +26,15 @@ SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
SET_hppa20_systemd_mu_SPECS="hppa2.0/stage1-systemd-mu.spec hppa2.0/stage3-systemd-mu.spec"
+SET_hppa11_openrc_23_SPECS="hppa1.1/stage1-openrc-23.spec hppa1.1/stage3-openrc-23.spec"
+
+SET_hppa11_systemd_23_SPECS="hppa1.1/stage1-systemd-23.spec hppa1.1/stage3-systemd-23.spec"
+
+SET_hppa20_openrc_23_SPECS="hppa2.0/stage1-openrc-23.spec hppa2.0/stage3-openrc-23.spec"
+
+SET_hppa20_systemd_23_SPECS="hppa2.0/stage1-systemd-23.spec hppa2.0/stage3-systemd-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
@@ -73,6 +86,17 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ hppa1.1/stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa1.1" hppa/23.0/hppa1.1
+ ;;
+ hppa2.0/stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-hppa2.0" hppa/23.0/hppa2.0
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
hppa1.1/stage3-systemd-mu.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-26 22:57 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-26 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 116775b9fc2e1a0418631c805174ee288b9920dc
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 26 22:57:00 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 26 22:57:00 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=116775b9
Enable amd64 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 67 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 67 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5ad68a57..ad73c416 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -26,8 +26,22 @@ SETS="
musl_llvm
x32_openrc
x32_systemd_mu
+ openrc_23
+ systemd_23
+ nomultilib_openrc_23
+ nomultilib_systemd_23
+ llvm_openrc_23
+ llvm_systemd_23
+ hardened_openrc_23
+ hardened_systemd_23
+ hardened_selinux_openrc_23
+ hardened_selinux_systemd_23
+ x32_openrc_23
+ x32_systemd_23
"
+# 17.0
+
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -63,6 +77,35 @@ SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec x32/stage3-systemd-mu.spec"
+# 23.0
+
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="stage3d-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+SET_systemd_23_OPTIONAL_SPECS="stage3d-systemd-23.spec"
+
+SET_hardened_openrc_23_SPECS="hardened/stage1-openrc-23.spec hardened/stage3-openrc-23.spec"
+
+SET_hardened_systemd_23_SPECS="hardened/stage1-systemd-23.spec hardened/stage3-systemd-23.spec"
+
+SET_hardened_selinux_openrc_23_SPECS="hardened-selinux/stage1-openrc-23.spec hardened-selinux/stage3-openrc-23.spec"
+
+SET_hardened_selinux_systemd_23_SPECS="hardened-selinux/stage1-systemd-23.spec hardened-selinux/stage3-systemd-23.spec"
+
+SET_nomultilib_openrc_23_SPECS="nomultilib/stage1-openrc-23.spec nomultilib/stage3-openrc-23.spec"
+
+SET_nomultilib_systemd_23_SPECS="nomultilib/stage1-systemd-23.spec nomultilib/stage3-systemd-23.spec"
+
+SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec llvm/stage3-openrc-23.spec"
+
+SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec llvm/stage3-systemd-23.spec"
+
+SET_x32_openrc_23_SPECS="x32/stage1-openrc-23.spec x32/stage3-openrc-23.spec"
+
+SET_x32_systemd_23_SPECS="x32/stage1-systemd-23.spec x32/stage3-systemd-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
@@ -119,6 +162,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-default >/dev/null || exit
+ case ${spec} in
+ x32/stage3-openrc-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-x32" amd64/23.0/x32
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/mergedusr >/dev/null || exit
case ${spec} in
stage3-systemd-mu.spec)
@@ -145,6 +196,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-llvm >/dev/null || exit
+ case ${spec} in
+ llvm/stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-amd64" amd64/23.0/x86-64_llvm
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/llvm-mergedusr >/dev/null || exit
case ${spec} in
clang/stage3-systemd-mu.spec)
@@ -174,6 +233,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/23.0-hardened >/dev/null || exit
+ case ${spec} in
+ hardened/stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-hardened/stage3-amd64" amd64/23.0/x86-64_hardened
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
case ${spec} in
musl/stage3.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-25 21:49 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-25 21:49 UTC (permalink / raw
To: gentoo-commits
commit: d4ba4c0f8e7ff4b69815b2a22a80a7f19cb4e993
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 25 21:49:28 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 25 21:49:28 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d4ba4c0f
Enable mips multilib 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 27 ++++++++++++++++++++++++++-
1 file changed, 26 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 3fd8405d..96bd8b20 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -66,13 +66,23 @@ SETS_N64_23="
SETS_N64="${SETS_N64_17} ${SETS_N64_23}"
-SETS_MULTI="
+SETS_MULTI_17="
mipsel3_multilib_openrc
mipsel3_multilib_systemd_mu
mips3_multilib_openrc
mips3_multilib_systemd_mu
"
+SETS_MULTI_23="
+ mipsel3_multilib_openrc_23
+ mipsel3_multilib_systemd_23
+ mips3_multilib_openrc_23
+ mips3_multilib_systemd_23
+"
+
+SETS_MULTI="${SETS_MULTI_17} ${SETS_MULTI_23}"
+
+
# 17.0 O32
SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
@@ -149,6 +159,15 @@ SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage
SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec stage3-mipsel3-multilib-systemd-mu.spec"
+# 23.0 multilib
+
+SET_mips3_multilib_openrc_23_SPECS="multilib/stage1-mips3-multilib-openrc-23.spec multilib/stage3-mips3-multilib-openrc-23.spec"
+SET_mips3_multilib_systemd_23_SPECS="multilib/stage1-mips3-multilib-systemd-23.spec multilib/stage3-mips3-multilib-systemd-23.spec"
+
+SET_mipsel3_multilib_openrc_23_SPECS="multilib/stage1-mipsel3-multilib-openrc-23.spec multilib/stage3-mipsel3-multilib-openrc-23.spec"
+SET_mipsel3_multilib_systemd_23_SPECS="multilib/stage1-mipsel3-multilib-systemd-23.spec multilib/stage3-mipsel3-multilib-systemd-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
@@ -240,6 +259,12 @@ post_build() {
n64/stage3-mipsel3-n64-systemd-23.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n64" mips/23.0/mipsel3_n64
;;
+ multilib/stage3-mips3-multilib-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips3_multilib" mips/23.0/mips3_multilib
+ ;;
+ multilib/stage3-mipsel3-multilib-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_multilib" mips/23.0/mipsel3_multilib
+ ;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-24 19:41 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-24 19:41 UTC (permalink / raw
To: gentoo-commits
commit: 5c370bdac66ebea6de3fd6be00ced533856eb9c9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 19:41:31 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 19:41:31 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5c370bda
Enable mips n64 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 41 ++++++++++++++++++++++++++++--------
1 file changed, 32 insertions(+), 9 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 22bddf80..3fd8405d 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -50,13 +50,22 @@ SETS_N32_23="
SETS_N32="${SETS_N32_17} ${SETS_N32_23}"
-SETS_N64="
+SETS_N64_17="
mipsel3_n64_openrc
mipsel3_n64_systemd_mu
mips3_n64_openrc
mips3_n64_systemd_mu
"
+SETS_N64_23="
+ mipsel3_n64_openrc_23
+ mipsel3_n64_systemd_23
+ mips3_n64_openrc_23
+ mips3_n64_systemd_23
+"
+
+SETS_N64="${SETS_N64_17} ${SETS_N64_23}"
+
SETS_MULTI="
mipsel3_multilib_openrc
mipsel3_multilib_systemd_mu
@@ -116,14 +125,6 @@ SET_mips3_n32_systemd_23_SPECS="n32/stage1-mips3-n32-systemd-23.spec n32/stage3-
SET_mipsel3_n32_openrc_23_SPECS="n32/stage1-mipsel3-n32-openrc-23.spec n32/stage3-mipsel3-n32-openrc-23.spec"
SET_mipsel3_n32_systemd_23_SPECS="n32/stage1-mipsel3-n32-systemd-23.spec n32/stage3-mipsel3-n32-systemd-23.spec"
-# 17.0 multilib
-
-SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
-SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage3-mips3-multilib-systemd-mu.spec"
-
-SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
-SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec stage3-mipsel3-multilib-systemd-mu.spec"
-
# 17.0 N64
SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec"
@@ -132,6 +133,22 @@ SET_mips3_n64_systemd_mu_SPECS="stage1-mips3-n64-systemd-mu.spec stage3-mips3-n6
SET_mipsel3_n64_openrc_SPECS="stage1-mipsel3-n64-openrc.spec stage3-mipsel3-n64-openrc.spec"
SET_mipsel3_n64_systemd_mu_SPECS="stage1-mipsel3-n64-systemd-mu.spec stage3-mipsel3-n64-systemd-mu.spec"
+# 23.0 N64
+
+SET_mips3_n64_openrc_23_SPECS="n64/stage1-mips3-n64-openrc-23.spec n64/stage3-mips3-n64-openrc-23.spec"
+SET_mips3_n64_systemd_23_SPECS="n64/stage1-mips3-n64-systemd-23.spec n64/stage3-mips3-n64-systemd-23.spec"
+
+SET_mipsel3_n64_openrc_23_SPECS="n64/stage1-mipsel3-n64-openrc-23.spec n64/stage3-mipsel3-n64-openrc-23.spec"
+SET_mipsel3_n64_systemd_23_SPECS="n64/stage1-mipsel3-n64-systemd-23.spec n64/stage3-mipsel3-n64-systemd-23.spec"
+
+# 17.0 multilib
+
+SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
+SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage3-mips3-multilib-systemd-mu.spec"
+
+SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
+SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec stage3-mipsel3-multilib-systemd-mu.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
@@ -217,6 +234,12 @@ post_build() {
n32/stage3-mipsel3-n32-systemd-23.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n32" mips/23.0/mipsel3_n32
;;
+ n64/stage3-mips3-n64-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips3_n64" mips/23.0/mips3_n64
+ ;;
+ n64/stage3-mipsel3-n64-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n64" mips/23.0/mipsel3_n64
+ ;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-24 14:33 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-24 14:33 UTC (permalink / raw
To: gentoo-commits
commit: 955caaafde0d18e676caae8b918d7519300f8f7e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 14:33:37 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 14:33:37 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=955caaaf
Enable mips n32 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 60864409..22bddf80 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -34,13 +34,22 @@ SETS_O32_23="
SETS_O32="${SETS_O32_17} ${SETS_O32_23}"
-SETS_N32="
+SETS_N32_17="
mipsel3_n32_openrc
mipsel3_n32_systemd_mu
mips3_n32_openrc
mips3_n32_systemd_mu
"
+SETS_N32_23="
+ mipsel3_n32_openrc_23
+ mipsel3_n32_systemd_23
+ mips3_n32_openrc_23
+ mips3_n32_systemd_23
+"
+
+SETS_N32="${SETS_N32_17} ${SETS_N32_23}"
+
SETS_N64="
mipsel3_n64_openrc
mipsel3_n64_systemd_mu
@@ -99,6 +108,14 @@ SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec stage3-mips3-n3
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
SET_mipsel3_n32_systemd_mu_SPECS="stage1-mipsel3-n32-systemd-mu.spec stage3-mipsel3-n32-systemd-mu.spec"
+# 23.0 N32
+
+SET_mips3_n32_openrc_23_SPECS="n32/stage1-mips3-n32-openrc-23.spec n32/stage3-mips3-n32-openrc-23.spec"
+SET_mips3_n32_systemd_23_SPECS="n32/stage1-mips3-n32-systemd-23.spec n32/stage3-mips3-n32-systemd-23.spec"
+
+SET_mipsel3_n32_openrc_23_SPECS="n32/stage1-mipsel3-n32-openrc-23.spec n32/stage3-mipsel3-n32-openrc-23.spec"
+SET_mipsel3_n32_systemd_23_SPECS="n32/stage1-mipsel3-n32-systemd-23.spec n32/stage3-mipsel3-n32-systemd-23.spec"
+
# 17.0 multilib
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
@@ -194,6 +211,12 @@ post_build() {
o32/stage3-mipsel2_softfloat-o32-systemd-23.spec)
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel2_softfloat" mips/23.0/mipsel2_o32_sf
;;
+ n32/stage3-mips3-n32-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips3_n32" mips/23.0/mips3_n32
+ ;;
+ n32/stage3-mipsel3-n32-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel3_n32" mips/23.0/mipsel3_n32
+ ;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-24 13:52 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-24 13:52 UTC (permalink / raw
To: gentoo-commits
commit: 70e01099077efae08218a80d66eda222c0b949cc
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 24 13:51:42 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 24 13:51:42 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=70e01099
Enable mips o32 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 70 +++++++++++++++++++++++++++++++++++-
1 file changed, 69 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 7f06eea8..60864409 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS_O32="
+SETS_O32_17="
mipsel2_softfloat_o32_openrc
mipsel2_softfloat_o32_systemd_mu
mipsel2_o32_openrc
@@ -19,6 +19,21 @@ SETS_O32="
mips2_o32_musl
"
+SETS_O32_23="
+ mipsel2_softfloat_o32_openrc_23
+ mipsel2_softfloat_o32_systemd_23
+ mipsel2_o32_openrc_23
+ mipsel2_o32_systemd_23
+ mipsel2_o32_musl_23
+ mips2_softfloat_o32_openrc_23
+ mips2_softfloat_o32_systemd_23
+ mips2_o32_openrc_23
+ mips2_o32_systemd_23
+ mips2_o32_musl_23
+"
+
+SETS_O32="${SETS_O32_17} ${SETS_O32_23}"
+
SETS_N32="
mipsel3_n32_openrc
mipsel3_n32_systemd_mu
@@ -40,6 +55,7 @@ SETS_MULTI="
mips3_multilib_systemd_mu
"
+# 17.0 O32
SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec stage3-mips2-o32-systemd-mu.spec"
@@ -57,18 +73,42 @@ SET_mipsel2_softfloat_o32_systemd_mu_SPECS="stage1-mipsel2_softfloat-o32-systemd
SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec stage3-mipsel2-o32-musl.spec"
+# 23.0 O32
+
+SET_mips2_o32_openrc_23_SPECS="o32/stage1-mips2-o32-openrc-23.spec o32/stage3-mips2-o32-openrc-23.spec"
+SET_mips2_o32_systemd_23_SPECS="o32/stage1-mips2-o32-systemd-23.spec o32/stage3-mips2-o32-systemd-23.spec"
+
+SET_mips2_softfloat_o32_openrc_23_SPECS="o32/stage1-mips2_softfloat-o32-openrc-23.spec o32/stage3-mips2_softfloat-o32-openrc-23.spec"
+SET_mips2_softfloat_o32_systemd_23_SPECS="o32/stage1-mips2_softfloat-o32-systemd-23.spec o32/stage3-mips2_softfloat-o32-systemd-23.spec"
+
+SET_mips2_o32_musl_23_SPECS="o32/stage1-mips2-o32-musl-23.spec o32/stage3-mips2-o32-musl-23.spec"
+
+SET_mipsel2_o32_openrc_23_SPECS="o32/stage1-mipsel2-o32-openrc-23.spec o32/stage3-mipsel2-o32-openrc-23.spec"
+SET_mipsel2_o32_systemd_23_SPECS="o32/stage1-mipsel2-o32-systemd-23.spec o32/stage3-mipsel2-o32-systemd-23.spec"
+
+SET_mipsel2_softfloat_o32_openrc_23_SPECS="o32/stage1-mipsel2_softfloat-o32-openrc-23.spec o32/stage3-mipsel2_softfloat-o32-openrc-23.spec"
+SET_mipsel2_softfloat_o32_systemd_23_SPECS="o32/stage1-mipsel2_softfloat-o32-systemd-23.spec o32/stage3-mipsel2_softfloat-o32-systemd-23.spec"
+
+SET_mipsel2_o32_musl_23_SPECS="o32/stage1-mipsel2-o32-musl-23.spec o32/stage3-mipsel2-o32-musl-23.spec"
+
+# 17.0 N32
+
SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec stage3-mips3-n32-systemd-mu.spec"
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
SET_mipsel3_n32_systemd_mu_SPECS="stage1-mipsel3-n32-systemd-mu.spec stage3-mipsel3-n32-systemd-mu.spec"
+# 17.0 multilib
+
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage3-mips3-multilib-systemd-mu.spec"
SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec stage3-mipsel3-multilib-systemd-mu.spec"
+# 17.0 N64
+
SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec"
SET_mips3_n64_systemd_mu_SPECS="stage1-mips3-n64-systemd-mu.spec stage3-mips3-n64-systemd-mu.spec"
@@ -140,6 +180,23 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ o32/stage3-mips2-o32-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips2" mips/23.0/mips2_o32
+ ;;
+ o32/stage3-mips2_softfloat-o32-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mips2_softfloat" mips/23.0/mips2_o32_sf
+ ;;
+ o32/stage3-mipsel2-o32-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel2" mips/23.0/mipsel2_o32
+ ;;
+ o32/stage3-mipsel2_softfloat-o32-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-mipsel2_softfloat" mips/23.0/mipsel2_o32_sf
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
stage3-mips2-o32-systemd-mu.spec)
@@ -190,4 +247,15 @@ post_build() {
;;
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+ case ${spec} in
+ o32/stage3-mips2-o32-musl-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-mips2_musl" mips/23.0/mips2_o32_musl
+ ;;
+ o32/stage3-mipsel2-o32-musl-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-mipsel2_musl" mips/23.0/mipsel2_o32_musl
+ ;;
+ esac
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-20 20:44 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2024-02-20 20:44 UTC (permalink / raw
To: gentoo-commits
commit: 456173c3212e5bcac176f17119b4c7763697f405
Author: Ian Jordan <immoloism <AT> gmail <DOT> com>
AuthorDate: Mon Jul 17 18:12:58 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 20:43:53 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=456173c3
tools/catalyst-auto: Remove treeish sed
Removes line which allowed catalyst-auto to convert to snapshot_treeish
on the fly as it's no longer needed.
Signed-off-by: Ian Jordan <immoloism <AT> gmail.com>
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 4 ----
1 file changed, 4 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 28a92611..dac4deb5 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -436,10 +436,6 @@ run_catalyst_commands() {
done
fi
- if [[ -n ${TREEISH} ]]; then
- sed -i -e "s|snapshot:.*|snapshot_treeish: ${TREEISH}|g" "${i}"
- fi
-
# Expand vars that the spec expects us to.
sed -i \
-e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-20 17:16 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-20 17:16 UTC (permalink / raw
To: gentoo-commits
commit: 0629ad5028e9915ceb8bc781aa10f7d142da31b6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 20 17:16:09 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Feb 20 17:16:09 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0629ad50
Adapt for build of MIPS o32 on milou
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-1.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-qemu-mips-1.conf b/tools/catalyst-auto-qemu-mips-1.conf
index bf7dee78..77036e73 100644
--- a/tools/catalyst-auto-qemu-mips-1.conf
+++ b/tools/catalyst-auto-qemu-mips-1.conf
@@ -2,3 +2,4 @@
source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
SETS=${SETS_O32}
+UPLOAD_KEY=/root/.ssh/id_ed25519
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-19 19:05 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-19 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 20e1b92f33766e90069fc05d2b177fe054f6c456
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 19 19:04:52 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 19 19:04:52 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=20e1b92f
mips: do LE builds first
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 22 +++++++++++-----------
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 4a3b00f6..7f06eea8 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -7,37 +7,37 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
SETS_O32="
- mips2_softfloat_o32_openrc
- mips2_softfloat_o32_systemd_mu
- mips2_o32_openrc
- mips2_o32_systemd_mu
- mips2_o32_musl
mipsel2_softfloat_o32_openrc
mipsel2_softfloat_o32_systemd_mu
mipsel2_o32_openrc
mipsel2_o32_systemd_mu
mipsel2_o32_musl
+ mips2_softfloat_o32_openrc
+ mips2_softfloat_o32_systemd_mu
+ mips2_o32_openrc
+ mips2_o32_systemd_mu
+ mips2_o32_musl
"
SETS_N32="
- mips3_n32_openrc
- mips3_n32_systemd_mu
mipsel3_n32_openrc
mipsel3_n32_systemd_mu
+ mips3_n32_openrc
+ mips3_n32_systemd_mu
"
SETS_N64="
- mips3_n64_openrc
- mips3_n64_systemd_mu
mipsel3_n64_openrc
mipsel3_n64_systemd_mu
+ mips3_n64_openrc
+ mips3_n64_systemd_mu
"
SETS_MULTI="
- mips3_multilib_openrc
- mips3_multilib_systemd_mu
mipsel3_multilib_openrc
mipsel3_multilib_systemd_mu
+ mips3_multilib_openrc
+ mips3_multilib_systemd_mu
"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-16 22:15 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-16 22:15 UTC (permalink / raw
To: gentoo-commits
commit: 858d00cd634502fed8325caacbb1fbe4e8291c1f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 16 22:09:33 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Feb 16 22:09:33 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=858d00cd
Enable ia64 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ia64.conf | 25 +++++++++++++++----------
1 file changed, 15 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 47c24f74..db010a8d 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -8,6 +8,8 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SETS="
openrc
systemd_mu
+ openrc_23
+ systemd_23
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
@@ -15,6 +17,11 @@ SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
update_symlinks() {
@@ -34,22 +41,20 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}" >/dev/null
case ${spec} in
installcd-stage2*)
- upload *${TIMESTAMP}*.iso*
+ upload builds/default/*${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
- upload stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ia64" ia64/17.0/ia64
+ upload builds/default/stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
+ upsync_binpackages packages/default/stage3-ia64 ia64/17.0/ia64
;;
- esac
- popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
stage3-systemd-mu.spec)
- upload stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ upload builds/mergedusr/stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3-systemd-23.spec)
+ upsync_binpackages packages/23.0-default/stage3-ia64 ia64/23.0/ia64
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-15 17:40 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-15 17:40 UTC (permalink / raw
To: gentoo-commits
commit: 48dfd4a007e2351ce528f02b7e0e03c40b7f8ee0
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 15 17:39:32 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Feb 15 17:39:32 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=48dfd4a0
Enable 23.0 aarch64_be builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm64.conf | 16 ++++++++++++++--
1 file changed, 14 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-arm64.conf b/tools/catalyst-auto-qemu-arm64.conf
index 20654770..cdd098b1 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -9,14 +9,18 @@ SUBARCH=aarch64_be
SETS="
openrc
systemd_mu
+ openrc_23
+ systemd_23
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64
@@ -55,4 +59,12 @@ post_build() {
;;
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-aarch64_be" arm64/23.0/aarch64_be
+ ;;
+ esac
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-13 22:43 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-13 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 760e4c8e096a2882fd3ec06022fd50bcedaa33b8
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 13 22:43:13 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Feb 13 22:43:13 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=760e4c8e
Enable 23.0 m68k musl build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-m68k.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 62e6ccac..06afd027 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -16,8 +16,8 @@ SETS="
musl
openrc_23
systemd_23
+ musl_23
"
-# musl_23
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
@@ -26,6 +26,7 @@ SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
SET_musl_23_SPECS="stage1-musl-23.spec stage3-musl-23.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-10 21:38 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-10 21:38 UTC (permalink / raw
To: gentoo-commits
commit: e174d90543fffd6005ccbef1285d881b4bd97e3b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 21:38:01 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 21:38:01 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e174d905
Enable riscv 23.0 musl builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 3b3573d6..3be768fb 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -21,8 +21,10 @@ SETS="
multilib_systemd_mu
lp64d_openrc_23
lp64d_systemd_23
+ lp64d_musl_23
lp64_openrc_23
lp64_systemd_23
+ lp64_musl_23
multilib_openrc_23
multilib_systemd_23
"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-10 16:21 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-10 16:21 UTC (permalink / raw
To: gentoo-commits
commit: e6f21b105af12713423574f481d86a47f88847d7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 16:20:57 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 16:20:57 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e6f21b10
Enable ppc64 LE 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 23 ++++++++++++++++++++++-
1 file changed, 22 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 67061610..feaf8d49 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -12,7 +12,13 @@ SETS="
systemd_power9le_mu
musl_hardened
musl_hardened_power9le
+ openrc_23
+ systemd_23
+ openrc_power9le_23
+ systemd_power9le_23
"
+# musl_hardened_23
+# musl_hardened_power9le_23
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -27,6 +33,15 @@ SET_musl_hardened_SPECS="stage1-musl-hardened-openrc.spec stage3-musl-hardened-o
SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
+
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
+SET_openrc_power9le_23_SPECS="stage1-openrc-power9le-23.spec stage3-openrc-power9le-23.spec stage3d-openrc-power9le-23.spec"
+
+SET_systemd_power9le_23_SPECS="stage1-systemd-power9le-23.spec stage3-systemd-power9le-23.spec stage3d-systemd-power9le-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -35,7 +50,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}"/builds/{default,mergedusr,power9le,power9le-mergedusr,musl-hardened,power9le-musl-hardened} ; do
+ for d in "${BUILD_SRCDIR_BASE}"/builds/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for t in ppc64le power9le; do
@@ -85,6 +100,12 @@ post_build() {
upload power9le-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/power9le-musl-hardened/stage3-power9le" ppc/17.0/power9le_musl_hardened
;;
+ stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64le" ppc/23.0/ppc64le
+ ;;
+ stage3-systemd-power9le-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-power9le" ppc/23.0/power9le
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-10 15:36 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-10 15:36 UTC (permalink / raw
To: gentoo-commits
commit: 24d1bf2d94029cc25b89e085d1ebc445cc0f9407
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 10 15:36:05 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 10 15:36:05 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=24d1bf2d
Enable ppc(64) BE 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 51 +++++++++++++++++++++++++++++++++++---------
1 file changed, 41 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 2e3e8236..956a502a 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -4,19 +4,44 @@
UPLOAD_USER=ppc
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ppc
+
+SETS="
+ openrc
+ systemd_mu
+ musl_hardened
+ openrc_23
+ systemd_23
+ openrc_64
+ systemd_mu_64
+ musl_hardened_64
+ openrc_64_23
+ systemd_64_23
+"
+# musl_hardened_23
+# musl_hardened_64_23
-SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec"
-#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
-#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
-#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
+SET_openrc_SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec"
+SET_openrc_OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
+
+SET_systemd_mu_SPECS="ppc32/stage1-systemd-mu.spec ppc32/stage3-systemd-mu.spec"
+
+SET_musl_hardened_SPECS="ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec"
+
+SET_openrc_64_SPECS="ppc64/stage1-openrc.spec ppc64/stage3-openrc.spec"
+
+SET_systemd_mu_64_SPECS="ppc64/stage1-systemd-mu.spec ppc64/stage3-systemd-mu.spec"
+
+SET_musl_hardened_64_SPECS="ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec"
+
+SET_openrc_23_SPECS="ppc32/stage1-openrc-23.spec ppc32/stage3-openrc-23.spec"
+
+SET_systemd_23_SPECS="ppc32/stage1-systemd-23.spec ppc32/stage3-systemd-23.spec"
+
+SET_openrc_64_23_SPECS="ppc64/stage1-openrc-23.spec ppc64/stage3-openrc-23.spec"
-OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
+SET_systemd_64_23_SPECS="ppc64/stage1-systemd-23.spec ppc64/stage3-systemd-23.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd-mu.spec ppc64/stage3-systemd-mu.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-systemd-mu.spec ppc32/stage3-systemd-mu.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -25,7 +50,7 @@ EMAIL_SUBJECT_PREPEND="[ppc-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds"/{default,musl-hardened,mergedusr} ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-ppc-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -71,6 +96,12 @@ post_build() {
upload musl-hardened/stage3-ppc64-musl-hardened-openrc-*${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-ppc64" ppc/17.0/ppc64_musl_hardened
;;
+ ppc32/stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc" ppc/23.0/ppc
+ ;;
+ ppc64/stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-ppc64" ppc/23.0/ppc64
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-05 21:13 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-05 21:13 UTC (permalink / raw
To: gentoo-commits
commit: be2fa5fd6723828765f0273459db7e4679eb895b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 21:12:39 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 21:12:39 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=be2fa5fd
Write some stats about binpkg uploads in the log
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index b7124fe8..28a92611 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -319,6 +319,7 @@ upsync_binpackages() {
--delay-updates
--mkpath
--min-size=1
+ --stats
)
rsync "${RSYNC_OPTS[@]}" "$1"/* "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
else
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-02-05 13:39 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-02-05 13:39 UTC (permalink / raw
To: gentoo-commits
commit: d6366affce217cde96924bd60d524a668ac42741
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 5 13:38:53 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 5 13:38:53 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d6366aff
Fix key names for move demeter => milou
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
tools/catalyst-auto-qemu-alpha.conf | 2 +-
tools/catalyst-auto-qemu-arm64.conf | 2 +-
tools/catalyst-auto-qemu-loong.conf | 2 +-
tools/catalyst-auto-qemu-m68k.conf | 2 +-
tools/catalyst-auto-qemu-riscv.conf | 2 +-
tools/catalyst-auto-x86.conf | 2 +-
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 40b97527..5ad68a57 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=amd64
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
EMAIL_SUBJECT_PREPEND="[amd64-auto]"
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index cea886dc..04d3d8c9 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=alpha
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha
EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
diff --git a/tools/catalyst-auto-qemu-arm64.conf b/tools/catalyst-auto-qemu-arm64.conf
index 03bcfd96..19aa9722 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=arm64
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm64/be
SUBARCH=aarch64_be
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index 415c3e32..08470313 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=loong
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index f2154c4a..62e6ccac 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=m68k
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index bcf6ea2e..3b3573d6 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=riscv
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 2e8d5b86..896b9c2e 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=x86
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
EMAIL_SUBJECT_PREPEND="[x86-auto]"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2024-01-28 0:58 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2024-01-28 0:58 UTC (permalink / raw
To: gentoo-commits
commit: d1052880b98707f7b1de9843b1ea4b0380b3f4c2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 28 00:58:20 2024 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 00:58:20 2024 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d1052880
sparc: Enable 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 37 +++++++++++++++++++++++++++++++++++--
1 file changed, 35 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 3d1c6f79..24330c68 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -5,8 +5,30 @@ UPLOAD_USER=sparc
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/sparc
-SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec"
-OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
+SETS="
+ openrc_32
+ systemd_32_mu
+ openrc_32_23
+ systemd_32_23
+ openrc_64
+ systemd_64_mu
+ openrc_64_23
+ systemd_64_23
+"
+
+SET_openrc_32_SPECS="sparc/stage1.spec sparc/stage3.spec"
+SET_systemd_32_mu_SPECS="sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec"
+
+SET_openrc_64_SPECS="sparc64/stage1.spec sparc64/stage3.spec"
+SET_openrc_64_OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
+SET_systemd_64_mu_SPECS="sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec"
+
+SET_openrc_32_23_SPECS="sparc/stage1-openrc-23.spec sparc/stage3-openrc-23.spec"
+SET_systemd_32_23_SPECS="sparc/stage1-systemd-23.spec sparc/stage3-systemd-23.spec"
+
+SET_openrc_64_23_SPECS="sparc64/stage1-openrc-23.spec sparc64/stage3-openrc-23.spec"
+SET_systemd_64_23_SPECS="sparc64/stage1-systemd-23.spec sparc64/stage3-systemd-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
@@ -49,6 +71,17 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ sparc/stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc" sparc/23.0/32
+ ;;
+ sparc64/stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-sparc64" sparc/23.0/64
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
sparc/systemd-stage3-mu.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-24 22:12 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-24 22:12 UTC (permalink / raw
To: gentoo-commits
commit: 78944c63846acd564965a5974c6d87507a2e3b64
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 24 22:11:44 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 22:11:44 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=78944c63
Upload sparc 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 878236f7..3d1c6f79 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -15,7 +15,7 @@ EMAIL_SUBJECT_PREPEND="[sparc-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-sparc-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -40,16 +40,10 @@ post_build() {
;;
sparc/stage3.spec)
upload stage3-sparc-${TIMESTAMP}*.xz*
- ;;
- sparc/systemd-stage3.spec)
- upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
;;
sparc64/stage3.spec)
upload stage3-sparc64-${TIMESTAMP}*.xz*
- ;;
- sparc64/systemd-stage3.spec)
- upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-24 22:08 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-24 22:08 UTC (permalink / raw
To: gentoo-commits
commit: a9c2966b9bec3cce5d92e104d25a8e4975e8ab32
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 24 22:08:16 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 24 22:08:16 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a9c2966b
Upload s390 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-s390.conf | 7 +------
tools/catalyst-auto-s390x.conf | 7 +------
2 files changed, 2 insertions(+), 12 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 1e46ab4a..a9cbf249 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -11,8 +11,6 @@ SETS="openrc systemd_mu"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
@@ -20,7 +18,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -44,9 +42,6 @@ post_build() {
;;
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
;;
esac
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index baf4ca90..f4fe9d83 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -11,8 +11,6 @@ SETS="openrc systemd_mu"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
@@ -20,7 +18,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/s390
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -44,9 +42,6 @@ post_build() {
;;
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-23 21:30 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-23 21:30 UTC (permalink / raw
To: gentoo-commits
commit: d0363089734bd2085a1b1593cdbbb81ae15bf783
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 21:29:52 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 21:29:52 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d0363089
Upload mips 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 53 +-----------------------------------
1 file changed, 1 insertion(+), 52 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 4331e527..4a3b00f6 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -42,51 +42,37 @@ SETS_MULTI="
SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
-SET_mips2_o32_systemd_SPECS="stage1-mips2-o32-systemd.spec stage3-mips2-o32-systemd.spec"
SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec stage3-mips2-o32-systemd-mu.spec"
SET_mips2_softfloat_o32_openrc_SPECS="stage1-mips2_softfloat-o32-openrc.spec stage3-mips2_softfloat-o32-openrc.spec"
-SET_mips2_softfloat_o32_systemd_SPECS="stage1-mips2_softfloat-o32-systemd.spec stage3-mips2_softfloat-o32-systemd.spec"
SET_mips2_softfloat_o32_systemd_mu_SPECS="stage1-mips2_softfloat-o32-systemd-mu.spec stage3-mips2_softfloat-o32-systemd-mu.spec"
SET_mips2_o32_musl_SPECS="stage1-mips2-o32-musl.spec stage3-mips2-o32-musl.spec"
SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
-SET_mipsel2_o32_systemd_SPECS="stage1-mipsel2-o32-systemd.spec stage3-mipsel2-o32-systemd.spec"
SET_mipsel2_o32_systemd_mu_SPECS="stage1-mipsel2-o32-systemd-mu.spec stage3-mipsel2-o32-systemd-mu.spec"
SET_mipsel2_softfloat_o32_openrc_SPECS="stage1-mipsel2_softfloat-o32-openrc.spec stage3-mipsel2_softfloat-o32-openrc.spec"
-SET_mipsel2_softfloat_o32_systemd_SPECS="stage1-mipsel2_softfloat-o32-systemd.spec stage3-mipsel2_softfloat-o32-systemd.spec"
SET_mipsel2_softfloat_o32_systemd_mu_SPECS="stage1-mipsel2_softfloat-o32-systemd-mu.spec stage3-mipsel2_softfloat-o32-systemd-mu.spec"
SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec stage3-mipsel2-o32-musl.spec"
-SET_mipsel3_o32_openrc_SPECS="stage1-mipsel3-o32-openrc.spec stage3-mipsel3-o32-openrc.spec"
-SET_mipsel3_o32_systemd_SPECS="stage1-mipsel3-o32-systemd.spec stage3-mipsel3-o32-systemd.spec"
-SET_mipsel3_o32_systemd_mu_SPECS="stage1-mipsel3-o32-systemd-mu.spec stage3-mipsel3-o32-systemd-mu.spec"
-
SET_mips3_n32_openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
-SET_mips3_n32_systemd_SPECS="stage1-mips3-n32-systemd.spec stage3-mips3-n32-systemd.spec"
SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec stage3-mips3-n32-systemd-mu.spec"
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
-SET_mipsel3_n32_systemd_SPECS="stage1-mipsel3-n32-systemd.spec stage3-mipsel3-n32-systemd.spec"
SET_mipsel3_n32_systemd_mu_SPECS="stage1-mipsel3-n32-systemd-mu.spec stage3-mipsel3-n32-systemd-mu.spec"
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
-SET_mips3_multilib_systemd_SPECS="stage1-mips3-multilib-systemd.spec stage3-mips3-multilib-systemd.spec"
SET_mips3_multilib_systemd_mu_SPECS="stage1-mips3-multilib-systemd-mu.spec stage3-mips3-multilib-systemd-mu.spec"
SET_mipsel3_multilib_openrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
-SET_mipsel3_multilib_systemd_SPECS="stage1-mipsel3-multilib-systemd.spec stage3-mipsel3-multilib-systemd.spec"
SET_mipsel3_multilib_systemd_mu_SPECS="stage1-mipsel3-multilib-systemd-mu.spec stage3-mipsel3-multilib-systemd-mu.spec"
SET_mips3_n64_openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec"
-SET_mips3_n64_systemd_SPECS="stage1-mips3-n64-systemd.spec stage3-mips3-n64-systemd.spec"
SET_mips3_n64_systemd_mu_SPECS="stage1-mips3-n64-systemd-mu.spec stage3-mips3-n64-systemd-mu.spec"
SET_mipsel3_n64_openrc_SPECS="stage1-mipsel3-n64-openrc.spec stage3-mipsel3-n64-openrc.spec"
-SET_mipsel3_n64_systemd_SPECS="stage1-mipsel3-n64-systemd.spec stage3-mipsel3-n64-systemd.spec"
SET_mipsel3_n64_systemd_mu_SPECS="stage1-mipsel3-n64-systemd-mu.spec stage3-mipsel3-n64-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
@@ -95,7 +81,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
@@ -113,79 +99,42 @@ post_build() {
case ${spec} in
stage3-mips2-o32-openrc.spec)
upload stage3-mips2-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips2-o32-systemd.spec)
- upload stage3-mips2-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2" mips/17.0/mips2_o32
;;
stage3-mips2_softfloat-o32-openrc.spec)
upload stage3-mips2_softfloat-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips2_softfloat-o32-systemd.spec)
- upload stage3-mips2_softfloat-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2_softfloat" mips/17.0/mips2_o32_softfloat
;;
stage3-mipsel2-o32-openrc.spec)
upload stage3-mipsel2-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel2-o32-systemd.spec)
- upload stage3-mipsel2-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2" mips/17.0/mipsel2_o32
;;
stage3-mipsel2_softfloat-o32-openrc.spec)
upload stage3-mipsel2_softfloat-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel2_softfloat-o32-systemd.spec)
- upload stage3-mipsel2_softfloat-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2_softfloat" mips/17.0/mipsel2_o32_softfloat
;;
- stage3-mipsel3-o32-openrc.spec)
- upload stage3-mipsel3-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-o32-systemd.spec)
- upload stage3-mipsel3-systemd-${TIMESTAMP}.tar.xz*
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3" mips/17.0/mipsel3_o32
- ;;
stage3-mips3-n32-openrc.spec)
upload stage3-mips3_n32-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips3-n32-systemd.spec)
- upload stage3-mips3_n32-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n32" mips/17.0/mips3_n32
;;
stage3-mipsel3-n32-openrc.spec)
upload stage3-mipsel3_n32-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-n32-systemd.spec)
- upload stage3-mipsel3_n32-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n32" mips/17.0/mipsel3_n32
;;
stage3-mips3-n64-openrc.spec)
upload stage3-mips3_n64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips3-n64-systemd.spec)
- upload stage3-mips3_n64-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n64" mips/17.0/mips3_n64
;;
stage3-mipsel3-n64-openrc.spec)
upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-n64-systemd.spec)
- upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n64" mips/17.0/mipsel3_n64
;;
stage3-mips3-multilib-openrc.spec)
upload stage3-mips3_multilib-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips3-multilib-systemd.spec)
- upload stage3-mips3_multilib-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_multilib" mips/17.0/mips3_multilib
;;
stage3-mipsel3-multilib-openrc.spec)
upload stage3-mipsel3_multilib-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-multilib-systemd.spec)
- upload stage3-mipsel3_multilib-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_multilib" mips/17.0/mipsel3_multilib
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-23 21:20 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-23 21:20 UTC (permalink / raw
To: gentoo-commits
commit: 94538cc032931f07c75796447d80583e9373e980
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 21:19:44 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 21:19:44 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=94538cc0
Minor m68k cleanups
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-m68k.conf | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index b5051456..f2154c4a 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -11,19 +11,23 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/m68k
EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
SETS="
- musl
openrc
systemd_mu
+ musl
openrc_23
systemd_23
"
+# musl_23
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+
SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
SET_musl_23_SPECS="stage1-musl-23.spec stage3-musl-23.spec"
update_symlinks() {
@@ -61,10 +65,6 @@ post_build() {
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
popd >/dev/null
;;
- stage3-openrc-23.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
- popd >/dev/null
- ;;
stage3-systemd-23.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-m68k" m68k/23.0/m68k
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-23 21:17 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-23 21:17 UTC (permalink / raw
To: gentoo-commits
commit: 092133aea365dc400fc38283cb5e340de3e6098c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 21:16:42 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 21:16:42 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=092133ae
Upload loong 22.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-loong.conf | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index 06d36d59..415c3e32 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -18,13 +18,12 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
-
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
@@ -46,9 +45,6 @@ post_build() {
case ${spec} in
stage3-openrc.spec)
upload stage3-loong-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-loong-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-loong" loong/22.0/loong
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-23 21:14 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-23 21:14 UTC (permalink / raw
To: gentoo-commits
commit: f8cd60f6eea424a411737a2391435a71747f2155
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 21:14:17 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 21:14:17 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f8cd60f6
Upload ia64 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ia64.conf | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 76dd80e1..47c24f74 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -13,8 +13,6 @@ SETS="
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
@@ -22,7 +20,7 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/ia64
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
@@ -43,9 +41,6 @@ post_build() {
;;
stage3-openrc.spec)
upload stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-ia64-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ia64" ia64/17.0/ia64
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-23 21:11 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-23 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 7da15b3bb344f21f0c8af73e41841016321bac77
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 21:11:15 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 21:11:15 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7da15b3b
Upload hppa 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 12 +-----------
1 file changed, 1 insertion(+), 11 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 0f397fb2..2cddc6c5 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -15,15 +15,11 @@ SETS="
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
-SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec hppa1.1/stage3-systemd.spec"
-
SET_hppa11_systemd_mu_SPECS="hppa1.1/stage1-systemd-mu.spec hppa1.1/stage3-systemd-mu.spec"
SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
-SET_hppa20_systemd_SPECS="hppa2.0/stage1-systemd.spec hppa2.0/stage3-systemd.spec"
-
SET_hppa20_systemd_mu_SPECS="hppa2.0/stage1-systemd-mu.spec hppa2.0/stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
@@ -35,7 +31,7 @@ TMP_PATH=/var/tmp/catalyst/tmp
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for t in hppa1.1 hppa2.0; do
@@ -68,16 +64,10 @@ post_build() {
;;
hppa1.1/stage3-openrc.spec)
upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
- ;;
- hppa1.1/stage3-systemd.spec)
- upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa1.1" hppa/17.0/hppa1.1
;;
hppa2.0/stage3-openrc.spec)
upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
- ;;
- hppa2.0/stage3-systemd.spec)
- upload stage3-hppa2.0-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa2.0" hppa/17.0/hppa2.0
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-23 21:02 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-23 21:02 UTC (permalink / raw
To: gentoo-commits
commit: 78665b1b63f74f1b8722ee69fc3f28fa0defa85a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 21:01:53 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 21:01:53 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=78665b1b
Add comment to amd64 config
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index f1da137f..40b97527 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -107,6 +107,7 @@ post_build() {
;;
nomultilib/stage3-openrc.spec)
upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-23 20:57 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-23 20:57 UTC (permalink / raw
To: gentoo-commits
commit: a72eb411125b32bc834533b7cb58be5e2e0f726a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 23 20:56:36 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 23 20:56:36 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a72eb411
Upload alpha 17.0 packages with openrc build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 6 ------
1 file changed, 6 deletions(-)
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index bc7964f7..cea886dc 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -10,9 +10,6 @@ SETS="openrc systemd_mu openrc23 systemd23"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
@@ -44,9 +41,6 @@ post_build() {
;;
stage3-openrc.spec)
upload stage3-alpha-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-alpha-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-alpha" alpha/17.0/alpha
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-22 0:39 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-22 0:39 UTC (permalink / raw
To: gentoo-commits
commit: 65901c614cfb54924ed07b4540ea63fcf418000f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 00:38:46 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 00:38:46 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=65901c61
Disable 23.0 musl builds until catalyst is ready /o\
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 2 +-
tools/catalyst-auto-qemu-m68k.conf | 1 -
tools/catalyst-auto-qemu-riscv.conf | 2 --
3 files changed, 1 insertion(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index dcf46eb3..ac015b05 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -19,7 +19,7 @@ SETS="
llvm_openrc_23
llvm_systemd_23
"
-# needs musl-1.2.4 stable:
+# needs musl-1.2.4 stable and new catalyst logic
# musl_23
# musl_hardened_23
# musl_llvm_23
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 0a6615f8..b5051456 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -14,7 +14,6 @@ SETS="
musl
openrc
systemd_mu
- musl_23
openrc_23
systemd_23
"
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 8cbe0e0b..bcf6ea2e 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -21,10 +21,8 @@ SETS="
multilib_systemd_mu
lp64d_openrc_23
lp64d_systemd_23
- lp64d_musl_23
lp64_openrc_23
lp64_systemd_23
- lp64_musl_23
multilib_openrc_23
multilib_systemd_23
"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-15 22:22 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-15 22:22 UTC (permalink / raw
To: gentoo-commits
commit: dfa28b9cff90fa1582858c44e35a69e50ac36696
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 22:22:08 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 22:22:08 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=dfa28b9c
Disable arm64 23.0 musl builds again (needs musl-1.2.4 stable)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 61c7d67f..dcf46eb3 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -18,10 +18,11 @@ SETS="
systemd_23
llvm_openrc_23
llvm_systemd_23
- musl_23
- musl_hardened_23
- musl_llvm_23
"
+# needs musl-1.2.4 stable:
+# musl_23
+# musl_hardened_23
+# musl_llvm_23
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-15 21:28 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-15 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 64fa328a3f38b51c702a01a56fffd65c46180a48
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 21:27:32 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 21:27:32 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=64fa328a
Enable arm64 23.0 profile builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 53 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 53 insertions(+)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index baba95af..61c7d67f 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -14,6 +14,13 @@ SETS="
musl
musl_hardened
musl_llvm
+ openrc_23
+ systemd_23
+ llvm_openrc_23
+ llvm_systemd_23
+ musl_23
+ musl_hardened_23
+ musl_llvm_23
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
@@ -21,16 +28,30 @@ SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec stage3d-systemd-mu.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec stage3d-openrc-23.spec"
+
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec stage3d-systemd-23.spec"
+
SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec"
SET_llvm_systemd_mu_SPECS="llvm/stage1-systemd-mu.spec llvm/stage3-systemd-mu.spec"
+SET_llvm_openrc_23_SPECS="llvm/stage1-openrc-23.spec llvm/stage3-openrc-23.spec"
+
+SET_llvm_systemd_23_SPECS="llvm/stage1-systemd-23.spec llvm/stage3-systemd-23.spec"
+
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
SET_musl_llvm_SPECS="musl-llvm/stage1.spec musl-llvm/stage3.spec"
+SET_musl_23_SPECS="musl/stage1-23.spec musl/stage3-23.spec"
+
+SET_musl_hardened_23_SPECS="musl-hardened/stage1-23.spec musl-hardened/stage3-23.spec"
+
+SET_musl_llvm_23_SPECS="musl-llvm/stage1-23.spec musl-llvm/stage3-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64
@@ -88,6 +109,14 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-llvm" >/dev/null
+ case ${spec} in
+ llvm/stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-llvm/stage3-arm64" arm64/23.0/arm64_llvm
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" >/dev/null
case ${spec} in
llvm/stage3-systemd-mu.spec)
@@ -105,6 +134,14 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+ case ${spec} in
+ musl/stage3-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-arm64" arm64/23.0/arm64_musl
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/musl-hardened" >/dev/null
case ${spec} in
musl-hardened/stage3.spec)
@@ -114,6 +151,14 @@ post_build() {
esac
popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-hardened" >/dev/null
+ case ${spec} in
+ musl-hardened/stage3-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-hardened/stage3-arm64" arm64/23.0/arm64_musl_hardened
+ ;;
+ esac
+ popd >/dev/null
+
pushd "${BUILD_SRCDIR_BASE}/builds/musl-llvm" >/dev/null
case ${spec} in
musl-llvm/stage3.spec)
@@ -122,4 +167,12 @@ post_build() {
;;
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl-llvm" >/dev/null
+ case ${spec} in
+ musl-llvm/stage3-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl-llvm/stage3-arm64" arm64/23.0/arm64_musl_llvm
+ ;;
+ esac
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-15 19:27 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-15 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 422d534d250f797843913c7d0fed6f1a6b1308ad
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 19:27:34 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 19:27:34 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=422d534d
Drop arm64 systemd split-usr sets
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 0f152ca1..baba95af 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -8,8 +8,8 @@ SUBARCH=arm64
SETS="
openrc
- llvm_openrc
systemd_mu
+ llvm_openrc
llvm_systemd_mu
musl
musl_hardened
@@ -19,12 +19,10 @@ SETS="
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec stage3d-systemd.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec stage3d-systemd-mu.spec"
SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec"
-SET_llvm_systemd_SPECS="llvm/stage1-systemd.spec llvm/stage3-systemd.spec"
SET_llvm_systemd_mu_SPECS="llvm/stage1-systemd-mu.spec llvm/stage3-systemd-mu.spec"
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-15 18:38 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-15 18:38 UTC (permalink / raw
To: gentoo-commits
commit: f1f0eaa27cfeac2335a7c16575205e5e06222f6b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 18:37:45 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 18:37:45 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f1f0eaa2
Enable all m68k 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-m68k.conf | 29 ++++++++++++++++++++++-------
1 file changed, 22 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index ed9f3b3e..0a6615f8 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -14,17 +14,23 @@ SETS="
musl
openrc
systemd_mu
+ musl_23
+ openrc_23
+ systemd_23
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_musl_SPECS="stage1-musl.spec stage3-musl.spec"
+SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+SET_musl_23_SPECS="stage1-musl-23.spec stage3-musl-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
@@ -42,11 +48,6 @@ post_build() {
stage3-openrc.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-m68k-openrc-${TIMESTAMP}*.xz*
- popd >/dev/null
- ;;
- stage3-systemd.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-m68k-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k
popd >/dev/null
;;
@@ -61,6 +62,20 @@ post_build() {
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
popd >/dev/null
;;
+ stage3-openrc-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ popd >/dev/null
+ ;;
+ stage3-systemd-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-m68k" m68k/23.0/m68k
+ popd >/dev/null
+ ;;
+ stage3-musl-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-m68k_musl" m68k/23.0/m68k_musl
+ popd >/dev/null
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-15 3:09 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-15 3:09 UTC (permalink / raw
To: gentoo-commits
commit: d7b9850fe6e064909daf3b7117a5edcfc4c54090
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 03:08:33 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 03:08:33 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7b9850f
Fix riscv binpkg upsync logic
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 5 -----
1 file changed, 5 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 5aa73f0b..8cbe0e0b 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -85,11 +85,6 @@ post_build() {
stage3*openrc.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
- popd >/dev/null
- ;;
- stage3*systemd.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64d" riscv/20.0/rv64_lp64d
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64" riscv/20.0/rv64_lp64
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_multilib" riscv/20.0/rv64_multilib
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-14 22:33 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-14 22:33 UTC (permalink / raw
To: gentoo-commits
commit: 3e97eeedb8b0fa38b327bc152523851f11ef7f23
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 22:33:18 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 22:33:18 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3e97eeed
Stop building and uploading arm systemd split-usr stages, sync with openrc
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 26 +-------------------------
1 file changed, 1 insertion(+), 25 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 7610aa91..fe7383d8 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -30,39 +30,33 @@ SETS="
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec"
-SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec"
SET_armv4tl_systemd_mu_SPECS="armv4tl/stage1-systemd-mu.spec armv4tl/stage3-systemd-mu.spec"
SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec armv5tel/stage3-openrc.spec"
-SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage3-systemd.spec"
SET_armv5tel_systemd_mu_SPECS="armv5tel/stage1-systemd-mu.spec armv5tel/stage3-systemd-mu.spec"
SET_armv6j_hf_openrc_SPECS="armv6j/stage1-hardfloat-openrc.spec armv6j/stage3-hardfloat-openrc.spec"
-SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec"
SET_armv6j_hf_systemd_mu_SPECS="armv6j/stage1-hardfloat-systemd-mu.spec armv6j/stage3-hardfloat-systemd-mu.spec"
SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec armv6j/stage3-openrc.spec"
-SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec"
SET_armv6j_sf_systemd_mu_SPECS="armv6j/stage1-systemd-mu.spec armv6j/stage3-systemd-mu.spec"
SET_armv6j_hf_musl_openrc_SPECS="armv6j-musl/stage1-hardfloat.spec armv6j-musl/stage3-hardfloat.spec"
SET_armv6j_hf_musl_hardened_openrc_SPECS="armv6j-musl-hardened/stage1-hardfloat.spec armv6j-musl-hardened/stage3-hardfloat.spec"
SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec"
-SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec"
SET_armv7a_hf_systemd_mu_SPECS="armv7a/stage1-hardfloat-systemd-mu.spec armv7a/stage3-hardfloat-systemd-mu.spec"
SET_armv7a_hf_musl_openrc_SPECS="armv7a-musl/stage1-hardfloat.spec armv7a-musl/stage3-hardfloat.spec"
SET_armv7a_hf_musl_hardened_openrc_SPECS="armv7a-musl-hardened/stage1-hardfloat.spec armv7a-musl-hardened/stage3-hardfloat.spec"
SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec armv7a/stage3-openrc.spec"
-SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec"
SET_armv7a_sf_systemd_mu_SPECS="armv7a/stage1-systemd-mu.spec armv7a/stage3-systemd-mu.spec"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
@@ -81,44 +75,26 @@ post_build() {
case ${spec} in
armv4tl/stage3-openrc.spec)
upload stage3-armv4tl-openrc-${TIMESTAMP}*.xz*
- ;;
- armv4tl/stage3-systemd.spec)
- upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv4tl" arm/17.0/armv4tl
;;
armv5tel/stage3-openrc.spec)
upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz*
- ;;
- armv5tel/stage3-systemd.spec)
- upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv5tel" arm/17.0/armv5tel
;;
armv6j/stage3-openrc.spec)
upload stage3-armv6j-openrc-${TIMESTAMP}*.xz*
- ;;
- armv6j/stage3-systemd.spec)
- upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j" arm/17.0/armv6j
;;
armv6j/stage3-hardfloat-openrc.spec)
upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz*
- ;;
- armv6j/stage3-hardfloat-systemd.spec)
- upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j_hardfp" arm/17.0/armv6j_hardfp
;;
armv7a/stage3-openrc.spec)
upload stage3-armv7a-openrc-${TIMESTAMP}*.xz*
- ;;
- armv7a/stage3-systemd.spec)
- upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a" arm/17.0/armv7a
;;
armv7a/stage3-hardfloat-openrc.spec)
upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz*
- ;;
- armv7a/stage3-hardfloat-systemd.spec)
- upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a_hardfp" arm/17.0/armv7a_hardfp
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-14 22:28 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-14 22:28 UTC (permalink / raw
To: gentoo-commits
commit: a1b5b9afd080fff8d6e06091d1976803728c03e6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 22:23:33 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 22:24:11 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a1b5b9af
Stop building arm64 systemd split-usr stages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 55eb174b..0f152ca1 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -41,7 +41,7 @@ EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/llvm" "${BUILD_SRCDIR_BASE}/builds/llvm-mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${BUILD_SRCDIR_BASE}/builds/musl-llvm"; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -62,17 +62,11 @@ post_build() {
;;
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
+ # do not upsync_binpackages, done by extra builder
;;
stage3d-openrc.spec)
upload stage3-${SUBARCH}-desktop-openrc-${TIMESTAMP}*.xz*
;;
- stage3-systemd.spec)
- upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
- # do not upsync_binpackages, done by extra builder
- ;;
- stage3d-systemd.spec)
- upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
- ;;
esac
popd >/dev/null
@@ -91,9 +85,6 @@ post_build() {
case ${spec} in
llvm/stage3-openrc.spec)
upload stage3-${SUBARCH}-llvm-openrc-${TIMESTAMP}*.xz*
- ;;
- llvm/stage3-systemd.spec)
- upload stage3-${SUBARCH}-llvm-systemd-${TIMESTAMP}*.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/llvm/stage3-arm64" arm64/17.0/arm64_llvm
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-14 22:28 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-14 22:28 UTC (permalink / raw
To: gentoo-commits
commit: 6255fc3365c4591b0962ccda8e296892acc4dbf4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 14 22:19:30 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 14 22:26:55 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6255fc33
Stop building and uploading amd64 systemd split-usr stages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 32 +-------------------------------
1 file changed, 1 insertion(+), 31 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 4fbce5bf..f1da137f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -11,14 +11,11 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
openrc
- systemd
systemd_mu
livegui
nomultilib_openrc
- nomultilib_systemd
nomultilib_systemd_mu
llvm_openrc
- llvm_systemd
llvm_systemd_mu
hardened_openrc
hardened_nomultilib_openrc
@@ -28,7 +25,6 @@ SETS="
musl_hardened
musl_llvm
x32_openrc
- x32_systemd
x32_systemd_mu
"
@@ -37,9 +33,6 @@ SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-s
SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec"
-
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
SET_systemd_mu_OPTIONAL_SPECS="stage3d-systemd-mu.spec"
@@ -54,14 +47,10 @@ SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec har
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage3-openrc.spec"
-SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage3-systemd.spec"
-
SET_nomultilib_systemd_mu_SPECS="nomultilib/stage1-systemd-mu.spec nomultilib/stage3-systemd-mu.spec"
SET_llvm_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
-SET_llvm_systemd_SPECS="clang/stage1-systemd.spec clang/stage3-systemd.spec"
-
SET_llvm_systemd_mu_SPECS="clang/stage1-systemd-mu.spec clang/stage3-systemd-mu.spec"
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
@@ -72,8 +61,6 @@ SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
-SET_x32_systemd_SPECS="x32/stage1-systemd.spec x32/stage3-systemd.spec"
-
SET_x32_systemd_mu_SPECS="x32/stage1-systemd-mu.spec x32/stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
@@ -82,7 +69,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/{default,clang,hardened,llvm-mergedusr,mergedusr,musl,musl-clang,musl-hardened} ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null || exit
shopt -s extglob
@@ -110,33 +97,19 @@ post_build() {
case ${spec} in
stage3-openrc.spec)
upload stage3-amd64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-systemd.spec)
- upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
# do not upsync_binpackages, done by extra builder
;;
stage3d-openrc.spec)
upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
;;
- stage3d-systemd.spec)
- upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
- # do not upsync_binpackages, done by extra builder
- ;;
installcd-stage2-minimal.spec)
upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
nomultilib/stage3-openrc.spec)
upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
;;
- nomultilib/stage3-systemd.spec)
- upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
- # do not upsync_binpackages, done by extra builder
- ;;
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
- ;;
- x32/stage3-systemd.spec)
- upload stage3-x32-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
;;
livegui/livegui-stage2.spec)
@@ -166,9 +139,6 @@ post_build() {
case ${spec} in
clang/stage3-openrc.spec)
upload stage3-amd64-llvm-openrc-${TIMESTAMP}.tar.xz*
- ;;
- clang/stage3-systemd.spec)
- upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-11 17:18 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-11 17:18 UTC (permalink / raw
To: gentoo-commits
commit: d4bd1a2dcd93960fb119a78800f7eca2ed44737b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 17:17:53 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 17:17:53 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d4bd1a2d
Enable riscv 23.0 autobuilds and binpkg uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 34 +++++++++++++++++++++++++++++++++-
1 file changed, 33 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index e8a20391..5aa73f0b 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -19,6 +19,14 @@ SETS="
lp64_musl
multilib_openrc
multilib_systemd_mu
+ lp64d_openrc_23
+ lp64d_systemd_23
+ lp64d_musl_23
+ lp64_openrc_23
+ lp64_systemd_23
+ lp64_musl_23
+ multilib_openrc_23
+ multilib_systemd_23
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
@@ -32,10 +40,21 @@ SET_lp64_systemd_mu_SPECS="stage1-lp64-systemd-mu.spec stage3-lp64-systemd-mu.sp
SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec stage3-multilib-openrc.spec"
SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec stage3-multilib-systemd-mu.spec"
+SET_lp64d_musl_23_SPECS="stage1-lp64d-musl-23.spec stage3-lp64d-musl-23.spec"
+SET_lp64d_openrc_23_SPECS="stage1-lp64d-openrc-23.spec stage3-lp64d-openrc-23.spec"
+SET_lp64d_systemd_23_SPECS="stage1-lp64d-systemd-23.spec stage3-lp64d-systemd-23.spec"
+
+SET_lp64_musl_23_SPECS="stage1-lp64-musl-23.spec stage3-lp64-musl-23.spec"
+SET_lp64_openrc_23_SPECS="stage1-lp64-openrc-23.spec stage3-lp64-openrc-23.spec"
+SET_lp64_systemd_23_SPECS="stage1-lp64-systemd-23.spec stage3-lp64-systemd-23.spec"
+
+SET_multilib_openrc_23_SPECS="stage1-multilib-openrc-23.spec stage3-multilib-openrc-23.spec"
+SET_multilib_systemd_23_SPECS="stage1-multilib-systemd-23.spec stage3-multilib-systemd-23.spec"
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
@@ -50,6 +69,19 @@ post_build() {
local set=$1 spec=$2
case ${spec} in
+ stage3*systemd-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64d" riscv/23.0/rv64_lp64d
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_lp64" riscv/23.0/rv64_lp64
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-rv64_multilib" riscv/23.0/rv64_multilib
+ popd >/dev/null
+ ;;
+ stage3*musl-23.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-musl" >/dev/null
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64d_musl" riscv/23.0/rv64_lp64d_musl
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-musl/stage3-rv64_lp64_musl" riscv/23.0/rv64_lp64_musl
+ popd >/dev/null
+ ;;
stage3*openrc.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-11 17:18 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-11 17:18 UTC (permalink / raw
To: gentoo-commits
commit: 428f0449d70743fd5383b03e6ada851b028d7353
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 11 17:08:37 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 11 17:08:37 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=428f0449
Drop riscv split-usr systemd sets
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 12077126..e8a20391 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -23,16 +23,13 @@ SETS="
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
-SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec"
SET_lp64d_systemd_mu_SPECS="stage1-lp64d-systemd-mu.spec stage3-lp64d-systemd-mu.spec"
SET_lp64_musl_SPECS="stage1-lp64-musl.spec stage3-lp64-musl.spec"
SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
-SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage3-lp64-systemd.spec"
SET_lp64_systemd_mu_SPECS="stage1-lp64-systemd-mu.spec stage3-lp64-systemd-mu.spec"
SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec stage3-multilib-openrc.spec"
-SET_multilib_systemd_SPECS="stage1-multilib-systemd.spec stage3-multilib-systemd.spec"
SET_multilib_systemd_mu_SPECS="stage1-multilib-systemd-mu.spec stage3-multilib-systemd-mu.spec"
update_symlinks() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-08 22:51 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-08 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 6e305b99cee8ff189828354318ab6224a5605427
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 22:51:22 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 22:51:22 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6e305b99
Stop building mipsel3 o32
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 0ae79925..4331e527 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -16,8 +16,6 @@ SETS_O32="
mipsel2_softfloat_o32_systemd_mu
mipsel2_o32_openrc
mipsel2_o32_systemd_mu
- mipsel3_o32_openrc
- mipsel3_o32_systemd_mu
mipsel2_o32_musl
"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-07 22:11 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-07 22:11 UTC (permalink / raw
To: gentoo-commits
commit: 47eb54bb040834f43e2913e72188ea6468323c7d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 7 22:10:48 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 7 22:10:48 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=47eb54bb
catalyst-auto: do not upload zero-size binpackage files
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 95094af6..b7124fe8 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -318,6 +318,7 @@ upsync_binpackages() {
--omit-dir-times
--delay-updates
--mkpath
+ --min-size=1
)
rsync "${RSYNC_OPTS[@]}" "$1"/* "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
else
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-05 20:45 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-05 20:45 UTC (permalink / raw
To: gentoo-commits
commit: f8b44bf3ab417dc1fd74cb6e3d6f9daf5697f08d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 5 20:40:53 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Dec 5 20:40:53 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f8b44bf3
Add upload for alpha 23.0 binpackages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index a0791f24..bc7964f7 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -59,4 +59,12 @@ post_build() {
;;
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-alpha" alpha/23.0/alpha
+ ;;
+ esac
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-05 20:45 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-05 20:45 UTC (permalink / raw
To: gentoo-commits
commit: 22169c223ae5111883655e89ea3bc96707303a53
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 5 20:44:55 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Dec 5 20:44:55 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=22169c22
Add loong 23.0 stage builds and upload binpackages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-loong.conf | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index b88a0891..06d36d59 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -13,18 +13,22 @@ EMAIL_SUBJECT_PREPEND="[loong-qemu-auto]"
SETS="
openrc
systemd_mu
+ openrc23
+ systemd23
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
+SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds"/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
@@ -57,4 +61,12 @@ post_build() {
;;
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
+ case ${spec} in
+ stage3-systemd-23.spec)
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/23.0-default/stage3-loong" loong/23.0/loong
+ ;;
+ esac
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-12-04 10:09 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-12-04 10:09 UTC (permalink / raw
To: gentoo-commits
commit: e00c1581e14f31169ce5f7ec743e240122fb32d8
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 4 10:08:59 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 4 10:08:59 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e00c1581
Add alpha 23.0 builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index fff9f8b9..a0791f24 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha
EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
-SETS="openrc systemd systemd_mu"
+SETS="openrc systemd_mu openrc23 systemd23"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -15,12 +15,15 @@ SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_openrc23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec"
+SET_systemd23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ for d in "${BUILD_SRCDIR_BASE}"/builds/* ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-11-12 2:03 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-11-12 2:03 UTC (permalink / raw
To: gentoo-commits
commit: 63aed276c454bdfa8c4d2941524fa2151b253057
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 12 02:03:24 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 02:03:24 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=63aed276
Stop building systemd split-usr stages for arm, arm64, hppa, ia64
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 6 ------
tools/catalyst-auto-arm64.conf | 10 +++++++++-
tools/catalyst-auto-hppa.conf | 7 ++++++-
tools/catalyst-auto-ia64.conf | 1 -
4 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 2545406f..7610aa91 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -12,24 +12,18 @@ EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
armv4tl_openrc
- armv4tl_systemd
armv4tl_systemd_mu
armv5tel_openrc
- armv5tel_systemd
armv5tel_systemd_mu
armv6j_hf_openrc
- armv6j_hf_systemd
armv6j_hf_systemd_mu
armv6j_sf_openrc
- armv6j_sf_systemd
armv6j_sf_systemd_mu
armv6j_hf_musl_openrc
armv6j_hf_musl_hardened_openrc
armv7a_hf_openrc
- armv7a_hf_systemd
armv7a_hf_systemd_mu
armv7a_sf_openrc
- armv7a_sf_systemd
armv7a_sf_systemd_mu
armv7a_hf_musl_openrc
armv7a_hf_musl_hardened_openrc
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 7abc8fdc..55eb174b 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -6,7 +6,15 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/arm64
SUBARCH=arm64
-SETS="openrc llvm_openrc systemd systemd_mu llvm_systemd llvm_systemd_mu musl musl_hardened musl_llvm"
+SETS="
+ openrc
+ llvm_openrc
+ systemd_mu
+ llvm_systemd_mu
+ musl
+ musl_hardened
+ musl_llvm
+"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 630e19e1..0f397fb2 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -5,7 +5,12 @@ UPLOAD_USER=hppa
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
-SETS="hppa11_openrc hppa11_systemd hppa11_systemd_mu hppa20_openrc hppa20_systemd hppa20_systemd_mu"
+SETS="
+ hppa11_openrc
+ hppa11_systemd_mu
+ hppa20_openrc
+ hppa20_systemd_mu
+"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b18765e2..76dd80e1 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -7,7 +7,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SETS="
openrc
- systemd
systemd_mu
"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-11-12 1:41 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-11-12 1:41 UTC (permalink / raw
To: gentoo-commits
commit: d7b032dd84d469e8195b1eb595c62637dfdb5e47
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 12 01:41:22 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 12 01:41:22 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d7b032dd
Stop building systemd split-usr stages for loong, mips, m68k, ppc, ppc64
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 4 ++--
tools/catalyst-auto-ppc64le.conf | 2 --
tools/catalyst-auto-qemu-loong.conf | 1 -
tools/catalyst-auto-qemu-m68k.conf | 1 -
tools/catalyst-auto-qemu-mips-common | 11 -----------
5 files changed, 2 insertions(+), 17 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 727e7eb7..f354b260 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -11,10 +11,10 @@ SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec ppc64/stage1-openrc.spe
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd.spec ppc64/stage3-systemd.spec"
+#OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd.spec ppc64/stage3-systemd.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd-mu.spec ppc64/stage3-systemd-mu.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-systemd.spec ppc32/stage3-systemd.spec"
+#OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-systemd.spec ppc32/stage3-systemd.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-systemd-mu.spec ppc32/stage3-systemd-mu.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec"
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index f051430a..eb27429c 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -7,10 +7,8 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
SETS="
openrc
- systemd
systemd_mu
openrc_power9le
- systemd_power9le
systemd_power9le_mu
musl_hardened
musl_hardened_power9le
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index c5cb8df1..b88a0891 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -12,7 +12,6 @@ EMAIL_SUBJECT_PREPEND="[loong-qemu-auto]"
SETS="
openrc
- systemd
systemd_mu
"
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 39bdd83b..ed9f3b3e 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -13,7 +13,6 @@ EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
SETS="
musl
openrc
- systemd
systemd_mu
"
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 300bfae6..0ae79925 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -8,48 +8,37 @@ EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
SETS_O32="
mips2_softfloat_o32_openrc
- mips2_softfloat_o32_systemd
mips2_softfloat_o32_systemd_mu
mips2_o32_openrc
- mips2_o32_systemd
mips2_o32_systemd_mu
mips2_o32_musl
mipsel2_softfloat_o32_openrc
- mipsel2_softfloat_o32_systemd
mipsel2_softfloat_o32_systemd_mu
mipsel2_o32_openrc
- mipsel2_o32_systemd
mipsel2_o32_systemd_mu
mipsel3_o32_openrc
- mipsel3_o32_systemd
mipsel3_o32_systemd_mu
mipsel2_o32_musl
"
SETS_N32="
mips3_n32_openrc
- mips3_n32_systemd
mips3_n32_systemd_mu
mipsel3_n32_openrc
- mipsel3_n32_systemd
mipsel3_n32_systemd_mu
"
SETS_N64="
mips3_n64_openrc
- mips3_n64_systemd
mips3_n64_systemd_mu
mipsel3_n64_openrc
- mipsel3_n64_systemd
mipsel3_n64_systemd_mu
"
SETS_MULTI="
mips3_multilib_openrc
- mips3_multilib_systemd
mips3_multilib_systemd_mu
mipsel3_multilib_openrc
- mipsel3_multilib_systemd
mipsel3_multilib_systemd_mu
"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-11-11 23:45 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-11-11 23:45 UTC (permalink / raw
To: gentoo-commits
commit: eb88620890a6d83e9225e196d86f8babde758644
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 11 23:45:27 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 11 23:45:27 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=eb886208
Stop building systemd split-usr stages for riscv, s390, sparc, x86
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 8 +++-----
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 2 +-
tools/catalyst-auto-x86.conf | 2 --
5 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index ead9a565..12077126 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -11,16 +11,14 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
SETS="
- lp64d_systemd_mu
lp64d_openrc
- lp64d_systemd
+ lp64d_systemd_mu
lp64d_musl
- lp64_systemd_mu
lp64_openrc
- lp64_systemd
+ lp64_systemd_mu
lp64_musl
multilib_openrc
- multilib_systemd
+ multilib_systemd_mu
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 51a11e1e..1e46ab4a 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
SUBARCH=s390
-SETS="openrc systemd systemd_mu"
+SETS="openrc systemd_mu"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 28432f1b..baf4ca90 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
SUBARCH=s390x
-SETS="openrc systemd systemd_mu"
+SETS="openrc systemd_mu"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="netboot/netboot.spec"
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 89d5bc91..878236f7 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -5,7 +5,7 @@ UPLOAD_USER=sparc
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/sparc
-SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec sparc/systemd-stage3.spec sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec"
+SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1-mu.spec sparc/systemd-stage3-mu.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1-mu.spec sparc64/systemd-stage3-mu.spec"
OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index a34f8219..38b49922 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -11,10 +11,8 @@ SPECS_DIR=${REPO_DIR}/releases/specs/x86
SETS="
i486_openrc
- i486_systemd
i486_systemd_mu
i686_openrc
- i686_systemd
i686_systemd_mu
hardened_openrc
musl
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-10-03 9:38 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-10-03 9:38 UTC (permalink / raw
To: gentoo-commits
commit: 57cb206aa5d4f889e4993f03a289425575206cd2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 3 09:38:08 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 3 09:38:08 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=57cb206a
Refactor ppc64le builds into sets
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 38 +++++++++++++++++++++++++++-----------
1 file changed, 27 insertions(+), 11 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 99edeeb2..f051430a 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -5,18 +5,34 @@ UPLOAD_USER=ppc
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
-SPECS="stage1-openrc.spec stage3-openrc.spec"
-OPTIONAL_SPECS+=" installcd-stage1.spec installcd-stage2-minimal.spec"
-OPTIONAL_SPECS+=" stage1-systemd.spec stage3-systemd.spec"
-OPTIONAL_SPECS+=" stage1-systemd-mu.spec stage3-systemd-mu.spec"
-OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
-OPTIONAL_SPECS+=" stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
-OPTIONAL_SPECS+=" stage1-systemd-mu-power9le.spec stage3-systemd-mu-power9le.spec stage3d-systemd-mu-power9le.spec"
-OPTIONAL_SPECS+=" stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
-OPTIONAL_SPECS+=" stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
+SETS="
+ openrc
+ systemd
+ systemd_mu
+ openrc_power9le
+ systemd_power9le
+ systemd_power9le_mu
+ musl_hardened
+ musl_hardened_power9le
+"
+
+SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+SET_openrc_OPTIONAL_SPECS=" installcd-stage1.spec installcd-stage2-minimal.spec"
+
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
+
+SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+
+SET_openrc_power9le_SPECS="stage1-openrc-power9le.spec stage3-openrc-power9le.spec stage3d-openrc-power9le.spec"
+
+SET_systemd_power9le_SPECS="stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
+
+SET_systemd_power9le_mu_SPECS="stage1-systemd-mu-power9le.spec stage3-systemd-mu-power9le.spec stage3d-systemd-mu-power9le.spec"
+
+SET_musl_hardened_SPECS="stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
+
+SET_musl_hardened_power9le_SPECS="stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
-#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
-#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-09-09 9:39 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-09-09 9:39 UTC (permalink / raw
To: gentoo-commits
commit: b215133537654d8dcc7d0329d7272d5ee5b56c97
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 9 09:17:56 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 9 09:17:56 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b2151335
Revert "Let's wait with riscv multilib until we're sure it works"
It works.
This reverts commit 6c455ce370f34c6ced649dadb9c42a03d64674af.
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 1eec68cd..ead9a565 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -19,9 +19,9 @@ SETS="
lp64_openrc
lp64_systemd
lp64_musl
+ multilib_openrc
+ multilib_systemd
"
-# multilib_openrc
-# multilib_systemd
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-09-07 20:08 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-09-07 20:08 UTC (permalink / raw
To: gentoo-commits
commit: 6c455ce370f34c6ced649dadb9c42a03d64674af
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 7 20:07:40 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Sep 7 20:07:40 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6c455ce3
Let's wait with riscv multilib until we're sure it works
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index ead9a565..1eec68cd 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -19,9 +19,9 @@ SETS="
lp64_openrc
lp64_systemd
lp64_musl
- multilib_openrc
- multilib_systemd
"
+# multilib_openrc
+# multilib_systemd
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-09-05 22:34 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-09-05 22:34 UTC (permalink / raw
To: gentoo-commits
commit: 1abc1345b4a9095611a28dc64e0dd855876da13b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 5 22:33:46 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Sep 5 22:33:46 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1abc1345
Re-enable riscv multilib builds, gcc seems to have been fixed
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index da306f59..ead9a565 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -19,6 +19,8 @@ SETS="
lp64_openrc
lp64_systemd
lp64_musl
+ multilib_openrc
+ multilib_systemd
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-09-03 14:12 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-09-03 14:12 UTC (permalink / raw
To: gentoo-commits
commit: 980c53a10e3c36f2119a8012d8af6c9649107937
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 3 14:11:40 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 3 14:11:40 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=980c53a1
Build in same order as listed on website
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 3eb082ca..300bfae6 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -7,23 +7,23 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
SETS_O32="
- mips2_o32_openrc
- mips2_o32_systemd
- mips2_o32_systemd_mu
mips2_softfloat_o32_openrc
mips2_softfloat_o32_systemd
mips2_softfloat_o32_systemd_mu
+ mips2_o32_openrc
+ mips2_o32_systemd
+ mips2_o32_systemd_mu
mips2_o32_musl
- mipsel2_o32_openrc
- mipsel2_o32_systemd
- mipsel2_o32_systemd_mu
mipsel2_softfloat_o32_openrc
mipsel2_softfloat_o32_systemd
mipsel2_softfloat_o32_systemd_mu
- mipsel2_o32_musl
+ mipsel2_o32_openrc
+ mipsel2_o32_systemd
+ mipsel2_o32_systemd_mu
mipsel3_o32_openrc
mipsel3_o32_systemd
mipsel3_o32_systemd_mu
+ mipsel2_o32_musl
"
SETS_N32="
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-09-02 11:22 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-09-02 11:22 UTC (permalink / raw
To: gentoo-commits
commit: ffafa62e640fbc81c5036b99b5b4999fcb2a52dd
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 2 11:21:39 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Sep 2 11:21:39 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ffafa62e
Disconnect binhost arm64/17.0/arm64 from stage builds (extra builder)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 3f7904ee..7abc8fdc 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -60,7 +60,7 @@ post_build() {
;;
stage3-systemd.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-arm64" arm64/17.0/arm64
+ # do not upsync_binpackages, done by extra builder
;;
stage3d-systemd.spec)
upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-20 22:35 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-20 22:35 UTC (permalink / raw
To: gentoo-commits
commit: d3c2ebe22ad6e7893438180608ae2cb8cadb84bb
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 20 22:34:47 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 20 22:34:47 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d3c2ebe2
Fill in all remaining binpackage uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 48c21372..3eb082ca 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -143,18 +143,21 @@ post_build() {
;;
stage3-mipsel2-o32-systemd.spec)
upload stage3-mipsel2-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2" mips/17.0/mipsel2_o32
;;
stage3-mipsel2_softfloat-o32-openrc.spec)
upload stage3-mipsel2_softfloat-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-mipsel2_softfloat-o32-systemd.spec)
upload stage3-mipsel2_softfloat-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel2_softfloat" mips/17.0/mipsel2_o32_softfloat
;;
stage3-mipsel3-o32-openrc.spec)
upload stage3-mipsel3-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-mipsel3-o32-systemd.spec)
upload stage3-mipsel3-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3" mips/17.0/mipsel3_o32
;;
stage3-mips3-n32-openrc.spec)
upload stage3-mips3_n32-openrc-${TIMESTAMP}.tar.xz*
@@ -168,6 +171,7 @@ post_build() {
;;
stage3-mipsel3-n32-systemd.spec)
upload stage3-mipsel3_n32-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n32" mips/17.0/mipsel3_n32
;;
stage3-mips3-n64-openrc.spec)
upload stage3-mips3_n64-openrc-${TIMESTAMP}.tar.xz*
@@ -178,10 +182,10 @@ post_build() {
;;
stage3-mipsel3-n64-openrc.spec)
upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz*
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n64" mips/17.0/mipsel3_n64
;;
stage3-mipsel3-n64-systemd.spec)
upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n64" mips/17.0/mipsel3_n64
;;
stage3-mips3-multilib-openrc.spec)
upload stage3-mips3_multilib-openrc-${TIMESTAMP}.tar.xz*
@@ -242,9 +246,11 @@ post_build() {
case ${spec} in
stage3-mips2-o32-musl.spec)
upload stage3-mips2_musl-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-mips2_musl" mips/17.0/mips2_o32_musl
;;
stage3-mipsel2-o32-musl.spec)
upload stage3-mipsel2_musl-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-mipsel2_musl" mips/17.0/mipsel2_o32_musl
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-18 18:30 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-18 18:30 UTC (permalink / raw
To: gentoo-commits
commit: e60bf6fd7b4cc01b11235d55ba541806ab3aff60
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 18 18:29:43 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Aug 18 18:29:43 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e60bf6fd
Add two more mips binpackage uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index b36d28ae..48c21372 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -136,6 +136,7 @@ post_build() {
;;
stage3-mips2_softfloat-o32-systemd.spec)
upload stage3-mips2_softfloat-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2_softfloat" mips/17.0/mips2_o32_softfloat
;;
stage3-mipsel2-o32-openrc.spec)
upload stage3-mipsel2-openrc-${TIMESTAMP}.tar.xz*
@@ -194,6 +195,7 @@ post_build() {
;;
stage3-mipsel3-multilib-systemd.spec)
upload stage3-mipsel3_multilib-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_multilib" mips/17.0/mipsel3_multilib
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-16 19:30 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-16 19:30 UTC (permalink / raw
To: gentoo-commits
commit: 1f8f309cad79d7cb063a8eea40b252c301515c8f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 16 19:29:42 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Aug 16 19:29:42 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1f8f309c
More uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 7 ++++++-
tools/catalyst-auto-qemu-riscv.conf | 2 ++
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index b5cf1b7c..4fbce5bf 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -137,6 +137,7 @@ post_build() {
;;
x32/stage3-systemd.spec)
upload stage3-x32-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-x32" amd64/17.0/x32
;;
livegui/livegui-stage2.spec)
upload livegui-amd64-${TIMESTAMP}.iso*
@@ -168,7 +169,7 @@ post_build() {
;;
clang/stage3-systemd.spec)
upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
- upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/amd64_llvm
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/x86-64_llvm
;;
esac
popd >/dev/null || exit
@@ -185,6 +186,7 @@ post_build() {
case ${spec} in
hardened/stage3-openrc.spec)
upload stage3-amd64-hardened-openrc-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-amd64" amd64/17.1/x86-64_hardened
;;
hardened/admincd-stage2.spec)
upload admincd-amd64-${TIMESTAMP}.iso*
@@ -205,6 +207,7 @@ post_build() {
case ${spec} in
musl/stage3.spec)
upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-amd64" amd64/17.1/x86-64_musl
;;
esac
popd >/dev/null || exit
@@ -213,6 +216,7 @@ post_build() {
case ${spec} in
musl-clang/stage3.spec)
upload stage3-amd64-musl-llvm-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-clang/stage3-amd64" amd64/17.1/x86-64_musl_llvm
;;
esac
popd >/dev/null || exit
@@ -221,6 +225,7 @@ post_build() {
case ${spec} in
musl-hardened/stage3.spec)
upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-amd64" amd64/17.1/x86-64_musl_hardened
;;
esac
popd >/dev/null || exit
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 6872b152..0f3c3562 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -73,6 +73,8 @@ post_build() {
stage3*musl.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:-:_:g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64d_musl" riscv/20.0/rv64_lp64d_musl
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-rv64_lp64_musl" riscv/20.0/rv64_lp64_musl
popd >/dev/null
;;
*)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-15 21:47 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-15 21:47 UTC (permalink / raw
To: gentoo-commits
commit: 2f3216d9b8db0f1ad6175d56b41bd34c52caf494
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 21:47:32 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 21:47:32 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2f3216d9
More binpkg uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 1 +
tools/catalyst-auto-arm64.conf | 5 +++++
tools/catalyst-auto-qemu-mips-common | 1 +
3 files changed, 7 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index fa78a418..b5cf1b7c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -168,6 +168,7 @@ post_build() {
;;
clang/stage3-systemd.spec)
upload stage3-amd64-llvm-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/clang/stage3-amd64" amd64/17.1/amd64_llvm
;;
esac
popd >/dev/null || exit
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 01594f7d..3f7904ee 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -60,6 +60,7 @@ post_build() {
;;
stage3-systemd.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-arm64" arm64/17.0/arm64
;;
stage3d-systemd.spec)
upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
@@ -85,6 +86,7 @@ post_build() {
;;
llvm/stage3-systemd.spec)
upload stage3-${SUBARCH}-llvm-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/llvm/stage3-arm64" arm64/17.0/arm64_llvm
;;
esac
popd >/dev/null
@@ -101,6 +103,7 @@ post_build() {
case ${spec} in
musl/stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-arm64" arm64/17.0/arm64_musl
;;
esac
popd >/dev/null
@@ -109,6 +112,7 @@ post_build() {
case ${spec} in
musl-hardened/stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-arm64" arm64/17.0/arm64_musl_hardened
;;
esac
popd >/dev/null
@@ -117,6 +121,7 @@ post_build() {
case ${spec} in
musl-llvm/stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-llvm/stage3-arm64" arm64/17.0/arm64_musl_llvm
;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index fea7bff8..b36d28ae 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -160,6 +160,7 @@ post_build() {
;;
stage3-mips3-n32-systemd.spec)
upload stage3-mips3_n32-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n32" mips/17.0/mips3_n32
;;
stage3-mipsel3-n32-openrc.spec)
upload stage3-mipsel3_n32-openrc-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-15 21:33 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-15 21:33 UTC (permalink / raw
To: gentoo-commits
commit: 58341efc5ea9d949bea40e97877aae7eb3437b53
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 15 21:33:33 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 15 21:33:33 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=58341efc
More binpackages and some cleanup
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 3 ++
tools/catalyst-auto-filter-stage4only.conf | 18 --------
tools/catalyst-auto-ia64.conf | 1 +
tools/catalyst-auto-qemu-hppa.conf | 66 ------------------------------
tools/catalyst-auto-qemu-mips-common | 1 +
tools/catalyst-auto-qemu-mips.conf | 5 ---
tools/catalyst-auto-qemu-mipsel.conf | 5 ---
7 files changed, 5 insertions(+), 94 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 478ed5ba..fa78a418 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -113,12 +113,14 @@ post_build() {
;;
stage3-systemd.spec)
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
stage3d-openrc.spec)
upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
;;
stage3d-systemd.spec)
upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
installcd-stage2-minimal.spec)
upload install-amd64-minimal-${TIMESTAMP}.iso*
@@ -128,6 +130,7 @@ post_build() {
;;
nomultilib/stage3-systemd.spec)
upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
+ # do not upsync_binpackages, done by extra builder
;;
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
diff --git a/tools/catalyst-auto-filter-stage4only.conf b/tools/catalyst-auto-filter-stage4only.conf
deleted file mode 100644
index a41e4bda..00000000
--- a/tools/catalyst-auto-filter-stage4only.conf
+++ /dev/null
@@ -1,18 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-# This configuration does not set any builds of it's own, but rather removes
-# everything EXCEPT stage4 builds.
-for s in $SETS ; do
- var=SET_${s}_SPECS
- val=${!var}
- newval=
- for spec in $val ; do
- case $spec in
- *stage4*) newval="${newval} $spec" ;;
- esac
- done
- eval "export $var='${newval}'"
-done
-
-# vim:ft=sh:
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 5f386b4c..b18765e2 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -47,6 +47,7 @@ post_build() {
;;
stage3-systemd.spec)
upload stage3-ia64-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-ia64" ia64/17.0/ia64
;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-qemu-hppa.conf b/tools/catalyst-auto-qemu-hppa.conf
deleted file mode 100644
index 7fdfccba..00000000
--- a/tools/catalyst-auto-qemu-hppa.conf
+++ /dev/null
@@ -1,66 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-UPLOAD_USER=hppa
-UPLOAD_KEY=/root/.ssh/id_ed25519
-SPECS_DIR=${REPO_DIR}/releases/specs-qemu/hppa
-
-SETS="hppa11_openrc hppa11_systemd hppa11_systemd_mu"
-
-SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
-SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
-
-SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec hppa1.1/stage3-systemd.spec"
-
-SET_hppa11_systemd_mu_SPECS="hppa1.1/stage1-systemd-mu.spec hppa1.1/stage3-systemd-mu.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
-
-EMAIL_SUBJECT_PREPEND="[hppa-qemu-auto]"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- local d f t
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
- mkdir -p "${d}"
- pushd "${d}" >/dev/null
- for t in hppa1.1 ; do
- for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
- local of=$(echo "${f}" | convert_filename)
- ln -sf "${f}" "${of}"
- done
- done
- popd >/dev/null
- done
-}
-
-post_build() {
- local set=$1 spec=$2
-
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- netboot-hppa32.spec)
- ls -l netboot-hppa1.1-${TIMESTAMP}/
- mv -v netboot-hppa1.1-${TIMESTAMP}/hppa32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
- upload netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
- ;;
- installcd-stage2-minimal.spec)
- upload install-hppa-minimal-*${TIMESTAMP}*.iso*
- ;;
- hppa1.1/stage3-openrc.spec)
- upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
- ;;
- hppa1.1/stage3-systemd.spec)
- upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
-
- pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
- case ${spec} in
- hppa1.1/stage3-systemd-mu.spec)
- upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null
-}
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 99dee3e3..fea7bff8 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -176,6 +176,7 @@ post_build() {
;;
stage3-mipsel3-n64-openrc.spec)
upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mipsel3_n64" mips/17.0/mipsel3_n64
;;
stage3-mipsel3-n64-systemd.spec)
upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz*
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
deleted file mode 100644
index 5e594770..00000000
--- a/tools/catalyst-auto-qemu-mips.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# only BE
-
-source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
-
-SETS=${SETS_BE}
diff --git a/tools/catalyst-auto-qemu-mipsel.conf b/tools/catalyst-auto-qemu-mipsel.conf
deleted file mode 100644
index 9434e91e..00000000
--- a/tools/catalyst-auto-qemu-mipsel.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# only LE
-
-source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
-
-SETS=${SETS_LE}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-13 18:36 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-13 18:36 UTC (permalink / raw
To: gentoo-commits
commit: 0d9cf2010e12fcbdab85ff17f9647ab7b537235d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 13 18:35:52 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 13 18:35:52 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0d9cf201
Upload hppa binpackages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 531c5b5d..630e19e1 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -66,12 +66,14 @@ post_build() {
;;
hppa1.1/stage3-systemd.spec)
upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa1.1" hppa/17.0/hppa1.1
;;
hppa2.0/stage3-openrc.spec)
upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
;;
hppa2.0/stage3-systemd.spec)
upload stage3-hppa2.0-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-hppa2.0" hppa/17.0/hppa2.0
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-12 18:18 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-12 18:18 UTC (permalink / raw
To: gentoo-commits
commit: a525e5c2fe8b4bad6b59be11f66f66a234aea2dc
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 12 18:18:21 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug 12 18:18:21 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a525e5c2
Add various more binpackage uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 1 +
tools/catalyst-auto-qemu-arm64.conf | 1 +
tools/catalyst-auto-qemu-m68k.conf | 2 ++
tools/catalyst-auto-qemu-mips-common | 1 +
tools/catalyst-auto-qemu-riscv.conf | 2 ++
tools/catalyst-auto-s390.conf | 1 +
6 files changed, 8 insertions(+)
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index 6b148372..fff9f8b9 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -44,6 +44,7 @@ post_build() {
;;
stage3-systemd.spec)
upload stage3-alpha-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-alpha" alpha/17.0/alpha
;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-qemu-arm64.conf b/tools/catalyst-auto-qemu-arm64.conf
index 1c010da2..03bcfd96 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -43,6 +43,7 @@ post_build() {
;;
stage3-systemd.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-aarch64_be" arm64/17.0/aarch64_be
;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 3a10d3c0..39bdd83b 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -48,6 +48,7 @@ post_build() {
stage3-systemd.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-m68k-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-m68k" m68k/17.0/m68k
popd >/dev/null
;;
stage3-systemd-mu.spec)
@@ -58,6 +59,7 @@ post_build() {
stage3-musl.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
upload stage3-m68k_musl-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-m68k_musl" m68k/17.0/m68k_musl
popd >/dev/null
;;
*)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 01ff6198..99dee3e3 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -129,6 +129,7 @@ post_build() {
;;
stage3-mips2-o32-systemd.spec)
upload stage3-mips2-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips2" mips/17.0/mips2_o32
;;
stage3-mips2_softfloat-o32-openrc.spec)
upload stage3-mips2_softfloat-openrc-${TIMESTAMP}.tar.xz*
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 2b0f985b..6872b152 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -61,6 +61,8 @@ post_build() {
stage3*systemd.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g' -e 's:-mu:-mergedusr:g')-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64d" riscv/20.0/rv64_lp64d
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-rv64_lp64" riscv/20.0/rv64_lp64
popd >/dev/null
;;
stage3*systemd-mu.spec)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 2f7ee79e..51a11e1e 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -47,6 +47,7 @@ post_build() {
;;
stage3-systemd.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390" s390/17.0/s390
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-09 23:18 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-09 23:18 UTC (permalink / raw
To: gentoo-commits
commit: 4e0c44a4112977bb7eb101e549aad43ba9e9b58f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 9 23:18:08 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Aug 9 23:18:08 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4e0c44a4
Add various more binpackage uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 4 ++++
tools/catalyst-auto-qemu-mips-common | 1 +
2 files changed, 5 insertions(+)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index b74ebc49..2545406f 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -118,12 +118,14 @@ post_build() {
;;
armv7a/stage3-systemd.spec)
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a" arm/17.0/armv7a
;;
armv7a/stage3-hardfloat-openrc.spec)
upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv7a_hardfp" arm/17.0/armv7a_hardfp
;;
esac
@@ -159,6 +161,7 @@ post_build() {
case ${spec} in
armv7a-musl/stage3-hardfloat.spec)
upload stage3-armv7a_hardfp_musl-openrc-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-armv7a_hardfp_musl" arm/17.0/armv7a_hardfp_musl
;;
armv6j-musl/stage3-hardfloat.spec)
upload stage3-armv6j_hardfp_musl-openrc-${TIMESTAMP}*.xz*
@@ -173,6 +176,7 @@ post_build() {
case ${spec} in
armv7a-musl-hardened/stage3-hardfloat.spec)
upload stage3-armv7a_hardfp_musl-hardened-openrc-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-armv7a_hardfp_musl" arm/17.0/armv7a_hardfp_musl_hardened
;;
armv6j-musl-hardened/stage3-hardfloat.spec)
upload stage3-armv6j_hardfp_musl-hardened-openrc-${TIMESTAMP}*.xz*
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index acb5e252..01ff6198 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -184,6 +184,7 @@ post_build() {
;;
stage3-mips3-multilib-systemd.spec)
upload stage3-mips3_multilib-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_multilib" mips/17.0/mips3_multilib
;;
stage3-mipsel3-multilib-openrc.spec)
upload stage3-mipsel3_multilib-openrc-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-08 17:55 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-08 17:55 UTC (permalink / raw
To: gentoo-commits
commit: 6df029a49d8c8f31c40dc85a249304bc4af3f4b1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 17:54:44 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 17:54:44 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6df029a4
Add various binpackage uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 6 ++++++
tools/catalyst-auto-qemu-loong.conf | 1 +
tools/catalyst-auto-qemu-mips-common | 1 +
tools/catalyst-auto-x86.conf | 2 ++
4 files changed, 10 insertions(+)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 7b9c1a14..b74ebc49 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -90,24 +90,28 @@ post_build() {
;;
armv4tl/stage3-systemd.spec)
upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv4tl" arm/17.0/armv4tl
;;
armv5tel/stage3-openrc.spec)
upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz*
;;
armv5tel/stage3-systemd.spec)
upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv5tel" arm/17.0/armv5tel
;;
armv6j/stage3-openrc.spec)
upload stage3-armv6j-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-systemd.spec)
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j" arm/17.0/armv6j
;;
armv6j/stage3-hardfloat-openrc.spec)
upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd.spec)
upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-armv6j_hardfp" arm/17.0/armv6j_hardfp
;;
armv7a/stage3-openrc.spec)
upload stage3-armv7a-openrc-${TIMESTAMP}*.xz*
@@ -158,6 +162,7 @@ post_build() {
;;
armv6j-musl/stage3-hardfloat.spec)
upload stage3-armv6j_hardfp_musl-openrc-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-armv6j_hardfp_musl" arm/17.0/armv6j_hardfp_musl
;;
esac
@@ -171,6 +176,7 @@ post_build() {
;;
armv6j-musl-hardened/stage3-hardfloat.spec)
upload stage3-armv6j_hardfp_musl-hardened-openrc-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl-hardened/stage3-armv6j_hardfp_musl" arm/17.0/armv6j_hardfp_musl_hardened
;;
esac
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index e486e510..c5cb8df1 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -46,6 +46,7 @@ post_build() {
;;
stage3-systemd.spec)
upload stage3-loong-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-loong" loong/22.0/loong
;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 76c9dbc1..acb5e252 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -171,6 +171,7 @@ post_build() {
;;
stage3-mips3-n64-systemd.spec)
upload stage3-mips3_n64-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-mips3_n64" mips/17.0/mips3_n64
;;
stage3-mipsel3-n64-openrc.spec)
upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz*
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index cd77925f..a34f8219 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -105,6 +105,7 @@ post_build() {
case ${spec} in
hardened/stage3-openrc.spec)
upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/hardened/stage3-i686" x86/17.0/i686_hardened
;;
hardened/admincd-stage2-openrc.spec)
upload admincd-x86-${TIMESTAMP}.iso*
@@ -116,6 +117,7 @@ post_build() {
case ${spec} in
musl/stage3.spec)
upload stage3-i686-musl-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/musl/stage3-i686" x86/17.0/i686_musl
;;
esac
popd >/dev/null || exit
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-08 0:38 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-08 0:38 UTC (permalink / raw
To: gentoo-commits
commit: 412e422251132fb0f8309eabeafe6656b9491e53
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 8 00:38:19 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 8 00:38:19 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=412e4222
Upsync i486 and i686
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 27df211d..cd77925f 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -75,6 +75,7 @@ post_build() {
;;
i486/stage3-systemd.spec)
upload stage3-i486-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i486" x86/17.0/i486
;;
i486/installcd-stage2-minimal-openrc.spec)
upload install-x86-minimal-${TIMESTAMP}.iso*
@@ -84,6 +85,7 @@ post_build() {
;;
i686/stage3-systemd.spec)
upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-i686" x86/17.0/i686
;;
esac
popd >/dev/null || exit
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-06 22:40 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-06 22:40 UTC (permalink / raw
To: gentoo-commits
commit: 204f3594941e9575596804a270659b65f0b846e5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 6 22:40:25 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 6 22:40:25 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=204f3594
Upload binpackages for s390x
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-s390x.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 01a04fb0..28432f1b 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -47,6 +47,7 @@ post_build() {
;;
stage3-systemd.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}.tar.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-s390x" s390/17.0/s390x
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-05 22:42 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-05 22:42 UTC (permalink / raw
To: gentoo-commits
commit: 2f84a3644dfc168e5274d9e09e93365f8371880d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 22:41:54 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 22:41:54 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2f84a364
Fix precise rsync syntax
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index e83938fc..95094af6 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -317,8 +317,9 @@ upsync_binpackages() {
--delete-after
--omit-dir-times
--delay-updates
+ --mkpath
)
- rsync "${RSYNC_OPTS[@]}" "$1" "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2"
+ rsync "${RSYNC_OPTS[@]}" "$1"/* "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2/"
else
echo Would now upsync binpackages from $1 to $2
ls -l $@
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-05 19:15 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-05 19:15 UTC (permalink / raw
To: gentoo-commits
commit: 1a9e8dbf6fc43c36e55b900a93e214e85af37521
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 19:15:16 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 19:15:16 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1a9e8dbf
Make future sparc runs upload binary packages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 57f93305..89d5bc91 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -43,12 +43,14 @@ post_build() {
;;
sparc/systemd-stage3.spec)
upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc" sparc/17.0/32
;;
sparc64/stage3.spec)
upload stage3-sparc64-${TIMESTAMP}*.xz*
;;
sparc64/systemd-stage3.spec)
upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
+ upsync_binpackages "${BUILD_SRCDIR_BASE}/packages/default/stage3-sparc64" sparc/17.0/64
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-08-05 19:06 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-08-05 19:06 UTC (permalink / raw
To: gentoo-commits
commit: 3bc092d56607af8279b05552233e28532a985e64
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 5 19:06:23 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug 5 19:06:23 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3bc092d5
catalyst-auto: add function upsync_binpackages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 2dab0185..e83938fc 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -296,6 +296,35 @@ upload() {
fi
}
+upsync_binpackages() {
+ # parameter 1: a PKGDIR on the local host
+ # parameter 2: the target dir in the mirroring system, should be of the
+ # form arch/profileversion/name (e.g., amd64/17.0/x32 )
+ if [[ ${nonetwork} == 0 ]]; then
+ echo Upsyncing binpackages from $1 to $2
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ -o IPQoS=cs0
+ )
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ --archive
+ --delete
+ --delete-after
+ --omit-dir-times
+ --delay-updates
+ )
+ rsync "${RSYNC_OPTS[@]}" "$1" "${UPLOAD_USER}@releng-incoming.gentoo.org:/release/weekly/binpackages/$2"
+ else
+ echo Would now upsync binpackages from $1 to $2
+ ls -l $@
+ fi
+}
+
run_catalyst_commands() {
doneconfig=0
for config_file in "${config_files[@]}"; do
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-06-24 15:05 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-06-24 15:05 UTC (permalink / raw
To: gentoo-commits
commit: 5e2eacd985d42204823341f4633ae0cd2d30955f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 24 15:04:40 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jun 24 15:04:40 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5e2eacd9
Add mips(el)2 musl builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 9acc6929..ac398b49 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -12,11 +12,13 @@ SETS_O32="
mips2_o32_systemd_mu
mips2_softfloat_o32_openrc
mips2_softfloat_o32_systemd
+ mips2_o32_musl
mipsel2_o32_openrc
mipsel2_o32_systemd
mipsel2_o32_systemd_mu
mipsel2_softfloat_o32_openrc
mipsel2_softfloat_o32_systemd
+ mipsel2_o32_musl
mipsel3_o32_openrc
mipsel3_o32_systemd
mipsel3_o32_systemd_mu
@@ -57,6 +59,8 @@ SET_mips2_o32_systemd_mu_SPECS="stage1-mips2-o32-systemd-mu.spec stage3-mips2-o3
SET_mips2_softfloat_o32_openrc_SPECS="stage1-mips2_softfloat-o32-openrc.spec stage3-mips2_softfloat-o32-openrc.spec"
SET_mips2_softfloat_o32_systemd_SPECS="stage1-mips2_softfloat-o32-systemd.spec stage3-mips2_softfloat-o32-systemd.spec"
+SET_mips2_o32_musl_SPECS="stage1-mips2-o32-musl.spec stage3-mips2-o32-musl.spec"
+
SET_mipsel2_o32_openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
SET_mipsel2_o32_systemd_SPECS="stage1-mipsel2-o32-systemd.spec stage3-mipsel2-o32-systemd.spec"
SET_mipsel2_o32_systemd_mu_SPECS="stage1-mipsel2-o32-systemd-mu.spec stage3-mipsel2-o32-systemd-mu.spec"
@@ -64,6 +68,8 @@ SET_mipsel2_o32_systemd_mu_SPECS="stage1-mipsel2-o32-systemd-mu.spec stage3-mips
SET_mipsel2_softfloat_o32_openrc_SPECS="stage1-mipsel2_softfloat-o32-openrc.spec stage3-mipsel2_softfloat-o32-openrc.spec"
SET_mipsel2_softfloat_o32_systemd_SPECS="stage1-mipsel2_softfloat-o32-systemd.spec stage3-mipsel2_softfloat-o32-systemd.spec"
+SET_mipsel2_o32_musl_SPECS="stage1-mipsel2-o32-musl.spec stage3-mipsel2-o32-musl.spec"
+
SET_mipsel3_o32_openrc_SPECS="stage1-mipsel3-o32-openrc.spec stage3-mipsel3-o32-openrc.spec"
SET_mipsel3_o32_systemd_SPECS="stage1-mipsel3-o32-systemd.spec stage3-mipsel3-o32-systemd.spec"
SET_mipsel3_o32_systemd_mu_SPECS="stage1-mipsel3-o32-systemd-mu.spec stage3-mipsel3-o32-systemd-mu.spec"
@@ -214,4 +220,15 @@ post_build() {
;;
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
+ case ${spec} in
+ stage3-mips2-o32-musl.spec)
+ upload stage3-mips2-musl-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3-mipsel2-o32-musl.spec)
+ upload stage3-mipsel2-musl-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-03-27 19:52 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-03-27 19:52 UTC (permalink / raw
To: gentoo-commits
commit: 269b9858012185745e67227d4642fca250c5153b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 27 19:51:43 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Mar 27 19:51:43 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=269b9858
Specify TMP_PATH for the slow builds on hppa
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index b294d0ea..531c5b5d 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -25,6 +25,8 @@ KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
+TMP_PATH=/var/tmp/catalyst/tmp
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-03-12 22:23 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-03-12 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 7294bf557cc175f9c0b05650cbfc363f00658723
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 22:23:23 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 22:23:23 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7294bf55
Fix specs dir
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-hppa.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-hppa.conf b/tools/catalyst-auto-qemu-hppa.conf
index 9870665c..7fdfccba 100644
--- a/tools/catalyst-auto-qemu-hppa.conf
+++ b/tools/catalyst-auto-qemu-hppa.conf
@@ -3,7 +3,7 @@
UPLOAD_USER=hppa
UPLOAD_KEY=/root/.ssh/id_ed25519
-SPECS_DIR=${REPO_DIR}/releases/specs/hppa
+SPECS_DIR=${REPO_DIR}/releases/specs-qemu/hppa
SETS="hppa11_openrc hppa11_systemd hppa11_systemd_mu"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-03-12 22:10 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-03-12 22:10 UTC (permalink / raw
To: gentoo-commits
commit: dd43685e2d0434ad1d8208d7053403d1fee6a064
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 12 22:09:07 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 12 22:10:34 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=dd43685e
Add catalyst-auto hppa qemu config
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-hppa.conf | 66 ++++++++++++++++++++++++++++++++++++++
1 file changed, 66 insertions(+)
diff --git a/tools/catalyst-auto-qemu-hppa.conf b/tools/catalyst-auto-qemu-hppa.conf
new file mode 100644
index 00000000..9870665c
--- /dev/null
+++ b/tools/catalyst-auto-qemu-hppa.conf
@@ -0,0 +1,66 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+UPLOAD_USER=hppa
+UPLOAD_KEY=/root/.ssh/id_ed25519
+SPECS_DIR=${REPO_DIR}/releases/specs/hppa
+
+SETS="hppa11_openrc hppa11_systemd hppa11_systemd_mu"
+
+SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
+SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
+
+SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec hppa1.1/stage3-systemd.spec"
+
+SET_hppa11_systemd_mu_SPECS="hppa1.1/stage1-systemd-mu.spec hppa1.1/stage3-systemd-mu.spec"
+
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
+
+EMAIL_SUBJECT_PREPEND="[hppa-qemu-auto]"
+
+update_symlinks() {
+ # Symlink the latest stages3 to build from
+ local d f t
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
+ mkdir -p "${d}"
+ pushd "${d}" >/dev/null
+ for t in hppa1.1 ; do
+ for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ done
+ popd >/dev/null
+ done
+}
+
+post_build() {
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ case ${spec} in
+ netboot-hppa32.spec)
+ ls -l netboot-hppa1.1-${TIMESTAMP}/
+ mv -v netboot-hppa1.1-${TIMESTAMP}/hppa32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
+ upload netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
+ ;;
+ installcd-stage2-minimal.spec)
+ upload install-hppa-minimal-*${TIMESTAMP}*.iso*
+ ;;
+ hppa1.1/stage3-openrc.spec)
+ upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ hppa1.1/stage3-systemd.spec)
+ upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
+ case ${spec} in
+ hppa1.1/stage3-systemd-mu.spec)
+ upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null
+}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-03-05 22:43 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-03-05 22:43 UTC (permalink / raw
To: gentoo-commits
commit: fe7ecde00f87122a0f05ba4ff88d24f66768f3b1
Author: Nic Boet <nic <AT> boet <DOT> cc>
AuthorDate: Sun Mar 5 22:38:17 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 22:38:17 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fe7ecde0
Do not source catalyst.conf as it's not bash syntax
* non-bash formatted lines are executed; results in several "command not found" errors
* instead, parse the file for the specific var
[this still leaves the doublequotes " around the value- dilfridge]
Signed-off-by: Nic Boet <nic <AT> boet.cc>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 7c298699..e84d3594 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -119,8 +119,8 @@ post_build() {
catalyst_var() {
# Extract a setting from the catalyst.conf.
- local var=$1
- (. "${CATALYST_CONFIG}"; echo "${!var}")
+ local var=$(grep --color=never -Po "^${1}\s*=\s*\K.*" "${CATALYST_CONFIG}" || true)
+ [[ -z ${var} ]] || echo "${var}"
}
trigger_post_build() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-03-05 22:43 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-03-05 22:43 UTC (permalink / raw
To: gentoo-commits
commit: e0097a27a91fcc6e6fa09f7c7b1a6a425ab44c06
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 5 22:42:46 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Mar 5 22:42:46 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e0097a27
Drop quotes around variable strings
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index e84d3594..2dab0185 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -120,7 +120,8 @@ post_build() {
catalyst_var() {
# Extract a setting from the catalyst.conf.
local var=$(grep --color=never -Po "^${1}\s*=\s*\K.*" "${CATALYST_CONFIG}" || true)
- [[ -z ${var} ]] || echo "${var}"
+ local vas=$(echo $var|sed -e 's:^"::g' -e 's:"$::g')
+ [[ -z ${vas} ]] || echo "${vas}"
}
trigger_post_build() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-03-02 18:32 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-03-02 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 249185d4274624bc9b8cce1acc0819cf95192180
Author: Nic Boet <nic <AT> boet <DOT> cc>
AuthorDate: Thu Mar 2 18:28:48 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Mar 2 18:28:48 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=249185d4
snapshot_cache was removed from catalyst Apr 2020
* catalyst commit 6493f3bc534f97468c514a12035b10e3107c4ecf
* --preclean would now fail as catalyst.conf is invalid
Signed-off-by: Nic Boet <nic <AT> boet.cc>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index c6b303f5..7c298699 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -329,14 +329,9 @@ run_catalyst_commands() {
if [[ ${preclean} == 1 ]]; then
rm -rf "${TMP_PATH:-/tmp}/catalyst-auto".*
- snapshot_cache=$(catalyst_var snapshot_cache)
- if [[ -z ${snapshot_cache} ]]; then
- echo "error: snapshot_cache not set in config file"
- exit 1
- fi
pushd "${BUILD_SRCDIR_BASE}" >/dev/null || exit 1
rm -rf --one-file-system \
- kerncache packages snapshots tmp "${snapshot_cache}"/*
+ kerncache packages snapshots tmp
popd >/dev/null
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-02-26 23:28 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-02-26 23:28 UTC (permalink / raw
To: gentoo-commits
commit: bdebb3c30ecfbce561a572ad6a8dfce281c322e1
Author: Nic Boet <nic <AT> boet <DOT> cc>
AuthorDate: Sun Feb 26 23:27:02 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 23:27:02 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bdebb3c3
Improve send_mail() because it acts more like the logger
* output failure events to stdout if verbose set, useful for those without a mailer
* do not email if recipient var is undef; allows flexibility for non-releng use cases
Signed-off-by: Nic Boet <nic <AT> boet.cc>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 1780daf4..c6b303f5 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -53,8 +53,14 @@ EOH
}
send_email() {
+ if [[ ${verbose} -ge 1 ]]; then
+ echo "$1 $2 build log at $3"
+ fi
+
[[ ${nonetwork} == 0 ]] || return
+ [[ ! -z ${EMAIL_TO} ]] || return
+
local subject="${EMAIL_SUBJECT_PREPEND} $1"
local message=$2
local logfile=$3
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-02-26 23:19 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-02-26 23:19 UTC (permalink / raw
To: gentoo-commits
commit: f2e3c07e81314d2b3a5d26638e08649f74350592
Author: Nic Boet <nic <AT> boet <DOT> cc>
AuthorDate: Sun Feb 26 23:18:04 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 26 23:18:54 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f2e3c07e
Make it more apparent that bash time is not used
Signed-off-by: Nic Boet <nic <AT> boet.cc>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 3dfd1233..1780daf4 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -421,8 +421,13 @@ run_catalyst_commands() {
build_failure=0
- timeprefix=()
- which time >/dev/null && timeprefix=( "time" )
+ # bash built-in time function is not used
+ if ! which time >/dev/null ; then
+ timeprefix=()
+ echo "sys-process/time is optional for build resource utilization"
+ else
+ timeprefix=( "time" )
+ fi
JOB_PIDS=()
JOB_RETS=()
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-01-27 13:38 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-01-27 13:38 UTC (permalink / raw
To: gentoo-commits
commit: f34ca4ea06f249be19ea626c0e997e7b5060ac6e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 27 13:38:37 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jan 27 13:38:37 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f34ca4ea
mips: parallelize better
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-1.conf | 4 ++++
tools/catalyst-auto-qemu-mips-2.conf | 4 ++++
tools/catalyst-auto-qemu-mips-3.conf | 4 ++++
tools/catalyst-auto-qemu-mips-4.conf | 4 ++++
tools/catalyst-auto-qemu-mips-common | 39 ++++++++++++++++++++++++++++++++++++
5 files changed, 55 insertions(+)
diff --git a/tools/catalyst-auto-qemu-mips-1.conf b/tools/catalyst-auto-qemu-mips-1.conf
new file mode 100644
index 00000000..bf7dee78
--- /dev/null
+++ b/tools/catalyst-auto-qemu-mips-1.conf
@@ -0,0 +1,4 @@
+
+source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
+
+SETS=${SETS_O32}
diff --git a/tools/catalyst-auto-qemu-mips-2.conf b/tools/catalyst-auto-qemu-mips-2.conf
new file mode 100644
index 00000000..c40c6bc9
--- /dev/null
+++ b/tools/catalyst-auto-qemu-mips-2.conf
@@ -0,0 +1,4 @@
+
+source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
+
+SETS=${SETS_N32}
diff --git a/tools/catalyst-auto-qemu-mips-3.conf b/tools/catalyst-auto-qemu-mips-3.conf
new file mode 100644
index 00000000..1321408b
--- /dev/null
+++ b/tools/catalyst-auto-qemu-mips-3.conf
@@ -0,0 +1,4 @@
+
+source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
+
+SETS=${SETS_N64}
diff --git a/tools/catalyst-auto-qemu-mips-4.conf b/tools/catalyst-auto-qemu-mips-4.conf
new file mode 100644
index 00000000..690ca4f9
--- /dev/null
+++ b/tools/catalyst-auto-qemu-mips-4.conf
@@ -0,0 +1,4 @@
+
+source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
+
+SETS=${SETS_MULTI}
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 1c2e0592..51c0770e 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -39,6 +39,45 @@ SETS_LE="
mipsel3_multilib_systemd_mu
"
+SETS_O32="
+ mips2_o32_openrc
+ mips2_o32_systemd
+ mips2_o32_systemd_mu
+ mipsel2_o32_openrc
+ mipsel2_o32_systemd
+ mipsel2_o32_systemd_mu
+ mipsel3_o32_openrc
+ mipsel3_o32_systemd
+ mipsel3_o32_systemd_mu
+"
+
+SETS_N32="
+ mips3_n32_openrc
+ mips3_n32_systemd
+ mips3_n32_systemd_mu
+ mipsel3_n32_openrc
+ mipsel3_n32_systemd
+ mipsel3_n32_systemd_mu
+"
+
+SETS_N64="
+ mips3_n64_openrc
+ mips3_n64_systemd
+ mips3_n64_systemd_mu
+ mipsel3_n64_openrc
+ mipsel3_n64_systemd
+ mipsel3_n64_systemd_mu
+"
+
+SETS_MULTI="
+ mips3_multilib_openrc
+ mips3_multilib_systemd
+ mips3_multilib_systemd_mu
+ mipsel3_multilib_openrc
+ mipsel3_multilib_systemd
+ mipsel3_multilib_systemd_mu
+"
+
# SETS="${SETS_BE} ${SETS_LE}"
SET_mips2_o32_openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-01-25 15:07 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-01-25 15:07 UTC (permalink / raw
To: gentoo-commits
commit: b0cb15f47f4b1ca2d061b4d54efa81f5eddfe5b5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 25 15:06:38 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jan 25 15:07:00 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b0cb15f4
Add missing mips upload command
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index be2bd0b8..1c2e0592 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -176,6 +176,9 @@ post_build() {
stage3-mipsel3-o32-systemd-mu.spec)
upload stage3-mipsel3-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
+ stage3-mipsel3-n32-systemd-mu.spec)
+ upload stage3-mipsel3_n32-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mipsel3-n64-systemd-mu.spec)
upload stage3-mipsel3_n64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-01-24 23:14 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-01-24 23:14 UTC (permalink / raw
To: gentoo-commits
commit: 2a78aa57d6640cc57d7736b732e5f654244f9d52
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 24 23:14:17 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan 24 23:14:33 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2a78aa57
Re-enable merged-usr riscv builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 315f1720..2b0f985b 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -11,12 +11,14 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
SETS="
- lp64d_musl
+ lp64d_systemd_mu
lp64d_openrc
lp64d_systemd
- lp64_musl
+ lp64d_musl
+ lp64_systemd_mu
lp64_openrc
lp64_systemd
+ lp64_musl
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-01-19 15:58 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-01-19 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 23951b8984fb142759bc83f2aa7fba2142cc1e6b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 19 15:57:58 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jan 19 15:57:58 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=23951b89
Use rsa key on demeter
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-arm64.conf b/tools/catalyst-auto-qemu-arm64.conf
index 238ef77d..1c010da2 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=arm64
-UPLOAD_KEY=/root/.ssh/id_ed25519
+UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm64/be
SUBARCH=aarch64_be
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2023-01-18 13:02 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2023-01-18 13:02 UTC (permalink / raw
To: gentoo-commits
commit: 15e1dc47bd83f85f0c76faf6da817ce95ccb7dc2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 18 13:02:19 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jan 18 13:02:19 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=15e1dc47
Drop nonexisting specs
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm64.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-arm64.conf b/tools/catalyst-auto-qemu-arm64.conf
index 085fc86e..238ef77d 100644
--- a/tools/catalyst-auto-qemu-arm64.conf
+++ b/tools/catalyst-auto-qemu-arm64.conf
@@ -10,9 +10,9 @@ SETS="openrc systemd systemd_mu"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec stage3d-systemd.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
-SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec stage3d-systemd-mu.spec"
+SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-12-12 9:05 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-12-12 9:05 UTC (permalink / raw
To: gentoo-commits
commit: 88f8a5df8cf6c2a50cef52ac717e55e46204a4ae
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 12 09:05:09 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 12 09:05:09 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=88f8a5df
Fix typo
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 6f7b0c79..be2bd0b8 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -59,7 +59,7 @@ SET_mips3_n32_systemd_mu_SPECS="stage1-mips3-n32-systemd-mu.spec stage3-mips3-n3
SET_mipsel3_n32_openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
SET_mipsel3_n32_systemd_SPECS="stage1-mipsel3-n32-systemd.spec stage3-mipsel3-n32-systemd.spec"
-SET_mipsel3_n32_mu_systemd_SPECS="stage1-mipsel3-n32-systemd-mu.spec stage3-mipsel3-n32-systemd-mu.spec"
+SET_mipsel3_n32_systemd_mu_SPECS="stage1-mipsel3-n32-systemd-mu.spec stage3-mipsel3-n32-systemd-mu.spec"
SET_mips3_multilib_openrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
SET_mips3_multilib_systemd_SPECS="stage1-mips3-multilib-systemd.spec stage3-mips3-multilib-systemd.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-12-11 14:48 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-12-11 14:48 UTC (permalink / raw
To: gentoo-commits
commit: f949c90a747fbb9cf393d1296555d700dfbcc05c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 11 14:48:04 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 11 14:48:04 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f949c90a
hppa autobuilds: there are no bz2 stages anymore
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index a03a5f7d..b294d0ea 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -32,7 +32,7 @@ update_symlinks() {
mkdir -p "${d}"
pushd "${d}" >/dev/null
for t in hppa1.1 hppa2.0; do
- for f in $(ls stage3-${t}-*bz2 stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
+ for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-12-10 11:33 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-12-10 11:33 UTC (permalink / raw
To: gentoo-commits
commit: 5c1cf78a25553b25440182b3f3268ac33d9efdd5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 10 11:32:48 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Dec 10 11:32:48 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5c1cf78a
Fix syntax error
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 98758859..27df211d 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -93,7 +93,6 @@ post_build() {
i486/stage3-systemd-mu.spec)
upload stage3-i486-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
- esac
i686/stage3-systemd-mu.spec)
upload stage3-i686-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-12-09 0:26 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-12-09 0:26 UTC (permalink / raw
To: gentoo-commits
commit: 93e2f9a023ac64363dfc602884fab0daeb104c2b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 9 00:25:40 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 9 00:25:40 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=93e2f9a0
riscv: temporarily disable failing multilib builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index a4bc71ff..315f1720 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -17,8 +17,6 @@ SETS="
lp64_musl
lp64_openrc
lp64_systemd
- multilib_openrc
- multilib_systemd
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-12-08 16:28 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-12-08 16:28 UTC (permalink / raw
To: gentoo-commits
commit: de23c091f235fa65ce8a92db7eb3aed4ac7ff9bc
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 8 16:27:58 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Dec 8 16:27:58 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=de23c091
hppa: fix upload filenames
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index cfe2e9e8..a03a5f7d 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -60,16 +60,16 @@ post_build() {
upload install-hppa-minimal-*${TIMESTAMP}*.iso*
;;
hppa1.1/stage3-openrc.spec)
- upload stage3-hppa1.1-openrc-${TIMESTAMP}.xz*
+ upload stage3-hppa1.1-openrc-${TIMESTAMP}.tar.xz*
;;
hppa1.1/stage3-systemd.spec)
- upload stage3-hppa1.1-systemd-${TIMESTAMP}.xz*
+ upload stage3-hppa1.1-systemd-${TIMESTAMP}.tar.xz*
;;
hppa2.0/stage3-openrc.spec)
- upload stage3-hppa2.0-openrc-${TIMESTAMP}.xz*
+ upload stage3-hppa2.0-openrc-${TIMESTAMP}.tar.xz*
;;
hppa2.0/stage3-systemd.spec)
- upload stage3-hppa2.0-systemd-${TIMESTAMP}.xz*
+ upload stage3-hppa2.0-systemd-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null
@@ -77,10 +77,10 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
hppa1.1/stage3-systemd-mu.spec)
- upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.xz*
+ upload stage3-hppa1.1-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
hppa2.0/stage3-systemd-mu.spec)
- upload stage3-hppa2.0-systemd-mergedusr-${TIMESTAMP}.xz*
+ upload stage3-hppa2.0-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-30 23:58 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-30 23:58 UTC (permalink / raw
To: gentoo-commits
commit: 1af830bd6cf9d77f388671157226bb78def7a062
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 30 23:57:55 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 30 23:57:55 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1af830bd
Disable riscv merged-usr builds, since this is still very broken
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 04a1a89e..a4bc71ff 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -14,14 +14,11 @@ SETS="
lp64d_musl
lp64d_openrc
lp64d_systemd
- lp64d_systemd_mu
lp64_musl
lp64_openrc
lp64_systemd
- lp64_systemd_mu
multilib_openrc
multilib_systemd
- multilib_systemd_mu
"
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-29 20:33 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-29 20:33 UTC (permalink / raw
To: gentoo-commits
commit: c59bff47837f3343d0b3e7d00be9bc550fc345a6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 20:33:30 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 20:33:30 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c59bff47
Add debug output to s390(x) netboot upload
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-s390.conf | 7 ++++---
tools/catalyst-auto-s390x.conf | 7 ++++---
2 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 2b9a505b..2f7ee79e 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -37,9 +37,10 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
netboot/netboot.spec)
- mv netboot2-s390-${TIMESTAMP}/kernels/netboot netboot2-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
- mv netboot2-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot2-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
- upload netboot2-s390-${TIMESTAMP}/netboot*
+ ls -l netboot-s390-${TIMESTAMP}/kernels/
+ mv -v netboot-s390-${TIMESTAMP}/kernels/netboot netboot-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
+ mv -v netboot-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
+ upload netboot-s390-${TIMESTAMP}/netboot*
;;
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 0c3b6f10..01a04fb0 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -37,9 +37,10 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
netboot/netboot.spec)
- mv netboot2-s390x-${TIMESTAMP}/kernels/netboot64 netboot2-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
- mv netboot2-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot2-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
- upload netboot2-s390x-${TIMESTAMP}/netboot*
+ ls -l netboot-s390x-${TIMESTAMP}/
+ mv -v netboot-s390x-${TIMESTAMP}/kernels/netboot64 netboot-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
+ mv -v netboot-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
+ upload netboot-s390x-${TIMESTAMP}/netboot*
;;
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-29 19:55 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-29 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 1b9b7d82f62df176fa60734e136ea355af441072
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 19:50:05 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 19:50:05 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1b9b7d82
loong: Fix upload filenames
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-loong.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index 0c2be771..e486e510 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -42,10 +42,10 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
stage3-openrc.spec)
- upload stage3-loong-openrc-${TIMESTAMP}.xz*
+ upload stage3-loong-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-systemd.spec)
- upload stage3-loong-systemd-${TIMESTAMP}.xz*
+ upload stage3-loong-systemd-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null
@@ -53,7 +53,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
stage3-systemd-mu.spec)
- upload stage3-loong-systemd-mergedusr-${TIMESTAMP}.xz*
+ upload stage3-loong-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-29 9:24 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-29 9:24 UTC (permalink / raw
To: gentoo-commits
commit: 1eec8595f31faa0c6a122fc6938fa33e6419f718
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 29 09:24:08 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 29 09:24:08 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1eec8595
Add some debug output for hppa netboot
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 2ad44760..cfe2e9e8 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -47,11 +47,13 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
netboot-hppa32.spec)
- mv netboot-hppa1.1-${TIMESTAMP}/hppa32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
+ ls -l netboot-hppa1.1-${TIMESTAMP}/
+ mv -v netboot-hppa1.1-${TIMESTAMP}/hppa32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
upload netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
;;
netboot-hppa64.spec)
- mv netboot-hppa2.0-${TIMESTAMP}/hppa64-hppa.lif netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
+ ls -l netboot-hppa2.0-${TIMESTAMP}/
+ mv -v netboot-hppa2.0-${TIMESTAMP}/hppa64-hppa.lif netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
upload netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
;;
installcd-stage2-minimal.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-28 23:27 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-28 23:27 UTC (permalink / raw
To: gentoo-commits
commit: d89998191e3d3b8dfb2ef928eac728e3ccf67c7f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 23:27:21 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 23:27:21 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d8999819
ia64: fix file path
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ia64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index a24190e4..5f386b4c 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -51,7 +51,7 @@ post_build() {
esac
popd >/dev/null
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
case ${spec} in
stage3-systemd-mu.spec)
upload stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-28 13:31 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-28 13:31 UTC (permalink / raw
To: gentoo-commits
commit: 331a4e5ccf1f372738759b9bd62ef2b99d831e03
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 28 13:31:23 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Nov 28 13:31:23 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=331a4e5c
ia64: fix filenames
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-ia64.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 8a54b0f1..a24190e4 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -43,10 +43,10 @@ post_build() {
upload *${TIMESTAMP}*.iso*
;;
stage3-openrc.spec)
- upload stage3-ia64-openrc-${TIMESTAMP}.xz*
+ upload stage3-ia64-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-systemd.spec)
- upload stage3-ia64-systemd-${TIMESTAMP}.xz*
+ upload stage3-ia64-systemd-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null
@@ -54,7 +54,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
stage3-systemd-mu.spec)
- upload stage3-ia64-systemd-mergedusr-${TIMESTAMP}.xz*
+ upload stage3-ia64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-27 0:27 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-27 0:27 UTC (permalink / raw
To: gentoo-commits
commit: 5fb1d14a9cbb7005b670bafc0e8534c2baab7cb9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 27 00:26:46 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 27 00:26:46 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5fb1d14a
Fix hppa netboot filenames?
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 02c4a488..2ad44760 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -47,11 +47,11 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
netboot-hppa32.spec)
- mv netboot-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
+ mv netboot-hppa1.1-${TIMESTAMP}/hppa32-hppa.lif netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
upload netboot-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
;;
netboot-hppa64.spec)
- mv netboot-hppa2.0-${TIMESTAMP}/netboot64-hppa.lif netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
+ mv netboot-hppa2.0-${TIMESTAMP}/hppa64-hppa.lif netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
upload netboot-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
;;
installcd-stage2-minimal.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-22 23:37 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-22 23:37 UTC (permalink / raw
To: gentoo-commits
commit: 41ab93c12ff1351ed5f92dbedc4fa7eaa5a069fe
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 23:36:53 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 23:36:53 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=41ab93c1
For amd64 autobuilds, add more dirs with latest links
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 9fb3583a..5fc56439 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -78,7 +78,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/{default,clang,hardened,musl,musl-clang,musl-hardened} ; do
+ for d in ${BUILD_SRCDIR_BASE}/builds/{default,clang,hardened,llvm-mergedusr,mergedusr,musl,musl-clang,musl-hardened} ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null || exit
shopt -s extglob
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-22 2:07 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2022-11-22 2:07 UTC (permalink / raw
To: gentoo-commits
commit: 19b9890db5a9cd2f653b1a01ab77472b05f9074c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 22 02:05:55 2022 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Nov 22 02:05:55 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=19b9890d
tools: mkdir build directories
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 1 +
tools/catalyst-auto-arm.conf | 1 +
tools/catalyst-auto-arm64.conf | 1 +
tools/catalyst-auto-hppa.conf | 1 +
tools/catalyst-auto-ia64.conf | 1 +
tools/catalyst-auto-ppc.conf | 1 +
tools/catalyst-auto-ppc64le.conf | 1 +
tools/catalyst-auto-qemu-alpha.conf | 1 +
tools/catalyst-auto-qemu-loong.conf | 1 +
tools/catalyst-auto-qemu-m68k.conf | 1 +
tools/catalyst-auto-qemu-mips-common | 1 +
tools/catalyst-auto-qemu-riscv.conf | 1 +
tools/catalyst-auto-s390.conf | 1 +
tools/catalyst-auto-s390x.conf | 1 +
tools/catalyst-auto-sparc64.conf | 1 +
tools/catalyst-auto-x86.conf | 1 +
16 files changed, 16 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 27578c1f..de6a291d 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -76,6 +76,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,clang,hardened,musl,musl-clang,musl-hardened} ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 20408e93..64791df8 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -69,6 +69,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 558fd6ae..9b509fd1 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -32,6 +32,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/llvm" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" "${BUILD_SRCDIR_BASE}/builds/musl-llvm"; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 0b00fc9c..48fb5323 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -29,6 +29,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for t in hppa1.1 hppa2.0; do
for f in $(ls stage3-${t}-*bz2 stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index ba74d35c..bfefa37d 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -14,6 +14,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 46814162..d68333a6 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -26,6 +26,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-ppc-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 56e26f92..bd380359 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -26,6 +26,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
for d in "${BUILD_SRCDIR_BASE}"/builds/{default,power9le,power9le-mergedusr,musl-hardened,power9le-musl-hardened} ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for t in ppc64le power9le; do
for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index e2eca036..7c12a687 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -21,6 +21,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index 69004e40..39d7e149 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -26,6 +26,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 7c4d4268..96158c71 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -24,6 +24,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index e36acad6..8ec6a8ab 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -55,6 +55,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 8b4edfdb..9c492491 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -42,6 +42,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 21336ad8..96417029 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -21,6 +21,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 62042a7b..b7ba5663 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -21,6 +21,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 668fc265..99b8e0af 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -16,6 +16,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3-sparc-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 4a740f57..de8f1161 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -37,6 +37,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl} ; do
+ mkdir -p "${d}"
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-21 23:52 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-21 23:52 UTC (permalink / raw
To: gentoo-commits
commit: 3a97b22d570388e163809b7a4718f3daec54b291
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 21 23:52:25 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Nov 21 23:52:42 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a97b22d
Add missing upload instructions
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips-common | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/catalyst-auto-qemu-mips-common b/tools/catalyst-auto-qemu-mips-common
index 576be618..e36acad6 100644
--- a/tools/catalyst-auto-qemu-mips-common
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -73,9 +73,15 @@ post_build() {
stage3-mips2-o32-openrc.spec)
upload stage3-mips2-openrc-${TIMESTAMP}.tar.xz*
;;
+ stage3-mips2-o32-systemd.spec)
+ upload stage3-mips2-systemd-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mipsel2-o32-openrc.spec)
upload stage3-mipsel2-openrc-${TIMESTAMP}.tar.xz*
;;
+ stage3-mipsel2-o32-systemd.spec)
+ upload stage3-mipsel2-systemd-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mips32-o32-openrc.spec)
upload stage3-mips32-openrc-${TIMESTAMP}.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-15 23:28 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-11-15 23:28 UTC (permalink / raw
To: gentoo-commits
commit: a7b4c40320639e17757c8e60ad2c53fab6ddd045
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 15 23:28:06 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Nov 15 23:28:06 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a7b4c403
Remove old/unused file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 54 ------------------------------------------
1 file changed, 54 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
deleted file mode 100644
index 6f52056d..00000000
--- a/tools/catalyst-auto-alpha.conf
+++ /dev/null
@@ -1,54 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-UPLOAD_USER=alpha
-UPLOAD_KEY=/root/.ssh/id_rsa
-SPECS_DIR=${REPO_DIR}/releases/specs/alpha
-
-SPECS="stage1.spec stage3.spec"
-#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
-#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
-#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
-
-#OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-
-SETS="default"
-
-SET_default_SPECS="stage1.spec stage3.spec"
-SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
- pushd "${d}" >/dev/null
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates) ; do
- local of=$(echo "${f}" | convert_filename)
- ln -sf "${f}" "${of}"
- done
- popd >/dev/null
- done
-}
-
-post_build() {
- local set=$1 spec=$2
-
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-
- case ${spec} in
- installcd-stage2-minimal.spec)
- upload *-${TIMESTAMP}*.iso*
- ;;
- stage3.spec)
- upload stage3-*${TIMESTAMP}*.bz2*
- ;;
- *)
- echo "Finished ${spec}"
- ;;
- esac
-
- popd >/dev/null
-}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-11-04 20:51 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2022-11-04 20:51 UTC (permalink / raw
To: gentoo-commits
commit: 081e858ee797ba91eee7bbbcfd2df86c7a0d47cf
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 4 20:50:59 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Fri Nov 4 20:51:18 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=081e858e
tools/catalyst-auto-ppc64le.conf: fix copy-paste err
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 7179a9c8..f0876431 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -11,7 +11,7 @@ OPTIONAL_SPECS+=" stage1-systemd.spec stage3-systemd.spec"
OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec"
OPTIONAL_SPECS+=" stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
OPTIONAL_SPECS+=" stage1-systemd-mergedusr-power9le.spec stage3-systemd-mergedusr-power9le.spec"
-OPTIONAL_SPECS+=" stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
+OPTIONAL_SPECS+=" stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
OPTIONAL_SPECS+=" stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-10-31 23:29 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2022-10-31 23:29 UTC (permalink / raw
To: gentoo-commits
commit: e7e7883dcb42371cc67b3c0879c28328bc581f3d
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 31 23:25:48 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Oct 31 23:29:01 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e7e7883d
tools/catalyst-auto-ppc64le.conf: build/upload power9le musl
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index a8fcc7d2..7179a9c8 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -11,7 +11,8 @@ OPTIONAL_SPECS+=" stage1-systemd.spec stage3-systemd.spec"
OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec"
OPTIONAL_SPECS+=" stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
OPTIONAL_SPECS+=" stage1-systemd-mergedusr-power9le.spec stage3-systemd-mergedusr-power9le.spec"
-OPTIONAL_SPECS+=" stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
+OPTIONAL_SPECS+=" stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
+OPTIONAL_SPECS+=" stage1-musl-hardened-openrc-power9le.spec stage3-musl-hardened-openrc-power9le.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
@@ -23,7 +24,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}"/builds/{default,power9le,power9le-mergedusr,musl-hardened} ; do
+ for d in "${BUILD_SRCDIR_BASE}"/builds/{default,power9le,power9le-mergedusr,musl-hardened,power9le-musl-hardened} ; do
pushd "${d}" >/dev/null
for t in ppc64le power9le; do
for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -62,6 +63,9 @@ post_build() {
stage3-musl-hardened-openrc.spec)
upload musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
;;
+ stage3-musl-hardened-openrc-power9le.spec)
+ upload power9le-musl-hardened/stage3-power9le-musl-hardened-openrc-${TIMESTAMP}*.xz*
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-10-12 18:56 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-10-12 18:56 UTC (permalink / raw
To: gentoo-commits
commit: 584fc8d441829cc1271292a3c7cb37e00f33ba85
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 18:56:03 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 18:56:03 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=584fc8d4
Enable loong upload
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-loong.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
index a5787555..5f140c17 100644
--- a/tools/catalyst-auto-qemu-loong.conf
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -37,7 +37,7 @@ post_build() {
case ${spec} in
stage3*.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- echo "Would upload stage3-loong-$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*"
+ upload stage3-loong-$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
popd >/dev/null
;;
*)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-10-11 14:55 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-10-11 14:55 UTC (permalink / raw
To: gentoo-commits
commit: 4c318a7daf0d82b3592262581f77d13fb67ec131
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 11 14:54:46 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Oct 11 14:55:11 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4c318a7d
Add loong config file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-loong.conf | 47 +++++++++++++++++++++++++++++++++++++
1 file changed, 47 insertions(+)
diff --git a/tools/catalyst-auto-qemu-loong.conf b/tools/catalyst-auto-qemu-loong.conf
new file mode 100644
index 00000000..a5787555
--- /dev/null
+++ b/tools/catalyst-auto-qemu-loong.conf
@@ -0,0 +1,47 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+UPLOAD_USER=loong
+UPLOAD_KEY=/root/.ssh/id_rsa
+
+host=$(hostname)
+
+SPECS_DIR=${REPO_DIR}/releases/specs-qemu/loong
+
+EMAIL_SUBJECT_PREPEND="[loong-qemu-auto]"
+
+SETS="
+ openrc
+ systemd
+"
+
+SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
+
+update_symlinks() {
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
+}
+
+post_build() {
+ local set=$1 spec=$2
+
+ case ${spec} in
+ stage3*.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ echo "Would upload stage3-loong-$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*"
+ popd >/dev/null
+ ;;
+ *)
+ echo "Finished ${spec}"
+ ;;
+ esac
+}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-09-19 3:11 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2022-09-19 3:11 UTC (permalink / raw
To: gentoo-commits
commit: 9a062f3ac7fe4b09242c07452822fa3aed97acdc
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 03:10:57 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 03:11:10 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9a062f3a
tools/catalyst-auto-ppc64le.conf: upload/cleanup mergedusr stages
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index a18c46f4..a8fcc7d2 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -23,7 +23,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}"/builds/{default,power9le,musl-hardened} ; do
+ for d in "${BUILD_SRCDIR_BASE}"/builds/{default,power9le,power9le-mergedusr,musl-hardened} ; do
pushd "${d}" >/dev/null
for t in ppc64le power9le; do
for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -56,6 +56,9 @@ post_build() {
stage3-systemd-power9le.spec)
upload power9le/stage3-power9le-systemd-${TIMESTAMP}*.xz*
;;
+ stage3-systemd-mergedusr-power9le.spec)
+ upload power9le-mergedusr/stage3-power9le-systemd-mergedusr-${TIMESTAMP}*.xz*
+ ;;
stage3-musl-hardened-openrc.spec)
upload musl-hardened/stage3-ppc64le-musl-hardened-openrc-${TIMESTAMP}*.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-09-19 1:24 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2022-09-19 1:24 UTC (permalink / raw
To: gentoo-commits
commit: 070177914d040f5d6a1db35cfa63f7599c35a10f
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 19 01:22:09 2022 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon Sep 19 01:24:05 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=07017791
tools/catalyst-auto-ppc64le.conf: build mergedusr stages
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 451162d3..a18c46f4 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -10,6 +10,7 @@ OPTIONAL_SPECS+=" installcd-stage1.spec installcd-stage2-minimal.spec"
OPTIONAL_SPECS+=" stage1-systemd.spec stage3-systemd.spec"
OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec"
OPTIONAL_SPECS+=" stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
+OPTIONAL_SPECS+=" stage1-systemd-mergedusr-power9le.spec stage3-systemd-mergedusr-power9le.spec"
OPTIONAL_SPECS+=" stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-08-09 16:53 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-08-09 16:53 UTC (permalink / raw
To: gentoo-commits
commit: 40f19a8d78d9a273feb1c32a2fc1e952d7f5954f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 9 16:53:10 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 9 16:53:10 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=40f19a8d
Add rv64 lp64 musl build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 0bf8f877..036e2710 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -14,6 +14,7 @@ SETS="
lp64d_musl
lp64d_openrc
lp64d_systemd
+ lp64_musl
lp64_openrc
lp64_systemd
multilib_openrc
@@ -23,6 +24,7 @@ SETS="
SET_lp64d_musl_SPECS="stage1-lp64d-musl.spec stage3-lp64d-musl.spec"
SET_lp64d_openrc_SPECS="stage1-lp64d-openrc.spec stage3-lp64d-openrc.spec"
SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage3-lp64d-systemd.spec"
+SET_lp64_musl_SPECS="stage1-lp64-musl.spec stage3-lp64-musl.spec"
SET_lp64_openrc_SPECS="stage1-lp64-openrc.spec stage3-lp64-openrc.spec"
SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage3-lp64-systemd.spec"
SET_multilib_openrc_SPECS="stage1-multilib-openrc.spec stage3-multilib-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-07-18 21:36 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-07-18 21:36 UTC (permalink / raw
To: gentoo-commits
commit: 4af672c29118e66f4fd45def97cde502a3750a15
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 21:36:23 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 21:36:23 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4af672c2
Add clang stages to autobuilds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 24 +++++++++++++++++++++++-
1 file changed, 23 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 401c640d..6e98d814 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -15,12 +15,14 @@ SETS="
livegui
nomultilib_openrc
nomultilib_systemd
+ clang_openrc
hardened_openrc
hardened_nomultilib_openrc
hardened_selinux_openrc
hardened_nomultilib_selinux_openrc
musl
musl_hardened
+ musl_clang
x32_openrc
"
@@ -44,8 +46,12 @@ SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec har
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage3-openrc.spec"
SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage3-systemd.spec"
+SET_clang_openrc_SPECS="clang/stage1-openrc.spec clang/stage3-openrc.spec"
+
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
+SET_musl_clang_SPECS="musl-clang/stage1.spec musl-clang/stage3.spec"
+
SET_musl_hardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
SET_x32_openrc_SPECS="x32/stage1-openrc.spec x32/stage3-openrc.spec"
@@ -56,7 +62,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl,musl-hardened} ; do
+ for d in ${BUILD_SRCDIR_BASE}/builds/{default,clang,hardened,musl,musl-clang,musl-hardened} ; do
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
@@ -111,6 +117,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/clang >/dev/null || exit
+ case ${spec} in
+ clang/stage3-openrc.spec)
+ upload stage3-amd64-clang-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/hardened >/dev/null || exit
case ${spec} in
hardened/stage3-openrc.spec)
@@ -139,6 +153,14 @@ post_build() {
esac
popd >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/musl-clang >/dev/null || exit
+ case ${spec} in
+ musl-clang/stage3.spec)
+ upload stage3-amd64-musl-clang-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null || exit
+
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
case ${spec} in
musl-hardened/stage3.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-07-18 20:14 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-07-18 20:14 UTC (permalink / raw
To: gentoo-commits
commit: 125e8f3bafc06f5898c33191eb4178bbf8013435
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 20:13:15 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 20:13:52 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=125e8f3b
Dont be so verbous, ln -s !
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
tools/catalyst-auto-x86.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index c4b0c33a..401c640d 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -70,7 +70,7 @@ update_symlinks() {
-e 's/20\d{6}/latest/g;' \
-e 's/20\d{2}\.\d{2}/latest/g;' \
<<<"$f")
- ln -svf "$f" "$of"
+ ln -sf "$f" "$of"
done
popd >/dev/null || exit
done
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index ced79e5d..b0a70c76 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -48,7 +48,7 @@ update_symlinks() {
-e 's/20\d{6}/latest/g;' \
-e 's/20\d{2}\.\d{2}/latest/g;' \
<<<"$f")
- ln -svf "$f" "$of"
+ ln -sf "$f" "$of"
done
popd >/dev/null || exit
done
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-07-18 18:40 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-07-18 18:40 UTC (permalink / raw
To: gentoo-commits
commit: d5223d3408561dee4677144277ecfe973931569c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 18:39:54 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 18:39:54 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d5223d34
catalyst-auto: e-mail more lines of failed logs (1000 instead of 200)
It helps if the log contains the actual error
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 028e09ca..3dfd1233 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -61,7 +61,7 @@ send_email() {
local body
if [ -n "${logfile}" ]; then
- body=$(printf '%b\n\n\n' "${message}"; tail -n 200 "${logfile}"; printf '\n\n\nFull build log at %s\n' "${logfile}")
+ body=$(printf '%b\n\n\n' "${message}"; tail -n 1000 "${logfile}"; printf '\n\n\nFull build log at %s\n' "${logfile}")
else
body=${message}
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-06-01 10:13 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-06-01 10:13 UTC (permalink / raw
To: gentoo-commits
commit: 4a3400c17103baffb668d6ece482647f2cea8580
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 1 10:12:40 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jun 1 10:12:55 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4a3400c1
Use ECC key on catbus
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 0c39a845..fc346e21 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=sparc
-UPLOAD_KEY=/root/.ssh/id_rsa
+UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/sparc
SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec sparc/systemd-stage3.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-05-30 13:46 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-05-30 13:46 UTC (permalink / raw
To: gentoo-commits
commit: e84c4976c1b4530cac0edb8dbff705bdaaa04107
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 13:45:41 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon May 30 13:46:11 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e84c4976
Enable m68k systemd stage
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-m68k.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 6129a2bf..7ac24ce5 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -12,9 +12,11 @@ EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
SETS="
openrc
+ systemd
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
update_symlinks() {
# Symlink the latest stages3 to build from
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-05-24 10:53 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-05-24 10:53 UTC (permalink / raw
To: gentoo-commits
commit: a624a66b9d1c51c4702b8c29d92abb00d46674f4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 10:53:28 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue May 24 10:53:28 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a624a66b
s390: set subarch
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-s390.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 42d49baa..13810624 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -4,7 +4,7 @@
UPLOAD_USER=s390
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+SUBARCH=s390
SETS="openrc systemd"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-05-05 17:52 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-05-05 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 07ac734d2509908d29a6b015432f0f3a9fe0cc5a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 17:52:37 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu May 5 17:52:37 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=07ac734d
Split mips builds into two jobs (LE and BE)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
...mu-mips.conf => catalyst-auto-qemu-mips-common} | 5 +-
tools/catalyst-auto-qemu-mips.conf | 125 +--------------------
tools/catalyst-auto-qemu-mipsel.conf | 5 +
3 files changed, 12 insertions(+), 123 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips-common
similarity index 91%
copy from tools/catalyst-auto-qemu-mips.conf
copy to tools/catalyst-auto-qemu-mips-common
index f47c5a6f..fe24d575 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips-common
@@ -6,7 +6,10 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mipsel3o32openrc mips3n32openrc mipsel3n32openrc mips3multilibopenrc mipsel3multilibopenrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64n32openrc mips64eln32openrc mips64multilibopenrc mips64elmultilibopenrc mips64n64openrc mips64eln64openrc mips64eln64systemd"
+SETS_BE="mips2o32openrc mips32o32openrc mips3n32openrc mips3multilibopenrc mips3n64openrc mips64n32openrc mips64multilibopenrc mips64n64openrc"
+SETS_LE="mipsel2o32openrc mips32elo32openrc mipsel3o32openrc mipsel3n32openrc mipsel3multilibopenrc mipsel3n64openrc mipsel3n64systemd mips64eln32openrc mips64elmultilibopenrc mips64eln64openrc mips64eln64systemd"
+
+# SETS="${SETS_BE} ${SETS_LE}"
SET_mips2o32openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index f47c5a6f..5e594770 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -1,124 +1,5 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-UPLOAD_USER=mips
-UPLOAD_KEY=/root/.ssh/id_rsa
-SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
-EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
+# only BE
-SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mipsel3o32openrc mips3n32openrc mipsel3n32openrc mips3multilibopenrc mipsel3multilibopenrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64n32openrc mips64eln32openrc mips64multilibopenrc mips64elmultilibopenrc mips64n64openrc mips64eln64openrc mips64eln64systemd"
+source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
-SET_mips2o32openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
-SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
-
-SET_mips32o32openrc_SPECS="stage1-mips32-o32-openrc.spec stage3-mips32-o32-openrc.spec"
-SET_mips32elo32openrc_SPECS="stage1-mips32el-o32-openrc.spec stage3-mips32el-o32-openrc.spec"
-
-SET_mipsel3o32openrc_SPECS="stage1-mipsel3-o32-openrc.spec stage3-mipsel3-o32-openrc.spec"
-
-SET_mips3n32openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
-SET_mipsel3n32openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
-
-SET_mips3multilibopenrc_SPECS="stage1-mips3-multilib-openrc.spec stage3-mips3-multilib-openrc.spec"
-SET_mipsel3multilibopenrc_SPECS="stage1-mipsel3-multilib-openrc.spec stage3-mipsel3-multilib-openrc.spec"
-
-SET_mips3n64openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec"
-SET_mipsel3n64openrc_SPECS="stage1-mipsel3-n64-openrc.spec stage3-mipsel3-n64-openrc.spec"
-SET_mipsel3n64systemd_SPECS="stage1-mipsel3-n64-systemd.spec stage3-mipsel3-n64-systemd.spec"
-
-SET_mips64n32openrc_SPECS="stage1-mips64-n32-openrc.spec stage3-mips64-n32-openrc.spec"
-SET_mips64eln32openrc_SPECS="stage1-mips64el-n32-openrc.spec stage3-mips64el-n32-openrc.spec"
-
-SET_mips64multilibopenrc_SPECS="stage1-mips64-multilib-openrc.spec stage3-mips64-multilib-openrc.spec"
-SET_mips64elmultilibopenrc_SPECS="stage1-mips64el-multilib-openrc.spec stage3-mips64el-multilib-openrc.spec"
-
-SET_mips64n64openrc_SPECS="stage1-mips64-n64-openrc.spec stage3-mips64-n64-openrc.spec"
-SET_mips64eln64openrc_SPECS="stage1-mips64el-n64-openrc.spec stage3-mips64el-n64-openrc.spec"
-SET_mips64eln64systemd_SPECS="stage1-mips64el-n64-systemd.spec stage3-mips64el-n64-systemd.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
-
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
- pushd "${d}" >/dev/null
- for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
- local of=$(echo "${f}" | convert_filename)
- ln -sf "${f}" "${of}"
- done
- popd >/dev/null
- done
-}
-
-post_build() {
- local set=$1 spec=$2
-
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-
- case ${spec} in
- stage3-mips2-o32-openrc.spec)
- upload stage3-mips2-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel2-o32-openrc.spec)
- upload stage3-mipsel2-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips32-o32-openrc.spec)
- upload stage3-mips32-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips32el-o32-openrc.spec)
- upload stage3-mips32el-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-o32-openrc.spec)
- upload stage3-mipsel3-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips3-n32-openrc.spec)
- upload stage3-mips3_n32-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips3-multilib-openrc.spec)
- upload stage3-mips3_multilib-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-n32-openrc.spec)
- upload stage3-mipsel3_n32-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-multilib-openrc.spec)
- upload stage3-mipsel3_multilib-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips3-n64-openrc.spec)
- upload stage3-mips3_n64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-n64-openrc.spec)
- upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mipsel3-n64-systemd.spec)
- upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips64-n32-openrc.spec)
- upload stage3-mips64_n32-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips64-multilib-openrc.spec)
- upload stage3-mips64_multilib-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips64el-n32-openrc.spec)
- upload stage3-mips64el_n32-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips64el-multilib-openrc.spec)
- upload stage3-mips64el_multilib-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips64-n64-openrc.spec)
- upload stage3-mips64_n64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips64el-n64-openrc.spec)
- upload stage3-mips64el_n64-openrc-${TIMESTAMP}.tar.xz*
- ;;
- stage3-mips64el-n64-systemd.spec)
- upload stage3-mips64el_n64-systemd-${TIMESTAMP}.tar.xz*
- ;;
- *)
- echo "Finished ${spec}"
- ;;
- esac
-
- popd >/dev/null
-}
+SETS=${SETS_BE}
diff --git a/tools/catalyst-auto-qemu-mipsel.conf b/tools/catalyst-auto-qemu-mipsel.conf
new file mode 100644
index 00000000..9434e91e
--- /dev/null
+++ b/tools/catalyst-auto-qemu-mipsel.conf
@@ -0,0 +1,5 @@
+# only LE
+
+source ${REPO_DIR}/tools/catalyst-auto-qemu-mips-common
+
+SETS=${SETS_LE}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-05-01 12:07 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-05-01 12:07 UTC (permalink / raw
To: gentoo-commits
commit: edc3ae02d0f3fad50d4ba679c85b0222ead1efa8
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun May 1 12:02:47 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May 1 12:02:47 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=edc3ae02
Add mipsel3 o32 build for the PS/2
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index c86c3f08..f47c5a6f 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mips3n32openrc mipsel3n32openrc mips3multilibopenrc mipsel3multilibopenrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64n32openrc mips64eln32openrc mips64multilibopenrc mips64elmultilibopenrc mips64n64openrc mips64eln64openrc mips64eln64systemd"
+SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mipsel3o32openrc mips3n32openrc mipsel3n32openrc mips3multilibopenrc mipsel3multilibopenrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64n32openrc mips64eln32openrc mips64multilibopenrc mips64elmultilibopenrc mips64n64openrc mips64eln64openrc mips64eln64systemd"
SET_mips2o32openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
@@ -14,6 +14,8 @@ SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-op
SET_mips32o32openrc_SPECS="stage1-mips32-o32-openrc.spec stage3-mips32-o32-openrc.spec"
SET_mips32elo32openrc_SPECS="stage1-mips32el-o32-openrc.spec stage3-mips32el-o32-openrc.spec"
+SET_mipsel3o32openrc_SPECS="stage1-mipsel3-o32-openrc.spec stage3-mipsel3-o32-openrc.spec"
+
SET_mips3n32openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
SET_mipsel3n32openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
@@ -68,6 +70,9 @@ post_build() {
stage3-mips32el-o32-openrc.spec)
upload stage3-mips32el-openrc-${TIMESTAMP}.tar.xz*
;;
+ stage3-mipsel3-o32-openrc.spec)
+ upload stage3-mipsel3-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mips3-n32-openrc.spec)
upload stage3-mips3_n32-openrc-${TIMESTAMP}.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-04-26 18:34 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-04-26 18:34 UTC (permalink / raw
To: gentoo-commits
commit: 4e62b91820e66ea0dbbd6979ea3a5b0899d9823e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 18:34:16 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 18:34:16 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4e62b918
Re-order hppa builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index e822c3a0..8a4c06fe 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -5,7 +5,7 @@ UPLOAD_USER=hppa
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
-SETS="hppa20_openrc hppa20_systemd hppa11_openrc hppa11_systemd"
+SETS="hppa11_openrc hppa11_systemd hppa20_openrc hppa20_systemd"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-04-25 23:25 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-04-25 23:25 UTC (permalink / raw
To: gentoo-commits
commit: ff9199db22e71aec768e454586dd06de0c69a673
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 23:25:41 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 23:25:41 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ff9199db
Restructure catalyst-auto hppa sets
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 6bf43274..e822c3a0 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -5,17 +5,17 @@ UPLOAD_USER=hppa
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
-SETS="hppa20_openrc hppa20_systemd hppa11_openrc hppa11_systemd hppa_livecd hppa_netboot"
+SETS="hppa20_openrc hppa20_systemd hppa11_openrc hppa11_systemd"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
+SET_hppa11_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec netboot-hppa32.spec"
+
SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec hppa1.1/stage3-systemd.spec"
SET_hppa20_openrc_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
-SET_hppa20_systemd_SPECS="hppa2.0/stage1-systemd.spec hppa2.0/stage3-systemd.spec"
+SET_hppa20_openrc_OPTIONAL_SPECS="netboot-hppa64.spec"
-SET_hppa_livecd_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-SET_hppa_netboot_SPECS="netboot-hppa32.spec netboot-hppa64.spec"
+SET_hppa20_systemd_SPECS="hppa2.0/stage1-systemd.spec hppa2.0/stage3-systemd.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/hppa
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-04-25 16:55 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-04-25 16:55 UTC (permalink / raw
To: gentoo-commits
commit: 2c105e3a69e72645069440a63e515f81bfdb75f5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 25 16:55:21 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 25 16:55:21 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2c105e3a
Re-order hppa builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 08b7ce81..6bf43274 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -5,7 +5,7 @@ UPLOAD_USER=hppa
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
-SETS="hppa20_systemd hppa11_systemd hppa11_openrc hppa20_openrc hppa_livecd hppa_netboot"
+SETS="hppa20_openrc hppa20_systemd hppa11_openrc hppa11_systemd hppa_livecd hppa_netboot"
SET_hppa11_openrc_SPECS="hppa1.1/stage1-openrc.spec hppa1.1/stage3-openrc.spec"
SET_hppa11_systemd_SPECS="hppa1.1/stage1-systemd.spec hppa1.1/stage3-systemd.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-04-24 12:33 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-04-24 12:33 UTC (permalink / raw
To: gentoo-commits
commit: 26c45e0c6cfc034f0262b49ee61a03772e2a5eba
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 24 12:33:30 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 24 12:33:30 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=26c45e0c
I knew I'd forgotten something...
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 935b8a48..08b7ce81 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -60,10 +60,10 @@ post_build() {
upload stage3-hppa1.1-systemd-*${TIMESTAMP}*.xz*
;;
hppa2.0/stage3-openrc.spec)
- upload stage3-hppa2.0-openrc-*${TIMESTAMP}*.bz2*
+ upload stage3-hppa2.0-openrc-*${TIMESTAMP}*.xz*
;;
hppa2.0/stage3-systemd.spec)
- upload stage3-hppa2.0-systemd-*${TIMESTAMP}*.bz2*
+ upload stage3-hppa2.0-systemd-*${TIMESTAMP}*.xz*
;;
*)
echo "Finished ${spec}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-04-22 23:34 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-04-22 23:34 UTC (permalink / raw
To: gentoo-commits
commit: 0df6caec2272687ef994e465091854fdd353f7ff
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 23:27:54 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 23:27:54 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0df6caec
Update hppa key name
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-hppa.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index c71d6f2a..53b2f68b 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -2,7 +2,7 @@
# self-explanatory.
UPLOAD_USER=hppa
-UPLOAD_KEY=/root/.ssh/buildsync.key
+UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
SETS="hppa11_openrc hppa11_systemd hppa20_openrc hppa20_systemd hppa_livecd hppa_netboot"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-04-19 19:46 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-04-19 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 50ef17ef8a04736bbeb9ae212eb8e43ced40ec18
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 17 23:04:37 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Apr 17 23:04:37 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=50ef17ef
Enable mipsel3 multilib build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index cb9ba0a6..77bea5d6 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mips3n32openrc mipsel3n32openrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64n32openrc mips64eln32openrc mips64elmultilibopenrc mips64n64openrc mips64eln64openrc mips64eln64systemd"
+SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mips3n32openrc mipsel3n32openrc mipsel3multilibopenrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64n32openrc mips64eln32openrc mips64elmultilibopenrc mips64n64openrc mips64eln64openrc mips64eln64systemd"
SET_mips2o32openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-03-29 14:32 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-03-29 14:32 UTC (permalink / raw
To: gentoo-commits
commit: cc3a1c0d6535d7c5c494d8377cd27c18ce68059b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 29 14:31:32 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 29 14:31:32 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cc3a1c0d
Add more mips n32 builds and uploads
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index 21c70aca..3caeb5c3 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mipsel3n32openrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64eln32openrc mips64n64openrc mips64eln64openrc mips64eln64systemd"
+SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mips3n32openrc mipsel3n32openrc mips3n64openrc mipsel3n64openrc mipsel3n64systemd mips64n32openrc mips64eln32openrc mips64n64openrc mips64eln64openrc mips64eln64systemd"
SET_mips2o32openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
@@ -14,12 +14,14 @@ SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-op
SET_mips32o32openrc_SPECS="stage1-mips32-o32-openrc.spec stage3-mips32-o32-openrc.spec"
SET_mips32elo32openrc_SPECS="stage1-mips32el-o32-openrc.spec stage3-mips32el-o32-openrc.spec"
+SET_mips3n32openrc_SPECS="stage1-mips3-n32-openrc.spec stage3-mips3-n32-openrc.spec"
SET_mipsel3n32openrc_SPECS="stage1-mipsel3-n32-openrc.spec stage3-mipsel3-n32-openrc.spec"
SET_mips3n64openrc_SPECS="stage1-mips3-n64-openrc.spec stage3-mips3-n64-openrc.spec"
SET_mipsel3n64openrc_SPECS="stage1-mipsel3-n64-openrc.spec stage3-mipsel3-n64-openrc.spec"
SET_mipsel3n64systemd_SPECS="stage1-mipsel3-n64-systemd.spec stage3-mipsel3-n64-systemd.spec"
+SET_mips64n32openrc_SPECS="stage1-mips64-n32-openrc.spec stage3-mips64-n32-openrc.spec"
SET_mips64eln32openrc_SPECS="stage1-mips64el-n32-openrc.spec stage3-mips64el-n32-openrc.spec"
SET_mips64n64openrc_SPECS="stage1-mips64-n64-openrc.spec stage3-mips64-n64-openrc.spec"
@@ -60,6 +62,9 @@ post_build() {
stage3-mips32el-o32-openrc.spec)
upload stage3-mips32el-openrc-${TIMESTAMP}.tar.xz*
;;
+ stage3-mips3-n32-openrc.spec)
+ upload stage3-mips3_n32-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mipsel3-n32-openrc.spec)
upload stage3-mipsel3_n32-openrc-${TIMESTAMP}.tar.xz*
;;
@@ -72,6 +77,12 @@ post_build() {
stage3-mipsel3-n64-systemd.spec)
upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz*
;;
+ stage3-mips64-n32-openrc.spec)
+ upload stage3-mips64_n32-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3-mips64el-n32-openrc.spec)
+ upload stage3-mips64el_n32-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mips64-n64-openrc.spec)
upload stage3-mips64_n64-openrc-${TIMESTAMP}.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-03-26 17:52 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-03-26 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 8b0a02fbc194113c73d188a94c812c58b448f79c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 26 17:51:30 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 26 17:51:30 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8b0a02fb
Also upload the mips n64 systemd stages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index 36abd7c2..c6eaefcb 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -62,12 +62,18 @@ post_build() {
stage3-mipsel3-n64-openrc.spec)
upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz*
;;
+ stage3-mipsel3-n64-systemd.spec)
+ upload stage3-mipsel3_n64-systemd-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mips64-n64-openrc.spec)
upload stage3-mips64_n64-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-mips64el-n64-openrc.spec)
upload stage3-mips64el_n64-openrc-${TIMESTAMP}.tar.xz*
;;
+ stage3-mips64el-n64-systemd.spec)
+ upload stage3-mips64el_n64-systemd-${TIMESTAMP}.tar.xz*
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-03-16 23:58 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-03-16 23:58 UTC (permalink / raw
To: gentoo-commits
commit: 2d494d1ff227d474ec65be71838aeb8c1ac19d43
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 23:57:58 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 23:57:58 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2d494d1f
Also upload mips(el)3-n64
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index e355b62d..392b163e 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -54,6 +54,12 @@ post_build() {
stage3-mips32el-o32-openrc.spec)
upload stage3-mips32el-openrc-${TIMESTAMP}.tar.xz*
;;
+ stage3-mips3-n64-openrc.spec)
+ upload stage3-mips3_n64-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3-mipsel3-n64-openrc.spec)
+ upload stage3-mipsel3_n64-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mips64-n64-openrc.spec)
upload stage3-mips64_n64-openrc-${TIMESTAMP}.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-03-05 16:11 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-03-05 16:11 UTC (permalink / raw
To: gentoo-commits
commit: e69459e41bdbfab82e1ca4fbfc4a5ffeee2121bb
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 5 16:11:23 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Mar 5 16:11:23 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e69459e4
Fix and update mips upload filenames
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index 252de290..fa6a326b 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -37,8 +37,17 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
+ stage3-mips2-o32-openrc.spec)
+ upload stage3-mips2-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3-mipsel2-o32-openrc.spec)
+ upload stage3-mipsel2-openrc-${TIMESTAMP}.tar.xz*
+ ;;
stage3-mips32-o32-openrc.spec)
- upload stage3-mips32_o32-openrc-${TIMESTAMP}.tar.xz*
+ upload stage3-mips32-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3-mips32el-o32-openrc.spec)
+ upload stage3-mips32el-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-mips64-n64-openrc.spec)
upload stage3-mips64_n64-openrc-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-03-04 18:41 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-03-04 18:41 UTC (permalink / raw
To: gentoo-commits
commit: 39e174cfe8a0811d1a110a3d725757054db1baab
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Mar 4 18:41:05 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Mar 4 18:41:05 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=39e174cf
Add new mips specs to autobuilds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index daaa1629..252de290 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -6,10 +6,12 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
+SETS="mips2o32openrc mipsel2o32openrc mips32o32openrc mips32elo32openrc mips64n64openrc mips64eln64openrc"
-SETS="mips32o32openrc mips64n64openrc mips64eln64openrc"
-
+SET_mips2o32openrc_SPECS="stage1-mips2-o32-openrc.spec stage3-mips2-o32-openrc.spec"
+SET_mipsel2o32openrc_SPECS="stage1-mipsel2-o32-openrc.spec stage3-mipsel2-o32-openrc.spec"
SET_mips32o32openrc_SPECS="stage1-mips32-o32-openrc.spec stage3-mips32-o32-openrc.spec"
+SET_mips32elo32openrc_SPECS="stage1-mips32el-o32-openrc.spec stage3-mips32el-o32-openrc.spec"
SET_mips64n64openrc_SPECS="stage1-mips64-n64-openrc.spec stage3-mips64-n64-openrc.spec"
SET_mips64eln64openrc_SPECS="stage1-mips64el-n64-openrc.spec stage3-mips64el-n64-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-03-01 22:14 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-03-01 22:14 UTC (permalink / raw
To: gentoo-commits
commit: 8ac7a212f09f8cc88e8a123b366a3ec9b1138913
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 22:13:56 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 22:14:15 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8ac7a212
Fix mips filenames for upload
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index 8baf4bac..daaa1629 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -36,13 +36,13 @@ post_build() {
case ${spec} in
stage3-mips32-o32-openrc.spec)
- upload stage3-mips32_o32-openrc-${TIMESTAMP}.xz*
+ upload stage3-mips32_o32-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-mips64-n64-openrc.spec)
- upload stage3-mips64_n64-openrc-${TIMESTAMP}.xz*
+ upload stage3-mips64_n64-openrc-${TIMESTAMP}.tar.xz*
;;
stage3-mips64el-n64-openrc.spec)
- upload stage3-mips64el_n64-openrc-${TIMESTAMP}.xz*
+ upload stage3-mips64el_n64-openrc-${TIMESTAMP}.tar.xz*
;;
*)
echo "Finished ${spec}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-03-01 8:25 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-03-01 8:25 UTC (permalink / raw
To: gentoo-commits
commit: 8595208a006a0f8ffcce82cf7d83f26a12d79b60
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 08:24:47 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 08:24:47 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8595208a
Fix filenames
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index 224aabed..8baf4bac 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -9,7 +9,7 @@ EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
SETS="mips32o32openrc mips64n64openrc mips64eln64openrc"
-SET_mips32o32openrc_SPECS="stage1-mips32-o32-openrc stage3-mips32-o32-openrc"
+SET_mips32o32openrc_SPECS="stage1-mips32-o32-openrc.spec stage3-mips32-o32-openrc.spec"
SET_mips64n64openrc_SPECS="stage1-mips64-n64-openrc.spec stage3-mips64-n64-openrc.spec"
SET_mips64eln64openrc_SPECS="stage1-mips64el-n64-openrc.spec stage3-mips64el-n64-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-03-01 8:11 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-03-01 8:11 UTC (permalink / raw
To: gentoo-commits
commit: 1a5a523830c31c82321dcaee127a0278b1caaa65
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 1 08:10:59 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Mar 1 08:11:16 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1a5a5238
Also build mips32-o32
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index 21d832ea..224aabed 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -7,8 +7,9 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS="mips64n64openrc mips64eln64openrc"
+SETS="mips32o32openrc mips64n64openrc mips64eln64openrc"
+SET_mips32o32openrc_SPECS="stage1-mips32-o32-openrc stage3-mips32-o32-openrc"
SET_mips64n64openrc_SPECS="stage1-mips64-n64-openrc.spec stage3-mips64-n64-openrc.spec"
SET_mips64eln64openrc_SPECS="stage1-mips64el-n64-openrc.spec stage3-mips64el-n64-openrc.spec"
@@ -34,6 +35,9 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
+ stage3-mips32-o32-openrc.spec)
+ upload stage3-mips32_o32-openrc-${TIMESTAMP}.xz*
+ ;;
stage3-mips64-n64-openrc.spec)
upload stage3-mips64_n64-openrc-${TIMESTAMP}.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-02-27 15:56 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-02-27 15:56 UTC (permalink / raw
To: gentoo-commits
commit: 16261751801f082e769f9ef9aa70a2b84cc459ae
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 27 15:56:12 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Feb 27 15:56:12 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=16261751
Fix upload filename
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 6af25e4b..0bf8f877 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -57,7 +57,7 @@ post_build() {
;;
stage3*musl.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
- upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:-:_:g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
popd >/dev/null
;;
*)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-02-21 13:04 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-02-21 13:04 UTC (permalink / raw
To: gentoo-commits
commit: 9ed48293a424d058a053421f215a415093f11d1e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 13:04:06 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 13:04:06 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9ed48293
Minor fixes in auto
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-mips.conf | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-mips.conf b/tools/catalyst-auto-qemu-mips.conf
index 93055aa7..6c82e181 100644
--- a/tools/catalyst-auto-qemu-mips.conf
+++ b/tools/catalyst-auto-qemu-mips.conf
@@ -4,11 +4,12 @@
UPLOAD_USER=mips
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
+EMAIL_SUBJECT_PREPEND="[mips-qemu-auto]"
-SETS="mips64len64"
+SETS="mips64len64openrc"
-SET_mips64len64_SPECS="stage1-mips64le-n64-openrc.spec stage3-mips64le-n64-openrc.spec"
+SET_mips64len64openrc_SPECS="stage1-mips64le-n64-openrc.spec stage3-mips64le-n64-openrc.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-02-21 13:04 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-02-21 13:04 UTC (permalink / raw
To: gentoo-commits
commit: cc229bbccfac258f64de89b0452867a4b82b9844
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 13:02:23 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 13:02:23 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cc229bbc
Rename file to indicate qemu
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/{catalyst-auto-mips.conf => catalyst-auto-qemu-mips.conf} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/tools/catalyst-auto-mips.conf b/tools/catalyst-auto-qemu-mips.conf
similarity index 100%
rename from tools/catalyst-auto-mips.conf
rename to tools/catalyst-auto-qemu-mips.conf
^ permalink raw reply [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-02-21 12:58 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-02-21 12:58 UTC (permalink / raw
To: gentoo-commits
commit: 1e2d304a58a1d39f82985fb7a6f35372f473cc4d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 21 12:58:27 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Feb 21 12:58:27 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1e2d304a
Add mips autocatalyst file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-mips.conf | 44 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 44 insertions(+)
diff --git a/tools/catalyst-auto-mips.conf b/tools/catalyst-auto-mips.conf
new file mode 100644
index 00000000..93055aa7
--- /dev/null
+++ b/tools/catalyst-auto-mips.conf
@@ -0,0 +1,44 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+UPLOAD_USER=mips
+UPLOAD_KEY=/root/.ssh/id_rsa
+SPECS_DIR=${REPO_DIR}/releases/specs-qemu/mips
+
+
+SETS="mips64len64"
+
+SET_mips64len64_SPECS="stage1-mips64le-n64-openrc.spec stage3-mips64le-n64-openrc.spec"
+
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/mips
+
+
+update_symlinks() {
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
+}
+
+post_build() {
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ stage3-mips64le-n64-openrc.spec)
+ upload stage3-mips64le_n64-openrc-${TIMESTAMP}.xz*
+ ;;
+ *)
+ echo "Finished ${spec}"
+ ;;
+ esac
+
+ popd >/dev/null
+}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-02-19 14:21 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-02-19 14:21 UTC (permalink / raw
To: gentoo-commits
commit: 771353ce0a10d4b659753f59964e72beceb258ff
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 19 14:21:33 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 19 14:21:50 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=771353ce
Upload livegui iso :)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index c594d1f7..9d6bf815 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -105,6 +105,9 @@ post_build() {
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
;;
+ livegui/livegui-stage2.spec)
+ upload livegui-amd64-${TIMESTAMP}.iso*
+ ;;
esac
popd >/dev/null || exit
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-02-16 16:22 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-02-16 16:22 UTC (permalink / raw
To: gentoo-commits
commit: 0db2ce81611f87eb3216708daf45a16ebfc81cb0
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 16 16:21:13 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Feb 16 16:21:53 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0db2ce81
Move livegui to own spec set
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 20d5cb83..c594d1f7 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -12,6 +12,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
openrc
systemd
+ livegui
nomultilib_openrc
nomultilib_systemd
hardened_openrc
@@ -24,7 +25,9 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage2-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec livegui/livegui-stage1.spec livegui/livegui-stage2.spec"
+SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec"
+
+SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec"
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-02-12 17:50 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-02-12 17:50 UTC (permalink / raw
To: gentoo-commits
commit: 8bf7b417d7ce336f38e0302b8562e42695e9867f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 12 17:49:38 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Feb 12 17:49:38 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8bf7b417
Also build the livegui experiment weekly
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index e64f889c..20d5cb83 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -24,7 +24,7 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage2-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec livegui/livegui-stage1.spec livegui/livegui-stage2.spec"
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-01-23 19:22 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-01-23 19:22 UTC (permalink / raw
To: gentoo-commits
commit: aea64e32a4b9aa880fca7dbe95815e528b1ce251
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 23 19:21:53 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jan 23 19:21:53 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=aea64e32
arm64: set SUBARCH (stage1.spec is gone)
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index d9d0c37f..8519d23d 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -4,7 +4,7 @@
UPLOAD_USER=arm64
UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/arm64
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
+SUBARCH=arm64
SETS="openrc systemd musl muslhardened"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2022-01-15 0:12 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2022-01-15 0:12 UTC (permalink / raw
To: gentoo-commits
commit: b9ae3c31098fdb5532c9127d40301c79ef6b80d4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 15 00:12:13 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jan 15 00:12:13 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b9ae3c31
Also try to build an alpha systemd stage3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index 50d8329c..323bd88d 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -6,11 +6,13 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha
EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
-SETS="openrc"
+SETS="openrc systemd"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/alpha
update_symlinks() {
@@ -38,6 +40,9 @@ post_build() {
stage3-openrc.spec)
upload stage3-*openrc-${TIMESTAMP}*.xz*
;;
+ stage3-systemd.spec)
+ upload stage3-*systemd-${TIMESTAMP}*.xz*
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-12-05 22:43 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-12-05 22:43 UTC (permalink / raw
To: gentoo-commits
commit: df7743da2d85d4fd02876c0576f35c16c21072bb
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 5 22:43:07 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Dec 5 22:43:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=df7743da
Sort arm builds a bit better
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 43354c74..5f1d6856 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -11,10 +11,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm
EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
- armv6j_hf_musl_hardened_openrc
- armv7a_hf_musl_hardened_openrc
- armv6j_hf_musl_openrc
- armv7a_hf_musl_openrc
armv4tl_openrc
armv4tl_systemd
armv5tel_openrc
@@ -23,10 +19,14 @@ SETS="
armv6j_hf_systemd
armv6j_sf_openrc
armv6j_sf_systemd
+ armv6j_hf_musl_openrc
+ armv6j_hf_musl_hardened_openrc
armv7a_hf_openrc
armv7a_hf_systemd
armv7a_sf_openrc
armv7a_sf_systemd
+ armv7a_hf_musl_openrc
+ armv7a_hf_musl_hardened_openrc
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-11-21 13:11 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-11-21 13:11 UTC (permalink / raw
To: gentoo-commits
commit: ba4f830eeaa1012a3dc9735dce4373ad51691ea1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 21 13:09:56 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Nov 21 13:09:56 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ba4f830e
Arm autobuilds: also update latest link in musl-hardened
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 547c4a35..43354c74 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -56,7 +56,7 @@ SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.sp
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-11-20 14:48 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-11-20 14:48 UTC (permalink / raw
To: gentoo-commits
commit: 1e5faa75ee1710ff87fb45636220c56e4bc22ca1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 20 14:48:10 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Nov 20 14:48:10 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1e5faa75
tools: Add armv6j hardfloat musl stage build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index e2ab9a9a..8c92df96 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -11,6 +11,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm
EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
+ armv6j_hf_musl_openrc
armv7a_hf_musl
armv4tl_openrc
armv4tl_systemd
@@ -38,6 +39,8 @@ SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-
SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec armv6j/stage3-openrc.spec"
SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec"
+SET_armv6j_hf_musl_openrc_SPECS="armv6j-musl/stage1-hardfloat.spec armv6j-musl/stage3-hardfloat.spec"
+
SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec"
SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec"
@@ -114,6 +117,9 @@ post_build() {
armv7a-musl/stage3-hardfloat.spec)
upload stage3-armv7a_hardfp_musl-openrc-${TIMESTAMP}*.xz*
;;
+ armv6j-musl/stage3-hardfloat.spec)
+ upload stage3-armv6j_hardfp_musl-openrc-${TIMESTAMP}*.xz*
+ ;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-11-19 21:40 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-11-19 21:40 UTC (permalink / raw
To: gentoo-commits
commit: 872caf0ddbc3c96d9ee5c65f8fd0fc6dc89fe434
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 19 21:38:42 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Nov 19 21:38:42 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=872caf0d
armv7a musl: fix upload filename
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 40569d87..e2ab9a9a 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -111,8 +111,8 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
case ${spec} in
- armv7a/musl/stage3-hardfloat.spec)
- upload stage3-armv7a_hardfp_musl-${TIMESTAMP}*.xz*
+ armv7a-musl/stage3-hardfloat.spec)
+ upload stage3-armv7a_hardfp_musl-openrc-${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-11-17 21:59 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-11-17 21:59 UTC (permalink / raw
To: gentoo-commits
commit: c085d86fb04abcbdd69ee46f78f5f6d6af64070d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 17 21:58:54 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 21:58:54 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c085d86f
"musl" moves from TIMESTAMP part to subarch part, the return
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 252b15fb..40569d87 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -112,7 +112,7 @@ post_build() {
case ${spec} in
armv7a/musl/stage3-hardfloat.spec)
- upload stage3-armv7a_hardfp-musl-${TIMESTAMP}*.xz*
+ upload stage3-armv7a_hardfp_musl-${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-11-17 19:46 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-11-17 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 94914ae93dfa035896efc38d395a6759ca355871
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 17 19:45:49 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 19:45:49 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=94914ae9
tools/catalyst-auto-ppc.conf: enable ppc32 musl builds
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 28b7189f..8b08df59 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -13,7 +13,7 @@ SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec ppc64/stage1-openrc.spe
OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd.spec ppc64/stage3-systemd.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec"
-#OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec"
+OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -49,7 +49,7 @@ post_build() {
upload default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
;;
ppc32/stage3-musl-hardened-openrc.spec)
- upload default/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
+ upload musl-hardened/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
;;
ppc64/stage3-openrc.spec)
upload default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-11-17 5:26 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-11-17 5:26 UTC (permalink / raw
To: gentoo-commits
commit: d5bc58b85fc61b3062a40985065f7d904cdd0aed
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 17 05:26:13 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Nov 17 05:26:13 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d5bc58b8
tools/catalyst-auto-ppc.conf: add config for musl specs (disabled)
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index e27e3687..28b7189f 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -13,6 +13,7 @@ SPECS="ppc32/stage1-openrc.spec ppc32/stage3-openrc.spec ppc64/stage1-openrc.spe
OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-systemd.spec ppc64/stage3-systemd.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/stage1-musl-hardened-openrc.spec ppc64/stage3-musl-hardened-openrc.spec"
+#OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc32/stage1-musl-hardened-openrc.spec ppc32/stage3-musl-hardened-openrc.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -47,6 +48,9 @@ post_build() {
ppc32/stage3-openrc.spec)
upload default/stage3-ppc-openrc-*${TIMESTAMP}*.xz*
;;
+ ppc32/stage3-musl-hardened-openrc.spec)
+ upload default/stage3-ppc-musl-hardened-openrc-*${TIMESTAMP}*.xz*
+ ;;
ppc64/stage3-openrc.spec)
upload default/stage3-ppc64-openrc-*${TIMESTAMP}*.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-11-10 21:05 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-11-10 21:05 UTC (permalink / raw
To: gentoo-commits
commit: 687963d2cb2bb856733825a1357b901ebfc4f3e3
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 21:04:43 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 21:04:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=687963d2
Also update latest links for arm in musl dir
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 29a51c10..252b15fb 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -49,7 +49,7 @@ SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.sp
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-11-10 20:59 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-11-10 20:59 UTC (permalink / raw
To: gentoo-commits
commit: 2c7bdeedc02380f003c3d2c7487257db10d82630
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 20:58:56 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 20:58:56 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2c7bdeed
Also upload arm-musl stages
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index f99e537a..228d4cea 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -107,4 +107,14 @@ post_build() {
esac
popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/musl" >/dev/null
+
+ case ${spec} in
+ armv7a/musl/stage3-hardfloat.spec)
+ upload stage3-armv7a_hardfp-musl-${TIMESTAMP}*.xz*
+ ;;
+ esac
+
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-11-10 20:39 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-11-10 20:39 UTC (permalink / raw
To: gentoo-commits
commit: a128556e807ae0a9d18af9c4cc3274f49022c257
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 10 20:39:38 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 10 20:39:38 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a128556e
Add armv7 hf musl autobuilds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 531af397..f99e537a 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -11,6 +11,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm
EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
+ armv7a_hf_musl
armv4tl_openrc
armv4tl_systemd
armv5tel_openrc
@@ -40,6 +41,8 @@ SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.sp
SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec"
SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec"
+SET_armv7a_hf_musl_SPECS="armv7a/musl/stage1-hardfloat.spec armv7a/musl/stage3-hardfloat.spec"
+
SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec armv7a/stage3-openrc.spec"
SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-10-18 21:26 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-10-18 21:26 UTC (permalink / raw
To: gentoo-commits
commit: 59328ba4341123278bf87d14a802333602d83b7e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 18 21:25:38 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Oct 18 21:25:38 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=59328ba4
Also upload "desktop stage3"
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 7b321683..e64f889c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -84,6 +84,12 @@ post_build() {
stage3-systemd.spec)
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
;;
+ stage3d-openrc.spec)
+ upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
+ ;;
+ stage3d-systemd.spec)
+ upload stage3-amd64-desktop-systemd-${TIMESTAMP}.tar.xz*
+ ;;
installcd-stage2-minimal.spec)
upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-10-18 20:06 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-10-18 20:06 UTC (permalink / raw
To: gentoo-commits
commit: 623bd0e72542eb7bbb3f4203b9a56e81f2bde92f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 18 20:06:28 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Oct 18 20:06:28 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=623bd0e7
Add amd64 stage3d experiment as optional autobuild
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 07650be0..7b321683 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -24,8 +24,10 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage2-openrc.spec stage3-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec"
+
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
+SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec"
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-09-26 12:34 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-09-26 12:34 UTC (permalink / raw
To: gentoo-commits
commit: eb059fcbb3be6f9e2d4c533e29c9abb45aecdf7b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 26 12:34:30 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 26 12:34:30 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=eb059fcb
Set e-mail subject to alpha-qemu
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index 9e22ee1b..50d8329c 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -4,7 +4,8 @@
UPLOAD_USER=alpha
UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/alpha
-
+EMAIL_SUBJECT_PREPEND="[alpha-qemu-auto]"
+
SETS="openrc"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-09-26 12:15 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-09-26 12:15 UTC (permalink / raw
To: gentoo-commits
commit: 742e08138898cb081eb3ee1edd4b5f37fce9692b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 26 12:15:26 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Sep 26 12:15:26 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=742e0813
Fix stage and spec filenames
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-alpha.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-alpha.conf b/tools/catalyst-auto-qemu-alpha.conf
index 2a7718dd..9e22ee1b 100644
--- a/tools/catalyst-auto-qemu-alpha.conf
+++ b/tools/catalyst-auto-qemu-alpha.conf
@@ -34,8 +34,8 @@ post_build() {
installcd-stage2-minimal.spec)
upload *-${TIMESTAMP}*.iso*
;;
- stage3.spec)
- upload stage3-*${TIMESTAMP}*.xz*
+ stage3-openrc.spec)
+ upload stage3-*openrc-${TIMESTAMP}*.xz*
;;
*)
echo "Finished ${spec}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-09-10 20:17 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-09-10 20:17 UTC (permalink / raw
To: gentoo-commits
commit: 81061e66028276195441e27b624bfc7182e5f909
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 10 20:17:39 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Sep 10 20:17:39 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=81061e66
arm64: build musl first for easier testing
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 5bc9dde3..3d57dc12 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -6,7 +6,7 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/arm64
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-SETS="default musl muslhardened"
+SETS="musl muslhardened default"
SET_default_SPECS="stage1.spec stage3.spec systemd-stage1.spec systemd-stage3.spec"
SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-09-02 10:44 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-09-02 10:44 UTC (permalink / raw
To: gentoo-commits
commit: a8f267c5b81201b6a42c46e181d0fa37849c601d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 2 10:43:47 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Sep 2 10:43:47 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a8f267c5
arm autobuilds: sort
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 5942aca2..531af397 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -11,10 +11,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm
EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
- armv7a_hf_openrc
- armv7a_hf_systemd
- armv7a_sf_openrc
- armv7a_sf_systemd
armv4tl_openrc
armv4tl_systemd
armv5tel_openrc
@@ -23,6 +19,10 @@ SETS="
armv6j_hf_systemd
armv6j_sf_openrc
armv6j_sf_systemd
+ armv7a_hf_openrc
+ armv7a_hf_systemd
+ armv7a_sf_openrc
+ armv7a_sf_systemd
"
SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-08-30 12:30 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-08-30 12:30 UTC (permalink / raw
To: gentoo-commits
commit: 1cfb6e041cea0995d3d7bac8589fc610e2bf66aa
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 12:30:07 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 12:30:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1cfb6e04
Fix arm filenames
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 27e86522..5942aca2 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -87,13 +87,13 @@ post_build() {
upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3-openrc.spec)
- upload stage3-armv7a-${TIMESTAMP}*.xz*
+ upload stage3-armv7a-openrc-${TIMESTAMP}*.xz*
;;
armv7a/stage3-systemd.spec)
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-openrc.spec)
- upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
+ upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-08-30 8:54 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-08-30 8:54 UTC (permalink / raw
To: gentoo-commits
commit: ab8e01bb79a23feb952d0d54535de4d8a294c396
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 30 08:47:55 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Aug 30 08:47:55 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ab8e01bb
Fix upload filenames of armv6
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index a66e8757..9f472845 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -77,13 +77,13 @@ post_build() {
upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
;;
armv6j/stage3.spec)
- upload stage3-armv6j-${TIMESTAMP}*.xz*
+ upload stage3-armv6j-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-systemd.spec)
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat.spec)
- upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
+ upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd.spec)
upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-08-29 17:05 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-08-29 17:05 UTC (permalink / raw
To: gentoo-commits
commit: 8258e1183aba7a971a7b9ac140736ac999532e4a
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 16:59:36 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 17:05:01 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8258e118
Disable armv5tel builds on demeter
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 6dff41a7..d791c1db 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -11,12 +11,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm
EMAIL_SUBJECT_PREPEND="[arm-qemu-auto]"
SETS="
- armv5tel
armv6j_hf
armv6j_sf
armv7a_hf
armv7a_sf
- armv5tel_systemd
armv6j_hf_systemd
armv6j_sf_systemd
armv7a_hf_systemd
@@ -25,6 +23,8 @@ SETS="
# armv4tl
# armv4tl_systemd
+# armv5tel
+# armv5tel_systemd
SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec"
SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-08-29 13:54 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-08-29 13:54 UTC (permalink / raw
To: gentoo-commits
commit: d4fb58d6117d877756a5f31ecd7d8023ff3535b2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 13:54:15 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 13:54:45 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d4fb58d6
Disable qemu armv4tl build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm.conf | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index efac2eb8..6dff41a7 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -11,13 +11,11 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm
EMAIL_SUBJECT_PREPEND="[arm-qemu-auto]"
SETS="
- armv4tl
armv5tel
armv6j_hf
armv6j_sf
armv7a_hf
armv7a_sf
- armv4tl_systemd
armv5tel_systemd
armv6j_hf_systemd
armv6j_sf_systemd
@@ -25,6 +23,9 @@ SETS="
armv7a_sf_systemd
"
+# armv4tl
+# armv4tl_systemd
+
SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec"
SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-08-29 13:54 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-08-29 13:54 UTC (permalink / raw
To: gentoo-commits
commit: 8aca038fbe13cba651d3c028ddf66cf5eb949619
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 29 13:40:54 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 29 13:54:39 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8aca038f
Copy catalyst-auto arm config for native builds on jiji
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 106 +++++++++++++++++++++++++++++++++++++++++++
1 file changed, 106 insertions(+)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
new file mode 100644
index 00000000..643fd258
--- /dev/null
+++ b/tools/catalyst-auto-arm.conf
@@ -0,0 +1,106 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+UPLOAD_USER=arm
+UPLOAD_KEY=/root/.ssh/id_rsa
+
+host=$(hostname)
+
+SPECS_DIR=${REPO_DIR}/releases/specs/arm
+
+EMAIL_SUBJECT_PREPEND="[arm-auto]"
+
+SETS="
+ armv4tl
+ armv5tel
+ armv6j_hf
+ armv6j_sf
+ armv7a_hf
+ armv7a_sf
+ armv4tl_systemd
+ armv5tel_systemd
+ armv6j_hf_systemd
+ armv6j_sf_systemd
+ armv7a_hf_systemd
+ armv7a_sf_systemd
+"
+
+SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec"
+SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec"
+
+SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage3.spec"
+SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage3-systemd.spec"
+
+SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage3-hardfloat.spec"
+SET_armv6j_sf_SPECS="armv6j/stage1.spec armv6j/stage3.spec"
+SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec"
+SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec"
+
+SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage3-hardfloat.spec"
+SET_armv7a_sf_SPECS="armv7a/stage1.spec armv7a/stage3.spec"
+SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec"
+SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec"
+
+
+update_symlinks() {
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
+}
+
+post_build() {
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ armv4tl/stage3.spec)
+ upload stage3-armv4tl-${TIMESTAMP}*.xz*
+ ;;
+ armv4tl/stage3-systemd.spec)
+ upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/stage3.spec)
+ upload stage3-armv5tel-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/stage3-systemd.spec)
+ upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3.spec)
+ upload stage3-armv6j-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-systemd.spec)
+ upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-hardfloat.spec)
+ upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-hardfloat-systemd.spec)
+ upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3.spec)
+ upload stage3-armv7a-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3-systemd.spec)
+ upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3-hardfloat.spec)
+ upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3-hardfloat-systemd.spec)
+ upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
+ ;;
+ *)
+ echo "Finished ${spec}"
+ ;;
+ esac
+
+ popd >/dev/null
+}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-08-26 19:56 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-08-26 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 9860d0914e8a5a494cb66b971d92ca540edf4a5c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 19:52:10 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 19:52:10 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9860d091
Remove leftovers from build.env usage
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 --
tools/catalyst-auto-x86.conf | 1 -
2 files changed, 3 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 41cbd219..07650be0 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -74,8 +74,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}
-
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
case ${spec} in
stage3-openrc.spec)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index b81bceb7..0149eab5 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -56,7 +56,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}
pushd ${BUILD_SRCDIR_BASE}/builds/default >/dev/null || exit
case ${spec} in
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-08-26 19:56 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-08-26 19:56 UTC (permalink / raw
To: gentoo-commits
commit: ba25e990d0ca8d84b5f2a7fbfecb6fad4ba21bbe
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 26 19:54:52 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 26 19:54:52 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ba25e990
tools: Upload with SSH option IPQoS=cs0
SSH defaults to IPQoS=cs1 for non-interative sessions, like scp.
OSUOSL's network prioritizes these packets lower and often drops them,
reducing uplaod performance significantly.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 1f053048..028e09ca 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -274,6 +274,7 @@ upload() {
-o UserKnownHostsFile=/dev/null
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
+ -o IPQoS=cs0
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-08-22 10:10 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-08-22 10:10 UTC (permalink / raw
To: gentoo-commits
commit: 0f6bdfa8120d87bf11438d6ec092d74a346d35d1
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 22 10:00:37 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Aug 22 10:00:37 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0f6bdfa8
Add m68k catalyst-auto config
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-m68k.conf | 45 ++++++++++++++++++++++++++++++++++++++
1 file changed, 45 insertions(+)
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
new file mode 100644
index 00000000..6129a2bf
--- /dev/null
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -0,0 +1,45 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+UPLOAD_USER=m68k
+UPLOAD_KEY=/root/.ssh/id_rsa
+
+host=$(hostname)
+
+SPECS_DIR=${REPO_DIR}/releases/specs-qemu/m68k
+
+EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
+
+SETS="
+ openrc
+"
+
+SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec"
+
+update_symlinks() {
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
+}
+
+post_build() {
+ local set=$1 spec=$2
+
+ case ${spec} in
+ stage3*.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ upload stage3-m68k-$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
+ *)
+ echo "Finished ${spec}"
+ ;;
+ esac
+}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-08-10 21:45 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-08-10 21:45 UTC (permalink / raw
To: gentoo-commits
commit: 83c48b1e644b3194efb83b2a8ba6cba2db4a9506
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 10 21:44:32 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Aug 10 21:44:32 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=83c48b1e
Enable arm64 installcd build
Acked-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 4957391b..5b191df5 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -9,7 +9,7 @@ SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default"
SET_default_SPECS="stage1.spec stage3.spec systemd-stage1.spec systemd-stage3.spec"
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64
@@ -35,7 +35,7 @@ post_build() {
case ${spec} in
installcd-stage2-minimal.spec)
- upload default/*${TIMESTAMP}*.iso*
+ upload install-arm64-*${TIMESTAMP}*.iso*
;;
stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-31 17:55 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-07-31 17:55 UTC (permalink / raw
To: gentoo-commits
commit: a2420f14fddfa29bdd0d5012b8fca7f24a212088
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 01:19:40 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 17:54:29 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a2420f14
tools: Remove unused ARCH and TYPE variables
In a previous configuration, these were used in a .env file that was
sourced immediately after the definitions.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 3 ---
tools/catalyst-auto-x86.conf | 2 --
2 files changed, 5 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 04b76871..41cbd219 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -5,9 +5,6 @@ UPLOAD_USER=amd64
UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname)
-ARCH="amd64"
-TYPE="auto"
-
EMAIL_SUBJECT_PREPEND="[amd64-auto]"
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 185564ca..b81bceb7 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -5,8 +5,6 @@ UPLOAD_USER=x86
UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname)
-ARCH="x86"
-TYPE="auto"
EMAIL_SUBJECT_PREPEND="[x86-auto]"
SPECS_DIR=${REPO_DIR}/releases/specs/x86
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-31 15:53 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-31 15:53 UTC (permalink / raw
To: gentoo-commits
commit: daca1362f42c6a15a1eb7417616183732f2ca362
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 15:51:55 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 15:51:55 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=daca1362
Remove unused arm non-qemu config file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 105 -------------------------------------------
1 file changed, 105 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
deleted file mode 100644
index a323f33d..00000000
--- a/tools/catalyst-auto-arm.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-UPLOAD_USER=arm
-UPLOAD_KEY=/root/.ssh/id_ed25519
-host=$(hostname)
-
-SPECS_DIR=${REPO_DIR}/releases/specs/arm
-
-EMAIL_SUBJECT_PREPEND="[arm-auto]"
-
-SETS="
- armv4tl
- armv5tel
- armv6j_hf
- armv6j_sf
- armv7a_hf
- armv7a_sf
- armv4tl_systemd
- armv5tel_systemd
- armv6j_hf_systemd
- armv6j_sf_systemd
- armv7a_hf_systemd
- armv7a_sf_systemd
-"
-
-SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec"
-SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec"
-
-SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage3.spec"
-SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage3-systemd.spec"
-
-SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage3-hardfloat.spec"
-SET_armv6j_sf_SPECS="armv6j/stage1.spec armv6j/stage3.spec"
-SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec"
-SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec"
-
-SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage3-hardfloat.spec"
-SET_armv7a_sf_SPECS="armv7a/stage1.spec armv7a/stage3.spec"
-SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec"
-SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec"
-
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
- pushd "${d}" >/dev/null
- for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
- local of=$(echo "${f}" | convert_filename)
- ln -sf "${f}" "${of}"
- done
- popd >/dev/null
- done
-}
-
-post_build() {
- local set=$1 spec=$2
-
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-
- case ${spec} in
- armv4tl/stage3.spec)
- upload stage3-armv4tl-${TIMESTAMP}*.xz*
- ;;
- armv4tl/stage3-systemd.spec)
- upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*
- ;;
- armv5tel/stage3.spec)
- upload stage3-armv5tel-${TIMESTAMP}*.xz*
- ;;
- armv5tel/stage3-systemd.spec)
- upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
- ;;
- armv6j/stage3.spec)
- upload stage3-armv6j-${TIMESTAMP}*.xz*
- ;;
- armv6j/stage3-systemd.spec)
- upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
- ;;
- armv6j/stage3-hardfloat.spec)
- upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
- ;;
- armv6j/stage3-hardfloat-systemd.spec)
- upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
- ;;
- armv7a/stage3.spec)
- upload stage3-armv7a-${TIMESTAMP}*.xz*
- ;;
- armv7a/stage3-systemd.spec)
- upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
- ;;
- armv7a/stage3-hardfloat.spec)
- upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
- ;;
- armv7a/stage3-hardfloat-systemd.spec)
- upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
- ;;
- *)
- echo "Finished ${spec}"
- ;;
- esac
-
- popd >/dev/null
-}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-31 15:53 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-31 15:53 UTC (permalink / raw
To: gentoo-commits
commit: 8c876b1e5dffdb0f4b7f60a32ffabd31f9bbe31b
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 15:52:48 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 15:52:48 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8c876b1e
Rename x86 config file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/{catalyst-auto-x86-demeter.conf => catalyst-auto-x86.conf} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86.conf
similarity index 100%
rename from tools/catalyst-auto-x86-demeter.conf
rename to tools/catalyst-auto-x86.conf
^ permalink raw reply [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-31 15:50 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-31 15:50 UTC (permalink / raw
To: gentoo-commits
commit: 07d358799813f875ffeac11b922397b832832c9f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 15:50:33 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 15:50:33 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=07d35879
Rename amd64 config file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/{catalyst-auto-amd64-demeter.conf => catalyst-auto-amd64.conf} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64.conf
similarity index 100%
rename from tools/catalyst-auto-amd64-demeter.conf
rename to tools/catalyst-auto-amd64.conf
^ permalink raw reply [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-31 15:50 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-31 15:50 UTC (permalink / raw
To: gentoo-commits
commit: a883a24bdc209e08dd3fd4730b02d99782dffe0f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 31 15:49:36 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 31 15:49:36 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a883a24b
Drop amd64 autobuild file from pardalote
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 56 ------------------------------------------
1 file changed, 56 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
deleted file mode 100644
index fc25a273..00000000
--- a/tools/catalyst-auto-amd64.conf
+++ /dev/null
@@ -1,56 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-UPLOAD_USER=amd64
-UPLOAD_KEY=/root/.ssh/id_rsa
-host=$(hostname)
-
-ARCH="amd64"
-TYPE="auto"
-source /etc/catalyst/release/build.env
-
-SPECS_DIR=${REPO_DIR}/releases/specs/amd64
-
-SETS=""
-SPECS="nosuchfile.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
-
-EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd "${d}" >/dev/null || exit
- shopt -s extglob
- for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
- # 20yymmddThhmmssZ
- # 20yymmddhhmmss
- # 20yymmdd
- # 20yy.n
- of=$(perl -p \
- -e 's/20\d{6}T\d{6}Z/latest/g;' \
- -e 's/20\d{6}\d{6}/latest/g;' \
- -e 's/20\d{6}/latest/g;' \
- -e 's/20\d{2}\.\d{2}/latest/g;' \
- <<<"$f")
- ln -svf "$f" "$of"
- done
- popd >/dev/null || exit
- done
-}
-
-post_build() {
- local set=$1 spec=$2
-
- pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
- case ${spec} in
- hardened/stage4-minimal.spec)
- upload stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null || exit
-}
-
-# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-25 4:01 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-07-25 4:01 UTC (permalink / raw
To: gentoo-commits
commit: 12b449177dbfa253f30f0a1e27fb6cd612daca7e
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 25 03:59:03 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Jul 25 03:59:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=12b44917
tools/catalyst-auto-arm64.conf: prepare iso upload code
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 518fa972..62a4b23d 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -34,6 +34,9 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
+ installcd-stage2-minimal.spec)
+ upload default/*${TIMESTAMP}*.iso*
+ ;;
stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-15 4:32 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-07-15 4:32 UTC (permalink / raw
To: gentoo-commits
commit: 157cb56b9b26cf1955bc0b1357cae33753588985
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 15 04:31:36 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Jul 15 04:31:36 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=157cb56b
tools/catalyst-auto-ppc64le.conf: symlink latest power9le stages
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 8fd6681c..451162d3 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -24,7 +24,7 @@ update_symlinks() {
local d f t
for d in "${BUILD_SRCDIR_BASE}"/builds/{default,power9le,musl-hardened} ; do
pushd "${d}" >/dev/null
- for t in ppc64le; do
+ for t in ppc64le power9le; do
for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-14 21:21 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-07-14 21:21 UTC (permalink / raw
To: gentoo-commits
commit: 1f8c83c59a445c075dc8ba7521b5600af5a173d8
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 21:20:39 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 21:20:39 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1f8c83c5
tools/catalyst-auto-ppc64le.conf: use new musl spec names
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 1adc4968..8fd6681c 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -10,7 +10,7 @@ OPTIONAL_SPECS+=" installcd-stage1.spec installcd-stage2-minimal.spec"
OPTIONAL_SPECS+=" stage1-systemd.spec stage3-systemd.spec"
OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec"
OPTIONAL_SPECS+=" stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
-OPTIONAL_SPECS+=" musl-hardened-stage1.spec musl-hardened-stage3.spec"
+OPTIONAL_SPECS+=" stage1-musl-hardened-openrc.spec stage3-musl-hardened-openrc.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-14 20:43 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-07-14 20:43 UTC (permalink / raw
To: gentoo-commits
commit: a3a1becbc6a82bdfe8a7110f50ce8d042acd2155
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 14 20:43:05 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed Jul 14 20:43:05 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a3a1becb
tools/catalyst-auto-ppc64le.conf: re-shuffle spec order
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 5a5ff353..1adc4968 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -6,8 +6,8 @@ UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
SPECS="stage1-openrc.spec stage3-openrc.spec"
-SPECS+=" installcd-stage1.spec installcd-stage2-minimal.spec"
-OPTIONAL_SPECS="stage1-systemd.spec stage3-systemd.spec"
+OPTIONAL_SPECS+=" installcd-stage1.spec installcd-stage2-minimal.spec"
+OPTIONAL_SPECS+=" stage1-systemd.spec stage3-systemd.spec"
OPTIONAL_SPECS+=" stage1-openrc-power9le.spec stage3-openrc-power9le.spec"
OPTIONAL_SPECS+=" stage1-systemd-power9le.spec stage3-systemd-power9le.spec"
OPTIONAL_SPECS+=" musl-hardened-stage1.spec musl-hardened-stage3.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-12 21:17 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-12 21:17 UTC (permalink / raw
To: gentoo-commits
commit: 4d0fcd831a752422a33dd9ec61a8537f7317f4c7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 12 21:16:56 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 12 21:16:56 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4d0fcd83
x86: fix installcd filename
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86-demeter.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86-demeter.conf
index dd26bd1c..185564ca 100644
--- a/tools/catalyst-auto-x86-demeter.conf
+++ b/tools/catalyst-auto-x86-demeter.conf
@@ -66,7 +66,7 @@ post_build() {
upload stage3-i486-openrc-${TIMESTAMP}.tar.xz*
;;
i486/installcd-stage2-minimal-openrc.spec)
- upload install-x86-minimal-openrc-${TIMESTAMP}.iso*
+ upload install-x86-minimal-${TIMESTAMP}.iso*
;;
i686/stage3-openrc.spec)
upload stage3-i686-openrc-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-10 21:53 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-10 21:53 UTC (permalink / raw
To: gentoo-commits
commit: 48d54deb9406b5e8217a88b6e769170df77128e5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 21:53:09 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 21:53:09 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=48d54deb
amd64: also upload nomultilib systemd stage3
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64-demeter.conf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf
index 42755ae3..04b76871 100644
--- a/tools/catalyst-auto-amd64-demeter.conf
+++ b/tools/catalyst-auto-amd64-demeter.conf
@@ -93,6 +93,9 @@ post_build() {
nomultilib/stage3-openrc.spec)
upload stage3-amd64-nomultilib-openrc-${TIMESTAMP}.tar.xz*
;;
+ nomultilib/stage3-systemd.spec)
+ upload stage3-amd64-nomultilib-systemd-${TIMESTAMP}.tar.xz*
+ ;;
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-08 8:26 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-08 8:26 UTC (permalink / raw
To: gentoo-commits
commit: bf734239dbaa49231fd9082dc40dd32795c7bced
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 8 08:25:45 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Jul 8 08:25:45 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bf734239
amd64: make flat upload directory, no subdirs
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64-demeter.conf | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf
index 8f462ad9..ec8a2ae3 100644
--- a/tools/catalyst-auto-amd64-demeter.conf
+++ b/tools/catalyst-auto-amd64-demeter.conf
@@ -50,8 +50,9 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}
+
pushd "${BUILD_SRCDIR_BASE}"/builds/default >/dev/null || exit
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}/x32
case ${spec} in
x32/stage3-openrc.spec)
upload stage3-x32-openrc-${TIMESTAMP}.tar.xz*
@@ -60,7 +61,6 @@ post_build() {
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl
case ${spec} in
musl/stage3.spec)
upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
@@ -69,7 +69,6 @@ post_build() {
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}/musl
case ${spec} in
musl/stage3-hardened.spec)
upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-06 23:02 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-06 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 7ab4ecfe706b34e19dc3fe85b48d284918cd21f4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 6 23:01:54 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 6 23:02:24 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7ab4ecfe
x86: fix admincd filename
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86-demeter.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86-demeter.conf
index 92996020..dd26bd1c 100644
--- a/tools/catalyst-auto-x86-demeter.conf
+++ b/tools/catalyst-auto-x86-demeter.conf
@@ -83,7 +83,7 @@ post_build() {
upload stage3-i686-hardened-openrc-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2-openrc.spec)
- upload admincd-x86-hardened-openrc-${TIMESTAMP}.iso*
+ upload admincd-x86-${TIMESTAMP}.iso*
;;
esac
popd >/dev/null || exit
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-06 23:02 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-06 23:02 UTC (permalink / raw
To: gentoo-commits
commit: 942e73d16daff6b4e0864ed4886ddce979cd79fe
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 6 22:59:44 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 6 23:02:21 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=942e73d1
x86: build musl last, works fine now
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86-demeter.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86-demeter.conf
index fa13276f..92996020 100644
--- a/tools/catalyst-auto-x86-demeter.conf
+++ b/tools/catalyst-auto-x86-demeter.conf
@@ -12,11 +12,11 @@ EMAIL_SUBJECT_PREPEND="[x86-auto]"
SPECS_DIR=${REPO_DIR}/releases/specs/x86
SETS="
- musl
i486_openrc
i686_openrc
i686_systemd
hardened_openrc
+ musl
"
SET_i486_openrc_SPECS="i486/stage1-openrc.spec i486/stage2-openrc.spec i486/stage3-openrc.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-05 23:31 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-05 23:31 UTC (permalink / raw
To: gentoo-commits
commit: a59843d9bdbd557d237a4e6f4ec85eabc210d0d9
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 5 23:31:13 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 5 23:31:13 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a59843d9
x86: delete obsolete catalyst-auto config file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 77 --------------------------------------------
1 file changed, 77 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
deleted file mode 100644
index 075bb447..00000000
--- a/tools/catalyst-auto-x86.conf
+++ /dev/null
@@ -1,77 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-UPLOAD_USER=x86
-UPLOAD_KEY=/root/.ssh/id_rsa
-host=$(hostname)
-
-ARCH="x86"
-TYPE="auto"
-source /etc/catalyst/release/build.env
-
-SPECS_DIR=${REPO_DIR}/releases/specs/x86
-
-SETS=""
-SPECS="nosuchfile.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86
-
-EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd "${d}" >/dev/null || exit
- shopt -s extglob
- for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
- # 20yymmddThhmmssZ
- # 20yymmddhhmmss
- # 20yymmdd
- # 20yy.n
- of=$(perl -p \
- -e 's/20\d{6}T\d{6}Z/latest/g;' \
- -e 's/20\d{6}\d{6}/latest/g;' \
- -e 's/20\d{6}/latest/g;' \
- -e 's/20\d{2}\.\d{2}/latest/g;' \
- <<<"$f")
- ln -svf "$f" "$of"
- done
- popd >/dev/null || exit
- done
-}
-
-post_build() {
- local set=$1 spec=$2
-
- pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}
- case ${spec} in
- stage3.spec)
- upload stage3-i486-${TIMESTAMP}.tar.xz*
- ;;
- installcd-stage2-minimal.spec)
- upload install-x86-minimal-${TIMESTAMP}.iso*
- ;;
- i686/stage3.spec)
- upload stage3-i686-${TIMESTAMP}.tar.xz*
- ;;
- i686/stage3-systemd.spec)
- upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null || exit
-
- pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
- UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
- case ${spec} in
- hardened/stage3.spec)
- upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*
- ;;
- hardened/admincd-stage2.spec)
- upload admincd-x86-${TIMESTAMP}.iso*
- ;;
- esac
- popd >/dev/null || exit
-}
-
-# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-05 23:21 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-05 23:21 UTC (permalink / raw
To: gentoo-commits
commit: 0e939e4cb1b3fedf5114454b4c14821346712eb7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 5 23:21:23 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 5 23:21:23 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0e939e4c
x86: also symlink latest in musl builds dir
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86-demeter.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86-demeter.conf
index f8ad498f..fa13276f 100644
--- a/tools/catalyst-auto-x86-demeter.conf
+++ b/tools/catalyst-auto-x86-demeter.conf
@@ -36,7 +36,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened} ; do
+ for d in ${BUILD_SRCDIR_BASE}/builds/{default,hardened,musl} ; do
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-05 22:23 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-05 22:23 UTC (permalink / raw
To: gentoo-commits
commit: 9f5c1be3930e1f53b0535fc370dff8b6e278bd1f
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 5 22:22:33 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 5 22:23:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9f5c1be3
amd64: rename conf file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/{catalyst-auto-amd64-musl.conf => catalyst-auto-amd64-demeter.conf} | 0
1 file changed, 0 insertions(+), 0 deletions(-)
diff --git a/tools/catalyst-auto-amd64-musl.conf b/tools/catalyst-auto-amd64-demeter.conf
similarity index 100%
rename from tools/catalyst-auto-amd64-musl.conf
rename to tools/catalyst-auto-amd64-demeter.conf
^ permalink raw reply [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-04 20:32 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-04 20:32 UTC (permalink / raw
To: gentoo-commits
commit: 0773a936df93b33003e3fe70e514f50117b09b06
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 4 17:23:59 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun Jul 4 17:23:59 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0773a936
x86: fix e-mail subject
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86-demeter.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86-demeter.conf
index 6f16156f..84c2f985 100644
--- a/tools/catalyst-auto-x86-demeter.conf
+++ b/tools/catalyst-auto-x86-demeter.conf
@@ -7,6 +7,7 @@ host=$(hostname)
ARCH="x86"
TYPE="auto"
+EMAIL_SUBJECT_PREPEND="[x86-auto]"
SPECS_DIR=${REPO_DIR}/releases/specs/x86
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-07-02 19:45 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-07-02 19:45 UTC (permalink / raw
To: gentoo-commits
commit: fc700b0e620f7f85e3ef928a1f6383e61a32ff88
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 2 19:44:17 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul 2 19:44:51 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fc700b0e
x86: Fix tarball path in c-auto conf
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-x86-demeter.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86-demeter.conf
index 522ccc26..ab0fc7b6 100644
--- a/tools/catalyst-auto-x86-demeter.conf
+++ b/tools/catalyst-auto-x86-demeter.conf
@@ -24,7 +24,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
+ for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
@@ -47,7 +47,7 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+ pushd ${BUILD_SRCDIR_BASE}/builds/default >/dev/null || exit
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
i486/stage3-openrc.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-06-29 21:12 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-06-29 21:12 UTC (permalink / raw
To: gentoo-commits
commit: 4bedfac79514e54fce9090b49ad716a723d4ec27
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 29 21:11:54 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 29 21:11:54 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4bedfac7
catalyst-auto: also here, move riscv64 stages back to build-type default
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 9 ++-------
1 file changed, 2 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 4954bdae..6a03879b 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -19,9 +19,6 @@ SETS="
multilib_200_systemd
"
-# riscv32 does not work yet
-# ilp32
-
SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec"
SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec"
SET_lp64_200_openrc_SPECS="stage1-lp64-20.0-openrc.spec stage3-lp64-20.0-openrc.spec"
@@ -29,12 +26,10 @@ SET_lp64_200_systemd_SPECS="stage1-lp64-20.0-systemd.spec stage3-lp64-20.0-syste
SET_multilib_200_openrc_SPECS="stage1-multilib-20.0-openrc.spec stage3-multilib-20.0-openrc.spec"
SET_multilib_200_systemd_SPECS="stage1-multilib-20.0-systemd.spec stage3-multilib-20.0-systemd.spec"
-SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec"
-
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/20.0" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
@@ -49,7 +44,7 @@ post_build() {
case ${spec} in
stage3*.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/20.0" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
popd >/dev/null
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-06-25 19:17 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-06-25 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 6abc54887ecc2c99d920f03dfaec2d1ca3bfe334
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 25 19:07:00 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun 25 19:07:25 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6abc5488
riscv: also upload 20.0 multilib
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 6212a8fe..78b7197d 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -46,16 +46,11 @@ post_build() {
local set=$1 spec=$2
case ${spec} in
- stage3*lp64*20.0*.spec)
+ stage3*.spec)
pushd "${BUILD_SRCDIR_BASE}/builds/20.0" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
popd >/dev/null
;;
- stage3*lp64*.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
- popd >/dev/null
- ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-06-23 16:14 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-06-23 16:14 UTC (permalink / raw
To: gentoo-commits
commit: cc9a2bf23dd5c465c3dcf97f62b01aa32252ef1d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 23 16:13:43 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Jun 23 16:13:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cc9a2bf2
riscv: enable multilib autobuild
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 146a43f0..6212a8fe 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -15,18 +15,17 @@ SETS="
lp64d_200_systemd
lp64_200_openrc
lp64_200_systemd
+ multilib_200_openrc
"
# riscv32 does not work yet
# ilp32
-# multilib needs re-bootstrapping
-
-SET_multilib_SPECS="stage1-multilib.spec stage3-multilib.spec"
SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec"
SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec"
SET_lp64_200_openrc_SPECS="stage1-lp64-20.0-openrc.spec stage3-lp64-20.0-openrc.spec"
SET_lp64_200_systemd_SPECS="stage1-lp64-20.0-systemd.spec stage3-lp64-20.0-systemd.spec"
+SET_multilib_200_openrc_SPECS="stage1-multilib-20.0-openrc.spec stage3-multilib-20.0-openrc.spec"
SET_ilp32_SPECS="stage1-ilp32.spec stage3-ilp32.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-06-15 14:18 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-06-15 14:18 UTC (permalink / raw
To: gentoo-commits
commit: 5413402d5ae386897d24ac39a7755de77ef3d9c5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 15 14:18:23 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jun 15 14:18:37 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5413402d
Fix riscv upload instructions
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 17 ++++++++++-------
1 file changed, 10 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index d6fed219..a1ebcf8e 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -51,16 +51,19 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
-
case ${spec} in
+ stage3*lp64*20.0*.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/20.0" >/dev/null
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
stage3*lp64*.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ popd >/dev/null
+ ;;
+ *)
+ echo "Finished ${spec}"
;;
- *)
- echo "Finished ${spec}"
- ;;
esac
-
- popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-06-11 16:11 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-06-11 16:11 UTC (permalink / raw
To: gentoo-commits
commit: ca22d0bbc634ecd52f517087c9c6c9cca80ba7b5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 11 16:09:55 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 16:11:01 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ca22d0bb
Add riscv64-lp64d stages with libdir=lib64 to the autobuilds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 8b49333e..d6fed219 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -11,6 +11,8 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
SETS="
+ lp64d_200_openrc
+ lp64d_200_systemd
lp64d
lp64
lp64d_systemd
@@ -19,13 +21,18 @@ SETS="
# riscv32 does not work yet
# ilp32
-
+# multilib needs re-bootstrapping
SET_multilib_SPECS="stage1-multilib.spec stage2-multilib.spec stage3-multilib.spec"
+
+SET_lp64d_200_openrc_SPECS="stage1-lp64d-20.0-openrc.spec stage2-lp64d-20.0-openrc.spec stage3-lp64d-20.0-openrc.spec"
+SET_lp64d_200_systemd_SPECS="stage1-lp64d-20.0-systemd.spec stage2-lp64d-20.0-systemd.spec stage3-lp64d-20.0-systemd.spec"
+
SET_lp64d_SPECS="stage1-lp64d.spec stage2-lp64d.spec stage3-lp64d.spec"
SET_lp64_SPECS="stage1-lp64.spec stage2-lp64.spec stage3-lp64.spec"
SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage2-lp64d-systemd.spec stage3-lp64d-systemd.spec"
SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage2-lp64-systemd.spec stage3-lp64-systemd.spec"
+
SET_ilp32_SPECS="stage1-ilp32.spec stage2-ilp32.spec stage3-ilp32.spec"
update_symlinks() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-31 8:27 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-05-31 8:27 UTC (permalink / raw
To: gentoo-commits
commit: 3b9621a4369f0f54a31f189ec07f095358197277
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Mon May 31 06:18:35 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Mon May 31 06:18:35 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3b9621a4
tools/catalyst-auto-ppc.conf: enable ppc64 hardened musl builds
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 0fbc89c8..9717ee93 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -11,7 +11,7 @@ SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
-#OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/musl-hardened-stage1.spec ppc64/musl-hardened-stage3.spec"
+OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/musl-hardened-stage1.spec ppc64/musl-hardened-stage3.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
@@ -20,7 +20,7 @@ EMAIL_SUBJECT_PREPEND="[ppc-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl-hardened" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3-ppc-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-30 21:38 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-05-30 21:38 UTC (permalink / raw
To: gentoo-commits
commit: c2cc59941d0a2675edca7eb4eb5d1c57fd239f55
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun May 30 21:37:35 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun May 30 21:38:01 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c2cc5994
tools/catalyst-auto-ppc64le.conf: enable installcd builds
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index c0218df8..6fbd174b 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -8,13 +8,11 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
SPECS="stage1.spec stage3.spec"
OPTIONAL_SPECS="systemd-stage1.spec systemd-stage3.spec"
OPTIONAL_SPECS="${OPTIONAL_SPECS} musl-hardened-stage1.spec musl-hardened-stage3.spec"
-#OPTIONAL_SPECS="${OPTIONAL_SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
+OPTIONAL_SPECS="${OPTIONAL_SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
-#OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-19 19:50 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-05-19 19:50 UTC (permalink / raw
To: gentoo-commits
commit: 3ed274bd9cc059eb6636b37008e7a08e826689ec
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed May 19 19:50:10 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed May 19 19:50:10 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3ed274bd
Fix musl upload logic
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64-musl.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64-musl.conf b/tools/catalyst-auto-amd64-musl.conf
index 13482b10..0ce857ec 100644
--- a/tools/catalyst-auto-amd64-musl.conf
+++ b/tools/catalyst-auto-amd64-musl.conf
@@ -50,7 +50,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
- stage3.spec)
+ musl/stage3.spec)
upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
;;
esac
@@ -59,7 +59,7 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
- stage3.spec)
+ musl/stage3-hardened.spec)
upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-13 3:19 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-05-13 3:19 UTC (permalink / raw
To: gentoo-commits
commit: 23d5c9acbf66227bfbb40a989b19922ef4f82d41
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 23:48:01 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed May 12 23:48:01 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=23d5c9ac
tools: adjust ppc basedir
don't cd into default, prepend default/ to each file.
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index dd9904dd..40ddd149 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -36,17 +36,17 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds" >/dev/null
case ${spec} in
ppc32/installcd-stage2-minimal.spec)
- upload *${TIMESTAMP}*.iso*
+ upload default/*${TIMESTAMP}*.iso*
;;
ppc32/stage3.spec)
- upload stage3-ppc-*${TIMESTAMP}*.xz*
+ upload default/stage3-ppc-*${TIMESTAMP}*.xz*
;;
ppc64/stage3.spec)
- upload stage3-ppc64-*${TIMESTAMP}*.xz*
+ upload default/stage3-ppc64-*${TIMESTAMP}*.xz*
;;
*)
echo "Finished ${spec}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-13 3:19 Georgy Yakovlev
0 siblings, 0 replies; 460+ messages in thread
From: Georgy Yakovlev @ 2021-05-13 3:19 UTC (permalink / raw
To: gentoo-commits
commit: 9740ac8c55c4755bc1328998db50dd3d24be91ca
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Wed May 12 23:55:07 2021 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Wed May 12 23:56:15 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9740ac8c
tools/catalyst-auto-ppc.conf: optionally build musl specs, disabled until tested
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 40ddd149..0fbc89c8 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -11,7 +11,8 @@ SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
-
+#OPTIONAL_SPECS="${OPTIONAL_SPECS} ppc64/musl-hardened-stage1.spec ppc64/musl-hardened-stage3.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/powerpc
EMAIL_SUBJECT_PREPEND="[ppc-auto]"
@@ -48,6 +49,9 @@ post_build() {
ppc64/stage3.spec)
upload default/stage3-ppc64-*${TIMESTAMP}*.xz*
;;
+ ppc64/musl-hardened-stage3*.spec)
+ upload musl-hardened/stage3-ppc64-musl-hardened-${TIMESTAMP}*.xz*
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-08 13:55 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-05-08 13:55 UTC (permalink / raw
To: gentoo-commits
commit: 4087e82ce05e2753413d99937a1f36c389aedbf4
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 8 13:55:09 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 8 13:55:09 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4087e82c
Minor changes amd64/musl: shift path components between variables
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64-musl.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-amd64-musl.conf b/tools/catalyst-auto-amd64-musl.conf
index d08f19e3..13482b10 100644
--- a/tools/catalyst-auto-amd64-musl.conf
+++ b/tools/catalyst-auto-amd64-musl.conf
@@ -8,15 +8,15 @@ host=$(hostname)
ARCH="amd64"
TYPE="auto"
-SPECS_DIR=${REPO_DIR}/releases/specs/amd64/musl
+SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
vanilla
hardened
"
-SET_vanilla_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_hardened_SPECS="stage1-hardened.spec stage2-hardened.spec stage3-hardened.spec"
+SET_vanilla_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
+SET_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-02 2:28 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-05-02 2:28 UTC (permalink / raw
To: gentoo-commits
commit: 3be1f70b59aba7e9774208cfc58144d47d149d05
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sun May 2 02:26:50 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sun May 2 02:26:50 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3be1f70b
Activate musl-hardened set
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64-musl.conf | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-amd64-musl.conf b/tools/catalyst-auto-amd64-musl.conf
index 8344aa59..d08f19e3 100644
--- a/tools/catalyst-auto-amd64-musl.conf
+++ b/tools/catalyst-auto-amd64-musl.conf
@@ -12,12 +12,11 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64/musl
SETS="
vanilla
+ hardened
"
-# hardened
-# vanilla_systemd
-# hardened_systemd
SET_vanilla_SPECS="stage1.spec stage2.spec stage3.spec"
+SET_hardened_SPECS="stage1-hardened.spec stage2-hardened.spec stage3-hardened.spec"
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
@@ -25,7 +24,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/musl ; do
+ for d in ${BUILD_SRCDIR_BASE}/builds/{musl,musl-hardened} ; do
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
@@ -56,6 +55,15 @@ post_build() {
;;
esac
popd >/dev/null || exit
+
+ pushd "${BUILD_SRCDIR_BASE}"/builds/musl-hardened >/dev/null || exit
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}
+ case ${spec} in
+ stage3.spec)
+ upload stage3-amd64-musl-hardened-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null || exit
}
# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-01 20:53 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-05-01 20:53 UTC (permalink / raw
To: gentoo-commits
commit: 506c8f79a50c90accf14cc70c8055d01203f979e
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 20:53:29 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 1 20:53:29 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=506c8f79
Fix path, again
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64-musl.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64-musl.conf b/tools/catalyst-auto-amd64-musl.conf
index 65de7672..8344aa59 100644
--- a/tools/catalyst-auto-amd64-musl.conf
+++ b/tools/catalyst-auto-amd64-musl.conf
@@ -25,7 +25,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/musl ; do
+ for d in ${BUILD_SRCDIR_BASE}/builds/musl ; do
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
@@ -48,7 +48,7 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}"/musl >/dev/null || exit
+ pushd "${BUILD_SRCDIR_BASE}"/builds/musl >/dev/null || exit
UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
stage3.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-01 20:50 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-05-01 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 6e6811f188354b6f6e8b46c068552ee486d30caa
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 20:46:36 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 1 20:46:36 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6e6811f1
Fix directory path
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64-musl.conf | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64-musl.conf b/tools/catalyst-auto-amd64-musl.conf
index 1b4e2b3b..65de7672 100644
--- a/tools/catalyst-auto-amd64-musl.conf
+++ b/tools/catalyst-auto-amd64-musl.conf
@@ -7,7 +7,6 @@ host=$(hostname)
ARCH="amd64"
TYPE="auto"
-source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/specs/amd64/musl
@@ -26,7 +25,7 @@ EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/{musl} ; do
+ for d in ${BUILD_SRCDIR_BASE}/musl ; do
pushd "${d}" >/dev/null || exit
shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-05-01 20:22 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-05-01 20:22 UTC (permalink / raw
To: gentoo-commits
commit: 1151b7a5c0901fb91723d20be695e43a11d1bf7d
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat May 1 20:14:28 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat May 1 20:21:52 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1151b7a5
Add experimental musl catalust-auto config file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-amd64-musl.conf | 62 +++++++++++++++++++++++++++++++++++++
1 file changed, 62 insertions(+)
diff --git a/tools/catalyst-auto-amd64-musl.conf b/tools/catalyst-auto-amd64-musl.conf
new file mode 100644
index 00000000..1b4e2b3b
--- /dev/null
+++ b/tools/catalyst-auto-amd64-musl.conf
@@ -0,0 +1,62 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+UPLOAD_USER=amd64
+UPLOAD_KEY=/root/.ssh/id_rsa
+host=$(hostname)
+
+ARCH="amd64"
+TYPE="auto"
+source /etc/catalyst/release/build.env
+
+SPECS_DIR=${REPO_DIR}/releases/specs/amd64/musl
+
+SETS="
+ vanilla
+"
+# hardened
+# vanilla_systemd
+# hardened_systemd
+
+SET_vanilla_SPECS="stage1.spec stage2.spec stage3.spec"
+
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
+
+EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
+
+update_symlinks() {
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/{musl} ; do
+ pushd "${d}" >/dev/null || exit
+ shopt -s extglob
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
+ # 20yymmddThhmmssZ
+ # 20yymmddhhmmss
+ # 20yymmdd
+ # 20yy.n
+ of=$(perl -p \
+ -e 's/20\d{6}T\d{6}Z/latest/g;' \
+ -e 's/20\d{6}\d{6}/latest/g;' \
+ -e 's/20\d{6}/latest/g;' \
+ -e 's/20\d{2}\.\d{2}/latest/g;' \
+ <<<"$f")
+ ln -svf "$f" "$of"
+ done
+ popd >/dev/null || exit
+ done
+}
+
+post_build() {
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}"/musl >/dev/null || exit
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}
+ case ${spec} in
+ stage3.spec)
+ upload stage3-amd64-musl-${TIMESTAMP}.tar.xz*
+ ;;
+ esac
+ popd >/dev/null || exit
+}
+
+# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-04-05 19:35 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-04-05 19:35 UTC (permalink / raw
To: gentoo-commits
commit: a6601df9003955fbefa1b7eefad4dec637c504b7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 5 19:34:25 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Apr 5 19:34:25 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a6601df9
tools/: don't build the hidden riscv-multilib for now, needs manual work
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 261d6db4..8b49333e 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -11,7 +11,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
SETS="
- multilib
lp64d
lp64
lp64d_systemd
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 7b51adc7521e137a33c5a5924b03054dc736585f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 23:24:53 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 23:27:13 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7b51adc7
tools: Simplify nonetwork handling
... and fix the indentation.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 70be8055..1f053048 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -53,7 +53,7 @@ EOH
}
send_email() {
- if [[ ${nonetwork} == 0 ]]; then
+ [[ ${nonetwork} == 0 ]] || return
local subject="${EMAIL_SUBJECT_PREPEND} $1"
local message=$2
@@ -69,8 +69,6 @@ send_email() {
printf 'From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%b' \
"${EMAIL_FROM}" "${EMAIL_TO}" "${subject}" "${body}" | \
/usr/sbin/sendmail -f "${EMAIL_FROM}" ${EMAIL_TO//,/ }
-
- fi
}
# Usage: run_cmd <logfile> <command to run>
@@ -249,7 +247,7 @@ git_update() {
# SSH fingerprint from DNS. To do this securely, we need to ensure DNSSEC is
# working.
verify_dnssec() {
- if [[ ${nonetwork} == 0 ]]; then
+ [[ ${nonetwork} == 0 ]] || return
which dig >/dev/null || {
echo "net-dns/bind-tools is needed to verify DNSSEC is working"
@@ -265,8 +263,6 @@ verify_dnssec() {
echo "DNSSEC is not enabled in /etc/resolv.conf"
exit 1
fi
-
- fi
}
upload() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 174254bbb1a7245e192fbe041b66ffc202ff5650
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 23:22:07 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 23:22:07 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=174254bb
tools: Include post_build.log contents when successful
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 0f0eae34..70be8055 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -522,7 +522,7 @@ run_catalyst_commands() {
(date -d"${stamp}" +%s; echo "${stamp}") >"${last_success_file}"
fi
- send_email "Catalyst build success" "Build process complete."
+ send_email "Catalyst build success" "Build process complete." "${TMPDIR}/log/post_build.log"
if [[ ${keep_tmpdir} == 0 ]]; then
if ! rm -rf "${TMPDIR}"; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 22d3877eb4a7d7e7eb5c89269ae3bca660125df2
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 23:00:32 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 23:00:32 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=22d3877e
tools: Correct ARM stage names
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 8 ++++----
tools/catalyst-auto-qemu-arm.conf | 8 ++++----
2 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 829ff4c5..49495a2c 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -79,10 +79,10 @@ post_build() {
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat.spec)
- upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
+ upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd.spec)
- upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
+ upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3.spec)
upload stage3-armv7a-${TIMESTAMP}*.xz*
@@ -91,10 +91,10 @@ post_build() {
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat.spec)
- upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
+ upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd.spec)
- upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
+ upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
esac
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 0e2d7826..e30178dc 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -80,10 +80,10 @@ post_build() {
upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat.spec)
- upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
+ upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
;;
armv6j/stage3-hardfloat-systemd.spec)
- upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
+ upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3.spec)
upload stage3-armv7a-${TIMESTAMP}*.xz*
@@ -92,10 +92,10 @@ post_build() {
upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat.spec)
- upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
+ upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
;;
armv7a/stage3-hardfloat-systemd.spec)
- upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
+ upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 33ce8acb5722cf2f91e81ed918e46cb4f0ef8ffe
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 00:41:01 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 01:56:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=33ce8acb
tools: Use same set of RSYNC_OPTS
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 3 +++
tools/catalyst-auto-arm.conf | 3 +++
tools/catalyst-auto-arm64.conf | 3 +++
tools/catalyst-auto-hppa.conf | 3 +++
tools/catalyst-auto-ia64.conf | 3 +++
tools/catalyst-auto-ppc.conf | 3 +++
tools/catalyst-auto-ppc64le.conf | 3 +++
tools/catalyst-auto-qemu-arm.conf | 3 +++
tools/catalyst-auto-qemu-riscv.conf | 3 +++
tools/catalyst-auto-s390.conf | 3 +++
tools/catalyst-auto-s390x.conf | 3 +++
tools/catalyst-auto-sparc64.conf | 3 +++
12 files changed, 36 insertions(+)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 381171b5..6a233900 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -44,6 +44,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index eaae0399..5c78ab99 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -66,6 +66,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 1bd94ae9..f1ce7ab1 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -38,6 +38,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 3b93e4ec..6ba59c81 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -44,6 +44,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 2d87a837..1d123d2a 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -37,6 +37,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 615c3f55..61354d22 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -43,6 +43,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index e2394932..a8e438e1 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -44,6 +44,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index e6075ec3..68f583ef 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -67,6 +67,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index dced8eec..035c0ee7 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -54,6 +54,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
fi
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index d8a39286..e442414c 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -37,6 +37,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index e8a509d5..980b721d 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -37,6 +37,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 9cfbdcd5..1b730c54 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -39,6 +39,9 @@ upload() {
)
local RSYNC_OPTS=(
-e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
)
rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 7ec486fab44faf29fc8abbedf9449f64088a89de
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 01:02:35 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 01:57:12 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7ec486fa
tools: Consolidate upload() function
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 24 +++++++++++++++++++++++-
tools/catalyst-auto-alpha.conf | 18 ------------------
tools/catalyst-auto-amd64.conf | 18 ------------------
tools/catalyst-auto-arm.conf | 23 -----------------------
tools/catalyst-auto-arm64.conf | 17 -----------------
tools/catalyst-auto-hppa.conf | 17 -----------------
tools/catalyst-auto-ia64.conf | 17 -----------------
tools/catalyst-auto-ppc.conf | 17 -----------------
tools/catalyst-auto-ppc64le.conf | 17 -----------------
tools/catalyst-auto-qemu-arm.conf | 23 -----------------------
tools/catalyst-auto-qemu-riscv.conf | 20 --------------------
tools/catalyst-auto-s390.conf | 17 -----------------
tools/catalyst-auto-s390x.conf | 17 -----------------
tools/catalyst-auto-sparc64.conf | 17 -----------------
tools/catalyst-auto-x86.conf | 18 ------------------
15 files changed, 23 insertions(+), 257 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 203abe81..0f0eae34 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -47,7 +47,6 @@ Options:
--interval <days> Exit if last successful run was less than <days> ago
-l|--lock <file> File to grab a lock on to prevent multiple invocations
-X|--nonetwork Do not perform network operations (like uploading result)
- This needs to be supported by the config file as well.
-h|--help Show this message and quit
EOH
@@ -270,6 +269,29 @@ verify_dnssec() {
fi
}
+upload() {
+ if [[ ${nonetwork} == 0 ]]; then
+ echo Uploading "$@"
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
+ else
+ echo Would now upload "$@"
+ ls -l $@
+ fi
+}
+
run_catalyst_commands() {
doneconfig=0
for config_file in "${config_files[@]}"; do
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index c2359f59..f755c9b5 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -33,24 +33,6 @@ update_symlinks() {
done
}
-upload() {
- echo Uploading "$@"
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 0b07c988..b14013f7 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -65,24 +65,6 @@ update_symlinks() {
done
}
-upload() {
- echo " ** Uploading $@"
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index b15d3569..829ff4c5 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -54,29 +54,6 @@ update_symlinks() {
done
}
-upload() {
- if [[ ${nonetwork} == 0 ]]; then
- echo Uploading "$@"
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
- else
- echo Would now upload "$@"
- ls -l $@
- fi
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index c14cb56b..5346153f 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -28,23 +28,6 @@ update_symlinks() {
done
}
-upload() {
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index d93a1370..8ad8f767 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -34,23 +34,6 @@ update_symlinks() {
done
}
-upload() {
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 852be0d4..009d5fd9 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -27,23 +27,6 @@ update_symlinks() {
done
}
-upload() {
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 68f49290..3a81822e 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -32,23 +32,6 @@ update_symlinks() {
popd >/dev/null
done
}
-
-upload() {
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index ecd4a738..a93975ca 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -34,23 +34,6 @@ update_symlinks() {
done
}
-upload() {
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 68b51a2d..0e2d7826 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -55,29 +55,6 @@ update_symlinks() {
done
}
-upload() {
- if [[ ${nonetwork} == 0 ]]; then
- echo Uploading "$@"
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
- else
- echo Would now upload "$@"
- ls -l $@
- fi
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index ce73642b..e809b598 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -42,26 +42,6 @@ update_symlinks() {
done
}
-upload() {
- if [[ ${nonetwork} == 0 ]]; then
- echo Uploading "$@"
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
- fi
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 11bdf6cc..15b5382b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -27,23 +27,6 @@ update_symlinks() {
done
}
-upload() {
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 1a5ea91d..5a351358 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -27,23 +27,6 @@ update_symlinks() {
done
}
-upload() {
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 77dd62ee..668971db 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -29,23 +29,6 @@ update_symlinks() {
done
}
-upload() {
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index bb779d7e..5822d992 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -52,24 +52,6 @@ update_symlinks() {
done
}
-upload() {
- echo " ** Uploading $@"
- local SSH_CMD=(
- ssh
- -i ${UPLOAD_KEY}
- -o UserKnownHostsFile=/dev/null
- -o VerifyHostKeyDNS=yes
- -o StrictHostKeyChecking=no
- )
- local RSYNC_OPTS=(
- -e "${SSH_CMD[*]}"
- --archive
- --omit-dir-times
- --delay-updates
- )
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
-}
-
post_build() {
local set=$1 spec=$2
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 4de1432aa1494b7c2459bb7fa740234a6777eac5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 00:39:55 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 01:56:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4de1432a
tools: Add RSYNC_OPTS array
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 5 ++++-
tools/catalyst-auto-amd64.conf | 14 +++++++-------
tools/catalyst-auto-arm.conf | 5 ++++-
tools/catalyst-auto-arm64.conf | 5 ++++-
tools/catalyst-auto-hppa.conf | 5 ++++-
tools/catalyst-auto-ia64.conf | 5 ++++-
tools/catalyst-auto-ppc.conf | 5 ++++-
tools/catalyst-auto-ppc64le.conf | 5 ++++-
tools/catalyst-auto-qemu-arm.conf | 5 ++++-
tools/catalyst-auto-qemu-riscv.conf | 5 ++++-
tools/catalyst-auto-s390.conf | 5 ++++-
tools/catalyst-auto-s390x.conf | 5 ++++-
tools/catalyst-auto-sparc64.conf | 5 ++++-
tools/catalyst-auto-x86.conf | 14 +++++++-------
14 files changed, 62 insertions(+), 26 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index ebaff6eb..381171b5 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -42,7 +42,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 0ef11f2f..363c80cb 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -74,13 +74,13 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync \
- -e "${SSH_CMD[*]}" \
- -a \
- --omit-dir-times \
- --delay-updates \
- "$@" \
- "${UPLOAD_DEST}"
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 26fe8156..eaae0399 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -64,7 +64,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 9f457989..1bd94ae9 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -36,7 +36,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 8b465421..3b93e4ec 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -42,7 +42,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 6c78c8a7..2d87a837 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -35,7 +35,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index a1286726..615c3f55 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -41,7 +41,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 0d54fab9..e2394932 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -42,7 +42,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 1a121997..e6075ec3 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -65,7 +65,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index b19de76f..dced8eec 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -52,7 +52,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
fi
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 5716702c..d8a39286 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -35,7 +35,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 3b4fd21c..e8a509d5 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -35,7 +35,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index bc441b2d..9cfbdcd5 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -37,7 +37,10 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index ef983969..1c809465 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -61,13 +61,13 @@ upload() {
-o VerifyHostKeyDNS=yes
-o StrictHostKeyChecking=no
)
- rsync \
- -e "${SSH_CMD[*]}" \
- -a \
- --omit-dir-times \
- --delay-updates \
- "$@" \
- "${UPLOAD_DEST}"
+ local RSYNC_OPTS=(
+ -e "${SSH_CMD[*]}"
+ --archive
+ --omit-dir-times
+ --delay-updates
+ )
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
}
post_build() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 2a8050450c9f210afff1624b1d6458bf4f782fae
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 1 04:03:24 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 1 04:03:24 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2a805045
tools: Readd ARCH/TYPE assignments
These are used in the sourced .env file.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 ++
tools/catalyst-auto-x86.conf | 2 ++
2 files changed, 4 insertions(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index b14013f7..2f6ed30e 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -5,6 +5,8 @@ UPLOAD_USER=amd64
UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname)
+ARCH="amd64"
+TYPE="auto"
source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/specs/amd64
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 5822d992..cee289e4 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -5,6 +5,8 @@ UPLOAD_USER=x86
UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname)
+ARCH="x86"
+TYPE="auto"
source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/specs/x86
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 8f478fe30ba9f3a43df0753fc8369f93b509f4af
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 01:00:37 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 01:56:43 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f478fe3
tools: Add UPLOAD_DEST
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-amd64.conf | 18 +++---------------
tools/catalyst-auto-arm.conf | 2 +-
tools/catalyst-auto-arm64.conf | 2 +-
tools/catalyst-auto-hppa.conf | 2 +-
tools/catalyst-auto-ia64.conf | 2 +-
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64le.conf | 2 +-
tools/catalyst-auto-qemu-arm.conf | 2 +-
tools/catalyst-auto-qemu-riscv.conf | 2 +-
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 2 +-
tools/catalyst-auto-x86.conf | 18 +++---------------
14 files changed, 18 insertions(+), 42 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 6a233900..c2359f59 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -48,7 +48,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 363c80cb..0b07c988 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -80,26 +80,14 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
local set=$1 spec=$2
- case $HOSTNAME in
- # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
- LOCAL)
- DEST_DEFAULT=${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
- ;;
- *)
- DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
- ;;
- esac
-
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
- UPLOAD_DEST=${DEST_DEFAULT}
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
stage3.spec)
upload stage3-amd64-${TIMESTAMP}.tar.xz*
@@ -126,7 +114,7 @@ post_build() {
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
- UPLOAD_DEST=${DEST_HARDENED}
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
case ${spec} in
hardened/stage3.spec)
upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 5c78ab99..b15d3569 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -70,7 +70,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index f1ce7ab1..c14cb56b 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -42,7 +42,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 6ba59c81..d93a1370 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -48,7 +48,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 1d123d2a..852be0d4 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -41,7 +41,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 61354d22..68f49290 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -47,7 +47,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index a8e438e1..ecd4a738 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -48,7 +48,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 68f583ef..68b51a2d 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -71,7 +71,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 035c0ee7..ce73642b 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -58,7 +58,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
fi
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index e442414c..11bdf6cc 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -41,7 +41,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 980b721d..1a5ea91d 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -41,7 +41,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 1b730c54..77dd62ee 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -43,7 +43,7 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 1c809465..bb779d7e 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -67,26 +67,14 @@ upload() {
--omit-dir-times
--delay-updates
)
- rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_DEST}
+ rsync "${RSYNC_OPTS[@]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:${UPLOAD_DEST}
}
post_build() {
local set=$1 spec=$2
- case $HOSTNAME in
- # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
- LOCAL)
- DEST_DEFAULT=${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
- ;;
- *)
- DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
- ;;
- esac
-
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
- UPLOAD_DEST=${DEST_DEFAULT}
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}
case ${spec} in
stage3.spec)
upload stage3-i486-${TIMESTAMP}.tar.xz*
@@ -104,7 +92,7 @@ post_build() {
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
- UPLOAD_DEST=${DEST_HARDENED}
+ UPLOAD_DEST=${BUILD_DESTDIR_BASE}/hardened
case ${spec} in
hardened/stage3.spec)
upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 3d95cec60b1acde2f6561df4dcc26f4b0dffe86c
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 00:01:29 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 00:01:29 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3d95cec6
tools: Add UPLOAD_KEY
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 3 ++-
tools/catalyst-auto-amd64.conf | 3 ++-
tools/catalyst-auto-arm.conf | 3 ++-
tools/catalyst-auto-arm64.conf | 3 ++-
tools/catalyst-auto-hppa.conf | 3 ++-
tools/catalyst-auto-ia64.conf | 3 ++-
tools/catalyst-auto-ppc.conf | 3 ++-
tools/catalyst-auto-ppc64le.conf | 3 ++-
tools/catalyst-auto-qemu-arm.conf | 3 ++-
tools/catalyst-auto-qemu-riscv.conf | 3 ++-
tools/catalyst-auto-s390.conf | 3 ++-
tools/catalyst-auto-s390x.conf | 3 ++-
tools/catalyst-auto-sparc64.conf | 3 ++-
tools/catalyst-auto-x86.conf | 3 ++-
14 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 687d1fc3..a60f979d 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=alpha
+UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/alpha
SPECS="stage1.spec stage3.spec"
@@ -34,7 +35,7 @@ update_symlinks() {
upload() {
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 3c0b6c99..16aeda56 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=amd64
+UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname)
source /etc/catalyst/release/build.env
@@ -67,7 +68,7 @@ update_symlinks() {
upload() {
echo " ** Uploading $@"
rsync \
- -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+ -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
-a \
--omit-dir-times \
--delay-updates \
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index feaad6bd..56459c50 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=arm
+UPLOAD_KEY=/root/.ssh/id_ed25519
host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs/arm
@@ -56,7 +57,7 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 14211166..064e6f41 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=arm64
+UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/arm64
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
@@ -28,7 +29,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 135b188c..d2034010 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=hppa
+UPLOAD_KEY=/root/.ssh/buildsync.key
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
@@ -34,7 +35,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/buildsync.key -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 2b495a73..845ffc51 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=ia64
+UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SPECS="stage1.spec stage3.spec"
@@ -27,7 +28,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index be7a7fc3..8628f30f 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=ppc
+UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ppc
SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
@@ -33,7 +34,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 5e1563b8..716e43fd 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=ppc
+UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
SPECS="stage1.spec stage3.spec"
@@ -34,7 +35,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 2d19a9b9..c351e99b 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=arm
+UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname)
@@ -57,7 +58,7 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 572d9d22..14e2b561 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=riscv
+UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname)
@@ -44,7 +45,7 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
fi
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index c8dbf832..8f59d581 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=s390
+UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
@@ -27,7 +28,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index c5a32dff..241179d5 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=s390
+UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
@@ -27,7 +28,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index cabf9293..fd963987 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=sparc
+UPLOAD_KEY=/root/.ssh/id_rsa
SPECS_DIR=${REPO_DIR}/releases/specs/sparc
SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec sparc/systemd-stage3.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec"
@@ -29,7 +30,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 1616e194..4753c3fe 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -2,6 +2,7 @@
# self-explanatory.
UPLOAD_USER=x86
+UPLOAD_KEY=/root/.ssh/id_rsa
host=$(hostname)
source /etc/catalyst/release/build.env
@@ -54,7 +55,7 @@ update_symlinks() {
upload() {
echo " ** Uploading $@"
rsync \
- -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+ -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
-a \
--omit-dir-times \
--delay-updates \
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: 5515e890485b5f23a68104dc7004235a02dca15d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 23:43:40 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 23:46:08 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5515e890
tools: Add UPLOAD_USER variable
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 3 ++-
tools/catalyst-auto-amd64.conf | 6 +++---
tools/catalyst-auto-arm.conf | 3 ++-
tools/catalyst-auto-arm64.conf | 3 ++-
tools/catalyst-auto-hppa.conf | 3 ++-
tools/catalyst-auto-ia64.conf | 3 ++-
tools/catalyst-auto-ppc.conf | 3 ++-
tools/catalyst-auto-ppc64le.conf | 3 ++-
tools/catalyst-auto-qemu-arm.conf | 4 +++-
tools/catalyst-auto-qemu-riscv.conf | 4 +++-
tools/catalyst-auto-s390.conf | 3 ++-
tools/catalyst-auto-s390x.conf | 3 ++-
tools/catalyst-auto-sparc64.conf | 3 ++-
tools/catalyst-auto-x86.conf | 6 +++---
14 files changed, 32 insertions(+), 18 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 27825851..687d1fc3 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=alpha
SPECS_DIR=${REPO_DIR}/releases/specs/alpha
SPECS="stage1.spec stage3.spec"
@@ -33,7 +34,7 @@ update_symlinks() {
upload() {
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" alpha@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 6ee56fb1..3c0b6c99 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-ARCH="amd64"
+UPLOAD_USER=amd64
host=$(hostname)
source /etc/catalyst/release/build.env
@@ -85,8 +85,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 9f873c31..feaad6bd 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=arm
host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs/arm
@@ -55,7 +56,7 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index e143ebbb..14211166 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=arm64
SPECS_DIR=${REPO_DIR}/releases/specs/arm64
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
@@ -27,7 +28,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm64@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 967985b6..135b188c 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=hppa
SPECS_DIR=${REPO_DIR}/releases/specs/hppa
SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
@@ -33,7 +34,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/buildsync.key -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" hppa@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/buildsync.key -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 0bc6e0af..2b495a73 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=ia64
SPECS_DIR=${REPO_DIR}/releases/specs/ia64
SPECS="stage1.spec stage3.spec"
@@ -26,7 +27,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ia64@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 4935739a..be7a7fc3 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=ppc
SPECS_DIR=${REPO_DIR}/releases/specs/ppc
SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
@@ -32,7 +33,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ppc@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 73f2d1c3..5e1563b8 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=ppc
SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
SPECS="stage1.spec stage3.spec"
@@ -33,7 +34,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ppc@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index a6d9cdd8..2d19a9b9 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -1,6 +1,8 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=arm
+
host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm
@@ -55,7 +57,7 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 89c40b79..572d9d22 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -1,6 +1,8 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=riscv
+
host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
@@ -42,7 +44,7 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" riscv@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
fi
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index ed84923a..c8dbf832 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=s390
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
@@ -26,7 +27,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" s390@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 8bdb8993..c5a32dff 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=s390
SPECS_DIR=${REPO_DIR}/releases/specs/s390/s390x
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
@@ -26,7 +27,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" s390@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 94723124..cabf9293 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -1,6 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+UPLOAD_USER=sparc
SPECS_DIR=${REPO_DIR}/releases/specs/sparc
SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec sparc/systemd-stage3.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec"
@@ -28,7 +29,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" sparc@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index e28131fc..1616e194 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-ARCH="x86"
+UPLOAD_USER=x86
host=$(hostname)
source /etc/catalyst/release/build.env
@@ -72,8 +72,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${UPLOAD_USER}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-02-01 4:04 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: e357bcd8673a5e86c152a0e584762a363715a0a8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 00:16:03 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 01:56:27 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e357bcd8
tools: Add SSH_CMD array
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 9 ++++++++-
tools/catalyst-auto-amd64.conf | 9 ++++++++-
tools/catalyst-auto-arm.conf | 9 ++++++++-
tools/catalyst-auto-arm64.conf | 9 ++++++++-
tools/catalyst-auto-hppa.conf | 9 ++++++++-
tools/catalyst-auto-ia64.conf | 9 ++++++++-
tools/catalyst-auto-ppc.conf | 9 ++++++++-
tools/catalyst-auto-ppc64le.conf | 9 ++++++++-
tools/catalyst-auto-qemu-arm.conf | 9 ++++++++-
tools/catalyst-auto-qemu-riscv.conf | 9 ++++++++-
tools/catalyst-auto-s390.conf | 9 ++++++++-
tools/catalyst-auto-s390x.conf | 9 ++++++++-
tools/catalyst-auto-sparc64.conf | 9 ++++++++-
tools/catalyst-auto-x86.conf | 9 ++++++++-
14 files changed, 112 insertions(+), 14 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index a60f979d..ebaff6eb 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -35,7 +35,14 @@ update_symlinks() {
upload() {
echo Uploading "$@"
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 16aeda56..0ef11f2f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -67,8 +67,15 @@ update_symlinks() {
upload() {
echo " ** Uploading $@"
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
rsync \
- -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+ -e "${SSH_CMD[*]}" \
-a \
--omit-dir-times \
--delay-updates \
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 56459c50..26fe8156 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -57,7 +57,14 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 064e6f41..9f457989 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -29,7 +29,14 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index d2034010..8b465421 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -35,7 +35,14 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 845ffc51..6c78c8a7 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -28,7 +28,14 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 8628f30f..a1286726 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -34,7 +34,14 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 716e43fd..0d54fab9 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -35,7 +35,14 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index c351e99b..1a121997 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -58,7 +58,14 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
else
echo Would now upload "$@"
ls -l $@
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 14e2b561..b19de76f 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -45,7 +45,14 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
fi
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 8f59d581..5716702c 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -28,7 +28,14 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 241179d5..3b4fd21c 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -28,7 +28,14 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index fd963987..bc441b2d 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -30,7 +30,14 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
+ rsync -e "${SSH_CMD[*]}" "$@" ${UPLOAD_USER}@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 4753c3fe..ef983969 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -54,8 +54,15 @@ update_symlinks() {
upload() {
echo " ** Uploading $@"
+ local SSH_CMD=(
+ ssh
+ -i ${UPLOAD_KEY}
+ -o UserKnownHostsFile=/dev/null
+ -o VerifyHostKeyDNS=yes
+ -o StrictHostKeyChecking=no
+ )
rsync \
- -e 'ssh -i ${UPLOAD_KEY} -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+ -e "${SSH_CMD[*]}" \
-a \
--omit-dir-times \
--delay-updates \
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:consolidate-upload commit in: tools/
@ 2021-01-31 23:08 Matt Turner
2021-02-01 4:04 ` [gentoo-commits] proj/releng:master " Matt Turner
0 siblings, 1 reply; 460+ messages in thread
From: Matt Turner @ 2021-01-31 23:08 UTC (permalink / raw
To: gentoo-commits
commit: a309ae36ac174b984f4efb20525b0ba8509e91b1
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 23:06:09 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 23:06:09 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a309ae36
tools: Log non-uploaded stages when they finish
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 3 +++
tools/catalyst-auto-arm.conf | 3 +++
tools/catalyst-auto-arm64.conf | 3 +++
tools/catalyst-auto-hppa.conf | 3 +++
tools/catalyst-auto-ia64.conf | 3 +++
tools/catalyst-auto-ppc.conf | 3 +++
tools/catalyst-auto-ppc64le.conf | 3 +++
tools/catalyst-auto-qemu-arm.conf | 3 +++
tools/catalyst-auto-qemu-riscv.conf | 3 +++
tools/catalyst-auto-s390.conf | 3 +++
tools/catalyst-auto-s390x.conf | 3 +++
tools/catalyst-auto-sparc64.conf | 3 +++
12 files changed, 36 insertions(+)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index f755c9b5..6f52056d 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -45,6 +45,9 @@ post_build() {
stage3.spec)
upload stage3-*${TIMESTAMP}*.bz2*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 49495a2c..a323f33d 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -96,6 +96,9 @@ post_build() {
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 5346153f..518fa972 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -40,6 +40,9 @@ post_build() {
systemd-stage3.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 8ad8f767..d666addf 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -57,6 +57,9 @@ post_build() {
hppa2.0/stage3.spec)
upload stage3-hppa2.0-*${TIMESTAMP}*.bz2*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 009d5fd9..054f28db 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -39,6 +39,9 @@ post_build() {
stage3.spec)
upload stage3-*${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 3a81822e..dd9904dd 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -48,6 +48,9 @@ post_build() {
ppc64/stage3.spec)
upload stage3-ppc64-*${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index a93975ca..2803268d 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -52,6 +52,9 @@ post_build() {
musl-hardened-stage3*.spec)
upload musl-hardened/stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index e30178dc..efac2eb8 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -97,6 +97,9 @@ post_build() {
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index e809b598..261d6db4 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -51,6 +51,9 @@ post_build() {
stage3*lp64*.spec)
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 15b5382b..3b8475ba 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -41,6 +41,9 @@ post_build() {
stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 5a351358..b29d352f 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -41,6 +41,9 @@ post_build() {
stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 668971db..0c39a845 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -50,6 +50,9 @@ post_build() {
sparc64/systemd-stage3.spec)
upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
2021-01-31 23:08 [gentoo-commits] proj/releng:consolidate-upload " Matt Turner
@ 2021-02-01 4:04 ` Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-02-01 4:04 UTC (permalink / raw
To: gentoo-commits
commit: a309ae36ac174b984f4efb20525b0ba8509e91b1
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 31 23:06:09 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Jan 31 23:06:09 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a309ae36
tools: Log non-uploaded stages when they finish
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 3 +++
tools/catalyst-auto-arm.conf | 3 +++
tools/catalyst-auto-arm64.conf | 3 +++
tools/catalyst-auto-hppa.conf | 3 +++
tools/catalyst-auto-ia64.conf | 3 +++
tools/catalyst-auto-ppc.conf | 3 +++
tools/catalyst-auto-ppc64le.conf | 3 +++
tools/catalyst-auto-qemu-arm.conf | 3 +++
tools/catalyst-auto-qemu-riscv.conf | 3 +++
tools/catalyst-auto-s390.conf | 3 +++
tools/catalyst-auto-s390x.conf | 3 +++
tools/catalyst-auto-sparc64.conf | 3 +++
12 files changed, 36 insertions(+)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index f755c9b5..6f52056d 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -45,6 +45,9 @@ post_build() {
stage3.spec)
upload stage3-*${TIMESTAMP}*.bz2*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 49495a2c..a323f33d 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -96,6 +96,9 @@ post_build() {
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 5346153f..518fa972 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -40,6 +40,9 @@ post_build() {
systemd-stage3.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 8ad8f767..d666addf 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -57,6 +57,9 @@ post_build() {
hppa2.0/stage3.spec)
upload stage3-hppa2.0-*${TIMESTAMP}*.bz2*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 009d5fd9..054f28db 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -39,6 +39,9 @@ post_build() {
stage3.spec)
upload stage3-*${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 3a81822e..dd9904dd 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -48,6 +48,9 @@ post_build() {
ppc64/stage3.spec)
upload stage3-ppc64-*${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index a93975ca..2803268d 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -52,6 +52,9 @@ post_build() {
musl-hardened-stage3*.spec)
upload musl-hardened/stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index e30178dc..efac2eb8 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -97,6 +97,9 @@ post_build() {
armv7a/stage3-hardfloat-systemd.spec)
upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index e809b598..261d6db4 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -51,6 +51,9 @@ post_build() {
stage3*lp64*.spec)
upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 15b5382b..3b8475ba 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -41,6 +41,9 @@ post_build() {
stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 5a351358..b29d352f 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -41,6 +41,9 @@ post_build() {
stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 668971db..0c39a845 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -50,6 +50,9 @@ post_build() {
sparc64/systemd-stage3.spec)
upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
;;
+ *)
+ echo "Finished ${spec}"
+ ;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-31 0:50 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-01-31 0:50 UTC (permalink / raw
To: gentoo-commits
commit: c6404520ed19d7eae62837281268a1518271671f
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 23:25:39 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 23:25:39 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c6404520
tools: Drop TYPE assignments
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 1 -
tools/catalyst-auto-x86.conf | 1 -
2 files changed, 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 9a05319c..20a1a80e 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -2,7 +2,6 @@
# self-explanatory.
ARCH="amd64"
-TYPE="auto"
host=$(hostname)
source /etc/catalyst/release/build.env
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index db4c2143..5a406782 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -2,7 +2,6 @@
# self-explanatory.
ARCH="x86"
-TYPE="auto"
host=$(hostname)
source /etc/catalyst/release/build.env
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-31 0:50 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-01-31 0:50 UTC (permalink / raw
To: gentoo-commits
commit: 16b0dfbc2e3a8f6a408d6ff19a2f3d1e52c156fa
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 23:43:50 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 23:44:32 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=16b0dfbc
tools: Remove REPO_DIR assignment
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 5d31d3fa..e143ebbb 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-REPO_DIR=/root/releng/
-
SPECS_DIR=${REPO_DIR}/releases/specs/arm64
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-31 0:50 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-01-31 0:50 UTC (permalink / raw
To: gentoo-commits
commit: c157adaf1b2e98be09c32cb6aefe776c40ccebe1
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 23:30:16 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 23:40:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c157adaf
tools: Remove some uses of ARCH
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 4 ++--
tools/catalyst-auto-arm.conf | 5 ++---
tools/catalyst-auto-qemu-arm.conf | 5 ++---
tools/catalyst-auto-qemu-riscv.conf | 5 ++---
tools/catalyst-auto-x86.conf | 4 ++--
5 files changed, 10 insertions(+), 13 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 20a1a80e..6ee56fb1 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -6,7 +6,7 @@ host=$(hostname)
source /etc/catalyst/release/build.env
-SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
multilib minimal_multilib
@@ -38,7 +38,7 @@ SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage
#SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/amd64
EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 3a54dfa7..9f873c31 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -1,12 +1,11 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-ARCH="arm"
host=$(hostname)
-SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs/arm
-EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
+EMAIL_SUBJECT_PREPEND="[arm-auto]"
SETS="
armv4tl
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 0e3d06fa..a6d9cdd8 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -1,12 +1,11 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-ARCH="arm"
host=$(hostname)
-SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs-qemu/arm
-EMAIL_SUBJECT_PREPEND="[${ARCH}-qemu-auto]"
+EMAIL_SUBJECT_PREPEND="[arm-qemu-auto]"
SETS="
armv4tl
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 03d014b9..89c40b79 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -1,12 +1,11 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-ARCH="riscv"
host=$(hostname)
-SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs-qemu/riscv
-EMAIL_SUBJECT_PREPEND="[${ARCH}-qemu-auto]"
+EMAIL_SUBJECT_PREPEND="[riscv-qemu-auto]"
SETS="
multilib
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 5a406782..e28131fc 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -6,7 +6,7 @@ host=$(hostname)
source /etc/catalyst/release/build.env
-SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/specs/x86
SETS="
i486
@@ -25,7 +25,7 @@ SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/s
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86
EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-30 19:26 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2021-01-30 19:26 UTC (permalink / raw
To: gentoo-commits
commit: c98c9ff401810314c2d0732b1c75098a51e01266
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 30 19:24:37 2021 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 30 19:25:36 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c98c9ff4
tools: Use new ssh key
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 85ff48e4..3a54dfa7 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -56,7 +56,7 @@ update_symlinks() {
upload() {
if [[ ${nonetwork} == 0 ]]; then
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
else
echo Would now upload "$@"
ls -l $@
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-25 7:18 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-01-25 7:18 UTC (permalink / raw
To: gentoo-commits
commit: e87d9d447465e609b78eeb868fe4b31bff758a88
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 25 07:17:45 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jan 25 07:17:45 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e87d9d44
catalyst-auto-qemu-riscv: fix upload filename
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-riscv.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index 7ea3c8f6..03d014b9 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -53,8 +53,8 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- stage3*lp*.spec)
- upload stage3-$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ stage3*lp64*.spec)
+ upload stage3-rv64_$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-19 21:31 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-01-19 21:31 UTC (permalink / raw
To: gentoo-commits
commit: b8c1579463674ecd1c0ac76f2d043ea7cdb1c0e2
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 21:31:00 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 21:31:28 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b8c15794
Update catalyst-auto-arm.conf from qemu copy
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 100 ++++++++++++++++++++++++++++++++++---------
1 file changed, 80 insertions(+), 20 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
index 96d75326..85ff48e4 100644
--- a/tools/catalyst-auto-arm.conf
+++ b/tools/catalyst-auto-arm.conf
@@ -1,30 +1,66 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-REPO_DIR=/root/releng/
+ARCH="arm"
+host=$(hostname)
-SPECS_DIR=${REPO_DIR}/releases/specs/arm
+SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
-SPECS="armv4tl/stage1.spec armv4tl/stage3.spec armv5tel/stage1.spec armv5tel/stage3.spec armv6j/hardfloat/stage1.spec armv6j/hardfloat/stage3.spec armv7a/hardfloat/stage1.spec armv7a/hardfloat/stage3.spec"
+EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
+
+SETS="
+ armv4tl
+ armv5tel
+ armv6j_hf
+ armv6j_sf
+ armv7a_hf
+ armv7a_sf
+ armv4tl_systemd
+ armv5tel_systemd
+ armv6j_hf_systemd
+ armv6j_sf_systemd
+ armv7a_hf_systemd
+ armv7a_sf_systemd
+"
+
+SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage3.spec"
+SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec"
+
+SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage3.spec"
+SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage3-systemd.spec"
+
+SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage3-hardfloat.spec"
+SET_armv6j_sf_SPECS="armv6j/stage1.spec armv6j/stage3.spec"
+SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec"
+SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec"
+
+SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage3-hardfloat.spec"
+SET_armv7a_sf_SPECS="armv7a/stage1.spec armv7a/stage3.spec"
+SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec"
+SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec"
-EMAIL_SUBJECT_PREPEND="[arm-auto]"
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
}
-
upload() {
+ if [[ ${nonetwork} == 0 ]]; then
+ echo Uploading "$@"
rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
+ else
+ echo Would now upload "$@"
+ ls -l $@
+ fi
}
post_build() {
@@ -36,14 +72,38 @@ post_build() {
armv4tl/stage3.spec)
upload stage3-armv4tl-${TIMESTAMP}*.xz*
;;
- armv5tel/systemd-stage3.spec)
+ armv4tl/stage3-systemd.spec)
+ upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/stage3.spec)
+ upload stage3-armv5tel-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/stage3-systemd.spec)
upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
;;
- armv6j_hardfp/stage3.spec)
- upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
+ armv6j/stage3.spec)
+ upload stage3-armv6j-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-systemd.spec)
+ upload stage3-armv6j-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-hardfloat.spec)
+ upload stage3-armv6j-hardfloat-${TIMESTAMP}*.xz*
+ ;;
+ armv6j/stage3-hardfloat-systemd.spec)
+ upload stage3-armv6j-hardfloat-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3.spec)
+ upload stage3-armv7a-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3-systemd.spec)
+ upload stage3-armv7a-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv7a/stage3-hardfloat.spec)
+ upload stage3-armv7a-hardfloat-${TIMESTAMP}*.xz*
;;
- armv7a_hardfp/stage3.spec)
- upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
+ armv7a/stage3-hardfloat-systemd.spec)
+ upload stage3-armv7a-hardfloat-systemd-${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-19 20:44 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-01-19 20:44 UTC (permalink / raw
To: gentoo-commits
commit: e486326b970a4fc43765033011463cea33809da6
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 19 20:43:25 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jan 19 20:43:46 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e486326b
catalyst-auto: fix e-mail subject
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm.conf | 2 ++
tools/catalyst-auto-qemu-riscv.conf | 2 ++
2 files changed, 4 insertions(+)
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 148ebe90..0e3d06fa 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -6,6 +6,8 @@ host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH}
+EMAIL_SUBJECT_PREPEND="[${ARCH}-qemu-auto]"
+
SETS="
armv4tl
armv5tel
diff --git a/tools/catalyst-auto-qemu-riscv.conf b/tools/catalyst-auto-qemu-riscv.conf
index f1d54001..7ea3c8f6 100644
--- a/tools/catalyst-auto-qemu-riscv.conf
+++ b/tools/catalyst-auto-qemu-riscv.conf
@@ -6,6 +6,8 @@ host=$(hostname)
SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH}
+EMAIL_SUBJECT_PREPEND="[${ARCH}-qemu-auto]"
+
SETS="
multilib
lp64d
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-15 19:55 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-01-15 19:55 UTC (permalink / raw
To: gentoo-commits
commit: 6c2559e2d45afa0fba623a0930e8202cc8c977d7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 19:51:41 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 19:51:41 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6c2559e2
Fix typo in catalyst-auto config file
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index a52005d8..3bce3ef8 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -29,7 +29,7 @@ SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage2-systemd
SET_armv6j_hf_SPECS="armv6j/stage1-hardfloat.spec armv6j/stage2-hardfloat.spec armv6j/stage3-hardfloat.spec"
SET_armv6j_sf_SPECS="armv6j/stage1.spec armv6j/stage2.spec armv6j/stage3.spec"
-SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage2-hardfloat-systemd.spec armv6j/stage3-hardfloat.systemd.spec"
+SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage2-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec"
SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage2-systemd.spec armv6j/stage3-systemd.spec"
SET_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage2-hardfloat.spec armv7a/stage3-hardfloat.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-15 19:55 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-01-15 19:55 UTC (permalink / raw
To: gentoo-commits
commit: b42197cbec0f5b3be27c99ebda4f042011ee3b72
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 15 19:54:33 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jan 15 19:54:33 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b42197cb
Fix latest symlinking
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm.conf | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
index 3bce3ef8..dd3c293d 100644
--- a/tools/catalyst-auto-qemu-arm.conf
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -39,16 +39,16 @@ SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage2-systemd.sp
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
}
upload() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-13 1:55 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-01-13 1:55 UTC (permalink / raw
To: gentoo-commits
commit: bb1e7293ac0757337ee34a692a169bede6d39031
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 8 23:21:37 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 23:21:37 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bb1e7293
Add catalyst-auto conf for qemu arm builds
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-qemu-arm.conf | 82 +++++++++++++++++++++++++++++++++++++++
1 file changed, 82 insertions(+)
diff --git a/tools/catalyst-auto-qemu-arm.conf b/tools/catalyst-auto-qemu-arm.conf
new file mode 100644
index 00000000..9326d336
--- /dev/null
+++ b/tools/catalyst-auto-qemu-arm.conf
@@ -0,0 +1,82 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+ARCH="arm"
+host=$(hostname)
+
+SPECS_DIR=${REPO_DIR}/releases/specs-qemu/${ARCH}
+
+SETS="
+ armv4tl
+ armv5tel
+ armv6j_hf
+ armv6j_sf
+ armv7a_hf
+ armv7a_sf
+ armv4tl_systemd
+ armv5tel_systemd
+ armv6j_hf_systemd
+ armv6j_sf_systemd
+ armv7a_hf_systemd
+ armv7a_sf_systemd
+"
+
+SET_armv4tl_SPECS="armv4tl/stage1.spec armv4tl/stage2.spec armv4tl/stage3.spec"
+SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage2-systemd.spec armv4tl/stage3-systemd.spec"
+
+SET_armv5tel_SPECS="armv5tel/stage1.spec armv5tel/stage2.spec armv5tel/stage3.spec"
+SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage2-systemd.spec armv5tel/stage3-systemd.spec"
+
+SET_armv6j_hf_SPECS="armv6j/hardfloat/stage1.spec armv6j/hardfloat/stage2.spec armv6j/hardfloat/stage3.spec"
+SET_armv6j_sf_SPECS="armv6j/softfloat/stage1.spec armv6j/softfloat/stage2.spec armv6j/softfloat/stage3.spec"
+SET_armv6j_hf_systemd_SPECS="armv6j/hardfloat/stage1-systemd.spec armv6j/hardfloat/stage2-systemd.spec armv6j/hardfloat/stage3-systemd.spec"
+SET_armv6j_sf_systemd_SPECS="armv6j/softfloat/stage1-systemd.spec armv6j/softfloat/stage2-systemd.spec armv6j/softfloat/stage3-systemd.spec"
+
+SET_armv7a_hf_SPECS="armv7a/hardfloat/stage1.spec armv7a/hardfloat/stage2.spec armv7a/hardfloat/stage3.spec"
+SET_armv7a_sf_SPECS="armv7a/softfloat/stage1.spec armv7a/softfloat/stage2.spec armv7a/softfloat/stage3.spec"
+SET_armv7a_hf_systemd_SPECS="armv7a/hardfloat/stage1-systemd.spec armv7a/hardfloat/stage2-systemd.spec armv7a/hardfloat/stage3-systemd.spec"
+SET_armv7a_sf_systemd_SPECS="armv7a/softfloat/stage1-systemd.spec armv7a/softfloat/stage2-systemd.spec armv7a/softfloat/stage3-systemd.spec"
+
+
+update_symlinks() {
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+ pushd $d >/dev/null
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+ ln -sf $f $of
+ done
+ popd >/dev/null
+ done
+}
+
+upload() {
+ if [[ ${nonetwork} == 0 ]]; then
+ echo Uploading "$@"
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
+ fi
+}
+
+post_build() {
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ armv4tl/stage3.spec)
+ upload stage3-armv4tl-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/systemd-stage3.spec)
+ upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv6j_hardfp/stage3.spec)
+ upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
+ ;;
+ armv7a_hardfp/stage3.spec)
+ upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
+ ;;
+ esac
+
+ popd >/dev/null
+}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2021-01-13 1:55 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2021-01-13 1:55 UTC (permalink / raw
To: gentoo-commits
commit: 0c7067713b7495aa26a45d85ccebc9f0843c50c3
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 6 15:46:02 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jan 8 20:09:03 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0c706771
Add catalyst-auto option --nonetwork
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 16 +++++++++++++++-
tools/catalyst-auto-riscv.conf | 15 ++++-----------
2 files changed, 19 insertions(+), 12 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index d71ad5a2..203abe81 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -24,6 +24,7 @@ preclean=0
lastrun=0
lock_file=
parallel_sets=1
+nonetwork=0
usage() {
local msg=$1
@@ -45,12 +46,16 @@ Options:
-t|--test Stop after mangling specs and copying files
--interval <days> Exit if last successful run was less than <days> ago
-l|--lock <file> File to grab a lock on to prevent multiple invocations
+ -X|--nonetwork Do not perform network operations (like uploading result)
+ This needs to be supported by the config file as well.
-h|--help Show this message and quit
EOH
}
send_email() {
+ if [[ ${nonetwork} == 0 ]]; then
+
local subject="${EMAIL_SUBJECT_PREPEND} $1"
local message=$2
local logfile=$3
@@ -65,6 +70,8 @@ send_email() {
printf 'From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%b' \
"${EMAIL_FROM}" "${EMAIL_TO}" "${subject}" "${body}" | \
/usr/sbin/sendmail -f "${EMAIL_FROM}" ${EMAIL_TO//,/ }
+
+ fi
}
# Usage: run_cmd <logfile> <command to run>
@@ -151,6 +158,9 @@ parse_args() {
-C|--preclean)
preclean=1
;;
+ -X|--nonetwork)
+ nonetwork=1
+ ;;
--interval)
lastrun=$1
shift
@@ -215,7 +225,7 @@ containerize() {
# the script whenever there's an update.
git_update() {
# If we've already relaunched, nothing to do.
- if [[ ${GIT_UPDATE} == "true" ]] ; then
+ if [[ ${GIT_UPDATE} == "true" || ${nonetwork} == 1 ]] ; then
return
fi
@@ -240,6 +250,8 @@ git_update() {
# SSH fingerprint from DNS. To do this securely, we need to ensure DNSSEC is
# working.
verify_dnssec() {
+ if [[ ${nonetwork} == 0 ]]; then
+
which dig >/dev/null || {
echo "net-dns/bind-tools is needed to verify DNSSEC is working"
exit 1
@@ -254,6 +266,8 @@ verify_dnssec() {
echo "DNSSEC is not enabled in /etc/resolv.conf"
exit 1
fi
+
+ fi
}
run_catalyst_commands() {
diff --git a/tools/catalyst-auto-riscv.conf b/tools/catalyst-auto-riscv.conf
index 4a5d40b5..6a7e8657 100644
--- a/tools/catalyst-auto-riscv.conf
+++ b/tools/catalyst-auto-riscv.conf
@@ -24,15 +24,6 @@ SET_ilp32_SPECS="stage1-ilp32.spec stage2-ilp32.spec stage3-ilp32.spec"
#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
-send_email() {
- :
-}
-
-# no upload -> no dnssec needed
-verify_dnssec() {
- :
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
@@ -47,8 +38,10 @@ update_symlinks() {
}
upload() {
- echo NOT Uploading "$@"
-# rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" alpha@releng-incoming.gentoo.org:
+ if [[ ${nonetwork} == 0 ]]; then
+ echo Uploading "$@"
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" riscv@releng-incoming.gentoo.org:
+ fi
}
post_build() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-12-21 14:14 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2020-12-21 14:14 UTC (permalink / raw
To: gentoo-commits
commit: 1d76d127db357bab33ae5c7955c24d11dc2912fa
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 21 14:14:06 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Dec 21 14:14:06 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1d76d127
Add ilp32 specs set
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-riscv.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-riscv.conf b/tools/catalyst-auto-riscv.conf
index fdc29375..4a5d40b5 100644
--- a/tools/catalyst-auto-riscv.conf
+++ b/tools/catalyst-auto-riscv.conf
@@ -12,6 +12,7 @@ SETS="
lp64
lp64d_systemd
lp64_systemd
+ ilp32
"
SET_multilib_SPECS="stage1-multilib.spec stage2-multilib.spec stage3-multilib.spec"
@@ -19,6 +20,7 @@ SET_lp64d_SPECS="stage1-lp64d.spec stage2-lp64d.spec stage3-lp64d.spec"
SET_lp64_SPECS="stage1-lp64.spec stage2-lp64.spec stage3-lp64.spec"
SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage2-lp64d-systemd.spec stage3-lp64d-systemd.spec"
SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage2-lp64-systemd.spec stage3-lp64-systemd.spec"
+SET_ilp32_SPECS="stage1-ilp32.spec stage2-ilp32.spec stage3-ilp32.spec"
#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-12-17 22:23 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-12-17 22:23 UTC (permalink / raw
To: gentoo-commits
commit: e02f16792baf9ac1c4d726e0eda9cc087b6cd699
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 17 22:20:00 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 17 22:20:31 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e02f1679
tools: Skip copying nonexistent kconfigs
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 484eaffc..d71ad5a2 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -354,7 +354,7 @@ run_catalyst_commands() {
done
done
- find "${KCONFIG_DIR}" -type f -exec cp {} "${TMPDIR}"/kconfig \;
+ [[ -n ${KCONFIG_DIR} ]] && find "${KCONFIG_DIR}" -type f -exec cp {} "${TMPDIR}"/kconfig \;
cd "${TMPDIR}/specs" || exit 1
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-12-15 23:29 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-12-15 23:29 UTC (permalink / raw
To: gentoo-commits
commit: af8ffec8e7544afce734cb6c3a0e4db2be539a6d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 23:18:38 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 23:29:20 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=af8ffec8
tools/ppc64le: Handle musl-hardened/ directory
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 2379954a..73f2d1c3 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -20,7 +20,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/musl-hardened"; do
pushd "${d}" >/dev/null
for t in ppc64le; do
for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -39,20 +39,20 @@ upload() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds" >/dev/null
case ${spec} in
installcd-stage2-minimal.spec)
- upload *${TIMESTAMP}*.iso*
+ upload default/*${TIMESTAMP}*.iso*
;;
stage3*.spec)
- upload stage3-ppc64le-${TIMESTAMP}*.xz*
+ upload default/stage3-ppc64le-${TIMESTAMP}*.xz*
;;
systemd-stage3*.spec)
- upload stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
+ upload default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
;;
musl-hardened-stage3*.spec)
- upload stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
+ upload musl-hardened/stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-12-15 23:18 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-12-15 23:18 UTC (permalink / raw
To: gentoo-commits
commit: a4eff6d6f0fff614fa4a39b681927346052bc72b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 15 23:18:38 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Tue Dec 15 23:18:38 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a4eff6d6
tools/ppc64le: Handle musl-hardened/ directory
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 2379954a..06b98819 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -20,7 +20,7 @@ EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds-musl-hardened"; do
pushd "${d}" >/dev/null
for t in ppc64le; do
for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
@@ -39,20 +39,20 @@ upload() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds" >/dev/null
case ${spec} in
installcd-stage2-minimal.spec)
- upload *${TIMESTAMP}*.iso*
+ upload default/*${TIMESTAMP}*.iso*
;;
stage3*.spec)
- upload stage3-ppc64le-${TIMESTAMP}*.xz*
+ upload default/stage3-ppc64le-${TIMESTAMP}*.xz*
;;
systemd-stage3*.spec)
- upload stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
+ upload default/stage3-ppc64le-systemd-${TIMESTAMP}*.xz*
;;
musl-hardened-stage3*.spec)
- upload stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
+ upload musl-hardened/stage3-ppc64le-musl-hardened-${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-12-04 14:46 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2020-12-04 14:46 UTC (permalink / raw
To: gentoo-commits
commit: 05a8acdfe089c70783b87e5d209fa7f9b0802c36
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 4 14:46:25 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Dec 4 14:46:25 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=05a8acdf
Add riscv64 systemd stages to autobuild
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-riscv.conf | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/catalyst-auto-riscv.conf b/tools/catalyst-auto-riscv.conf
index c7bfcd84..fdc29375 100644
--- a/tools/catalyst-auto-riscv.conf
+++ b/tools/catalyst-auto-riscv.conf
@@ -10,11 +10,15 @@ SETS="
multilib
lp64d
lp64
+ lp64d_systemd
+ lp64_systemd
"
SET_multilib_SPECS="stage1-multilib.spec stage2-multilib.spec stage3-multilib.spec"
SET_lp64d_SPECS="stage1-lp64d.spec stage2-lp64d.spec stage3-lp64d.spec"
SET_lp64_SPECS="stage1-lp64.spec stage2-lp64.spec stage3-lp64.spec"
+SET_lp64d_systemd_SPECS="stage1-lp64d-systemd.spec stage2-lp64d-systemd.spec stage3-lp64d-systemd.spec"
+SET_lp64_systemd_SPECS="stage1-lp64-systemd.spec stage2-lp64-systemd.spec stage3-lp64-systemd.spec"
#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-10-21 19:00 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-10-21 19:00 UTC (permalink / raw
To: gentoo-commits
commit: 292177ad4311d0d8f505e3326ef177323048f4f4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 18:29:37 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 19:00:28 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=292177ad
Revert "specs/ppc/ppc64le: Disable musl builds"
This reverts commit 3c5ff69f328f1dbd50f1ba622cd3740bd8df8b3d.
In catalyst commit 3be3ac84 ("arch/ppc.toml: add CHOST based subarches")
we've added subarches for 'powerpc', 'powerpc64', and 'powerpc64le', so
these stage builds should now work.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 0474cb49..2379954a 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -5,6 +5,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
SPECS="stage1.spec stage3.spec"
OPTIONAL_SPECS="systemd-stage1.spec systemd-stage3.spec"
+OPTIONAL_SPECS="${OPTIONAL_SPECS} musl-hardened-stage1.spec musl-hardened-stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-10-15 17:55 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-10-15 17:55 UTC (permalink / raw
To: gentoo-commits
commit: 3c5ff69f328f1dbd50f1ba622cd3740bd8df8b3d
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 15 17:55:26 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 15 17:55:26 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3c5ff69f
specs/ppc/ppc64le: Disable musl builds
They don't work with latest catalyst.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 2379954a..0474cb49 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -5,7 +5,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/ppc/ppc64le
SPECS="stage1.spec stage3.spec"
OPTIONAL_SPECS="systemd-stage1.spec systemd-stage3.spec"
-OPTIONAL_SPECS="${OPTIONAL_SPECS} musl-hardened-stage1.spec musl-hardened-stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-08-29 12:34 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2020-08-29 12:34 UTC (permalink / raw
To: gentoo-commits
commit: e2d27f67f5c832e30b4683917e2bd7e28f22cfb9
Author: Andreas K. Huettel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Aug 22 19:11:51 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Aug 29 12:33:37 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e2d27f67
catalyst-auto: Allow parallel building of spec sets
This assumes that the spec sets are logically independent from each other,
i.e., building different ABIs.
Code shamelessly adapted from locale-gen.
Signed-off-by: Andreas K. Huettel <dilfridge <AT> gentoo.org>
tools/catalyst-auto | 97 ++++++++++++++++++++++++++++++++++++-----------------
1 file changed, 66 insertions(+), 31 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 34238c01..484eaffc 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -23,6 +23,7 @@ testing=0
preclean=0
lastrun=0
lock_file=
+parallel_sets=1
usage() {
local msg=$1
@@ -38,6 +39,7 @@ Usage:
Options:
-c|--config Specifies the config file to use (required)
-C|--preclean Clean up loose artifacts from previous runs
+ -j|--jobs <n> Build <n> spec sets in parallel
-v|--verbose Send output of commands to console as well as log
-k|--keep-tmpdir Don't remove temp dir when build finishes
-t|--test Stop after mangling specs and copying files
@@ -133,6 +135,10 @@ parse_args() {
config_files+=("$1")
shift
;;
+ -j|--jobs)
+ parallel_sets="$1"
+ shift
+ ;;
-v|--verbose)
verbose=$(($verbose+1))
;;
@@ -385,47 +391,76 @@ run_catalyst_commands() {
timeprefix=()
which time >/dev/null && timeprefix=( "time" )
+ JOB_PIDS=()
+ JOB_RETS=()
+ JOB_IDX_S=0
+ JOB_IDX_E=0
+
for a in "" ${SETS}; do
- if [[ -z ${a} ]]; then
- specs_var="SPECS"
- optional_specs_var="OPTIONAL_SPECS"
- else
- specs_var="SET_${a}_SPECS"
- optional_specs_var="SET_${a}_OPTIONAL_SPECS"
+
+ if [[ $(( JOB_IDX_E - JOB_IDX_S )) == ${parallel_sets} ]] ; then
+ wait ${JOB_PIDS[$(( JOB_IDX_S++ ))]}
+ JOB_RETS+=( $? )
fi
- for i in ${!specs_var}; do
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- specpath=$(readlink -f "${i}")
- run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
- if [[ $? != 0 ]]; then
- build_failure=1
- send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
- continue 2
- else
- trigger_post_build "${a}" "${i}"
- fi
- done
+ (
- for i in ${!optional_specs_var}; do
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- specpath=$(readlink -f "${i}")
- run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
- if [[ $? != 0 ]]; then
- build_failure=1
- send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
- break
+ if [[ -z ${a} ]]; then
+ specs_var="SPECS"
+ optional_specs_var="OPTIONAL_SPECS"
else
- trigger_post_build "${a}" "${i}"
+ specs_var="SET_${a}_SPECS"
+ optional_specs_var="SET_${a}_OPTIONAL_SPECS"
fi
- done
- # Do not purge yet, because there might be interdendency between specs
- # in different build sets!
+ for i in ${!specs_var}; do
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
+ specpath=$(readlink -f "${i}")
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
+ if [[ $? != 0 ]]; then
+ build_failure=1
+ send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
+ exit 1
+ else
+ trigger_post_build "${a}" "${i}"
+ fi
+ done
+
+ for i in ${!optional_specs_var}; do
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
+ specpath=$(readlink -f "${i}")
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
+ if [[ $? != 0 ]]; then
+ build_failure=1
+ send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
+ break
+ else
+ trigger_post_build "${a}" "${i}"
+ fi
+ done
+
+ # Do not purge yet, because there might be interdendency between specs
+ # in different build sets!
+
+ update_symlinks
+
+ exit ${build_failure}
+
+ )&
+
+ JOB_PIDS+=( $! )
+ : $(( ++JOB_IDX_E ))
+
- update_symlinks
done
+ for (( i = JOB_IDX_S; i < JOB_IDX_E; ++i )) ; do
+ wait ${JOB_PIDS[i]}
+ JOB_RETS+=( $? )
+ done
+ build_failure=$(( 0 ${JOB_RETS[@]/#/+} ))
+
+
# Now do the cleanup
for a in "" ${SETS}; do
if [[ -z ${a} ]]; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-08-17 22:14 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-08-17 22:14 UTC (permalink / raw
To: gentoo-commits
commit: a4866ae21533c0d578667de5f9ab7b8588202ff5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 17:50:16 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 22:13:53 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a4866ae2
arm64: Upload xz stages to arm64@
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-arm64.conf | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 774dc265..a63eadea 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -20,7 +20,7 @@ update_symlinks() {
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
@@ -29,7 +29,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_ed25519 -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm64@releng-incoming.gentoo.org:
}
post_build() {
@@ -39,7 +39,7 @@ post_build() {
case ${spec} in
stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2*
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-08-12 15:44 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-08-12 15:44 UTC (permalink / raw
To: gentoo-commits
commit: f7891ac366db465c95749524f16577f97cc09efa
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 12 15:43:54 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Aug 12 15:43:54 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f7891ac3
tools/catalyst-auto-{amd64,x86}.conf: fix update_symlinks globbing
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 3 ++-
tools/catalyst-auto-x86.conf | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 4289f036..9a05319c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -41,12 +41,13 @@ SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec h
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
-EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd "${d}" >/dev/null || exit
+ shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
# 20yymmddThhmmssZ
# 20yymmddhhmmss
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index c6f4a694..db4c2143 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -28,12 +28,13 @@ SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
-EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd "${d}" >/dev/null || exit
+ shopt -s extglob
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
# 20yymmddThhmmssZ
# 20yymmddhhmmss
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-07-28 11:15 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2020-07-28 11:15 UTC (permalink / raw
To: gentoo-commits
commit: d850a7c5e0ee225f353b82a678ffafefc24f41c5
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 11:14:42 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 11:14:42 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d850a7c5
riscv: no upload -> no dnssec needed for now
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-riscv.conf | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/catalyst-auto-riscv.conf b/tools/catalyst-auto-riscv.conf
index d7690621..c7bfcd84 100644
--- a/tools/catalyst-auto-riscv.conf
+++ b/tools/catalyst-auto-riscv.conf
@@ -22,6 +22,11 @@ send_email() {
:
}
+# no upload -> no dnssec needed
+verify_dnssec() {
+ :
+}
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-07-28 10:59 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2020-07-28 10:59 UTC (permalink / raw
To: gentoo-commits
commit: bb47dd2aa101feb111cd32bdf884bfbc9aca4f53
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 28 10:59:28 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Tue Jul 28 10:59:28 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bb47dd2a
riscv: no e-mails for now
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-riscv.conf | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/catalyst-auto-riscv.conf b/tools/catalyst-auto-riscv.conf
index 843b7da4..d7690621 100644
--- a/tools/catalyst-auto-riscv.conf
+++ b/tools/catalyst-auto-riscv.conf
@@ -18,6 +18,10 @@ SET_lp64_SPECS="stage1-lp64.spec stage2-lp64.spec stage3-lp64.spec"
#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
+send_email() {
+ :
+}
+
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-07-27 23:14 Andreas K. Hüttel
0 siblings, 0 replies; 460+ messages in thread
From: Andreas K. Hüttel @ 2020-07-27 23:14 UTC (permalink / raw
To: gentoo-commits
commit: afffdb82731793c43b533b458fd99971d655051c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 27 23:13:35 2020 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 23:13:35 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=afffdb82
Add first experimental riscv catalyst-auto-riscv.conf
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
tools/catalyst-auto-riscv.conf | 51 ++++++++++++++++++++++++++++++++++++++++++
1 file changed, 51 insertions(+)
diff --git a/tools/catalyst-auto-riscv.conf b/tools/catalyst-auto-riscv.conf
new file mode 100644
index 00000000..843b7da4
--- /dev/null
+++ b/tools/catalyst-auto-riscv.conf
@@ -0,0 +1,51 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+ARCH="riscv"
+host=$(hostname)
+
+SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
+
+SETS="
+ multilib
+ lp64d
+ lp64
+"
+
+SET_multilib_SPECS="stage1-multilib.spec stage2-multilib.spec stage3-multilib.spec"
+SET_lp64d_SPECS="stage1-lp64d.spec stage2-lp64d.spec stage3-lp64d.spec"
+SET_lp64_SPECS="stage1-lp64.spec stage2-lp64.spec stage3-lp64.spec"
+
+#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
+
+update_symlinks() {
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
+}
+
+upload() {
+ echo NOT Uploading "$@"
+# rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" alpha@releng-incoming.gentoo.org:
+}
+
+post_build() {
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ stage3*.spec)
+ upload stage3-$(echo ${spec}|sed -e 's:^stage3-::g' -e 's:\.spec$::g')-${TIMESTAMP}*.xz*
+ ;;
+ esac
+
+ popd >/dev/null
+}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-07-06 21:48 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-07-06 21:48 UTC (permalink / raw
To: gentoo-commits
commit: 6fbf103e56b555415217a23431b6501491a2fbb4
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 6 21:48:03 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon Jul 6 21:48:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6fbf103e
cataylst-auto-amd64.conf: disable stage4 builds
No longer needed, per prometheanfire
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 558e184c..4289f036 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -21,9 +21,9 @@ SETS="
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
+#SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
-SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
+#SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
@@ -31,9 +31,9 @@ SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
-SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
+#SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec"
+#SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
#SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-06-30 10:39 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-06-30 10:39 UTC (permalink / raw
To: gentoo-commits
commit: 6e5eb93fb394dbb83330fc8f3ebc45008a627f1d
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 30 10:38:47 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jun 30 10:38:47 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6e5eb93f
catalyst-auto-amd64.conf: re-enable selinux builds
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 3fa37fea..558e184c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -16,9 +16,8 @@ SETS="
systemd
hardened_multilib minimal_hardened_multilib
hardened_nomultilib minimal_hardened_nomultilib
+ hardened_multilib_selinux hardened_nomultilib_selinux
"
-# hardened_multilib_selinux hardened_nomultilib_selinux
-#"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-31 16:45 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2020-05-31 16:45 UTC (permalink / raw
To: gentoo-commits
commit: 0d1104d04fefd4ca6f78fc3721be05cabd77eb19
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 16:43:59 2020 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun May 31 16:43:59 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0d1104d0
catalyst-auto: fix preclean logic after snapshot changes
The snapshot generation logic was moved earlier in the build (before
the cleaning logic) which caused the preclean to nuke the freshly
generated cache. Move all the preclean logic back up before that.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
tools/catalyst-auto | 33 +++++++++++++++------------------
1 file changed, 15 insertions(+), 18 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index a1e1d7f2..34238c01 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -280,6 +280,21 @@ run_catalyst_commands() {
fi
fi
+ # Nuke any previous tmpdirs to keep them from accumulating.
+ if [[ ${preclean} == 1 ]]; then
+ rm -rf "${TMP_PATH:-/tmp}/catalyst-auto".*
+
+ snapshot_cache=$(catalyst_var snapshot_cache)
+ if [[ -z ${snapshot_cache} ]]; then
+ echo "error: snapshot_cache not set in config file"
+ exit 1
+ fi
+ pushd "${BUILD_SRCDIR_BASE}" >/dev/null || exit 1
+ rm -rf --one-file-system \
+ kerncache packages snapshots tmp "${snapshot_cache}"/*
+ popd >/dev/null
+ fi
+
if catalyst --help | grep -q "git-treeish"; then
snapshot_log=$(mktemp --tmpdir="${TMP_PATH:-/tmp}")
if ! run_cmd "${snapshot_log}" catalyst -c "${CATALYST_CONFIG}" -s stable; then
@@ -301,12 +316,6 @@ run_catalyst_commands() {
DATESTAMP=$(date -u +%Y%m%d)
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" "catalyst-auto.${TIMESTAMP}.XXXXXX")
- # Nuke any previous tmpdirs to keep them from accumulating.
- if [[ ${preclean} == 1 ]]; then
- rm -rf "${TMPDIR%.??????}".*
- mkdir "${TMPDIR}"
- fi
-
if [[ ${verbose} -ge 1 ]]; then
echo "TMPDIR = ${TMPDIR}"
echo "TIMESTAMP = ${TIMESTAMP}"
@@ -371,18 +380,6 @@ run_catalyst_commands() {
exit
fi
- if [[ ${preclean} == 1 ]]; then
- snapshot_cache=$(catalyst_var snapshot_cache)
- if [[ -z ${snapshot_cache} ]]; then
- echo "error: snapshot_cache not set in config file"
- exit 1
- fi
- pushd "${BUILD_SRCDIR_BASE}" >/dev/null || exit 1
- rm -rf --one-file-system \
- kerncache packages snapshots tmp "${snapshot_cache}"/*
- popd >/dev/null
- fi
-
build_failure=0
timeprefix=()
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-31 16:32 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2020-05-31 16:32 UTC (permalink / raw
To: gentoo-commits
commit: cfc55d171282a7eeb38a6e33744fd747dddb88d1
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun May 31 16:32:02 2020 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun May 31 16:32:02 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cfc55d17
catalyst-auto: standardize indentation
This file uses tabs in most of it, so migrate the few funcs using
spaces over to tabs.
Signed-off-by: Mike Frysinger <vapier <AT> gentoo.org>
tools/catalyst-auto | 112 ++++++++++++++++++++++++++--------------------------
1 file changed, 56 insertions(+), 56 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index e6d32244..a1e1d7f2 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -25,13 +25,13 @@ lastrun=0
lock_file=
usage() {
- local msg=$1
+ local msg=$1
- if [ -n "${msg}" ]; then
- printf "%b\n\n" "${msg}"
- fi
+ if [ -n "${msg}" ]; then
+ printf "%b\n\n" "${msg}"
+ fi
- cat <<EOH
+ cat <<EOH
Usage:
catalyst-auto [-c|--config <config>] [-v|--verbose] [-h|--help]
@@ -49,66 +49,66 @@ EOH
}
send_email() {
- local subject="${EMAIL_SUBJECT_PREPEND} $1"
- local message=$2
- local logfile=$3
- local body
-
- if [ -n "${logfile}" ]; then
- body=$(printf '%b\n\n\n' "${message}"; tail -n 200 "${logfile}"; printf '\n\n\nFull build log at %s\n' "${logfile}")
- else
- body=${message}
- fi
-
- printf 'From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%b' \
- "${EMAIL_FROM}" "${EMAIL_TO}" "${subject}" "${body}" | \
- /usr/sbin/sendmail -f "${EMAIL_FROM}" ${EMAIL_TO//,/ }
+ local subject="${EMAIL_SUBJECT_PREPEND} $1"
+ local message=$2
+ local logfile=$3
+ local body
+
+ if [ -n "${logfile}" ]; then
+ body=$(printf '%b\n\n\n' "${message}"; tail -n 200 "${logfile}"; printf '\n\n\nFull build log at %s\n' "${logfile}")
+ else
+ body=${message}
+ fi
+
+ printf 'From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%b' \
+ "${EMAIL_FROM}" "${EMAIL_TO}" "${subject}" "${body}" | \
+ /usr/sbin/sendmail -f "${EMAIL_FROM}" ${EMAIL_TO//,/ }
}
# Usage: run_cmd <logfile> <command to run>
run_cmd() {
- local logfile="$1"
- shift
-
- echo "*** Running command: $*" &>> "${logfile}"
- if [ $verbose = 2 ]; then
- echo "*** Running command: $*"
- "$@" 2>&1 | tee -a "${logfile}"
- elif [ $verbose = 1 ]; then
- echo "*** Running command: $*"
- "$@" &>> "${logfile}"
- else
- "$@" &>> "${logfile}"
- fi
-
- # If we used tee above, make sure we pass back up the command's error.
- return ${PIPESTATUS[0]}
+ local logfile="$1"
+ shift
+
+ echo "*** Running command: $*" &>> "${logfile}"
+ if [[ ${verbose} == 2 ]]; then
+ echo "*** Running command: $*"
+ "$@" 2>&1 | tee -a "${logfile}"
+ elif [[ ${verbose} == 1 ]]; then
+ echo "*** Running command: $*"
+ "$@" &>> "${logfile}"
+ else
+ "$@" &>> "${logfile}"
+ fi
+
+ # If we used tee above, make sure we pass back up the command's error.
+ return ${PIPESTATUS[0]}
}
update_symlinks() {
- # This is a skeleton function that you can override from the config file.
- # It will be called by pre_build and after completing the build of a set
- # to ensure the symlinks point to the latest built stages.
- :
+ # This is a skeleton function that you can override from the config file.
+ # It will be called by pre_build and after completing the build of a set
+ # to ensure the symlinks point to the latest built stages.
+ :
}
pre_build() {
- # This is a skeleton function that you can override from the config file.
- # It will be executed before the build is started.
- update_symlinks
+ # This is a skeleton function that you can override from the config file.
+ # It will be executed before the build is started.
+ update_symlinks
}
post_build() {
- # This is a skeleton function that you can override from the config file.
- # It will be executed after the build is successfully completed. You can
- # use this to rsync the builds to another box
- :
+ # This is a skeleton function that you can override from the config file.
+ # It will be executed after the build is successfully completed. You can
+ # use this to rsync the builds to another box
+ :
}
catalyst_var() {
- # Extract a setting from the catalyst.conf.
- local var=$1
- (. "${CATALYST_CONFIG}"; echo "${!var}")
+ # Extract a setting from the catalyst.conf.
+ local var=$1
+ (. "${CATALYST_CONFIG}"; echo "${!var}")
}
trigger_post_build() {
@@ -166,13 +166,13 @@ parse_args() {
}
give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' | \
+ awk -F'~' \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
}
# Replace the date/time stamp in the filename to "latest".
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-26 11:50 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-05-26 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 5bfe6e81dc07220eed4eed01a1698381ab23c674
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue May 26 11:45:56 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue May 26 11:45:56 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5bfe6e81
catalyst-auto-x86.conf: add missing -systemd suffix on upload call
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index ad3f29ab..c6f4a694 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -90,7 +90,7 @@ post_build() {
upload stage3-i686-${TIMESTAMP}.tar.xz*
;;
i686/stage3-systemd.spec)
- upload stage3-i686-${TIMESTAMP}.tar.xz*
+ upload stage3-i686-systemd-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-25 18:53 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-05-25 18:53 UTC (permalink / raw
To: gentoo-commits
commit: bb01692c4f7b3809b3153c1fb1c3bfcd62e7deeb
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 18:53:27 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 25 18:53:27 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bb01692c
catalyst-auto-x86.conf: fix i686-systemd setup
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 9dbab7be..ad3f29ab 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -12,7 +12,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
SETS="
i486
i686
- i686-systemd
+ i686_systemd
hardened
"
@@ -21,7 +21,7 @@ SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
-SET_i686_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
+SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-25 11:10 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-05-25 11:10 UTC (permalink / raw
To: gentoo-commits
commit: c0ebcf37c7448a2e4fda8feb2f03c067ed25401c
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon May 25 11:09:56 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 25 11:09:56 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c0ebcf37
catalyst-auto-amd64.conf: missing amd64- in systemd stage3 filenames
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index bbf27ca2..3fa37fea 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -110,7 +110,7 @@ post_build() {
upload stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz*
;;
stage3-systemd.spec)
- upload stage3-systemd-${TIMESTAMP}.tar.xz*
+ upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
;;
stage3-x32.spec)
upload stage3-x32-${TIMESTAMP}.tar.xz*
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-20 13:52 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-05-20 13:52 UTC (permalink / raw
To: gentoo-commits
commit: a1f347da838d0ef9382047770eb645bac5f3ef5d
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed May 20 13:49:33 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed May 20 13:52:43 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a1f347da
catalyst-auto-amd64.conf: disable selinux builds for now
Due to https://bugs.gentoo.org/722108 , selinux stable builds cannot
possibly succeed right now. We are wasting lots of hours in update_seed
since that part cannot be cached. We can re-enable them when
https://bugs.gentoo.org/714376 is fixed (stabilization).
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 8b2134f8..586b9083 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -15,8 +15,9 @@ SETS="
x32
hardened_multilib minimal_hardened_multilib
hardened_nomultilib minimal_hardened_nomultilib
- hardened_multilib_selinux hardened_nomultilib_selinux
"
+# hardened_multilib_selinux hardened_nomultilib_selinux
+#"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-17 22:31 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-05-17 22:31 UTC (permalink / raw
To: gentoo-commits
commit: 23c58990ce8a89255f5d18f9bf550f99ea842986
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 22:31:25 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 17 22:31:25 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=23c58990
tools: Drop catalyst-auto-*-experimental.conf
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 145 ----------------------------
tools/catalyst-auto-x86-experimental.conf | 105 --------------------
2 files changed, 250 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
deleted file mode 100644
index b70d01f9..00000000
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ /dev/null
@@ -1,145 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-ARCH="amd64"
-TYPE="experimental"
-host=$(hostname)
-
-source /etc/catalyst/release/build.env
-
-SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
-
-SETS="
- multilib minimal_multilib
- nomultilib minimal_nomultilib
- x32
- hardened_multilib minimal_hardened_multilib
- hardened_nomultilib minimal_hardened_nomultilib
- hardened_multilib_selinux hardened_nomultilib_selinux
-"
-
-SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
-SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
-SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
-
-SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
-
-SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
-SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
-SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
-SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec"
-
-SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
-SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
-SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
-
-EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd "${d}" >/dev/null || exit
- for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
- # 20yymmddThhmmssZ
- # 20yymmddhhmmss
- # 20yymmdd
- # 20yy.n
- of=$(perl -p \
- -e 's/20\d{6}T\d{6}Z/latest/g;' \
- -e 's/20\d{6}\d{6}/latest/g;' \
- -e 's/20\d{6}/latest/g;' \
- -e 's/20\d{2}\.\d{2}/latest/g;' \
- <<<"$f")
- ln -svf "$f" "$of"
- done
- popd >/dev/null || exit
- done
-}
-
-upload() {
- echo " ** Uploading $@"
- rsync \
- -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
- -a \
- --omit-dir-times \
- --delay-updates \
- "$@" \
- "${UPLOAD_DEST}"
-}
-
-post_build() {
- local set=$1 spec=$2
-
- case $HOSTNAME in
- # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
- LOCAL)
- DEST_DEFAULT=${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
- ;;
- *)
- DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
- ;;
- esac
-
- pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
- UPLOAD_DEST=${DEST_DEFAULT}
- case ${spec} in
- stage3.spec)
- upload stage3-amd64-${TIMESTAMP}.tar.xz*
- ;;
- installcd-stage2-minimal.spec)
- upload install-amd64-minimal-${TIMESTAMP}.iso*
- ;;
- stage4-minimal.spec)
- upload stage4-amd64-minimal-${TIMESTAMP}.tar.xz*
- ;;
- stage3-nomultilib.spec)
- upload stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz*
- ;;
- stage4-nomultilib-minimal.spec)
- upload stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz*
- ;;
- stage3-x32.spec)
- upload stage3-x32-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null || exit
-
- pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
- UPLOAD_DEST=${DEST_HARDENED}
- case ${spec} in
- hardened/stage3.spec)
- upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
- ;;
- hardened/admincd-stage2.spec)
- upload admincd-amd64-${TIMESTAMP}.iso*
- ;;
- hardened/stage4-minimal.spec)
- upload stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz*
- ;;
- hardened/stage3-nomultilib.spec)
- upload stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz*
- ;;
- hardened/stage4-nomultilib-minimal.spec)
- upload stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz*
- ;;
- hardened/stage3-selinux.spec)
- upload stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz*
- ;;
- hardened/admincd-stage2-selinux.spec)
- upload admincd-amd64-${TIMESTAMP}.iso*
- ;;
- hardened/stage3-selinux-nomultilib.spec)
- upload stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null || exit
-}
-
-# vim:ft=sh:
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
deleted file mode 100644
index 10789143..00000000
--- a/tools/catalyst-auto-x86-experimental.conf
+++ /dev/null
@@ -1,105 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-ARCH="x86"
-TYPE="experimental"
-host=$(hostname)
-
-source /etc/catalyst/release/build.env
-
-SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
-
-SETS="
- i486
- i686
- hardened
-"
-
-SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
-
-SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
-SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/kconfig/${ARCH}
-
-EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd "${d}" >/dev/null || exit
- for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
- # 20yymmddThhmmssZ
- # 20yymmddhhmmss
- # 20yymmdd
- # 20yy.n
- of=$(perl -p \
- -e 's/20\d{6}T\d{6}Z/latest/g;' \
- -e 's/20\d{6}\d{6}/latest/g;' \
- -e 's/20\d{6}/latest/g;' \
- -e 's/20\d{2}\.\d{2}/latest/g;' \
- <<<"$f")
- ln -svf "$f" "$of"
- done
- popd >/dev/null || exit
- done
-}
-
-upload() {
- echo " ** Uploading $@"
- rsync \
- -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
- -a \
- --omit-dir-times \
- --delay-updates \
- "$@" \
- "${UPLOAD_DEST}"
-}
-
-post_build() {
- local set=$1 spec=$2
-
- case $HOSTNAME in
- # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
- LOCAL)
- DEST_DEFAULT=${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
- ;;
- *)
- DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
- ;;
- esac
-
- pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
- UPLOAD_DEST=${DEST_DEFAULT}
- case ${spec} in
- stage3.spec)
- upload stage3-i486-${TIMESTAMP}.tar.xz*
- ;;
- installcd-stage2-minimal.spec)
- upload install-x86-minimal-${TIMESTAMP}.iso*
- ;;
- i686/stage3.spec)
- upload stage3-i686-${TIMESTAMP}.tar.xz*
- ;;
- esac
- popd >/dev/null || exit
-
- pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
- UPLOAD_DEST=${DEST_HARDENED}
- case ${spec} in
- hardened/stage3.spec)
- upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*
- ;;
- hardened/admincd-stage2.spec)
- upload admincd-x86-${TIMESTAMP}.iso*
- ;;
- esac
- popd >/dev/null || exit
-}
-
-# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-17 22:31 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-05-17 22:31 UTC (permalink / raw
To: gentoo-commits
commit: a09f3dfda4aec0185f53a240fb3f8608ebdb7dbb
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 22:29:31 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun May 17 22:29:53 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a09f3dfd
catalyst-auto: Don't send useless failure email
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 2 --
1 file changed, 2 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 51b0471c..e6d32244 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -462,8 +462,6 @@ run_catalyst_commands() {
exit 1
fi
fi
- else
- send_email "Catalyst build complete, but with errors" "Build process has completed, but there were errors. Please consult previous emails to determine the problem."
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-17 15:34 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-05-17 15:34 UTC (permalink / raw
To: gentoo-commits
commit: ef26f9a26fc16de15a733aaf2bae92f7fd3db1d4
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun May 17 15:31:07 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun May 17 15:31:07 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ef26f9a2
catalyst-auto-{amd64,x86}*.conf: add info echo to post_build
Added a small debug echo so that post_build.log shows some information
about what's being uploaded. Might add destination info later.
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 1 +
tools/catalyst-auto-amd64.conf | 1 +
tools/catalyst-auto-x86-experimental.conf | 1 +
tools/catalyst-auto-x86.conf | 1 +
4 files changed, 4 insertions(+)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index f09cdb3b..b70d01f9 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -62,6 +62,7 @@ update_symlinks() {
}
upload() {
+ echo " ** Uploading $@"
rsync \
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
-a \
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 15f691d4..8b2134f8 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -62,6 +62,7 @@ update_symlinks() {
}
upload() {
+ echo " ** Uploading $@"
rsync \
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
-a \
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 5f0e475e..10789143 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -49,6 +49,7 @@ update_symlinks() {
}
upload() {
+ echo " ** Uploading $@"
rsync \
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
-a \
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index aa00dde1..e6307421 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -49,6 +49,7 @@ update_symlinks() {
}
upload() {
+ echo " ** Uploading $@"
rsync \
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
-a \
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-16 18:26 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-05-16 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 151b13ac968bc3eab8226e20489f193b8b3b48d7
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 13:02:33 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri May 15 13:02:33 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=151b13ac
catalyst-auto-x86*.conf: explicitly list files to be transferred
Previously when we were copying locally there was no (major) problem
with wildcarding a long list of files to be transferred after every
single spec finishes. Now that we are transferring to a remote host,
this results in a lot of wasted transfer time & bandwidth.
I have adjusted the post_build function to only transfer the new files
known to be produced by each spec (which has files meant to be
published).
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-x86-experimental.conf | 71 +++++++++++++++++--------------
tools/catalyst-auto-x86.conf | 57 ++++++++++++-------------
2 files changed, 67 insertions(+), 61 deletions(-)
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 3fd60287..061cab92 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -30,17 +30,27 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d >/dev/null
+ pushd "${d}" >/dev/null || exit
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
- ln -sf $f $of
+ # 20yymmddThhmmssZ
+ # 20yymmddhhmmss
+ # 20yymmdd
+ # 20yy.n
+ of=$(perl -p \
+ -e 's/20\d{6}T\d{6}Z/latest/g;' \
+ -e 's/20\d{6}\d{6}/latest/g;' \
+ -e 's/20\d{6}/latest/g;' \
+ -e 's/20\d{2}\.\d{2}/latest/g;' \
+ <<<"$f")
+ ln -svf "$f" "$of"
done
- popd >/dev/null
+ popd >/dev/null || exit
done
}
post_build() {
+ local set=$1 spec=$2
+
cmd=(
rsync
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
@@ -59,34 +69,31 @@ post_build() {
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
- pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
- mkdir -p ${TMPDIR}/empty
- "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
- for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
- if [ -f $file ]; then
- "${cmd[@]}" ${file}* ${DEST_DEFAULT}
- fi
- done
- if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
- elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
- fi
- popd >/dev/null
- pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
- "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
- for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
- if [ -f $file ]; then
- "${cmd[@]}" $file* ${DEST_HARDENED}
- fi
- done
- if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
- elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
- fi
- popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+ case ${spec} in
+ stage3.spec)
+ "${cmd[@]}" stage3-i486-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ installcd-stage2-minimal.spec)
+ "${cmd[@]}" install-x86-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
+ ;;
+ i686/stage3.spec)
+ "${cmd[@]}" stage3-i686-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ esac
+ popd >/dev/null || exit
+
+ pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
+ case ${spec} in
+ hardened/stage3.spec)
+ "${cmd[@]}" stage3-i686-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/admincd-stage2.spec)
+ "${cmd[@]}" admincd-x86-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ ;;
+ esac
+ popd >/dev/null || exit
}
# vim:ft=sh:
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 27637e59..e778ce8e 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -30,7 +30,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d >/dev/null
+ pushd "${d}" >/dev/null || exit
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
# 20yymmddThhmmssZ
# 20yymmddhhmmss
@@ -44,11 +44,13 @@ update_symlinks() {
<<<"$f")
ln -svf "$f" "$of"
done
- popd >/dev/null
+ popd >/dev/null || exit
done
}
post_build() {
+ local set=$1 spec=$2
+
cmd=(
rsync
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
@@ -67,34 +69,31 @@ post_build() {
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
- pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
- mkdir -p ${TMPDIR}/empty
- "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
- if [ -f $file ]; then
- "${cmd[@]}" ${file}* ${DEST_DEFAULT}
- fi
- done
- if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
- elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
- fi
- popd >/dev/null
- pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
- "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
- if [ -f $file ]; then
- "${cmd[@]}" $file* ${DEST_HARDENED}
- fi
- done
- if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
- elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
- fi
- popd >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+ case ${spec} in
+ stage3.spec)
+ "${cmd[@]}" stage3-i486-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ installcd-stage2-minimal.spec)
+ "${cmd[@]}" install-x86-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
+ ;;
+ i686/stage3.spec)
+ "${cmd[@]}" stage3-i686-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ esac
+ popd >/dev/null || exit
+
+ pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
+ case ${spec} in
+ hardened/stage3.spec)
+ "${cmd[@]}" stage3-i686-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/admincd-stage2.spec)
+ "${cmd[@]}" admincd-x86-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ ;;
+ esac
+ popd >/dev/null || exit
}
# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-16 18:26 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-05-16 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 915dc435ff09494c32c6e7d1197808ba94e53b9d
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 12:40:02 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri May 15 12:40:02 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=915dc435
catalyst-auto-amd64*.conf: explicitly list files to be transferred
Previously when we were copying locally there was no (major) problem
with wildcarding a long list of files to be transferred after every
single spec finishes. Now that we are transferring to a remote host,
this results in a lot of wasted transfer time & bandwidth.
I have adjusted the post_build function to only transfer the new files
known to be produced by each spec (which has files meant to be
published).
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 87 +++++++++++++++++++----------
tools/catalyst-auto-amd64.conf | 86 ++++++++++++++++++----------
2 files changed, 113 insertions(+), 60 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index e7b1ea79..2aa91a03 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -26,6 +26,7 @@ SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
+
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
@@ -43,7 +44,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d >/dev/null
+ pushd "${d}" >/dev/null || exit
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
# 20yymmddThhmmssZ
# 20yymmddhhmmss
@@ -57,11 +58,13 @@ update_symlinks() {
<<<"$f")
ln -svf "$f" "$of"
done
- popd >/dev/null
+ popd >/dev/null || exit
done
}
post_build() {
+ local set=$1 spec=$2
+
cmd=(
rsync
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
@@ -80,34 +83,58 @@ post_build() {
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
- pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
- mkdir -p ${TMPDIR}/empty
- "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
- if [ -f $file ]; then
- "${cmd[@]}" ${file}* ${DEST_DEFAULT}
- fi
- done
- if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
- elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
- fi
- popd >/dev/null
-
- pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
- "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
- if [ -f $file ]; then
- "${cmd[@]}" $file* ${DEST_HARDENED}
- fi
- done
- if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
- elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
- fi
- popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+ case ${spec} in
+ stage3.spec)
+ "${cmd[@]}" stage3-amd64-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ installcd-stage2-minimal.spec)
+ "${cmd[@]}" install-amd64-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
+ ;;
+ stage4-minimal.spec)
+ "${cmd[@]}" stage4-amd64-minimal-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ stage3-nomultilib.spec)
+ "${cmd[@]}" stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ stage4-nomultilib-minimal.spec)
+ "${cmd[@]}" stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ stage3-x32.spec)
+ "${cmd[@]}" stage3-x32-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ esac
+ popd >/dev/null || exit
+
+ pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
+ case ${spec} in
+ hardened/stage3.spec)
+ "${cmd[@]}" stage3-amd64-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/admincd-stage2.spec)
+ "${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ ;;
+ hardened/stage4-minimal.spec)
+ "${cmd[@]}" stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/stage3-nomultilib.spec)
+ "${cmd[@]}" stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/stage4-nomultilib-minimal.spec)
+ "${cmd[@]}" stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/stage3-selinux.spec)
+ "${cmd[@]}" stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/admincd-stage2-selinux.spec)
+ "${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ ;;
+ hardened/stage3-selinux-nomultilib.spec)
+ "${cmd[@]}" stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ esac
+ popd >/dev/null || exit
}
# vim:ft=sh:
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 0b7e9b2f..585c22c6 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -44,7 +44,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d >/dev/null
+ pushd "${d}" >/dev/null || exit
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
# 20yymmddThhmmssZ
# 20yymmddhhmmss
@@ -58,11 +58,13 @@ update_symlinks() {
<<<"$f")
ln -svf "$f" "$of"
done
- popd >/dev/null
+ popd >/dev/null || exit
done
}
post_build() {
+ local set=$1 spec=$2
+
cmd=(
rsync
-e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
@@ -81,34 +83,58 @@ post_build() {
DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
- pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
- mkdir -p ${TMPDIR}/empty
- "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
- if [ -f $file ]; then
- "${cmd[@]}" ${file}* ${DEST_DEFAULT}
- fi
- done
- if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
- elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
- fi
- popd >/dev/null
-
- pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
- "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
- if [ -f $file ]; then
- "${cmd[@]}" $file* ${DEST_HARDENED}
- fi
- done
- if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
- elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
- fi
- popd >/dev/null
+
+ pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+ case ${spec} in
+ stage3.spec)
+ "${cmd[@]}" stage3-amd64-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ installcd-stage2-minimal.spec)
+ "${cmd[@]}" install-amd64-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
+ ;;
+ stage4-minimal.spec)
+ "${cmd[@]}" stage4-amd64-minimal-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ stage3-nomultilib.spec)
+ "${cmd[@]}" stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ stage4-nomultilib-minimal.spec)
+ "${cmd[@]}" stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ stage3-x32.spec)
+ "${cmd[@]}" stage3-x32-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ ;;
+ esac
+ popd >/dev/null || exit
+
+ pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
+ case ${spec} in
+ hardened/stage3.spec)
+ "${cmd[@]}" stage3-amd64-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/admincd-stage2.spec)
+ "${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ ;;
+ hardened/stage4-minimal.spec)
+ "${cmd[@]}" stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/stage3-nomultilib.spec)
+ "${cmd[@]}" stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/stage4-nomultilib-minimal.spec)
+ "${cmd[@]}" stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/stage3-selinux.spec)
+ "${cmd[@]}" stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ hardened/admincd-stage2-selinux.spec)
+ "${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ ;;
+ hardened/stage3-selinux-nomultilib.spec)
+ "${cmd[@]}" stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ ;;
+ esac
+ popd >/dev/null || exit
}
# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-16 18:26 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-05-16 18:26 UTC (permalink / raw
To: gentoo-commits
commit: 60a1326315870e1cc5780b721db5a5567393d968
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri May 15 17:34:12 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri May 15 17:34:12 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=60a13263
catalyst-auto-{amd64,x86}*.conf: change cmd array to upload function
Use an easier-to-read "upload" function in place of "${cmd[@]}" array
syntax. Added a helper var UPLOAD_DEST to be set in advance so that
upload function takes only a list of filenames to be uploaded.
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 48 ++++++++++++++++-------------
tools/catalyst-auto-amd64.conf | 48 ++++++++++++++++-------------
tools/catalyst-auto-x86-experimental.conf | 29 +++++++++--------
tools/catalyst-auto-x86.conf | 29 +++++++++--------
4 files changed, 86 insertions(+), 68 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 2aa91a03..f09cdb3b 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -26,7 +26,6 @@ SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
-
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
@@ -62,16 +61,19 @@ update_symlinks() {
done
}
+upload() {
+ rsync \
+ -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+ -a \
+ --omit-dir-times \
+ --delay-updates \
+ "$@" \
+ "${UPLOAD_DEST}"
+}
+
post_build() {
local set=$1 spec=$2
- cmd=(
- rsync
- -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
- -a
- --omit-dir-times
- --delay-updates
- )
case $HOSTNAME in
# If you ever need to ensure it's copied somewhere local, drop a hostname in here!
LOCAL)
@@ -85,53 +87,55 @@ post_build() {
esac
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+ UPLOAD_DEST=${DEST_DEFAULT}
case ${spec} in
stage3.spec)
- "${cmd[@]}" stage3-amd64-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-amd64-${TIMESTAMP}.tar.xz*
;;
installcd-stage2-minimal.spec)
- "${cmd[@]}" install-amd64-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
+ upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
stage4-minimal.spec)
- "${cmd[@]}" stage4-amd64-minimal-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage4-amd64-minimal-${TIMESTAMP}.tar.xz*
;;
stage3-nomultilib.spec)
- "${cmd[@]}" stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz*
;;
stage4-nomultilib-minimal.spec)
- "${cmd[@]}" stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz*
;;
stage3-x32.spec)
- "${cmd[@]}" stage3-x32-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-x32-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
+ UPLOAD_DEST=${DEST_HARDENED}
case ${spec} in
hardened/stage3.spec)
- "${cmd[@]}" stage3-amd64-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2.spec)
- "${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ upload admincd-amd64-${TIMESTAMP}.iso*
;;
hardened/stage4-minimal.spec)
- "${cmd[@]}" stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz*
;;
hardened/stage3-nomultilib.spec)
- "${cmd[@]}" stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz*
;;
hardened/stage4-nomultilib-minimal.spec)
- "${cmd[@]}" stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz*
;;
hardened/stage3-selinux.spec)
- "${cmd[@]}" stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2-selinux.spec)
- "${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ upload admincd-amd64-${TIMESTAMP}.iso*
;;
hardened/stage3-selinux-nomultilib.spec)
- "${cmd[@]}" stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 585c22c6..15f691d4 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -26,7 +26,6 @@ SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
-
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
@@ -62,16 +61,19 @@ update_symlinks() {
done
}
+upload() {
+ rsync \
+ -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+ -a \
+ --omit-dir-times \
+ --delay-updates \
+ "$@" \
+ "${UPLOAD_DEST}"
+}
+
post_build() {
local set=$1 spec=$2
- cmd=(
- rsync
- -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
- -a
- --omit-dir-times
- --delay-updates
- )
case $HOSTNAME in
# If you ever need to ensure it's copied somewhere local, drop a hostname in here!
LOCAL)
@@ -85,53 +87,55 @@ post_build() {
esac
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+ UPLOAD_DEST=${DEST_DEFAULT}
case ${spec} in
stage3.spec)
- "${cmd[@]}" stage3-amd64-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-amd64-${TIMESTAMP}.tar.xz*
;;
installcd-stage2-minimal.spec)
- "${cmd[@]}" install-amd64-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
+ upload install-amd64-minimal-${TIMESTAMP}.iso*
;;
stage4-minimal.spec)
- "${cmd[@]}" stage4-amd64-minimal-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage4-amd64-minimal-${TIMESTAMP}.tar.xz*
;;
stage3-nomultilib.spec)
- "${cmd[@]}" stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-amd64-nomultilib-${TIMESTAMP}.tar.xz*
;;
stage4-nomultilib-minimal.spec)
- "${cmd[@]}" stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz*
;;
stage3-x32.spec)
- "${cmd[@]}" stage3-x32-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-x32-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
+ UPLOAD_DEST=${DEST_HARDENED}
case ${spec} in
hardened/stage3.spec)
- "${cmd[@]}" stage3-amd64-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-amd64-hardened-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2.spec)
- "${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ upload admincd-amd64-${TIMESTAMP}.iso*
;;
hardened/stage4-minimal.spec)
- "${cmd[@]}" stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage4-amd64-hardened+minimal-${TIMESTAMP}.tar.xz*
;;
hardened/stage3-nomultilib.spec)
- "${cmd[@]}" stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-amd64-hardened+nomultilib-${TIMESTAMP}.tar.xz*
;;
hardened/stage4-nomultilib-minimal.spec)
- "${cmd[@]}" stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage4-amd64-hardened+minimal-nomultilib-${TIMESTAMP}.tar.xz*
;;
hardened/stage3-selinux.spec)
- "${cmd[@]}" stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-amd64-hardened-selinux-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2-selinux.spec)
- "${cmd[@]}" admincd-amd64-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ upload admincd-amd64-${TIMESTAMP}.iso*
;;
hardened/stage3-selinux-nomultilib.spec)
- "${cmd[@]}" stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-amd64-hardened-selinux+nomultilib-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 061cab92..5f0e475e 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -48,16 +48,19 @@ update_symlinks() {
done
}
+upload() {
+ rsync \
+ -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+ -a \
+ --omit-dir-times \
+ --delay-updates \
+ "$@" \
+ "${UPLOAD_DEST}"
+}
+
post_build() {
local set=$1 spec=$2
- cmd=(
- rsync
- -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
- -a
- --omit-dir-times
- --delay-updates
- )
case $HOSTNAME in
# If you ever need to ensure it's copied somewhere local, drop a hostname in here!
LOCAL)
@@ -71,26 +74,28 @@ post_build() {
esac
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+ UPLOAD_DEST=${DEST_DEFAULT}
case ${spec} in
stage3.spec)
- "${cmd[@]}" stage3-i486-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-i486-${TIMESTAMP}.tar.xz*
;;
installcd-stage2-minimal.spec)
- "${cmd[@]}" install-x86-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
+ upload install-x86-minimal-${TIMESTAMP}.iso*
;;
i686/stage3.spec)
- "${cmd[@]}" stage3-i686-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-i686-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
+ UPLOAD_DEST=${DEST_HARDENED}
case ${spec} in
hardened/stage3.spec)
- "${cmd[@]}" stage3-i686-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2.spec)
- "${cmd[@]}" admincd-x86-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ upload admincd-x86-${TIMESTAMP}.iso*
;;
esac
popd >/dev/null || exit
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index e778ce8e..aa00dde1 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -48,16 +48,19 @@ update_symlinks() {
done
}
+upload() {
+ rsync \
+ -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' \
+ -a \
+ --omit-dir-times \
+ --delay-updates \
+ "$@" \
+ "${UPLOAD_DEST}"
+}
+
post_build() {
local set=$1 spec=$2
- cmd=(
- rsync
- -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
- -a
- --omit-dir-times
- --delay-updates
- )
case $HOSTNAME in
# If you ever need to ensure it's copied somewhere local, drop a hostname in here!
LOCAL)
@@ -71,26 +74,28 @@ post_build() {
esac
pushd "${BUILD_SRCDIR_BASE}"/default >/dev/null || exit
+ UPLOAD_DEST=${DEST_DEFAULT}
case ${spec} in
stage3.spec)
- "${cmd[@]}" stage3-i486-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-i486-${TIMESTAMP}.tar.xz*
;;
installcd-stage2-minimal.spec)
- "${cmd[@]}" install-x86-minimal-${TIMESTAMP}.iso* "${DEST_DEFAULT}"
+ upload install-x86-minimal-${TIMESTAMP}.iso*
;;
i686/stage3.spec)
- "${cmd[@]}" stage3-i686-${TIMESTAMP}.tar.xz* "${DEST_DEFAULT}"
+ upload stage3-i686-${TIMESTAMP}.tar.xz*
;;
esac
popd >/dev/null || exit
pushd "${BUILD_SRCDIR_BASE}"/hardened >/dev/null || exit
+ UPLOAD_DEST=${DEST_HARDENED}
case ${spec} in
hardened/stage3.spec)
- "${cmd[@]}" stage3-i686-hardened-${TIMESTAMP}.tar.xz* "${DEST_HARDENED}"
+ upload stage3-i686-hardened-${TIMESTAMP}.tar.xz*
;;
hardened/admincd-stage2.spec)
- "${cmd[@]}" admincd-x86-${TIMESTAMP}.iso* "${DEST_HARDENED}"
+ upload admincd-x86-${TIMESTAMP}.iso*
;;
esac
popd >/dev/null || exit
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-12 5:47 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2020-05-12 5:47 UTC (permalink / raw
To: gentoo-commits
commit: 62bfd232bb9a2312be840f717f692da5d6db808a
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 05:46:34 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue May 12 05:46:34 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=62bfd232
catalyst-auto: defer purge until all sets are done
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index efa7a99d..e6e7f30f 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -421,11 +421,25 @@ run_catalyst_commands() {
fi
done
+ # Do not purge yet, because there might be interdendency between specs
+ # in different build sets!
+
+ update_symlinks
+ done
+
+ # Now do the cleanup
+ for a in "" ${SETS}; do
+ if [[ -z ${a} ]]; then
+ specs_var="SPECS"
+ optional_specs_var="OPTIONAL_SPECS"
+ else
+ specs_var="SET_${a}_SPECS"
+ optional_specs_var="SET_${a}_OPTIONAL_SPECS"
+ fi
for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${i}"
done
-
update_symlinks
done
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-12 5:47 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2020-05-12 5:47 UTC (permalink / raw
To: gentoo-commits
commit: 703d2ef0c1ae105b22a25094ce18fbf5a339b974
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 05:47:03 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue May 12 05:47:03 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=703d2ef0
catalyst-auto: print full path to specfile for the email
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index e6e7f30f..51b0471c 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -399,7 +399,8 @@ run_catalyst_commands() {
for i in ${!specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}"
+ specpath=$(readlink -f "${i}")
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
if [[ $? != 0 ]]; then
build_failure=1
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
@@ -411,7 +412,8 @@ run_catalyst_commands() {
for i in ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}"
+ specpath=$(readlink -f "${i}")
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${specpath}"
if [[ $? != 0 ]]; then
build_failure=1
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
@@ -438,7 +440,8 @@ run_catalyst_commands() {
fi
for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
- run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${i}"
+ specpath=$(readlink -f "${i}")
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${specpath}"
done
update_symlinks
done
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-12 5:16 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2020-05-12 5:16 UTC (permalink / raw
To: gentoo-commits
commit: affe64920529782abc21f92e045dbbc91e78d2f9
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue May 12 05:14:17 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue May 12 05:14:35 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=affe6492
catalyst-auto: no special behavior for nightheron copy anymore
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 3 ++-
tools/catalyst-auto-amd64.conf | 3 ++-
tools/catalyst-auto-x86-experimental.conf | 3 ++-
tools/catalyst-auto-x86.conf | 3 ++-
4 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index b78f3d23..e7b1ea79 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -70,7 +70,8 @@ post_build() {
--delay-updates
)
case $HOSTNAME in
- nightheron)
+ # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
+ LOCAL)
DEST_DEFAULT=${BUILD_DESTDIR_BASE}
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 57f080aa..0b7e9b2f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -71,7 +71,8 @@ post_build() {
--delay-updates
)
case $HOSTNAME in
- nightheron)
+ # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
+ LOCAL)
DEST_DEFAULT=${BUILD_DESTDIR_BASE}
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index da8c3df6..3fd60287 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -49,7 +49,8 @@ post_build() {
--delay-updates
)
case $HOSTNAME in
- nightheron)
+ # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
+ LOCAL)
DEST_DEFAULT=${BUILD_DESTDIR_BASE}
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 6d8ea027..27637e59 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -57,7 +57,8 @@ post_build() {
--delay-updates
)
case $HOSTNAME in
- nightheron)
+ # If you ever need to ensure it's copied somewhere local, drop a hostname in here!
+ LOCAL)
DEST_DEFAULT=${BUILD_DESTDIR_BASE}
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-11 19:05 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2020-05-11 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 05592ee0b7c716c9f45115e1db66eedeb16c8445
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon May 11 18:53:55 2020 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Mon May 11 18:53:55 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=05592ee0
catalyst-auto: set DATESTAMP again
This var is still used by some arches' catalyst-auto configs
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 27ba3700..efa7a99d 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -298,6 +298,7 @@ run_catalyst_commands() {
exit 1
fi
fi
+ DATESTAMP=$(date -u +%Y%m%d)
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" "catalyst-auto.${TIMESTAMP}.XXXXXX")
# Nuke any previous tmpdirs to keep them from accumulating.
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-09 21:41 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-05-09 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 635cc00fa9ca3d2abf61a5ca11aafcdc72547489
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat May 9 20:43:43 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat May 9 20:58:42 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=635cc00f
tools: Combine arm configs
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-arm.conf | 51 ++++++++++++++++++++++++++++++++++
tools/catalyst-auto-armv4tl.conf | 34 -----------------------
tools/catalyst-auto-armv5tel.conf | 34 -----------------------
tools/catalyst-auto-armv6j.conf | 34 -----------------------
tools/catalyst-auto-armv6j_hardfp.conf | 34 -----------------------
tools/catalyst-auto-armv7a.conf | 34 -----------------------
tools/catalyst-auto-armv7a_hardfp.conf | 34 -----------------------
7 files changed, 51 insertions(+), 204 deletions(-)
diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf
new file mode 100644
index 00000000..96d75326
--- /dev/null
+++ b/tools/catalyst-auto-arm.conf
@@ -0,0 +1,51 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+REPO_DIR=/root/releng/
+
+SPECS_DIR=${REPO_DIR}/releases/specs/arm
+
+SPECS="armv4tl/stage1.spec armv4tl/stage3.spec armv5tel/stage1.spec armv5tel/stage3.spec armv6j/hardfloat/stage1.spec armv6j/hardfloat/stage3.spec armv7a/hardfloat/stage1.spec armv7a/hardfloat/stage3.spec"
+
+EMAIL_SUBJECT_PREPEND="[arm-auto]"
+
+update_symlinks() {
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
+ pushd $d >/dev/null
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
+ ln -sf $f $of
+ done
+ popd >/dev/null
+ done
+}
+
+
+upload() {
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
+}
+
+post_build() {
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ armv4tl/stage3.spec)
+ upload stage3-armv4tl-${TIMESTAMP}*.xz*
+ ;;
+ armv5tel/systemd-stage3.spec)
+ upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz*
+ ;;
+ armv6j_hardfp/stage3.spec)
+ upload stage3-armv6j_hardfp-${TIMESTAMP}*.xz*
+ ;;
+ armv7a_hardfp/stage3.spec)
+ upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz*
+ ;;
+ esac
+
+ popd >/dev/null
+}
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
deleted file mode 100644
index e09b6cb8..00000000
--- a/tools/catalyst-auto-armv4tl.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv4tl
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-
-SETS="default"
-
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
-}
-
-
-post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
deleted file mode 100644
index 8daef964..00000000
--- a/tools/catalyst-auto-armv5tel.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv5tel
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-
-SETS="default"
-
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
-}
-
-
-post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
deleted file mode 100644
index a1d52f5d..00000000
--- a/tools/catalyst-auto-armv6j.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-
-SETS="default"
-
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
-}
-
-
-post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
deleted file mode 100644
index 50bf09f7..00000000
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv6j/hardfloat
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-
-SETS="default"
-
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
-}
-
-
-post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
deleted file mode 100644
index a4def3c7..00000000
--- a/tools/catalyst-auto-armv7a.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-
-SETS="default"
-
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
-}
-
-
-post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
deleted file mode 100644
index ce7904a5..00000000
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ /dev/null
@@ -1,34 +0,0 @@
-# This is the config file for the catalyst-auto script. It should be pretty
-# self-explanatory.
-
-REPO_DIR=/root/releng/
-
-SPECS_DIR=${REPO_DIR}/releases/specs/arm/armv7a/hardfloat
-SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-
-SETS="default"
-
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-#SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
-
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
-}
-
-
-post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
-}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-05-08 4:59 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2020-05-08 4:59 UTC (permalink / raw
To: gentoo-commits
commit: 77b29c8686fa5aa681163ab7b38958347b329308
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri May 8 04:59:19 2020 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri May 8 04:59:19 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=77b29c86
tools/catalyst-auto: permit OTHER flags in /etc/resolv.conf
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 0cd9275f..27ba3700 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -244,7 +244,7 @@ verify_dnssec() {
exit 1
fi
- if ! grep -q '^options \<edns0\>' /etc/resolv.conf; then
+ if ! grep -q '^options\>.*\<edns0\>' /etc/resolv.conf; then
echo "DNSSEC is not enabled in /etc/resolv.conf"
exit 1
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-30 23:16 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-30 23:16 UTC (permalink / raw
To: gentoo-commits
commit: 51d806875ebd575a9d6ec71ec3a2c6fc5bf0ee4b
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 23:12:56 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 23:12:56 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=51d80687
catalyst-auto: Add fallback for unset storedir
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index f8258545..0cd9275f 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -268,6 +268,7 @@ run_catalyst_commands() {
# Some configs will set this explicitly, so don't clobber it.
: ${BUILD_SRCDIR_BASE:=$(catalyst_var storedir)}
+ : ${BUILD_SRCDIR_BASE:=/var/tmp/catalyst}
# See if we had a recent success.
if [[ ${lastrun} != 0 ]]; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-30 22:54 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-30 22:54 UTC (permalink / raw
To: gentoo-commits
commit: 943e1a71819f93c595bbfe5583d4a92baa25dd34
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 30 04:49:10 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 06:04:59 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=943e1a71
catalyst-auto: Support sqfs snapshots
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 31 ++++++++++++++++++++++++-------
1 file changed, 24 insertions(+), 7 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 66ff5ecc..f8258545 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -279,7 +279,24 @@ run_catalyst_commands() {
fi
fi
- TIMESTAMP=$(date -u +%Y%m%dT%H%M%SZ)
+ if catalyst --help | grep -q "git-treeish"; then
+ snapshot_log=$(mktemp --tmpdir="${TMP_PATH:-/tmp}")
+ if ! run_cmd "${snapshot_log}" catalyst -c "${CATALYST_CONFIG}" -s stable; then
+ send_email "Catalyst build error - snapshot" "" "${snapshot_log}"
+ exit 1
+ fi
+
+ read TREEISH gitdir <<<$(egrep -o 'Creating .* tree snapshot [0-9a-f]{40} from .*' "${snapshot_log}" | cut -d' ' -f5,7)
+ TIMESTAMP=$(git -C "${gitdir}" show --no-patch --format=%cd --date=format:%Y%m%dT%H%M%SZ "${TREEISH}")
+ else
+ TIMESTAMP=$(date -u +%Y%m%dT%H%M%SZ)
+
+ snapshot_log=$(mktemp --tmpdir="${TMP_PATH:-/tmp}")
+ if ! run_cmd "${snapshot_log}" catalyst -c "${CATALYST_CONFIG}" -s "${TIMESTAMP}"; then
+ send_email "Catalyst build error - snapshot" "" "${snapshot_log}"
+ exit 1
+ fi
+ fi
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" "catalyst-auto.${TIMESTAMP}.XXXXXX")
# Nuke any previous tmpdirs to keep them from accumulating.
@@ -297,6 +314,7 @@ run_catalyst_commands() {
echo "Couldn't create tempdirs!"
exit 1
fi
+ mv "${snapshot_log}" "${TMPDIR}/log/snapshot.log"
if ! run_cmd "${TMPDIR}/log/pre_build.log" pre_build; then
send_email "Catalyst build error - pre_build" "The pre_build function failed" "${TMPDIR}/log/pre_build.log"
@@ -334,10 +352,15 @@ run_catalyst_commands() {
done
fi
+ if [[ -n ${TREEISH} ]]; then
+ sed -i -e "s|snapshot:.*|snapshot_treeish: ${TREEISH}|g" "${i}"
+ fi
+
# Expand vars that the spec expects us to.
sed -i \
-e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
-e "s:@REPO_DIR@:${REPO_DIR}:g" \
+ -e "s:@TREEISH@:${TREEISH}:g" \
"${i}"
done
@@ -358,12 +381,6 @@ run_catalyst_commands() {
popd >/dev/null
fi
- # Create snapshot
- if ! run_cmd "${TMPDIR}/log/snapshot.log" catalyst -c "${CATALYST_CONFIG}" -s "${TIMESTAMP}"; then
- send_email "Catalyst build error - snapshot" "" "${TMPDIR}/log/snapshot.log"
- exit 1
- fi
-
build_failure=0
timeprefix=()
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-29 23:20 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-29 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 43aa276417114d50600816e0d1aa044da99ca1f0
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 04:45:43 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 19:37:50 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=43aa2764
catalyst-auto: Drop unnecessary spec munging
No longer necessary with @TIMESTAMP@.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 18 ------------------
1 file changed, 18 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 2e449ea0..66ff5ecc 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -325,24 +325,6 @@ run_catalyst_commands() {
# Fix up specs with datestamp
for i in $(find -name '*.spec'); do
- # Grab current version_stamp and source_subpath
- old_version_stamp=$(grep version_stamp "${i}" | sed -e 's|^version_stamp: *||')
- old_source_subpath=$(grep source_subpath "${i}" | sed -e 's|^source_subpath: *||')
-
- new_version_stamp=$(echo "${old_version_stamp}" | sed -e "s|^\(.*-\)\?.*$|\1${TIMESTAMP}|")
- new_source_subpath=$(echo "${old_source_subpath}" | sed -e "s|${old_version_stamp}|${new_version_stamp}|")
-
- sed -i "s|^version_stamp:.*$|version_stamp: ${new_version_stamp}|" "${i}"
- sed -i "s|^snapshot:.*$|snapshot: ${TIMESTAMP}|" "${i}"
-
- # We don't want to mangle the source_subpath for our stage1 spec
- if ! grep -q '^target: *stage[14]$' "${i}"; then
- sed -i "s|^source_subpath:.*$|source_subpath: ${new_source_subpath}|" "${i}"
- fi
-
- sed -i "/^livecd\/iso/s|${old_version_stamp}|${new_version_stamp}|" "${i}"
- sed -i "/^livecd\/volid/s|${old_version_stamp}|${new_version_stamp}|" "${i}"
-
kconfig_lines=$(grep '^boot/kernel/[^/]\+/config:' "${i}")
if [[ -n ${kconfig_lines} ]]; then
echo "${kconfig_lines}" | while read line; do
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-29 23:20 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-29 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 369e27e399f3eec10ef47dfa2d8909e6f964ca95
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 29 01:20:25 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 29 04:36:06 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=369e27e3
catalyst-auto: Drop setting @DATESTAMP@
Not used in any of the spec files.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 3 ---
1 file changed, 3 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index ce155d6d..2e449ea0 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -279,7 +279,6 @@ run_catalyst_commands() {
fi
fi
- DATESTAMP=$(date -u +%Y%m%d)
TIMESTAMP=$(date -u +%Y%m%dT%H%M%SZ)
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" "catalyst-auto.${TIMESTAMP}.XXXXXX")
@@ -291,7 +290,6 @@ run_catalyst_commands() {
if [[ ${verbose} -ge 1 ]]; then
echo "TMPDIR = ${TMPDIR}"
- echo "DATESTAMP = ${DATESTAMP}"
echo "TIMESTAMP = ${TIMESTAMP}"
fi
@@ -356,7 +354,6 @@ run_catalyst_commands() {
# Expand vars that the spec expects us to.
sed -i \
- -e "s:@DATESTAMP@:${DATESTAMP}:g" \
-e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
-e "s:@REPO_DIR@:${REPO_DIR}:g" \
"${i}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-26 5:24 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-26 5:24 UTC (permalink / raw
To: gentoo-commits
commit: e24e331fa3536e751fe90e1158b60c9ad6c4f939
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 05:23:48 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 05:23:48 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e24e331f
catalyst-auto: Ensure 'options edns0' is in /etc/resolv.conf
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 509917c7..ce155d6d 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -243,6 +243,11 @@ verify_dnssec() {
echo "DNSSEC does not appear to be working. Bailing out"
exit 1
fi
+
+ if ! grep -q '^options \<edns0\>' /etc/resolv.conf; then
+ echo "DNSSEC is not enabled in /etc/resolv.conf"
+ exit 1
+ fi
}
run_catalyst_commands() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-26 5:19 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-26 5:19 UTC (permalink / raw
To: gentoo-commits
commit: e9ea15ab8baf47f34b508fe02f5135f3063e0dc5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 26 04:52:40 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Apr 26 05:18:34 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e9ea15ab
Upload stages to releng-incoming.gentoo.org
Most architecture's build systems are hosted at OSUOSL. The place the
stages need to end up is ultimately masterreleases.gentoo.org, also at
OSUOSL. For some unknown reason, instead of rsync'ing from one system to
another in the same building, we were sending the stages first (slowly,
I might add) to nightheron in France, before sending them back to
OSUOSL.
robbat2 has added a releng-incoming.gentoo.org DNS record that currently
points to nightheron. This will allow us to switch the record in the
future and save the stages from needing to circumnavigate the globe
before reaching the mirrors.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 19 +++++++++++++++++++
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-amd64-experimental.conf | 6 +++---
tools/catalyst-auto-amd64.conf | 6 +++---
tools/catalyst-auto-arm64.conf | 2 +-
tools/catalyst-auto-armv4tl.conf | 2 +-
tools/catalyst-auto-armv5tel.conf | 2 +-
tools/catalyst-auto-armv6j.conf | 2 +-
tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
tools/catalyst-auto-armv7a.conf | 2 +-
tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
tools/catalyst-auto-hppa.conf | 2 +-
tools/catalyst-auto-ia64.conf | 2 +-
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 2 +-
tools/catalyst-auto-x86-experimental.conf | 6 +++---
tools/catalyst-auto-x86.conf | 6 +++---
18 files changed, 44 insertions(+), 25 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index de0afd69..509917c7 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -229,6 +229,22 @@ git_update() {
fi
}
+# Stages are uploaded to <arch>@releng-incoming.gentoo.org and in order to
+# allow us to change what system this domain points to, we will retrieve the
+# SSH fingerprint from DNS. To do this securely, we need to ensure DNSSEC is
+# working.
+verify_dnssec() {
+ which dig >/dev/null || {
+ echo "net-dns/bind-tools is needed to verify DNSSEC is working"
+ exit 1
+ }
+
+ if ! dig +noall +comments dev.gentoo.org. IN SSHFP | egrep -q '^;; flags: [ a-z]+\<ad\>'; then
+ echo "DNSSEC does not appear to be working. Bailing out"
+ exit 1
+ fi
+}
+
run_catalyst_commands() {
doneconfig=0
for config_file in "${config_files[@]}"; do
@@ -441,6 +457,9 @@ main() {
# Update the release git dir if possible.
git_update "$@"
+ # Verify DNSSEC works
+ verify_dnssec
+
# Try to isolate ourselves from the rest of the system.
containerize "$@"
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index b218fa0e..c8090e97 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -33,7 +33,7 @@ update_symlinks() {
upload() {
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" alpha@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 37e01bd1..5e444764 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -64,7 +64,7 @@ update_symlinks() {
post_build() {
cmd=(
rsync
- -e 'ssh -i /root/.ssh/id_rsa'
+ -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
-a
--omit-dir-times
--delay-updates
@@ -75,8 +75,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index c2e0c8b1..31cb48b0 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -65,7 +65,7 @@ update_symlinks() {
post_build() {
cmd=(
rsync
- -e 'ssh -i /root/.ssh/id_rsa'
+ -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
-a
--omit-dir-times
--delay-updates
@@ -76,8 +76,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 0d1506a4..15a4a0c4 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -29,7 +29,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" arm@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index fa20b5ca..0727b830 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 79975984..9956a033 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 0db433fa..97406f65 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index ca12d89d..6f26e2fa 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 1b13c6b5..0e7a6126 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index c3037712..e9c893d2 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 5444cc4e..850cf411 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -33,7 +33,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/buildsync.key -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" hppa@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b3328ed3..e441cfc8 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ia64@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index b48c7536..4986c053 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" s390@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index c9f3f7e9..ab10f702 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" s390@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 4a9a2c21..5e83a6bc 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -28,7 +28,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes' "$@" sparc@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" sparc@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 2373041e..673e00e9 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -43,7 +43,7 @@ update_symlinks() {
post_build() {
cmd=(
rsync
- -e 'ssh -i /root/.ssh/id_rsa'
+ -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
-a
--omit-dir-times
--delay-updates
@@ -54,8 +54,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 52f07b12..0aa7990a 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -51,7 +51,7 @@ update_symlinks() {
post_build() {
cmd=(
rsync
- -e 'ssh -i /root/.ssh/id_rsa'
+ -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no'
-a
--omit-dir-times
--delay-updates
@@ -62,8 +62,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-25 3:55 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-25 3:55 UTC (permalink / raw
To: gentoo-commits
commit: 7f9d62eae5b8a93b0e67ee1da758a8f2e2dd5832
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 25 03:54:20 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Apr 25 03:54:20 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=7f9d62ea
ppc: Use StrictHostKeyChecking=no
We're using UserKnownHostsFile=/dev/null to force ssh to use the
fingerprint from DNSSEC, so StrictHostKeyChecking=no just prevents ssh
from asking us to confirm the fingerprint.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64le.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index c6e6e67a..1ff04bd0 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -32,7 +32,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes' "$@" ppc@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ppc@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index b9f09e46..acfcdfec 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -31,7 +31,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes' "$@" ppc@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes -o StrictHostKeyChecking=no' "$@" ppc@releng-incoming.gentoo.org:
}
post_build() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-24 18:31 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-24 18:31 UTC (permalink / raw
To: gentoo-commits
commit: df596c4815756085644f4da5388e11ef9253d9ca
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 18:28:34 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 18:31:02 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=df596c48
ppc: Upload stages to releng-incoming.gentoo.org
See commit 63174346f265 for rationale.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64le.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 59572644..c6e6e67a 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -32,7 +32,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes' "$@" ppc@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 76e1bdf5..b9f09e46 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -31,7 +31,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes' "$@" ppc@releng-incoming.gentoo.org:
}
post_build() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-24 6:56 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-24 6:56 UTC (permalink / raw
To: gentoo-commits
commit: 17d89ba37883e39a8f5655bf6ada01d987f8abb9
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 24 06:55:57 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 24 06:55:57 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=17d89ba3
sparc: Upload stages to releng-incoming.gentoo.org
See commit 63174346f265 for rationale.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 0eeaddd6..4a9a2c21 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -28,7 +28,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa -o UserKnownHostsFile=/dev/null -o VerifyHostKeyDNS=yes' "$@" sparc@releng-incoming.gentoo.org:
}
post_build() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-23 21:41 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-23 21:41 UTC (permalink / raw
To: gentoo-commits
commit: 8f5cec8809109e97da564d6cf2a6ea1f335512a5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 21:38:00 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 21:41:13 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f5cec88
Revert "Upload stages to releng-incoming.gentoo.org"
This causes an interactive prompt:
Are you sure you want to continue connecting (yes/no/[fingerprint])?
The plan is to get the SSH fingerprint via DNSSEC, so I'll revert this
change until that is in place and wired up.
This reverts commit 63174346f265830ae8fce6ad3860bcb894069123.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-amd64-experimental.conf | 4 ++--
tools/catalyst-auto-amd64.conf | 4 ++--
tools/catalyst-auto-arm64.conf | 2 +-
tools/catalyst-auto-armv4tl.conf | 2 +-
tools/catalyst-auto-armv5tel.conf | 2 +-
tools/catalyst-auto-armv6j.conf | 2 +-
tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
tools/catalyst-auto-armv7a.conf | 2 +-
tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
tools/catalyst-auto-hppa.conf | 2 +-
tools/catalyst-auto-ia64.conf | 2 +-
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64le.conf | 2 +-
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 2 +-
tools/catalyst-auto-x86-experimental.conf | 4 ++--
tools/catalyst-auto-x86.conf | 4 ++--
19 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index b60f17e8..b218fa0e 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -33,7 +33,7 @@ update_symlinks() {
upload() {
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@nightheron.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index a2f2cec6..37e01bd1 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -75,8 +75,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index ab2ac660..c2e0c8b1 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -76,8 +76,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 004560a0..0d1506a4 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -29,7 +29,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@nightheron.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index 662b2895..fa20b5ca 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index ffb6d34e..79975984 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index d30f4147..0db433fa 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 46e9e9cf..ca12d89d 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 34ecd6c5..1b13c6b5 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index 9bc947e9..c3037712 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 4b13e28b..5444cc4e 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -33,7 +33,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@nightheron.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 13258032..b3328ed3 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@nightheron.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index ddf661c0..59572644 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -32,7 +32,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 04abc577..76e1bdf5 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -31,7 +31,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index a15df683..b48c7536 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 1141b3b9..c9f3f7e9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 18cbfb9d..0eeaddd6 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -28,7 +28,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@releng-incoming.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@nightheron.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 5d147ab8..2373041e 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -54,8 +54,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index bdd9fe35..52f07b12 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -62,8 +62,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-04-23 7:21 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2020-04-23 7:21 UTC (permalink / raw
To: gentoo-commits
commit: 63174346f265830ae8fce6ad3860bcb894069123
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 23 07:14:11 2020 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 07:14:11 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=63174346
Upload stages to releng-incoming.gentoo.org
Most architecture's build systems are hosted at OSUOSL. The place the
stages need to end up is ultimately masterreleases.gentoo.org, also at
OSUOSL. For some unknown reason, instead of rsync'ing from one system to
another in the same building, we were sending the stages first (slowly,
I might add) to nightheron in France, before sending them back to
OSUOSL.
robbat2 has added a releng-incoming.gentoo.org DNS record that currently
points to nightheron. This will allow us to switch the record in the
future and save the stages from needing to circumnavigate the globe
before reaching the mirrors.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-amd64-experimental.conf | 4 ++--
tools/catalyst-auto-amd64.conf | 4 ++--
tools/catalyst-auto-arm64.conf | 2 +-
tools/catalyst-auto-armv4tl.conf | 2 +-
tools/catalyst-auto-armv5tel.conf | 2 +-
tools/catalyst-auto-armv6j.conf | 2 +-
tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
tools/catalyst-auto-armv7a.conf | 2 +-
tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
tools/catalyst-auto-hppa.conf | 2 +-
tools/catalyst-auto-ia64.conf | 2 +-
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64le.conf | 2 +-
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 2 +-
tools/catalyst-auto-x86-experimental.conf | 4 ++--
tools/catalyst-auto-x86.conf | 4 ++--
19 files changed, 23 insertions(+), 23 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index b218fa0e..b60f17e8 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -33,7 +33,7 @@ update_symlinks() {
upload() {
echo Uploading "$@"
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 37e01bd1..a2f2cec6 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -75,8 +75,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index c2e0c8b1..ab2ac660 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -76,8 +76,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 0d1506a4..004560a0 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -29,7 +29,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index fa20b5ca..662b2895 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 79975984..ffb6d34e 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 0db433fa..d30f4147 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index ca12d89d..46e9e9cf 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 1b13c6b5..34ecd6c5 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index c3037712..9bc947e9 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -30,5 +30,5 @@ update_symlinks() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@releng-incoming.gentoo.org:
}
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 5444cc4e..4b13e28b 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -33,7 +33,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b3328ed3..13258032 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 59572644..ddf661c0 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -32,7 +32,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 76e1bdf5..04abc577 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -31,7 +31,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index b48c7536..a15df683 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index c9f3f7e9..1141b3b9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -26,7 +26,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 0eeaddd6..18cbfb9d 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -28,7 +28,7 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@releng-incoming.gentoo.org:
}
post_build() {
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 2373041e..5d147ab8 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -54,8 +54,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 52f07b12..bdd9fe35 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -62,8 +62,8 @@ post_build() {
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
*)
- DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
- DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ DEST_DEFAULT=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@releng-incoming.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2020-02-03 12:03 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2020-02-03 12:03 UTC (permalink / raw
To: gentoo-commits
commit: cee3787b3f30dec1e47d674c0db885b1fb0d5abb
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 3 12:02:36 2020 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Feb 3 12:02:36 2020 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cee3787b
Try to fix the symlink creation for x86 by copying the code form amd64.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 18 +++++++++++++-----
1 file changed, 13 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 064881d4..52f07b12 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -32,9 +32,17 @@ update_symlinks() {
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
- ln -sf $f $of
+ # 20yymmddThhmmssZ
+ # 20yymmddhhmmss
+ # 20yymmdd
+ # 20yy.n
+ of=$(perl -p \
+ -e 's/20\d{6}T\d{6}Z/latest/g;' \
+ -e 's/20\d{6}\d{6}/latest/g;' \
+ -e 's/20\d{6}/latest/g;' \
+ -e 's/20\d{2}\.\d{2}/latest/g;' \
+ <<<"$f")
+ ln -svf "$f" "$of"
done
popd >/dev/null
done
@@ -61,7 +69,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
mkdir -p ${TMPDIR}/empty
"${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
- for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
"${cmd[@]}" ${file}* ${DEST_DEFAULT}
fi
@@ -75,7 +83,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
"${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
- for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
"${cmd[@]}" $file* ${DEST_HARDENED}
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-10-06 16:27 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-10-06 16:27 UTC (permalink / raw
To: gentoo-commits
commit: 14cc38d97b8ddae8610d2cefc55d57133ca689ce
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 6 16:26:21 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Oct 6 16:26:21 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=14cc38d9
catalyst-auto: Use xz instead of bz2 for ia64 builds
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-ia64.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b1b61124..b3328ed3 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -17,7 +17,7 @@ update_symlinks() {
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates) ; do
+ for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
@@ -39,7 +39,7 @@ post_build() {
upload *${TIMESTAMP}*.iso*
;;
stage3.spec)
- upload stage3-*${TIMESTAMP}*.bz2*
+ upload stage3-*${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-09-05 15:48 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-09-05 15:48 UTC (permalink / raw
To: gentoo-commits
commit: dce27f9f28ec56eef5b5c650e4e6b559cff1cec8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Sep 5 15:48:26 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Sep 5 15:48:26 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=dce27f9f
catalyst-auto: Skip ia64 stage2 builds
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-ia64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 438a5757..b1b61124 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -3,7 +3,7 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ia64
-SPECS="stage1.spec stage2.spec stage3.spec"
+SPECS="stage1.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-09-02 17:30 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-09-02 17:30 UTC (permalink / raw
To: gentoo-commits
commit: f761d0b7170ef1e8473a959ad9556497567a087a
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 2 17:29:13 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 2 17:29:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f761d0b7
catalyst-auto: Upload sparc64 systemd stages
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 32d23b65..0eeaddd6 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -41,10 +41,16 @@ post_build() {
upload *${TIMESTAMP}*.iso*
;;
sparc/stage3.spec)
- upload stage3-sparc-*${TIMESTAMP}*.xz*
+ upload stage3-sparc-${TIMESTAMP}*.xz*
+ ;;
+ sparc/systemd-stage3.spec)
+ upload stage3-sparc-systemd-${TIMESTAMP}*.xz*
;;
sparc64/stage3.spec)
- upload stage3-sparc64-*${TIMESTAMP}*.xz*
+ upload stage3-sparc64-${TIMESTAMP}*.xz*
+ ;;
+ sparc64/systemd-stage3.spec)
+ upload stage3-sparc64-systemd-${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-09-02 2:06 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-09-02 2:06 UTC (permalink / raw
To: gentoo-commits
commit: 492aacba77160895edd9e275c485b88b34b54fa9
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 2 02:04:59 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 2 02:04:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=492aacba
catalyst-auto: Combine common functions
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto | 19 +++++++++++++++++++
tools/catalyst-auto-alpha.conf | 19 -------------------
tools/catalyst-auto-amd64-experimental.conf | 10 ----------
tools/catalyst-auto-amd64.conf | 10 ----------
tools/catalyst-auto-arm64.conf | 19 -------------------
tools/catalyst-auto-armv4tl.conf | 11 -----------
tools/catalyst-auto-armv5tel.conf | 11 -----------
tools/catalyst-auto-armv6j.conf | 11 -----------
tools/catalyst-auto-armv6j_hardfp.conf | 11 -----------
tools/catalyst-auto-armv7a.conf | 11 -----------
tools/catalyst-auto-armv7a_hardfp.conf | 11 -----------
tools/catalyst-auto-hppa.conf | 19 -------------------
tools/catalyst-auto-ia64.conf | 19 -------------------
tools/catalyst-auto-ppc.conf | 19 -------------------
tools/catalyst-auto-ppc64le.conf | 19 -------------------
tools/catalyst-auto-s390.conf | 19 -------------------
tools/catalyst-auto-s390x.conf | 19 -------------------
tools/catalyst-auto-sparc64.conf | 19 -------------------
tools/catalyst-auto-x86-experimental.conf | 10 ----------
tools/catalyst-auto-x86.conf | 10 ----------
20 files changed, 19 insertions(+), 277 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 6aac1cc4..de0afd69 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -165,6 +165,25 @@ parse_args() {
done
}
+give_latest_from_dates() {
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' |\
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
+}
+
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.bz2
+# stage3-xxx-20180116.tar.bz2
+# stage3-xxx-20180116T015819Z.tar.bz2
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
+}
+
# Let's get our own namespaces/etc... to avoid leaking crap.
containerize() {
# If we've already relaunched, nothing to do.
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 525c2a26..b218fa0e 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -17,25 +17,6 @@ SET_default_SPECS="stage1.spec stage3.spec"
SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/alpha
-
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-# Replace the date/time stamp in the filename to "latest".
-# Forms we handle:
-# stage3-xxx-2018.0.tar.bz2
-# stage3-xxx-20180116.tar.bz2
-# stage3-xxx-20180116T015819Z.tar.bz2
-convert_filename() {
- sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
-}
update_symlinks() {
# Symlink the latest stages3 to build from
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 70963a0a..37e01bd1 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -40,16 +40,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' | \
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 9b799645..c2e0c8b1 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -41,16 +41,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' | \
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index c1320a96..0d1506a4 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -15,25 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-# Replace the date/time stamp in the filename to "latest".
-# Forms we handle:
-# stage3-xxx-2018.0.tar.bz2
-# stage3-xxx-20180116.tar.bz2
-# stage3-xxx-20180116T015819Z.tar.bz2
-convert_filename() {
- sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index 9ae84d5e..fa20b5ca 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 072b8d8a..79975984 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 9a14ddf9..0db433fa 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index f3295b22..ca12d89d 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 66911204..1b13c6b5 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index 4dd146f5..c3037712 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -15,17 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index f838c940..5444cc4e 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -17,25 +17,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/hppa
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-# Replace the date/time stamp in the filename to "latest".
-# Forms we handle:
-# stage3-xxx-2018.0.tar.bz2
-# stage3-xxx-20180116.tar.bz2
-# stage3-xxx-20180116T015819Z.tar.bz2
-convert_filename() {
- sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 950a9b48..438a5757 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -12,25 +12,6 @@ OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/ia64
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-# Replace the date/time stamp in the filename to "latest".
-# Forms we handle:
-# stage3-xxx-2018.0.tar.bz2
-# stage3-xxx-20180116.tar.bz2
-# stage3-xxx-20180116T015819Z.tar.bz2
-convert_filename() {
- sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index f88c5ce0..59572644 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -13,25 +13,6 @@ OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
EMAIL_SUBJECT_PREPEND="[ppc-auto]"
-
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-# Replace the date/time stamp in the filename to "latest".
-# Forms we handle:
-# stage3-xxx-2018.0.tar.xz
-# stage3-xxx-20180116.tar.xz
-# stage3-xxx-20180116T015819Z.tar.xz
-convert_filename() {
- sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
-}
update_symlinks() {
# Symlink the latest stages3 to build from
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index 1b353864..76e1bdf5 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -14,25 +14,6 @@ SPECS="stage1.spec stage3.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
-
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-# Replace the date/time stamp in the filename to "latest".
-# Forms we handle:
-# stage3-xxx-2018.0.tar.xz
-# stage3-xxx-20180116.tar.xz
-# stage3-xxx-20180116T015819Z.tar.xz
-convert_filename() {
- sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
-}
update_symlinks() {
# Symlink the latest stages3 to build from
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 30d78e76..b48c7536 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -12,25 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-# Replace the date/time stamp in the filename to "latest".
-# Forms we handle:
-# stage3-xxx-2018.0.tar.xz
-# stage3-xxx-20180116.tar.xz
-# stage3-xxx-20180116T015819Z.tar.xz
-convert_filename() {
- sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index e56b4c81..c9f3f7e9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -12,25 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/s390
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-# Replace the date/time stamp in the filename to "latest".
-# Forms we handle:
-# stage3-xxx-2018.0.tar.xz
-# stage3-xxx-20180116.tar.xz
-# stage3-xxx-20180116T015819Z.tar.xz
-convert_filename() {
- sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 056218dd..32d23b65 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -10,25 +10,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
EMAIL_SUBJECT_PREPEND="[sparc-auto]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
-# Replace the date/time stamp in the filename to "latest".
-# Forms we handle:
-# stage3-xxx-2018.0.tar.xz
-# stage3-xxx-20180116.tar.xz
-# stage3-xxx-20180116T015819Z.tar.xz
-convert_filename() {
- sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 9092e577..2373041e 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -27,16 +27,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index d2042559..064881d4 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -27,16 +27,6 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
-give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
-}
-
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-09-01 16:57 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-09-01 16:57 UTC (permalink / raw
To: gentoo-commits
commit: ac2b40065944fcc3a01fab69da2750669196e1a2
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 1 16:56:30 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 1 16:56:30 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ac2b4006
catalyst-auto: Build sparc systemd stages
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 1b28d283..ed55a57c 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -3,7 +3,7 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc
-SPECS="sparc/stage1.spec sparc/stage3.spec sparc64/stage1.spec sparc64/stage3.spec"
+SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec sparc/systemd-stage3.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec"
OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-09-01 16:57 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-09-01 16:57 UTC (permalink / raw
To: gentoo-commits
commit: 031f5dc976938e8e6e83d36295b4f932345e7370
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 1 16:56:43 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 1 16:56:43 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=031f5dc9
catalyst-auto: Fix copy-and-paste mistake
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index ed55a57c..056218dd 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -6,7 +6,7 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc
SPECS="sparc/stage1.spec sparc/stage3.spec sparc/systemd-stage1.spec sparc/systemd-stage3.spec sparc64/stage1.spec sparc64/stage3.spec sparc64/systemd-stage1.spec sparc64/systemd-stage3.spec"
OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
+KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
EMAIL_SUBJECT_PREPEND="[sparc-auto]"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-08-29 17:39 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-08-29 17:39 UTC (permalink / raw
To: gentoo-commits
commit: 2779b4af6a0ea7d5dd730a0bbabd1df1744d181e
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 29 17:38:11 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu Aug 29 17:39:10 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=2779b4af
catalyst-auto: Update sparc64 conf based on ppc
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 91 ++++++++++++++++++----------------------
1 file changed, 41 insertions(+), 50 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index e153871b..1b28d283 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -1,80 +1,71 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-ARCH="sparc"
-TYPE="auto"
-host="$(hostname)"
+SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc
-EMAIL_TO="bkohler@gentoo.org"
+SPECS="sparc/stage1.spec sparc/stage3.spec sparc64/stage1.spec sparc64/stage3.spec"
+OPTIONAL_SPECS="sparc64/installcd-stage1.spec sparc64/installcd-stage2-minimal.spec"
-source /etc/catalyst/release/build.env
+KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc/sparc64
-
-SETS="default"
-
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
-#SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.spec"
-
-KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
-
-EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+EMAIL_SUBJECT_PREPEND="[sparc-auto]"
give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' | \
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' |\
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
+}
+
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.xz
+# stage3-xxx-20180116.tar.xz
+# stage3-xxx-20180116T015819Z.tar.xz
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/default; do
- pushd $d >/dev/null
- for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
- # 20yymmddThhmmssZ
- # 20yymmddhhmmss
- # 20yymmdd
- # 20yy.n
- of=$(perl -p \
- -e 's/20\d{6}T\d{6}Z/latest/g;' \
- -e 's/20\d{6}\d{6}/latest/g;' \
- -e 's/20\d{6}/latest/g;' \
- -e 's/20\d{2}\.\d{2}/latest/g;' \
- <<<"$f")
- ln -svf "$f" "$of"
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3-sparc-*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ for f in $(ls stage3-sparc64-*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
done
popd >/dev/null
done
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' \
- -a \
- --omit-dir-times \
- --delay-updates \
- "$@" \
- sparc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" sparc@nightheron.gentoo.org:
}
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/default/" > /dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- stage3.spec)
- upload stage3-*${DATESTAMP}*${EXTENSIONS}*
+ sparc64/installcd-stage2-minimal.spec)
+ upload *${TIMESTAMP}*.iso*
+ ;;
+ sparc/stage3.spec)
+ upload stage3-sparc-*${TIMESTAMP}*.xz*
;;
- installcd-stage2-minimal.spec)
- upload *${DATESTAMP}*.iso*
+ sparc64/stage3.spec)
+ upload stage3-sparc64-*${TIMESTAMP}*.xz*
;;
esac
- popd > /dev/null
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-06-07 0:37 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2019-06-07 0:37 UTC (permalink / raw
To: gentoo-commits
commit: ce743c3886e0ca8d58569eafe89ae96ec18ec26b
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 7 00:36:48 2019 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Jun 7 00:37:34 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ce743c38
Stop building the admincd for selinux.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 890a1cc6..9b799645 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -34,7 +34,7 @@ SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-n
SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
-SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
+#SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-05-30 21:11 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-05-30 21:11 UTC (permalink / raw
To: gentoo-commits
commit: 0d88b842623fae95f7ac6e1111e566d8650a6319
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 21:04:14 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu May 30 21:10:25 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0d88b842
catalyst-auto: Use xz instead of bz2 for s390 builds
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-s390.conf | 10 +++++-----
tools/catalyst-auto-s390x.conf | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index b42797dc..30d78e76 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -24,9 +24,9 @@ give_latest_from_dates() {
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
-# stage3-xxx-2018.0.tar.bz2
-# stage3-xxx-20180116.tar.bz2
-# stage3-xxx-20180116T015819Z.tar.bz2
+# stage3-xxx-2018.0.tar.xz
+# stage3-xxx-20180116.tar.xz
+# stage3-xxx-20180116T015819Z.tar.xz
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
@@ -36,7 +36,7 @@ update_symlinks() {
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
@@ -60,7 +60,7 @@ post_build() {
upload netboot2-s390-${TIMESTAMP}/netboot*
;;
stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2*
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
;;
esac
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 2f9b9b4a..e56b4c81 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -24,9 +24,9 @@ give_latest_from_dates() {
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
-# stage3-xxx-2018.0.tar.bz2
-# stage3-xxx-20180116.tar.bz2
-# stage3-xxx-20180116T015819Z.tar.bz2
+# stage3-xxx-2018.0.tar.xz
+# stage3-xxx-20180116.tar.xz
+# stage3-xxx-20180116T015819Z.tar.xz
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
@@ -36,7 +36,7 @@ update_symlinks() {
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ for f in $(ls stage3-${SUBARCH}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
@@ -60,7 +60,7 @@ post_build() {
upload netboot2-s390x-${TIMESTAMP}/netboot*
;;
stage3.spec)
- upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2*
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-05-30 21:11 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-05-30 21:11 UTC (permalink / raw
To: gentoo-commits
commit: c02b25b76504f0c226c73eb63bc853de4c5d37ae
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Thu May 30 21:01:25 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Thu May 30 21:10:25 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c02b25b7
catalyst-auto: Skip s390 stage2 builds
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 36672db2..b42797dc 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -6,7 +6,7 @@ SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default netboot"
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+SET_default_SPECS="stage1.spec stage3.spec"
SET_netboot_SPECS="netboot/netboot.spec"
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 2aa01f7a..2f9b9b4a 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -6,7 +6,7 @@ SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default netboot"
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+SET_default_SPECS="stage1.spec stage3.spec"
SET_netboot_SPECS="netboot/netboot.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-11 14:11 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-11 14:11 UTC (permalink / raw
To: gentoo-commits
commit: fff9e2cbc377d4e793e1ae65b2ac772b7bf78bfb
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 11 14:10:59 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan 11 14:10:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fff9e2cb
catalyst-auto-sparc64.conf: no hardened
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index f6357a35..e153871b 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -34,7 +34,7 @@ give_latest_from_dates() {
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
+ for d in ${BUILD_SRCDIR_BASE}/default; do
pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
# 20yymmddThhmmssZ
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-09 17:19 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-09 17:19 UTC (permalink / raw
To: gentoo-commits
commit: d8a805cba3ea8cc800fdc0e6e9a4972f933701c2
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 17:18:48 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 17:18:48 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d8a805cb
lyst-auto-sparc64.conf: borrow new symlink logic from amd64
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 43 +++++++++++++++++++++++-----------------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 5f37ecd2..f6357a35 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -23,27 +23,34 @@ KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' | \
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
}
-
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/default; do
- pushd $d >/dev/null
- for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
+ pushd $d >/dev/null
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
+ # 20yymmddThhmmssZ
+ # 20yymmddhhmmss
+ # 20yymmdd
+ # 20yy.n
+ of=$(perl -p \
+ -e 's/20\d{6}T\d{6}Z/latest/g;' \
+ -e 's/20\d{6}\d{6}/latest/g;' \
+ -e 's/20\d{6}/latest/g;' \
+ -e 's/20\d{2}\.\d{2}/latest/g;' \
+ <<<"$f")
+ ln -svf "$f" "$of"
+ done
+ popd >/dev/null
+ done
}
upload() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-09 2:46 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-09 2:46 UTC (permalink / raw
To: gentoo-commits
commit: fe0c440967cf1d81b232887193dde97800eb9916
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 9 02:44:56 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Wed Jan 9 02:44:56 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fe0c4409
catalyst-auto-sparc64.conf: add line wraps
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 13784e8d..5f37ecd2 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -47,11 +47,11 @@ update_symlinks() {
}
upload() {
- rsync -e 'ssh -i /root/.ssh/id_rsa'
- -a
- --omit-dir-times
- --delay-updates
- "$@"
+ rsync -e 'ssh -i /root/.ssh/id_rsa' \
+ -a \
+ --omit-dir-times \
+ --delay-updates \
+ "$@" \
sparc@nightheron.gentoo.org:
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-08 17:34 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-08 17:34 UTC (permalink / raw
To: gentoo-commits
commit: 8d05f7d50814d361f45cdaa058a895fb8657bf70
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 17:34:13 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jan 8 17:34:13 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8d05f7d5
catalyst-auto-sparc64.conf: missed some ) in case statement
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 3a3e5f0e..13784e8d 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -61,10 +61,10 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/default/" > /dev/null
case ${spec} in
- stage3.spec
+ stage3.spec)
upload stage3-*${DATESTAMP}*${EXTENSIONS}*
;;
- installcd-stage2-minimal.spec
+ installcd-stage2-minimal.spec)
upload *${DATESTAMP}*.iso*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-08 17:18 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-08 17:18 UTC (permalink / raw
To: gentoo-commits
commit: a831d3f1499adc4eb04e113fe6a2bf5eef6bd79f
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 8 17:02:26 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Tue Jan 8 17:02:26 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a831d3f1
catalyst-auto-sparc64.conf: redo post_build modeled after ppc
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 38 ++++++++++++++++++++++----------------
1 file changed, 22 insertions(+), 16 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 570a0566..3a3e5f0e 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -46,22 +46,28 @@ update_symlinks() {
done
}
+upload() {
+ rsync -e 'ssh -i /root/.ssh/id_rsa'
+ -a
+ --omit-dir-times
+ --delay-updates
+ "$@"
+ sparc@nightheron.gentoo.org:
+}
post_build() {
- # We only want to do anything on the final (0 argument) post_build call
- [ $# -eq 0 ] || return 0
-
- mkdir -p ${TMPDIR}/empty
- cmd=(
- rsync
- -e 'ssh -i /root/.ssh/id_rsa'
- -a
- --omit-dir-times
- --delay-updates
- )
- "${cmd[@]}" ${TMPDIR}/empty ${DEST}
- "${cmd[@]}" \
- ${BUILD_SRCDIR_BASE}/default/stage3-*${DATESTAMP}*${EXTENSIONS}* \
- ${BUILD_SRCDIR_BASE}/default/*${DATESTAMP}*.iso* \
- sparc@nightheron.gentoo.org:
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/default/" > /dev/null
+
+ case ${spec} in
+ stage3.spec
+ upload stage3-*${DATESTAMP}*${EXTENSIONS}*
+ ;;
+ installcd-stage2-minimal.spec
+ upload *${DATESTAMP}*.iso*
+ ;;
+ esac
+
+ popd > /dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-06 20:38 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-06 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 3eb7bc30bc85acf9ff9ecbc832a35c68e3a75bb6
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 6 20:38:13 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Sun Jan 6 20:38:13 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3eb7bc30
catalyst-auto-sparc64.conf: only rsync in final post_build call
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index e220c414..570a0566 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -48,6 +48,9 @@ update_symlinks() {
post_build() {
+ # We only want to do anything on the final (0 argument) post_build call
+ [ $# -eq 0 ] || return 0
+
mkdir -p ${TMPDIR}/empty
cmd=(
rsync
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-05 23:45 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-01-05 23:45 UTC (permalink / raw
To: gentoo-commits
commit: bcc0a963dc7ca9d3bbdecfded5095772b749d362
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 5 23:45:05 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 5 23:45:05 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bcc0a963
catalyst-auto-ppc64le.conf: Remove ppc64le subdir
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/catalyst-auto-ppc64le.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64le.conf b/tools/catalyst-auto-ppc64le.conf
index e375b980..1b353864 100644
--- a/tools/catalyst-auto-ppc64le.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -37,7 +37,7 @@ convert_filename() {
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc64le" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for t in ppc64le; do
for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-05 23:20 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2019-01-05 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 12f78e9aa32a22371d5ccbcfdf5cceaac9ef3b71
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 5 23:01:48 2019 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sat Jan 5 23:01:48 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=12f78e9a
catalyst-auto-ppc64le.conf: Move from catalyst-auto-ppc64.conf
catalyst-auto-ppc64.conf is no longer used since ppc and ppc64 builds
are done from catalyst-auto-ppc.conf. Repurpose (and rename) this file
to be used by ppc64le.
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
tools/{catalyst-auto-ppc64.conf => catalyst-auto-ppc64le.conf} | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64le.conf
similarity index 87%
rename from tools/catalyst-auto-ppc64.conf
rename to tools/catalyst-auto-ppc64le.conf
index 7c1ed9d3..e375b980 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64le.conf
@@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc64
+SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc64le
SPECS="stage1.spec stage3.spec"
@@ -13,7 +13,7 @@ SPECS="stage1.spec stage3.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
-EMAIL_SUBJECT_PREPEND="[ppc64-auto]"
+EMAIL_SUBJECT_PREPEND="[ppc64le-auto]"
give_latest_from_dates() {
sed 's,-20,~20,g' | \
@@ -37,9 +37,9 @@ convert_filename() {
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc64" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc64le" ; do
pushd "${d}" >/dev/null
- for t in ppc64; do
+ for t in ppc64le; do
for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
@@ -63,7 +63,7 @@ post_build() {
upload *${TIMESTAMP}*.iso*
;;
stage3*.spec)
- upload stage3-ppc64-*${TIMESTAMP}*.xz*
+ upload stage3-ppc64le-*${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-04 22:51 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-04 22:51 UTC (permalink / raw
To: gentoo-commits
commit: 52488db7c071b0d2c04e84153621a27ae7712817
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 22:50:59 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 22:50:59 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=52488db7
catalyst-auto-sparc64.conf: email to me for now
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 2 ++
1 file changed, 2 insertions(+)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index e7736a74..e220c414 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -5,6 +5,8 @@ ARCH="sparc"
TYPE="auto"
host="$(hostname)"
+EMAIL_TO="bkohler@gentoo.org"
+
source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc/sparc64
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-04 22:51 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-04 22:51 UTC (permalink / raw
To: gentoo-commits
commit: e3ce4e5a4816cd1b92624a10273c02e89e4fb982
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 22:49:43 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 22:49:43 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e3ce4e5a
catalyst-auto-sparc64.conf: path fixups
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index fee5205f..e7736a74 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -56,7 +56,7 @@ post_build() {
)
"${cmd[@]}" ${TMPDIR}/empty ${DEST}
"${cmd[@]}" \
- ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*${EXTENSIONS}* \
- ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* \
+ ${BUILD_SRCDIR_BASE}/default/stage3-*${DATESTAMP}*${EXTENSIONS}* \
+ ${BUILD_SRCDIR_BASE}/default/*${DATESTAMP}*.iso* \
sparc@nightheron.gentoo.org:
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-04 16:46 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-04 16:46 UTC (permalink / raw
To: gentoo-commits
commit: 5ed8b0c8b0bcac6d0817b873e834b26850f24c7c
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 16:46:35 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 16:46:35 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5ed8b0c8
catalyst-auto-sparc64.conf: disable multilib in one more place
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 8e9c9a35..fee5205f 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -33,7 +33,7 @@ give_latest_from_dates() {
update_symlinks() {
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
+ for d in ${BUILD_SRCDIR_BASE}/default; do
pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-04 16:44 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-04 16:44 UTC (permalink / raw
To: gentoo-commits
commit: fecc01022071641a3829a80774278a0e260fc048
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 16:43:58 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 16:43:58 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fecc0102
catalyst-auto-sparc64.conf: fix ARCH
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index abbfb082..8e9c9a35 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-ARCH="amd64"
+ARCH="sparc"
TYPE="auto"
host="$(hostname)"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-04 16:34 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-04 16:34 UTC (permalink / raw
To: gentoo-commits
commit: d12a8d02ccb706930db964ac2098144f821ae807
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 4 16:33:17 2019 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Fri Jan 4 16:33:17 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d12a8d02
catalyst-auto-sparc64.conf: start sourcing build.env
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index e5e43846..abbfb082 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -1,6 +1,12 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
+ARCH="amd64"
+TYPE="auto"
+host="$(hostname)"
+
+source /etc/catalyst/release/build.env
+
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc/sparc64
SETS="default"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2019-01-03 16:09 Ben Kohler
0 siblings, 0 replies; 460+ messages in thread
From: Ben Kohler @ 2019-01-03 16:09 UTC (permalink / raw
To: gentoo-commits
commit: fdedd793b64c881662d04bf7537165123d96ddcb
Author: Ben Kohler <bkohler <AT> gentoo <DOT> org>
AuthorDate: Mon Dec 31 22:42:11 2018 +0000
Commit: Ben Kohler <bkohler <AT> gentoo <DOT> org>
CommitDate: Thu Jan 3 14:30:24 2019 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fdedd793
catalyst-auto-sparc64.conf: stop hardcoding .tar.bz2, no multilib build
As has been done in other arches' specs, allow a list of different
stage3 tarball extensions. Also disable building of multilib stages.
Signed-off-by: Ben Kohler <bkohler <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index b3364f8f..e5e43846 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -3,15 +3,17 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/sparc/sparc64
-SETS="default multilib"
+SETS="default"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.spec"
+#SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/sparc
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@@ -27,7 +29,7 @@ update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
pushd $d >/dev/null
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
@@ -47,12 +49,8 @@ post_build() {
--delay-updates
)
"${cmd[@]}" ${TMPDIR}/empty ${DEST}
- "${cmd[@]}" ${TMPDIR}/empty ${DEST}/multilib
"${cmd[@]}" \
- ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* \
+ ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*${EXTENSIONS}* \
${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* \
sparc@nightheron.gentoo.org:
- "${cmd[@]}" \
- ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* \
- sparc@nightheron.gentoo.org:multilib
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-17 19:22 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-17 19:22 UTC (permalink / raw
To: gentoo-commits
commit: 958fe2facffe558c71d1b32d97998af804559c51
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 19:20:30 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 19:21:14 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=958fe2fa
catalyst-auto: Skip alpha stage2 builds
tools/catalyst-auto-alpha.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 5a86db14..45527489 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -3,7 +3,7 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/alpha
-SPECS="stage1.spec stage2.spec stage3.spec"
+SPECS="stage1.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-17 3:27 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-17 3:27 UTC (permalink / raw
To: gentoo-commits
commit: c53e24b4b040a54f8fc6eebf628c63e799b8d368
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 03:26:34 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 03:26:34 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c53e24b4
catalyst-auto: Fix more s/ppc/ppc32/
tools/catalyst-auto-ppc.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index bc4ee17f..f88c5ce0 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -60,10 +60,10 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- ppc/installcd-stage2-minimal.spec)
+ ppc32/installcd-stage2-minimal.spec)
upload *${TIMESTAMP}*.iso*
;;
- ppc/stage3.spec)
+ ppc32/stage3.spec)
upload stage3-ppc-*${TIMESTAMP}*.xz*
;;
ppc64/stage3.spec)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-16 15:47 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-16 15:47 UTC (permalink / raw
To: gentoo-commits
commit: 53d73577440a313137f8aff6d82359b0971b58b8
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 15:47:10 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 15:47:10 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=53d73577
catalyst-auto: Build ppc install CD from 32-bit specs
tools/catalyst-auto-ppc.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 656ee88d..bc4ee17f 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -8,7 +8,7 @@ SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
-OPTIONAL_SPECS="ppc/installcd-stage1.spec ppc/installcd-stage2-minimal.spec"
+OPTIONAL_SPECS="ppc32/installcd-stage1.spec ppc32/installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-16 15:23 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-16 15:23 UTC (permalink / raw
To: gentoo-commits
commit: f2398d0b731cfbfddacdf90ce62a57b81f8607ec
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 15:23:26 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 15:23:26 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f2398d0b
catalyst-auto: Build ppc and ppc64 stages from catalyst-auto-ppc.conf
tools/catalyst-auto-ppc.conf | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index c5d09d09..656ee88d 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -1,14 +1,14 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc32
+SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc
-SPECS="stage1.spec stage3.spec"
+SPECS="ppc32/stage1.spec ppc32/stage3.spec ppc64/stage1.spec ppc64/stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
-OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+OPTIONAL_SPECS="ppc/installcd-stage1.spec ppc/installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
@@ -36,12 +36,16 @@ convert_filename() {
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3-ppc-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
+ for f in $(ls stage3-ppc64-*xz | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
popd >/dev/null
done
}
@@ -56,9 +60,15 @@ post_build() {
pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
case ${spec} in
- stage3.spec)
+ ppc/installcd-stage2-minimal.spec)
+ upload *${TIMESTAMP}*.iso*
+ ;;
+ ppc/stage3.spec)
upload stage3-ppc-*${TIMESTAMP}*.xz*
;;
+ ppc64/stage3.spec)
+ upload stage3-ppc64-*${TIMESTAMP}*.xz*
+ ;;
esac
popd >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-16 15:12 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-16 15:12 UTC (permalink / raw
To: gentoo-commits
commit: 5c7cf135fe7d2d2a4efa8a2f677bae0b9bf36544
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 15:11:20 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 15:11:20 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5c7cf135
catalyst-auto: Build ppc64 stages from stage{1,3}.spec
Spec files were renamed in commit cf41003f5ca3 ("specs/ppc: Remove
"64ul" from stage names")
tools/catalyst-auto-ppc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index ce5aa5c8..7c1ed9d3 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -3,7 +3,7 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc64
-SPECS="stage1-64ul.spec stage3-64ul.spec"
+SPECS="stage1.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-16 15:10 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-16 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 3ee52a24b5e307584f726ebcd9da7b4ff936ad90
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 15:09:38 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 15:09:38 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3ee52a24
catalyst-auto: Use xz instead of bz2 for powerpc builds
tools/catalyst-auto-ppc.conf | 10 +++++-----
tools/catalyst-auto-ppc64.conf | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 71a4e840..c5d09d09 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -26,9 +26,9 @@ give_latest_from_dates() {
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
-# stage3-xxx-2018.0.tar.bz2
-# stage3-xxx-20180116.tar.bz2
-# stage3-xxx-20180116T015819Z.tar.bz2
+# stage3-xxx-2018.0.tar.xz
+# stage3-xxx-20180116.tar.xz
+# stage3-xxx-20180116T015819Z.tar.xz
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
@@ -38,7 +38,7 @@ update_symlinks() {
local d f
for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc" ; do
pushd "${d}" >/dev/null
- for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ for f in $(ls stage3-ppc-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
@@ -57,7 +57,7 @@ post_build() {
case ${spec} in
stage3.spec)
- upload stage3-ppc-*${TIMESTAMP}*.bz2*
+ upload stage3-ppc-*${TIMESTAMP}*.xz*
;;
esac
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index bb4d50d0..ce5aa5c8 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -27,9 +27,9 @@ give_latest_from_dates() {
# Replace the date/time stamp in the filename to "latest".
# Forms we handle:
-# stage3-xxx-2018.0.tar.bz2
-# stage3-xxx-20180116.tar.bz2
-# stage3-xxx-20180116T015819Z.tar.bz2
+# stage3-xxx-2018.0.tar.xz
+# stage3-xxx-20180116.tar.xz
+# stage3-xxx-20180116T015819Z.tar.xz
convert_filename() {
sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
}
@@ -40,7 +40,7 @@ update_symlinks() {
for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc64" ; do
pushd "${d}" >/dev/null
for t in ppc64; do
- for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ for f in $(ls stage3-${t}-*xz | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
done
@@ -63,7 +63,7 @@ post_build() {
upload *${TIMESTAMP}*.iso*
;;
stage3*.spec)
- upload stage3-ppc64-*${TIMESTAMP}*.bz2*
+ upload stage3-ppc64-*${TIMESTAMP}*.xz*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-16 15:10 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-16 15:10 UTC (permalink / raw
To: gentoo-commits
commit: a42ad6e6403b4addd6b17c4fce3759b4c2b7ea60
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 15:08:56 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 15:08:56 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a42ad6e6
catalyst-auto: Build only 64-bit userland on ppc64 and remove '64ul'
tools/catalyst-auto-ppc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 9af46fc0..bb4d50d0 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -39,7 +39,7 @@ update_symlinks() {
local d f t
for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc64" ; do
pushd "${d}" >/dev/null
- for t in ppc64-64ul ppc64-32ul; do
+ for t in ppc64; do
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
ln -sf "${f}" "${of}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-16 15:10 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-16 15:10 UTC (permalink / raw
To: gentoo-commits
commit: 726e5fb33d9853d6dd4553d5a84f6ba1342e3445
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 15:07:10 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 15:07:10 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=726e5fb3
catalyst-auto: Save powerpc builds in separate directories
Otherwise we write the last_success_file when the first build succeeds
and prevent the second from executing. Both of these sets of builds
should probably be executed from the same catalyst-auto file...
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index f35a2c12..71a4e840 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -36,7 +36,7 @@ convert_filename() {
update_symlinks() {
# Symlink the latest stages3 to build from
local d f
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc" ; do
pushd "${d}" >/dev/null
for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates) ; do
local of=$(echo "${f}" | convert_filename)
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 06ae2abe..9af46fc0 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -37,7 +37,7 @@ convert_filename() {
update_symlinks() {
# Symlink the latest stages3 to build from
local d f t
- for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default/ppc64" ; do
pushd "${d}" >/dev/null
for t in ppc64-64ul ppc64-32ul; do
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates) ; do
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-16 5:48 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-16 5:48 UTC (permalink / raw
To: gentoo-commits
commit: caa080159ad259649d9d1200fe41dfefc00e3291
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 05:30:29 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 05:47:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=caa08015
catalyst-auto: Don't build ppc64-32ul stages
ppc64-32ul provides nothing that standard 32-bit ppc does not, as far as
I can tell.
tools/catalyst-auto-ppc64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 3ca55464..64561ab3 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -3,7 +3,7 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc64
-SPECS="stage1-32ul.spec stage2-32ul.spec stage3-32ul.spec stage1-64ul.spec stage2-64ul.spec stage3-64ul.spec"
+SPECS="stage1-64ul.spec stage2-64ul.spec stage3-64ul.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-16 5:48 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-16 5:48 UTC (permalink / raw
To: gentoo-commits
commit: 630f0be613bc8801a089af29860a5d17dea1df87
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 05:32:40 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 05:47:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=630f0be6
catalyst-auto: Skip powerpc stage2 builds
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index d689fdbc..f35a2c12 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -3,7 +3,7 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc32
-SPECS="stage1.spec stage2.spec stage3.spec"
+SPECS="stage1.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 044eb50f..06ae2abe 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -3,7 +3,7 @@
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/ppc/ppc64
-SPECS="stage1-64ul.spec stage2-64ul.spec stage3-64ul.spec"
+SPECS="stage1-64ul.spec stage3-64ul.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-16 5:48 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-16 5:48 UTC (permalink / raw
To: gentoo-commits
commit: 9b75c9336df976373bd01d1efdec08c710f0efb5
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 16 05:31:58 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Sep 16 05:47:11 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9b75c933
catalyst-auto: Switch powerpc livecds from ppc64-32ul to ppc
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 49a3dd95..d689fdbc 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -8,7 +8,7 @@ SPECS="stage1.spec stage2.spec stage3.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
-#OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 64561ab3..044eb50f 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -9,7 +9,7 @@ SPECS="stage1-64ul.spec stage2-64ul.spec stage3-64ul.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
-OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+#OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/powerpc
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-09-14 18:24 Matt Turner
0 siblings, 0 replies; 460+ messages in thread
From: Matt Turner @ 2018-09-14 18:24 UTC (permalink / raw
To: gentoo-commits
commit: d0afafa0190f4cdd2d41a272f2a2dfb585ac9f42
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 14 18:24:44 2018 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri Sep 14 18:24:44 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d0afafa0
catalyst-auto/hppa: Skip stage2
tools/catalyst-auto-hppa.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 14e604ca..f838c940 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -5,9 +5,9 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/hppa
SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
-SET_hppa1_1_SPECS="hppa1.1/stage1.spec hppa1.1/stage2.spec hppa1.1/stage3.spec"
+SET_hppa1_1_SPECS="hppa1.1/stage1.spec hppa1.1/stage3.spec"
-SET_hppa2_0_SPECS="hppa2.0/stage1.spec hppa2.0/stage2.spec hppa2.0/stage3.spec"
+SET_hppa2_0_SPECS="hppa2.0/stage1.spec hppa2.0/stage3.spec"
SET_hppa_livecd_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-03-02 15:04 Matt Thode
0 siblings, 0 replies; 460+ messages in thread
From: Matt Thode @ 2018-03-02 15:04 UTC (permalink / raw
To: gentoo-commits
commit: 71795cbe91ac6474247c8dabe650e23e2ee5d7b8
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Mar 2 15:04:04 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 15:04:04 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=71795cbe
Revert "enable systemd stage generation"
This reverts commit 60d2a138de5a7231f38016b544dd9b96731243d3.
using blueness's run-systemd stuff
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a80ea195..e469a487 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -27,7 +27,7 @@ SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
-SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
+#SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
SET_systemd_OPTIONAL_SPECS="stage4-systemd.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-03-02 15:04 Matt Thode
0 siblings, 0 replies; 460+ messages in thread
From: Matt Thode @ 2018-03-02 15:04 UTC (permalink / raw
To: gentoo-commits
commit: dda62ba0271c5d4c7ce443a6846be82ef5f7c038
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Mar 2 15:03:25 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 15:03:25 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=dda62ba0
Revert "add systemd to sets"
This reverts commit f249d956496809cba31161a40bb7f104039a2db7.
using blueness's run-systemd stuff
tools/catalyst-auto-amd64.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index b831673b..a80ea195 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -12,7 +12,6 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="
multilib minimal_multilib
nomultilib minimal_nomultilib
- multilib systemd
x32
hardened_multilib minimal_hardened_multilib
hardened_nomultilib minimal_hardened_nomultilib
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-03-02 12:36 Matt Thode
0 siblings, 0 replies; 460+ messages in thread
From: Matt Thode @ 2018-03-02 12:36 UTC (permalink / raw
To: gentoo-commits
commit: f249d956496809cba31161a40bb7f104039a2db7
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Mar 2 12:36:07 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 12:36:07 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f249d956
add systemd to sets
tools/catalyst-auto-amd64.conf | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a80ea195..b831673b 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -12,6 +12,7 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="
multilib minimal_multilib
nomultilib minimal_nomultilib
+ multilib systemd
x32
hardened_multilib minimal_hardened_multilib
hardened_nomultilib minimal_hardened_nomultilib
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-03-02 12:33 Matt Thode
0 siblings, 0 replies; 460+ messages in thread
From: Matt Thode @ 2018-03-02 12:33 UTC (permalink / raw
To: gentoo-commits
commit: 60d2a138de5a7231f38016b544dd9b96731243d3
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Fri Mar 2 12:32:59 2018 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Fri Mar 2 12:32:59 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=60d2a138
enable systemd stage generation
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index e469a487..a80ea195 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -27,7 +27,7 @@ SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
-#SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
SET_systemd_OPTIONAL_SPECS="stage4-systemd.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-01-16 16:24 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2018-01-16 16:24 UTC (permalink / raw
To: gentoo-commits
commit: c63938c5e093ed690ef1a96ea463396a3ac90ada
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 16:24:43 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 16:24:43 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c63938c5
catalyst-auto: run git merge in quiet mode
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index b7036937..6aac1cc4 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -203,7 +203,7 @@ git_update() {
repo_dir=$1 script=$2
shift 2
pushd "${repo_dir}" >/dev/null
- git merge FETCH_HEAD || echo "${script}: WARNING: git repo is dirty"
+ git merge -q FETCH_HEAD || echo "${script}: WARNING: git repo is dirty"
popd >/dev/null
exec "${script}" "$@"
' -- "${REPO_DIR}" "$0" "$@"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-01-16 16:21 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2018-01-16 16:21 UTC (permalink / raw
To: gentoo-commits
commit: f98bc791e6f6404707475877e4f469fb665c5f49
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 01:52:14 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 01:52:14 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f98bc791
catalyst-auto: pass current targets down to post_build
Commit b7e493b4e4ad6cf6f9367e4b139df042526c21de (run trigger_post_build
after every successful spec) broke a lot of builders. The configs were
written to be called only after everything was done, but by calling it
after the first build (stage1 only), all the other artifacts we expected
did not yet exist.
Change post_build to pass the current set & spec name down so the config
can figure out what is available at that point in time.
tools/catalyst-auto | 13 +++++++------
tools/catalyst-auto-alpha.conf | 19 ++++++++++++++++++-
tools/catalyst-auto-arm64.conf | 16 ++++++++++++++--
tools/catalyst-auto-hppa.conf | 32 +++++++++++++++++++++++++++++---
tools/catalyst-auto-ia64.conf | 18 +++++++++++++++++-
tools/catalyst-auto-ppc.conf | 16 +++++++++++++++-
tools/catalyst-auto-ppc64.conf | 21 +++++++++++++++++++--
tools/catalyst-auto-s390.conf | 22 +++++++++++++++++++---
tools/catalyst-auto-s390x.conf | 22 +++++++++++++++++++---
9 files changed, 157 insertions(+), 22 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 750e7047..756bc515 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -111,10 +111,11 @@ catalyst_var() {
}
trigger_post_build() {
- if ! run_cmd "${TMPDIR}/log/post_build.log" post_build; then
- send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log"
- exit 1
- fi
+ local set=$1 spec=$2
+ if ! run_cmd "${TMPDIR}/log/post_build.log" post_build "${set}" "${spec}"; then
+ send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log"
+ exit 1
+ fi
}
parse_args() {
@@ -365,7 +366,7 @@ run_catalyst_commands() {
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
continue 2
else
- trigger_post_build
+ trigger_post_build "${a}" "${i}"
fi
done
@@ -377,7 +378,7 @@ run_catalyst_commands() {
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
break
else
- trigger_post_build
+ trigger_post_build "${a}" "${i}"
fi
done
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 5b2bd2ed..585f8f23 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -35,6 +35,23 @@ update_symlinks() {
done
}
+upload() {
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" alpha@nightheron.gentoo.org:
+}
+
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* alpha@nightheron.gentoo.org:
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ installcd-stage2-minimal.spec)
+ upload *-${DATESTAMP}*.iso*
+ ;;
+ stage3.spec)
+ upload stage3-*${DATESTAMP}*.bz2*
+ ;;
+ esac
+
+ popd >/dev/null
}
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index e9744337..21617af7 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -38,8 +38,20 @@ update_symlinks() {
done
}
+upload() {
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" arm@nightheron.gentoo.org:
+}
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
- # Need to update this still.
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ stage3.spec)
+ upload stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
+ ;;
+ esac
+
+ popd >/dev/null
}
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 9899e7da..b7b41527 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -42,8 +42,34 @@ update_symlinks() {
done
}
+upload() {
+ rsync -e 'ssh -i /root/.ssh/buildsync.key' "$@" hppa@nightheron.gentoo.org:
+}
+
post_build() {
- mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa1.1-${DATESTAMP}/netboot32-hppa.lif ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa1.1-${DATESTAMP}/netboot-hppa32-${DATESTAMP}.lif
- mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa2.0-${DATESTAMP}/netboot64-hppa.lif ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa2.0-${DATESTAMP}/netboot-hppa64-${DATESTAMP}.lif
- rsync -e 'ssh -i /root/.ssh/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/install-hppa-minimal-*${DATESTAMP}*.iso* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa*-${DATESTAMP}/*.lif hppa@nightheron.gentoo.org:
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ netboot2-hppa32.spec)
+ mv netboot2-hppa1.1-${DATESTAMP}/netboot32-hppa.lif netboot2-hppa1.1-${DATESTAMP}/netboot-hppa32-${DATESTAMP}.lif
+ upload netboot2-hppa1.1-${DATESTAMP}/netboot-hppa32-${DATESTAMP}.lif
+ ;;
+ netboot2-hppa64.spec)
+ mv netboot2-hppa2.0-${DATESTAMP}/netboot64-hppa.lif netboot2-hppa2.0-${DATESTAMP}/netboot-hppa64-${DATESTAMP}.lif
+ upload netboot2-hppa2.0-${DATESTAMP}/netboot-hppa64-${DATESTAMP}.lif
+ ;;
+ installcd-stage2-minimal.spec)
+ upload install-hppa-minimal-*${DATESTAMP}*.iso*
+ ;;
+ hppa1.1/stage3.spec)
+ upload stage3-hppa1.1-*${DATESTAMP}*.bz2*
+ ;;
+ hppa2.0/stage3.spec)
+ upload stage3-hppa2.0-*${DATESTAMP}*.bz2*
+ ;;
+ esac
+
+ popd >/dev/null
}
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index dc91c4c4..ac8eee77 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -35,7 +35,23 @@ update_symlinks() {
done
}
+upload() {
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ia64@nightheron.gentoo.org:
+}
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ia64@nightheron.gentoo.org:
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ installcd-stage2*)
+ upload *${DATESTAMP}*.iso*
+ ;;
+ stage3.spec)
+ upload stage3-*${DATESTAMP}*.bz2*
+ ;;
+ esac
+
+ popd >/dev/null
}
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 139f1a1a..05a10ec6 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -36,7 +36,21 @@ update_symlinks() {
popd >/dev/null
done
}
+
+upload() {
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
+}
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-ppc-*${DATESTAMP}*.bz2* ppc@nightheron.gentoo.org:
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ stage3.spec)
+ upload stage3-ppc-*${DATESTAMP}*.bz2*
+ ;;
+ esac
+
+ popd >/dev/null
}
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index d9c45856..dbe0c767 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -39,7 +39,24 @@ update_symlinks() {
popd >/dev/null
done
}
-
+
+upload() {
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" ppc@nightheron.gentoo.org:
+}
+
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-ppc64-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ppc@nightheron.gentoo.org:
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ installcd-stage2-minimal.spec)
+ upload *${DATESTAMP}*.iso*
+ ;;
+ stage3*.spec)
+ upload stage3-ppc64-*${DATESTAMP}*.bz2*
+ ;;
+ esac
+
+ popd >/dev/null
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 44b47a93..560a38d3 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -35,9 +35,25 @@ update_symlinks() {
done
}
+upload() {
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
+}
post_build() {
- mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/kernels/netboot ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/netboot-s390-kernel-${DATESTAMP}
- mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/kernels/misc/netboot.igz ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/netboot-s390-initramfs-${DATESTAMP}
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/netboot* s390@nightheron.gentoo.org:
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ netboot/netboot.spec)
+ mv netboot2-s390-${DATESTAMP}/kernels/netboot netboot2-s390-${DATESTAMP}/netboot-s390-kernel-${DATESTAMP}
+ mv netboot2-s390-${DATESTAMP}/kernels/misc/netboot.igz netboot2-s390-${DATESTAMP}/netboot-s390-initramfs-${DATESTAMP}
+ upload netboot2-s390-${DATESTAMP}/netboot*
+ ;;
+ stage3.spec)
+ upload stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
+ ;;
+ esac
+
+ popd >/dev/null
}
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index c12a959e..a01b9a81 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -35,9 +35,25 @@ update_symlinks() {
done
}
+upload() {
+ rsync -e 'ssh -i /root/.ssh/id_rsa' "$@" s390@nightheron.gentoo.org:
+}
post_build() {
- mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/netboot64 ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-kernel-${DATESTAMP}
- mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/misc/netboot64.igz ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-initramfs-${DATESTAMP}
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot* s390@nightheron.gentoo.org:
+ local set=$1 spec=$2
+
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+
+ case ${spec} in
+ netboot/netboot.spec)
+ mv netboot2-s390x-${DATESTAMP}/kernels/netboot64 netboot2-s390x-${DATESTAMP}/netboot-s390x-kernel-${DATESTAMP}
+ mv netboot2-s390x-${DATESTAMP}/kernels/misc/netboot64.igz netboot2-s390x-${DATESTAMP}/netboot-s390x-initramfs-${DATESTAMP}
+ upload netboot2-s390x-${DATESTAMP}/netboot*
+ ;;
+ stage3.spec)
+ upload stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
+ ;;
+ esac
+
+ popd >/dev/null
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-01-16 16:21 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2018-01-16 16:21 UTC (permalink / raw
To: gentoo-commits
commit: bbca329576836dc445f5caa3310d221747750110
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 03:42:07 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 03:42:07 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bbca3295
catalyst-auto: log the command in the log file itself
This should make it clear in each log file what is being run, especially
when a phase is run more than once (like post_build).
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 756bc515..b7036937 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -70,6 +70,7 @@ run_cmd() {
local logfile="$1"
shift
+ echo "*** Running command: $*" &>> "${logfile}"
if [ $verbose = 2 ]; then
echo "*** Running command: $*"
"$@" 2>&1 | tee -a "${logfile}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-01-16 16:21 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2018-01-16 16:21 UTC (permalink / raw
To: gentoo-commits
commit: 40ed3e84d7ed3f8afce986344d1b88c8309f4d81
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 07:01:19 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 07:01:19 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=40ed3e84
catalyst-auto: update arch configs after timestamp changes
Commit ed258c751bb3457721112e2371d426c112369331 (change
datestamp->timestamp) broke a lot of builders. The symlinks
and upload logic were all based on the datestamp. Update it
to use the new timestamp format.
tools/catalyst-auto-alpha.conf | 33 ++++++++++++++++++-----------
tools/catalyst-auto-arm64.conf | 31 ++++++++++++++++++----------
tools/catalyst-auto-hppa.conf | 47 +++++++++++++++++++++++++-----------------
tools/catalyst-auto-ia64.conf | 33 ++++++++++++++++++-----------
tools/catalyst-auto-ppc.conf | 31 ++++++++++++++++++----------
tools/catalyst-auto-ppc64.conf | 37 ++++++++++++++++++++-------------
tools/catalyst-auto-s390.conf | 37 ++++++++++++++++++++-------------
tools/catalyst-auto-s390x.conf | 37 ++++++++++++++++++++-------------
8 files changed, 179 insertions(+), 107 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 585f8f23..5a86db14 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -22,17 +22,26 @@ give_latest_from_dates() {
tr '~' '-'
}
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.bz2
+# stage3-xxx-20180116.tar.bz2
+# stage3-xxx-20180116T015819Z.tar.bz2
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
+}
+
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
}
upload() {
@@ -46,10 +55,10 @@ post_build() {
case ${spec} in
installcd-stage2-minimal.spec)
- upload *-${DATESTAMP}*.iso*
+ upload *-${TIMESTAMP}*.iso*
;;
stage3.spec)
- upload stage3-*${DATESTAMP}*.bz2*
+ upload stage3-*${TIMESTAMP}*.bz2*
;;
esac
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 21617af7..c1320a96 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -25,17 +25,26 @@ give_latest_from_dates() {
tr '~' '-'
}
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.bz2
+# stage3-xxx-20180116.tar.bz2
+# stage3-xxx-20180116T015819Z.tar.bz2
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
+}
+
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd
- done
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
}
upload() {
@@ -49,7 +58,7 @@ post_build() {
case ${spec} in
stage3.spec)
- upload stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2*
;;
esac
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index b7b41527..14e604ca 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -27,19 +27,28 @@ give_latest_from_dates() {
tr '~' '-'
}
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.bz2
+# stage3-xxx-20180116.tar.bz2
+# stage3-xxx-20180116T015819Z.tar.bz2
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
+}
+
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for t in hppa1.1 hppa2.0; do
- for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ local d f t
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for t in hppa1.1 hppa2.0; do
+ for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ done
+ popd >/dev/null
+ done
}
upload() {
@@ -53,21 +62,21 @@ post_build() {
case ${spec} in
netboot2-hppa32.spec)
- mv netboot2-hppa1.1-${DATESTAMP}/netboot32-hppa.lif netboot2-hppa1.1-${DATESTAMP}/netboot-hppa32-${DATESTAMP}.lif
- upload netboot2-hppa1.1-${DATESTAMP}/netboot-hppa32-${DATESTAMP}.lif
+ mv netboot2-hppa1.1-${TIMESTAMP}/netboot32-hppa.lif netboot2-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
+ upload netboot2-hppa1.1-${TIMESTAMP}/netboot-hppa32-${TIMESTAMP}.lif
;;
netboot2-hppa64.spec)
- mv netboot2-hppa2.0-${DATESTAMP}/netboot64-hppa.lif netboot2-hppa2.0-${DATESTAMP}/netboot-hppa64-${DATESTAMP}.lif
- upload netboot2-hppa2.0-${DATESTAMP}/netboot-hppa64-${DATESTAMP}.lif
+ mv netboot2-hppa2.0-${TIMESTAMP}/netboot64-hppa.lif netboot2-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
+ upload netboot2-hppa2.0-${TIMESTAMP}/netboot-hppa64-${TIMESTAMP}.lif
;;
installcd-stage2-minimal.spec)
- upload install-hppa-minimal-*${DATESTAMP}*.iso*
+ upload install-hppa-minimal-*${TIMESTAMP}*.iso*
;;
hppa1.1/stage3.spec)
- upload stage3-hppa1.1-*${DATESTAMP}*.bz2*
+ upload stage3-hppa1.1-*${TIMESTAMP}*.bz2*
;;
hppa2.0/stage3.spec)
- upload stage3-hppa2.0-*${DATESTAMP}*.bz2*
+ upload stage3-hppa2.0-*${TIMESTAMP}*.bz2*
;;
esac
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index ac8eee77..950a9b48 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -22,17 +22,26 @@ give_latest_from_dates() {
tr '~' '-'
}
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.bz2
+# stage3-xxx-20180116.tar.bz2
+# stage3-xxx-20180116T015819Z.tar.bz2
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
+}
+
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
}
upload() {
@@ -46,10 +55,10 @@ post_build() {
case ${spec} in
installcd-stage2*)
- upload *${DATESTAMP}*.iso*
+ upload *${TIMESTAMP}*.iso*
;;
stage3.spec)
- upload stage3-*${DATESTAMP}*.bz2*
+ upload stage3-*${TIMESTAMP}*.bz2*
;;
esac
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 05a10ec6..49a3dd95 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -24,17 +24,26 @@ give_latest_from_dates() {
tr '~' '-'
}
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.bz2
+# stage3-xxx-20180116.tar.bz2
+# stage3-xxx-20180116T015819Z.tar.bz2
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
+}
+
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
}
upload() {
@@ -48,7 +57,7 @@ post_build() {
case ${spec} in
stage3.spec)
- upload stage3-ppc-*${DATESTAMP}*.bz2*
+ upload stage3-ppc-*${TIMESTAMP}*.bz2*
;;
esac
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index dbe0c767..3ca55464 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -25,19 +25,28 @@ give_latest_from_dates() {
tr '~' '-'
}
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.bz2
+# stage3-xxx-20180116.tar.bz2
+# stage3-xxx-20180116T015819Z.tar.bz2
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
+}
+
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for t in ppc64-64ul ppc64-32ul; do
- for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ local d f t
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for t in ppc64-64ul ppc64-32ul; do
+ for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ done
+ popd >/dev/null
+ done
}
upload() {
@@ -51,10 +60,10 @@ post_build() {
case ${spec} in
installcd-stage2-minimal.spec)
- upload *${DATESTAMP}*.iso*
+ upload *${TIMESTAMP}*.iso*
;;
stage3*.spec)
- upload stage3-ppc64-*${DATESTAMP}*.bz2*
+ upload stage3-ppc64-*${TIMESTAMP}*.bz2*
;;
esac
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 560a38d3..36672db2 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -22,17 +22,26 @@ give_latest_from_dates() {
tr '~' '-'
}
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.bz2
+# stage3-xxx-20180116.tar.bz2
+# stage3-xxx-20180116T015819Z.tar.bz2
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
+}
+
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
}
upload() {
@@ -46,12 +55,12 @@ post_build() {
case ${spec} in
netboot/netboot.spec)
- mv netboot2-s390-${DATESTAMP}/kernels/netboot netboot2-s390-${DATESTAMP}/netboot-s390-kernel-${DATESTAMP}
- mv netboot2-s390-${DATESTAMP}/kernels/misc/netboot.igz netboot2-s390-${DATESTAMP}/netboot-s390-initramfs-${DATESTAMP}
- upload netboot2-s390-${DATESTAMP}/netboot*
+ mv netboot2-s390-${TIMESTAMP}/kernels/netboot netboot2-s390-${TIMESTAMP}/netboot-s390-kernel-${TIMESTAMP}
+ mv netboot2-s390-${TIMESTAMP}/kernels/misc/netboot.igz netboot2-s390-${TIMESTAMP}/netboot-s390-initramfs-${TIMESTAMP}
+ upload netboot2-s390-${TIMESTAMP}/netboot*
;;
stage3.spec)
- upload stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2*
;;
esac
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index a01b9a81..2aa01f7a 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -22,17 +22,26 @@ give_latest_from_dates() {
tr '~' '-'
}
+# Replace the date/time stamp in the filename to "latest".
+# Forms we handle:
+# stage3-xxx-2018.0.tar.bz2
+# stage3-xxx-20180116.tar.bz2
+# stage3-xxx-20180116T015819Z.tar.bz2
+convert_filename() {
+ sed -E 's:-20[0-9]+(\.[0-9]+|T[0-9]+Z)?:-latest:g'
+}
+
update_symlinks() {
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d >/dev/null
- for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
- ln -sf $f $of
- done
- popd >/dev/null
- done
+ # Symlink the latest stages3 to build from
+ local d f
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" ; do
+ pushd "${d}" >/dev/null
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates) ; do
+ local of=$(echo "${f}" | convert_filename)
+ ln -sf "${f}" "${of}"
+ done
+ popd >/dev/null
+ done
}
upload() {
@@ -46,12 +55,12 @@ post_build() {
case ${spec} in
netboot/netboot.spec)
- mv netboot2-s390x-${DATESTAMP}/kernels/netboot64 netboot2-s390x-${DATESTAMP}/netboot-s390x-kernel-${DATESTAMP}
- mv netboot2-s390x-${DATESTAMP}/kernels/misc/netboot64.igz netboot2-s390x-${DATESTAMP}/netboot-s390x-initramfs-${DATESTAMP}
- upload netboot2-s390x-${DATESTAMP}/netboot*
+ mv netboot2-s390x-${TIMESTAMP}/kernels/netboot64 netboot2-s390x-${TIMESTAMP}/netboot-s390x-kernel-${TIMESTAMP}
+ mv netboot2-s390x-${TIMESTAMP}/kernels/misc/netboot64.igz netboot2-s390x-${TIMESTAMP}/netboot-s390x-initramfs-${TIMESTAMP}
+ upload netboot2-s390x-${TIMESTAMP}/netboot*
;;
stage3.spec)
- upload stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2*
+ upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.bz2*
;;
esac
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-01-16 7:27 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2018-01-16 7:27 UTC (permalink / raw
To: gentoo-commits
commit: cb652173f6d910bcad4eb9be2ac0781d983b2ae2
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 01:44:31 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 01:44:31 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cb652173
catalyst-auto: move remaining configs from pre_build to update_symlinks
All the configs running symlink updates in pre_build can do it in the
update_symlinks callback instead. Convert them over.
tools/catalyst-auto-alpha.conf | 3 +--
tools/catalyst-auto-arm64.conf | 3 +--
tools/catalyst-auto-armv4tl.conf | 2 +-
tools/catalyst-auto-armv5tel.conf | 2 +-
tools/catalyst-auto-armv6j.conf | 2 +-
tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
tools/catalyst-auto-armv7a.conf | 2 +-
tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
tools/catalyst-auto-hppa.conf | 3 +--
tools/catalyst-auto-ia64.conf | 3 +--
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 3 +--
tools/catalyst-auto-s390.conf | 3 +--
tools/catalyst-auto-s390x.conf | 3 +--
tools/catalyst-auto-sparc64.conf | 2 +-
tools/catalyst-auto-x86-experimental.conf | 2 +-
tools/catalyst-auto-x86.conf | 2 +-
17 files changed, 17 insertions(+), 24 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index f72747ab..5b2bd2ed 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -22,8 +22,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index f987eb9f..e9744337 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -25,8 +25,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index dfa65886..9ae84d5e 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 7ae17c0e..072b8d8a 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 950b7f03..9a14ddf9 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 86ae9ddb..f3295b22 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 33138ce6..66911204 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index 55dae2e1..4dd146f5 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -26,7 +26,7 @@ give_latest_from_dates() {
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 18ca85ff..9899e7da 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -27,8 +27,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 9f059ee3..dc91c4c4 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -22,8 +22,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 43d9809f..139f1a1a 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -24,7 +24,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 1dfe64a9..d9c45856 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -25,8 +25,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index e580032a..44b47a93 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -22,8 +22,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 37e543f5..c12a959e 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -22,8 +22,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index cca8dd58..b3364f8f 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -23,7 +23,7 @@ give_latest_from_dates() {
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index e2c19761..9092e577 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -37,7 +37,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 286a9304..d2042559 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -37,7 +37,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-pre_build() {
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-01-16 7:27 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2018-01-16 7:27 UTC (permalink / raw
To: gentoo-commits
commit: 8f6370f8b309fbc8f958557f25f9c090c6345644
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 01:42:19 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 01:42:19 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8f6370f8
catalyst-auto: run update_symlinks by default in pre_build
All configs defining update_symlinks run it in pre_build, and all the
other configs will want to do the same. So make it the default in the
pre_build phase.
tools/catalyst-auto | 2 +-
tools/catalyst-auto-amd64-experimental.conf | 4 ----
tools/catalyst-auto-amd64.conf | 4 ----
3 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cd23d159..750e7047 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -94,7 +94,7 @@ update_symlinks() {
pre_build() {
# This is a skeleton function that you can override from the config file.
# It will be executed before the build is started.
- :
+ update_symlinks
}
post_build() {
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index e4766949..70963a0a 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -71,10 +71,6 @@ update_symlinks() {
done
}
-pre_build() {
- update_symlinks
-}
-
post_build() {
cmd=(
rsync
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a2a0abdc..e469a487 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -75,10 +75,6 @@ update_symlinks() {
done
}
-pre_build() {
- update_symlinks
-}
-
post_build() {
cmd=(
rsync
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-01-16 6:44 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2018-01-16 6:44 UTC (permalink / raw
To: gentoo-commits
commit: 04b56eaab3ad5d9e78ed8e173bbcb680d958041e
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 01:13:59 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 01:13:59 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=04b56eaa
catalyst-auto: move container logic into a func too
This lets us put it after command line parsing.
tools/catalyst-auto | 38 +++++++++++++++++++++++---------------
1 file changed, 23 insertions(+), 15 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cf5a7c65..c06a42bf 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -2,21 +2,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# First let's get our own namespaces to avoid leaking crap.
-if [[ -z ${UNSHARE} ]] ; then
- if type -P unshare >&/dev/null ; then
- uargs=()
- # Probe the namespaces as some can be disabled (or we are not root).
- unshare -m -- true >&/dev/null && uargs+=( -m )
- unshare -u -- true >&/dev/null && uargs+=( -u )
- unshare -i -- true >&/dev/null && uargs+=( -i )
- unshare -p -- true >&/dev/null && uargs+=( -p -f --mount-proc )
- # Re-exec ourselves in the new namespace.
- UNSHARE=true exec unshare "${uargs[@]}" -- "$0" "$@"
- fi
-fi
-unset UNSHARE
-
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
# Probe the default source dir from this script name.
@@ -179,6 +164,26 @@ parse_args() {
done
}
+# Let's get our own namespaces/etc... to avoid leaking crap.
+containerize() {
+ # If we've already relaunched, nothing to do.
+ if [[ ${UNSHARE} == "true" ]] ; then
+ return
+ fi
+
+ # Most systems have unshare available, but just in case.
+ if type -P unshare >&/dev/null ; then
+ local uargs=()
+ # Probe the namespaces as some can be disabled (or we are not root).
+ unshare -m -- true >&/dev/null && uargs+=( -m )
+ unshare -u -- true >&/dev/null && uargs+=( -u )
+ unshare -i -- true >&/dev/null && uargs+=( -i )
+ unshare -p -- true >&/dev/null && uargs+=( -p -f --mount-proc )
+ # Re-exec ourselves in the new namespace.
+ UNSHARE=true exec unshare "${uargs[@]}" -- "$0" "$@"
+ fi
+}
+
run_catalyst_commands() {
doneconfig=0
for config_file in "${config_files[@]}"; do
@@ -388,6 +393,9 @@ main() {
# Parse user arguments before we try doing container logic.
parse_args "$@"
+ # Try to isolate ourselves from the rest of the system.
+ containerize "$@"
+
(
if [[ -n ${lock_file} ]]; then
if ! flock -n 9; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-01-16 6:44 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2018-01-16 6:44 UTC (permalink / raw
To: gentoo-commits
commit: a8e70e197696b8feee4dd8aa2c785770113bb5c3
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 01:17:43 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 01:17:43 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a8e70e19
catalyst-auto: move git update into main script
All of our config files are doing this already, so move it into the
common code.
tools/catalyst-auto | 31 +++++++++++++++++++++++++++--
tools/catalyst-auto-alpha.conf | 3 ---
tools/catalyst-auto-amd64-experimental.conf | 3 ---
tools/catalyst-auto-amd64.conf | 3 ---
tools/catalyst-auto-arm64.conf | 3 ---
tools/catalyst-auto-armv4tl.conf | 3 ---
tools/catalyst-auto-armv5tel.conf | 3 ---
tools/catalyst-auto-armv6j.conf | 3 ---
tools/catalyst-auto-armv6j_hardfp.conf | 3 ---
tools/catalyst-auto-armv7a.conf | 3 ---
tools/catalyst-auto-armv7a_hardfp.conf | 3 ---
tools/catalyst-auto-hppa.conf | 3 ---
tools/catalyst-auto-ia64.conf | 3 ---
tools/catalyst-auto-ppc.conf | 3 ---
tools/catalyst-auto-ppc64.conf | 3 ---
tools/catalyst-auto-s390.conf | 3 ---
tools/catalyst-auto-s390x.conf | 3 ---
tools/catalyst-auto-sparc64.conf | 3 ---
tools/catalyst-auto-x86-experimental.conf | 4 ----
tools/catalyst-auto-x86.conf | 4 ----
20 files changed, 29 insertions(+), 61 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index c06a42bf..cd23d159 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -93,8 +93,7 @@ update_symlinks() {
pre_build() {
# This is a skeleton function that you can override from the config file.
- # It will be executed before the build is started. You can use this to
- # update the checkout of the releng repo
+ # It will be executed before the build is started.
:
}
@@ -184,6 +183,31 @@ containerize() {
fi
}
+# Update the git repo if possible. It might modify this script which will probably
+# make bash fail (since bash parses as it executes). So we have to safely re-exec
+# the script whenever there's an update.
+git_update() {
+ # If we've already relaunched, nothing to do.
+ if [[ ${GIT_UPDATE} == "true" ]] ; then
+ return
+ fi
+
+ pushd "${REPO_DIR}" >/dev/null
+ git fetch -q
+ revs=$(git rev-list HEAD..FETCH_HEAD)
+ popd >/dev/null
+ if [[ -n ${revs} ]] ; then
+ GIT_UPDATE=true exec bash -c '
+ repo_dir=$1 script=$2
+ shift 2
+ pushd "${repo_dir}" >/dev/null
+ git merge FETCH_HEAD || echo "${script}: WARNING: git repo is dirty"
+ popd >/dev/null
+ exec "${script}" "$@"
+ ' -- "${REPO_DIR}" "$0" "$@"
+ fi
+}
+
run_catalyst_commands() {
doneconfig=0
for config_file in "${config_files[@]}"; do
@@ -393,6 +417,9 @@ main() {
# Parse user arguments before we try doing container logic.
parse_args "$@"
+ # Update the release git dir if possible.
+ git_update "$@"
+
# Try to isolate ourselves from the rest of the system.
containerize "$@"
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 8edbaf5d..f72747ab 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -24,9 +24,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 535f4fb5..e4766949 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -72,9 +72,6 @@ update_symlinks() {
}
pre_build() {
- pushd ${REPO_DIR} >/dev/null
- git pull
- popd >/dev/null
update_symlinks
}
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index b92f8314..a2a0abdc 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -76,9 +76,6 @@ update_symlinks() {
}
pre_build() {
- pushd ${REPO_DIR} >/dev/null
- git pull
- popd >/dev/null
update_symlinks
}
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index bede1247..f987eb9f 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -27,9 +27,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index 75fda247..dfa65886 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -27,9 +27,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 2a02f117..7ae17c0e 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -27,9 +27,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index bf5c3aa0..950b7f03 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -27,9 +27,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 771f4454..86ae9ddb 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -27,9 +27,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 363188b3..33138ce6 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -27,9 +27,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index e85ca6c0..55dae2e1 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -27,9 +27,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index aa5fdde2..18ca85ff 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -29,9 +29,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index fc53d33e..9f059ee3 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -24,9 +24,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 2a20e4c1..43d9809f 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -25,9 +25,6 @@ give_latest_from_dates() {
}
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index fd169306..1dfe64a9 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -27,9 +27,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 1f766eeb..e580032a 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -24,9 +24,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index a97a3f79..37e543f5 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -24,9 +24,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index f93796f0..cca8dd58 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -24,9 +24,6 @@ give_latest_from_dates() {
pre_build() {
- cd ${REPO_DIR}
- git pull
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index dd0c180d..e2c19761 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -38,10 +38,6 @@ give_latest_from_dates() {
}
pre_build() {
- pushd ${REPO_DIR} >/dev/null
- git pull
- popd >/dev/null
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d >/dev/null
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index deca9d07..286a9304 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -38,10 +38,6 @@ give_latest_from_dates() {
}
pre_build() {
- pushd ${REPO_DIR} >/dev/null
- git pull
- popd >/dev/null
-
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d >/dev/null
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2018-01-16 3:52 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2018-01-16 3:52 UTC (permalink / raw
To: gentoo-commits
commit: b291ea47548bf025259632a18d86e16d9bb0a886
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 16 01:11:44 2018 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 01:11:44 2018 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b291ea47
catalyst-auto: move all code into functions
Mixing inline funcs and executable code makes it hard to follow and
shuffle ordering of operations. Put everything other than variables
into functions.
The delta here is large, but it's almost entirely indentation changes.
This also makes updating the script (like `git pull`) more resilient.
tools/catalyst-auto | 536 ++++++++++++++++++++++++++--------------------------
1 file changed, 273 insertions(+), 263 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 02115d1c..cf5a7c65 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -19,6 +19,17 @@ unset UNSHARE
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+# Probe the default source dir from this script name.
+REPO_DIR=$(dirname "$(dirname "$(realpath "$0")")")
+
+# Set up defaults that config files can override if they want.
+SUBARCH=$(uname -m)
+EMAIL_TO="releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org"
+# Use full hostname by default as Gentoo servers will reject short names.
+EMAIL_FROM="catalyst@$(hostname -f)"
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
+
+# Variables updated by command line arguments.
declare -a config_files
config_files=()
verbose=0
@@ -28,9 +39,6 @@ preclean=0
lastrun=0
lock_file=
-# Set pipefail so that run_cmd returns the right value in $?
-set -o pipefail
-
usage() {
local msg=$1
@@ -125,269 +133,271 @@ trigger_post_build() {
fi
}
-# Parse args
-while [ ${#} -gt 0 ]
-do
- a=${1}
- shift
- case "${a}" in
- -h|--help)
- usage
- exit 0
- ;;
- -c|--config)
- config_files+=("$1")
- shift
- ;;
- -v|--verbose)
- verbose=$(($verbose+1))
- ;;
- -k|--keep-tmpdir)
- keep_tmpdir=1
- ;;
- -t|--test)
- testing=1
- ;;
- -C|--preclean)
- preclean=1
- ;;
- --interval)
- lastrun=$1
- shift
- ;;
- -l|--lock)
- lock_file=$1
- shift
- ;;
- -*)
- usage "ERROR: You have specified an invalid option: ${a}"
- exit 1
- ;;
- *)
- usage "ERROR: This script takes no arguments: ${a}"
- exit 1
- ;;
- esac
-done
-
-(
-
-if [[ -n ${lock_file} ]]; then
- if ! flock -n 9; then
- echo "catalyst-auto already running"
- exit 1
- fi
-fi
-
-# Probe the default source dir from this script name.
-REPO_DIR=$(dirname "$(dirname "$(realpath "$0")")")
-
-# Set up defaults that config files can override if they want.
-SUBARCH=$(uname -m)
-EMAIL_TO="releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org"
-# Use full hostname by default as Gentoo servers will reject short names.
-EMAIL_FROM="catalyst@$(hostname -f)"
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
-doneconfig=0
-for config_file in "${config_files[@]}"; do
- # Make sure all required values were specified
- if [ -z "${config_file}" -o ! -e "${config_file}" ]; then
- usage "ERROR: You must specify a valid config file to use: '$config_file' is not valid"
- exit 1
- fi
- source "${config_file}"
- doneconfig=1
-done
-if [[ $doneconfig -eq 0 ]]; then
- usage "ERROR: You must specify at least one valid config file to use"
- exit 1
-fi
-
-# Some configs will set this explicitly, so don't clobber it.
-: ${BUILD_SRCDIR_BASE:=$(catalyst_var storedir)}
-
-# See if we had a recent success.
-if [[ ${lastrun} -ne 0 ]]; then
- last_success_file="${BUILD_SRCDIR_BASE}/.last_success"
- delay=$(( lastrun * 24 * 60 * 60 ))
- last_success=$(head -1 "${last_success_file}" 2>/dev/null || echo 0)
- if [[ $(date +%s) -lt $(( last_success + delay )) ]]; then
- exit 0
- fi
-fi
-
-DATESTAMP=$(date -u +%Y%m%d)
-TIMESTAMP=$(date -u +%Y%m%dT%H%M%SZ)
-TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" "catalyst-auto.${TIMESTAMP}.XXXXXX")
-
-# Nuke any previous tmpdirs to keep them from accumulating.
-if [[ ${preclean} -eq 1 ]]; then
- rm -rf "${TMPDIR%.??????}".*
- mkdir "${TMPDIR}"
-fi
-
-if [ ${verbose} -ge 1 ]; then
- echo "TMPDIR = ${TMPDIR}"
- echo "DATESTAMP = ${DATESTAMP}"
- echo "TIMESTAMP = ${TIMESTAMP}"
-fi
-
-if ! mkdir -p "${TMPDIR}"/{specs,kconfig,log}; then
- echo "Couldn't create tempdirs!"
- exit 1
-fi
-
-if ! run_cmd "${TMPDIR}/log/pre_build.log" pre_build; then
- send_email "Catalyst build error - pre_build" "The pre_build function failed" "${TMPDIR}/log/pre_build.log"
- exit 1
-fi
-
-cd "${SPECS_DIR}" || exit 1
-
-for a in "" ${SETS}; do
- if [ -z "${a}" ]; then
- specs_var="SPECS"
- optional_specs_var="OPTIONAL_SPECS"
- else
- specs_var="SET_${a}_SPECS"
- optional_specs_var="SET_${a}_OPTIONAL_SPECS"
- fi
-
- for i in ${!specs_var} ${!optional_specs_var}; do
- cp --parents "${i}" "${TMPDIR}"/specs/
- done
-done
-
-find "${KCONFIG_DIR}" -type f -exec cp {} "${TMPDIR}"/kconfig \;
-
-cd "${TMPDIR}/specs" || exit 1
-
-# Fix up specs with datestamp
-for i in $(find -name '*.spec'); do
- # Grab current version_stamp and source_subpath
- old_version_stamp=$(grep version_stamp "${i}" | sed -e 's|^version_stamp: *||')
- old_source_subpath=$(grep source_subpath "${i}" | sed -e 's|^source_subpath: *||')
-
- new_version_stamp=$(echo "${old_version_stamp}" | sed -e "s|^\(.*-\)\?.*$|\1${TIMESTAMP}|")
- new_source_subpath=$(echo "${old_source_subpath}" | sed -e "s|${old_version_stamp}|${new_version_stamp}|")
-
- sed -i "s|^version_stamp:.*$|version_stamp: ${new_version_stamp}|" "${i}"
- sed -i "s|^snapshot:.*$|snapshot: ${TIMESTAMP}|" "${i}"
-
- # We don't want to mangle the source_subpath for our stage1 spec
- if ! grep -q '^target: *stage[14]$' "${i}"; then
- sed -i "s|^source_subpath:.*$|source_subpath: ${new_source_subpath}|" "${i}"
- fi
-
- sed -i "/^livecd\/iso/s|${old_version_stamp}|${new_version_stamp}|" "${i}"
- sed -i "/^livecd\/volid/s|${old_version_stamp}|${new_version_stamp}|" "${i}"
-
- kconfig_lines=$(grep '^boot/kernel/[^/]\+/config:' "${i}")
- if [ -n "${kconfig_lines}" ]; then
- echo "${kconfig_lines}" | while read line; do
- key=$(echo "${line}" | cut -d: -f1)
- filename=$(basename $(echo "${line}" | cut -d: -f2))
- sed -i "s|^${key}:.*\$|${key}: ${TMPDIR}/kconfig/${filename}|" "${i}"
- done
- fi
-
- # Expand vars that the spec expects us to.
- sed -i \
- -e "s:@DATESTAMP@:${DATESTAMP}:g" \
- -e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
- -e "s:@REPO_DIR@:${REPO_DIR}:g" \
- "${i}"
-done
-
-if [ "${testing}" -eq 1 ]; then
- echo "Exiting due to --test"
- exit
-fi
-
-if [[ ${preclean} -eq 1 ]]; then
- snapshot_cache=$(catalyst_var snapshot_cache)
- if [[ -z ${snapshot_cache} ]]; then
- echo "error: snapshot_cache not set in config file"
- exit 1
- fi
- pushd "${BUILD_SRCDIR_BASE}" >/dev/null || exit 1
- rm -rf --one-file-system \
- kerncache packages snapshots tmp "${snapshot_cache}"/*
- popd >/dev/null
-fi
-
-# Create snapshot
-if ! run_cmd "${TMPDIR}/log/snapshot.log" catalyst -c "${CATALYST_CONFIG}" -s "${TIMESTAMP}"; then
- send_email "Catalyst build error - snapshot" "" "${TMPDIR}/log/snapshot.log"
- exit 1
-fi
-
-build_failure=0
+parse_args() {
+ local a
+ while [[ $# -gt 0 ]] ; do
+ a=$1
+ shift
+ case "${a}" in
+ -h|--help)
+ usage
+ exit 0
+ ;;
+ -c|--config)
+ config_files+=("$1")
+ shift
+ ;;
+ -v|--verbose)
+ verbose=$(($verbose+1))
+ ;;
+ -k|--keep-tmpdir)
+ keep_tmpdir=1
+ ;;
+ -t|--test)
+ testing=1
+ ;;
+ -C|--preclean)
+ preclean=1
+ ;;
+ --interval)
+ lastrun=$1
+ shift
+ ;;
+ -l|--lock)
+ lock_file=$1
+ shift
+ ;;
+ -*)
+ usage "ERROR: You have specified an invalid option: ${a}"
+ exit 1
+ ;;
+ *)
+ usage "ERROR: This script takes no arguments: ${a}"
+ exit 1
+ ;;
+ esac
+ done
+}
-timeprefix=()
-which time >/dev/null && timeprefix=( "time" )
+run_catalyst_commands() {
+ doneconfig=0
+ for config_file in "${config_files[@]}"; do
+ # Make sure all required values were specified.
+ if [[ -z "${config_file}" || ! -e "${config_file}" ]]; then
+ usage "ERROR: You must specify a valid config file to use: '$config_file' is not valid"
+ exit 1
+ fi
+ source "${config_file}"
+ doneconfig=1
+ done
+ if [[ ${doneconfig} == 0 ]]; then
+ usage "ERROR: You must specify at least one valid config file to use"
+ exit 1
+ fi
+
+ # Some configs will set this explicitly, so don't clobber it.
+ : ${BUILD_SRCDIR_BASE:=$(catalyst_var storedir)}
+
+ # See if we had a recent success.
+ if [[ ${lastrun} != 0 ]]; then
+ last_success_file="${BUILD_SRCDIR_BASE}/.last_success"
+ delay=$(( lastrun * 24 * 60 * 60 ))
+ last_success=$(head -1 "${last_success_file}" 2>/dev/null || echo 0)
+ if [[ $(date +%s) -lt $(( last_success + delay )) ]]; then
+ exit 0
+ fi
+ fi
+
+ DATESTAMP=$(date -u +%Y%m%d)
+ TIMESTAMP=$(date -u +%Y%m%dT%H%M%SZ)
+ TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" "catalyst-auto.${TIMESTAMP}.XXXXXX")
+
+ # Nuke any previous tmpdirs to keep them from accumulating.
+ if [[ ${preclean} == 1 ]]; then
+ rm -rf "${TMPDIR%.??????}".*
+ mkdir "${TMPDIR}"
+ fi
+
+ if [[ ${verbose} -ge 1 ]]; then
+ echo "TMPDIR = ${TMPDIR}"
+ echo "DATESTAMP = ${DATESTAMP}"
+ echo "TIMESTAMP = ${TIMESTAMP}"
+ fi
+
+ if ! mkdir -p "${TMPDIR}"/{specs,kconfig,log}; then
+ echo "Couldn't create tempdirs!"
+ exit 1
+ fi
+
+ if ! run_cmd "${TMPDIR}/log/pre_build.log" pre_build; then
+ send_email "Catalyst build error - pre_build" "The pre_build function failed" "${TMPDIR}/log/pre_build.log"
+ exit 1
+ fi
+
+ cd "${SPECS_DIR}" || exit 1
+
+ for a in "" ${SETS}; do
+ if [[ -z "${a}" ]]; then
+ specs_var="SPECS"
+ optional_specs_var="OPTIONAL_SPECS"
+ else
+ specs_var="SET_${a}_SPECS"
+ optional_specs_var="SET_${a}_OPTIONAL_SPECS"
+ fi
+
+ for i in ${!specs_var} ${!optional_specs_var}; do
+ cp --parents "${i}" "${TMPDIR}"/specs/
+ done
+ done
+
+ find "${KCONFIG_DIR}" -type f -exec cp {} "${TMPDIR}"/kconfig \;
+
+ cd "${TMPDIR}/specs" || exit 1
+
+ # Fix up specs with datestamp
+ for i in $(find -name '*.spec'); do
+ # Grab current version_stamp and source_subpath
+ old_version_stamp=$(grep version_stamp "${i}" | sed -e 's|^version_stamp: *||')
+ old_source_subpath=$(grep source_subpath "${i}" | sed -e 's|^source_subpath: *||')
+
+ new_version_stamp=$(echo "${old_version_stamp}" | sed -e "s|^\(.*-\)\?.*$|\1${TIMESTAMP}|")
+ new_source_subpath=$(echo "${old_source_subpath}" | sed -e "s|${old_version_stamp}|${new_version_stamp}|")
+
+ sed -i "s|^version_stamp:.*$|version_stamp: ${new_version_stamp}|" "${i}"
+ sed -i "s|^snapshot:.*$|snapshot: ${TIMESTAMP}|" "${i}"
+
+ # We don't want to mangle the source_subpath for our stage1 spec
+ if ! grep -q '^target: *stage[14]$' "${i}"; then
+ sed -i "s|^source_subpath:.*$|source_subpath: ${new_source_subpath}|" "${i}"
+ fi
+
+ sed -i "/^livecd\/iso/s|${old_version_stamp}|${new_version_stamp}|" "${i}"
+ sed -i "/^livecd\/volid/s|${old_version_stamp}|${new_version_stamp}|" "${i}"
+
+ kconfig_lines=$(grep '^boot/kernel/[^/]\+/config:' "${i}")
+ if [[ -n ${kconfig_lines} ]]; then
+ echo "${kconfig_lines}" | while read line; do
+ key=$(echo "${line}" | cut -d: -f1)
+ filename=$(basename $(echo "${line}" | cut -d: -f2))
+ sed -i "s|^${key}:.*\$|${key}: ${TMPDIR}/kconfig/${filename}|" "${i}"
+ done
+ fi
+
+ # Expand vars that the spec expects us to.
+ sed -i \
+ -e "s:@DATESTAMP@:${DATESTAMP}:g" \
+ -e "s:@TIMESTAMP@:${TIMESTAMP}:g" \
+ -e "s:@REPO_DIR@:${REPO_DIR}:g" \
+ "${i}"
+ done
+
+ if [[ ${testing} == 1 ]]; then
+ echo "Exiting due to --test"
+ exit
+ fi
+
+ if [[ ${preclean} == 1 ]]; then
+ snapshot_cache=$(catalyst_var snapshot_cache)
+ if [[ -z ${snapshot_cache} ]]; then
+ echo "error: snapshot_cache not set in config file"
+ exit 1
+ fi
+ pushd "${BUILD_SRCDIR_BASE}" >/dev/null || exit 1
+ rm -rf --one-file-system \
+ kerncache packages snapshots tmp "${snapshot_cache}"/*
+ popd >/dev/null
+ fi
+
+ # Create snapshot
+ if ! run_cmd "${TMPDIR}/log/snapshot.log" catalyst -c "${CATALYST_CONFIG}" -s "${TIMESTAMP}"; then
+ send_email "Catalyst build error - snapshot" "" "${TMPDIR}/log/snapshot.log"
+ exit 1
+ fi
+
+ build_failure=0
+
+ timeprefix=()
+ which time >/dev/null && timeprefix=( "time" )
+
+ for a in "" ${SETS}; do
+ if [[ -z ${a} ]]; then
+ specs_var="SPECS"
+ optional_specs_var="OPTIONAL_SPECS"
+ else
+ specs_var="SET_${a}_SPECS"
+ optional_specs_var="SET_${a}_OPTIONAL_SPECS"
+ fi
+
+ for i in ${!specs_var}; do
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}"
+ if [[ $? != 0 ]]; then
+ build_failure=1
+ send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
+ continue 2
+ else
+ trigger_post_build
+ fi
+ done
+
+ for i in ${!optional_specs_var}; do
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}"
+ if [[ $? != 0 ]]; then
+ build_failure=1
+ send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
+ break
+ else
+ trigger_post_build
+ fi
+ done
+
+ for i in ${!specs_var} ${!optional_specs_var}; do
+ LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${i}"
+ done
+
+ update_symlinks
+ done
+
+ trigger_post_build
+
+ if [[ ${build_failure} == 0 ]]; then
+ if [[ ${lastrun} != 0 ]]; then
+ stamp=$(date)
+ (date -d"${stamp}" +%s; echo "${stamp}") >"${last_success_file}"
+ fi
+
+ send_email "Catalyst build success" "Build process complete."
+
+ if [[ ${keep_tmpdir} == 0 ]]; then
+ if ! rm -rf "${TMPDIR}"; then
+ echo "Could not remove tmpdir ${TMPDIR}!"
+ exit 1
+ fi
+ fi
+ else
+ send_email "Catalyst build complete, but with errors" "Build process has completed, but there were errors. Please consult previous emails to determine the problem."
+ fi
+}
-for a in "" ${SETS}; do
- if [ -z "${a}" ]; then
- specs_var="SPECS"
- optional_specs_var="OPTIONAL_SPECS"
- else
- specs_var="SET_${a}_SPECS"
- optional_specs_var="SET_${a}_OPTIONAL_SPECS"
- fi
+main() {
+ # Set pipefail so that run_cmd returns the right value in $?.
+ set -o pipefail
- for i in ${!specs_var}; do
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}"
- if [ $? != 0 ]; then
- build_failure=1
- send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
- continue 2
- else
- trigger_post_build
- fi
- done
-
- for i in ${!optional_specs_var}; do
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -c "${CATALYST_CONFIG}" -f "${i}"
- if [ $? != 0 ]; then
- build_failure=1
- send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
- break
- else
- trigger_post_build
- fi
- done
-
- for i in ${!specs_var} ${!optional_specs_var}; do
- LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
- run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${i}"
- done
-
- update_symlinks
-done
-
-trigger_post_build
-
-if [ ${build_failure} = 0 ]; then
- if [[ ${lastrun} -ne 0 ]]; then
- stamp=$(date)
- (date -d"${stamp}" +%s; echo "${stamp}") >"${last_success_file}"
- fi
+ # Parse user arguments before we try doing container logic.
+ parse_args "$@"
- send_email "Catalyst build success" "Build process complete."
+ (
+ if [[ -n ${lock_file} ]]; then
+ if ! flock -n 9; then
+ echo "catalyst-auto already running"
+ exit 1
+ fi
+ fi
- if [ "${keep_tmpdir}" = 0 ]; then
- if ! rm -rf "${TMPDIR}"; then
- echo "Could not remove tmpdir ${TMPDIR}!"
- exit 1
- fi
- fi
-
-else
- send_email "Catalyst build complete, but with errors" "Build process has completed, but there were errors. Please consult previous emails to determine the problem."
-fi
+ run_catalyst_commands
+ ) 9>"${lock_file:-/dev/null}"
+}
-) 9>"${lock_file:-/dev/null}"
+main "$@"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-29 5:32 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-29 5:32 UTC (permalink / raw
To: gentoo-commits
commit: 5d73c6b04ae06319ba5cc7bed9902249284494a1
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 29 05:32:10 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 29 05:32:10 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=5d73c6b0
catalyst-auto: add intermediate verbose, that prints the command, but not the output; -vv has old behavior
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cd26f969..02115d1c 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -77,9 +77,12 @@ run_cmd() {
local logfile="$1"
shift
- if [ $verbose = 1 ]; then
+ if [ $verbose = 2 ]; then
echo "*** Running command: $*"
"$@" 2>&1 | tee -a "${logfile}"
+ elif [ $verbose = 1 ]; then
+ echo "*** Running command: $*"
+ "$@" &>> "${logfile}"
else
"$@" &>> "${logfile}"
fi
@@ -137,7 +140,7 @@ do
shift
;;
-v|--verbose)
- verbose=1
+ verbose=$(($verbose+1))
;;
-k|--keep-tmpdir)
keep_tmpdir=1
@@ -224,7 +227,7 @@ if [[ ${preclean} -eq 1 ]]; then
mkdir "${TMPDIR}"
fi
-if [ ${verbose} = 1 ]; then
+if [ ${verbose} -ge 1 ]; then
echo "TMPDIR = ${TMPDIR}"
echo "DATESTAMP = ${DATESTAMP}"
echo "TIMESTAMP = ${TIMESTAMP}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-28 19:01 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-28 19:01 UTC (permalink / raw
To: gentoo-commits
commit: 731b5886ad34b8c202e93b097861807675b93039
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 28 19:01:26 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Thu Dec 28 19:01:26 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=731b5886
tools: fix typo of DEST_HARDEND
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-x86-experimental.conf | 2 +-
tools/catalyst-auto-x86.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 4d6ccd30..dd0c180d 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -95,7 +95,7 @@ post_build() {
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDEND}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
elif [ -f *${TIMESTAMP}*.iso ]; then
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
fi
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 03d51642..deca9d07 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -95,7 +95,7 @@ post_build() {
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDEND}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
elif [ -f *${TIMESTAMP}*.iso ]; then
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-27 2:56 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2017-12-27 2:56 UTC (permalink / raw
To: gentoo-commits
commit: 93bc214182bfd5ca49494c83e068f53a5b22f276
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 27 02:54:39 2017 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Dec 27 02:54:39 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=93bc2141
Sync amd64 and x86 base and experimental scripts. Add a few missing popd calls to base scripts.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 85 ++++++++++++++++++++---------
tools/catalyst-auto-amd64.conf | 1 +
tools/catalyst-auto-x86-experimental.conf | 43 +++++++++++----
tools/catalyst-auto-x86.conf | 1 +
4 files changed, 92 insertions(+), 38 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index a3b9f023..535f4fb5 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -10,23 +10,27 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="
- multilib
- nomultilib
+ multilib minimal_multilib
+ nomultilib minimal_nomultilib
x32
- hardened_multilib
- hardened_nomultilib
+ hardened_multilib minimal_hardened_multilib
+ hardened_nomultilib minimal_hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux
"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
+SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
+SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
+SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
@@ -38,7 +42,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
give_latest_from_dates() {
sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
+ sort -k +1 -n -t '~' | \
awk -F\~ \
'BEGIN{i=$1; o=$0};
{ if($1 != i && i != "") { print o; }; i=$1; o=$0; }
@@ -46,51 +50,80 @@ give_latest_from_dates() {
tr '~' '-'
}
-pre_build() {
- pushd ${REPO_DIR} >/dev/null
- git pull
- popd >/dev/null
-
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
- ln -sf $f $of
+ # 20yymmddThhmmssZ
+ # 20yymmddhhmmss
+ # 20yymmdd
+ # 20yy.n
+ of=$(perl -p \
+ -e 's/20\d{6}T\d{6}Z/latest/g;' \
+ -e 's/20\d{6}\d{6}/latest/g;' \
+ -e 's/20\d{6}/latest/g;' \
+ -e 's/20\d{2}\.\d{2}/latest/g;' \
+ <<<"$f")
+ ln -svf "$f" "$of"
done
popd >/dev/null
done
}
+pre_build() {
+ pushd ${REPO_DIR} >/dev/null
+ git pull
+ popd >/dev/null
+ update_symlinks
+}
+
post_build() {
+ cmd=(
+ rsync
+ -e 'ssh -i /root/.ssh/id_rsa'
+ -a
+ --omit-dir-times
+ --delay-updates
+ )
+ case $HOSTNAME in
+ nightheron)
+ DEST_DEFAULT=${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
+ ;;
+ *)
+ DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ ;;
+ esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
-
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ mkdir -p ${TMPDIR}/empty
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
- cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ "${cmd[@]}" ${file}* ${DEST_DEFAULT}
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
+ elif [ -f *${TIMESTAMP}*.iso ]; then
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
fi
popd >/dev/null
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
-
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
- cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ "${cmd[@]}" $file* ${DEST_HARDENED}
fi
done
-
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
+ elif [ -f *${TIMESTAMP}*.iso ]; then
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
fi
-
-
+ popd >/dev/null
}
# vim:ft=sh:
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index c9bbdc1a..b92f8314 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -127,6 +127,7 @@ post_build() {
elif [ -f *${TIMESTAMP}*.iso ]; then
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
fi
+ popd >/dev/null
}
# vim:ft=sh:
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 79f310dd..4d6ccd30 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -55,32 +55,51 @@ pre_build() {
}
post_build() {
+ cmd=(
+ rsync
+ -e 'ssh -i /root/.ssh/id_rsa'
+ -a
+ --omit-dir-times
+ --delay-updates
+ )
+ case $HOSTNAME in
+ nightheron)
+ DEST_DEFAULT=${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
+ ;;
+ *)
+ DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ ;;
+ esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
-
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ mkdir -p ${TMPDIR}/empty
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
+ for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
if [ -f $file ]; then
- cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ "${cmd[@]}" ${file}* ${DEST_DEFAULT}
fi
done
-
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
+ elif [ -f *${TIMESTAMP}*.iso ]; then
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
fi
popd >/dev/null
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
-
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
+ for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
if [ -f $file ]; then
- cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ "${cmd[@]}" $file* ${DEST_HARDENED}
fi
done
-
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDEND}
+ elif [ -f *${TIMESTAMP}*.iso ]; then
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
fi
+ popd >/dev/null
}
# vim:ft=sh:
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 5398ba10..03d51642 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -99,6 +99,7 @@ post_build() {
elif [ -f *${TIMESTAMP}*.iso ]; then
"${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
fi
+ popd >/dev/null
}
# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-22 11:30 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2017-12-22 11:30 UTC (permalink / raw
To: gentoo-commits
commit: 0c3d971bfb722b2a00960efebfb9caa779187970
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 11:29:30 2017 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 11:29:30 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0c3d971b
Fix typo.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 2570396f..c9bbdc1a 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -95,7 +95,7 @@ post_build() {
DEST_DEFAULT=${BUILD_DESTDIR_BASE}
DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
;;
- *
+ *)
DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
;;
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-22 11:22 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2017-12-22 11:22 UTC (permalink / raw
To: gentoo-commits
commit: 495425ec6a2e8cec1b6a499464391b27b9143e1c
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 11:22:26 2017 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 11:22:26 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=495425ec
Drop old set definition.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index eeaaf01c..2570396f 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -9,7 +9,6 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
-#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux"
SETS="
multilib minimal_multilib
nomultilib minimal_nomultilib
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-22 11:03 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2017-12-22 11:03 UTC (permalink / raw
To: gentoo-commits
commit: 3190fadba2380046d056a90c2f37ebfbc4b7c74c
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 22 11:02:44 2017 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Dec 22 11:02:44 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3190fadb
Use 2 vars for destinations (one for default and another for hardened).
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 26 ++++++++++++++++----------
tools/catalyst-auto-x86.conf | 26 ++++++++++++++++----------
2 files changed, 32 insertions(+), 20 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 53dac821..eeaaf01c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -92,35 +92,41 @@ post_build() {
--delay-updates
)
case $HOSTNAME in
- nightheron) DEST=${BUILD_DESTDIR_BASE} ;;
- *) DEST=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} ;;
+ nightheron)
+ DEST_DEFAULT=${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
+ ;;
+ *
+ DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ ;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
mkdir -p ${TMPDIR}/empty
- "${cmd[@]}" ${TMPDIR}/empty ${DEST}
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
- "${cmd[@]}" ${file}* ${DEST}
+ "${cmd[@]}" ${file}* ${DEST_DEFAULT}
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
fi
popd >/dev/null
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
- "${cmd[@]}" ${TMPDIR}/empty ${DEST}/hardened
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
- "${cmd[@]}" $file* ${DEST}/hardened
+ "${cmd[@]}" $file* ${DEST_HARDENED}
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}/hardened
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDENED}
elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}/hardened
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
fi
}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 6ec010ce..5398ba10 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -63,35 +63,41 @@ post_build() {
--delay-updates
)
case $HOSTNAME in
- nightheron) DEST=${BUILD_DESTDIR_BASE} ;;
- *) DEST=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} ;;
+ nightheron)
+ DEST_DEFAULT=${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${BUILD_DESTDIR_BASE}/hardened
+ ;;
+ *)
+ DEST_DEFAULT=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}
+ DEST_HARDENED=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE}/hardened
+ ;;
esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
mkdir -p ${TMPDIR}/empty
- "${cmd[@]}" ${TMPDIR}/empty ${DEST}
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST_DEFAULT}
for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
if [ -f $file ]; then
- "${cmd[@]}" ${file}* ${DEST}
+ "${cmd[@]}" ${file}* ${DEST_DEFAULT}
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_DEFAULT}
elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_DEFAULT}
fi
popd >/dev/null
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
- "${cmd[@]}" ${TMPDIR}/empty ${DEST}/hardened
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST_HARDENED}
for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
if [ -f $file ]; then
- "${cmd[@]}" $file* ${DEST}/hardened
+ "${cmd[@]}" $file* ${DEST_HARDENED}
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}/hardened
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST_HARDEND}
elif [ -f *${TIMESTAMP}*.iso ]; then
- "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}/hardened
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST_HARDENED}
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-15 23:44 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-15 23:44 UTC (permalink / raw
To: gentoo-commits
commit: af9a181c70a63be21dd3231da25d2854eeba1fc6
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 18:40:07 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 18:40:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=af9a181c
catalyst-auto: fix title.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index f8533f62..cd26f969 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -40,7 +40,7 @@ usage() {
cat <<EOH
Usage:
- stage_build [-c|--config <config>] [-v|--verbose] [-h|--help]
+ catalyst-auto [-c|--config <config>] [-v|--verbose] [-h|--help]
Options:
-c|--config Specifies the config file to use (required)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-15 5:48 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-15 5:48 UTC (permalink / raw
To: gentoo-commits
commit: bcdd88a2d40f1edaad27c37ea76a2b287249a84a
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 05:39:40 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 05:39:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bcdd88a2
tools/catalyst-auto-sparc64: start common post_build refactor
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-sparc64.conf | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index c866c081..f93796f0 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -41,7 +41,21 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* sparc@nightheron.gentoo.org:
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* sparc@nightheron.gentoo.org:multilib
-
+ mkdir -p ${TMPDIR}/empty
+ cmd=(
+ rsync
+ -e 'ssh -i /root/.ssh/id_rsa'
+ -a
+ --omit-dir-times
+ --delay-updates
+ )
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST}
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST}/multilib
+ "${cmd[@]}" \
+ ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* \
+ ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* \
+ sparc@nightheron.gentoo.org:
+ "${cmd[@]}" \
+ ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* \
+ sparc@nightheron.gentoo.org:multilib
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-15 5:48 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-15 5:48 UTC (permalink / raw
To: gentoo-commits
commit: d9f56a2c95452e4c101935732ae7bedd92942419
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 05:28:22 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 05:28:22 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d9f56a2c
tools/catalyst-auto-amd64: stage4 builds should be optional.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 87e83fa1..a6082de7 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -22,20 +22,20 @@ SETS="
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_minimal_multilib_SPECS="stage4-minimal.spec"
+SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
-SET_minimal_nomultilib_SPECS="stage4-nomultilib-minimal.spec"
+SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
#SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
-SET_systemd_SPECS="stage4-systemd.spec"
+SET_systemd_OPTIONAL_SPECS="stage4-systemd.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
-SET_minimal_hardened_multilib_SPECS="hardened/stage4-minimal.spec"
+SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_minimal_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-minimal.spec"
+SET_minimal_hardened_nomultilib_OPTIONAL_SPECS="hardened/stage4-nomultilib-minimal.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-15 5:48 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-15 5:48 UTC (permalink / raw
To: gentoo-commits
commit: 0292a7e2b5e28486380ea1c5eef1ccbd8ca1365b
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 05:48:20 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 05:48:20 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0292a7e2
tools/catalyst-auto-{x86,amd64}: refactor post_build for remote buildhost.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 28 ++++++++++++++++++++--------
tools/catalyst-auto-x86.conf | 32 ++++++++++++++++++++++++--------
2 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a6082de7..53dac821 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -84,31 +84,43 @@ pre_build() {
}
post_build() {
+ cmd=(
+ rsync
+ -e 'ssh -i /root/.ssh/id_rsa'
+ -a
+ --omit-dir-times
+ --delay-updates
+ )
+ case $HOSTNAME in
+ nightheron) DEST=${BUILD_DESTDIR_BASE} ;;
+ *) DEST=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} ;;
+ esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
- mkdir -p ${BUILD_DESTDIR_BASE}
+ mkdir -p ${TMPDIR}/empty
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
- cp $file* ${BUILD_DESTDIR_BASE}
+ "${cmd[@]}" ${file}* ${DEST}
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}
elif [ -f *${TIMESTAMP}*.iso ]; then
- cp *${TIMESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}
fi
popd >/dev/null
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST}/hardened
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} stage{3,4}*${TIMESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
- cp $file* ${BUILD_DESTDIR_BASE}/hardened
+ "${cmd[@]}" $file* ${DEST}/hardened
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}/hardened
elif [ -f *${TIMESTAMP}*.iso ]; then
- cp *${TIMESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}/hardened
fi
}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 4d49b8b4..6ec010ce 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -55,27 +55,43 @@ pre_build() {
}
post_build() {
+ cmd=(
+ rsync
+ -e 'ssh -i /root/.ssh/id_rsa'
+ -a
+ --omit-dir-times
+ --delay-updates
+ )
+ case $HOSTNAME in
+ nightheron) DEST=${BUILD_DESTDIR_BASE} ;;
+ *) DEST=${ARCH}@nightheron.gentoo.org:${BUILD_DESTDIR_BASE} ;;
+ esac
pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
- mkdir -p ${BUILD_DESTDIR_BASE}
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ mkdir -p ${TMPDIR}/empty
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST}
+ for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
if [ -f $file ]; then
- cp $file* ${BUILD_DESTDIR_BASE}
+ "${cmd[@]}" ${file}* ${DEST}
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}
+ elif [ -f *${TIMESTAMP}*.iso ]; then
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}
fi
popd >/dev/null
pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened
- for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ "${cmd[@]}" ${TMPDIR}/empty ${DEST}/hardened
+ for file in $(ls stage{3,4}*{${DATESTAMP},${TIMESTAMP}}*${EXTENSIONS} ); do
if [ -f $file ]; then
- cp $file* ${BUILD_DESTDIR_BASE}/hardened
+ "${cmd[@]}" $file* ${DEST}/hardened
fi
done
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
+ "${cmd[@]}" *${DATESTAMP}*.iso* ${DEST}/hardened
+ elif [ -f *${TIMESTAMP}*.iso ]; then
+ "${cmd[@]}" *${TIMESTAMP}*.iso* ${DEST}/hardened
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-15 3:45 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-15 3:45 UTC (permalink / raw
To: gentoo-commits
commit: 85bac3a8a27f06059acb72d6a3f28b9201fa7e48
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 03:45:09 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 03:45:09 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=85bac3a8
catalyst-auto: only purge tmpdir+autoresume, not pkgdir.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index f605873c..f8533f62 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -360,7 +360,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
- run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -P -c "${CATALYST_CONFIG}" -f "${i}"
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst --purgetmponly -c "${CATALYST_CONFIG}" -f "${i}"
done
update_symlinks
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-15 3:45 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-15 3:45 UTC (permalink / raw
To: gentoo-commits
commit: b7e493b4e4ad6cf6f9367e4b139df042526c21de
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 03:44:41 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 03:44:41 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b7e493b4
catalyst-auto: run trigger_post_build after every successful spec, to export results sooner.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 35443c4a..f605873c 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -115,6 +115,13 @@ catalyst_var() {
(. "${CATALYST_CONFIG}"; echo "${!var}")
}
+trigger_post_build() {
+ if ! run_cmd "${TMPDIR}/log/post_build.log" post_build; then
+ send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log"
+ exit 1
+ fi
+}
+
# Parse args
while [ ${#} -gt 0 ]
do
@@ -334,6 +341,8 @@ for a in "" ${SETS}; do
build_failure=1
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
continue 2
+ else
+ trigger_post_build
fi
done
@@ -344,6 +353,8 @@ for a in "" ${SETS}; do
build_failure=1
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
break
+ else
+ trigger_post_build
fi
done
@@ -355,10 +366,7 @@ for a in "" ${SETS}; do
update_symlinks
done
-if ! run_cmd "${TMPDIR}/log/post_build.log" post_build; then
- send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log"
- exit 1
-fi
+trigger_post_build
if [ ${build_failure} = 0 ]; then
if [[ ${lastrun} -ne 0 ]]; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-15 3:45 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-15 3:45 UTC (permalink / raw
To: gentoo-commits
commit: a5c5c7faad6164bba67530b247662a7f6719d179
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 03:39:33 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 03:39:33 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a5c5c7fa
catalyst-auto-amd64: verbosely update_symlinks.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 82bc147c..87e83fa1 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -70,7 +70,7 @@ update_symlinks() {
-e 's/20\d{6}/latest/g;' \
-e 's/20\d{2}\.\d{2}/latest/g;' \
<<<"$f")
- ln -sf "$f" "$of"
+ ln -svf "$f" "$of"
done
popd >/dev/null
done
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-15 3:45 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-15 3:45 UTC (permalink / raw
To: gentoo-commits
commit: 561af1245fe65a8d9422c36677e97704ca691869
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 15 03:44:07 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 15 03:44:07 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=561af124
catalyst-auto/run_cmd: append logs instead of overwrite
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index ae47f443..35443c4a 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -79,9 +79,9 @@ run_cmd() {
if [ $verbose = 1 ]; then
echo "*** Running command: $*"
- "$@" 2>&1 | tee "${logfile}"
+ "$@" 2>&1 | tee -a "${logfile}"
else
- "$@" &> "${logfile}"
+ "$@" &>> "${logfile}"
fi
# If we used tee above, make sure we pass back up the command's error.
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-08 8:04 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-08 8:04 UTC (permalink / raw
To: gentoo-commits
commit: c19080d5f4c096f89ce17768e1f231b9f1db54b7
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 8 08:04:40 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Dec 8 08:04:40 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c19080d5
catalyst-auto: tweak timestamp.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5676f5c1..82bc147c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -47,7 +47,7 @@ EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
give_latest_from_dates() {
sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
+ sort -k +1 -n -t '~' | \
awk -F\~ \
'BEGIN{i=$1; o=$0};
{ if($1 != i && i != "") { print o; }; i=$1; o=$0; }
@@ -67,6 +67,7 @@ update_symlinks() {
of=$(perl -p \
-e 's/20\d{6}T\d{6}Z/latest/g;' \
-e 's/20\d{6}\d{6}/latest/g;' \
+ -e 's/20\d{6}/latest/g;' \
-e 's/20\d{2}\.\d{2}/latest/g;' \
<<<"$f")
ln -sf "$f" "$of"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-03 21:23 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2017-12-03 21:23 UTC (permalink / raw
To: gentoo-commits
commit: ad4692b02f4a1587110fdef343c005462c266264
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 3 21:23:35 2017 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 21:23:35 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ad4692b0
Drop more stage4-cloud.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 4dc879a6..a3b9f023 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -10,27 +10,23 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="
- multilib cloud_multilib
- nomultilib cloud_nomultilib
+ multilib
+ nomultilib
x32
- hardened_multilib cloud_hardened_multilib
- hardened_nomultilib cloud_hardened_nomultilib
+ hardened_multilib
+ hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux
"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_cloud_multilib_SPECS="stage4-cloud.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
-SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
-SET_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-12-03 21:20 Matt Thode
0 siblings, 0 replies; 460+ messages in thread
From: Matt Thode @ 2017-12-03 21:20 UTC (permalink / raw
To: gentoo-commits
commit: c65a62093029c452f9ca5c266d046caefcfc27fd
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Sun Dec 3 21:20:03 2017 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Sun Dec 3 21:20:03 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=c65a6209
remove stage4 cloud stages from tools/catalyst-auto-amd64.conf
tools/catalyst-auto-amd64.conf | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index ea0a6cea..35bc255d 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -11,21 +11,19 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux"
SETS="
- multilib cloud_multilib minimal_multilib
- nomultilib cloud_nomultilib minimal_nomultilib
+ multilib minimal_multilib
+ nomultilib minimal_nomultilib
x32
- hardened_multilib cloud_hardened_multilib minimal_hardened_multilib
- hardened_nomultilib cloud_hardened_nomultilib minimal_hardened_nomultilib
+ hardened_multilib minimal_hardened_multilib
+ hardened_nomultilib minimal_hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux
"
# systemd
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-SET_cloud_multilib_SPECS="stage4-cloud.spec"
SET_minimal_multilib_SPECS="stage4-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
-SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec"
SET_minimal_nomultilib_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
@@ -35,10 +33,8 @@ SET_systemd_SPECS="stage4-systemd.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
-SET_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec"
SET_minimal_hardened_multilib_SPECS="hardened/stage4-minimal.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec"
SET_minimal_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-minimal.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-03-23 2:16 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2017-03-23 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 9444f99d3dc28ded807e3956235cac19de88d777
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 02:12:54 2017 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 02:12:54 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9444f99d
update armin keys to same root path as others
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index e98fba0d..8edbaf5d 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -40,5 +40,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /space/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* alpha@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* alpha@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 6b7445c8..e41c0e3f 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -41,5 +41,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ppc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ppc@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 85571cc6..2825b9fd 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -45,5 +45,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ppc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ppc@nightheron.gentoo.org:
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-03-23 2:16 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2017-03-23 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 1de39bb16d60c124f187ef1f433abc1b18e6ca96
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 02:14:42 2017 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 02:14:42 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1de39bb1
catalyst-auto: use full system hostname by default
tools/catalyst-auto | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 275a5330..86c654f6 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -175,7 +175,8 @@ REPO_DIR=$(dirname "$(dirname "$(realpath "$0")")")
# Set up defaults that config files can override if they want.
SUBARCH=$(uname -m)
EMAIL_TO="releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org"
-EMAIL_FROM="catalyst@${HOSTNAME:-$(hostname)}"
+# Use full hostname by default as Gentoo servers will reject short names.
+EMAIL_FROM="catalyst@$(hostname -f)"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
doneconfig=0
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2017-03-23 2:16 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2017-03-23 2:16 UTC (permalink / raw
To: gentoo-commits
commit: 16e8a9fdc420072a83617b4400ffda5e71faf471
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 23 02:16:22 2017 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 23 02:16:22 2017 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=16e8a9fd
catalyst-auto: scope ppc upload names
Shouldn't impact current builds, but avoids double uploads when we run
ppc & ppc64 builds on the same system.
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index e41c0e3f..2a20e4c1 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -41,5 +41,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ppc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-ppc-*${DATESTAMP}*.bz2* ppc@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 2825b9fd..fd169306 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -45,5 +45,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ppc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-ppc64-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ppc@nightheron.gentoo.org:
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-12-22 1:20 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-12-22 1:20 UTC (permalink / raw
To: gentoo-commits
commit: e98ae4f69e91b5a0bb06d3fb183c309ae6de959b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 9 04:54:14 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 01:20:03 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e98ae4f6
catalyst-auto: add missing `local body` in send_email
tools/catalyst-auto | 1 +
1 file changed, 1 insertion(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 30fed8f..275a533 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -59,6 +59,7 @@ send_email() {
local subject="${EMAIL_SUBJECT_PREPEND} $1"
local message=$2
local logfile=$3
+ local body
if [ -n "${logfile}" ]; then
body=$(printf '%b\n\n\n' "${message}"; tail -n 200 "${logfile}"; printf '\n\n\nFull build log at %s\n' "${logfile}")
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-12-22 1:20 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-12-22 1:20 UTC (permalink / raw
To: gentoo-commits
commit: ef83c934a8bd2a1e59e0c84ff7dc3342be4685bf
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 9 04:53:03 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 01:20:03 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=ef83c934
catalyst-auto: fix return value passing with run_cmd helper
tools/catalyst-auto | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index ad4a95a..30fed8f 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -82,6 +82,9 @@ run_cmd() {
else
"$@" &> "${logfile}"
fi
+
+ # If we used tee above, make sure we pass back up the command's error.
+ return ${PIPESTATUS[0]}
}
update_symlinks() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-12-22 1:20 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-12-22 1:20 UTC (permalink / raw
To: gentoo-commits
commit: e8186ef489fa1d36d3c8116cb294ff8faf01ac55
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 9 04:51:29 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 01:20:03 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e8186ef4
catalyst-auto: rework run_cmd pass through
Make the logfile the first arg so the rest of the args are the command
to actually run. This allows us to properly quote arguments.
tools/catalyst-auto | 27 ++++++++++++++-------------
1 file changed, 14 insertions(+), 13 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 793e0c6..ad4a95a 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -71,15 +71,16 @@ send_email() {
/usr/sbin/sendmail -f "${EMAIL_FROM}" ${EMAIL_TO//,/ }
}
+# Usage: run_cmd <logfile> <command to run>
run_cmd() {
- local cmd=$1
- local logfile=$2
+ local logfile="$1"
+ shift
if [ $verbose = 1 ]; then
- echo "*** Running command: ${cmd}"
- ${cmd} 2>&1 | tee "${logfile}"
+ echo "*** Running command: $*"
+ "$@" 2>&1 | tee "${logfile}"
else
- ${cmd} &> "${logfile}"
+ "$@" &> "${logfile}"
fi
}
@@ -220,7 +221,7 @@ if ! mkdir -p "${TMPDIR}"/{specs,kconfig,log}; then
exit 1
fi
-if ! run_cmd "pre_build" "${TMPDIR}/log/pre_build.log"; then
+if ! run_cmd "${TMPDIR}/log/pre_build.log" pre_build; then
send_email "Catalyst build error - pre_build" "The pre_build function failed" "${TMPDIR}/log/pre_build.log"
exit 1
fi
@@ -299,15 +300,15 @@ if [[ ${preclean} -eq 1 ]]; then
fi
# Create snapshot
-if ! run_cmd "catalyst -c ${CATALYST_CONFIG} -s ${DATESTAMP}" "${TMPDIR}/log/snapshot.log"; then
+if ! run_cmd "${TMPDIR}/log/snapshot.log" catalyst -c "${CATALYST_CONFIG}" -s "${DATESTAMP}"; then
send_email "Catalyst build error - snapshot" "" "${TMPDIR}/log/snapshot.log"
exit 1
fi
build_failure=0
-timeprefix=""
-which time >/dev/null && timeprefix="time"
+timeprefix=()
+which time >/dev/null && timeprefix=( "time" )
for a in "" ${SETS}; do
if [ -z "${a}" ]; then
@@ -320,7 +321,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -p -c "${CATALYST_CONFIG}" -f "${i}"
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
@@ -330,7 +331,7 @@ for a in "" ${SETS}; do
for i in ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -a -p -c "${CATALYST_CONFIG}" -f "${i}"
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
@@ -340,13 +341,13 @@ for a in "" ${SETS}; do
for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
- run_cmd "${timeprefix} catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
+ run_cmd "${LOGFILE}" "${timeprefix[@]}" catalyst -P -c "${CATALYST_CONFIG}" -f "${i}"
done
update_symlinks
done
-if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then
+if ! run_cmd "${TMPDIR}/log/post_build.log" post_build; then
send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log"
exit 1
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-12-22 1:20 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-12-22 1:20 UTC (permalink / raw
To: gentoo-commits
commit: 6fd55163c02287295e011a3af7d9a4e00d9de012
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 9 04:38:18 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 01:20:03 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=6fd55163
catalyst-auto: reject unknown command line arguments
tools/catalyst-auto | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index f632e9d..6c84aa9 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -148,6 +148,10 @@ do
usage "ERROR: You have specified an invalid option: ${a}"
exit 1
;;
+ *)
+ usage "ERROR: This script takes no arguments: ${a}"
+ exit 1
+ ;;
esac
done
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-12-22 1:20 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-12-22 1:20 UTC (permalink / raw
To: gentoo-commits
commit: d56243723abc19f19ca7e9c586ab12596ea0bfb3
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 9 04:36:17 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 01:20:02 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d5624372
catalyst-auto: drop unused variables
tools/catalyst-auto | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 719c3cc..f632e9d 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -87,21 +87,21 @@ update_symlinks() {
# This is a skeleton function that you can override from the config file.
# It will be called by pre_build and after completing the build of a set
# to ensure the symlinks point to the latest built stages.
- local foo=bar
+ :
}
pre_build() {
# This is a skeleton function that you can override from the config file.
# It will be executed before the build is started. You can use this to
# update the checkout of the releng repo
- local foo=bar
+ :
}
post_build() {
# This is a skeleton function that you can override from the config file.
# It will be executed after the build is successfully completed. You can
# use this to rsync the builds to another box
- local foo=bar
+ :
}
catalyst_var() {
@@ -111,7 +111,6 @@ catalyst_var() {
}
# Parse args
-params=${#}
while [ ${#} -gt 0 ]
do
a=${1}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-12-22 1:20 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-12-22 1:20 UTC (permalink / raw
To: gentoo-commits
commit: 12b23fa07ea78234450010f8a57d31eb8ed143b7
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 9 04:45:55 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Dec 22 01:20:03 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=12b23fa0
catalyst-auto: fix quoting in a number of places
tools/catalyst-auto | 46 +++++++++++++++++++++++-----------------------
1 file changed, 23 insertions(+), 23 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 6c84aa9..793e0c6 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -77,9 +77,9 @@ run_cmd() {
if [ $verbose = 1 ]; then
echo "*** Running command: ${cmd}"
- ${cmd} 2>&1 | tee ${logfile}
+ ${cmd} 2>&1 | tee "${logfile}"
else
- ${cmd} &> ${logfile}
+ ${cmd} &> "${logfile}"
fi
}
@@ -174,13 +174,13 @@ EMAIL_FROM="catalyst@${HOSTNAME:-$(hostname)}"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
doneconfig=0
-for config_file in ${config_files[@]}; do
+for config_file in "${config_files[@]}"; do
# Make sure all required values were specified
if [ -z "${config_file}" -o ! -e "${config_file}" ]; then
usage "ERROR: You must specify a valid config file to use: '$config_file' is not valid"
exit 1
fi
- source ${config_file}
+ source "${config_file}"
doneconfig=1
done
if [[ $doneconfig -eq 0 ]]; then
@@ -202,7 +202,7 @@ if [[ ${lastrun} -ne 0 ]]; then
fi
DATESTAMP=$(date +%Y%m%d)
-TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.${DATESTAMP}.XXXXXX)
+TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" "catalyst-auto.${DATESTAMP}.XXXXXX")
# Nuke any previous tmpdirs to keep them from accumulating.
if [[ ${preclean} -eq 1 ]]; then
@@ -225,7 +225,7 @@ if ! run_cmd "pre_build" "${TMPDIR}/log/pre_build.log"; then
exit 1
fi
-cd ${SPECS_DIR}
+cd "${SPECS_DIR}" || exit 1
for a in "" ${SETS}; do
if [ -z "${a}" ]; then
@@ -237,40 +237,40 @@ for a in "" ${SETS}; do
fi
for i in ${!specs_var} ${!optional_specs_var}; do
- cp --parents ${i} ${TMPDIR}/specs/
+ cp --parents "${i}" "${TMPDIR}"/specs/
done
done
-find ${KCONFIG_DIR} -type f -exec cp {} ${TMPDIR}/kconfig \;
+find "${KCONFIG_DIR}" -type f -exec cp {} "${TMPDIR}"/kconfig \;
-cd ${TMPDIR}/specs
+cd "${TMPDIR}/specs" || exit 1
# Fix up specs with datestamp
for i in $(find -name '*.spec'); do
# Grab current version_stamp and source_subpath
- old_version_stamp=$(grep version_stamp ${i} | sed -e 's|^version_stamp: *||')
- old_source_subpath=$(grep source_subpath ${i} | sed -e 's|^source_subpath: *||')
+ old_version_stamp=$(grep version_stamp "${i}" | sed -e 's|^version_stamp: *||')
+ old_source_subpath=$(grep source_subpath "${i}" | sed -e 's|^source_subpath: *||')
- new_version_stamp=$(echo "${old_version_stamp}" | sed -e 's|^\(.*-\)\?.*$|\1'${DATESTAMP}'|')
- new_source_subpath=$(echo "${old_source_subpath}" | sed -e 's|'${old_version_stamp}'|'${new_version_stamp}'|')
+ new_version_stamp=$(echo "${old_version_stamp}" | sed -e "s|^\(.*-\)\?.*$|\1${DATESTAMP}|")
+ new_source_subpath=$(echo "${old_source_subpath}" | sed -e "s|${old_version_stamp}|${new_version_stamp}|")
- sed -i 's|^version_stamp:.*$|version_stamp: '${new_version_stamp}'|' ${i}
- sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i}
+ sed -i "s|^version_stamp:.*$|version_stamp: ${new_version_stamp}|" "${i}"
+ sed -i "s|^snapshot:.*$|snapshot: ${DATESTAMP}|" "${i}"
# We don't want to mangle the source_subpath for our stage1 spec
- if ! grep -q '^target: *stage[14]$' ${i}; then
- sed -i 's|^source_subpath:.*$|source_subpath: '${new_source_subpath}'|' ${i}
+ if ! grep -q '^target: *stage[14]$' "${i}"; then
+ sed -i "s|^source_subpath:.*$|source_subpath: ${new_source_subpath}|" "${i}"
fi
- sed -i '/^livecd\/iso/s|'${old_version_stamp}'|'${new_version_stamp}'|' ${i}
- sed -i '/^livecd\/volid/s|'${old_version_stamp}'|'${new_version_stamp}'|' ${i}
+ sed -i "/^livecd\/iso/s|${old_version_stamp}|${new_version_stamp}|" "${i}"
+ sed -i "/^livecd\/volid/s|${old_version_stamp}|${new_version_stamp}|" "${i}"
- kconfig_lines=$(grep '^boot/kernel/[^/]\+/config:' ${i})
+ kconfig_lines=$(grep '^boot/kernel/[^/]\+/config:' "${i}")
if [ -n "${kconfig_lines}" ]; then
echo "${kconfig_lines}" | while read line; do
key=$(echo "${line}" | cut -d: -f1)
filename=$(basename $(echo "${line}" | cut -d: -f2))
- sed -i "s|^${key}:.*\$|${key}: ${TMPDIR}/kconfig/${filename}|" ${i}
+ sed -i "s|^${key}:.*\$|${key}: ${TMPDIR}/kconfig/${filename}|" "${i}"
done
fi
@@ -320,7 +320,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
+ run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
@@ -330,7 +330,7 @@ for a in "" ${SETS}; do
for i in ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
+ run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-06-15 1:37 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2016-06-15 1:37 UTC (permalink / raw
To: gentoo-commits
commit: e243f99edf0080848382ddeb6dc5fe9035aef871
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 15 01:29:20 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Jun 15 01:31:06 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e243f99e
catalyst-auto: squelch all pushd/popd
Have some sed magic, including a negative match.
git grep -l -e pushd -e popd \
| xargs sed -i -r \
-e '/(pushd|popd)/{ /null/! { s,$, >/dev/null,g } }'
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-alpha.conf | 4 ++--
tools/catalyst-auto-amd64-experimental.conf | 14 +++++++-------
tools/catalyst-auto-amd64.conf | 14 +++++++-------
tools/catalyst-auto-armv4tl.conf | 4 ++--
tools/catalyst-auto-armv5tel.conf | 4 ++--
tools/catalyst-auto-armv6j.conf | 4 ++--
tools/catalyst-auto-armv6j_hardfp.conf | 4 ++--
tools/catalyst-auto-armv7a.conf | 4 ++--
tools/catalyst-auto-armv7a_hardfp.conf | 4 ++--
tools/catalyst-auto-hppa.conf | 4 ++--
tools/catalyst-auto-ia64.conf | 4 ++--
tools/catalyst-auto-ppc.conf | 4 ++--
tools/catalyst-auto-ppc64.conf | 4 ++--
tools/catalyst-auto-s390.conf | 4 ++--
tools/catalyst-auto-s390x.conf | 4 ++--
tools/catalyst-auto-sparc64.conf | 4 ++--
tools/catalyst-auto-x86-experimental.conf | 14 +++++++-------
tools/catalyst-auto-x86.conf | 14 +++++++-------
18 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index ae5ec8b..e98fba0 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -29,13 +29,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 9317650..4dc879a 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -51,24 +51,24 @@ give_latest_from_dates() {
}
pre_build() {
- pushd ${REPO_DIR}
+ pushd ${REPO_DIR} >/dev/null
git pull
- popd
+ popd >/dev/null
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
post_build() {
- pushd ${BUILD_SRCDIR_BASE}/default
+ pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
@@ -79,9 +79,9 @@ post_build() {
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
fi
- popd
+ popd >/dev/null
- pushd ${BUILD_SRCDIR_BASE}/hardened
+ pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 80bf8b7..ea0a6ce 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -62,25 +62,25 @@ give_latest_from_dates() {
update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
pre_build() {
- pushd ${REPO_DIR}
+ pushd ${REPO_DIR} >/dev/null
git pull
- popd
+ popd >/dev/null
update_symlinks
}
post_build() {
- pushd ${BUILD_SRCDIR_BASE}/default
+ pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
@@ -90,9 +90,9 @@ post_build() {
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi
- popd
+ popd >/dev/null
- pushd ${BUILD_SRCDIR_BASE}/hardened
+ pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}/hardened
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index d37bf1c..75fda24 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -32,13 +32,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 0945ad5..2a02f11 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -32,13 +32,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index ad4c8f5..bf5c3aa 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -32,13 +32,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 845cafa..771f445 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -32,13 +32,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index b3ca018..363188b 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -32,13 +32,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index c30b132..e85ca6c 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -32,13 +32,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 4eb0565..aa5fdde 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -34,7 +34,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for t in hppa1.1 hppa2.0; do
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
@@ -42,7 +42,7 @@ pre_build() {
ln -sf $f $of
done
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index ad7dbd4..fc53d33 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -29,13 +29,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index f5a7e9a..6b7445c 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -30,13 +30,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index d5ef926..85571cc 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -32,7 +32,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for t in ppc64-64ul ppc64-32ul; do
for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
@@ -40,7 +40,7 @@ pre_build() {
ln -sf $f $of
done
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 19a8bac..1f766ee 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -29,13 +29,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 01abfe3..a97a3f7 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -29,13 +29,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 59a75c3..c866c08 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -29,13 +29,13 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index f8beb81..79f310d 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -38,24 +38,24 @@ give_latest_from_dates() {
}
pre_build() {
- pushd ${REPO_DIR}
+ pushd ${REPO_DIR} >/dev/null
git pull
- popd
+ popd >/dev/null
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
post_build() {
- pushd ${BUILD_SRCDIR_BASE}/default
+ pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
@@ -67,9 +67,9 @@ post_build() {
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
- popd
+ popd >/dev/null
- pushd ${BUILD_SRCDIR_BASE}/hardened
+ pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index d613264..4d49b8b 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -38,24 +38,24 @@ give_latest_from_dates() {
}
pre_build() {
- pushd ${REPO_DIR}
+ pushd ${REPO_DIR} >/dev/null
git pull
- popd
+ popd >/dev/null
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- pushd $d
+ pushd $d >/dev/null
for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
done
- popd
+ popd >/dev/null
done
}
post_build() {
- pushd ${BUILD_SRCDIR_BASE}/default
+ pushd ${BUILD_SRCDIR_BASE}/default >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
@@ -65,9 +65,9 @@ post_build() {
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi
- popd
+ popd >/dev/null
- pushd ${BUILD_SRCDIR_BASE}/hardened
+ pushd ${BUILD_SRCDIR_BASE}/hardened >/dev/null
mkdir -p ${BUILD_DESTDIR_BASE}/hardened
for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
if [ -f $file ]; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-05-30 16:13 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2016-05-30 16:13 UTC (permalink / raw
To: gentoo-commits
commit: 3a6d81ff2e6f99df8815719e514f3d30989348fc
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Mon May 30 16:13:32 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon May 30 16:13:32 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a6d81ff
catalyst-auto: do not fail if /usr/bin/time is not present.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index e038898..719c3cc 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -303,6 +303,9 @@ fi
build_failure=0
+timeprefix=""
+which time >/dev/null && timeprefix="time"
+
for a in "" ${SETS}; do
if [ -z "${a}" ]; then
specs_var="SPECS"
@@ -314,7 +317,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
+ run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
@@ -324,7 +327,7 @@ for a in "" ${SETS}; do
for i in ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
+ run_cmd "${timeprefix} catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
@@ -334,7 +337,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
- run_cmd "time catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
+ run_cmd "${timeprefix} catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
done
update_symlinks
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-05-27 20:43 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2016-05-27 20:43 UTC (permalink / raw
To: gentoo-commits
commit: 380990612e39d6f2b319e3b80a49ec9b0bc4ac46
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 20:43:08 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri May 27 20:43:08 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=38099061
catalyst-auto: datestamp tmpdir for ease of debug.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 2598fd5..e038898 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -198,8 +198,8 @@ if [[ ${lastrun} -ne 0 ]]; then
fi
fi
-TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
DATESTAMP=$(date +%Y%m%d)
+TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.${DATESTAMP}.XXXXXX)
# Nuke any previous tmpdirs to keep them from accumulating.
if [[ ${preclean} -eq 1 ]]; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-05-24 2:28 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-05-24 2:28 UTC (permalink / raw
To: gentoo-commits
commit: bc049160cbcf53795384ee48008c2aca480db0e6
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 02:27:18 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue May 24 02:27:18 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bc049160
stage_build.sh: punt unused script
No one seems to use it or ask about it, so punt it until someone notices.
tools/stage_build.sh | 162 ---------------------------------------------------
1 file changed, 162 deletions(-)
diff --git a/tools/stage_build.sh b/tools/stage_build.sh
deleted file mode 100755
index 0dd89a9..0000000
--- a/tools/stage_build.sh
+++ /dev/null
@@ -1,162 +0,0 @@
-#!/bin/bash
-
-PID=$$
-
-profile=
-version_stamp=
-subarch=
-stage1_seed=
-snapshot=
-config=/etc/catalyst/catalyst.conf
-email_from="catalyst@localhost"
-email_to="root@localhost"
-verbose=0
-
-usage() {
- msg=$1
-
- if [ -n "${msg}" ]; then
- echo -e "${msg}\n";
- fi
-
- cat <<EOH
-Usage:
- stage_build [-p|--profile <profile>] [-v|--version-stamp <stamp>]
- [-a|--arch <arch>] [-s|--stage1-seed <seed>] [--verbose]
- [-f|--email-from <from>] [-t|--email-to <to>] [-h|--help]
-
-Options:
- -p|--profile Sets the portage profile (required)
- -v|--version-stamp Sets the version stamp (required)
- -a|--arch Sets the 'subarch' in the spec (required)
- -s|--stage1-seed Sets the seed for the stage1 (required)
- -S|--snapshot Sets the snapshot name (if not given defaults to today's
- date)
- -c|--config catalyst config to use, defaults to catalyst default
- --verbose Send output of commands to console as well as log
- -f|--email-from Sets the 'From' on emails sent from this script (defaults
- to catalyst@localhost)
- -t|--email-to Sets the 'To' on emails sent from this script (defaults
- to root@localhost)
- -h|--help Show this message and quit
-
-Example:
- stage_build -p default-linux/x86/2006.1 -v 2007.0_pre -a i686 -s default/stage3-i686-2006.1
-EOH
-}
-
-send_email() {
- subject="[${subarch}] $1"
- body=$2
-
- echo -e "From: ${email_from}\r\nTo: ${email_to}\r\nSubject: ${subject}\r\n\r\nArch: ${subarch}\r\nProfile: ${profile}\r\nVersion stamp: ${version_stamp}\r\nStage1 seed: ${stage1_seed}\r\nSnapshot: ${snapshot}\r\n\r\n${body}\r\n" | /usr/sbin/sendmail -f ${email_from} ${email_to}
-}
-
-run_cmd() {
- cmd=$1
- logfile=$2
-
- if [ $verbose = 1 ]; then
- ${cmd} 2>&1 | tee ${logfile}
- else
- ${cmd} &> ${logfile}
- fi
-}
-
-# Parse args
-params=${#}
-while [ ${#} -gt 0 ]
-do
- a=${1}
- shift
- case "${a}" in
- -h|--help)
- usage
- exit 0
- ;;
- -p|--profile)
- profile=$1
- shift
- ;;
- -v|--version-stamp)
- version_stamp=$1
- shift
- ;;
- -a|--arch)
- subarch=$1
- shift
- ;;
- -f|--email-from)
- email_from=$1
- shift
- ;;
- -t|--email-to)
- email_to=$1
- shift
- ;;
- -s|--stage1-seed)
- stage1_seed=$1
- shift
- ;;
- -S|--snapshot)
- snapshot=$1
- shift
- ;;
- -c|--config)
- config=$1
- shift
- ;;
- --verbose)
- verbose=1
- ;;
- -*)
- echo "You have specified an invalid option: ${a}"
- usage
- exit 1
- ;;
- esac
-done
-
-# Make sure all required values were specified
-if [ -z "${profile}" ]; then
- usage "You must specify a profile."
- exit 1
-fi
-if [ -z "${version_stamp}" ]; then
- usage "You must specify a version stamp."
- exit 1
-fi
-if [ -z "${subarch}" ]; then
- usage "You must specify an arch."
- exit 1
-fi
-if [ -z "${stage1_seed}" ]; then
- usage "You must specify a stage1 seed."
- exit 1
-fi
-cd /tmp
-
-if [ -z "${snapshot}" ]; then
- snapshot=`date +%Y%m%d`
- run_cmd "catalyst -c ${config} -s '${snapshot}'" "/tmp/catalyst_build_snapshot.${PID}.log"
- if [ $? != 0 ]; then
- send_email "Catalyst build error - snapshot" "$(</tmp/catalyst_build_snapshot.${PID}.log)"
- exit 1
- fi
-fi
-
-for i in 1 2 3; do
- echo -e "subarch: ${subarch}\ntarget: stage${i}\nversion_stamp: ${version_stamp}\nrel_type: default\nprofile: ${profile}\nsnapshot: ${snapshot}" > stage${i}.spec
- if [ ${i} = 1 ]; then
- echo "source_subpath: ${stage1_seed}" >> stage${i}.spec
- else
- echo "source_subpath: default/stage$(expr ${i} - 1)-${subarch}-${version_stamp}" >> stage${i}.spec
- fi
- run_cmd "catalyst -a -p -c ${config} -f stage${i}.spec" "/tmp/catalyst_build_stage${i}.${PID}.log"
- if [ $? != 0 ]; then
- send_email "Catalyst build error - stage${i}" "$(tail -n 200 /tmp/catalyst_build_stage${i}.${PID}.log)\r\n\r\nFull build log at /tmp/catalyst_build_stage${i}.${PID}.log"
- exit 1
- fi
-done
-
-send_email "Catalyst build success" "Everything finished successfully."
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-05-24 2:05 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-05-24 2:05 UTC (permalink / raw
To: gentoo-commits
commit: d97b2662fa789f2b6962320061c9c1315e0f9344
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 02:02:22 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue May 24 02:02:22 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=d97b2662
catalyst-auto: use `local` in a few more places
tools/catalyst-auto | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index de1b10d..2598fd5 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -56,9 +56,9 @@ EOH
}
send_email() {
- subject="${EMAIL_SUBJECT_PREPEND} $1"
- message=$2
- logfile=$3
+ local subject="${EMAIL_SUBJECT_PREPEND} $1"
+ local message=$2
+ local logfile=$3
if [ -n "${logfile}" ]; then
body=$(printf '%b\n\n\n' "${message}"; tail -n 200 "${logfile}"; printf '\n\n\nFull build log at %s\n' "${logfile}")
@@ -72,8 +72,8 @@ send_email() {
}
run_cmd() {
- cmd=$1
- logfile=$2
+ local cmd=$1
+ local logfile=$2
if [ $verbose = 1 ]; then
echo "*** Running command: ${cmd}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-05-24 2:05 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-05-24 2:05 UTC (permalink / raw
To: gentoo-commits
commit: b86673c79105fa3cfd5ec84e6d1e052587f9f96b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue May 24 02:00:31 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue May 24 02:00:31 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b86673c7
catalyst-auto: convert `echo -e` to `printf`
Makes the code a bit more robust.
tools/catalyst-auto | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index beb7aa8..de1b10d 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -61,12 +61,14 @@ send_email() {
logfile=$3
if [ -n "${logfile}" ]; then
- body=$(echo -e "${message}\n\n"; tail -n 200 "${logfile}"; echo -e "\n\n\nFull build log at ${logfile}")
+ body=$(printf '%b\n\n\n' "${message}"; tail -n 200 "${logfile}"; printf '\n\n\nFull build log at %s\n' "${logfile}")
else
body=${message}
fi
- echo -e "From: ${EMAIL_FROM}\r\nTo: ${EMAIL_TO}\r\nSubject: ${subject}\r\n\r\n${body}" | /usr/sbin/sendmail -f ${EMAIL_FROM} ${EMAIL_TO//,/ }
+ printf 'From: %s\r\nTo: %s\r\nSubject: %s\r\n\r\n%b' \
+ "${EMAIL_FROM}" "${EMAIL_TO}" "${subject}" "${body}" | \
+ /usr/sbin/sendmail -f "${EMAIL_FROM}" ${EMAIL_TO//,/ }
}
run_cmd() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-05-07 20:04 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-05-07 20:04 UTC (permalink / raw
To: gentoo-commits
commit: 1294da69329b3541c50d96b09eb6249f5150ea91
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sat May 7 20:04:33 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sat May 7 20:04:33 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1294da69
catalyst-auto: try to fix syntax error in previous commits
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 101cf82..51e0c16 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -253,7 +253,7 @@ for i in $(find -name '*.spec'); do
sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i}
# We don't want to mangle the source_subpath for our stage1 spec
- if ! [[ grep -q '^target: *stage1$' ${i} || grep -q '^target: *stage4$' ${i} ]]; then
+ if ! grep -q '^target: *stage[14]$' ${i}; then
sed -i 's|^source_subpath:.*$|source_subpath: '${new_source_subpath}'|' ${i}
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-05-06 18:32 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2016-05-06 18:32 UTC (permalink / raw
To: gentoo-commits
commit: 56e7e887ecc07f873e3ae5a668cf63ba6be290a0
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri May 6 18:30:25 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri May 6 18:30:25 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=56e7e887
catalyst-auto: fix whitespace.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cc4da35..101cf82 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -253,7 +253,7 @@ for i in $(find -name '*.spec'); do
sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i}
# We don't want to mangle the source_subpath for our stage1 spec
- if ! [[grep -q '^target: *stage1$' ${i} || grep -q '^target: *stage4$' ${i} ]]; then
+ if ! [[ grep -q '^target: *stage1$' ${i} || grep -q '^target: *stage4$' ${i} ]]; then
sed -i 's|^source_subpath:.*$|source_subpath: '${new_source_subpath}'|' ${i}
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-05-05 10:10 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2016-05-05 10:10 UTC (permalink / raw
To: gentoo-commits
commit: bac6e3a2d70d1c757f4ee3a51dcad1ef89cca922
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu May 5 10:07:20 2016 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu May 5 10:07:20 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bac6e3a2
Move the code to update symlinks to a separate function, call it from pre_build and after each set build.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto | 10 +++++++++-
tools/catalyst-auto-amd64.conf | 13 ++++++++-----
2 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index b928ac9..cc4da35 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -81,6 +81,13 @@ run_cmd() {
fi
}
+update_symlinks() {
+ # This is a skeleton function that you can override from the config file.
+ # It will be called by pre_build and after completing the build of a set
+ # to ensure the symlinks point to the latest built stages.
+ local foo=bar
+}
+
pre_build() {
# This is a skeleton function that you can override from the config file.
# It will be executed before the build is started. You can use this to
@@ -246,7 +253,7 @@ for i in $(find -name '*.spec'); do
sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i}
# We don't want to mangle the source_subpath for our stage1 spec
- if ! grep -q '^target: *stage1$' ${i}; then
+ if ! [[grep -q '^target: *stage1$' ${i} || grep -q '^target: *stage4$' ${i} ]]; then
sed -i 's|^source_subpath:.*$|source_subpath: '${new_source_subpath}'|' ${i}
fi
@@ -329,6 +336,7 @@ for a in "" ${SETS}; do
run_cmd "time catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
done
+ update_symlinks
done
if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 48dd9cf..80bf8b7 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -59,11 +59,7 @@ give_latest_from_dates() {
tr '~' '-'
}
-pre_build() {
- pushd ${REPO_DIR}
- git pull
- popd
-
+update_symlinks() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
@@ -76,6 +72,13 @@ pre_build() {
done
}
+pre_build() {
+ pushd ${REPO_DIR}
+ git pull
+ popd
+ update_symlinks
+}
+
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
mkdir -p ${BUILD_DESTDIR_BASE}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-04-29 18:20 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2016-04-29 18:20 UTC (permalink / raw
To: gentoo-commits
commit: a77a4ebce59e97e9f32ad61e77be545c477a2855
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 29 18:20:28 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Apr 29 18:20:28 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a77a4ebc
catalyst-auto: Record how long the catalyst runs take.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 823b9f2..b928ac9 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -306,7 +306,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
+ run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst fatal build error - ${i}" "" "${LOGFILE}"
@@ -316,7 +316,7 @@ for a in "" ${SETS}; do
for i in ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::').log"
- run_cmd "catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
+ run_cmd "time catalyst -a -p -c ${CATALYST_CONFIG} -f ${i}" ${LOGFILE}
if [ $? != 0 ]; then
build_failure=1
send_email "Catalyst non-fatal build error - ${i}" "" "${LOGFILE}"
@@ -326,7 +326,7 @@ for a in "" ${SETS}; do
for i in ${!specs_var} ${!optional_specs_var}; do
LOGFILE="${TMPDIR}/log/$(echo "${i}" | sed -e 's:/:_:' -e 's:\.spec$::')_purge.log"
- run_cmd "catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
+ run_cmd "time catalyst -P -c ${CATALYST_CONFIG} -f ${i}" "${LOGFILE}"
done
done
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-04-27 21:34 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2016-04-27 21:34 UTC (permalink / raw
To: gentoo-commits
commit: fadbc54d952765619e7cab35e294cbfe172d8eaf
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 21:33:38 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 21:34:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fadbc54d
tools: Add a config that filters to stage4 only.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
...-amd64-stage4.conf => catalyst-auto-filter-stage4only.conf} | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/tools/catalyst-auto-amd64-stage4.conf b/tools/catalyst-auto-filter-stage4only.conf
similarity index 64%
rename from tools/catalyst-auto-amd64-stage4.conf
rename to tools/catalyst-auto-filter-stage4only.conf
index 7341046..a41e4bd 100644
--- a/tools/catalyst-auto-amd64-stage4.conf
+++ b/tools/catalyst-auto-filter-stage4only.conf
@@ -1,13 +1,8 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-B=`readlink -f $0`
-BASECONF=${B/-daily}
-if [ ! -e $BASECONF ]; then
- echo "Could not find base config from $B" 1>&2
- exit 1
-fi
-source ${BASECONF}
+# This configuration does not set any builds of it's own, but rather removes
+# everything EXCEPT stage4 builds.
for s in $SETS ; do
var=SET_${s}_SPECS
val=${!var}
@@ -19,6 +14,5 @@ for s in $SETS ; do
done
eval "export $var='${newval}'"
done
-printenv |grep SET
# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-04-27 1:59 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2016-04-27 1:59 UTC (permalink / raw
To: gentoo-commits
commit: 407605789e064db87d803b98c220e2fd2f7fbe53
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 27 01:58:51 2016 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Apr 27 01:58:51 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=40760578
Change copy logic.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 29 +++++++++++++++++++----------
tools/catalyst-auto-x86-experimental.conf | 28 ++++++++++++++++++----------
2 files changed, 37 insertions(+), 20 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 817c953..9317650 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -69,23 +69,32 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${TYPE}/${ARCH}/default/${DATESTAMP}
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
- if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
+ done
+
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
+
+
}
# vim:ft=sh:
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 379adc0..f8beb81 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -56,22 +56,30 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- if [ -f *${DATESTAMP}*.iso* ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
+ done
+
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
- if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
+ done
+
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-04-26 22:35 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2016-04-26 22:35 UTC (permalink / raw
To: gentoo-commits
commit: 11c84ac57d237be3aeccc69fe0d9d92b655618ce
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 22:35:19 2016 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 22:35:19 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=11c84ac5
Whitespace. Stop hardcoding the bz2 extension and sync updates to the scripts to the experimental scripts.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64-experimental.conf | 22 +++++++++++++++++-----
tools/catalyst-auto-amd64.conf | 4 ++--
tools/catalyst-auto-ia64.conf | 1 -
tools/catalyst-auto-s390.conf | 1 -
tools/catalyst-auto-s390x.conf | 1 -
tools/catalyst-auto-sparc64.conf | 2 --
tools/catalyst-auto-x86-experimental.conf | 11 +++++++++--
7 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 3f2bd16..817c953 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -9,18 +9,28 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
-#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux"
-SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
+SETS="
+ multilib cloud_multilib
+ nomultilib cloud_nomultilib
+ x32
+ hardened_multilib cloud_hardened_multilib
+ hardened_nomultilib cloud_hardened_nomultilib
+ hardened_multilib_selinux hardened_nomultilib_selinux
+"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_cloud_multilib_SPECS="stage4-cloud.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
+SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
+SET_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
+SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
@@ -28,12 +38,14 @@ SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec h
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
END { print o; };' | \
tr '~' '-'
}
@@ -46,7 +58,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 279ddfd..48dd9cf 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -53,8 +53,8 @@ give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
END { print o; };' | \
tr '~' '-'
}
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 20c8820..8d7e3e5 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -12,7 +12,6 @@ OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/ia64
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 7e37997..f87fb03 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -12,7 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 39047e7..24a1384 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -12,7 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 72ade0a..2f1834a 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -12,8 +12,6 @@ SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.sp
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_SUBJECT_PREPEND="[sparc64-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index ece0e5a..379adc0 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -9,10 +9,15 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
-SETS="i486 i686 hardened"
+SETS="
+ i486
+ i686
+ hardened
+"
SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
@@ -20,6 +25,8 @@ SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@@ -38,7 +45,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-04-26 21:46 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2016-04-26 21:46 UTC (permalink / raw
To: gentoo-commits
commit: f5d7bfff3a4acf71e2990b824ab8e8c2c330bb4d
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 21:46:07 2016 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 21:46:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f5d7bfff
Whitespace.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-armv4tl.conf | 1 -
tools/catalyst-auto-armv5tel.conf | 1 -
tools/catalyst-auto-armv6j.conf | 1 -
tools/catalyst-auto-armv6j_hardfp.conf | 1 -
tools/catalyst-auto-armv7a.conf | 1 -
tools/catalyst-auto-armv7a_hardfp.conf | 1 -
6 files changed, 6 deletions(-)
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index f49b457..da46a4b 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -15,7 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index b6a0924..882d555 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -15,7 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 4048d84..56891ba 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -15,7 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 7a5ab2e..55e7eb0 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -15,7 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 0e67b76..bf1d626 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -15,7 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index 2095001..f95c539 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -15,7 +15,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-04-26 21:11 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2016-04-26 21:11 UTC (permalink / raw
To: gentoo-commits
commit: dda6889241e86d11f917c66a8df1883a0d315b2f
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 26 21:10:03 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Apr 26 21:10:03 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=dda68892
tools: stage4-only config that loads base amd64 config to avoid duplication
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto-amd64-stage4.conf | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)
diff --git a/tools/catalyst-auto-amd64-stage4.conf b/tools/catalyst-auto-amd64-stage4.conf
new file mode 100644
index 0000000..7341046
--- /dev/null
+++ b/tools/catalyst-auto-amd64-stage4.conf
@@ -0,0 +1,24 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+B=`readlink -f $0`
+BASECONF=${B/-daily}
+if [ ! -e $BASECONF ]; then
+ echo "Could not find base config from $B" 1>&2
+ exit 1
+fi
+source ${BASECONF}
+for s in $SETS ; do
+ var=SET_${s}_SPECS
+ val=${!var}
+ newval=
+ for spec in $val ; do
+ case $spec in
+ *stage4*) newval="${newval} $spec" ;;
+ esac
+ done
+ eval "export $var='${newval}'"
+done
+printenv |grep SET
+
+# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-27 5:33 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-03-27 5:33 UTC (permalink / raw
To: gentoo-commits
commit: 08a69c4392ff7b85bf02675d074d73348810af24
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 27 05:31:30 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 27 05:31:30 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=08a69c43
catalyst-auto: move default email settings to main script
tools/catalyst-auto | 6 ++++++
tools/catalyst-auto-alpha.conf | 7 -------
tools/catalyst-auto-armv4tl.conf | 2 --
tools/catalyst-auto-armv5tel.conf | 2 --
tools/catalyst-auto-armv6j.conf | 2 --
tools/catalyst-auto-armv6j_hardfp.conf | 2 --
tools/catalyst-auto-armv7a.conf | 2 --
tools/catalyst-auto-armv7a_hardfp.conf | 2 --
tools/catalyst-auto-hppa.conf | 2 --
tools/catalyst-auto-ia64.conf | 3 ---
tools/catalyst-auto-ppc.conf | 2 --
tools/catalyst-auto-ppc64.conf | 2 --
tools/catalyst-auto-s390.conf | 4 ----
tools/catalyst-auto-s390x.conf | 4 ----
tools/catalyst-auto-sparc64.conf | 2 --
15 files changed, 6 insertions(+), 38 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index cc20505..00d8250 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -155,6 +155,12 @@ fi
# Probe the default gitdir from this script name.
GITDIR=$(dirname "$(dirname "$(realpath "$0")")")
+# Set up defaults that config files can override if they want.
+SUBARCH=$(uname -m)
+EMAIL_TO="releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org"
+EMAIL_FROM="catalyst@${HOSTNAME:-$(hostname)}"
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
+
doneconfig=0
for config_file in ${config_files[@]}; do
# Make sure all required values were specified
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 5035345..601f9ef 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/space/armin76/releng
-
SPECS_DIR=${GITDIR}/releases/weekly/specs/alpha
SPECS="stage1.spec stage2.spec stage3.spec"
@@ -14,11 +12,6 @@ OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/alpha
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-#EMAIL_FROM=catalyst@monolith.alpha.dev.gentoo.org
-EMAIL_FROM=armin76@gentoo.org
-EMAIL_SUBJECT_PREPEND="[alpha-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index 410b61d..f49b457 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 0acc94f..b6a0924 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 019dab1..4048d84 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 1ab7569..7a5ab2e 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index 462ae68..0e67b76 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index bdb0114..2095001 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -13,8 +13,6 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 77939d0..f87b60b 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -15,8 +15,6 @@ SET_hppa_netboot_SPECS="netboot2-hppa32.spec netboot2-hppa64.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/hppa
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@hake.hppa.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
give_latest_from_dates() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b065af2..20c8820 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -12,9 +12,6 @@ OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/ia64
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@guppy.ia64.dev.gentoo.org
-EMAIL_SUBJECT_PREPEND="[ia64-auto]"
give_latest_from_dates() {
sed 's,-20,~20,g' | \
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index a65e21b..6822ef0 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -12,8 +12,6 @@ SPECS="stage1.spec stage2.spec stage3.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/powerpc
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ppc-auto]"
give_latest_from_dates() {
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 4600771..7a4a970 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -13,8 +13,6 @@ OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/powerpc
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ppc64-auto]"
give_latest_from_dates() {
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 6301ee1..7e37997 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -12,10 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@$(hostname)
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index ce22af9..39047e7 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -12,10 +12,6 @@ SET_netboot_SPECS="netboot/netboot.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@$(hostname)
-EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 5a8ab0c..72ade0a 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -12,8 +12,6 @@ SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.sp
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@bender.sparc.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[sparc64-auto]"
give_latest_from_dates() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-24 5:26 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-03-24 5:26 UTC (permalink / raw
To: gentoo-commits
commit: bc16472a156e4edf40d38251bb59e2bbc79c79a5
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 05:25:28 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 05:25:28 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bc16472a
catalyst-auto: allow configs to set BUILD_SRCDIR_BASE
At least the amd64/x86 ones do this via ../config/build.env files.
tools/catalyst-auto | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 75f6a84..cc20505 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -170,7 +170,8 @@ if [[ $doneconfig -eq 0 ]]; then
exit 1
fi
-BUILD_SRCDIR_BASE=$(catalyst_var storedir)
+# Some configs will set this explicitly, so don't clobber it.
+: ${BUILD_SRCDIR_BASE:=$(catalyst_var storedir)}
# See if we had a recent success.
if [[ ${lastrun} -ne 0 ]]; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-24 3:30 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2016-03-24 3:30 UTC (permalink / raw
To: gentoo-commits
commit: 32af29f06ee97b90ef79645e3a8943afa7f4462a
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 24 03:30:32 2016 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Mar 24 03:30:32 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=32af29f0
Whitespace.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-x86.conf | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 9b60c81..d613264 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -9,10 +9,15 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
-SETS="i486 i686 hardened"
+SETS="
+ i486
+ i686
+ hardened
+"
SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-23 18:23 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-03-23 18:23 UTC (permalink / raw
To: gentoo-commits
commit: 51b8860d23dd16bd51d6e87a0d13d2bb6ae27073
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 23 18:20:52 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 23 18:20:52 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=51b8860d
catalyst-auto: add an option to hold a lock while running
This makes it easy to put into a cronjob and not worry about a copy
already/still running.
tools/catalyst-auto | 17 +++++++++++++++++
1 file changed, 17 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 0b1c389..75f6a84 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -26,6 +26,7 @@ keep_tmpdir=0
testing=0
preclean=0
lastrun=0
+lock_file=
# Set pipefail so that run_cmd returns the right value in $?
set -o pipefail
@@ -48,6 +49,7 @@ Options:
-k|--keep-tmpdir Don't remove temp dir when build finishes
-t|--test Stop after mangling specs and copying files
--interval <days> Exit if last successful run was less than <days> ago
+ -l|--lock <file> File to grab a lock on to prevent multiple invocations
-h|--help Show this message and quit
EOH
@@ -130,6 +132,10 @@ do
lastrun=$1
shift
;;
+ -l|--lock)
+ lock_file=$1
+ shift
+ ;;
-*)
usage "ERROR: You have specified an invalid option: ${a}"
exit 1
@@ -137,6 +143,15 @@ do
esac
done
+(
+
+if [[ -n ${lock_file} ]]; then
+ if ! flock -n 9; then
+ echo "catalyst-auto already running"
+ exit 1
+ fi
+fi
+
# Probe the default gitdir from this script name.
GITDIR=$(dirname "$(dirname "$(realpath "$0")")")
@@ -331,3 +346,5 @@ if [ ${build_failure} = 0 ]; then
else
send_email "Catalyst build complete, but with errors" "Build process has completed, but there were errors. Please consult previous emails to determine the problem."
fi
+
+) 9>"${lock_file:-/dev/null}"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-22 16:46 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-03-22 16:46 UTC (permalink / raw
To: gentoo-commits
commit: fdc39e249cfe9dc956ebd3f04f33a1f5636548f8
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 22 16:46:36 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Tue Mar 22 16:46:36 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=fdc39e24
catalyst-auto: minor word smithing
tools/catalyst-auto | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index f20aa1d..0b1c389 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -187,7 +187,7 @@ if ! mkdir -p "${TMPDIR}"/{specs,kconfig,log}; then
fi
if ! run_cmd "pre_build" "${TMPDIR}/log/pre_build.log"; then
- send_email "Catalyst build error - pre_build" "Your pre_build function sucks" "${TMPDIR}/log/pre_build.log"
+ send_email "Catalyst build error - pre_build" "The pre_build function failed" "${TMPDIR}/log/pre_build.log"
exit 1
fi
@@ -309,7 +309,7 @@ for a in "" ${SETS}; do
done
if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then
- send_email "Catalyst build error - post_build" "Your post_build function sucks" "${TMPDIR}/log/post_build.log"
+ send_email "Catalyst build error - post_build" "The post_build function failed" "${TMPDIR}/log/post_build.log"
exit 1
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-22 1:48 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-03-22 1:48 UTC (permalink / raw
To: gentoo-commits
commit: a85f4327c67f66501a4332d1a1a1617f3a26ec3b
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 05:21:05 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 05:21:05 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=a85f4327
catalyst-auto: unify catalyst.conf parsing
tools/catalyst-auto | 9 +++++++++
tools/catalyst-auto-alpha.conf | 4 ----
tools/catalyst-auto-armv4tl.conf | 4 ----
tools/catalyst-auto-armv5tel.conf | 4 ----
tools/catalyst-auto-armv6j.conf | 4 ----
tools/catalyst-auto-armv6j_hardfp.conf | 4 ----
tools/catalyst-auto-armv7a.conf | 4 ----
tools/catalyst-auto-armv7a_hardfp.conf | 4 ----
tools/catalyst-auto-hppa.conf | 4 ----
tools/catalyst-auto-ia64.conf | 4 ----
tools/catalyst-auto-ppc.conf | 4 ----
tools/catalyst-auto-ppc64.conf | 4 ----
tools/catalyst-auto-s390.conf | 4 ----
tools/catalyst-auto-s390x.conf | 4 ----
tools/catalyst-auto-sparc64.conf | 4 ----
15 files changed, 9 insertions(+), 56 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 3d0b419..70755d5 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -17,6 +17,8 @@ if [[ -z ${UNSHARE} ]] ; then
fi
unset UNSHARE
+CATALYST_CONFIG=/etc/catalyst/catalyst.conf
+
declare -a config_files
config_files=()
verbose=0
@@ -87,6 +89,12 @@ post_build() {
local foo=bar
}
+catalyst_var() {
+ # Extract a setting from the catalyst.conf.
+ local var=$1
+ (. "${CATALYST_CONFIG}"; echo "${!var}")
+}
+
# Parse args
params=${#}
while [ ${#} -gt 0 ]
@@ -136,6 +144,7 @@ if [[ $doneconfig -eq 0 ]]; then
exit 1
fi
+BUILD_SRCDIR_BASE=$(catalyst_var storedir)
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
DATESTAMP=$(date +%Y%m%d)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 5a698cf..5035345 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -19,10 +19,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=armin76@gentoo.org
EMAIL_SUBJECT_PREPEND="[alpha-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index e5328d2..410b61d 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index ebcf494..0acc94f 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 0dc8ffa..019dab1 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index cfb669f..1ab7569 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index a1e6689..462ae68 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index f2b5aa0..bdb0114 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -18,10 +18,6 @@ EMAIL_FROM=catalyst@replaceme.local
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 17bab7a..77939d0 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -19,10 +19,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@hake.hppa.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[hppa-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 684c60c..b065af2 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -16,10 +16,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@guppy.ia64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ia64-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 44ecae7..a65e21b 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -16,10 +16,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ppc-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index b726e7e..4600771 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -17,10 +17,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ppc64-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index 9f59c2b..6301ee1 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -17,10 +17,6 @@ EMAIL_FROM=catalyst@$(hostname)
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 13ba079..ce22af9 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -17,10 +17,6 @@ EMAIL_FROM=catalyst@$(hostname)
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 4d56b0f..5a8ab0c 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -16,10 +16,6 @@ EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@bender.sparc.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[sparc64-auto]"
-CATALYST_CONFIG=/etc/catalyst/catalyst.conf
-
-BUILD_SRCDIR_BASE=`grep storedir= $CATALYST_CONFIG | cut -d '=' -f2 | sed -e 's/"//g'`
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-22 1:48 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-03-22 1:48 UTC (permalink / raw
To: gentoo-commits
commit: 880a1aa775fd7cc6890074b1baab43ef4b29c31c
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 05:27:34 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 05:27:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=880a1aa7
catalyst-auto: add a preclean option to trim temp files
This makes it easier to cronjob things w/out needing manual cleanup
from time to time by people.
tools/catalyst-auto | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 70755d5..a018dc9 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -24,6 +24,7 @@ config_files=()
verbose=0
keep_tmpdir=0
testing=0
+preclean=0
# Set pipefail so that run_cmd returns the right value in $?
set -o pipefail
@@ -41,6 +42,7 @@ Usage:
Options:
-c|--config Specifies the config file to use (required)
+ -C|--preclean Clean up loose artifacts from previous runs
-v|--verbose Send output of commands to console as well as log
-k|--keep-tmpdir Don't remove temp dir when build finishes
-t|--test Stop after mangling specs and copying files
@@ -119,6 +121,9 @@ do
-t|--test)
testing=1
;;
+ -C|--preclean)
+ preclean=1
+ ;;
-*)
usage "ERROR: You have specified an invalid option: ${a}"
exit 1
@@ -149,6 +154,12 @@ BUILD_SRCDIR_BASE=$(catalyst_var storedir)
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
DATESTAMP=$(date +%Y%m%d)
+# Nuke any previous tmpdirs to keep them from accumulating.
+if [[ ${preclean} -eq 1 ]]; then
+ rm -rf "${TMPDIR%.??????}".*
+ mkdir "${TMPDIR}"
+fi
+
if [ ${verbose} = 1 ]; then
echo "TMPDIR = ${TMPDIR}"
echo "DATESTAMP = ${DATESTAMP}"
@@ -225,6 +236,18 @@ if [ "${testing}" -eq 1 ]; then
exit
fi
+if [[ ${preclean} -eq 1 ]]; then
+ snapshot_cache=$(catalyst_var snapshot_cache)
+ if [[ -z ${snapshot_cache} ]]; then
+ echo "error: snapshot_cache not set in config file"
+ exit 1
+ fi
+ pushd "${BUILD_SRCDIR_BASE}" >/dev/null || exit 1
+ rm -rf --one-file-system \
+ kerncache packages snapshots tmp "${snapshot_cache}"/*
+ popd >/dev/null
+fi
+
# Create snapshot
if ! run_cmd "catalyst -c ${CATALYST_CONFIG} -s ${DATESTAMP}" "${TMPDIR}/log/snapshot.log"; then
send_email "Catalyst build error - snapshot" "" "${TMPDIR}/log/snapshot.log"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-22 1:48 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-03-22 1:48 UTC (permalink / raw
To: gentoo-commits
commit: f34a62d0ab062674ba70d60611c35e88dc60c112
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 21 05:34:12 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Mar 21 05:34:12 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=f34a62d0
catalyst-auto: add a time delay option
We usually run catalyst on systems via cronjob, and do so at weekly
(or so) intervals. But if a failure hits a run, it will be a while
before we know if changes fixed the situation. Instead, let's push
the delay logic into the script itself so we can run this tool once
a day. When it passes, it will take care of quitting early. When
it fails, it will retry once a day until it passes.
tools/catalyst-auto | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index a018dc9..f20aa1d 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -25,6 +25,7 @@ verbose=0
keep_tmpdir=0
testing=0
preclean=0
+lastrun=0
# Set pipefail so that run_cmd returns the right value in $?
set -o pipefail
@@ -46,6 +47,7 @@ Options:
-v|--verbose Send output of commands to console as well as log
-k|--keep-tmpdir Don't remove temp dir when build finishes
-t|--test Stop after mangling specs and copying files
+ --interval <days> Exit if last successful run was less than <days> ago
-h|--help Show this message and quit
EOH
@@ -124,6 +126,10 @@ do
-C|--preclean)
preclean=1
;;
+ --interval)
+ lastrun=$1
+ shift
+ ;;
-*)
usage "ERROR: You have specified an invalid option: ${a}"
exit 1
@@ -151,6 +157,16 @@ fi
BUILD_SRCDIR_BASE=$(catalyst_var storedir)
+# See if we had a recent success.
+if [[ ${lastrun} -ne 0 ]]; then
+ last_success_file="${BUILD_SRCDIR_BASE}/.last_success"
+ delay=$(( lastrun * 24 * 60 * 60 ))
+ last_success=$(head -1 "${last_success_file}" 2>/dev/null || echo 0)
+ if [[ $(date +%s) -lt $(( last_success + delay )) ]]; then
+ exit 0
+ fi
+fi
+
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
DATESTAMP=$(date +%Y%m%d)
@@ -298,6 +314,11 @@ if ! run_cmd "post_build" "${TMPDIR}/log/post_build.log"; then
fi
if [ ${build_failure} = 0 ]; then
+ if [[ ${lastrun} -ne 0 ]]; then
+ stamp=$(date)
+ (date -d"${stamp}" +%s; echo "${stamp}") >"${last_success_file}"
+ fi
+
send_email "Catalyst build success" "Build process complete."
if [ "${keep_tmpdir}" = 0 ]; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-20 20:15 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-03-20 20:15 UTC (permalink / raw
To: gentoo-commits
commit: 0f867a3dfd535bca768ecfff7440820edc855a48
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 20 20:08:57 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Sun Mar 20 20:08:57 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0f867a3d
catalyst-auto: use automatic GITDIR for ppc/ppc64/sparc64
tools/catalyst-auto-ppc.conf | 2 --
tools/catalyst-auto-ppc64.conf | 2 --
tools/catalyst-auto-sparc64.conf | 2 --
3 files changed, 6 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 79387a1..44ecae7 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/home/armin76/releng
-
SPECS_DIR=${GITDIR}/releases/weekly/specs/ppc/ppc32
SPECS="stage1.spec stage2.spec stage3.spec"
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index ff78a0c..b726e7e 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/home/armin76/releng
-
SPECS_DIR=${GITDIR}/releases/weekly/specs/ppc/ppc64
SPECS="stage1-32ul.spec stage2-32ul.spec stage3-32ul.spec stage1-64ul.spec stage2-64ul.spec stage3-64ul.spec"
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 92e4773..4d56b0f 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/root/releng/
-
SPECS_DIR=${GITDIR}/releases/weekly/specs/sparc/sparc64
SETS="default multilib"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-16 21:28 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2016-03-16 21:28 UTC (permalink / raw
To: gentoo-commits
commit: 8b1a77084225efe6ce090cea51b09832725d6984
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 16 21:28:16 2016 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 16 21:28:16 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=8b1a7708
catalyst-auto: use automatic GITDIR for hppa/ia64
tools/catalyst-auto-hppa.conf | 2 --
tools/catalyst-auto-ia64.conf | 2 --
2 files changed, 4 deletions(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 6f606a3..17bab7a 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/home/armin76/releng
-
SPECS_DIR=${GITDIR}/releases/weekly/specs/hppa
SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index a094f48..684c60c 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/home/armin76/releng
-
SPECS_DIR=${GITDIR}/releases/weekly/specs/ia64
SPECS="stage1.spec stage2.spec stage3.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-03-13 23:47 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2016-03-13 23:47 UTC (permalink / raw
To: gentoo-commits
commit: 39a3b94b3946392886da7a63f070ec068a787fea
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 13 23:46:14 2016 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Mar 13 23:46:14 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=39a3b94b
Forgot to disable the systemd stage building.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 474cb03..279ddfd 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -14,11 +14,11 @@ SETS="
multilib cloud_multilib minimal_multilib
nomultilib cloud_nomultilib minimal_nomultilib
x32
- systemd
hardened_multilib cloud_hardened_multilib minimal_hardened_multilib
hardened_nomultilib cloud_hardened_nomultilib minimal_hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux
"
+# systemd
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-01-26 7:45 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2016-01-26 7:45 UTC (permalink / raw
To: gentoo-commits
commit: 9b18c9796e4173b7d404239fa7a516edbc05a561
Author: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 26 07:17:34 2016 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 07:17:34 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=9b18c979
tools/catalyst-auto: Allow multiple config files, for host-specific overrides.
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>
tools/catalyst-auto | 28 +++++++++++++++++++---------
1 file changed, 19 insertions(+), 9 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index d42e97e..684531f 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -17,7 +17,8 @@ if [[ -z ${UNSHARE} ]] ; then
fi
unset UNSHARE
-config_file=
+declare -a config_files
+config_files=()
verbose=0
keep_tmpdir=0
testing=0
@@ -98,7 +99,7 @@ do
exit 0
;;
-c|--config)
- config_file=$1
+ config_files+=("$1")
shift
;;
-v|--verbose)
@@ -117,15 +118,24 @@ do
esac
done
-# Make sure all required values were specified
-if [ -z "${config_file}" -o ! -e "${config_file}" ]; then
- usage "ERROR: You must specify a valid config file to use"
- exit 1
-fi
-
# Probe the default gitdir from this script name.
GITDIR=$(dirname "$(dirname "$(realpath "$0")")")
-source ${config_file}
+
+doneconfig=0
+for config_file in ${config_files[@]}; do
+ # Make sure all required values were specified
+ if [ -z "${config_file}" -o ! -e "${config_file}" ]; then
+ usage "ERROR: You must specify a valid config file to use: '$config_file' is not valid"
+ exit 1
+ fi
+ source ${config_file}
+ doneconfig=1
+done
+if [[ $doneconfig -eq 0 ]]; then
+ usage "ERROR: You must specify at least one valid config file to use"
+ exit 1
+fi
+
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
DATESTAMP=$(date +%Y%m%d)
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-01-26 5:49 Matt Thode
0 siblings, 0 replies; 460+ messages in thread
From: Matt Thode @ 2016-01-26 5:49 UTC (permalink / raw
To: gentoo-commits
commit: 06359b3c67249d3925c3cf3fb7235d952c498162
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Jan 26 05:49:19 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 05:49:19 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=06359b3c
fix typo in catalyst config
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 876790a..f54ab37 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -22,7 +22,7 @@ SETS="
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_cloud_multilib_SPECS="stage4-cloud.spec"
-SET_minimal_hardened_multilib_SPECS="stage4-minimal.spec"
+SET_minimal_multilib_SPECS="stage4-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec"
SET_minimal_nomultilib_SPECS="stage4-nomultilib-minimal.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-01-26 0:44 Matt Thode
0 siblings, 0 replies; 460+ messages in thread
From: Matt Thode @ 2016-01-26 0:44 UTC (permalink / raw
To: gentoo-commits
commit: 56eaf4245f0f81aa3a61c48e8dffd2d58f4676e9
Author: Matthew Thode <mthode <AT> mthode <DOT> org>
AuthorDate: Tue Jan 26 00:44:12 2016 +0000
Commit: Matt Thode <prometheanfire <AT> gentoo <DOT> org>
CommitDate: Tue Jan 26 00:44:12 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=56eaf424
enabling new minimal stage4 specs
tools/catalyst-auto-amd64.conf | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 363f0d1..876790a 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -11,27 +11,31 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux"
SETS="
- multilib cloud_multilib
- nomultilib cloud_nomultilib
+ multilib cloud_multilib minimal_multilib
+ nomultilib cloud_nomultilib minimal_nomultilib
x32
- hardened_multilib cloud_hardened_multilib
- hardened_nomultilib cloud_hardened_nomultilib
+ hardened_multilib cloud_hardened_multilib minimal_hardened_multilib
+ hardened_nomultilib cloud_hardened_nomultilib minimal_hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux
"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_cloud_multilib_SPECS="stage4-cloud.spec"
+SET_minimal_hardened_multilib_SPECS="stage4-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec"
+SET_minimal_nomultilib_SPECS="stage4-nomultilib-minimal.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SET_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec"
+SET_minimal_hardened_multilib_SPECS="hardened/stage4-minimal.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec"
+SET_minimal_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-minimal.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2016-01-13 22:17 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2016-01-13 22:17 UTC (permalink / raw
To: gentoo-commits
commit: 656ca16378fc703ba8db1ad3598c205635c344e2
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 13 22:12:39 2016 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jan 13 22:12:39 2016 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=656ca163
Enable selinux stages.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5a4ec54..363f0d1 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -16,8 +16,8 @@ SETS="
x32
hardened_multilib cloud_hardened_multilib
hardened_nomultilib cloud_hardened_nomultilib
+ hardened_multilib_selinux hardened_nomultilib_selinux
"
-# hardened_multilib_selinux hardened_nomultilib_selinux
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2015-12-27 2:44 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2015-12-27 2:44 UTC (permalink / raw
To: gentoo-commits
commit: 4ed90e5bb5a502d7250de21d0f9ee407ec6d203a
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 02:44:04 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 02:44:04 2015 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=4ed90e5b
Update sed to match snapshot version.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index ff596a7..d42e97e 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -172,7 +172,7 @@ for i in $(find -name '*.spec'); do
old_source_subpath=$(grep source_subpath ${i} | sed -e 's|^source_subpath: *||')
new_version_stamp=$(echo "${old_version_stamp}" | sed -e 's|^\(.*-\)\?.*$|\1'${DATESTAMP}'|')
- new_source_subpath=$(echo "${old_source_subpath}" | sed -e 's|'${old_version_stamp}'$|'${new_version_stamp}'|')
+ new_source_subpath=$(echo "${old_source_subpath}" | sed -e 's|'${old_version_stamp}'|'${new_version_stamp}'|')
sed -i 's|^version_stamp:.*$|version_stamp: '${new_version_stamp}'|' ${i}
sed -i 's|^snapshot:.*$|snapshot: '${DATESTAMP}'|' ${i}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2015-12-27 2:37 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2015-12-27 2:37 UTC (permalink / raw
To: gentoo-commits
commit: e7ded9f8dd423ecb57edf9cc25192cb46add05ec
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 27 02:37:12 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Dec 27 02:37:12 2015 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=e7ded9f8
Update catalyst-auto scripts for amd64 / x86 to add support for more targets and improve the detection / copy of stages.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 47 ++++++++++++++++++++++++++++--------------
tools/catalyst-auto-x86.conf | 28 +++++++++++++++----------
2 files changed, 48 insertions(+), 27 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 92162fa..5a4ec54 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -10,19 +10,28 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux"
-SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
+SETS="
+ multilib cloud_multilib
+ nomultilib cloud_nomultilib
+ x32
+ hardened_multilib cloud_hardened_multilib
+ hardened_nomultilib cloud_hardened_nomultilib
+"
+# hardened_multilib_selinux hardened_nomultilib_selinux
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec stage4-cloud.spec"
+SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_cloud_multilib_SPECS="stage4-cloud.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
-SET_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-cloud.spec"
+SET_cloud_nomultilib_SPECS="stage4-nomultilib-cloud.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
-SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec hardened/stage4-cloud.spec"
+SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
+SET_cloud_hardened_multilib_SPECS="hardened/stage4-cloud.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-SET_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec"
+SET_cloud_hardened_nomultilib_SPECS="hardened/stage4-nomultilib-cloud.spec"
SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
@@ -30,6 +39,8 @@ SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec h
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@@ -48,7 +59,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
@@ -59,22 +70,26 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
+ mkdir -p ${BUILD_DESTDIR_BASE}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
- if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi
}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 7bde015..9b60c81 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -20,6 +20,8 @@ SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+EXTENSIONS="[.tar.xz,.tar.bz2,.tar.gz,.tar,.sfs]"
+
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@@ -38,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3*${EXTENSIONS} | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
@@ -49,22 +51,26 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
+ mkdir -p ${BUILD_DESTDIR_BASE}
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
- if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened
- cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened
- if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+ for file in $(ls stage{3,4}*${DATESTAMP}*${EXTENSIONS} ); do
+ if [ -f $file ]; then
+ cp $file* ${BUILD_DESTDIR_BASE}/hardened
fi
+ done
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2015-12-18 2:54 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2015-12-18 2:54 UTC (permalink / raw
To: gentoo-commits
commit: bc954c38f27f27ea719a8ec51a5d37fe57acae7d
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 02:53:31 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 02:54:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bc954c38
Fix another spec name typo.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a33c731..92162fa 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -14,7 +14,7 @@ SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec stage4-cloud.spec"
-SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib-cloud.spec"
+SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
SET_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-cloud.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/
@ 2015-12-18 2:30 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2015-12-18 2:30 UTC (permalink / raw
To: gentoo-commits
commit: 16bcda7b4e1a5cb0aceeaa45767c2680bc775fe0
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Dec 18 02:29:21 2015 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Dec 18 02:30:15 2015 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=16bcda7b
Fix stage4 spec name.
Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
tools/catalyst-auto-amd64.conf | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index e756acf..a33c731 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -13,8 +13,8 @@ SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
-SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec stage4.spec"
-SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
+SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec stage4-cloud.spec"
+SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib-cloud.spec"
SET_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-cloud.spec"
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-10-06 7:47 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2014-10-06 7:47 UTC (permalink / raw
To: gentoo-commits
commit: c2b28e8d1f36047985869c61d18e849ea47f7992
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 6 07:47:42 2014 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Mon Oct 6 07:47:42 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=c2b28e8d
Add netboot to s390 conf and fix s390x conf
Signed-off-by: Raúl Porcel <armin76 <AT> gentoo.org>
---
tools/catalyst-auto-s390.conf | 10 +++++++---
tools/catalyst-auto-s390x.conf | 2 +-
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index d7ea936..9f59c2b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -4,11 +4,13 @@
SPECS_DIR=${GITDIR}/releases/weekly/specs/s390/s390
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-SETS="default"
+SETS="default netboot"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
+SET_netboot_SPECS="netboot/netboot.spec"
+
+KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@$(hostname)
@@ -48,5 +50,7 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@nightheron.gentoo.org:
+ mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/kernels/netboot ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/netboot-s390-kernel-${DATESTAMP}
+ mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/kernels/misc/netboot.igz ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/netboot-s390-initramfs-${DATESTAMP}
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390-${DATESTAMP}/netboot* s390@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 30ee386..13ba079 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -51,6 +51,6 @@ pre_build() {
post_build() {
mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/netboot64 ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-kernel-${DATESTAMP}
- mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/misc/netboot64.igz ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot64 ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-initramfs-${DATESTAMP}
+ mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/misc/netboot64.igz ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-initramfs-${DATESTAMP}
rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot* s390@nightheron.gentoo.org:
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-10-02 11:50 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2014-10-02 11:50 UTC (permalink / raw
To: gentoo-commits
commit: 509ce3b8235a75a3f388c0696c0b0c3965082e70
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 2 10:00:07 2014 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Thu Oct 2 10:00:07 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=509ce3b8
Add netboot to s390x
---
tools/catalyst-auto-s390x.conf | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 33eee23..30ee386 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -4,11 +4,13 @@
SPECS_DIR=${GITDIR}/releases/weekly/specs/s390/s390x
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-SETS="default"
+SETS="default netboot"
SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
-#KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
+SET_netboot_SPECS="netboot/netboot.spec"
+
+KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/s390
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@$(hostname)
@@ -48,5 +50,7 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@nightheron.gentoo.org:
+ mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/netboot64 ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-kernel-${DATESTAMP}
+ mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/kernels/misc/netboot64.igz ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot64 ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot-s390x-initramfs-${DATESTAMP}
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-s390x-${DATESTAMP}/netboot* s390@nightheron.gentoo.org:
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-09-10 20:35 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2014-09-10 20:35 UTC (permalink / raw
To: gentoo-commits
commit: a05155c18b5f6a9ad3d191ae08c511a2746eccfa
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 10 19:58:54 2014 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 19:58:54 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=a05155c1
catalyst-auto: set up a default GITDIR for scripts
Rather than hardcode system-specific paths, let catalyst-auto probe
the current git dir based on its script name.
---
tools/catalyst-auto | 2 ++
tools/catalyst-auto-s390.conf | 2 --
tools/catalyst-auto-s390x.conf | 2 --
3 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 4453009..ff596a7 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -123,6 +123,8 @@ if [ -z "${config_file}" -o ! -e "${config_file}" ]; then
exit 1
fi
+# Probe the default gitdir from this script name.
+GITDIR=$(dirname "$(dirname "$(realpath "$0")")")
source ${config_file}
TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index a0cc15b..d7ea936 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/root/releng/
-
SPECS_DIR=${GITDIR}/releases/weekly/specs/s390/s390
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index 92a9380..33eee23 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -1,8 +1,6 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/root/releng/
-
SPECS_DIR=${GITDIR}/releases/weekly/specs/s390/s390x
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-09-10 20:35 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2014-09-10 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 187e786116b56b60bf1a84d44094619843214920
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 10 19:54:16 2014 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 19:54:16 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=187e7861
catalyst-auto: automatically use uts/ipc/pid namespaces
If the system can support them, throw the build process into various
namespaces to further isolate ourselves from the host system.
---
tools/catalyst-auto | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index ebdb7c7..4453009 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -2,10 +2,17 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# First let's get our own mount namespace to avoid leaking crap.
+# First let's get our own namespaces to avoid leaking crap.
if [[ -z ${UNSHARE} ]] ; then
if type -P unshare >&/dev/null ; then
- UNSHARE=true exec unshare -m -- "$0" "$@"
+ uargs=()
+ # Probe the namespaces as some can be disabled (or we are not root).
+ unshare -m -- true >&/dev/null && uargs+=( -m )
+ unshare -u -- true >&/dev/null && uargs+=( -u )
+ unshare -i -- true >&/dev/null && uargs+=( -i )
+ unshare -p -- true >&/dev/null && uargs+=( -p -f --mount-proc )
+ # Re-exec ourselves in the new namespace.
+ UNSHARE=true exec unshare "${uargs[@]}" -- "$0" "$@"
fi
fi
unset UNSHARE
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-09-10 20:35 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2014-09-10 20:35 UTC (permalink / raw
To: gentoo-commits
commit: 9133fc879c354c0889e775d6a42c3fa21efe8fe7
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 10 19:51:20 2014 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 19:51:20 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=9133fc87
catalyst-auto: clean up usage a bit
---
tools/catalyst-auto | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index aa4ec1d..3aa98b2 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -19,10 +19,10 @@ testing=0
set -o pipefail
usage() {
- msg=$1
+ local msg=$1
if [ -n "${msg}" ]; then
- echo -e "${msg}\n";
+ printf "%b\n\n" "${msg}"
fi
cat <<EOH
@@ -104,8 +104,7 @@ do
testing=1
;;
-*)
- echo "You have specified an invalid option: ${a}"
- usage
+ usage "ERROR: You have specified an invalid option: ${a}"
exit 1
;;
esac
@@ -113,7 +112,7 @@ done
# Make sure all required values were specified
if [ -z "${config_file}" -o ! -e "${config_file}" ]; then
- usage "You must specify a valid config file to use"
+ usage "ERROR: You must specify a valid config file to use"
exit 1
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-09-10 20:35 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2014-09-10 20:35 UTC (permalink / raw
To: gentoo-commits
commit: dbacb3edd62cf3e30a3635c92c5582a7d754bf35
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 10 19:52:48 2014 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Sep 10 19:52:48 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=dbacb3ed
catalyst-auto: construct tempdir with mktemp rather than pid
This way we can sanely use pid namespaces without tempdirs clashing.
---
tools/catalyst-auto | 22 ++++++----------------
1 file changed, 6 insertions(+), 16 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 3aa98b2..ebdb7c7 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -1,4 +1,6 @@
#!/bin/bash
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
# First let's get our own mount namespace to avoid leaking crap.
if [[ -z ${UNSHARE} ]] ; then
@@ -8,8 +10,6 @@ if [[ -z ${UNSHARE} ]] ; then
fi
unset UNSHARE
-PID=$$
-
config_file=
verbose=0
keep_tmpdir=0
@@ -118,7 +118,7 @@ fi
source ${config_file}
-TMPDIR=${TMP_PATH:-/tmp}/catalyst-auto.${PID}
+TMPDIR=$(mktemp -d --tmpdir="${TMP_PATH:-/tmp}" catalyst-auto.XXXXXX)
DATESTAMP=$(date +%Y%m%d)
if [ ${verbose} = 1 ]; then
@@ -126,21 +126,11 @@ if [ ${verbose} = 1 ]; then
echo "DATESTAMP = ${DATESTAMP}"
fi
-# Check if tmp directory exists and remove it
-if [ -d "${TMPDIR}" ]; then
- if ! rm -rf "${TMPDIR}"; then
- echo "Couldn't remove stale tmpdir ${TMPDIR}!"
- exit 1
- fi
+if ! mkdir -p "${TMPDIR}"/{specs,kconfig,log}; then
+ echo "Couldn't create tempdirs!"
+ exit 1
fi
-for i in ${TMPDIR} ${TMPDIR}/specs ${TMPDIR}/kconfig ${TMPDIR}/log; do
- if ! mkdir -p "${i}"; then
- echo "Couldn't create dir ${i}!"
- exit 1
- fi
-done
-
if ! run_cmd "pre_build" "${TMPDIR}/log/pre_build.log"; then
send_email "Catalyst build error - pre_build" "Your pre_build function sucks" "${TMPDIR}/log/pre_build.log"
exit 1
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-08-18 21:59 Robin H. Johnson
0 siblings, 0 replies; 460+ messages in thread
From: Robin H. Johnson @ 2014-08-18 21:59 UTC (permalink / raw
To: gentoo-commits
commit: 2a8047d9c9c53fc5a1bf936da5b0d554d9249766
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 8 14:01:20 2014 +0000
Commit: Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 8 14:01:20 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=2a8047d9
Push to nightheron instead of skimmer
---
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-armv4tl.conf | 2 +-
tools/catalyst-auto-armv5tel.conf | 2 +-
tools/catalyst-auto-armv6j.conf | 2 +-
tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
tools/catalyst-auto-armv7a.conf | 2 +-
tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
tools/catalyst-auto-hppa.conf | 2 +-
tools/catalyst-auto-ia64.conf | 2 +-
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 2 +-
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 4 ++--
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 8910913..17b2b93 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -51,5 +51,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* alpha@skimmer.gentoo.org:
+ rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* alpha@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index 70e4d07..e5328d2 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index dda8e17..ebcf494 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 12e21d6..0dc8ffa 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 989546e..cfb669f 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index e9fd62f..a1e6689 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index 7c31deb..f2b5aa0 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index e33a93a..6f606a3 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -57,5 +57,5 @@ pre_build() {
post_build() {
mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa1.1-${DATESTAMP}/netboot32-hppa.lif ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa1.1-${DATESTAMP}/netboot-hppa32-${DATESTAMP}.lif
mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa2.0-${DATESTAMP}/netboot64-hppa.lif ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa2.0-${DATESTAMP}/netboot-hppa64-${DATESTAMP}.lif
- rsync -e 'ssh -i /root/.ssh/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/install-hppa-minimal-*${DATESTAMP}*.iso* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa*-${DATESTAMP}/*.lif hppa@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/install-hppa-minimal-*${DATESTAMP}*.iso* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa*-${DATESTAMP}/*.lif hppa@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 3f42a8e..a094f48 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ia64@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ia64@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 620a705..79387a1 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -49,5 +49,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ppc@skimmer.gentoo.org:
+ rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ppc@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index ff742a5..ff78a0c 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -53,5 +53,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ppc@skimmer.gentoo.org:
+ rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ppc@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index d8f975c..a0cc15b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -50,5 +50,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index c085330..92a9380 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -50,5 +50,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 10124aa..92e4773 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -51,7 +51,7 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* sparc@skimmer.gentoo.org:
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* sparc@skimmer.gentoo.org:multilib
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* sparc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* sparc@nightheron.gentoo.org:multilib
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-08-08 14:01 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2014-08-08 14:01 UTC (permalink / raw
To: gentoo-commits
commit: 2a8047d9c9c53fc5a1bf936da5b0d554d9249766
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 8 14:01:20 2014 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 8 14:01:20 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=2a8047d9
Push to nightheron instead of skimmer
---
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-armv4tl.conf | 2 +-
tools/catalyst-auto-armv5tel.conf | 2 +-
tools/catalyst-auto-armv6j.conf | 2 +-
tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
tools/catalyst-auto-armv7a.conf | 2 +-
tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
tools/catalyst-auto-hppa.conf | 2 +-
tools/catalyst-auto-ia64.conf | 2 +-
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 2 +-
tools/catalyst-auto-s390.conf | 2 +-
tools/catalyst-auto-s390x.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 4 ++--
14 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 8910913..17b2b93 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -51,5 +51,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* alpha@skimmer.gentoo.org:
+ rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* alpha@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index 70e4d07..e5328d2 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index dda8e17..ebcf494 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 12e21d6..0dc8ffa 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 989546e..cfb669f 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index e9fd62f..a1e6689 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index 7c31deb..f2b5aa0 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index e33a93a..6f606a3 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -57,5 +57,5 @@ pre_build() {
post_build() {
mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa1.1-${DATESTAMP}/netboot32-hppa.lif ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa1.1-${DATESTAMP}/netboot-hppa32-${DATESTAMP}.lif
mv ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa2.0-${DATESTAMP}/netboot64-hppa.lif ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa2.0-${DATESTAMP}/netboot-hppa64-${DATESTAMP}.lif
- rsync -e 'ssh -i /root/.ssh/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/install-hppa-minimal-*${DATESTAMP}*.iso* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa*-${DATESTAMP}/*.lif hppa@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/install-hppa-minimal-*${DATESTAMP}*.iso* ${BUILD_SRCDIR_BASE}/builds/default/netboot2-hppa*-${DATESTAMP}/*.lif hppa@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 3f42a8e..a094f48 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ia64@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ia64@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 620a705..79387a1 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -49,5 +49,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ppc@skimmer.gentoo.org:
+ rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ppc@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index ff742a5..ff78a0c 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -53,5 +53,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ppc@skimmer.gentoo.org:
+ rsync -e 'ssh -i /home/armin76/buildsync.key' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* ppc@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-s390.conf b/tools/catalyst-auto-s390.conf
index d8f975c..a0cc15b 100644
--- a/tools/catalyst-auto-s390.conf
+++ b/tools/catalyst-auto-s390.conf
@@ -50,5 +50,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-s390x.conf b/tools/catalyst-auto-s390x.conf
index c085330..92a9380 100644
--- a/tools/catalyst-auto-s390x.conf
+++ b/tools/catalyst-auto-s390x.conf
@@ -50,5 +50,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* s390@nightheron.gentoo.org:
}
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 10124aa..92e4773 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -51,7 +51,7 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* sparc@skimmer.gentoo.org:
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* sparc@skimmer.gentoo.org:multilib
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* sparc@nightheron.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* sparc@nightheron.gentoo.org:multilib
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-04-15 11:07 Guy Martin
0 siblings, 0 replies; 460+ messages in thread
From: Guy Martin @ 2014-04-15 11:07 UTC (permalink / raw
To: gentoo-commits
commit: d203cfd8bad7c7450d9f80d9309cfa6e066b6dc6
Author: Guy Martin <gmsoft <AT> gentoo <DOT> org>
AuthorDate: Tue Apr 15 11:07:03 2014 +0000
Commit: Guy Martin <gmsoft <AT> gentoo <DOT> org>
CommitDate: Tue Apr 15 11:07:03 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=d203cfd8
tools/catalyst-auto: Set pipefail to catch failure in verbose mode as well.
---
tools/catalyst-auto | 3 +++
1 file changed, 3 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index c4796a1..aa4ec1d 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -15,6 +15,9 @@ verbose=0
keep_tmpdir=0
testing=0
+# Set pipefail so that run_cmd returns the right value in $?
+set -o pipefail
+
usage() {
msg=$1
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-02-24 7:50 Mike Frysinger
0 siblings, 0 replies; 460+ messages in thread
From: Mike Frysinger @ 2014-02-24 7:50 UTC (permalink / raw
To: gentoo-commits
commit: 509986231a7dd61984223e951c63d2d01a0b861d
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 22 05:58:29 2014 +0000
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Mon Feb 24 07:49:49 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=50998623
catalyst-auto: run in a mount namespace
This way if things crash, we don't leak mounts that need cleaning up.
---
tools/catalyst-auto | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index c4c6aa6..c4796a1 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -1,5 +1,13 @@
#!/bin/bash
+# First let's get our own mount namespace to avoid leaking crap.
+if [[ -z ${UNSHARE} ]] ; then
+ if type -P unshare >&/dev/null ; then
+ UNSHARE=true exec unshare -m -- "$0" "$@"
+ fi
+fi
+unset UNSHARE
+
PID=$$
config_file=
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2014-02-01 18:10 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2014-02-01 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 97103e7cfad8dcc9c4c1d776971574fc4795f81d
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 1 18:10:33 2014 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Sat Feb 1 18:10:33 2014 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=97103e7c
move hostname to guppy
---
tools/catalyst-auto-ia64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index f31cc6e..3f42a8e 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -15,7 +15,7 @@ OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/ia64
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@dolphin.ia64.dev.gentoo.org
+EMAIL_FROM=catalyst@guppy.ia64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ia64-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-20 6:33 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2013-08-20 6:33 UTC (permalink / raw
To: gentoo-commits
commit: 0fa0d1ff3029231c5c845161a4482dd127a4fded
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 20 06:33:42 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 20 06:33:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=0fa0d1ff
Fix ia64
---
tools/catalyst-auto-ia64.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index b9d4081..f31cc6e 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -38,7 +38,7 @@ pre_build() {
git pull
# Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
+ for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-19 11:46 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2013-08-19 11:46 UTC (permalink / raw
To: gentoo-commits
commit: 3dd1d8ec721cd6b035cd438d2cba2b10d617e3f0
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 19 11:46:05 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Mon Aug 19 11:46:05 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=3dd1d8ec
There was an extra done
---
tools/catalyst-auto-ppc.conf | 1 -
1 file changed, 1 deletion(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index a0c2d0c..620a705 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -44,7 +44,6 @@ pre_build() {
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
done
- done
popd
done
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-16 10:23 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2013-08-16 10:23 UTC (permalink / raw
To: gentoo-commits
commit: 097690e7807924187d0365ac1d0194192d2422f4
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 10:23:08 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 10:23:08 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=097690e7
Typo
---
tools/catalyst-auto-armv4tl.conf | 2 +-
tools/catalyst-auto-armv5tel.conf | 2 +-
tools/catalyst-auto-armv6j.conf | 2 +-
tools/catalyst-auto-armv6j_hardfp.conf | 2 +-
tools/catalyst-auto-armv7a.conf | 2 +-
tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index 0a09773..70e4d07 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -4,7 +4,7 @@
GITDIR=/root/releng/
SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv4tl
-SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'`
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default"
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 8554a07..dda8e17 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -4,7 +4,7 @@
GITDIR=/root/releng/
SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv5tel
-SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'`
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default"
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 398bcd5..12e21d6 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -4,7 +4,7 @@
GITDIR=/root/releng/
SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j
-SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'`
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default"
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index 6b8c4f5..989546e 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -4,7 +4,7 @@
GITDIR=/root/releng/
SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv6j/hardfloat
-SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'`
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default"
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index adc178b..e9fd62f 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -4,7 +4,7 @@
GITDIR=/root/releng/
SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a
-SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'`
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default"
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index 227abfc..7c31deb 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -4,7 +4,7 @@
GITDIR=/root/releng/
SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a/hardfloat
-SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'`
+SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-16 10:18 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2013-08-16 10:18 UTC (permalink / raw
To: gentoo-commits
commit: 10fd7de988e2b800e3cddb5e0c4d946df0e2cb6a
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 10:18:37 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 10:18:37 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=10fd7de9
Fix variable
---
tools/catalyst-auto-armv4tl.conf | 6 +++---
tools/catalyst-auto-armv5tel.conf | 6 +++---
tools/catalyst-auto-armv6j.conf | 6 +++---
tools/catalyst-auto-armv6j_hardfp.conf | 6 +++---
tools/catalyst-auto-armv7a.conf | 6 +++---
tools/catalyst-auto-armv7a_hardfp.conf | 6 +++---
6 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/tools/catalyst-auto-armv4tl.conf b/tools/catalyst-auto-armv4tl.conf
index 0ba2656..0a09773 100644
--- a/tools/catalyst-auto-armv4tl.conf
+++ b/tools/catalyst-auto-armv4tl.conf
@@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@replaceme.local
-EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]"
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
@@ -40,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
- for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv5tel.conf b/tools/catalyst-auto-armv5tel.conf
index 13fd55e..8554a07 100644
--- a/tools/catalyst-auto-armv5tel.conf
+++ b/tools/catalyst-auto-armv5tel.conf
@@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@replaceme.local
-EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]"
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
@@ -40,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
- for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j.conf b/tools/catalyst-auto-armv6j.conf
index 719ef8a..398bcd5 100644
--- a/tools/catalyst-auto-armv6j.conf
+++ b/tools/catalyst-auto-armv6j.conf
@@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@replaceme.local
-EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]"
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
@@ -40,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
- for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv6j_hardfp.conf b/tools/catalyst-auto-armv6j_hardfp.conf
index c22d759..6b8c4f5 100644
--- a/tools/catalyst-auto-armv6j_hardfp.conf
+++ b/tools/catalyst-auto-armv6j_hardfp.conf
@@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@replaceme.local
-EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]"
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
@@ -40,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
- for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a.conf b/tools/catalyst-auto-armv7a.conf
index ca39146..adc178b 100644
--- a/tools/catalyst-auto-armv7a.conf
+++ b/tools/catalyst-auto-armv7a.conf
@@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@replaceme.local
-EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]"
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
@@ -40,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
- for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
}
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index d52982d..227abfc 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -15,7 +15,7 @@ SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@replaceme.local
-EMAIL_SUBJECT_PREPEND="[$SUBARCH-auto]"
+EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
@@ -40,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
- for f in $(ls stage3-$SUBARCH-*bz2 | grep -v latest | give_latest_from_dates ) ; do
+ for f in $(ls stage3-${SUBARCH}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
@@ -51,5 +51,5 @@ pre_build() {
post_build() {
- rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-$SUBARCH-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
+ rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-${SUBARCH}-*${DATESTAMP}*.tar.bz2* arm@skimmer.gentoo.org:
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-16 10:08 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2013-08-16 10:08 UTC (permalink / raw
To: gentoo-commits
commit: ff14403dd3fd592aa449ae319976a3c3df14f640
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 10:08:20 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 10:08:20 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=ff14403d
Fix path on armv7a_hardfp, thanks to steev
---
tools/catalyst-auto-armv7a_hardfp.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-armv7a_hardfp.conf b/tools/catalyst-auto-armv7a_hardfp.conf
index 3860a10..d52982d 100644
--- a/tools/catalyst-auto-armv7a_hardfp.conf
+++ b/tools/catalyst-auto-armv7a_hardfp.conf
@@ -3,7 +3,7 @@
GITDIR=/root/releng/
-SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a_hardfloat
+SPECS_DIR=${GITDIR}/releases/weekly/specs/arm/armv7a/hardfloat
SUBARCH=`grep subarch $SPECSDIR/stage1.spec | awk '{print $2}'`
SETS="default"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-16 1:27 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-08-16 1:27 UTC (permalink / raw
To: gentoo-commits
commit: 6dcdad447a4df276d4f93a71473283adb822f8e2
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 16 01:23:03 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Aug 16 01:23:03 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=6dcdad44
Fix the circular latest symlinks by taking them out of the list of stages.
Sync amd64/x86 experimental script with base amd64/x86 script.
---
tools/catalyst-auto-alpha.conf | 2 +-
tools/catalyst-auto-amd64-experimental.conf | 7 ++++++-
tools/catalyst-auto-amd64.conf | 2 +-
tools/catalyst-auto-hppa.conf | 2 +-
tools/catalyst-auto-ia64.conf | 2 +-
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 2 +-
tools/catalyst-auto-sparc64.conf | 2 +-
tools/catalyst-auto-x86-experimental.conf | 2 +-
tools/catalyst-auto-x86.conf | 2 +-
10 files changed, 15 insertions(+), 10 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index b87fda8..8910913 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -41,7 +41,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
- for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
+ for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 92f9c71..3f2bd16 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -9,6 +9,7 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
+#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux"
SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
@@ -21,6 +22,10 @@ SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
+SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
+SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
+SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
give_latest_from_dates() {
@@ -41,7 +46,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
+ for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 2331e05..8d1a079 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -46,7 +46,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
+ for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 25199cb..8249913 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -40,7 +40,7 @@ pre_build() {
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
for t in hppa1.1 hppa2.0; do
- for f in $(ls stage3-${t}-*bz2 | give_latest_from_dates ) ; do
+ for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 7f9352a..b9d4081 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -40,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
pushd $d
- for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
+ for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 8ee9c35..a0c2d0c 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -39,7 +39,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
- for f in $(ls stage3-ppc-*bz2 | give_latest_from_dates ) ; do
+ for f in $(ls stage3-ppc-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 73cdf6e..ff742a5 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -42,7 +42,7 @@ pre_build() {
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
for t in ppc64-64ul ppc64-32ul; do
- for f in $(ls stage3-${t}-*bz2 | give_latest_from_dates ) ; do
+ for f in $(ls stage3-${t}-*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index dc11418..10124aa 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -40,7 +40,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/builds/{default,multilib} ; do
pushd $d
- for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
+ for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 38daa0e..ece0e5a 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -38,7 +38,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
+ for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 862cc1d..7bde015 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -38,7 +38,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
+ for f in $(ls stage3*bz2 | grep -v latest | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-14 18:01 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2013-08-14 18:01 UTC (permalink / raw
To: gentoo-commits
commit: 93c25d5835e41fceaf5f5ac962ff95d90be43191
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 17:55:31 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 17:55:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=93c25d58
Add a dash for just in case
---
tools/catalyst-auto-hppa.conf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 87efa66..25199cb 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -40,7 +40,7 @@ pre_build() {
for d in ${BUILD_SRCDIR_BASE}/builds/default ; do
pushd $d
for t in hppa1.1 hppa2.0; do
- for f in $(ls stage3-${t}*bz2 | give_latest_from_dates ) ; do
+ for f in $(ls stage3-${t}-*bz2 | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-14 18:01 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2013-08-14 18:01 UTC (permalink / raw
To: gentoo-commits
commit: 9ce4d2496c3d6dd0babcfcd00f94655ff5949d1a
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 17:53:22 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 17:53:22 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=9ce4d249
whitespace
---
tools/catalyst-auto-alpha.conf | 1 -
tools/catalyst-auto-ia64.conf | 1 -
tools/catalyst-auto-sparc64.conf | 1 -
3 files changed, 3 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index fd600f1..b87fda8 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -45,7 +45,6 @@ pre_build() {
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
-
done
popd
done
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 47ad7d2..7f9352a 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -44,7 +44,6 @@ pre_build() {
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
-
done
popd
done
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index a4395a4..dc11418 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -44,7 +44,6 @@ pre_build() {
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for $
ln -sf $f $of
-
done
popd
done
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-14 17:23 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2013-08-14 17:23 UTC (permalink / raw
To: gentoo-commits
commit: 585d8d645f363375fe80e2cfa81e920caf7cd788
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 14 17:23:42 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Wed Aug 14 17:23:42 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=585d8d64
Remove apostrophes
---
tools/catalyst-auto-amd64.conf | 2 +-
tools/catalyst-auto-x86.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 9215228..2331e05 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -46,7 +46,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
+ for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 45a97ad..862cc1d 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -38,7 +38,7 @@ pre_build() {
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
- for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
+ for f in $(ls stage3*bz2 | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-08-06 15:29 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2013-08-06 15:29 UTC (permalink / raw
To: gentoo-commits
commit: b44902b6e9a3d82b32225d89113563e495e957c6
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 6 15:29:31 2013 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Tue Aug 6 15:29:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=b44902b6
The user should be ppc not powerpc
---
tools/catalyst-auto-ppc.conf | 2 +-
tools/catalyst-auto-ppc64.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 181600e..52f99fb 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -26,5 +26,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' /var/tmp/catalyst/builds/default/stage3-*${DATESTAMP}*.bz2* powerpc@skimmer.gentoo.org:
+ rsync -e 'ssh -i /home/armin76/buildsync.key' /var/tmp/catalyst/builds/default/stage3-*${DATESTAMP}*.bz2* ppc@skimmer.gentoo.org:
}
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index 8e9a37e..e6ab474 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -27,5 +27,5 @@ pre_build() {
}
post_build() {
- rsync -e 'ssh -i /home/armin76/buildsync.key' /var/tmp/catalyst/builds/default/stage3-*${DATESTAMP}*.bz2* /var/tmp/catalyst/builds/default/*${DATESTAMP}*.iso* powerpc@skimmer.gentoo.org:
+ rsync -e 'ssh -i /home/armin76/buildsync.key' /var/tmp/catalyst/builds/default/stage3-*${DATESTAMP}*.bz2* /var/tmp/catalyst/builds/default/*${DATESTAMP}*.iso* ppc@skimmer.gentoo.org:
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-04-28 22:37 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-04-28 22:37 UTC (permalink / raw
To: gentoo-commits
commit: 5b98494124e026ffb987272537f325bca6db13f2
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Apr 28 22:36:56 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Apr 28 22:36:56 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=5b984941
Drop the date from the destination dir to avoid the double date directories in the mirrors.
---
tools/catalyst-auto-amd64.conf | 12 ++++++------
tools/catalyst-auto-x86.conf | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index a162f15..9215228 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -58,20 +58,20 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi
fi
}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index e45b0db..45a97ad 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -50,20 +50,20 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}
+ cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}
fi
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
- cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened
+ cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened
fi
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-04-20 15:21 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-04-20 15:21 UTC (permalink / raw
To: gentoo-commits
commit: cf5df37ff008f1243f62464d47a3f211b68f8c29
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 20 15:18:55 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Apr 20 15:21:31 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=cf5df37f
Add the sets to create the selinux targets. They're not being added to sets, yet.
---
tools/catalyst-auto-amd64.conf | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 4c88f2c..a162f15 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -9,6 +9,7 @@ source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
+#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib hardened_multilib_selinux hardened_nomultilib_selinux"
SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
@@ -21,6 +22,10 @@ SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/
SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
+SET_hardened_multilib_selinux_SPECS="hardened/stage1-selinux.spec hardened/stage2-selinux.spec hardened/stage3-selinux.spec"
+SET_hardened_multilib_selinux_OPTIONAL_SPECS="hardened/admincd-stage1-selinux.spec hardened/admincd-stage2-selinux.spec"
+SET_hardened_nomultilib_selinux_SPECS="hardened/stage1-selinux-nomultilib.spec hardened/stage2-selinux-nomultilib.spec hardened/stage3-selinux-nomultilib.spec"
+
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
give_latest_from_dates() {
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-04-18 8:33 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-04-18 8:33 UTC (permalink / raw
To: gentoo-commits
commit: bd55c0c9878f66de2636986428d672b3da3b03c1
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 08:28:12 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 08:28:12 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=bd55c0c9
Revert unintentional change to amd64 / x86 paths that is causing path weirdness on mirrors.
---
tools/catalyst-auto-amd64.conf | 12 ++++++------
tools/catalyst-auto-x86.conf | 12 ++++++------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 5b1a523..4c88f2c 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -53,20 +53,20 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
fi
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
fi
fi
}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 36f6b6d..e45b0db 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -50,20 +50,20 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}
+ cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}
fi
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
+ cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
if [ -f *${DATESTAMP}*.iso ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/${DATESTAMP}/hardened
fi
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2013-04-18 8:04 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2013-04-18 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 7b2552f0c8b739d2973d712552c1734507d354a8
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 18 08:01:16 2013 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Apr 18 08:01:16 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=7b2552f0
Update x86 script file to only copy the ISO files if we built the ISO file.
---
tools/catalyst-auto-x86.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index b43ddc3..36f6b6d 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -52,7 +52,7 @@ post_build() {
if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- if [ -f *${DATESTAMP}*.iso* ]; then
+ if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
fi
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-10-14 4:38 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-14 4:38 UTC (permalink / raw
To: gentoo-commits
commit: 666c0cdbe62e030f032f11d9ed7f621f7be4dc12
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sun Oct 14 04:30:56 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sun Oct 14 04:30:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=666c0cdb
Build parent dirs if needed.
---
tools/catalyst-auto-amd64-experimental.conf | 4 ++--
tools/catalyst-auto-amd64.conf | 4 ++--
tools/catalyst-auto-x86-experimental.conf | 4 ++--
tools/catalyst-auto-x86.conf | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
index 90c6aab..92f9c71 100644
--- a/tools/catalyst-auto-amd64-experimental.conf
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -53,7 +53,7 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
@@ -63,7 +63,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 47777a3..5b1a523 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -53,7 +53,7 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
@@ -63,7 +63,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
- mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
index 002b85c..38daa0e 100644
--- a/tools/catalyst-auto-x86-experimental.conf
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -50,7 +50,7 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso* ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
@@ -60,7 +60,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 8acc833..b43ddc3 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -50,7 +50,7 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso* ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
@@ -60,7 +60,7 @@ post_build() {
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
- mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ mkdir -p ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-10-13 4:19 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-13 4:19 UTC (permalink / raw
To: gentoo-commits
commit: ccfa82019425ca5e707aae05ba50d0894e1fcbe7
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 04:16:14 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 04:16:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=ccfa8201
Add experimental conf files for amd64/x86.
---
tools/catalyst-auto-amd64-experimental.conf | 74 +++++++++++++++++++++++++++
tools/catalyst-auto-x86-experimental.conf | 71 +++++++++++++++++++++++++
2 files changed, 145 insertions(+), 0 deletions(-)
diff --git a/tools/catalyst-auto-amd64-experimental.conf b/tools/catalyst-auto-amd64-experimental.conf
new file mode 100644
index 0000000..90c6aab
--- /dev/null
+++ b/tools/catalyst-auto-amd64-experimental.conf
@@ -0,0 +1,74 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+ARCH="amd64"
+TYPE="experimental"
+host=$(hostname)
+
+source /etc/catalyst/release/build.env
+
+SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
+
+SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
+
+SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
+SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
+
+SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
+
+SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
+SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
+SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
+
+KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+
+give_latest_from_dates() {
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' |\
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
+}
+
+pre_build() {
+ pushd ${REPO_DIR}
+ git pull
+ popd
+
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
+ pushd $d
+ for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
+ ln -sf $f $of
+ done
+ popd
+ done
+}
+
+post_build() {
+ pushd ${BUILD_SRCDIR_BASE}/default
+ if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
+ mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ fi
+ fi
+ popd
+
+ pushd ${BUILD_SRCDIR_BASE}/hardened
+ if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
+ mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ fi
+ fi
+}
+
+# vim:ft=sh:
diff --git a/tools/catalyst-auto-x86-experimental.conf b/tools/catalyst-auto-x86-experimental.conf
new file mode 100644
index 0000000..002b85c
--- /dev/null
+++ b/tools/catalyst-auto-x86-experimental.conf
@@ -0,0 +1,71 @@
+# This is the config file for the catalyst-auto script. It should be pretty
+# self-explanatory.
+
+ARCH="x86"
+TYPE="experimental"
+host=$(hostname)
+
+source /etc/catalyst/release/build.env
+
+SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
+
+SETS="i486 i686 hardened"
+
+SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
+SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
+
+SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
+SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
+
+KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
+
+give_latest_from_dates() {
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' |\
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
+}
+
+pre_build() {
+ pushd ${REPO_DIR}
+ git pull
+ popd
+
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
+ pushd $d
+ for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
+ ln -sf $f $of
+ done
+ popd
+ done
+}
+
+post_build() {
+ pushd ${BUILD_SRCDIR_BASE}/default
+ if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
+ mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ if [ -f *${DATESTAMP}*.iso* ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ fi
+ fi
+ popd
+
+ pushd ${BUILD_SRCDIR_BASE}/hardened
+ if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
+ mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ if [ -f *${DATESTAMP}*.iso ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ fi
+ fi
+}
+
+# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-10-13 4:19 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-13 4:19 UTC (permalink / raw
To: gentoo-commits
commit: f42a40df9abfbb3b0b8ff9bc1f5c112d1c7bf27d
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Sat Oct 13 04:06:36 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Sat Oct 13 04:06:36 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=f42a40df
Move hardcoded paths out of the script files.
---
tools/catalyst-auto | 2 +-
tools/catalyst-auto-amd64.conf | 19 +++++++------------
tools/catalyst-auto-x86.conf | 19 ++++++-------------
3 files changed, 14 insertions(+), 26 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 9503cb7..9e89d39 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -108,7 +108,7 @@ fi
source ${config_file}
-TMPDIR=/release/tmp/catalyst-auto.${PID}
+TMPDIR=${TMP_PATH}/catalyst-auto.${PID}
DATESTAMP=$(date +%Y%m%d)
if [ ${verbose} = 1 ]; then
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 96f8ce8..47777a3 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -1,9 +1,11 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-BASE_DIR="/release"
-REPO_DIR="${BASE_DIR}/releng"
ARCH="amd64"
+TYPE="auto"
+host=$(hostname)
+
+source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
@@ -12,22 +14,15 @@ SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
+
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
+SET_hardened_multilib_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@skimmer.gentoo.org
-EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
-
-CATALYST_CONFIG=/etc/catalyst/release/${ARCH}-auto.conf
-
-BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/
-BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@@ -41,8 +36,8 @@ give_latest_from_dates() {
pre_build() {
pushd ${REPO_DIR}
git pull
-
popd
+
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 4ab5038..8acc833 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -1,9 +1,11 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-BASE_DIR="/release"
-REPO_DIR="${BASE_DIR}/releng"
ARCH="x86"
+TYPE="auto"
+host=$(hostname)
+
+source /etc/catalyst/release/build.env
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
@@ -11,22 +13,13 @@ SETS="i486 i686 hardened"
SET_i486_SPECS="stage1.spec stage2.spec stage3.spec"
SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
+SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
-EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@skimmer.gentoo.org
-EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
-
-CATALYST_CONFIG=/etc/catalyst/release/${ARCH}-auto.conf
-
-BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/
-BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/
-
give_latest_from_dates() {
sed 's,-20,~20,g' | \
sort -k +1 -n -t '~' |\
@@ -40,8 +33,8 @@ give_latest_from_dates() {
pre_build() {
pushd ${REPO_DIR}
git pull
-
popd
+
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
pushd $d
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-10-11 6:14 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-11 6:14 UTC (permalink / raw
To: gentoo-commits
commit: 8ee2ae6b0f4afaed714465e3ad9dfaf740cac50e
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 06:13:20 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 06:13:20 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=8ee2ae6b
Update config for amd64 / x86 to store stages under {default,hardened}.
---
tools/catalyst-auto-amd64.conf | 19 +++++++------------
tools/catalyst-auto-x86.conf | 16 ++++++----------
2 files changed, 13 insertions(+), 22 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index d46768d..96f8ce8 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -7,8 +7,7 @@ ARCH="amd64"
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
-SETS="multilib nomultilib hardened_multilib hardened_nomultilib"
-#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
+SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -59,24 +58,20 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
-# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-# cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
+ mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
-# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
-# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-# cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
+ mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
-# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
fi
}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 18364be..4ab5038 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -57,24 +57,20 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
-# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
-# cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
+ mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso* ]; then
-# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
fi
fi
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
-# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
-# cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
+ mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
if [ -f *${DATESTAMP}*.iso ]; then
-# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
fi
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-10-11 6:14 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-10-11 6:14 UTC (permalink / raw
To: gentoo-commits
commit: 104107c2b0d6b57bd4c3ec3a87c3851110f69a8f
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 06:08:14 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 06:08:14 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=104107c2
Create catalyst temp dirs, including logs, under /release path instead of using system /tmp.
---
tools/catalyst-auto | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index f49df56..9503cb7 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -108,7 +108,7 @@ fi
source ${config_file}
-TMPDIR=/tmp/catalyst-auto.${PID}
+TMPDIR=/release/tmp/catalyst-auto.${PID}
DATESTAMP=$(date +%Y%m%d)
if [ ${verbose} = 1 ]; then
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-09-17 20:50 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-09-17 20:50 UTC (permalink / raw
To: gentoo-commits
commit: 1c1dd9bf9e34063f7ea8abb0ed22059eb302f8a0
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 17 20:49:07 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Sep 17 20:49:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=1c1dd9bf
Update email address to skimmer and add nomultilib to the amd64 set.
---
tools/catalyst-auto-amd64.conf | 4 ++--
tools/catalyst-auto-x86.conf | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 49d046d..d46768d 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -7,7 +7,7 @@ ARCH="amd64"
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
-SETS="multilib hardened_multilib hardened_nomultilib"
+SETS="multilib nomultilib hardened_multilib hardened_nomultilib"
#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
@@ -21,7 +21,7 @@ SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-n
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
+EMAIL_FROM=catalyst@skimmer.gentoo.org
EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
CATALYST_CONFIG=/etc/catalyst/release/${ARCH}-auto.conf
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 818c5f4..18364be 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -19,7 +19,7 @@ SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.sp
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
+EMAIL_FROM=catalyst@skimmer.gentoo.org
EMAIL_SUBJECT_PREPEND="[${ARCH}-auto]"
CATALYST_CONFIG=/etc/catalyst/release/${ARCH}-auto.conf
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-08-31 0:25 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-08-31 0:25 UTC (permalink / raw
To: gentoo-commits
commit: e6637d16dcd5fb55c753b10d7d8dd37ee9a60d13
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 31 00:25:44 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Fri Aug 31 00:25:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=e6637d16
Fix x86 i[46]86 stage test.
---
tools/catalyst-auto-x86.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index bef6cb6..db2744b 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -56,7 +56,7 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-i[46]86-*${DATESTAMP}*.bz2 ]; then
+ if [ -f stage3-i486-*${DATESTAMP}*.bz2 -o -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
# cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-08-29 2:08 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-08-29 2:08 UTC (permalink / raw
To: gentoo-commits
commit: c842572bf9e9ec6dbc6565d850a08d6246a70e75
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 29 02:05:56 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Aug 29 02:05:56 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=c842572b
Drop extra '*' on catalyst-auto-x86.
---
tools/catalyst-auto-x86.conf | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 26f82b1..bef6cb6 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -56,7 +56,7 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-i[46]86-*${DATESTAMP}*.bz2* ]; then
+ if [ -f stage3-i[46]86-*${DATESTAMP}*.bz2 ]; then
# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
# cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
@@ -68,7 +68,7 @@ post_build() {
popd
pushd ${BUILD_SRCDIR_BASE}/hardened
- if [ -f stage3-i686-*${DATESTAMP}*.bz2* ]; then
+ if [ -f stage3-i686-*${DATESTAMP}*.bz2 ]; then
# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
# cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-07-18 4:00 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-07-18 4:00 UTC (permalink / raw
To: gentoo-commits
commit: 50891e6e0713138408d83db618bbbdee0ac82609
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 03:59:43 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jul 18 03:59:43 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=50891e6e
Fix the catalst-auto-x86.conf file.
---
tools/catalyst-auto-x86.conf | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index b1cbe95..26f82b1 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -56,7 +56,7 @@ pre_build() {
post_build() {
pushd ${BUILD_SRCDIR_BASE}/default
- if [ -f stage3-i[46]86-*${DATESTAMP}*.bz2* ]
+ if [ -f stage3-i[46]86-*${DATESTAMP}*.bz2* ]; then
# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
# cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
@@ -64,7 +64,6 @@ post_build() {
# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
fi
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
fi
popd
@@ -73,6 +72,10 @@ post_build() {
# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
# cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
+ if [ -f *${DATESTAMP}*.iso ]; then
+# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
+ fi
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-07-13 12:39 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-07-13 12:39 UTC (permalink / raw
To: gentoo-commits
commit: 25a5c10300513736d44ddacdc92135d4dcef66e9
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 28 00:20:00 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Tue Jul 10 00:38:07 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=25a5c103
Add more checks and tests in postbuild for amd64 / x86.
---
tools/catalyst-auto-amd64.conf | 29 ++++++++++++++++++++++-------
tools/catalyst-auto-x86.conf | 24 ++++++++++++++++++------
2 files changed, 40 insertions(+), 13 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 9131974..25e02f2 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -42,27 +42,42 @@ give_latest_from_dates() {
pre_build() {
pushd ${REPO_DIR}
git pull
+
popd
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- cd $d
+ pushd $d
for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
done
+ popd
done
}
post_build() {
- cd ${BUILD_SRCDIR_BASE}/default
- cp stage3-*${DATESTAMP}*bz2* ${BUILD_DESTDIR_BASE}/
- if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
+ pushd ${BUILD_SRCDIR_BASE}/default
+ if [ -f stage3-amd64-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-nomultilib-${DATESTAMP}.tar.bz2 ]; then
+# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+# cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
+ if [ -f *${DATESTAMP}*.iso ]; then
+# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
+ fi
fi
- cd ${BUILD_SRCDIR_BASE}/hardened
- if [ -n "$(ls -1 stage3-*${DATESTAMP}*.bz2.* 2>/dev/null)" ]; then
+ popd
+
+ pushd ${BUILD_SRCDIR_BASE}/hardened
+ if [ -f stage3-amd64-hardened-${DATESTAMP}.tar.bz2 -o -f stage3-amd64-hardened+nomultilib-${DATESTAMP}.tar.bz2 ]; then
+# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+# cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
+ if [ -f *${DATESTAMP}*.iso ]; then
+# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/hardened/
+ fi
fi
}
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 41d0acf..b1cbe95 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -40,26 +40,38 @@ give_latest_from_dates() {
pre_build() {
pushd ${REPO_DIR}
git pull
+
popd
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- cd $d
+ pushd $d
for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
ln -sf $f $of
done
+ popd
done
}
post_build() {
- cd ${BUILD_SRCDIR_BASE}/default
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
- if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then
+ pushd ${BUILD_SRCDIR_BASE}/default
+ if [ -f stage3-i[46]86-*${DATESTAMP}*.bz2* ]
+# mkdir ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+# cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/
+ if [ -f *${DATESTAMP}*.iso* ]; then
+# cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/default/${DATESTAMP}
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
+ fi
cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
fi
- cd ${BUILD_SRCDIR_BASE}/hardened
- if [ -n "$(ls -1 stage3-i686-*${DATESTAMP}*.bz2* 2>/dev/null)" ]; then
+ popd
+
+ pushd ${BUILD_SRCDIR_BASE}/hardened
+ if [ -f stage3-i686-*${DATESTAMP}*.bz2* ]; then
+# mkdir ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
+# cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/${DATESTAMP}
cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
fi
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-06-27 23:58 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-06-27 23:58 UTC (permalink / raw
To: gentoo-commits
commit: bd95b086759a6444569e1a094d250dc14f2d9d7e
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 27 23:58:05 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jun 27 23:58:05 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=bd95b086
Fix whitespace.
---
tools/catalyst-auto-amd64.conf | 56 ++++++++++++++++++++--------------------
tools/catalyst-auto-x86.conf | 56 ++++++++++++++++++++--------------------
2 files changed, 56 insertions(+), 56 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 502dc2d..9131974 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -30,40 +30,40 @@ BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/
BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/
give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' |\
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
}
pre_build() {
- pushd ${REPO_DIR}
- git pull
- popd
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- cd $d
- for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
- ln -sf $f $of
- done
- done
+ pushd ${REPO_DIR}
+ git pull
+ popd
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
+ cd $d
+ for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
+ ln -sf $f $of
+ done
+ done
}
post_build() {
- cd ${BUILD_SRCDIR_BASE}/default
- cp stage3-*${DATESTAMP}*bz2* ${BUILD_DESTDIR_BASE}/
- if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
- fi
- cd ${BUILD_SRCDIR_BASE}/hardened
- if [ -n "$(ls -1 stage3-*${DATESTAMP}*.bz2.* 2>/dev/null)" ]; then
- cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
- fi
+ cd ${BUILD_SRCDIR_BASE}/default
+ cp stage3-*${DATESTAMP}*bz2* ${BUILD_DESTDIR_BASE}/
+ if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
+ fi
+ cd ${BUILD_SRCDIR_BASE}/hardened
+ if [ -n "$(ls -1 stage3-*${DATESTAMP}*.bz2.* 2>/dev/null)" ]; then
+ cp stage3-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
+ fi
}
# vim:ft=sh:
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index e7f48be..41d0acf 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -28,40 +28,40 @@ BUILD_SRCDIR_BASE=${BASE_DIR}/buildroot/${ARCH}-dev/builds/
BUILD_DESTDIR_BASE=/home/buildsync/builds/${ARCH}/
give_latest_from_dates() {
- sed 's,-20,~20,g' | \
- sort -k +1 -n -t '~' |\
- awk -F\~ \
- 'BEGIN{i=$1; o=$0};
- { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
- END { print o; };' | \
- tr '~' '-'
+ sed 's,-20,~20,g' | \
+ sort -k +1 -n -t '~' |\
+ awk -F\~ \
+ 'BEGIN{i=$1; o=$0};
+ { if($1 != i && i != "") { print o; }; i=$1; o=$0; }
+ END { print o; };' | \
+ tr '~' '-'
}
pre_build() {
- pushd ${REPO_DIR}
- git pull
- popd
- # Symlink the latest stages3 to build from
- for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
- cd $d
- for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
- of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
- of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
- ln -sf $f $of
- done
- done
+ pushd ${REPO_DIR}
+ git pull
+ popd
+ # Symlink the latest stages3 to build from
+ for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
+ cd $d
+ for f in $(ls 'stage3*bz2' | give_latest_from_dates ) ; do
+ of=${f/20[0-9][0-9].[0-9]/latest} # for 20XX.Y stuff
+ of=${of/20[0-9][0-9][0-1][0-9][0-9][0-9]/latest} # for 20YYMMDD stuff
+ ln -sf $f $of
+ done
+ done
}
post_build() {
- cd ${BUILD_SRCDIR_BASE}/default
- cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
- if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then
- cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
- fi
- cd ${BUILD_SRCDIR_BASE}/hardened
- if [ -n "$(ls -1 stage3-i686-*${DATESTAMP}*.bz2* 2>/dev/null)" ]; then
- cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
- fi
+ cd ${BUILD_SRCDIR_BASE}/default
+ cp stage3-i[46]86-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}
+ if [ -n "$(ls -1 *${DATESTAMP}*.iso* 2>/dev/null)" ]; then
+ cp *${DATESTAMP}*.iso* ${BUILD_DESTDIR_BASE}/
+ fi
+ cd ${BUILD_SRCDIR_BASE}/hardened
+ if [ -n "$(ls -1 stage3-i686-*${DATESTAMP}*.bz2* 2>/dev/null)" ]; then
+ cp stage3-i686-*${DATESTAMP}*.bz2* ${BUILD_DESTDIR_BASE}/hardened/
+ fi
}
# vim:ft=sh:
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-06-13 4:53 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-06-13 4:53 UTC (permalink / raw
To: gentoo-commits
commit: c01d15caeaf2a1731cc7744e0faeef518f6f9cf0
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 13 04:52:28 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Jun 13 04:52:28 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=c01d15ca
Added x32 specs set and prepared the sets to build nomultilib and x32 targets.
---
tools/catalyst-auto-amd64.conf | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 80fe043..502dc2d 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -8,10 +8,12 @@ ARCH="amd64"
SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="multilib hardened_multilib hardened_nomultilib"
+#SETS="multilib nomultilib x32 hardened_multilib hardened_nomultilib"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
+SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-03-06 19:27 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2012-03-06 19:27 UTC (permalink / raw
To: gentoo-commits
commit: 81f0612a69c2b073dee2e05c2e4027d20a7a3701
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 6 19:27:01 2012 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Tue Mar 6 19:27:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=81f0612a
Fix path for GITDIR on ia64
---
tools/catalyst-auto-ia64.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index 46eae3d..f439fa9 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -1,7 +1,7 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-GITDIR=/root/releng
+GITDIR=/home/armin76/releng
SPECS_DIR=${GITDIR}/releases/weekly/specs/ia64
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-02-22 4:20 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-02-22 4:20 UTC (permalink / raw
To: gentoo-commits
commit: 8c70eae6eed96dcb005c43e2f53516a6e3bcd1de
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 22 04:16:53 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Wed Feb 22 04:16:53 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=8c70eae6
Add the nomultilib set. The target won't be built until the set is added to sets.
---
tools/catalyst-auto-amd64.conf | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 76e9405..80fe043 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -11,9 +11,9 @@ SETS="multilib hardened_multilib hardened_nomultilib"
SET_multilib_SPECS="stage1.spec stage2.spec stage3.spec"
SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec stage3-nomultilib.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
-
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-02-13 1:13 Jorge Manuel B. S. Vicetto
0 siblings, 0 replies; 460+ messages in thread
From: Jorge Manuel B. S. Vicetto @ 2012-02-13 1:13 UTC (permalink / raw
To: gentoo-commits
commit: e38dced51fc45730d8ae00635b9a45ad0d9a2c42
Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
AuthorDate: Mon Feb 13 01:10:01 2012 +0000
Commit: Jorge Manuel B. S. Vicetto <jmbsvicetto <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 01:10:01 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=e38dced5
Update catalyst tools to use git for amd64 and x86.
---
tools/catalyst-auto | 2 +-
tools/catalyst-auto-amd64.conf | 10 ++++++----
tools/catalyst-auto-x86.conf | 10 ++++++----
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/tools/catalyst-auto b/tools/catalyst-auto
index 4da3f42..f49df56 100755
--- a/tools/catalyst-auto
+++ b/tools/catalyst-auto
@@ -57,7 +57,7 @@ run_cmd() {
pre_build() {
# This is a skeleton function that you can override from the config file.
# It will be executed before the build is started. You can use this to
- # update a svn checkout of spec files
+ # update the checkout of the releng repo
local foo=bar
}
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 3c2ed6f..76e9405 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -2,10 +2,10 @@
# self-explanatory.
BASE_DIR="/release"
-SVN_DIR="${BASE_DIR}/svn-releng"
+REPO_DIR="${BASE_DIR}/releng"
ARCH="amd64"
-SPECS_DIR=${SVN_DIR}/trunk/releases/weekly/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="multilib hardened_multilib hardened_nomultilib"
@@ -16,7 +16,7 @@ SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/
SET_hardened_nomultilib_SPECS="hardened/stage1-nomultilib.spec hardened/stage2-nomultilib.spec hardened/stage3-nomultilib.spec"
-KCONFIG_DIR=${SVN_DIR}/trunk/releases/weekly/kconfig/${ARCH}
+KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
@@ -38,7 +38,9 @@ give_latest_from_dates() {
}
pre_build() {
- svn up ${SVN_DIR}
+ pushd ${REPO_DIR}
+ git pull
+ popd
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
cd $d
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index 5166e3e..e7f48be 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -2,10 +2,10 @@
# self-explanatory.
BASE_DIR="/release"
-SVN_DIR="${BASE_DIR}/svn-releng"
+REPO_DIR="${BASE_DIR}/releng"
ARCH="x86"
-SPECS_DIR=${SVN_DIR}/trunk/releases/weekly/specs/${ARCH}
+SPECS_DIR=${REPO_DIR}/releases/weekly/specs/${ARCH}
SETS="i486 i686 hardened"
@@ -16,7 +16,7 @@ SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
-KCONFIG_DIR=${SVN_DIR}/trunk/releases/weekly/kconfig/${ARCH}
+KCONFIG_DIR=${REPO_DIR}/releases/weekly/kconfig/${ARCH}
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@poseidon.amd64.dev.gentoo.org
@@ -38,7 +38,9 @@ give_latest_from_dates() {
}
pre_build() {
- svn up ${SVN_DIR}
+ pushd ${REPO_DIR}
+ git pull
+ popd
# Symlink the latest stages3 to build from
for d in ${BUILD_SRCDIR_BASE}/{default,hardened} ; do
cd $d
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-02-09 16:00 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2012-02-09 16:00 UTC (permalink / raw
To: gentoo-commits
commit: f061c9fb364df16fa9713ebad0ca5dce12c4d1a2
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 16:00:44 2012 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 16:00:44 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=f061c9fb
Update sparc64 conf
---
tools/catalyst-auto-sparc64.conf | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index 04e4b81..e26b089 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -5,7 +5,15 @@ GITDIR=/root/releng/
SPECS_DIR=${GITDIR}/releases/weekly/specs/sparc/sparc64
-SPECS="stage1.spec stage2.spec stage3.spec"
+SETS="default multilib"
+
+SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+SET_default_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+
+SET_multilib_SPECS="multilib/stage1.spec multilib/stage2.spec multilib/stage3.spec"
+
+
+#SPECS="stage1.spec stage2.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
#SPECS="${SPECS} stage2-desktop.spec stage3-desktop.spec"
#SPECS="${SPECS} livecd-stage1.spec livecd-stage2.spec"
@@ -27,4 +35,6 @@ pre_build() {
post_build() {
rsync -e 'ssh -i /root/.ssh/id_rsa' /var/tmp/catalyst/builds/default/stage3-*${DATESTAMP}*.bz2* /var/tmp/catalyst/builds/default/*${DATESTAMP}*.iso* buildsync@poseidon.amd64.dev.gentoo.org:/home/buildsync/builds/sparc/
+ rsync -e 'ssh -i /root/.ssh/id_rsa' /var/tmp/catalyst/builds/multilib/stage3-*${DATESTAMP}*.bz2* buildsync@poseidon.amd64.dev.gentoo.org:/home/buildsync/builds/sparc/multilib
+
}
^ permalink raw reply related [flat|nested] 460+ messages in thread* [gentoo-commits] proj/releng:master commit in: tools/
@ 2012-02-09 15:58 Raúl Porcel
0 siblings, 0 replies; 460+ messages in thread
From: Raúl Porcel @ 2012-02-09 15:58 UTC (permalink / raw
To: gentoo-commits
commit: 8e2a4cec660094a2ae2682fad3658ea5a7456983
Author: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
AuthorDate: Thu Feb 9 15:58:30 2012 +0000
Commit: Raúl Porcel <armin76 <AT> gentoo <DOT> org>
CommitDate: Thu Feb 9 15:58:30 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/releng.git;a=commit;h=8e2a4cec
Update confs to use git
---
tools/catalyst-auto-alpha.conf | 9 +++++----
tools/catalyst-auto-hppa.conf | 7 ++++---
tools/catalyst-auto-ia64.conf | 9 +++++----
tools/catalyst-auto-ppc.conf | 11 ++++++-----
tools/catalyst-auto-ppc64.conf | 11 ++++++-----
tools/catalyst-auto-sparc64.conf | 11 +++++++----
6 files changed, 33 insertions(+), 25 deletions(-)
diff --git a/tools/catalyst-auto-alpha.conf b/tools/catalyst-auto-alpha.conf
index 17231cf..1d1bc2f 100644
--- a/tools/catalyst-auto-alpha.conf
+++ b/tools/catalyst-auto-alpha.conf
@@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-SVNDIR=/home/armin76/releng
+GITDIR=/home/armin76/releng
-SPECS_DIR=${SVNDIR}/trunk/releases/weekly/specs/alpha
+SPECS_DIR=${GITDIR}/releases/weekly/specs/alpha
SPECS="stage1.spec stage2.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -12,7 +12,7 @@ SPECS="stage1.spec stage2.spec stage3.spec"
OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-KCONFIG_DIR=${SVNDIR}/trunk/releases/weekly/kconfig/alpha
+KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/alpha
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
#EMAIL_FROM=catalyst@monolith.alpha.dev.gentoo.org
@@ -22,7 +22,8 @@ EMAIL_SUBJECT_PREPEND="[alpha-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
pre_build() {
- svn up ${SVNDIR}
+ cd ${GITDIR}
+ git pull
}
post_build() {
diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 2b873c4..ee8deac 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-SVNDIR=/home/armin76/releng
+GITDIR=/home/armin76/releng
-SPECS_DIR=${SVNDIR}/trunk/releases/weekly/specs/hppa
+SPECS_DIR=${GITDIR}/releases/weekly/specs/hppa
SETS="hppa1_1 hppa2_0"
@@ -20,7 +20,8 @@ EMAIL_SUBJECT_PREPEND="[hppa-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
pre_build() {
- svn up ${SVNDIR}
+ cd ${GITDIR}
+ git pull
}
post_build() {
diff --git a/tools/catalyst-auto-ia64.conf b/tools/catalyst-auto-ia64.conf
index db9ec23..46eae3d 100644
--- a/tools/catalyst-auto-ia64.conf
+++ b/tools/catalyst-auto-ia64.conf
@@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-SVNDIR=/root/releng
+GITDIR=/root/releng
-SPECS_DIR=${SVNDIR}/trunk/releases/weekly/specs/ia64
+SPECS_DIR=${GITDIR}/releases/weekly/specs/ia64
SPECS="stage1.spec stage2.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -12,7 +12,7 @@ SPECS="stage1.spec stage2.spec stage3.spec"
OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-KCONFIG_DIR=${SVNDIR}/trunk/releases/weekly/kconfig/ia64
+KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/ia64
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
EMAIL_FROM=catalyst@dolphin.ia64.dev.gentoo.org
@@ -21,7 +21,8 @@ EMAIL_SUBJECT_PREPEND="[ia64-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
pre_build() {
- svn up ${SVNDIR}
+ cd ${GITDIR}
+ git pull
}
post_build() {
diff --git a/tools/catalyst-auto-ppc.conf b/tools/catalyst-auto-ppc.conf
index 6ca9f54..08d76da 100644
--- a/tools/catalyst-auto-ppc.conf
+++ b/tools/catalyst-auto-ppc.conf
@@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-SVNDIR=/home/armin76/releng
+GITDIR=/home/armin76/releng
-SPECS_DIR=${SVNDIR}/trunk/releases/weekly/specs/ppc/ppc32
+SPECS_DIR=${GITDIR}/releases/weekly/specs/ppc/ppc32
SPECS="stage1.spec stage2.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -12,16 +12,17 @@ SPECS="stage1.spec stage2.spec stage3.spec"
#OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-KCONFIG_DIR=${SVNDIR}/trunk/releases/weekly/kconfig/powerpc
+KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/powerpc
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@rooster.ppc64.dev.gentoo.org
+EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ppc-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
pre_build() {
- svn up ${SVNDIR}
+ cd ${GITDIR}
+ git pull
}
post_build() {
diff --git a/tools/catalyst-auto-ppc64.conf b/tools/catalyst-auto-ppc64.conf
index b8bdec6..6888164 100644
--- a/tools/catalyst-auto-ppc64.conf
+++ b/tools/catalyst-auto-ppc64.conf
@@ -1,9 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-SVNDIR=/home/armin76/releng
+GITDIR=/home/armin76/releng
-SPECS_DIR=${SVNDIR}/trunk/releases/weekly/specs/ppc/ppc64
+SPECS_DIR=${GITDIR}/releases/weekly/specs/ppc/ppc64
SPECS="stage1-32ul.spec stage2-32ul.spec stage3-32ul.spec stage1-64ul.spec stage2-64ul.spec stage3-64ul.spec"
@@ -13,16 +13,17 @@ SPECS="stage1-32ul.spec stage2-32ul.spec stage3-32ul.spec stage1-64ul.spec stage
OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-KCONFIG_DIR=${SVNDIR}/trunk/releases/weekly/kconfig/powerpc
+KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/powerpc
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@rooster.ppc64.dev.gentoo.org
+EMAIL_FROM=catalyst@timberdoodle.ppc64.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[ppc64-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
pre_build() {
- svn up ${SVNDIR}
+ cd ${GITDIR}
+ git pull
}
post_build() {
diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index cbe32fe..04e4b81 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -1,7 +1,9 @@
# This is the config file for the catalyst-auto script. It should be pretty
# self-explanatory.
-SPECS_DIR=/root/releng/svn-releng/trunk/releases/weekly/specs/sparc/sparc64
+GITDIR=/root/releng/
+
+SPECS_DIR=${GITDIR}/releases/weekly/specs/sparc/sparc64
SPECS="stage1.spec stage2.spec stage3.spec"
#SPECS="${SPECS} installcd-stage1.spec installcd-stage2-minimal.spec"
@@ -10,16 +12,17 @@ SPECS="stage1.spec stage2.spec stage3.spec"
OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
-KCONFIG_DIR=/root/releng/svn-releng/trunk/releases/weekly/kconfig/sparc
+KCONFIG_DIR=${GITDIR}/releases/weekly/kconfig/sparc
EMAIL_TO=releng@gentoo.org,gentoo-releng-autobuilds@lists.gentoo.org
-EMAIL_FROM=catalyst@bender.sparc64.dev.gentoo.org
+EMAIL_FROM=catalyst@bender.sparc.dev.gentoo.org
EMAIL_SUBJECT_PREPEND="[sparc64-auto]"
CATALYST_CONFIG=/etc/catalyst/catalyst.conf
pre_build() {
- svn up /root/releng/svn-releng/
+ cd ${GITDIR}
+ git pull
}
post_build() {
^ permalink raw reply related [flat|nested] 460+ messages in thread
end of thread, other threads:[~2024-11-08 20:24 UTC | newest]
Thread overview: 460+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-12-24 22:16 [gentoo-commits] proj/releng:master commit in: tools/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2024-11-08 20:24 Andreas K. Hüttel
2024-11-02 15:12 Andreas K. Hüttel
2024-09-15 0:44 Andreas K. Hüttel
2024-09-14 12:07 Ben Kohler
2024-07-29 21:44 Andreas K. Hüttel
2024-06-11 18:29 Andreas K. Hüttel
2024-06-01 15:48 Andreas K. Hüttel
2024-06-01 14:22 Andreas K. Hüttel
2024-05-06 11:17 Andreas K. Hüttel
2024-05-02 7:32 Andreas K. Hüttel
2024-04-06 14:35 Andreas K. Hüttel
2024-04-02 11:53 Ben Kohler
2024-03-31 12:05 Andreas K. Hüttel
2024-03-28 0:03 Andreas K. Hüttel
2024-03-27 13:25 Andreas K. Hüttel
2024-03-27 13:11 Andreas K. Hüttel
2024-03-23 14:21 Andreas K. Hüttel
2024-03-23 14:16 Andreas K. Hüttel
2024-03-23 14:11 Andreas K. Hüttel
2024-03-23 13:01 Andreas K. Hüttel
2024-03-23 10:59 Andreas K. Hüttel
2024-03-23 10:23 Andreas K. Hüttel
2024-03-23 10:08 Andreas K. Hüttel
2024-03-23 9:56 Andreas K. Hüttel
2024-03-22 22:11 Andreas K. Hüttel
2024-03-22 22:08 Andreas K. Hüttel
2024-03-22 22:05 Andreas K. Hüttel
2024-03-22 22:01 Andreas K. Hüttel
2024-03-22 21:58 Andreas K. Hüttel
2024-03-22 20:40 Andreas K. Hüttel
2024-03-22 20:31 Andreas K. Hüttel
2024-03-22 20:18 Andreas K. Hüttel
2024-03-22 19:59 Andreas K. Hüttel
2024-03-21 13:39 Andreas K. Hüttel
2024-03-19 16:14 Ben Kohler
2024-03-15 23:15 Andreas K. Hüttel
2024-03-14 10:22 Andreas K. Hüttel
2024-03-13 20:19 Andreas K. Hüttel
2024-03-11 19:07 Andreas K. Hüttel
2024-03-11 12:47 Andreas K. Hüttel
2024-03-09 0:52 Andreas K. Hüttel
2024-03-08 15:31 Andreas K. Hüttel
2024-03-08 13:49 Andreas K. Hüttel
2024-03-07 23:38 Andreas K. Hüttel
2024-03-07 18:45 Andreas K. Hüttel
2024-03-04 23:06 Andreas K. Hüttel
2024-03-02 14:37 Andreas K. Hüttel
2024-02-26 22:57 Andreas K. Hüttel
2024-02-25 21:49 Andreas K. Hüttel
2024-02-24 19:41 Andreas K. Hüttel
2024-02-24 14:33 Andreas K. Hüttel
2024-02-24 13:52 Andreas K. Hüttel
2024-02-20 20:44 Matt Turner
2024-02-20 17:16 Andreas K. Hüttel
2024-02-19 19:05 Andreas K. Hüttel
2024-02-16 22:15 Andreas K. Hüttel
2024-02-15 17:40 Andreas K. Hüttel
2024-02-13 22:43 Andreas K. Hüttel
2024-02-10 21:38 Andreas K. Hüttel
2024-02-10 16:21 Andreas K. Hüttel
2024-02-10 15:36 Andreas K. Hüttel
2024-02-05 21:13 Andreas K. Hüttel
2024-02-05 13:39 Andreas K. Hüttel
2024-01-28 0:58 Andreas K. Hüttel
2023-12-24 22:12 Andreas K. Hüttel
2023-12-24 22:08 Andreas K. Hüttel
2023-12-23 21:30 Andreas K. Hüttel
2023-12-23 21:20 Andreas K. Hüttel
2023-12-23 21:17 Andreas K. Hüttel
2023-12-23 21:14 Andreas K. Hüttel
2023-12-23 21:11 Andreas K. Hüttel
2023-12-23 21:02 Andreas K. Hüttel
2023-12-23 20:57 Andreas K. Hüttel
2023-12-22 0:39 Andreas K. Hüttel
2023-12-15 22:22 Andreas K. Hüttel
2023-12-15 21:28 Andreas K. Hüttel
2023-12-15 19:27 Andreas K. Hüttel
2023-12-15 18:38 Andreas K. Hüttel
2023-12-15 3:09 Andreas K. Hüttel
2023-12-14 22:33 Andreas K. Hüttel
2023-12-14 22:28 Andreas K. Hüttel
2023-12-14 22:28 Andreas K. Hüttel
2023-12-11 17:18 Andreas K. Hüttel
2023-12-11 17:18 Andreas K. Hüttel
2023-12-08 22:51 Andreas K. Hüttel
2023-12-07 22:11 Andreas K. Hüttel
2023-12-05 20:45 Andreas K. Hüttel
2023-12-05 20:45 Andreas K. Hüttel
2023-12-04 10:09 Andreas K. Hüttel
2023-11-12 2:03 Andreas K. Hüttel
2023-11-12 1:41 Andreas K. Hüttel
2023-11-11 23:45 Andreas K. Hüttel
2023-10-03 9:38 Andreas K. Hüttel
2023-09-09 9:39 Andreas K. Hüttel
2023-09-07 20:08 Andreas K. Hüttel
2023-09-05 22:34 Andreas K. Hüttel
2023-09-03 14:12 Andreas K. Hüttel
2023-09-02 11:22 Andreas K. Hüttel
2023-08-20 22:35 Andreas K. Hüttel
2023-08-18 18:30 Andreas K. Hüttel
2023-08-16 19:30 Andreas K. Hüttel
2023-08-15 21:47 Andreas K. Hüttel
2023-08-15 21:33 Andreas K. Hüttel
2023-08-13 18:36 Andreas K. Hüttel
2023-08-12 18:18 Andreas K. Hüttel
2023-08-09 23:18 Andreas K. Hüttel
2023-08-08 17:55 Andreas K. Hüttel
2023-08-08 0:38 Andreas K. Hüttel
2023-08-06 22:40 Andreas K. Hüttel
2023-08-05 22:42 Andreas K. Hüttel
2023-08-05 19:15 Andreas K. Hüttel
2023-08-05 19:06 Andreas K. Hüttel
2023-06-24 15:05 Andreas K. Hüttel
2023-03-27 19:52 Andreas K. Hüttel
2023-03-12 22:23 Andreas K. Hüttel
2023-03-12 22:10 Andreas K. Hüttel
2023-03-05 22:43 Andreas K. Hüttel
2023-03-05 22:43 Andreas K. Hüttel
2023-03-02 18:32 Andreas K. Hüttel
2023-02-26 23:28 Andreas K. Hüttel
2023-02-26 23:19 Andreas K. Hüttel
2023-01-27 13:38 Andreas K. Hüttel
2023-01-25 15:07 Andreas K. Hüttel
2023-01-24 23:14 Andreas K. Hüttel
2023-01-19 15:58 Andreas K. Hüttel
2023-01-18 13:02 Andreas K. Hüttel
2022-12-12 9:05 Andreas K. Hüttel
2022-12-11 14:48 Andreas K. Hüttel
2022-12-10 11:33 Andreas K. Hüttel
2022-12-09 0:26 Andreas K. Hüttel
2022-12-08 16:28 Andreas K. Hüttel
2022-11-30 23:58 Andreas K. Hüttel
2022-11-29 20:33 Andreas K. Hüttel
2022-11-29 19:55 Andreas K. Hüttel
2022-11-29 9:24 Andreas K. Hüttel
2022-11-28 23:27 Andreas K. Hüttel
2022-11-28 13:31 Andreas K. Hüttel
2022-11-27 0:27 Andreas K. Hüttel
2022-11-22 23:37 Andreas K. Hüttel
2022-11-22 2:07 Matt Turner
2022-11-21 23:52 Andreas K. Hüttel
2022-11-15 23:28 Andreas K. Hüttel
2022-11-04 20:51 Georgy Yakovlev
2022-10-31 23:29 Georgy Yakovlev
2022-10-12 18:56 Andreas K. Hüttel
2022-10-11 14:55 Andreas K. Hüttel
2022-09-19 3:11 Georgy Yakovlev
2022-09-19 1:24 Georgy Yakovlev
2022-08-09 16:53 Andreas K. Hüttel
2022-07-18 21:36 Andreas K. Hüttel
2022-07-18 20:14 Andreas K. Hüttel
2022-07-18 18:40 Andreas K. Hüttel
2022-06-01 10:13 Andreas K. Hüttel
2022-05-30 13:46 Andreas K. Hüttel
2022-05-24 10:53 Andreas K. Hüttel
2022-05-05 17:52 Andreas K. Hüttel
2022-05-01 12:07 Andreas K. Hüttel
2022-04-26 18:34 Andreas K. Hüttel
2022-04-25 23:25 Andreas K. Hüttel
2022-04-25 16:55 Andreas K. Hüttel
2022-04-24 12:33 Andreas K. Hüttel
2022-04-22 23:34 Andreas K. Hüttel
2022-04-19 19:46 Andreas K. Hüttel
2022-03-29 14:32 Andreas K. Hüttel
2022-03-26 17:52 Andreas K. Hüttel
2022-03-16 23:58 Andreas K. Hüttel
2022-03-05 16:11 Andreas K. Hüttel
2022-03-04 18:41 Andreas K. Hüttel
2022-03-01 22:14 Andreas K. Hüttel
2022-03-01 8:25 Andreas K. Hüttel
2022-03-01 8:11 Andreas K. Hüttel
2022-02-27 15:56 Andreas K. Hüttel
2022-02-21 13:04 Andreas K. Hüttel
2022-02-21 13:04 Andreas K. Hüttel
2022-02-21 12:58 Andreas K. Hüttel
2022-02-19 14:21 Andreas K. Hüttel
2022-02-16 16:22 Andreas K. Hüttel
2022-02-12 17:50 Andreas K. Hüttel
2022-01-23 19:22 Andreas K. Hüttel
2022-01-15 0:12 Andreas K. Hüttel
2021-12-05 22:43 Andreas K. Hüttel
2021-11-21 13:11 Andreas K. Hüttel
2021-11-20 14:48 Andreas K. Hüttel
2021-11-19 21:40 Andreas K. Hüttel
2021-11-17 21:59 Andreas K. Hüttel
2021-11-17 19:46 Georgy Yakovlev
2021-11-17 5:26 Georgy Yakovlev
2021-11-10 21:05 Andreas K. Hüttel
2021-11-10 20:59 Andreas K. Hüttel
2021-11-10 20:39 Andreas K. Hüttel
2021-10-18 21:26 Andreas K. Hüttel
2021-10-18 20:06 Andreas K. Hüttel
2021-09-26 12:34 Andreas K. Hüttel
2021-09-26 12:15 Andreas K. Hüttel
2021-09-10 20:17 Andreas K. Hüttel
2021-09-02 10:44 Andreas K. Hüttel
2021-08-30 12:30 Andreas K. Hüttel
2021-08-30 8:54 Andreas K. Hüttel
2021-08-29 17:05 Andreas K. Hüttel
2021-08-29 13:54 Andreas K. Hüttel
2021-08-29 13:54 Andreas K. Hüttel
2021-08-26 19:56 Matt Turner
2021-08-26 19:56 Matt Turner
2021-08-22 10:10 Andreas K. Hüttel
2021-08-10 21:45 Andreas K. Hüttel
2021-07-31 17:55 Matt Turner
2021-07-31 15:53 Andreas K. Hüttel
2021-07-31 15:53 Andreas K. Hüttel
2021-07-31 15:50 Andreas K. Hüttel
2021-07-31 15:50 Andreas K. Hüttel
2021-07-25 4:01 Georgy Yakovlev
2021-07-15 4:32 Georgy Yakovlev
2021-07-14 21:21 Georgy Yakovlev
2021-07-14 20:43 Georgy Yakovlev
2021-07-12 21:17 Andreas K. Hüttel
2021-07-10 21:53 Andreas K. Hüttel
2021-07-08 8:26 Andreas K. Hüttel
2021-07-06 23:02 Andreas K. Hüttel
2021-07-06 23:02 Andreas K. Hüttel
2021-07-05 23:31 Andreas K. Hüttel
2021-07-05 23:21 Andreas K. Hüttel
2021-07-05 22:23 Andreas K. Hüttel
2021-07-04 20:32 Andreas K. Hüttel
2021-07-02 19:45 Andreas K. Hüttel
2021-06-29 21:12 Andreas K. Hüttel
2021-06-25 19:17 Andreas K. Hüttel
2021-06-23 16:14 Andreas K. Hüttel
2021-06-15 14:18 Andreas K. Hüttel
2021-06-11 16:11 Andreas K. Hüttel
2021-05-31 8:27 Georgy Yakovlev
2021-05-30 21:38 Georgy Yakovlev
2021-05-19 19:50 Andreas K. Hüttel
2021-05-13 3:19 Georgy Yakovlev
2021-05-13 3:19 Georgy Yakovlev
2021-05-08 13:55 Andreas K. Hüttel
2021-05-02 2:28 Andreas K. Hüttel
2021-05-01 20:53 Andreas K. Hüttel
2021-05-01 20:50 Andreas K. Hüttel
2021-05-01 20:22 Andreas K. Hüttel
2021-04-05 19:35 Andreas K. Hüttel
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-02-01 4:04 Matt Turner
2021-01-31 23:08 [gentoo-commits] proj/releng:consolidate-upload " Matt Turner
2021-02-01 4:04 ` [gentoo-commits] proj/releng:master " Matt Turner
2021-01-31 0:50 Matt Turner
2021-01-31 0:50 Matt Turner
2021-01-31 0:50 Matt Turner
2021-01-30 19:26 Matt Turner
2021-01-25 7:18 Andreas K. Hüttel
2021-01-19 21:31 Andreas K. Hüttel
2021-01-19 20:44 Andreas K. Hüttel
2021-01-15 19:55 Andreas K. Hüttel
2021-01-15 19:55 Andreas K. Hüttel
2021-01-13 1:55 Andreas K. Hüttel
2021-01-13 1:55 Andreas K. Hüttel
2020-12-21 14:14 Andreas K. Hüttel
2020-12-17 22:23 Matt Turner
2020-12-15 23:29 Matt Turner
2020-12-15 23:18 Matt Turner
2020-12-04 14:46 Andreas K. Hüttel
2020-10-21 19:00 Matt Turner
2020-10-15 17:55 Matt Turner
2020-08-29 12:34 Andreas K. Hüttel
2020-08-17 22:14 Matt Turner
2020-08-12 15:44 Ben Kohler
2020-07-28 11:15 Andreas K. Hüttel
2020-07-28 10:59 Andreas K. Hüttel
2020-07-27 23:14 Andreas K. Hüttel
2020-07-06 21:48 Ben Kohler
2020-06-30 10:39 Ben Kohler
2020-05-31 16:45 Mike Frysinger
2020-05-31 16:32 Mike Frysinger
2020-05-26 11:50 Ben Kohler
2020-05-25 18:53 Ben Kohler
2020-05-25 11:10 Ben Kohler
2020-05-20 13:52 Ben Kohler
2020-05-17 22:31 Matt Turner
2020-05-17 22:31 Matt Turner
2020-05-17 15:34 Ben Kohler
2020-05-16 18:26 Ben Kohler
2020-05-16 18:26 Ben Kohler
2020-05-16 18:26 Ben Kohler
2020-05-12 5:47 Robin H. Johnson
2020-05-12 5:47 Robin H. Johnson
2020-05-12 5:16 Robin H. Johnson
2020-05-11 19:05 Ben Kohler
2020-05-09 21:41 Matt Turner
2020-05-08 4:59 Robin H. Johnson
2020-04-30 23:16 Matt Turner
2020-04-30 22:54 Matt Turner
2020-04-29 23:20 Matt Turner
2020-04-29 23:20 Matt Turner
2020-04-26 5:24 Matt Turner
2020-04-26 5:19 Matt Turner
2020-04-25 3:55 Matt Turner
2020-04-24 18:31 Matt Turner
2020-04-24 6:56 Matt Turner
2020-04-23 21:41 Matt Turner
2020-04-23 7:21 Matt Turner
2020-02-03 12:03 Jorge Manuel B. S. Vicetto
2019-10-06 16:27 Matt Turner
2019-09-05 15:48 Matt Turner
2019-09-02 17:30 Matt Turner
2019-09-02 2:06 Matt Turner
2019-09-01 16:57 Matt Turner
2019-09-01 16:57 Matt Turner
2019-08-29 17:39 Matt Turner
2019-06-07 0:37 Jorge Manuel B. S. Vicetto
2019-05-30 21:11 Matt Turner
2019-05-30 21:11 Matt Turner
2019-01-11 14:11 Ben Kohler
2019-01-09 17:19 Ben Kohler
2019-01-09 2:46 Ben Kohler
2019-01-08 17:34 Ben Kohler
2019-01-08 17:18 Ben Kohler
2019-01-06 20:38 Ben Kohler
2019-01-05 23:45 Matt Turner
2019-01-05 23:20 Matt Turner
2019-01-04 22:51 Ben Kohler
2019-01-04 22:51 Ben Kohler
2019-01-04 16:46 Ben Kohler
2019-01-04 16:44 Ben Kohler
2019-01-04 16:34 Ben Kohler
2019-01-03 16:09 Ben Kohler
2018-09-17 19:22 Matt Turner
2018-09-17 3:27 Matt Turner
2018-09-16 15:47 Matt Turner
2018-09-16 15:23 Matt Turner
2018-09-16 15:12 Matt Turner
2018-09-16 15:10 Matt Turner
2018-09-16 15:10 Matt Turner
2018-09-16 15:10 Matt Turner
2018-09-16 5:48 Matt Turner
2018-09-16 5:48 Matt Turner
2018-09-16 5:48 Matt Turner
2018-09-14 18:24 Matt Turner
2018-03-02 15:04 Matt Thode
2018-03-02 15:04 Matt Thode
2018-03-02 12:36 Matt Thode
2018-03-02 12:33 Matt Thode
2018-01-16 16:24 Mike Frysinger
2018-01-16 16:21 Mike Frysinger
2018-01-16 16:21 Mike Frysinger
2018-01-16 16:21 Mike Frysinger
2018-01-16 7:27 Mike Frysinger
2018-01-16 7:27 Mike Frysinger
2018-01-16 6:44 Mike Frysinger
2018-01-16 6:44 Mike Frysinger
2018-01-16 3:52 Mike Frysinger
2017-12-29 5:32 Robin H. Johnson
2017-12-28 19:01 Robin H. Johnson
2017-12-27 2:56 Jorge Manuel B. S. Vicetto
2017-12-22 11:30 Jorge Manuel B. S. Vicetto
2017-12-22 11:22 Jorge Manuel B. S. Vicetto
2017-12-22 11:03 Jorge Manuel B. S. Vicetto
2017-12-15 23:44 Robin H. Johnson
2017-12-15 5:48 Robin H. Johnson
2017-12-15 5:48 Robin H. Johnson
2017-12-15 5:48 Robin H. Johnson
2017-12-15 3:45 Robin H. Johnson
2017-12-15 3:45 Robin H. Johnson
2017-12-15 3:45 Robin H. Johnson
2017-12-15 3:45 Robin H. Johnson
2017-12-08 8:04 Robin H. Johnson
2017-12-03 21:23 Robin H. Johnson
2017-12-03 21:20 Matt Thode
2017-03-23 2:16 Mike Frysinger
2017-03-23 2:16 Mike Frysinger
2017-03-23 2:16 Mike Frysinger
2016-12-22 1:20 Mike Frysinger
2016-12-22 1:20 Mike Frysinger
2016-12-22 1:20 Mike Frysinger
2016-12-22 1:20 Mike Frysinger
2016-12-22 1:20 Mike Frysinger
2016-12-22 1:20 Mike Frysinger
2016-06-15 1:37 Robin H. Johnson
2016-05-30 16:13 Robin H. Johnson
2016-05-27 20:43 Robin H. Johnson
2016-05-24 2:28 Mike Frysinger
2016-05-24 2:05 Mike Frysinger
2016-05-24 2:05 Mike Frysinger
2016-05-07 20:04 Mike Frysinger
2016-05-06 18:32 Robin H. Johnson
2016-05-05 10:10 Jorge Manuel B. S. Vicetto
2016-04-29 18:20 Robin H. Johnson
2016-04-27 21:34 Robin H. Johnson
2016-04-27 1:59 Jorge Manuel B. S. Vicetto
2016-04-26 22:35 Jorge Manuel B. S. Vicetto
2016-04-26 21:46 Jorge Manuel B. S. Vicetto
2016-04-26 21:11 Robin H. Johnson
2016-03-27 5:33 Mike Frysinger
2016-03-24 5:26 Mike Frysinger
2016-03-24 3:30 Jorge Manuel B. S. Vicetto
2016-03-23 18:23 Mike Frysinger
2016-03-22 16:46 Mike Frysinger
2016-03-22 1:48 Mike Frysinger
2016-03-22 1:48 Mike Frysinger
2016-03-22 1:48 Mike Frysinger
2016-03-20 20:15 Mike Frysinger
2016-03-16 21:28 Mike Frysinger
2016-03-13 23:47 Jorge Manuel B. S. Vicetto
2016-01-26 7:45 Robin H. Johnson
2016-01-26 5:49 Matt Thode
2016-01-26 0:44 Matt Thode
2016-01-13 22:17 Jorge Manuel B. S. Vicetto
2015-12-27 2:44 Jorge Manuel B. S. Vicetto
2015-12-27 2:37 Jorge Manuel B. S. Vicetto
2015-12-18 2:54 Jorge Manuel B. S. Vicetto
2015-12-18 2:30 Jorge Manuel B. S. Vicetto
2014-10-06 7:47 Raúl Porcel
2014-10-02 11:50 Raúl Porcel
2014-09-10 20:35 Mike Frysinger
2014-09-10 20:35 Mike Frysinger
2014-09-10 20:35 Mike Frysinger
2014-09-10 20:35 Mike Frysinger
2014-08-18 21:59 Robin H. Johnson
2014-08-08 14:01 Raúl Porcel
2014-04-15 11:07 Guy Martin
2014-02-24 7:50 Mike Frysinger
2014-02-01 18:10 Raúl Porcel
2013-08-20 6:33 Raúl Porcel
2013-08-19 11:46 Raúl Porcel
2013-08-16 10:23 Raúl Porcel
2013-08-16 10:18 Raúl Porcel
2013-08-16 10:08 Raúl Porcel
2013-08-16 1:27 Jorge Manuel B. S. Vicetto
2013-08-14 18:01 Raúl Porcel
2013-08-14 18:01 Raúl Porcel
2013-08-14 17:23 Raúl Porcel
2013-08-06 15:29 Raúl Porcel
2013-04-28 22:37 Jorge Manuel B. S. Vicetto
2013-04-20 15:21 Jorge Manuel B. S. Vicetto
2013-04-18 8:33 Jorge Manuel B. S. Vicetto
2013-04-18 8:04 Jorge Manuel B. S. Vicetto
2012-10-14 4:38 Jorge Manuel B. S. Vicetto
2012-10-13 4:19 Jorge Manuel B. S. Vicetto
2012-10-13 4:19 Jorge Manuel B. S. Vicetto
2012-10-11 6:14 Jorge Manuel B. S. Vicetto
2012-10-11 6:14 Jorge Manuel B. S. Vicetto
2012-09-17 20:50 Jorge Manuel B. S. Vicetto
2012-08-31 0:25 Jorge Manuel B. S. Vicetto
2012-08-29 2:08 Jorge Manuel B. S. Vicetto
2012-07-18 4:00 Jorge Manuel B. S. Vicetto
2012-07-13 12:39 Jorge Manuel B. S. Vicetto
2012-06-27 23:58 Jorge Manuel B. S. Vicetto
2012-06-13 4:53 Jorge Manuel B. S. Vicetto
2012-03-06 19:27 Raúl Porcel
2012-02-22 4:20 Jorge Manuel B. S. Vicetto
2012-02-13 1:13 Jorge Manuel B. S. Vicetto
2012-02-09 16:00 Raúl Porcel
2012-02-09 15:58 Raúl Porcel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox