From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4EDC51382C5 for ; Sat, 23 May 2020 18:17:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5BD13E0869; Sat, 23 May 2020 18:17:03 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 28677E0869 for ; Sat, 23 May 2020 18:17:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BEBB834EF24 for ; Sat, 23 May 2020 18:17:01 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D18A9239 for ; Sat, 23 May 2020 18:16:59 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1590112159.dfec6c432d964d3289104a645160f8a63ff06b4d.mattst88@gentoo> Subject: [gentoo-commits] proj/releng:master commit in: releases/specs/x86/i686/, tools/ X-VCS-Repository: proj/releng X-VCS-Files: releases/specs/x86/i686/stage1-systemd.spec releases/specs/x86/i686/stage2-systemd.spec releases/specs/x86/i686/stage3-systemd.spec tools/catalyst-auto-x86.conf X-VCS-Directories: tools/ releases/specs/x86/i686/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: dfec6c432d964d3289104a645160f8a63ff06b4d X-VCS-Branch: master Date: Sat, 23 May 2020 18:16:59 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3400ef56-ff72-421a-8c70-86d862ae1b73 X-Archives-Hash: 3edf83af07c9006db333bc70a679b06e commit: dfec6c432d964d3289104a645160f8a63ff06b4d Author: Matt Turner gentoo org> AuthorDate: Fri May 22 01:49:19 2020 +0000 Commit: Matt Turner gentoo 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 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