From b3dba6b4415ac5841606db32b6e82db23626e670 Mon Sep 17 00:00:00 2001 From: Francois Andrieu Date: Nov 17 2022 22:23:41 +0000 Subject: freeze armv7 to F36 --- diff --git a/arm.fedoraproject.org/data/content/index.html b/arm.fedoraproject.org/data/content/index.html index f439247..ebde33b 100644 --- a/arm.fedoraproject.org/data/content/index.html +++ b/arm.fedoraproject.org/data/content/index.html @@ -40,7 +40,8 @@
-

${Markup(_('Fedora %(rel)s released! Get it now.')) % {'rel':global_variables.release['curr_id']}}

+

${Markup(_('Fedora Linux on ARMv7 (also known as arm32 or armhfp) is now deprecated.'))}

+

${Markup(_('For latest ARM aarch64 images, visit <a href="https://getfedora.org">getfedora.org</a>.'))}

@@ -72,7 +73,7 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['ARM_Server']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -86,7 +87,7 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['ARM_Minimal']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -114,7 +115,7 @@

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -123,7 +124,7 @@

${_('Fedora Minimal')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -152,7 +153,7 @@

${_('Fedora Server')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -163,7 +164,7 @@

${_('Fedora Minimal')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -194,7 +195,7 @@

${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Workstation']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -208,7 +209,7 @@

${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_KDE']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -222,7 +223,7 @@

${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Xfce']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -267,7 +268,7 @@

${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Mate']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

--> @@ -282,7 +283,7 @@

${Markup(_('%sMB raw image')) % global_variables.iso_size['ARM_SoaS']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -310,7 +311,7 @@

${_('Fedora Workstation')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

-->
@@ -319,7 +320,7 @@

${_('KDE Plasma Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -328,7 +329,7 @@

${_('Xfce Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -358,7 +359,7 @@

${_('MATE-Compiz Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

--> @@ -368,7 +369,7 @@

${_('Sugar on a Stick')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -397,7 +398,7 @@

${_('Fedora Workstation')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

-->
@@ -408,7 +409,7 @@

${_('KDE Plasma Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -419,7 +420,7 @@

${_('Xfce Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -455,7 +456,7 @@

${_('MATE-Compiz Desktop')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

--> @@ -467,7 +468,7 @@

${_('Sugar on a Stick')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -499,7 +500,7 @@

${Markup(_('%sGB raw image')) % global_variables.iso_size['ARM_Python']}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -529,7 +530,7 @@

${_('Python-Classroom')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

@@ -560,7 +561,7 @@

${_('Python-Classroom')}

-

${_('Download')} | ${_('Verify')}

+

${_('Download')} | ${_('Verify')}

diff --git a/build.d/globalvar.py b/build.d/globalvar.py index b9a635f..e5d5db6 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -18,7 +18,7 @@ release={ 'prev_alt_id': '36', 'prev_cloud_id': '36', 'prev_atomic_id': '30', - 'curr_arm_id': '37', + 'curr_arm_id': '36', # Final release for armhfp is F36 'curr_alt_id': '37', 'curr_cloud_id': '37', 'curr_atomic_id': '30', @@ -27,7 +27,7 @@ release={ 'curr_iot_id': '37', 'curr_silverblue_id': '37', 'next_silverblue_id': '38', - 'next_arm_id': '38', + 'next_arm_id': '36', 'next_alt_id': '38', 'next_cloud_id': '38', 'next_atomic_id': '30', @@ -57,6 +57,7 @@ release={ 'RC_gold': '1.7', # insert the number of the RC version declared GOLD 'RC_server_gold': '1.7', # insert the number of the RC version declared GOLD 'RC_build': '1.7', # sometimes releng use the RC build + 'RC_gold_armhfp': '1.5', # RC Gold for armhfp 'RC_gold_aarch64': '1.7', # RC Gold for aarch64 'RC_gold_ppc64': '1.7', # RC Gold for ppc64 'RC_gold_ppc64le': '1.7', # RC Gold for ppc64le