commit: bfb088cb59f74a5b37655ccf2b7058e236b11bc9 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Wed Nov 16 20:40:58 2022 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Wed Nov 16 20:40:58 2022 +0000 URL: https://gitweb.gentoo.org/proj/releng.git/commit/?id=bfb088cb
Add arm systemd merged-usr build Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> releases/specs/arm/armv4tl/stage1-systemd-mu.spec | 12 +++++++++ releases/specs/arm/armv4tl/stage3-systemd-mu.spec | 10 ++++++++ releases/specs/arm/armv5tel/stage1-systemd-mu.spec | 12 +++++++++ releases/specs/arm/armv5tel/stage3-systemd-mu.spec | 10 ++++++++ .../arm/armv6j/stage1-hardfloat-systemd-mu.spec | 12 +++++++++ releases/specs/arm/armv6j/stage1-systemd-mu.spec | 12 +++++++++ .../arm/armv6j/stage3-hardfloat-systemd-mu.spec | 10 ++++++++ releases/specs/arm/armv6j/stage3-systemd-mu.spec | 10 ++++++++ .../arm/armv7a/stage1-hardfloat-systemd-mu.spec | 12 +++++++++ releases/specs/arm/armv7a/stage1-systemd-mu.spec | 12 +++++++++ .../arm/armv7a/stage3-hardfloat-systemd-mu.spec | 10 ++++++++ releases/specs/arm/armv7a/stage3-systemd-mu.spec | 10 ++++++++ tools/catalyst-auto-arm.conf | 30 ++++++++++++++++++++++ 13 files changed, 162 insertions(+) diff --git a/releases/specs/arm/armv4tl/stage1-systemd-mu.spec b/releases/specs/arm/armv4tl/stage1-systemd-mu.spec new file mode 100644 index 00000000..327e3fe6 --- /dev/null +++ b/releases/specs/arm/armv4tl/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: armv4tl +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage1 +rel_type: default +profile: default/linux/arm/17.0/armv4t/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-armv4tl-systemd-mergedusr-latest.tar.xz +compression_mode: pixz +update_seed: no +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv4tl/stage3-systemd-mu.spec b/releases/specs/arm/armv4tl/stage3-systemd-mu.spec new file mode 100644 index 00000000..dd9d375d --- /dev/null +++ b/releases/specs/arm/armv4tl/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: armv4tl +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage3 +rel_type: default +profile: default/linux/arm/17.0/armv4t/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-armv4tl-systemd-mergedusr-@[email protected] +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv5tel/stage1-systemd-mu.spec b/releases/specs/arm/armv5tel/stage1-systemd-mu.spec new file mode 100644 index 00000000..0b0a5c1e --- /dev/null +++ b/releases/specs/arm/armv5tel/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: armv5tel +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage1 +rel_type: default +profile: default/linux/arm/17.0/armv5te/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-armv5tel-systemd-mergedusr-latest.tar.xz +compression_mode: pixz +update_seed: no +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv5tel/stage3-systemd-mu.spec b/releases/specs/arm/armv5tel/stage3-systemd-mu.spec new file mode 100644 index 00000000..07a5d2a7 --- /dev/null +++ b/releases/specs/arm/armv5tel/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: armv5tel +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage3 +rel_type: default +profile: default/linux/arm/17.0/armv5te/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-armv5tel-systemd-mergedusr-@[email protected] +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv6j/stage1-hardfloat-systemd-mu.spec b/releases/specs/arm/armv6j/stage1-hardfloat-systemd-mu.spec new file mode 100644 index 00000000..2b7bd2fc --- /dev/null +++ b/releases/specs/arm/armv6j/stage1-hardfloat-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: armv6j_hardfp +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage1 +rel_type: default +profile: default/linux/arm/17.0/armv6j/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-armv6j_hardfp-systemd-mergedusr-latest.tar.xz +compression_mode: pixz +update_seed: no +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv6j/stage1-systemd-mu.spec b/releases/specs/arm/armv6j/stage1-systemd-mu.spec new file mode 100644 index 00000000..be57040d --- /dev/null +++ b/releases/specs/arm/armv6j/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: armv6j +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage1 +rel_type: default +profile: default/linux/arm/17.0/armv6j/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-armv6j-systemd-mergedusr-latest.tar.xz +compression_mode: pixz +update_seed: no +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv6j/stage3-hardfloat-systemd-mu.spec b/releases/specs/arm/armv6j/stage3-hardfloat-systemd-mu.spec new file mode 100644 index 00000000..bab362d7 --- /dev/null +++ b/releases/specs/arm/armv6j/stage3-hardfloat-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: armv6j_hardfp +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage3 +rel_type: default +profile: default/linux/arm/17.0/armv6j/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-armv6j_hardfp-systemd-mergedusr-@[email protected] +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv6j/stage3-systemd-mu.spec b/releases/specs/arm/armv6j/stage3-systemd-mu.spec new file mode 100644 index 00000000..1b2c7ed5 --- /dev/null +++ b/releases/specs/arm/armv6j/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: armv6j +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage3 +rel_type: default +profile: default/linux/arm/17.0/armv6j/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-armv6j-systemd-mergedusr-@[email protected] +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv7a/stage1-hardfloat-systemd-mu.spec b/releases/specs/arm/armv7a/stage1-hardfloat-systemd-mu.spec new file mode 100644 index 00000000..0516a5bf --- /dev/null +++ b/releases/specs/arm/armv7a/stage1-hardfloat-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: armv7a_hardfp +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage1 +rel_type: default +profile: default/linux/arm/17.0/armv7a/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-armv7a_hardfp-systemd-mergedusr-latest.tar.xz +compression_mode: pixz +update_seed: no +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv7a/stage1-systemd-mu.spec b/releases/specs/arm/armv7a/stage1-systemd-mu.spec new file mode 100644 index 00000000..5238adda --- /dev/null +++ b/releases/specs/arm/armv7a/stage1-systemd-mu.spec @@ -0,0 +1,12 @@ +subarch: armv7a +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage1 +rel_type: default +profile: default/linux/arm/17.0/armv7a/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage3-armv7a-systemd-mergedusr-latest.tar.xz +compression_mode: pixz +update_seed: no +update_seed_command: -uDN @world +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv7a/stage3-hardfloat-systemd-mu.spec b/releases/specs/arm/armv7a/stage3-hardfloat-systemd-mu.spec new file mode 100644 index 00000000..67895086 --- /dev/null +++ b/releases/specs/arm/armv7a/stage3-hardfloat-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: armv7a_hardfp +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage3 +rel_type: default +profile: default/linux/arm/17.0/armv7a/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-armv7a_hardfp-systemd-mergedusr-@[email protected] +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/releases/specs/arm/armv7a/stage3-systemd-mu.spec b/releases/specs/arm/armv7a/stage3-systemd-mu.spec new file mode 100644 index 00000000..1dc73acd --- /dev/null +++ b/releases/specs/arm/armv7a/stage3-systemd-mu.spec @@ -0,0 +1,10 @@ +subarch: armv7a +version_stamp: systemd-mergedusr-@TIMESTAMP@ +target: stage3 +rel_type: default +profile: default/linux/arm/17.0/armv7a/systemd/merged-usr +snapshot: @TIMESTAMP@ +source_subpath: default/stage1-armv7a-systemd-mergedusr-@[email protected] +compression_mode: pixz +portage_confdir: @REPO_DIR@/releases/portage/stages +portage_prefix: releng diff --git a/tools/catalyst-auto-arm.conf b/tools/catalyst-auto-arm.conf index 5f1d6856..20408e93 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -13,45 +13,57 @@ EMAIL_SUBJECT_PREPEND="[arm-auto]" SETS=" armv4tl_openrc armv4tl_systemd + armv4tl_systemd_mu armv5tel_openrc armv5tel_systemd + armv5tel_systemd_mu armv6j_hf_openrc armv6j_hf_systemd + armv6j_hf_systemd_mu armv6j_sf_openrc armv6j_sf_systemd + armv6j_sf_systemd_mu armv6j_hf_musl_openrc armv6j_hf_musl_hardened_openrc armv7a_hf_openrc armv7a_hf_systemd + armv7a_hf_systemd_mu armv7a_sf_openrc armv7a_sf_systemd + armv7a_sf_systemd_mu armv7a_hf_musl_openrc armv7a_hf_musl_hardened_openrc " SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec" SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec" +SET_armv4tl_systemd_mu_SPECS="armv4tl/stage1-systemd-mu.spec armv4tl/stage3-systemd-mu.spec" SET_armv5tel_openrc_SPECS="armv5tel/stage1-openrc.spec armv5tel/stage3-openrc.spec" SET_armv5tel_systemd_SPECS="armv5tel/stage1-systemd.spec armv5tel/stage3-systemd.spec" +SET_armv5tel_systemd_mu_SPECS="armv5tel/stage1-systemd-mu.spec armv5tel/stage3-systemd-mu.spec" SET_armv6j_hf_openrc_SPECS="armv6j/stage1-hardfloat-openrc.spec armv6j/stage3-hardfloat-openrc.spec" SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3-hardfloat-systemd.spec" +SET_armv6j_hf_systemd_mu_SPECS="armv6j/stage1-hardfloat-systemd-mu.spec armv6j/stage3-hardfloat-systemd-mu.spec" SET_armv6j_sf_openrc_SPECS="armv6j/stage1-openrc.spec armv6j/stage3-openrc.spec" SET_armv6j_sf_systemd_SPECS="armv6j/stage1-systemd.spec armv6j/stage3-systemd.spec" +SET_armv6j_sf_systemd_mu_SPECS="armv6j/stage1-systemd-mu.spec armv6j/stage3-systemd-mu.spec" SET_armv6j_hf_musl_openrc_SPECS="armv6j-musl/stage1-hardfloat.spec armv6j-musl/stage3-hardfloat.spec" SET_armv6j_hf_musl_hardened_openrc_SPECS="armv6j-musl-hardened/stage1-hardfloat.spec armv6j-musl-hardened/stage3-hardfloat.spec" SET_armv7a_hf_openrc_SPECS="armv7a/stage1-hardfloat-openrc.spec armv7a/stage3-hardfloat-openrc.spec" SET_armv7a_hf_systemd_SPECS="armv7a/stage1-hardfloat-systemd.spec armv7a/stage3-hardfloat-systemd.spec" +SET_armv7a_hf_systemd_mu_SPECS="armv7a/stage1-hardfloat-systemd-mu.spec armv7a/stage3-hardfloat-systemd-mu.spec" SET_armv7a_hf_musl_openrc_SPECS="armv7a-musl/stage1-hardfloat.spec armv7a-musl/stage3-hardfloat.spec" SET_armv7a_hf_musl_hardened_openrc_SPECS="armv7a-musl-hardened/stage1-hardfloat.spec armv7a-musl-hardened/stage3-hardfloat.spec" SET_armv7a_sf_openrc_SPECS="armv7a/stage1-openrc.spec armv7a/stage3-openrc.spec" SET_armv7a_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.spec" +SET_armv7a_sf_systemd_mu_SPECS="armv7a/stage1-systemd-mu.spec armv7a/stage3-systemd-mu.spec" update_symlinks() { # Symlink the latest stages3 to build from @@ -78,36 +90,54 @@ post_build() { armv4tl/stage3-systemd.spec) upload stage3-armv4tl-systemd-${TIMESTAMP}*.xz* ;; + armv4tl/stage3-systemd-mu.spec) + upload stage3-armv4tl-systemd-mergedusr-${TIMESTAMP}*.xz* + ;; armv5tel/stage3-openrc.spec) upload stage3-armv5tel-openrc-${TIMESTAMP}*.xz* ;; armv5tel/stage3-systemd.spec) upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz* ;; + armv5tel/stage3-systemd-mu.spec) + upload stage3-armv5tel-systemd-mergedusr-${TIMESTAMP}*.xz* + ;; armv6j/stage3-openrc.spec) upload stage3-armv6j-openrc-${TIMESTAMP}*.xz* ;; armv6j/stage3-systemd.spec) upload stage3-armv6j-systemd-${TIMESTAMP}*.xz* ;; + armv6j/stage3-systemd-mu.spec) + upload stage3-armv6j-systemd-mergedusr-${TIMESTAMP}*.xz* + ;; armv6j/stage3-hardfloat-openrc.spec) upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz* ;; armv6j/stage3-hardfloat-systemd.spec) upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz* ;; + armv6j/stage3-hardfloat-systemd-mu.spec) + upload stage3-armv6j_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz* + ;; armv7a/stage3-openrc.spec) upload stage3-armv7a-openrc-${TIMESTAMP}*.xz* ;; armv7a/stage3-systemd.spec) upload stage3-armv7a-systemd-${TIMESTAMP}*.xz* ;; + armv7a/stage3-systemd-mu.spec) + upload stage3-armv7a-systemd-mergedusr-${TIMESTAMP}*.xz* + ;; armv7a/stage3-hardfloat-openrc.spec) upload stage3-armv7a_hardfp-openrc-${TIMESTAMP}*.xz* ;; armv7a/stage3-hardfloat-systemd.spec) upload stage3-armv7a_hardfp-systemd-${TIMESTAMP}*.xz* ;; + armv7a/stage3-hardfloat-systemd-mu.spec) + upload stage3-armv7a_hardfp-systemd-mergedusr-${TIMESTAMP}*.xz* + ;; *) echo "Finished ${spec}" ;;
