#11486 critpath.py: drop armhfp and a related
Merged 2 years ago by pbrobinson. Opened 2 years ago by adamwill.

file modified
+1 -7
@@ -51,7 +51,7 @@ 

      "@critical-path-standard",

      "@critical-path-xfce",

  ]

- PRIMARY_ARCHES = ("armhfp", "aarch64", "x86_64")

+ PRIMARY_ARCHES = ("aarch64", "x86_64")

  ALTERNATE_ARCHES = ("ppc64le", "s390x")

  BODHI_RELEASEURL = "https://bodhi.fedoraproject.org/releases/?rows_per_page=500"

  FEDORA_BASEURL = "http://dl.fedoraproject.org/pub/fedora/linux/"
@@ -126,9 +126,6 @@ 

      # be marked incorrectly

      conf.persistdir = temp_cache_dir

      conf.installroot = temp_install_root

-     # dnf needs arches, not basearches to work

-     if arch == "armhfp":

-         conf.arch = "armv7hl"

      else:

          conf.arch = arch

      packages = dict()
@@ -269,9 +266,6 @@ 

  

  def generate_critpath(release, args, output, jsonout, forcebranched=False):

      check_arches = args.arches.split(",")

-     if not (release.isdigit() and int(release) < 37):

-         # armhfp is gone on F37+

-         check_arches.remove("armhfp")

      alternate_check_arches = args.altarches.split(",")

      package_count = 0

  

F36 is EOL now, we don't generate critpath for it any more, so
we don't need this. This also fixes a crash if you passed arches
on the cmdline.

Signed-off-by: Adam Williamson awilliam@redhat.com

rebased onto 703f561aa9b6d445ee46e0c29efa0712ad79bb78

2 years ago

rebased onto 43ffa88

2 years ago

The title is actually "critpath.py: drop armhfp and a related <F37 conditional", a bug in Pagure means it does not show right in the web UI - https://pagure.io/pagure/issue/5394 .

Pull-Request has been merged by pbrobinson

2 years ago
Metadata