From dfec6c432d964d3289104a645160f8a63ff06b4d Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Thu, 21 May 2020 18:49:19 -0700 Subject: x86: Add systemd specs Signed-off-by: Matt Turner --- 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(+) create mode 100644 releases/specs/x86/i686/stage1-systemd.spec create mode 100644 releases/specs/x86/i686/stage2-systemd.spec create mode 100644 releases/specs/x86/i686/stage3-systemd.spec 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 -- cgit v1.2.3-65-gdbad