1 |
commit: 1e54abd4ff6ee07517d3e666f0d18fe85c95e951 |
2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jul 5 22:57:04 2021 +0000 |
4 |
Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jul 5 22:57:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=1e54abd4 |
7 |
|
8 |
x86: Add specs and catalyst-auto job for musl |
9 |
|
10 |
Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> |
11 |
|
12 |
releases/specs/x86/musl/stage1.spec | 14 ++++++++++++++ |
13 |
releases/specs/x86/musl/stage2.spec | 12 ++++++++++++ |
14 |
releases/specs/x86/musl/stage3.spec | 11 +++++++++++ |
15 |
tools/catalyst-auto-x86-demeter.conf | 11 +++++++++++ |
16 |
4 files changed, 48 insertions(+) |
17 |
|
18 |
diff --git a/releases/specs/x86/musl/stage1.spec b/releases/specs/x86/musl/stage1.spec |
19 |
new file mode 100644 |
20 |
index 00000000..7c15b0ce |
21 |
--- /dev/null |
22 |
+++ b/releases/specs/x86/musl/stage1.spec |
23 |
@@ -0,0 +1,14 @@ |
24 |
+subarch: i686 |
25 |
+target: stage1 |
26 |
+version_stamp: musl-@TIMESTAMP@ |
27 |
+rel_type: musl |
28 |
+profile: default/linux/x86/17.0/musl |
29 |
+snapshot: @TIMESTAMP@ |
30 |
+source_subpath: musl/stage3-i686-musl-latest |
31 |
+chost: i686-gentoo-linux-musl |
32 |
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl |
33 |
+portage_overlay: /root/musl |
34 |
+portage_prefix: releng |
35 |
+update_seed: yes |
36 |
+update_seed_command: --update --deep --newuse @world |
37 |
+compression_mode: pixz_x |
38 |
|
39 |
diff --git a/releases/specs/x86/musl/stage2.spec b/releases/specs/x86/musl/stage2.spec |
40 |
new file mode 100644 |
41 |
index 00000000..cb5c5fff |
42 |
--- /dev/null |
43 |
+++ b/releases/specs/x86/musl/stage2.spec |
44 |
@@ -0,0 +1,12 @@ |
45 |
+subarch: i686 |
46 |
+target: stage2 |
47 |
+version_stamp: musl-@TIMESTAMP@ |
48 |
+rel_type: musl |
49 |
+profile: default/linux/x86/17.0/musl |
50 |
+snapshot: @TIMESTAMP@ |
51 |
+source_subpath: musl/stage1-i686-musl-@TIMESTAMP@ |
52 |
+chost: i686-gentoo-linux-musl |
53 |
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl |
54 |
+portage_overlay: /root/musl |
55 |
+portage_prefix: releng |
56 |
+compression_mode: pixz_x |
57 |
|
58 |
diff --git a/releases/specs/x86/musl/stage3.spec b/releases/specs/x86/musl/stage3.spec |
59 |
new file mode 100644 |
60 |
index 00000000..bb32f043 |
61 |
--- /dev/null |
62 |
+++ b/releases/specs/x86/musl/stage3.spec |
63 |
@@ -0,0 +1,11 @@ |
64 |
+subarch: i686 |
65 |
+target: stage3 |
66 |
+version_stamp: musl-@TIMESTAMP@ |
67 |
+rel_type: musl |
68 |
+profile: default/linux/x86/17.0/musl |
69 |
+snapshot: @TIMESTAMP@ |
70 |
+source_subpath: musl/stage2-i686-musl-@TIMESTAMP@ |
71 |
+portage_confdir: @REPO_DIR@/releases/portage/stages-musl |
72 |
+portage_overlay: /root/musl |
73 |
+portage_prefix: releng |
74 |
+compression_mode: pixz_x |
75 |
|
76 |
diff --git a/tools/catalyst-auto-x86-demeter.conf b/tools/catalyst-auto-x86-demeter.conf |
77 |
index 98c2d131..f8ad498f 100644 |
78 |
--- a/tools/catalyst-auto-x86-demeter.conf |
79 |
+++ b/tools/catalyst-auto-x86-demeter.conf |
80 |
@@ -12,6 +12,7 @@ EMAIL_SUBJECT_PREPEND="[x86-auto]" |
81 |
SPECS_DIR=${REPO_DIR}/releases/specs/x86 |
82 |
|
83 |
SETS=" |
84 |
+ musl |
85 |
i486_openrc |
86 |
i686_openrc |
87 |
i686_systemd |
88 |
@@ -27,6 +28,8 @@ SET_i686_systemd_SPECS="i686/stage1-systemd.spec i686/stage2-systemd.spec i686/s |
89 |
SET_hardened_openrc_SPECS="hardened/stage1-openrc.spec hardened/stage2-openrc.spec hardened/stage3-openrc.spec" |
90 |
SET_hardened_openrc_OPTIONAL_SPECS="hardened/admincd-stage1-openrc.spec hardened/admincd-stage2-openrc.spec" |
91 |
|
92 |
+SET_musl_SPECS="musl/stage1.spec musl/stage2.spec musl/stage3.spec" |
93 |
+ |
94 |
KCONFIG_DIR=${REPO_DIR}/releases/kconfig/x86 |
95 |
|
96 |
EXTENSIONS="@(.tar.xz|.tar.bz2|.tar.gz|.tar|.sfs)" |
97 |
@@ -84,6 +87,14 @@ post_build() { |
98 |
;; |
99 |
esac |
100 |
popd >/dev/null || exit |
101 |
+ |
102 |
+ pushd ${BUILD_SRCDIR_BASE}/builds/musl >/dev/null || exit |
103 |
+ case ${spec} in |
104 |
+ musl/stage3.spec) |
105 |
+ upload stage3-i686-musl-${TIMESTAMP}.tar.xz* |
106 |
+ ;; |
107 |
+ esac |
108 |
+ popd >/dev/null || exit |
109 |
} |
110 |
|
111 |
# vim:ft=sh: |