[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/, tools/
commit: 64a00207f3eac64f8371251434d52e3c96910f54
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Thu Dec 29 22:36:03 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Dec 29 22:36:30 2022 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=64a00207
Add amd64 desktop systemd mu stage
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/amd64/stage3d-systemd-mu.spec | 10 ++
tools/catalyst-auto-amd64.conf | 4
2 files changed, 14 insertions(+)
diff --git a/releases/specs/amd64/stage3d-systemd-mu.spec
b/releases/specs/amd64/stage3d-systemd-mu.spec
new file mode 100644
index ..369e255e
--- /dev/null
+++ b/releases/specs/amd64/stage3d-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: amd64
+target: stage3
+version_stamp: desktop-systemd-mergedusr-@TIMESTAMP@
+rel_type: mergedusr
+profile: default/linux/amd64/17.1/desktop/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: mergedusr/stage1-amd64-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 544bc40d..478ed5ba 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -41,6 +41,7 @@ SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec"
SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+SET_systemd_mu_OPTIONAL_SPECS="stage3d-systemd-mu.spec"
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec
hardened/admincd-stage2.spec"
@@ -145,6 +146,9 @@ post_build() {
stage3-systemd-mu.spec)
upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
+ stage3d-systemd-mu.spec)
+ upload
stage3-amd64-desktop-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
nomultilib/stage3-systemd-mu.spec)
upload
stage3-amd64-nomultilib-systemd-mergedusr-${TIMESTAMP}.tar.xz*
;;
[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/, tools/
commit: 2756242a284ad88aa49a497963e461a21b92029d
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Nov 12 15:56:56 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Nov 12 15:57:27 2022 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=2756242a
Add amd64 systemd/merged-usr stages
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/amd64/stage1-systemd-mu.spec | 12
releases/specs/amd64/stage3-systemd-mu.spec | 10 ++
tools/catalyst-auto-amd64.conf | 6 ++
3 files changed, 28 insertions(+)
diff --git a/releases/specs/amd64/stage1-systemd-mu.spec
b/releases/specs/amd64/stage1-systemd-mu.spec
new file mode 100644
index ..3e97cf93
--- /dev/null
+++ b/releases/specs/amd64/stage1-systemd-mu.spec
@@ -0,0 +1,12 @@
+subarch: amd64
+target: stage1
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/amd64/17.1/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-amd64-systemd-mergedusr-latest
+compression_mode: pixz
+update_seed: no
+update_seed_command: --update --deep --newuse @world
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/amd64/stage3-systemd-mu.spec
b/releases/specs/amd64/stage3-systemd-mu.spec
new file mode 100644
index ..2d710c99
--- /dev/null
+++ b/releases/specs/amd64/stage3-systemd-mu.spec
@@ -0,0 +1,10 @@
+subarch: amd64
+target: stage3
+version_stamp: systemd-mergedusr-@TIMESTAMP@
+rel_type: default
+profile: default/linux/amd64/17.1/systemd/merged-usr
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-amd64-systemd-mergedusr-@TIMESTAMP@
+compression_mode: pixz
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index e0a01f32..b2495007 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -12,6 +12,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/amd64
SETS="
openrc
systemd
+ systemd_mu
livegui
nomultilib_openrc
nomultilib_systemd
@@ -35,6 +36,8 @@ SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec
livegui/livegui-stage2.s
SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec"
SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec"
+SET_systemd_mu_SPECS="stage1-systemd-mu.spec stage3-systemd-mu.spec"
+
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec
hardened/stage3-openrc.spec"
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1.spec
hardened/admincd-stage2.spec"
@@ -96,6 +99,9 @@ post_build() {
stage3-systemd.spec)
upload stage3-amd64-systemd-${TIMESTAMP}.tar.xz*
;;
+ stage3-systemd-mu.spec)
+ upload stage3-amd64-systemd-mergedusr-${TIMESTAMP}.tar.xz*
+ ;;
stage3d-openrc.spec)
upload stage3-amd64-desktop-openrc-${TIMESTAMP}.tar.xz*
;;
[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/, tools/
commit: 3714fd918b3876f6c389e6f64029656c62e63185 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Mar 14 15:12:03 2022 + Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Mar 14 15:12:03 2022 + URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=3714fd91 Skip some amd64 stage2 Signed-off-by: Andreas K. Hüttel gentoo.org> releases/specs/amd64/stage2-openrc.spec | 10 -- releases/specs/amd64/stage2-systemd.spec | 10 -- releases/specs/amd64/stage3-openrc.spec | 2 +- releases/specs/amd64/stage3-systemd.spec | 2 +- releases/specs/amd64/stage3d-openrc.spec | 2 +- releases/specs/amd64/stage3d-systemd.spec | 2 +- tools/catalyst-auto-amd64.conf| 4 ++-- 7 files changed, 6 insertions(+), 26 deletions(-) diff --git a/releases/specs/amd64/stage2-openrc.spec b/releases/specs/amd64/stage2-openrc.spec deleted file mode 100644 index aaa6893d.. --- a/releases/specs/amd64/stage2-openrc.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: openrc-@TIMESTAMP@ -rel_type: default -profile: default/linux/amd64/17.1 -snapshot: @TIMESTAMP@ -source_subpath: default/stage1-amd64-openrc-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/stage2-systemd.spec b/releases/specs/amd64/stage2-systemd.spec deleted file mode 100644 index 58a1391a.. --- a/releases/specs/amd64/stage2-systemd.spec +++ /dev/null @@ -1,10 +0,0 @@ -subarch: amd64 -target: stage2 -version_stamp: systemd-@TIMESTAMP@ -rel_type: default -profile: default/linux/amd64/17.1/systemd -snapshot: @TIMESTAMP@ -source_subpath: default/stage1-amd64-systemd-@TIMESTAMP@ -compression_mode: pixz -portage_confdir: @REPO_DIR@/releases/portage/stages -portage_prefix: releng diff --git a/releases/specs/amd64/stage3-openrc.spec b/releases/specs/amd64/stage3-openrc.spec index 79ad0d70..ae91bc50 100644 --- a/releases/specs/amd64/stage3-openrc.spec +++ b/releases/specs/amd64/stage3-openrc.spec @@ -4,7 +4,7 @@ version_stamp: openrc-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1 snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-openrc-@TIMESTAMP@ +source_subpath: default/stage1-amd64-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/stage3-systemd.spec b/releases/specs/amd64/stage3-systemd.spec index c81d78d8..cb188ed7 100644 --- a/releases/specs/amd64/stage3-systemd.spec +++ b/releases/specs/amd64/stage3-systemd.spec @@ -4,7 +4,7 @@ version_stamp: systemd-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1/systemd snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-systemd-@TIMESTAMP@ +source_subpath: default/stage1-amd64-systemd-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/stage3d-openrc.spec b/releases/specs/amd64/stage3d-openrc.spec index 1f39cb01..667d3b6d 100644 --- a/releases/specs/amd64/stage3d-openrc.spec +++ b/releases/specs/amd64/stage3d-openrc.spec @@ -4,7 +4,7 @@ version_stamp: desktop-openrc-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1/desktop snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-openrc-@TIMESTAMP@ +source_subpath: default/stage1-amd64-openrc-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/amd64/stage3d-systemd.spec b/releases/specs/amd64/stage3d-systemd.spec index 6160e2df..ae1a4233 100644 --- a/releases/specs/amd64/stage3d-systemd.spec +++ b/releases/specs/amd64/stage3d-systemd.spec @@ -4,7 +4,7 @@ version_stamp: desktop-systemd-@TIMESTAMP@ rel_type: default profile: default/linux/amd64/17.1/desktop/systemd snapshot: @TIMESTAMP@ -source_subpath: default/stage2-amd64-systemd-@TIMESTAMP@ +source_subpath: default/stage1-amd64-systemd-@TIMESTAMP@ compression_mode: pixz portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf index 9d6bf815..e4882343 100644 --- a/tools/catalyst-auto-amd64.conf +++ b/tools/catalyst-auto-amd64.conf @@ -24,12 +24,12 @@ SETS=" x32_openrc " -SET_openrc_SPECS="stage1-openrc.spec stage2-openrc.spec stage3-openrc.spec" +SET_openrc_SPECS="stage1-openrc.spec stage3-openrc.spec" SET_openrc_OPTIONAL_SPECS="stage3d-openrc.spec installcd-stage1.spec installcd-stage2-minimal.spec" SET_livegui_OPTIONAL_SPECS="livegui/livegui-stage1.spec livegui/livegui-stage2.spec" -SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec" +SET_systemd_SPECS="stage1-systemd.spec stage3-systemd.spec" SET_systemd_OPTIONAL_SPECS="stage3d-systemd.spec"
[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/, tools/
commit: 91376d48dfdd053ecf695ae1aae1694e9ea2e806
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Jul 10 17:28:33 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Jul 10 17:28:33 2021 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=91376d48
amd64: move "normal" multilib builds to demeter
Signed-off-by: Andreas K. Hüttel gentoo.org>
releases/specs/amd64/livecd-stage1.spec| 151 ---
releases/specs/amd64/livecd-stage2.spec| 65 -
releases/specs/amd64/livedvd-stage1.spec | 285 -
releases/specs/amd64/livedvd-stage2.spec | 65 -
.../amd64/{stage1.spec => stage1-openrc.spec} | 4 +-
releases/specs/amd64/stage2-desktop.spec | 8 -
.../amd64/{stage2.spec => stage2-openrc.spec} | 4 +-
releases/specs/amd64/stage3-desktop.spec | 8 -
.../amd64/{stage3.spec => stage3-openrc.spec} | 4 +-
releases/specs/amd64/stage4-minimal.spec | 70 -
.../specs/amd64/stage4-nomultilib-minimal.spec | 70 -
tools/catalyst-auto-amd64-demeter.conf | 15 ++
tools/catalyst-auto-amd64.conf | 26 --
13 files changed, 21 insertions(+), 754 deletions(-)
diff --git a/releases/specs/amd64/livecd-stage1.spec
b/releases/specs/amd64/livecd-stage1.spec
deleted file mode 100644
index a7743acd..
--- a/releases/specs/amd64/livecd-stage1.spec
+++ /dev/null
@@ -1,151 +0,0 @@
-subarch: amd64
-version_stamp: installer-@TIMESTAMP@
-target: livecd-stage1
-rel_type: default
-profile: default/linux/amd64/17.0/desktop
-snapshot: @TIMESTAMP@
-source_subpath: default/stage3-amd64-desktop-@TIMESTAMP@
-livecd/use:
- branding
- livecd
- socks5
-
-livecd/packages:
- app-accessibility/brltty
- app-admin/hddtemp
- app-admin/ide-smart
- app-admin/logrotate
- app-admin/pwgen
- app-admin/sudo
- app-admin/syslog-ng
- app-arch/mt-st
- app-benchmarks/cpuburn
-# app-cdr/cdrkit
- app-crypt/gnupg
-# app-editors/emacs
- app-editors/vim
- app-misc/livecd-tools
- app-misc/mc
- app-misc/screen
-# app-office/openoffice-bin
-# app-office/openoffice
- app-portage/gentoolkit
- app-portage/mirrorselect
- app-portage/ufed
- app-text/wgetpaste
- dev-util/ccache
- dev-vcs/cvs
- dev-vcs/git
- dev-vcs/subversion
- gnome-base/gdm
-# gnome-base/gnome
- xfce-base/xfce4
- mail-client/thunderbird
-# mail-client/thunderbird-bin
- media-gfx/fbgrab
-# media-sound/audacious
- net-analyzer/netcat
- net-analyzer/nmap
- net-analyzer/tcpdump
- net-analyzer/traceroute
- net-dialup/mingetty
- net-dialup/minicom
-### Masked (no keywords)
-# net-dialup/penggy
- net-dialup/pptpclient
- net-dialup/rp-pppoe
- net-firewall/iptables
- net-fs/cifs-utils
- net-fs/nfs-utils
- net-im/pidgin
- net-irc/irssi
- net-irc/xchat
- net-misc/bridge-utils
- net-misc/dhcpcd
- net-misc/iputils
- net-misc/ntp
- net-misc/rdate
- net-misc/rdesktop
- net-misc/vconfig
- net-misc/vpnc
- net-misc/whois
- net-p2p/bittorrent
- net-proxy/dante
- net-proxy/tsocks
- net-wireless/b43-fwcutter
- net-wireless/wireless-tools
- net-wireless/wpa_supplicant
-### Masked (no keywords)
- sys-apps/ethtool
- sys-apps/fxload
- sys-apps/hdparm
-### Masked (no keywords)
-# sys-apps/ibm-powerpc-utils
-### Masked (no keywords)
-# sys-apps/ibm-powerpc-utils-papr
- sys-apps/iproute2
-### Masked (no keywords)
-# sys-apps/lssbus
- sys-apps/memtester
- sys-apps/netplug
- sys-block/parted
-### Masked (no keywords)
-# sys-apps/powerpc-utils
- sys-apps/sdparm
- sys-apps/sg3_utils
- sys-apps/slocate
- sys-apps/smartmontools
- sys-block/aoetools
- sys-block/disktype
-### Masked (-amd64)
-# sys-block/gpart
- sys-block/partimage
- sys-block/qla-fc-firmware
-### Masked (no keywords)
-# sys-boot/aboot
-### Masked (no keywords)
-# sys-boot/elilo
- sys-boot/grub
-# sys-boot/lilo
- sys-boot/syslinux
-### Masked (no keywords)
-# sys-boot/yaboot
-### Masked (no keywords)
-# sys-devel/binutils-hppa64
- sys-devel/distcc
-### Masked (no keywords)
-# sys-devel/gcc-hppa64
- sys-firmware/ipw2100-firmware
- sys-firmware/ipw2200-firmware
- sys-firmware/zd1201-firmware
- sys-firmware/zd1211-firmware
- sys-fs/cryptsetup
- sys-fs/dmraid
- sys-fs/dosfstools
- sys-fs/e2fsprogs
- sys-fs/hfsplusutils
- sys-fs/hfsutils
-### Masked (no keywords)
-# sys-fs/iprutils
- sys-fs/jfsutils
- sys-fs/lsscsi
- sys-fs/lvm2
-#
[gentoo-commits] proj/releng:master commit in: releases/specs/amd64/, tools/
commit: a24359b95ce5c2e9316f87142bdcc7551166ce5b
Author: Matt Turner gentoo org>
AuthorDate: Fri May 22 01:46:51 2020 +
Commit: Matt Turner gentoo org>
CommitDate: Fri May 22 01:46:51 2020 +
URL:https://gitweb.gentoo.org/proj/releng.git/commit/?id=a24359b9
amd64: Add systemd specs
Signed-off-by: Matt Turner gentoo.org>
releases/specs/amd64/stage1-systemd.spec | 12
releases/specs/amd64/stage2-systemd.spec | 10 ++
releases/specs/amd64/stage3-systemd.spec | 10 ++
tools/catalyst-auto-amd64.conf | 6 ++
4 files changed, 38 insertions(+)
diff --git a/releases/specs/amd64/stage1-systemd.spec
b/releases/specs/amd64/stage1-systemd.spec
new file mode 100644
index ..d6375069
--- /dev/null
+++ b/releases/specs/amd64/stage1-systemd.spec
@@ -0,0 +1,12 @@
+subarch: amd64
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/amd64/17.1/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-amd64-systemd-latest
+compression_mode: pixz_x
+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/amd64/stage2-systemd.spec
b/releases/specs/amd64/stage2-systemd.spec
new file mode 100644
index ..2c5ea742
--- /dev/null
+++ b/releases/specs/amd64/stage2-systemd.spec
@@ -0,0 +1,10 @@
+subarch: amd64
+target: stage2
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/amd64/17.1/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-amd64-systemd-@TIMESTAMP@
+compression_mode: pixz_x
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/releases/specs/amd64/stage3-systemd.spec
b/releases/specs/amd64/stage3-systemd.spec
new file mode 100644
index ..0b44ad5b
--- /dev/null
+++ b/releases/specs/amd64/stage3-systemd.spec
@@ -0,0 +1,10 @@
+subarch: amd64
+target: stage3
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/amd64/17.1/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage2-amd64-systemd-@TIMESTAMP@
+compression_mode: pixz_x
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng
diff --git a/tools/catalyst-auto-amd64.conf b/tools/catalyst-auto-amd64.conf
index 586b9083..bbf27ca2 100644
--- a/tools/catalyst-auto-amd64.conf
+++ b/tools/catalyst-auto-amd64.conf
@@ -13,6 +13,7 @@ SETS="
multilib minimal_multilib
nomultilib minimal_nomultilib
x32
+ systemd
hardened_multilib minimal_hardened_multilib
hardened_nomultilib minimal_hardened_nomultilib
"
@@ -25,6 +26,8 @@ SET_minimal_multilib_OPTIONAL_SPECS="stage4-minimal.spec"
SET_nomultilib_SPECS="stage1-nomultilib.spec stage2-nomultilib.spec
stage3-nomultilib.spec"
SET_minimal_nomultilib_OPTIONAL_SPECS="stage4-nomultilib-minimal.spec"
+SET_systemd_SPECS="stage1-systemd.spec stage2-systemd.spec stage3-systemd.spec"
+
SET_x32_SPECS="stage1-x32.spec stage2-x32.spec stage3-x32.spec"
SET_hardened_multilib_SPECS="hardened/stage1.spec hardened/stage2.spec
hardened/stage3.spec"
@@ -106,6 +109,9 @@ post_build() {
stage4-nomultilib-minimal.spec)
upload stage4-amd64-minimal-nomultilib-${TIMESTAMP}.tar.xz*
;;
+ stage3-systemd.spec)
+ upload stage3-systemd-${TIMESTAMP}.tar.xz*
+ ;;
stage3-x32.spec)
upload stage3-x32-${TIMESTAMP}.tar.xz*
;;
