* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/amd64/hardened/, ...
@ 2021-07-10 18:46 Andreas K. Hüttel
0 siblings, 0 replies; only message in thread
From: Andreas K. Hüttel @ 2021-07-10 18:46 UTC (permalink / raw
To: gentoo-commits
commit: b891ceb5991363ef0d234c0a911def0beaa330b7
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 10 17:15:23 2021 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Sat Jul 10 17:15:23 2021 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=b891ceb5
amd64: move amd64 hardened-nomultilib to demeter
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
.../stage1-openrc.spec} | 4 ++--
.../stage2-openrc.spec} | 4 ++--
.../stage3-openrc.spec} | 4 ++--
tools/catalyst-auto-amd64-demeter.conf | 9 ++++++---
tools/catalyst-auto-amd64.conf | 10 ----------
5 files changed, 12 insertions(+), 19 deletions(-)
diff --git a/releases/specs/amd64/hardened/stage1-nomultilib.spec b/releases/specs/amd64/hardened-nomultilib/stage1-openrc.spec
similarity index 70%
rename from releases/specs/amd64/hardened/stage1-nomultilib.spec
rename to releases/specs/amd64/hardened-nomultilib/stage1-openrc.spec
index 3228d154..72f6e386 100644
--- a/releases/specs/amd64/hardened/stage1-nomultilib.spec
+++ b/releases/specs/amd64/hardened-nomultilib/stage1-openrc.spec
@@ -1,10 +1,10 @@
subarch: amd64
target: stage1
-version_stamp: hardened+nomultilib-@TIMESTAMP@
+version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@
rel_type: hardened
profile: default/linux/amd64/17.1/no-multilib/hardened
snapshot: @TIMESTAMP@
-source_subpath: hardened/stage3-amd64-hardened+nomultilib-latest
+source_subpath: hardened/stage3-amd64-hardened-nomultilib-openrc-latest
compression_mode: pixz_x
update_seed: yes
update_seed_command: --update --deep --newuse @world
diff --git a/releases/specs/amd64/hardened/stage2-nomultilib.spec b/releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec
similarity index 63%
rename from releases/specs/amd64/hardened/stage2-nomultilib.spec
rename to releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec
index 5f088727..3ad5fd58 100644
--- a/releases/specs/amd64/hardened/stage2-nomultilib.spec
+++ b/releases/specs/amd64/hardened-nomultilib/stage2-openrc.spec
@@ -1,10 +1,10 @@
subarch: amd64
target: stage2
-version_stamp: hardened+nomultilib-@TIMESTAMP@
+version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@
rel_type: hardened
profile: default/linux/amd64/17.1/no-multilib/hardened
snapshot: @TIMESTAMP@
-source_subpath: hardened/stage1-amd64-hardened+nomultilib-@TIMESTAMP@
+source_subpath: hardened/stage1-amd64-hardened-nomultilib-openrc-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/amd64/hardened/stage3-nomultilib.spec b/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec
similarity index 63%
rename from releases/specs/amd64/hardened/stage3-nomultilib.spec
rename to releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec
index fa297c92..84dad839 100644
--- a/releases/specs/amd64/hardened/stage3-nomultilib.spec
+++ b/releases/specs/amd64/hardened-nomultilib/stage3-openrc.spec
@@ -1,10 +1,10 @@
subarch: amd64
target: stage3
-version_stamp: hardened+nomultilib-@TIMESTAMP@
+version_stamp: hardened-nomultilib-openrc-@TIMESTAMP@
rel_type: hardened
profile: default/linux/amd64/17.1/no-multilib/hardened
snapshot: @TIMESTAMP@
-source_subpath: hardened/stage2-amd64-hardened+nomultilib-@TIMESTAMP@
+source_subpath: hardened/stage2-amd64-hardened-nomultilib-openrc-@TIMESTAMP@
compression_mode: pixz_x
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/tools/catalyst-auto-amd64-demeter.conf b/tools/catalyst-auto-amd64-demeter.conf
index bfe2509c..fc3bbe49 100644
--- a/tools/catalyst-auto-amd64-demeter.conf
+++ b/tools/catalyst-auto-amd64-demeter.conf
@@ -14,6 +14,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
hardened_openrc
+ hardened_nomultilib_openrc
nomultilib_openrc
nomultilib_systemd
musl
@@ -24,12 +25,11 @@ SETS="
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"
+SET_hardened_nomultilib_openrc_SPECS="hardened-nomultilib/stage1-openrc.spec hardened-nomultilib/stage2-openrc.spec hardened-nomultilib/stage3-openrc.spec"
+
SET_nomultilib_openrc_SPECS="nomultilib/stage1-openrc.spec nomultilib/stage2-openrc.spec nomultilib/stage3-openrc.spec"
SET_nomultilib_systemd_SPECS="nomultilib/stage1-systemd.spec nomultilib/stage2-systemd.spec nomultilib/stage3-systemd.spec"
-##SET_minimal_hardened_multilib_OPTIONAL_SPECS="hardened/stage4-minimal.spec"
-##SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
-
SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
SET_musl_hardened_SPECS="musl/stage1-hardened.spec musl/stage2-hardened.spec musl/stage3-hardened.spec"
@@ -85,6 +85,9 @@ post_build() {
hardened/admincd-stage2.spec)
upload admincd-amd64-${TIMESTAMP}.iso*
;;
+ hardened-nomultilib/stage3-openrc.spec)
+ upload stage3-amd64-hardened-nomultilib-openrc-${TIMESTAMP}.tar.xz*
+ ;;
esac
popd >/dev/null || exit
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index ebfb4d4f..261db285 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -14,7 +14,6 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
multilib minimal_multilib
systemd
- hardened_nomultilib minimal_hardened_nomultilib
hardened_multilib_selinux hardened_nomultilib_selinux
"
@@ -24,9 +23,6 @@ SET_multilib_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec
SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.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"
@@ -84,12 +80,6 @@ post_build() {
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*
;;
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-07-10 18:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-10 18:46 [gentoo-commits] proj/releng:master commit in: tools/, releases/specs/amd64/hardened/, Andreas K. Hüttel
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox