#1045 Removed armhfp image
Closed 2 years ago by pbrobinson. Opened 2 years ago by bcapper.
Unknown source f35  into  f35

file modified
+14 -14
@@ -23,7 +23,7 @@

  

  # limit tree architectures

  # if undefined, all architectures from variants.xml will be included

- tree_arches = ['aarch64', 'armhfp', 'ppc64le', 's390x', 'x86_64']

+ tree_arches = ['aarch64', 'ppc64le', 's390x', 'x86_64']

  

  # limit tree variants

  # if undefined, all variants from variants.xml will be included
@@ -63,7 +63,7 @@

  

  repoclosure_backend = 'dnf'

  

- # fomat: [(variant_uid_regex, {arch|*: [repos]})]

+ # format: [(variant_uid_regex, {arch|*: [repos]})]

  # gather_lookaside_repos = []

  

  # GATHER - JSON
@@ -121,7 +121,7 @@

  #]

  

  

- # fomat: [(variant_uid_regex, {arch|*: [packages]})]

+ # format: [(variant_uid_regex, {arch|*: [packages]})]

  additional_packages = [

      ('^(Server|Everything)$', {

          '*': [
@@ -237,7 +237,7 @@

  

      ]

  

- # fomat: [(variant_uid_regex, {arch|*: [scm_dicts]})]

+ # format: [(variant_uid_regex, {arch|*: [scm_dicts]})]

  #extra_files = [

  #    ('^(Server)$', {

  #        '*': [
@@ -321,7 +321,7 @@

                      'kickstart': 'fedora-container-base.ks',

                      'distro': 'Fedora-22',

                      'disk_size': 5,

-                     'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],

+                     'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',

                      'subvariant': 'Container_Base',
@@ -341,7 +341,7 @@

                      'kickstart': 'fedora-container-base-minimal.ks',

                      'distro': 'Fedora-22',

                      'disk_size': 5,

-                     'arches': ['armhfp', 'aarch64', 'ppc64le', 's390x', 'x86_64'],

+                     'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',

                      'subvariant': 'Container_Minimal_Base',
@@ -446,7 +446,7 @@

                      'kickstart': 'fedora-disk-python-classroom.ks',

                      'distro': 'Fedora-30',

                      'disk_size': 12,

-                     'arches': ['aarch64', 'armhfp'],

+                     'arches': ['aarch64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',

                      'subvariant': 'Python_Classroom',
@@ -462,7 +462,7 @@

                      'kickstart': 'fedora-disk-minimal.ks',

                      'distro': 'Fedora-30',

                      'disk_size': 6,

-                     'arches': ['aarch64', 'armhfp'],

+                     'arches': ['aarch64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',

                      'subvariant': 'Minimal',
@@ -476,7 +476,7 @@

                      'kickstart': 'fedora-disk-kde.ks',

                      'distro': 'Fedora-30',

                      'disk_size': 13,

-                     'arches': ['aarch64', 'armhfp'],

+                     'arches': ['aarch64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',

                      'subvariant': 'KDE',
@@ -490,7 +490,7 @@

                      'kickstart': 'fedora-disk-soas.ks',

                      'distro': 'Fedora-30',

                      'disk_size': 8,

-                     'arches': ['aarch64', 'armhfp'],

+                     'arches': ['aarch64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',

                      'subvariant': 'SoaS',
@@ -504,7 +504,7 @@

                      'kickstart': 'fedora-disk-xfce.ks',

                      'distro': 'Fedora-30',

                      'disk_size': 11,

-                     'arches': ['aarch64', 'armhfp'],

+                     'arches': ['aarch64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',

                      'subvariant': 'Xfce',
@@ -520,11 +520,11 @@

                      'kickstart': 'fedora-disk-workstation.ks',

                      'distro': 'Fedora-30',

                      'disk_size': 12,

-                     'arches': ['armhfp', 'aarch64'],

+                     'arches': ['aarch64'],

                      'repo': 'Everything',

                      'install_tree_from': 'Everything',

                      'subvariant': 'Workstation',

-                     'failable': ['armhfp'],

+                     'failable': ['*'],

                       }

          },

          ],
@@ -536,7 +536,7 @@

                      'kickstart': 'fedora-disk-server.ks',

                      'distro': 'Fedora-30',

                      'disk_size': 7,

-                     'arches': ['armhfp', 'aarch64'],

+                     'arches': ['aarch64'],

                      'repo': 'Server',

                      'install_tree_from': 'Server',

                      'subvariant': 'Server',

file modified
-7
@@ -12,7 +12,6 @@

      <variant id="Container" name="Container" type="variant" is_empty="true">

          <arches>

              <arch>aarch64</arch>

-             <arch>armhfp</arch>

              <arch>ppc64le</arch>

              <arch>s390x</arch>

              <arch>x86_64</arch>
@@ -21,7 +20,6 @@

      <variant id="Everything" name="Everything" type="variant">

          <arches>

              <arch>aarch64</arch>

-             <arch>armhfp</arch>

              <arch>ppc64le</arch>

              <arch>s390x</arch>

              <arch>x86_64</arch>
@@ -30,13 +28,11 @@

      <variant id="Labs" name="Labs" type="variant" is_empty="true">

          <arches>

              <arch>aarch64</arch>

-             <arch>armhfp</arch>

              <arch>x86_64</arch>

          </arches>

      </variant>

      <variant id="Server" name="Server" type="variant">

          <arches>

-             <arch>armhfp</arch>

              <arch>aarch64</arch>

              <arch>ppc64le</arch>

              <arch>s390x</arch>
@@ -67,14 +63,12 @@

      <variant id="Spins" name="Spins" type="variant" is_empty="true">

          <arches>

              <arch>aarch64</arch>

-             <arch>armhfp</arch>

              <arch>x86_64</arch>

          </arches>

      </variant>

      <variant id="Workstation" name="Workstation" type="variant" is_empty="true">

          <arches>

              <arch>aarch64</arch>

-             <arch>armhfp</arch>

              <arch>x86_64</arch>

              <arch>ppc64le</arch>

          </arches>
@@ -95,7 +89,6 @@

      </variant>

      <variant id="Modular" name="Modular" type="variant">

          <arches>

-             <arch>armhfp</arch>

              <arch>aarch64</arch>

              <arch>ppc64le</arch>

              <arch>s390x</arch>

As per the other PR this is wrong, and the commit mess is not good enough.

Pull-Request has been closed by pbrobinson

2 years ago
Metadata