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

[Andreas K. Hüttel]

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