[gentoo-commits] proj/releng:master commit in: releases/specs/x86/musl/, releases/specs/x86/hardened/, releases/specs/x86/i686/, ...

2024-06-01 Thread Andreas K. Hüttel 
commit: e5d7d48cf5fc6f606acfaf418c03b40325032834
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sat Jun  1 20:34:42 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sat Jun  1 20:34:42 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=e5d7d48c

Clean up x86 specs

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

 releases/specs/x86/hardened/stage1-openrc.spec | 12 
 releases/specs/x86/hardened/stage3-openrc.spec | 11 ---
 releases/specs/x86/i486/stage1-openrc.spec | 12 
 releases/specs/x86/i486/stage3-openrc.spec | 11 ---
 releases/specs/x86/i686/stage1-openrc.spec | 12 
 releases/specs/x86/i686/stage3-openrc.spec | 11 ---
 releases/specs/x86/musl/stage1.spec| 13 -
 releases/specs/x86/musl/stage3.spec| 11 ---
 8 files changed, 93 deletions(-)

diff --git a/releases/specs/x86/hardened/stage1-openrc.spec 
b/releases/specs/x86/hardened/stage1-openrc.spec
deleted file mode 100644
index fd0a33b0..
--- a/releases/specs/x86/hardened/stage1-openrc.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: i686
-target: stage1
-version_stamp: hardened-openrc-@TIMESTAMP@
-rel_type: hardened
-profile: default/linux/x86/17.0/hardened
-snapshot_treeish: @TREEISH@
-source_subpath: hardened/stage3-i686-hardened-openrc-latest
-compression_mode: pixz
-update_seed: yes
-update_seed_command: --update --deep --newuse @world
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng

diff --git a/releases/specs/x86/hardened/stage3-openrc.spec 
b/releases/specs/x86/hardened/stage3-openrc.spec
deleted file mode 100644
index 238fc9a3..
--- a/releases/specs/x86/hardened/stage3-openrc.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: i686
-target: stage3
-version_stamp: hardened-openrc-@TIMESTAMP@
-rel_type: hardened
-profile: default/linux/x86/17.0/hardened
-snapshot_treeish: @TREEISH@
-source_subpath: hardened/stage1-i686-hardened-openrc-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
-binrepo_path: x86/binpackages/17.0/i686_hardened

diff --git a/releases/specs/x86/i486/stage1-openrc.spec 
b/releases/specs/x86/i486/stage1-openrc.spec
deleted file mode 100644
index cf165173..
--- a/releases/specs/x86/i486/stage1-openrc.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: i486
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-i486-openrc-latest
-compression_mode: pixz
-update_seed: yes
-update_seed_command: --update --deep --newuse @world
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng

diff --git a/releases/specs/x86/i486/stage3-openrc.spec 
b/releases/specs/x86/i486/stage3-openrc.spec
deleted file mode 100644
index 34f523d8..
--- a/releases/specs/x86/i486/stage3-openrc.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: i486
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-i486-openrc-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
-binrepo_path: x86/binpackages/17.0/i486

diff --git a/releases/specs/x86/i686/stage1-openrc.spec 
b/releases/specs/x86/i686/stage1-openrc.spec
deleted file mode 100644
index 6922206d..
--- a/releases/specs/x86/i686/stage1-openrc.spec
+++ /dev/null
@@ -1,12 +0,0 @@
-subarch: i686
-target: stage1
-version_stamp: openrc-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-i686-openrc-latest
-compression_mode: pixz
-update_seed: yes
-update_seed_command: --update --deep --newuse @world
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng

diff --git a/releases/specs/x86/i686/stage3-openrc.spec 
b/releases/specs/x86/i686/stage3-openrc.spec
deleted file mode 100644
index 2cac1c31..
--- a/releases/specs/x86/i686/stage3-openrc.spec
+++ /dev/null
@@ -1,11 +0,0 @@
-subarch: i686
-target: stage3
-version_stamp: openrc-@TIMESTAMP@
-rel_type: default
-profile: default/linux/x86/17.0
-snapshot_treeish: @TREEISH@
-source_subpath: default/stage1-i686-openrc-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
-binrepo_path: x86/binpackages/17.0/i686

