From 93449eee1f213983d831adabdabf38349c81f6b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20K=2E=20H=C3=BCttel?= Date: Mon, 30 Aug 2021 10:54:34 +0200 Subject: [PATCH] Also build armv7a on jiji MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andreas K. Hüttel --- ...loat.spec => stage1-hardfloat-openrc.spec} | 4 ++-- .../{stage1.spec => stage1-openrc.spec} | 4 ++-- ...loat.spec => stage3-hardfloat-openrc.spec} | 4 ++-- .../{stage3.spec => stage3-openrc.spec} | 4 ++-- tools/catalyst-auto-arm.conf | 24 +++++++++---------- 5 files changed, 19 insertions(+), 21 deletions(-) rename releases/specs/arm/armv7a/{stage1-hardfloat.spec => stage1-hardfloat-openrc.spec} (74%) rename releases/specs/arm/armv7a/{stage1.spec => stage1-openrc.spec} (75%) rename releases/specs/arm/armv7a/{stage3-hardfloat.spec => stage3-hardfloat-openrc.spec} (68%) rename releases/specs/arm/armv7a/{stage3.spec => stage3-openrc.spec} (69%) diff --git a/releases/specs/arm/armv7a/stage1-hardfloat.spec b/releases/specs/arm/armv7a/stage1-hardfloat-openrc.spec similarity index 74% rename from releases/specs/arm/armv7a/stage1-hardfloat.spec rename to releases/specs/arm/armv7a/stage1-hardfloat-openrc.spec index a4c888fd..d7519391 100644 --- a/releases/specs/arm/armv7a/stage1-hardfloat.spec +++ b/releases/specs/arm/armv7a/stage1-hardfloat-openrc.spec @@ -1,10 +1,10 @@ subarch: armv7a_hardfp -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ target: stage1 rel_type: default profile: default/linux/arm/17.0/armv7a snapshot: @TIMESTAMP@ -source_subpath: default/stage3-armv7a_hardfp-latest +source_subpath: default/stage3-armv7a_hardfp-openrc-latest compression_mode: pixz_x update_seed: yes update_seed_command: -uDN @world diff --git a/releases/specs/arm/armv7a/stage1.spec b/releases/specs/arm/armv7a/stage1-openrc.spec similarity index 75% rename from releases/specs/arm/armv7a/stage1.spec rename to releases/specs/arm/armv7a/stage1-openrc.spec index db9e62ff..9c585823 100644 --- a/releases/specs/arm/armv7a/stage1.spec +++ b/releases/specs/arm/armv7a/stage1-openrc.spec @@ -1,10 +1,10 @@ subarch: armv7a -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ target: stage1 rel_type: default profile: default/linux/arm/17.0/armv7a snapshot: @TIMESTAMP@ -source_subpath: default/stage3-armv7a-latest +source_subpath: default/stage3-armv7a-openrc-latest compression_mode: pixz_x update_seed: yes update_seed_command: -uDN @world diff --git a/releases/specs/arm/armv7a/stage3-hardfloat.spec b/releases/specs/arm/armv7a/stage3-hardfloat-openrc.spec similarity index 68% rename from releases/specs/arm/armv7a/stage3-hardfloat.spec rename to releases/specs/arm/armv7a/stage3-hardfloat-openrc.spec index a418e902..95d55e85 100644 --- a/releases/specs/arm/armv7a/stage3-hardfloat.spec +++ b/releases/specs/arm/armv7a/stage3-hardfloat-openrc.spec @@ -1,10 +1,10 @@ subarch: armv7a_hardfp -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ target: stage3 rel_type: default profile: default/linux/arm/17.0/armv7a snapshot: @TIMESTAMP@ -source_subpath: default/stage1-armv7a_hardfp-@TIMESTAMP@ +source_subpath: default/stage1-armv7a_hardfp-openrc-@TIMESTAMP@ compression_mode: pixz_x portage_confdir: @REPO_DIR@/releases/portage/stages portage_prefix: releng diff --git a/releases/specs/arm/armv7a/stage3.spec b/releases/specs/arm/armv7a/stage3-openrc.spec similarity index 69% rename from releases/specs/arm/armv7a/stage3.spec rename to releases/specs/arm/armv7a/stage3-openrc.spec index 037dcbd3..b4302c62 100644 --- a/releases/specs/arm/armv7a/stage3.spec +++ b/releases/specs/arm/armv7a/stage3-openrc.spec @@ -1,10 +1,10 @@ subarch: armv7a -version_stamp: @TIMESTAMP@ +version_stamp: openrc-@TIMESTAMP@ target: stage3 rel_type: default profile: default/linux/arm/17.0/armv7a snapshot: @TIMESTAMP@ -source_subpath: default/stage1-armv7a-@TIMESTAMP@ +source_subpath: default/stage1-armv7a-openrc-@TIMESTAMP@ compression_mode: pixz_x 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 9f472845..27e86522 100644 --- a/tools/catalyst-auto-arm.conf +++ b/tools/catalyst-auto-arm.conf @@ -11,6 +11,10 @@ SPECS_DIR=${REPO_DIR}/releases/specs/arm EMAIL_SUBJECT_PREPEND="[arm-auto]" SETS=" + armv7a_hf_openrc + armv7a_hf_systemd + armv7a_sf_openrc + armv7a_sf_systemd armv4tl_openrc armv4tl_systemd armv5tel_openrc @@ -21,12 +25,6 @@ SETS=" armv6j_sf_systemd " -# armv7a_hf -# armv7a_sf -# armv7a_hf_systemd -# armv7a_sf_systemd - - SET_armv4tl_openrc_SPECS="armv4tl/stage1-openrc.spec armv4tl/stage3-openrc.spec" SET_armv4tl_systemd_SPECS="armv4tl/stage1-systemd.spec armv4tl/stage3-systemd.spec" @@ -39,11 +37,11 @@ SET_armv6j_hf_systemd_SPECS="armv6j/stage1-hardfloat-systemd.spec armv6j/stage3- 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_armv7a_hf_SPECS="armv7a/stage1-hardfloat.spec armv7a/stage3-hardfloat.spec" -SET_armv7a_sf_SPECS="armv7a/stage1.spec armv7a/stage3.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_sf_systemd_SPECS="armv7a/stage1-systemd.spec armv7a/stage3-systemd.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" update_symlinks() { # Symlink the latest stages3 to build from @@ -76,25 +74,25 @@ post_build() { armv5tel/stage3-systemd.spec) upload stage3-armv5tel-systemd-${TIMESTAMP}*.xz* ;; - armv6j/stage3.spec) + armv6j/stage3-openrc.spec) upload stage3-armv6j-openrc-${TIMESTAMP}*.xz* ;; armv6j/stage3-systemd.spec) upload stage3-armv6j-systemd-${TIMESTAMP}*.xz* ;; - armv6j/stage3-hardfloat.spec) + armv6j/stage3-hardfloat-openrc.spec) upload stage3-armv6j_hardfp-openrc-${TIMESTAMP}*.xz* ;; armv6j/stage3-hardfloat-systemd.spec) upload stage3-armv6j_hardfp-systemd-${TIMESTAMP}*.xz* ;; - armv7a/stage3.spec) + armv7a/stage3-openrc.spec) upload stage3-armv7a-${TIMESTAMP}*.xz* ;; armv7a/stage3-systemd.spec) upload stage3-armv7a-systemd-${TIMESTAMP}*.xz* ;; - armv7a/stage3-hardfloat.spec) + armv7a/stage3-hardfloat-openrc.spec) upload stage3-armv7a_hardfp-${TIMESTAMP}*.xz* ;; armv7a/stage3-hardfloat-systemd.spec)