[gentoo-commits] proj/releng:master commit in: releases/specs/hppa/hppa2.0/, tools/

[Andreas K. Hüttel]

commit:     85671b9938ba321123305e1a858f0de881662510
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 18:58:58 2022 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 18:58:58 2022 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=85671b99

hppa2.0: drop unused stage2, rename spec files

Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>

 .../specs/hppa/hppa2.0/{stage1.spec => stage1-openrc.spec}     |  0
 releases/specs/hppa/hppa2.0/stage2.spec                        | 10 ----------
 .../specs/hppa/hppa2.0/{stage3.spec => stage3-openrc.spec}     |  0
 tools/catalyst-auto-hppa.conf                                  |  4 ++--
 4 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/releases/specs/hppa/hppa2.0/stage1.spec 
b/releases/specs/hppa/hppa2.0/stage1-openrc.spec
similarity index 100%
rename from releases/specs/hppa/hppa2.0/stage1.spec
rename to releases/specs/hppa/hppa2.0/stage1-openrc.spec

diff --git a/releases/specs/hppa/hppa2.0/stage2.spec 
b/releases/specs/hppa/hppa2.0/stage2.spec
deleted file mode 100644
index aaae12da..00000000
--- a/releases/specs/hppa/hppa2.0/stage2.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: hppa2.0
-target: stage2
-version_stamp: @TIMESTAMP@
-rel_type: default
-profile: default/linux/hppa/17.0
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-hppa2.0-@TIMESTAMP@
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
-pkgcache_path: /var/tmp/catalyst/packages/default/stage2-hppa2.0

diff --git a/releases/specs/hppa/hppa2.0/stage3.spec 
b/releases/specs/hppa/hppa2.0/stage3-openrc.spec
similarity index 100%
rename from releases/specs/hppa/hppa2.0/stage3.spec
rename to releases/specs/hppa/hppa2.0/stage3-openrc.spec

diff --git a/tools/catalyst-auto-hppa.conf b/tools/catalyst-auto-hppa.conf
index 07da406d..f485325d 100644
--- a/tools/catalyst-auto-hppa.conf
+++ b/tools/catalyst-auto-hppa.conf
@@ -9,7 +9,7 @@ SETS="hppa1_1 hppa2_0 hppa_livecd hppa_netboot"
 
 SET_hppa1_1_SPECS="hppa1.1/stage1.spec hppa1.1/stage3.spec"
 
-SET_hppa2_0_SPECS="hppa2.0/stage1.spec hppa2.0/stage3.spec"
+SET_hppa2_0_SPECS="hppa2.0/stage1-openrc.spec hppa2.0/stage3-openrc.spec"
 
 SET_hppa_livecd_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
@@ -54,7 +54,7 @@ post_build() {
        hppa1.1/stage3.spec)
                upload stage3-hppa1.1-*${TIMESTAMP}*.bz2*
                ;;
-       hppa2.0/stage3.spec)
+       hppa2.0/stage3-openrc.spec)
                upload stage3-hppa2.0-*${TIMESTAMP}*.bz2*
                ;;
        *)