Gentoo Archives: gentoo-commits

From: Matt Turner <mattst88@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/releng:master commit in: releases/specs/x86/i686/, tools/
Date: Sat, 23 May 2020 18:17:04
Message-Id: 1590112159.dfec6c432d964d3289104a645160f8a63ff06b4d.mattst88@gentoo
commit:     dfec6c432d964d3289104a645160f8a63ff06b4d
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 22 01:49:19 2020 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 22 01:49:19 2020 +0000
URL:        https://gitweb.gentoo.org/proj/releng.git/commit/?id=dfec6c43

x86: Add systemd specs

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 releases/specs/x86/i686/stage1-systemd.spec | 12 ++++++++++++
 releases/specs/x86/i686/stage2-systemd.spec | 10 ++++++++++
 releases/specs/x86/i686/stage3-systemd.spec | 10 ++++++++++
 tools/catalyst-auto-x86.conf                |  6 ++++++
 4 files changed, 38 insertions(+)

diff --git a/releases/specs/x86/i686/stage1-systemd.spec b/releases/specs/x86/i686/stage1-systemd.spec
new file mode 100644
index 00000000..c1d4a09e
--- /dev/null
+++ b/releases/specs/x86/i686/stage1-systemd.spec
@@ -0,0 +1,12 @@
+subarch: i686
+target: stage1
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/x86/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage3-i686-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/x86/i686/stage2-systemd.spec b/releases/specs/x86/i686/stage2-systemd.spec
new file mode 100644
index 00000000..d7a99295
--- /dev/null
+++ b/releases/specs/x86/i686/stage2-systemd.spec
@@ -0,0 +1,10 @@
+subarch: i686
+target: stage2
+version_stamp: systemd-@TIMESTAMP@
+rel_type: default
+profile: default/linux/x86/17.0/systemd
+snapshot: @TIMESTAMP@
+source_subpath: default/stage1-i686-systemd-@TIMESTAMP@
+compression_mode: pixz_x
+portage_confdir: @REPO_DIR@/releases/portage/stages
+portage_prefix: releng

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

diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf
index e6307421..9dbab7be 100644
--- a/tools/catalyst-auto-x86.conf
+++ b/tools/catalyst-auto-x86.conf
@@ -12,6 +12,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH}
 SETS="
 	i486
 	i686
+	i686-systemd
 	hardened
 "
 
@@ -20,6 +21,8 @@ SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec"
 
 SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec"
 
+SET_i686_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec"
+
 SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec"
 SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec"
 
@@ -86,6 +89,9 @@ post_build() {
 	i686/stage3.spec)
 		upload stage3-i686-${TIMESTAMP}.tar.xz*
 		;;
+	i686/stage3-systemd.spec)
+		upload stage3-i686-${TIMESTAMP}.tar.xz*
+		;;
 	esac
 	popd >/dev/null || exit