* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/m68k/
@ 2022-11-17 1:53 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2022-11-17 1:53 UTC (permalink / raw
To: gentoo-commits
commit: 3a3df3551918797f0b7e8aac4f1ad1ad34b25c81
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 17 01:52:59 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Thu Nov 17 01:52:59 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=3a3df355
Add m68k systemd merged-usr build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/m68k/stage1-systemd-mu.spec | 13 +++++++++++++
releases/specs-qemu/m68k/stage3-systemd-mu.spec | 11 +++++++++++
tools/catalyst-auto-qemu-m68k.conf | 16 ++++++++++++++--
3 files changed, 38 insertions(+), 2 deletions(-)
diff --git a/releases/specs-qemu/m68k/stage1-systemd-mu.spec b/releases/specs-qemu/m68k/stage1-systemd-mu.spec
new file mode 100644
index 00000000..ae5ec941
--- /dev/null
+++ b/releases/specs-qemu/m68k/stage1-systemd-mu.spec
@@ -0,0 +1,13 @@
+subarch: m68k
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage1
+rel_type: default
+profile: default/linux/m68k/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-m68k-systemd-mergedusr-latest
+compression_mode: pixz
+update_seed: no
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-m68k
diff --git a/releases/specs-qemu/m68k/stage3-systemd-mu.spec b/releases/specs-qemu/m68k/stage3-systemd-mu.spec
new file mode 100644
index 00000000..527b2056
--- /dev/null
+++ b/releases/specs-qemu/m68k/stage3-systemd-mu.spec
@@ -0,0 +1,11 @@
+subarch: m68k
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+target: stage3
+rel_type: default
+profile: default/linux/m68k/17.0/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-m68k-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-m68k
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 7ac24ce5..7c4d4268 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -13,10 +13,12 @@ EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
SETS="
openrc
systemd
+ systemd_mu
"
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"
update_symlinks() {
# Symlink the latest stages3 to build from
@@ -35,9 +37,19 @@ post_build() {
local set=$1 spec=$2
case ${spec} in
- stage3*.spec)
+ stage3-openrc.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*
+ 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*
+ popd >/dev/null
+ ;;
+ stage3-systemd-mu.spec)
+ pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ upload stage3-m68k-systemd-mergedusr-${TIMESTAMP}*.xz*
popd >/dev/null
;;
*)
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/m68k/
@ 2022-11-23 22:55 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2022-11-23 22:55 UTC (permalink / raw
To: gentoo-commits
commit: cd55ba6a335dc423ddf032c91bb5b857a6068c6c
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 23 22:53:41 2022 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 22:53:41 2022 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=cd55ba6a
Move m68k merged-usr builds to separate build types
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/m68k/stage1-systemd-mu.spec | 4 ++--
releases/specs-qemu/m68k/stage3-systemd-mu.spec | 4 ++--
tools/catalyst-auto-qemu-m68k.conf | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/releases/specs-qemu/m68k/stage1-systemd-mu.spec b/releases/specs-qemu/m68k/stage1-systemd-mu.spec
index ae5ec941..dae9c234 100644
--- a/releases/specs-qemu/m68k/stage1-systemd-mu.spec
+++ b/releases/specs-qemu/m68k/stage1-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: m68k
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage1
-rel_type: default
+rel_type: mergedusr
profile: default/linux/m68k/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-m68k-systemd-mergedusr-latest
+source_subpath: mergedusr/stage3-m68k-systemd-mergedusr-latest
compression_mode: pixz
update_seed: no
update_seed_command: -uDN @world
diff --git a/releases/specs-qemu/m68k/stage3-systemd-mu.spec b/releases/specs-qemu/m68k/stage3-systemd-mu.spec
index 527b2056..aef1ca26 100644
--- a/releases/specs-qemu/m68k/stage3-systemd-mu.spec
+++ b/releases/specs-qemu/m68k/stage3-systemd-mu.spec
@@ -1,10 +1,10 @@
subarch: m68k
version_stamp: systemd-mergedusr-@TIMESTAMP@
target: stage3
-rel_type: default
+rel_type: mergedusr
profile: default/linux/m68k/17.0/systemd/merged-usr
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-m68k-systemd-mergedusr-@TIMESTAMP@
+source_subpath: mergedusr/stage1-m68k-systemd-mergedusr-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
portage_prefix: releng
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 96158c71..868a27f6 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -23,7 +23,7 @@ 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" ; do
+ for d in "${BUILD_SRCDIR_BASE}/builds/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" ; do
mkdir -p "${d}"
pushd "${d}" >/dev/null
for f in $(ls stage3*xz | grep -v latest | give_latest_from_dates) ; do
@@ -49,7 +49,7 @@ post_build() {
popd >/dev/null
;;
stage3-systemd-mu.spec)
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
+ pushd "${BUILD_SRCDIR_BASE}/builds/mergedusr" >/dev/null
upload stage3-m68k-systemd-mergedusr-${TIMESTAMP}*.xz*
popd >/dev/null
;;
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/m68k/
@ 2023-07-21 19:17 Andreas K. Hüttel
0 siblings, 0 replies; 3+ messages in thread
From: Andreas K. Hüttel @ 2023-07-21 19:17 UTC (permalink / raw
To: gentoo-commits
commit: 0b6c63cb26de43ec8c88fc28cbc2739c74c1d003
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 21 19:16:39 2023 +0000
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Fri Jul 21 19:16:39 2023 +0000
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=0b6c63cb
Add m68k musl build
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org>
releases/specs-qemu/m68k/stage1-musl.spec | 13 +++++++++++++
releases/specs-qemu/m68k/stage3-musl.spec | 11 +++++++++++
tools/catalyst-auto-qemu-m68k.conf | 9 ++++++++-
3 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/releases/specs-qemu/m68k/stage1-musl.spec b/releases/specs-qemu/m68k/stage1-musl.spec
new file mode 100644
index 00000000..90e5719b
--- /dev/null
+++ b/releases/specs-qemu/m68k/stage1-musl.spec
@@ -0,0 +1,13 @@
+subarch: m68k_musl
+version_stamp: @TIMESTAMP@
+target: stage1
+rel_type: musl
+profile: default/linux/m68k/17.0/musl
+snapshot: @TIMESTAMP@
+source_subpath: musl/stage3-m68k_musl-latest
+compression_mode: pixz
+update_seed: yes
+update_seed_command: -uDN @world
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-m68k
diff --git a/releases/specs-qemu/m68k/stage3-musl.spec b/releases/specs-qemu/m68k/stage3-musl.spec
new file mode 100644
index 00000000..ac15fc04
--- /dev/null
+++ b/releases/specs-qemu/m68k/stage3-musl.spec
@@ -0,0 +1,11 @@
+subarch: m68k_musl
+version_stamp: @TIMESTAMP@
+target: stage3
+rel_type: musl
+profile: default/linux/m68k/17.0/musl
+snapshot: @TIMESTAMP@
+source_subpath: musl/stage1-m68k_musl-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages-qemu
+portage_prefix: releng
+interpreter: /usr/bin/qemu-m68k
diff --git a/tools/catalyst-auto-qemu-m68k.conf b/tools/catalyst-auto-qemu-m68k.conf
index 868a27f6..3a10d3c0 100644
--- a/tools/catalyst-auto-qemu-m68k.conf
+++ b/tools/catalyst-auto-qemu-m68k.conf
@@ -11,6 +11,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs-qemu/m68k
EMAIL_SUBJECT_PREPEND="[m68k-qemu-auto]"
SETS="
+ musl
openrc
systemd
systemd_mu
@@ -19,11 +20,12 @@ SETS="
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"
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/default" "${BUILD_SRCDIR_BASE}/builds/mergedusr" "${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
@@ -53,6 +55,11 @@ post_build() {
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*
+ popd >/dev/null
+ ;;
*)
echo "Finished ${spec}"
;;
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2023-07-21 19:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-11-23 22:55 [gentoo-commits] proj/releng:master commit in: tools/, releases/specs-qemu/m68k/ Andreas K. Hüttel
-- strict thread matches above, loose matches on Subject: below --
2023-07-21 19:17 Andreas K. Hüttel
2022-11-17 1:53 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