[gentoo-commits] proj/releng:master commit in: releases/specs/arm64/, tools/
commit: 69b60ed89e8f9e2bd24c9ab715ca9ba9c83927d1
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Apr 1 20:46:37 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Apr 1 20:46:37 2024 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=69b60ed8
Switch arm64 bootmedia uploads to 23.0
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/arm64/installcd-stage1.spec | 6 +--
releases/specs/arm64/installcd-stage2-minimal.spec | 50 +++---
tools/catalyst-auto-arm64.conf | 13 ++
3 files changed, 32 insertions(+), 37 deletions(-)
diff --git a/releases/specs/arm64/installcd-stage1.spec
b/releases/specs/arm64/installcd-stage1.spec
index b6809046..7506ef20 100644
--- a/releases/specs/arm64/installcd-stage1.spec
+++ b/releases/specs/arm64/installcd-stage1.spec
@@ -1,10 +1,10 @@
subarch: arm64
target: livecd-stage1
version_stamp: @TIMESTAMP@
-rel_type: default
-profile: default/linux/arm64/17.0
+rel_type: 23.0-default
+profile: default/linux/arm64/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/stage3-arm64-openrc-@timest...@.tar.xz
+source_subpath: 23.0-default/stage3-arm64-openrc-@timest...@.tar.xz
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
diff --git a/releases/specs/arm64/installcd-stage2-minimal.spec
b/releases/specs/arm64/installcd-stage2-minimal.spec
index 7d3a7b4a..f55be2fe 100644
--- a/releases/specs/arm64/installcd-stage2-minimal.spec
+++ b/releases/specs/arm64/installcd-stage2-minimal.spec
@@ -1,10 +1,10 @@
subarch: arm64
version_stamp: @TIMESTAMP@
target: livecd-stage2
-rel_type: default
-profile: default/linux/arm64/17.0
+rel_type: 23.0-default
+profile: default/linux/arm64/23.0
snapshot_treeish: @TREEISH@
-source_subpath: default/livecd-stage1-arm64-@timest...@.tar.xz
+source_subpath: 23.0-default/livecd-stage1-arm64-@timest...@.tar.xz
portage_confdir: @REPO_DIR@/releases/portage/isos
livecd/bootargs: dokeymap
@@ -75,10 +75,10 @@ livecd/empty:
/etc/rsync
/etc/runlevels/single
/etc/skel
- /lib/dev-state
- /lib/udev-state
- /lib64/dev-state
- /lib64/udev-state
+ /usr/lib/dev-state
+ /usr/lib/udev-state
+ /usr/lib64/dev-state
+ /usr/lib64/udev-state
/root/.ccache
/tmp
/usr/diet/include
@@ -158,17 +158,17 @@ livecd/rm:
/etc/make.profile
/etc/man.conf
/etc/resolv.conf
- /lib*/*.a
- /lib*/*.la
- /lib*/cpp
+ /usr/lib*/*.a
+ /usr/lib*/*.la
+ /usr/lib*/cpp
/root/.bash_history
/root/.viminfo
- /sbin/*.static
- /sbin/fsck.cramfs
- /sbin/fsck.minix
- /sbin/mkfs.bfs
- /sbin/mkfs.cramfs
- /sbin/mkfs.minix
+ /usr/bin/*.static
+ /usr/bin/fsck.cramfs
+ /usr/bin/fsck.minix
+ /usr/bin/mkfs.bfs
+ /usr/bin/mkfs.cramfs
+ /usr/bin/mkfs.minix
/usr/bin/addr2line
/usr/bin/ar
/usr/bin/as
@@ -210,15 +210,15 @@ livecd/rm:
/usr/lib*/*.la
/usr/lib*/perl5/site_perl
/usr/lib*/gcc-lib/*/*/libgcj*
- /usr/sbin/archive-conf
- /usr/sbin/dispatch-conf
- /usr/sbin/emaint
- /usr/sbin/env-update
- /usr/sbin/etc-update
- /usr/sbin/fb*
- /usr/sbin/fixpackages
- /usr/sbin/quickpkg
- /usr/sbin/regenworld
+ /usr/bin/archive-conf
+ /usr/bin/dispatch-conf
+ /usr/bin/emaint
+ /usr/bin/env-update
+ /usr/bin/etc-update
+ /usr/bin/fb*
+ /usr/bin/fixpackages
+ /usr/bin/quickpkg
+ /usr/bin/regenworld
/usr/share/consolefonts/1*
/usr/share/consolefonts/7*
/usr/share/consolefonts/8*
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index dc572bab..28e51b4b 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -23,9 +23,9 @@ SETS="
"
SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
-SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec
stage3d-openrc-23.spec"
+SET_openrc_23_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec"
@@ -71,14 +71,6 @@ update_symlinks() {
post_build() {
local set=$1 spec=$2
- pushd "${BUILD_SRCDIR_BASE}/builds/default" >/dev/null
- case ${spec} in
- installcd-stage2-minimal.spec)
- upload install-arm64-*${TIMESTAMP}*.iso*
- ;;
- esac
- popd >/dev/null
-
pushd "${BUILD_SRCDIR_BASE}/builds/23.0-default" >/dev/null
case ${spec} in
stage3-openrc-23.spec)
@@ -97,6 +89,9 @@ post_build() {
upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
# do no
[gentoo-commits] proj/releng:master commit in: releases/specs/arm64/, tools/
commit: 548d7b8a329eb5eb5f154dea36e6ae48457007b7 Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Mar 21 13:50:50 2024 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Thu Mar 21 13:50:50 2024 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=548d7b8a Add and enable arm64 split-usr 23.0 spec Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs/arm64/stage1-openrc-23-su.spec | 12 releases/specs/arm64/stage3-openrc-23-su.spec | 10 ++ tools/catalyst-auto-arm64.conf| 3 +++ 3 files changed, 25 insertions(+) diff --git a/releases/specs/arm64/stage1-openrc-23-su.spec b/releases/specs/arm64/stage1-openrc-23-su.spec new file mode 100644 index ..f3941b0a --- /dev/null +++ b/releases/specs/arm64/stage1-openrc-23-su.spec @@ -0,0 +1,12 @@ +subarch: arm64 +target: stage1 +version_stamp: openrc-splitusr-@TIMESTAMP@ +rel_type: 23.0-splitusr +profile: default/linux/arm64/23.0/split-usr +snapshot_treeish: @TREEISH@ +source_subpath: 23.0-splitusr/stage3-arm64-openrc-splitusr-latest.tar.xz +compression_mode: pixz +update_seed: yes +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm64/stage3-openrc-23-su.spec b/releases/specs/arm64/stage3-openrc-23-su.spec new file mode 100644 index ..619f902c --- /dev/null +++ b/releases/specs/arm64/stage3-openrc-23-su.spec @@ -0,0 +1,10 @@ +subarch: arm64 +target: stage3 +version_stamp: openrc-splitusr-@TIMESTAMP@ +rel_type: 23.0-splitusr +profile: default/linux/arm64/23.0/split-usr +snapshot_treeish: @TREEISH@ +source_subpath: 23.0-splitusr/stage1-arm64-openrc-splitusr-@timest...@.tar.xz +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf index 27b70c7e..5d2d1268 100644 --- a/tools/catalyst-auto-arm64.conf +++ b/tools/catalyst-auto-arm64.conf @@ -8,6 +8,7 @@ SUBARCH=arm64 SETS=" openrc_23 + openrc_23_su systemd_23 llvm_openrc_23 llvm_systemd_23 @@ -30,6 +31,8 @@ SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec stage3d-syst SET_openrc_23_SPECS="stage1-openrc-23.spec stage3-openrc-23.spec stage3d-openrc-23.spec" +SET_openrc_23_su_SPECS="stage1-openrc-23-su.spec stage3-openrc-23-su.spec" + SET_systemd_23_SPECS="stage1-systemd-23.spec stage3-systemd-23.spec stage3d-systemd-23.spec" SET_llvm_openrc_SPECS="llvm/stage1-openrc.spec llvm/stage3-openrc.spec"
[gentoo-commits] proj/releng:master commit in: releases/specs/arm64/, tools/
commit: 52f389d43a83b727d08cfd9447f04b5ed7235e05
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Jan 23 19:16:55 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Jan 23 19:16:55 2022 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=52f389d4
arm64: add desktop stages
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/arm64/stage3d-openrc.spec | 10 ++
releases/specs/arm64/stage3d-systemd.spec | 10 ++
tools/catalyst-auto-arm64.conf| 13 ++---
3 files changed, 30 insertions(+), 3 deletions(-)
diff --git a/releases/specs/arm64/stage3d-openrc.spec
b/releases/specs/arm64/stage3d-openrc.spec
new file mode 100644
index ..680d9d43
--- /dev/null
+++ b/releases/specs/arm64/stage3d-openrc.spec
@@ -0,0 +1,10 @@
+subarch: arm64
+target: stage3
+version_stamp: desktop-openrc-@TIMESTAMP@
+rel_type: default
+profile: default/linux/arm64/17.0/desktop
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-arm64-openrc-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/arm64/stage3d-systemd.spec
b/releases/specs/arm64/stage3d-systemd.spec
new file mode 100644
index ..6deedc4b
--- /dev/null
+++ b/releases/specs/arm64/stage3d-systemd.spec
@@ -0,0 +1,10 @@
+subarch: arm64
+target: stage3
+version_stamp: desktop-systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/arm64/17.0/desktop/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-arm64-systemd-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 0e32bc43..d9d0c37f 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -6,10 +6,11 @@ UPLOAD_KEY=/root/.ssh/id_ed25519
SPECS_DIR=${REPO_DIR}/releases/specs/arm64
SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
-SETS="musl muslhardened default"
+SETS="openrc systemd musl muslhardened"
-SET_default_SPECS="stage1-openrc.spec stage3-openrc.spec stage1-systemd.spec
stage3-systemd.spec"
-SET_default_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
+SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec stage3d-openrc.spec"
+SET_openrc_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec
stage3d-systemd.spec"
SET_musl_SPECS="musl/stage1.spec musl/stage3.spec"
SET_muslhardened_SPECS="musl-hardened/stage1.spec musl-hardened/stage3.spec"
@@ -43,9 +44,15 @@ post_build() {
stage3-openrc.spec)
upload stage3-${SUBARCH}-openrc-${TIMESTAMP}*.xz*
;;
+ stage3d-openrc.spec)
+ upload stage3-${SUBARCH}-desktop-openrc-${TIMESTAMP}*.xz*
+ ;;
stage3-systemd.spec)
upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
;;
+ stage3d-systemd.spec)
+ upload stage3-${SUBARCH}-desktop-systemd-${TIMESTAMP}*.xz*
+ ;;
*)
echo "Finished ${spec}"
;;
[gentoo-commits] proj/releng:master commit in: releases/specs/arm64/, tools/
commit: 24e4e8950f936ec891a5c53340b1ac59a8476d92
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Jan 23 18:37:53 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Jan 23 18:37:53 2022 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=24e4e895
arm64: Unify stage and spec naming
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/arm64/installcd-stage1.spec | 2 +-
releases/specs/arm64/{stage1.spec => stage1-openrc.spec} | 4 ++--
.../specs/arm64/{systemd-stage1.spec => stage1-systemd.spec} | 0
releases/specs/arm64/stage2.spec | 10 --
releases/specs/arm64/{stage3.spec => stage3-openrc.spec} | 4 ++--
.../specs/arm64/{systemd-stage3.spec => stage3-systemd.spec} | 0
releases/specs/arm64/systemd-stage2.spec | 10 --
tools/catalyst-auto-arm64.conf | 8
8 files changed, 9 insertions(+), 29 deletions(-)
diff --git a/releases/specs/arm64/installcd-stage1.spec
b/releases/specs/arm64/installcd-stage1.spec
index 81133fd3..ac149e64 100644
--- a/releases/specs/arm64/installcd-stage1.spec
+++ b/releases/specs/arm64/installcd-stage1.spec
@@ -4,7 +4,7 @@ version_stamp: @TIMESTAMP@
rel_type: default
profile: default/linux/arm64/17.0
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-arm64-@TIMESTAMP@
+source_subpath: default/stage3-arm64-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/isos
diff --git a/releases/specs/arm64/stage1.spec
b/releases/specs/arm64/stage1-openrc.spec
similarity index 77%
rename from releases/specs/arm64/stage1.spec
rename to releases/specs/arm64/stage1-openrc.spec
index a0f8a64c..75032fda 100644
--- a/releases/specs/arm64/stage1.spec
+++ b/releases/specs/arm64/stage1-openrc.spec
@@ -1,10 +1,10 @@
subarch: arm64
target: stage1
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
rel_type: default
profile: default/linux/arm64/17.0
snapshot: @TIMESTAMP@
-source_subpath: default/stage3-arm64-latest
+source_subpath: default/stage3-arm64-openrc-latest
compression_mode: pixz
update_seed: yes
update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world
diff --git a/releases/specs/arm64/systemd-stage1.spec
b/releases/specs/arm64/stage1-systemd.spec
similarity index 100%
rename from releases/specs/arm64/systemd-stage1.spec
rename to releases/specs/arm64/stage1-systemd.spec
diff --git a/releases/specs/arm64/stage2.spec b/releases/specs/arm64/stage2.spec
deleted file mode 100644
index daef1ea0..
--- a/releases/specs/arm64/stage2.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: arm64
-target: stage2
-version_stamp: @TIMESTAMP@
-rel_type: default
-profile: default/linux/arm64/17.0
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-arm64-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/releases/specs/arm64/stage3.spec
b/releases/specs/arm64/stage3-openrc.spec
similarity index 69%
rename from releases/specs/arm64/stage3.spec
rename to releases/specs/arm64/stage3-openrc.spec
index d2253fda..8b22b222 100644
--- a/releases/specs/arm64/stage3.spec
+++ b/releases/specs/arm64/stage3-openrc.spec
@@ -1,10 +1,10 @@
subarch: arm64
target: stage3
-version_stamp: @TIMESTAMP@
+version_stamp: openrc-@TIMESTAMP@
rel_type: default
profile: default/linux/arm64/17.0
snapshot: @TIMESTAMP@
-source_subpath: default/stage1-arm64-@TIMESTAMP@
+source_subpath: default/stage1-arm64-openrc-@TIMESTAMP@
compression_mode: pixz
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/releases/specs/arm64/systemd-stage3.spec
b/releases/specs/arm64/stage3-systemd.spec
similarity index 100%
rename from releases/specs/arm64/systemd-stage3.spec
rename to releases/specs/arm64/stage3-systemd.spec
diff --git a/releases/specs/arm64/systemd-stage2.spec
b/releases/specs/arm64/systemd-stage2.spec
deleted file mode 100644
index 756e0bba..
--- a/releases/specs/arm64/systemd-stage2.spec
+++ /dev/null
@@ -1,10 +0,0 @@
-subarch: arm64
-target: stage2
-version_stamp: systemd-@TIMESTAMP@
-rel_type: default
-profile: default/linux/arm64/17.0/systemd
-snapshot: @TIMESTAMP@
-source_subpath: default/stage1-arm64-systemd-@TIMESTAMP@
-compression_mode: pixz
-portage_confdir: @REPO_DIR@/releases/portage/stages
-portage_prefix: releng
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 3d57dc12..0e32bc43 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -8,7 +8,7 @@ SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="musl muslhardened default"
-SET_default_SPECS="stage1.spec stage3.spec systemd-stage1.spec
systemd-stage3.spec"
+SET_default_SPECS="stage1-openrc.spec stage3-openrc.spec stage1-systemd.spec
stage3-systemd.spec"
SET_defa
[gentoo-commits] proj/releng:master commit in: releases/specs/arm64/, tools/
commit: 105076d641ef82b1884fd7c497a37cfae696cd53
Author: Georgy Yakovlev gentoo org>
AuthorDate: Sun Jul 25 20:57:45 2021 +
Commit: Georgy Yakovlev gentoo org>
CommitDate: Sun Jul 25 20:57:45 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=105076d6
tools/catalyst-auto-arm64.conf: uncomment KCONFIG_DIR
without it catalyst will not copy kconfig to /tmp/catalyst-*/kconfig
Signed-off-by: Georgy Yakovlev gentoo.org>
releases/specs/arm64/installcd-stage2-minimal.spec | 5 ++---
tools/catalyst-auto-arm64.conf | 2 +-
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/releases/specs/arm64/installcd-stage2-minimal.spec
b/releases/specs/arm64/installcd-stage2-minimal.spec
index 5ae887ed..f1d3c34b 100644
--- a/releases/specs/arm64/installcd-stage2-minimal.spec
+++ b/releases/specs/arm64/installcd-stage2-minimal.spec
@@ -15,8 +15,9 @@ livecd/volid: Gentoo arm64 @TIMESTAMP@
boot/kernel: gentoo
-boot/kernel/gentoo/sources: gentoo-sources
+boot/kernel/gentoo/sources: sys-kernel/gentoo-sources
boot/kernel/gentoo/config:
@REPO_DIR@/releases/kconfig/arm64/arm64-5.10.52.config
+boot/kernel/gentoo/packages: zfs zfs-kmod
livecd/unmerge:
app-admin/eselect
@@ -81,8 +82,6 @@ livecd/empty:
/usr/diet/include
/usr/diet/man
/usr/include
- /usr/i?86-gentoo-linux-uclibc
- /usr/i?86-pc-linux-uclibc
/usr/lib/X11/config
/usr/lib/X11/doc
/usr/lib/X11/etc
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index 62a4b23d..4957391b 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -11,7 +11,7 @@ SETS="default"
SET_default_SPECS="stage1.spec stage3.spec systemd-stage1.spec
systemd-stage3.spec"
#SET_default_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
-#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
+KCONFIG_DIR=${REPO_DIR}/releases/kconfig/arm64
EMAIL_SUBJECT_PREPEND="[${SUBARCH}-auto]"
[gentoo-commits] proj/releng:master commit in: releases/specs/arm64/, tools/
commit: e41e548f4bd30f7602f33b8bdec9b976971be904
Author: Matt Turner gentoo org>
AuthorDate: Mon Aug 17 17:52:09 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Aug 17 22:13:53 2020 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=e41e548f
specs/arm64: Build stage3 from stage1
Signed-off-by: Matt Turner gentoo.org>
releases/specs/arm64/stage3.spec | 2 +-
tools/catalyst-auto-arm64.conf | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/releases/specs/arm64/stage3.spec b/releases/specs/arm64/stage3.spec
index 2984879a..003b556c 100644
--- a/releases/specs/arm64/stage3.spec
+++ b/releases/specs/arm64/stage3.spec
@@ -4,7 +4,7 @@ version_stamp: @TIMESTAMP@
rel_type: default
profile: default/linux/arm64/17.0
snapshot: current
-source_subpath: default/stage2-arm64-@TIMESTAMP@
+source_subpath: default/stage1-arm64-@TIMESTAMP@
pkgcache_path: /var/tmp/catalyst/packages/stage3
portage_confdir: @REPO_DIR@/releases/portage/stages
portage_prefix: releng
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index a63eadea..a34b9732 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -8,7 +8,7 @@ SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default"
-SET_default_SPECS="stage1.spec stage2.spec stage3.spec"
+SET_default_SPECS="stage1.spec stage3.spec"
#SET_default_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
[gentoo-commits] proj/releng:master commit in: releases/specs/arm64/, tools/
commit: 84660f02f3dfbd4b88b06fd451cff6d9b859
Author: Matt Turner gentoo org>
AuthorDate: Mon Aug 17 22:08:43 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Mon Aug 17 22:13:53 2020 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=84660f02
specs/arm64: Add systemd specs
Signed-off-by: Matt Turner gentoo.org>
releases/specs/arm64/systemd-stage1.spec | 12
releases/specs/arm64/systemd-stage2.spec | 10 ++
releases/specs/arm64/systemd-stage3.spec | 10 ++
tools/catalyst-auto-arm64.conf | 5 -
4 files changed, 36 insertions(+), 1 deletion(-)
diff --git a/releases/specs/arm64/systemd-stage1.spec
b/releases/specs/arm64/systemd-stage1.spec
new file mode 100644
index ..8e55af34
--- /dev/null
+++ b/releases/specs/arm64/systemd-stage1.spec
@@ -0,0 +1,12 @@
+subarch: arm64
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/arm64/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-arm64-systemd-latest
+compression_mode: pixz_x
+update_seed: yes
+update_seed_command: --update --deep --jobs=5 --newuse --complete-graph @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/arm64/systemd-stage2.spec
b/releases/specs/arm64/systemd-stage2.spec
new file mode 100644
index ..960dce2c
--- /dev/null
+++ b/releases/specs/arm64/systemd-stage2.spec
@@ -0,0 +1,10 @@
+subarch: arm64
+target: stage2
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/arm64/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-arm64-systemd-@TIMESTAMP@
+compression_mode: pixz_x
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/arm64/systemd-stage3.spec
b/releases/specs/arm64/systemd-stage3.spec
new file mode 100644
index ..04ebee65
--- /dev/null
+++ b/releases/specs/arm64/systemd-stage3.spec
@@ -0,0 +1,10 @@
+subarch: arm64
+target: stage3
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/arm64/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-arm64-systemd-@TIMESTAMP@
+compression_mode: pixz_x
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-arm64.conf b/tools/catalyst-auto-arm64.conf
index a34b9732..5d31d3fa 100644
--- a/tools/catalyst-auto-arm64.conf
+++ b/tools/catalyst-auto-arm64.conf
@@ -8,7 +8,7 @@ SUBARCH=`grep subarch $SPECS_DIR/stage1.spec | awk '{print $2}'`
SETS="default"
-SET_default_SPECS="stage1.spec stage3.spec"
+SET_default_SPECS="stage1.spec stage3.spec systemd-stage1.spec
systemd-stage3.spec"
#SET_default_OPTIONAL_SPECS="installcd-stage1.spec
installcd-stage2-minimal.spec"
#KCONFIG_DIR=${REPO_DIR}/releases/kconfig/sparc
@@ -41,6 +41,9 @@ post_build() {
stage3.spec)
upload stage3-${SUBARCH}-*${TIMESTAMP}*.tar.xz*
;;
+ systemd-stage3.spec)
+ upload stage3-${SUBARCH}-systemd-${TIMESTAMP}*.xz*
+ ;;
esac
popd >/dev/null