diff --git a/releases/specs/x86/musl/stage1.spec 
b/releases/specs/x86/musl/stage1.spec
deleted file mode 100644
index 0f158f21..
--- a/releases/specs/x86/musl/stage1.spec
+++ /dev/null
@@ -1,13 +0,0 @@
-subarch: i686
-target: stage1
-version_stamp: musl-@TIMESTAMP@
-rel_type: musl
-profile: default/linux/x86/17.0/musl
-snapshot_treeish: @TREEISH@
-source_subpath: musl/stage3-i686-musl-latest
-chost:

[gentoo-commits] proj/releng:master commit in: releases/specs/x86/musl/, tools/, releases/specs/x86/hardened/, ...

2024-01-25 Thread Andreas K. Hüttel 
commit: ee7defb2acc29707173a34b3ebe152637828cbc1
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Thu Jan 25 19:15:33 2024 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Thu Jan 25 19:15:33 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=ee7defb2

Add x86 23.0 builds and uploads

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

 releases/specs/x86/hardened/stage1-openrc-23.spec | 12 ++
 releases/specs/x86/hardened/stage3-openrc-23.spec | 11 ++
 releases/specs/x86/i686/stage1-openrc-23.spec | 12 ++
 releases/specs/x86/i686/stage1-systemd-23.spec| 12 ++
 releases/specs/x86/i686/stage3-openrc-23.spec | 11 ++
 releases/specs/x86/i686/stage3-systemd-23.spec| 11 ++
 releases/specs/x86/musl/stage1-23.spec| 13 +++
 releases/specs/x86/musl/stage3-23.spec| 11 ++
 tools/catalyst-auto-x86.conf  | 46 +++
 9 files changed, 139 insertions(+)

diff --git a/releases/specs/x86/hardened/stage1-openrc-23.spec 
b/releases/specs/x86/hardened/stage1-openrc-23.spec
new file mode 100644
index ..ca210e00
--- /dev/null
+++ b/releases/specs/x86/hardened/stage1-openrc-23.spec
@@ -0,0 +1,12 @@
+subarch: i686
+target: stage1
+version_stamp: hardened-openrc-@TIMESTAMP@
+rel_type: 23.0-hardened
+profile: default/linux/x86/23.0/i686/hardened
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-hardened/stage3-i686-hardened-openrc-latest
+compression_mode: pixz
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/releases/specs/x86/hardened/stage3-openrc-23.spec 
b/releases/specs/x86/hardened/stage3-openrc-23.spec
new file mode 100644
index ..87356fce
--- /dev/null
+++ b/releases/specs/x86/hardened/stage3-openrc-23.spec
@@ -0,0 +1,11 @@
+subarch: i686
+target: stage3
+version_stamp: hardened-openrc-@TIMESTAMP@
+rel_type: 23.0-hardened
+profile: default/linux/x86/23.0/i686/hardened
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-hardened/stage1-i686-hardened-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+binrepo_path: x86/binpackages/23.0/i686_hardened

diff --git a/releases/specs/x86/i686/stage1-openrc-23.spec 
b/releases/specs/x86/i686/stage1-openrc-23.spec
new file mode 100644
index ..20be8881
--- /dev/null
+++ b/releases/specs/x86/i686/stage1-openrc-23.spec
@@ -0,0 +1,12 @@
+subarch: i686
+target: stage1
+version_stamp: openrc-@TIMESTAMP@
+rel_type: 23.0-default
+profile: default/linux/x86/23.0/i686
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-i686-openrc-latest
+compression_mode: pixz
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/releases/specs/x86/i686/stage1-systemd-23.spec 
b/releases/specs/x86/i686/stage1-systemd-23.spec
new file mode 100644
index ..e7a08b22
--- /dev/null
+++ b/releases/specs/x86/i686/stage1-systemd-23.spec
@@ -0,0 +1,12 @@
+subarch: i686
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+rel_type: 23.0-default
+profile: default/linux/x86/23.0/i686/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage3-i686-systemd-latest
+compression_mode: pixz
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

