davidlt/fedora-comps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Arch cleanup: drop all armhfp and ppc64, update check-missing

Browse Source 
We don't build or ship armhfp or ppc64 any more, so drop all
references to those arches from comps-f38 and update the
`check-missing` script.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-08-29 16:09:00 -07:00
parent b3b714ae1d
commit 5d608cba7b
2 changed files with 12 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
check-missing
View File

@ -5,7 +5,7 @@
# packages that do not currently exist in Rawhide. It is arch-aware. It # packages that do not currently exist in Rawhide. It is arch-aware. It
# expects to be run on a Fedora system with network access, as it will # expects to be run on a Fedora system with network access, as it will
# try to query the 'rawhide' dnf repo to get lists of currently-existing # try to query the 'rawhide' dnf repo to get lists of currently-existing
# packages. # packages. You will need fedora-repos-rawhide and python3-lxml.
import glob import glob
import argparse import argparse
@ -13,7 +13,7 @@ import subprocess
import lxml.etree as ET import lxml.etree as ET
from collections import defaultdict from collections import defaultdict
ARCHES = ('aarch64', 'armv7hl', 'ppc64le', 's390x', 'x86_64') ARCHES = ('aarch64', 'ppc64le', 's390x', 'x86_64')
parser = argparse.ArgumentParser(description='Check the comps file for missing packages and packages missing on architectures') parser = argparse.ArgumentParser(description='Check the comps file for missing packages and packages missing on architectures')
parser.add_argument('--update', dest='update', action='store_true', default=False, parser.add_argument('--update', dest='update', action='store_true', default=False,
@ -45,7 +45,7 @@ for pkgreq in pkgreqs:
present = [] present = []
# arches the package is listed for (if no 'arch' key, it's listed for all) # arches the package is listed for (if no 'arch' key, it's listed for all)
reqarches = pkgreq.get('arch', '').replace('armhfp', 'armv7hl').replace('ppc64,','') reqarches = pkgreq.get('arch', '')
if reqarches: if reqarches:
reqarches = reqarches.split(',') reqarches = reqarches.split(',')
else: else:

28
comps-f38.xml.in
View File

@ -61,7 +61,7 @@
<packagereq type="mandatory">dosfstools</packagereq> <packagereq type="mandatory">dosfstools</packagereq>
<packagereq type="mandatory">dracut-network</packagereq> <packagereq type="mandatory">dracut-network</packagereq>
<packagereq type="mandatory">e2fsprogs</packagereq> <packagereq type="mandatory">e2fsprogs</packagereq>
<packagereq arch="aarch64,armhfp,x86_64" type="mandatory">efibootmgr</packagereq> <packagereq arch="aarch64,x86_64" type="mandatory">efibootmgr</packagereq>
<packagereq type="mandatory">exfatprogs</packagereq> <packagereq type="mandatory">exfatprogs</packagereq>
<packagereq type="mandatory">fcoe-utils</packagereq> <packagereq type="mandatory">fcoe-utils</packagereq>
<packagereq type="mandatory">firewalld</packagereq> <packagereq type="mandatory">firewalld</packagereq>
@ -69,18 +69,15 @@
<packagereq type="mandatory">glibc-all-langpacks</packagereq> <packagereq type="mandatory">glibc-all-langpacks</packagereq>
<packagereq arch="aarch64" type="mandatory">grub2-efi-aa64</packagereq> <packagereq arch="aarch64" type="mandatory">grub2-efi-aa64</packagereq>
<packagereq arch="aarch64" type="mandatory">grub2-efi-aa64-cdboot</packagereq> <packagereq arch="aarch64" type="mandatory">grub2-efi-aa64-cdboot</packagereq>
<packagereq arch="armhfp" type="mandatory">grub2-efi-arm</packagereq>
<packagereq arch="armhfp" type="mandatory">grub2-efi-arm-cdboot</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-efi-ia32</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-efi-ia32</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-efi-ia32-cdboot</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-efi-ia32-cdboot</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-efi-x64</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-efi-x64</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-efi-x64-cdboot</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-efi-x64-cdboot</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-pc</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-pc</packagereq>
<packagereq arch="ppc64" type="mandatory">grub2-ppc64</packagereq>
<packagereq arch="ppc64le" type="mandatory">grub2-ppc64le</packagereq> <packagereq arch="ppc64le" type="mandatory">grub2-ppc64le</packagereq>
<packagereq arch="aarch64,armhfp,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools</packagereq> <packagereq arch="aarch64,ppc64le,x86_64" type="mandatory">grub2-tools</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-tools-efi</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-tools-efi</packagereq>
<packagereq arch="aarch64,armhfp,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools-extra</packagereq> <packagereq arch="aarch64,ppc64le,x86_64" type="mandatory">grub2-tools-extra</packagereq>
<packagereq type="mandatory">hfsplus-tools</packagereq> <packagereq type="mandatory">hfsplus-tools</packagereq>
<packagereq type="mandatory">iscsi-initiator-utils</packagereq> <packagereq type="mandatory">iscsi-initiator-utils</packagereq>
<packagereq type="mandatory">kbd-legacy</packagereq> <packagereq type="mandatory">kbd-legacy</packagereq>
@ -107,9 +104,8 @@
<default>false</default> <default>false</default>
<uservisible>false</uservisible> <uservisible>false</uservisible>
<packagelist> <packagelist>
<packagereq arch="armhfp,aarch64">arm-image-installer</packagereq> <packagereq arch="aarch64">arm-image-installer</packagereq>
<packagereq arch="armhfp,aarch64">cloud-utils-growpart</packagereq> <packagereq arch="aarch64">cloud-utils-growpart</packagereq>
<packagereq arch="armhfp">uboot-images-armv7</packagereq>
<packagereq arch="aarch64">uboot-images-armv8</packagereq> <packagereq arch="aarch64">uboot-images-armv8</packagereq>
</packagelist> </packagelist>
</group> </group>
@ -280,7 +276,6 @@
<packagereq>mesa-vulkan-drivers</packagereq> <packagereq>mesa-vulkan-drivers</packagereq>
<packagereq>plymouth-system-theme</packagereq> <packagereq>plymouth-system-theme</packagereq>
<packagereq>xorg-x11-drv-amdgpu</packagereq> <packagereq>xorg-x11-drv-amdgpu</packagereq>
<packagereq arch="armhfp">xorg-x11-drv-armada</packagereq>
<packagereq arch="aarch64">xorg-x11-drv-armsoc</packagereq> <packagereq arch="aarch64">xorg-x11-drv-armsoc</packagereq>
<packagereq>xorg-x11-drv-ati</packagereq> <packagereq>xorg-x11-drv-ati</packagereq>
<packagereq>xorg-x11-drv-evdev</packagereq> <packagereq>xorg-x11-drv-evdev</packagereq>
@ -477,17 +472,15 @@
<default>false</default> <default>false</default>
<uservisible>false</uservisible> <uservisible>false</uservisible>
<packagelist> <packagelist>
<packagereq arch="aarch64,armhfp,x86_64" type="mandatory">efibootmgr</packagereq> <packagereq arch="aarch64,x86_64" type="mandatory">efibootmgr</packagereq>
<packagereq arch="aarch64" type="mandatory">grub2-efi-aa64</packagereq> <packagereq arch="aarch64" type="mandatory">grub2-efi-aa64</packagereq>
<packagereq arch="armhfp" type="mandatory">grub2-efi-arm</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-efi-ia32</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-efi-ia32</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-efi-x64</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-efi-x64</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-pc</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-pc</packagereq>
<packagereq arch="ppc64" type="mandatory">grub2-ppc64</packagereq>
<packagereq arch="ppc64le" type="mandatory">grub2-ppc64le</packagereq> <packagereq arch="ppc64le" type="mandatory">grub2-ppc64le</packagereq>
<packagereq arch="aarch64,armhfp,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools</packagereq> <packagereq arch="aarch64,ppc64le,x86_64" type="mandatory">grub2-tools</packagereq>
<packagereq arch="x86_64" type="mandatory">grub2-tools-efi</packagereq> <packagereq arch="x86_64" type="mandatory">grub2-tools-efi</packagereq>
<packagereq arch="aarch64,armhfp,ppc64,ppc64le,x86_64" type="mandatory">grub2-tools-extra</packagereq> <packagereq arch="aarch64,ppc64le,x86_64" type="mandatory">grub2-tools-extra</packagereq>
<packagereq arch="s390x" type="mandatory">s390utils</packagereq> <packagereq arch="s390x" type="mandatory">s390utils</packagereq>
<packagereq arch="s390x" type="mandatory">s390utils-base</packagereq> <packagereq arch="s390x" type="mandatory">s390utils-base</packagereq>
<packagereq arch="aarch64" type="mandatory">shim-aa64</packagereq> <packagereq arch="aarch64" type="mandatory">shim-aa64</packagereq>
@ -638,9 +631,8 @@
<packagereq type="optional">dracut-config-generic</packagereq> <packagereq type="optional">dracut-config-generic</packagereq>
<packagereq type="optional">initial-setup</packagereq> <packagereq type="optional">initial-setup</packagereq>
<packagereq type="optional">initscripts</packagereq> <packagereq type="optional">initscripts</packagereq>
<packagereq arch="armhfp" type="optional">uboot-images-armv7</packagereq>
<packagereq arch="aarch64" type="optional">uboot-images-armv8</packagereq> <packagereq arch="aarch64" type="optional">uboot-images-armv8</packagereq>
<packagereq arch="armhfp,aarch64" type="optional">uboot-tools</packagereq> <packagereq arch="aarch64" type="optional">uboot-tools</packagereq>
</packagelist> </packagelist>
</group> </group>
<!-- <!--
@ -2920,8 +2912,6 @@
<packagereq type="default">iwl6050-firmware</packagereq> <packagereq type="default">iwl6050-firmware</packagereq>
<packagereq type="default">iwl7260-firmware</packagereq> <packagereq type="default">iwl7260-firmware</packagereq>
<packagereq type="default">iwlax2xx-firmware</packagereq> <packagereq type="default">iwlax2xx-firmware</packagereq>
<packagereq arch="armhfp" type="default">libertas-sd8686-firmware</packagereq>
<packagereq arch="armhfp" type="default">libertas-sd8787-firmware</packagereq>
<packagereq type="default">libertas-usb8388-firmware</packagereq> <packagereq type="default">libertas-usb8388-firmware</packagereq>
<packagereq type="default">usb_modeswitch</packagereq> <packagereq type="default">usb_modeswitch</packagereq>
<packagereq type="default">zd1211-firmware</packagereq> <packagereq type="default">zd1211-firmware</packagereq>