| 1 |
commit: dfec6c432d964d3289104a645160f8a63ff06b4d |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri May 22 01:49:19 2020 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri May 22 01:49:19 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=dfec6c43 |
| 7 |
|
| 8 |
x86: Add systemd specs |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
releases/specs/x86/i686/stage1-systemd.spec | 12 ++++++++++++ |
| 13 |
releases/specs/x86/i686/stage2-systemd.spec | 10 ++++++++++ |
| 14 |
releases/specs/x86/i686/stage3-systemd.spec | 10 ++++++++++ |
| 15 |
tools/catalyst-auto-x86.conf | 6 ++++++ |
| 16 |
4 files changed, 38 insertions(+) |
| 17 |
|
| 18 |
diff --git a/releases/specs/x86/i686/stage1-systemd.spec b/releases/specs/x86/i686/stage1-systemd.spec |
| 19 |
new file mode 100644 |
| 20 |
index 00000000..c1d4a09e |
| 21 |
--- /dev/null |
| 22 |
+++ b/releases/specs/x86/i686/stage1-systemd.spec |
| 23 |
@@ -0,0 +1,12 @@ |
| 24 |
+subarch: i686 |
| 25 |
+target: stage1 |
| 26 |
+version_stamp: systemd-@TIMESTAMP@ |
| 27 |
+rel_type: default |
| 28 |
+profile: default/linux/x86/17.0/systemd |
| 29 |
+snapshot: @TIMESTAMP@ |
| 30 |
+source_subpath: default/stage3-i686-systemd-latest |
| 31 |
+compression_mode: pixz_x |
| 32 |
+update_seed: yes |
| 33 |
+update_seed_command: --update --deep --newuse @world |
| 34 |
+portage_confdir: @REPO_DIR@/releases/portage/stages |
| 35 |
+portage_prefix: releng |
| 36 |
|
| 37 |
diff --git a/releases/specs/x86/i686/stage2-systemd.spec b/releases/specs/x86/i686/stage2-systemd.spec |
| 38 |
new file mode 100644 |
| 39 |
index 00000000..d7a99295 |
| 40 |
--- /dev/null |
| 41 |
+++ b/releases/specs/x86/i686/stage2-systemd.spec |
| 42 |
@@ -0,0 +1,10 @@ |
| 43 |
+subarch: i686 |
| 44 |
+target: stage2 |
| 45 |
+version_stamp: systemd-@TIMESTAMP@ |
| 46 |
+rel_type: default |
| 47 |
+profile: default/linux/x86/17.0/systemd |
| 48 |
+snapshot: @TIMESTAMP@ |
| 49 |
+source_subpath: default/stage1-i686-systemd-@TIMESTAMP@ |
| 50 |
+compression_mode: pixz_x |
| 51 |
+portage_confdir: @REPO_DIR@/releases/portage/stages |
| 52 |
+portage_prefix: releng |
| 53 |
|
| 54 |
diff --git a/releases/specs/x86/i686/stage3-systemd.spec b/releases/specs/x86/i686/stage3-systemd.spec |
| 55 |
new file mode 100644 |
| 56 |
index 00000000..1ac69305 |
| 57 |
--- /dev/null |
| 58 |
+++ b/releases/specs/x86/i686/stage3-systemd.spec |
| 59 |
@@ -0,0 +1,10 @@ |
| 60 |
+subarch: i686 |
| 61 |
+target: stage3 |
| 62 |
+version_stamp: systemd-@TIMESTAMP@ |
| 63 |
+rel_type: default |
| 64 |
+profile: default/linux/x86/17.0/systemd |
| 65 |
+snapshot: @TIMESTAMP@ |
| 66 |
+source_subpath: default/stage2-i686-systemd-@TIMESTAMP@ |
| 67 |
+compression_mode: pixz_x |
| 68 |
+portage_confdir: @REPO_DIR@/releases/portage/stages |
| 69 |
+portage_prefix: releng |
| 70 |
|
| 71 |
diff --git a/tools/catalyst-auto-x86.conf b/tools/catalyst-auto-x86.conf |
| 72 |
index e6307421..9dbab7be 100644 |
| 73 |
--- a/tools/catalyst-auto-x86.conf |
| 74 |
+++ b/tools/catalyst-auto-x86.conf |
| 75 |
@@ -12,6 +12,7 @@ SPECS_DIR=${REPO_DIR}/releases/specs/${ARCH} |
| 76 |
SETS=" |
| 77 |
i486 |
| 78 |
i686 |
| 79 |
+ i686-systemd |
| 80 |
hardened |
| 81 |
" |
| 82 |
|
| 83 |
@@ -20,6 +21,8 @@ SET_i486_OPTIONAL_SPECS="installcd-stage1.spec installcd-stage2-minimal.spec" |
| 84 |
|
| 85 |
SET_i686_SPECS="i686/stage1.spec i686/stage2.spec i686/stage3.spec" |
| 86 |
|
| 87 |
+SET_i686_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/stage3-systemd.spec" |
| 88 |
+ |
| 89 |
SET_hardened_SPECS="hardened/stage1.spec hardened/stage2.spec hardened/stage3.spec" |
| 90 |
SET_hardened_OPTIONAL_SPECS="hardened/admincd-stage1.spec hardened/admincd-stage2.spec" |
| 91 |
|
| 92 |
@@ -86,6 +89,9 @@ post_build() { |
| 93 |
i686/stage3.spec) |
| 94 |
upload stage3-i686-${TIMESTAMP}.tar.xz* |
| 95 |
;; |
| 96 |
+ i686/stage3-systemd.spec) |
| 97 |
+ upload stage3-i686-${TIMESTAMP}.tar.xz* |
| 98 |
+ ;; |
| 99 |
esac |
| 100 |
popd >/dev/null || exit |
Archives