diff --git a/releases/specs/x86/i686/stage3-openrc-23.spec 
b/releases/specs/x86/i686/stage3-openrc-23.spec
new file mode 100644
index ..6fbcd4fc
--- /dev/null
+++ b/releases/specs/x86/i686/stage3-openrc-23.spec
@@ -0,0 +1,11 @@
+subarch: i686
+target: stage3
+version_stamp: openrc-@TIMESTAMP@
+rel_type: 23.0-default
+profile: default/linux/x86/23.0/i686
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-i686-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+binrepo_path: x86/binpackages/23.0/i686

diff --git a/releases/specs/x86/i686/stage3-systemd-23.spec 
b/releases/specs/x86/i686/stage3-systemd-23.spec
new file mode 100644
index ..28965d68
--- /dev/null
+++ b/releases/specs/x86/i686/stage3-systemd-23.spec
@@ -0,0 +1,11 @@
+subarch: i686
+target: stage3
+version_stamp: systemd-@TIMESTAMP@
+rel_type: 23.0-default
+profile: default/linux/x86/23.0/i686/systemd
+snapshot: @TIMESTAMP@
+source_subpath: 23.0-default/stage1-i686-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
+binrepo_path: x86/binpackages/23.0/i686

diff --git a/releases/specs/x86/musl/stage1-23.spec 
b/releases/specs/x86/musl/stage1-23.spec
new file mode 100644
index ..912fc4f0
--- /dev/null
+++ b/releases/specs/x86/musl/stage1-23.spec
@@ -0,0 +1,13 @@
+subarch: i686
+target: stage1

[gentoo-commits] proj/releng:master commit in: releases/specs/x86/musl/

2021-11-21 Thread Andreas K. Hüttel 
commit: e7344a1689c5ae62a3b2604b931f8bad5d0a632f
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Sun Nov 21 23:06:54 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Sun Nov 21 23:06:54 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=e7344a16

x86: as a try, drop musl overlay from musl builds (should work fine now)

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

 releases/specs/x86/musl/stage1.spec | 1 -
 releases/specs/x86/musl/stage2.spec | 1 -
 releases/specs/x86/musl/stage3.spec | 1 -
 3 files changed, 3 deletions(-)

diff --git a/releases/specs/x86/musl/stage1.spec 
b/releases/specs/x86/musl/stage1.spec
index 4c1d34a1..dbe69076 100644
--- a/releases/specs/x86/musl/stage1.spec
+++ b/releases/specs/x86/musl/stage1.spec
@@ -7,7 +7,6 @@ snapshot: @TIMESTAMP@
 source_subpath: musl/stage3-i686-musl-latest
 chost: i686-gentoo-linux-musl
 portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_overlay: /root/musl
 portage_prefix: releng
 update_seed: yes
 update_seed_command: --update --deep --newuse @world

diff --git a/releases/specs/x86/musl/stage2.spec 
b/releases/specs/x86/musl/stage2.spec
index d4cc6cd5..f502721c 100644
--- a/releases/specs/x86/musl/stage2.spec
+++ b/releases/specs/x86/musl/stage2.spec
@@ -7,6 +7,5 @@ snapshot: @TIMESTAMP@
 source_subpath: musl/stage1-i686-musl-@TIMESTAMP@
 chost: i686-gentoo-linux-musl
 portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_overlay: /root/musl
 portage_prefix: releng
 compression_mode: pixz

diff --git a/releases/specs/x86/musl/stage3.spec 
b/releases/specs/x86/musl/stage3.spec
index 36317686..63c315bf 100644
--- a/releases/specs/x86/musl/stage3.spec
+++ b/releases/specs/x86/musl/stage3.spec
@@ -6,6 +6,5 @@ profile: default/linux/x86/17.0/musl
 snapshot: @TIMESTAMP@
 source_subpath: musl/stage2-i686-musl-@TIMESTAMP@
 portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_overlay: /root/musl
 portage_prefix: releng
 compression_mode: pixz

[gentoo-commits] proj/releng:master commit in: releases/specs/x86/musl/, tools/

