From bb35256b72a60356612ea4898229ee6f1f4f8341 Mon Sep 17 00:00:00 2001 From: Ben Cotton Date: Dec 09 2019 17:58:19 +0000 Subject: Merge #1008 `alt.fp.o - fixes, updates, cleanups` --- diff --git a/alt.fedoraproject.org/data/content/alt/index.html b/alt.fedoraproject.org/data/content/alt/index.html index 792dd28..8f8d238 100644 --- a/alt.fedoraproject.org/data/content/alt/index.html +++ b/alt.fedoraproject.org/data/content/alt/index.html @@ -437,7 +437,7 @@

${Markup(_('%sGB dvd iso')) % global_variables.iso_size['ppc64le_Server_DVD']}

-

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

+

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

@@ -451,7 +451,7 @@

${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['ppc64le_Server_net']}

-

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

+

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

@@ -465,22 +465,7 @@

${Markup(_('%sMB dvd iso')) % global_variables.iso_size['ppc64le_ev']}

-

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

-
- - @@ -539,77 +523,6 @@

${_('Power Architecture')}

-
-
-

${_('PPC64 images are for installation on IBM Power systems or OpenPOWER systems.')}

-
-
-
-
-
- -
-
-

${_('Fedora Server')}

-

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

-
-
-
-
- -
-
-

${_('Fedora Server')}

-

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

-
-
-
-
- -
-
-

${_('Everything')}

-

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

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-

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

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-

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

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-

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

-
-
- -

${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}

@@ -622,7 +535,7 @@

${_('Fedora Server')}

-

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

+

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

@@ -631,7 +544,7 @@

${_('Fedora Server')}

-

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

+

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

@@ -640,16 +553,7 @@

${_('Everything')}

-

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

-
- -
-
- -
-
-

${_('Fedora Cloud')}

-

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

+

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

@@ -658,7 +562,7 @@

${_('Fedora Cloud')}

-

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

+

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

@@ -667,7 +571,7 @@

${_('Fedora Cloud')}

-

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

+

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

@@ -676,7 +580,7 @@

${_('Fedora Container')}

-

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

+

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

@@ -691,91 +595,6 @@

${_('Power Architecture')}

-
-
-

${_('These images are for installation on IBM Power systems or OpenPOWER systems.')}

-
-
-
-
-
- -
-
-

${_('Fedora Server')}

-
-
-

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

-
-
-
-
- -
-
-

${_('Fedora Server')}

-
-
-

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

-
-
-
-
- -
-
-

${_('Everything')}

-
-
-

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

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-
-
-

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

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-
-
-

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

-
-
-
-
- -
-
-

${_('Fedora Cloud')}

-
-
-

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

-
-
- -

${_('PPC64LE images are for installation on IBM Power systems or OpenPOWER systems.')}

@@ -790,7 +609,7 @@

${_('Fedora Server')}

-

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

+

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

@@ -801,7 +620,7 @@

${_('Fedora Server')}

-

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

+

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

@@ -812,18 +631,7 @@

${_('Everything')}

-

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

-
- -
-
- -
-
-

${_('Fedora Cloud')}

-
-
-

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

+

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

@@ -834,7 +642,7 @@

${_('Fedora Cloud')}

-

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

+

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

@@ -845,7 +653,7 @@

${_('Fedora Cloud')}

-

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

+

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

@@ -856,7 +664,7 @@

${_('Fedora Container')}

-

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

+

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

@@ -926,6 +734,20 @@
+ +
+
+

${_('Fedora Server')}

+
+
+

${Markup(_('%sMB netinstall iso')) % global_variables.iso_size['s390x_Server_net']}

+
+
+

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

+
+
+
+
@@ -938,6 +760,48 @@

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

+
+
+ +
+
+

${_('Fedora Cloud')}

+
+
+

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

+
+
+

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

+
+
+
+
+ +
+
+

${_('Fedora Cloud')}

+
+
+

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

+
+
+

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

+
+
+
+
+ +
+
+

${_('Fedora Container')}

+
+
+

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

+
+
+

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

+
+
@@ -968,6 +832,15 @@
+ +
+
+

${_('Fedora Server')}

+

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

+
+
+
+
@@ -975,6 +848,33 @@

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

+
+
+ +
+
+

${_('Fedora Cloud')}

+

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

+
+
+
+
+ +
+
+

${_('Fedora Cloud')}

+

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

+
+
+
+
+ +
+
+

${_('Fedora Container')}

+

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

+
+
@@ -1006,6 +906,17 @@
+ +
+
+

${_('Fedora Server')}

+
+
+

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

+
+
+
+
@@ -1015,6 +926,39 @@

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

+
+
+ +
+
+

${_('Fedora Cloud')}

+
+
+

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

+
+
+
+
+ +
+
+

${_('Fedora Cloud')}

+
+
+

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

+
+
+
+
+ +
+
+

${_('Fedora Container')}

+
+
+

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

+
+
diff --git a/alt.fedoraproject.org/data/content/verify.html b/alt.fedoraproject.org/data/content/verify.html index fff2bf6..1ef3085 100644 --- a/alt.fedoraproject.org/data/content/verify.html +++ b/alt.fedoraproject.org/data/content/verify.html @@ -70,13 +70,12 @@
${_('For aarch64 images')}
- + ${_('For s390x images')} +
${_('For Cloud Base images')}
@@ -89,11 +88,12 @@
${_('For aarch64')}
- diff --git a/build.d/globalvar.py b/build.d/globalvar.py index dae327b..184b3f5 100644 --- a/build.d/globalvar.py +++ b/build.d/globalvar.py @@ -59,6 +59,7 @@ release={ 'RC_build': '1.9', # sometimes releng use the RC build 'RC_gold_aarch64': '1.9', # RC Gold for aarch64 'RC_gold_ppc64': '1.9', # RC Gold for ppc64 + 'RC_gold_ppc64le': '1.9', # RC Gold for ppc64le 'RC_gold_s390x': '1.9', # RC Gold for s390x 'RC_pre_gold': '1.1', # insert the number of the prerelease RC version declared GOLD 'RC_pre_build': '2', # sometimes releng use the RC build @@ -133,13 +134,17 @@ iso_size={ 'ppc64_qcow2': '282', # In MB 'ppc64_raw': '158', # In MB 'ppc64_Container': '43', # In MB - 'ppc64le_Server_DVD': '2.8', # In GB - 'ppc64le_Server_net': '578', # In MB + 'ppc64le_Server_DVD': '1.9', # In GB + 'ppc64le_Server_net': '619', # In MB 'ppc64le_Cloud_net': '488', # In MB - 'ppc64le_qcow2': '273', # In MB - 'ppc64le_raw': '159', # In MB - 'ppc64le_Container': '43', # In MB - 's390x_Server_DVD': '2.7', # In GB + 'ppc64le_qcow2': '366', # In MB + 'ppc64le_raw': '232', # In MB + 'ppc64le_Container': '42', # In MB + 's390x_Server_DVD': '1.7', # In GB + 's390x_Server_net': '484', # In MB + 's390x_qcow2': '360', # In MB + 's390x_raw': '222', # In MB + 's390x_Container': '37', # In MB 'i686_sda.qcow2': '212', # In MB 'x86_64_sda.qcow2': '207', # In MB 'i686_raw': '122', # In MB