2021-07-05 Thread Andreas K. Hüttel 
commit: 1e54abd4ff6ee07517d3e666f0d18fe85c95e951
Author: Andreas K. Hüttel  gentoo  org>
AuthorDate: Mon Jul  5 22:57:04 2021 +
Commit: Andreas K. Hüttel  gentoo  org>
CommitDate: Mon Jul  5 22:57:04 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=1e54abd4

x86: Add specs and catalyst-auto job for musl

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

 releases/specs/x86/musl/stage1.spec  | 14 ++
 releases/specs/x86/musl/stage2.spec  | 12 
 releases/specs/x86/musl/stage3.spec  | 11 +++
 tools/catalyst-auto-x86-demeter.conf | 11 +++
 4 files changed, 48 insertions(+)

diff --git a/releases/specs/x86/musl/stage1.spec 
b/releases/specs/x86/musl/stage1.spec
new file mode 100644
index ..7c15b0ce
--- /dev/null
+++ b/releases/specs/x86/musl/stage1.spec
@@ -0,0 +1,14 @@
+subarch: i686
+target: stage1
+version_stamp: musl-@TIMESTAMP@
+rel_type: musl
+profile: default/linux/x86/17.0/musl
+snapshot: @TIMESTAMP@
+source_subpath: musl/stage3-i686-musl-latest
+chost: i686-gentoo-linux-musl
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl
+portage_overlay: /root/musl
+portage_prefix: releng
+update_seed: yes
+update_seed_command: --update --deep --newuse @world
+compression_mode: pixz_x

diff --git a/releases/specs/x86/musl/stage2.spec 
b/releases/specs/x86/musl/stage2.spec
new file mode 100644
index ..cb5c5fff
--- /dev/null
+++ b/releases/specs/x86/musl/stage2.spec
@@ -0,0 +1,12 @@
+subarch: i686
+target: stage2
+version_stamp: musl-@TIMESTAMP@
+rel_type: musl
+profile: default/linux/x86/17.0/musl
+snapshot: @TIMESTAMP@
+source_subpath: musl/stage1-i686-musl-@TIMESTAMP@
+chost: i686-gentoo-linux-musl
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl
+portage_overlay: /root/musl
+portage_prefix: releng
+compression_mode: pixz_x

diff --git a/releases/specs/x86/musl/stage3.spec 
b/releases/specs/x86/musl/stage3.spec
new file mode 100644
index ..bb32f043
--- /dev/null
+++ b/releases/specs/x86/musl/stage3.spec
@@ -0,0 +1,11 @@
+subarch: i686
+target: stage3
+version_stamp: musl-@TIMESTAMP@
+rel_type: musl
+profile: default/linux/x86/17.0/musl
+snapshot: @TIMESTAMP@
+source_subpath: musl/stage2-i686-musl-@TIMESTAMP@
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl
+portage_overlay: /root/musl
+portage_prefix: releng
+compression_mode: pixz_x

diff --git a/tools/catalyst-auto-x86-demeter.conf 
b/tools/catalyst-auto-x86-demeter.conf
index 98c2d131..f8ad498f 100644
--- a/tools/catalyst-auto-x86-demeter.conf
+++ b/tools/catalyst-auto-x86-demeter.conf
@@ -12,6 +12,7 @@ EMAIL_SUBJECT_PREPEND="[x86-auto]"
 SPECS_DIR=${REPO_DIR}/releases/specs/x86
 
 SETS="
+   musl
i486_openrc
i686_openrc
i686_systemd
@@ -27,6 +28,8 @@ SET_i686_systemd_SPECS="i686/stage1-systemd.spec 
i686/stage2-systemd.spec i686/s
 SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec 
hardened/stage2-openrc.spec hardened/stage3-openrc.spec"
 SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec 
hardened/admincd-stage2-openrc.spec"
 
+SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec"
+
 KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86
 
 EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)"
@@ -84,6 +87,14 @@ post_build() {
;;
esac
popd >/dev/null || exit
+
+   pushd ${BUILD_SRCDIR_BASE}/builds/musl >/dev/null || exit
+   case ${spec} in
+   musl/stage3.spec)
+   upload stage3-i686-musl-${TIMESTAMP}.tar.xz*
+   ;;
+   esac
+   popd >/dev/null || exit
 }
 
 # vim:ft=sh: