runtime-cleanup: fix warnings from old or changed packages

This addresses most "no files matched!" and "no files to remove!"
errors in current F36/Rawhide. They mostly relate to packages
that are no longer pulled in at all, or whose layout has changed.
The entries for audit haven't been fixed for the /usr merge years
ago. In linux-firmware, all files have been xz-compressed at some
point, so the entries were not matching any more. The usbdux/
subdir contains only sources for the actual firmwares that are a
level above, and we don't include those in the package any more;
the actual firmwares are useless in the installer env, so this
removes them. util-linux was split into util-linux and
util-linux-core, so we have to add an entry for util-linux-core
and move the relevant excludes to that entry.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-02-08 15:49:54 -08:00 committed by Brian C. Lane
parent d39a5f625e
commit 94ef6ed036

View File

@ -11,8 +11,6 @@ remove usr/share/i18n
## no sound support, thanks ## no sound support, thanks
removepkg flac-libs libsndfile pipewire pulseaudio* rtkit sound-theme-freedesktop wireplumber* removepkg flac-libs libsndfile pipewire pulseaudio* rtkit sound-theme-freedesktop wireplumber*
## lv2appy requires removed libsndfile, we don't need the rest either
removefrom lilv /usr/bin/*
## we don't create new initramfs/bootloader conf inside anaconda ## we don't create new initramfs/bootloader conf inside anaconda
## (that happens inside the target system after we install dracut/grubby) ## (that happens inside the target system after we install dracut/grubby)
removepkg dracut-network grubby anaconda-dracut removepkg dracut-network grubby anaconda-dracut
@ -29,8 +27,6 @@ removepkg selinux-policy libselinux-utils
## The removepkg above removes it, create an empty one. See rhbz#1243168 ## The removepkg above removes it, create an empty one. See rhbz#1243168
append etc/selinux/config "" append etc/selinux/config ""
removepkg fedora-release-rawhide
## keep enough of shadow-utils to create accounts ## keep enough of shadow-utils to create accounts
removefrom shadow-utils --allbut /usr/bin/chage /usr/sbin/chpasswd \ removefrom shadow-utils --allbut /usr/bin/chage /usr/sbin/chpasswd \
/usr/sbin/groupadd /usr/sbin/useradd /usr/sbin/groupadd /usr/sbin/useradd
@ -39,9 +35,8 @@ removefrom shadow-utils --allbut /usr/bin/chage /usr/sbin/chpasswd \
removefrom initscripts /usr/sbin/* /usr/share/locale/* /usr/share/doc/* /usr/share/man/* removefrom initscripts /usr/sbin/* /usr/share/locale/* /usr/share/doc/* /usr/share/man/*
## no storage device monitoring ## no storage device monitoring
removepkg device-mapper-event dmraid-events sgpio removepkg device-mapper-event
## logrotate isn't useful in anaconda ## logrotate isn't useful in anaconda
removepkg logrotate
remove /etc/logrotate.d remove /etc/logrotate.d
## anaconda needs this to do media check ## anaconda needs this to do media check
removefrom isomd5sum --allbut /usr/bin/checkisomd5 removefrom isomd5sum --allbut /usr/bin/checkisomd5
@ -52,17 +47,14 @@ removefrom systemd /usr/share/zsh/site-functions/*
## various other things we remove to save space ## various other things we remove to save space
removepkg diffutils file removepkg diffutils file
removepkg jasper-libs
removepkg libasyncns removepkg libasyncns
removepkg libmcpp libtiff removepkg libtiff
removepkg lvm2-libs mcpp removepkg lvm2-libs
removepkg mobile-broadband-provider-info removepkg mobile-broadband-provider-info
removepkg pkgconf pkgconf-m4 pkgconf-pkg-config ppp pth removepkg rmt rpcbind squashfs-tools
removepkg rmt rpcbind squashfs-tools system-config-firewall-base
removepkg tigervnc-license xml-common removepkg tigervnc-license xml-common
removepkg xorg-x11-font-utils bdftopcf mkfontscale fonttosfnt removepkg mkfontscale fonttosfnt
removepkg xorg-x11-server-common removepkg xorg-x11-server-common
removepkg ncurses
## other removals ## other removals
remove /home /media /opt /srv /tmp/* remove /home /media /opt /srv /tmp/*
@ -104,11 +96,8 @@ remove lib/modules/*/{build,source,*.map}
## NOTE: depmod gets re-run after cleanup finishes ## NOTE: depmod gets re-run after cleanup finishes
## remove unused themes, theme engines, icons, etc. ## remove unused themes, theme engines, icons, etc.
removefrom gtk2 /usr/${libdir}/gtk-2.0/*/{engines,printbackends}/*
removefrom gtk2 /usr/share/themes/*
removefrom gtk3 /usr/${libdir}/gtk-3.0/*/printbackends/* removefrom gtk3 /usr/${libdir}/gtk-3.0/*/printbackends/*
removefrom gtk3 /usr/share/themes/* removefrom gtk3 /usr/share/themes/*
removefrom metacity --allbut /usr/bin/* /usr/${libdir}/*
## filesystem tools ## filesystem tools
removefrom e2fsprogs /usr/share/locale/* removefrom e2fsprogs /usr/share/locale/*
@ -120,15 +109,14 @@ removefrom gsettings-desktop-schemas /usr/share/locale/*
removefrom NetworkManager-libnm /usr/share/locale/*/NetworkManager.mo removefrom NetworkManager-libnm /usr/share/locale/*/NetworkManager.mo
removefrom nm-connection-editor /usr/share/applications/* removefrom nm-connection-editor /usr/share/applications/*
removefrom atk /usr/share/locale/* removefrom atk /usr/share/locale/*
removefrom audit /etc/* /sbin/auditctl /sbin/aureport removefrom audit /etc/* /usr/sbin/auditctl /usr/sbin/aureport
removefrom audit /sbin/ausearch /sbin/autrace /usr/bin/* removefrom audit /usr/sbin/ausearch /usr/sbin/autrace /usr/bin/*
removefrom audit-libs /etc/* /${libdir}/libauparse* removefrom audit-libs /etc/* /usr/${libdir}/libauparse*
removefrom bash /etc/* /usr/bin/bashbug* /usr/share/* removefrom bash /etc/* /usr/bin/bashbug* /usr/share/*
removefrom bind-utils /usr/bin/host /usr/bin/nsupdate removefrom bind-utils /usr/bin/host /usr/bin/nsupdate
removefrom bitmap-fangsongti-fonts /usr/share/fonts/* removefrom bitmap-fangsongti-fonts /usr/share/fonts/*
removefrom ca-certificates /etc/pki/java/* removefrom ca-certificates /etc/pki/java/*
removefrom ca-certificates /etc/pki/tls/certs/ca-bundle.trust.crt removefrom ca-certificates /etc/pki/tls/certs/ca-bundle.trust.crt
removefrom cairo /usr/${libdir}/libcairo-script* /usr/bin/cairo-sphinx
removefrom coreutils /usr/bin/link /usr/bin/nice /usr/bin/stty /usr/bin/unlink removefrom coreutils /usr/bin/link /usr/bin/nice /usr/bin/stty /usr/bin/unlink
removefrom coreutils /usr/bin/[ /usr/bin/base64 /usr/bin/chcon removefrom coreutils /usr/bin/[ /usr/bin/base64 /usr/bin/chcon
removefrom coreutils /usr/bin/cksum /usr/bin/csplit removefrom coreutils /usr/bin/cksum /usr/bin/csplit
@ -173,11 +161,11 @@ removefrom gdk-pixbuf2 /usr/share/locale*
removefrom glib2 /usr/bin/* /usr/share/locale/* removefrom glib2 /usr/bin/* /usr/share/locale/*
removefrom glibc /etc/gai.conf /etc/rpc removefrom glibc /etc/gai.conf /etc/rpc
removefrom glibc /${libdir}/libBrokenLocale* removefrom glibc /${libdir}/libBrokenLocale*
removefrom glibc /${libdir}/libSegFault* /${libdir}/libanl* removefrom glibc /${libdir}/libanl*
removefrom glibc /${libdir}/libnss_compat* removefrom glibc /${libdir}/libnss_compat*
# python-pyudev uses ctypes.util.find_library, which uses /sbin/ldconfig # python-pyudev uses ctypes.util.find_library, which uses /sbin/ldconfig
removefrom glibc /usr/libexec/* /usr/sbin/* removefrom glibc /usr/libexec/* /usr/sbin/*
removefrom glibc-common /usr/bin/catchsegv /usr/bin/gencat removefrom glibc-common /usr/bin/gencat
removefrom glibc-common /usr/bin/getent removefrom glibc-common /usr/bin/getent
removefrom glibc-common /usr/bin/locale /usr/bin/sprof removefrom glibc-common /usr/bin/locale /usr/bin/sprof
# NB: we keep /usr/bin/localedef so anaconda can inspect payload locale info # NB: we keep /usr/bin/localedef so anaconda can inspect payload locale info
@ -187,13 +175,11 @@ removefrom gnutls /usr/share/locale/*
removefrom google-noto-sans-cjk-ttc-fonts /usr/share/fonts/google-noto-cjk/NotoSansCJK-{Black,Bold,*Light,Medium,Thin}.ttc removefrom google-noto-sans-cjk-ttc-fonts /usr/share/fonts/google-noto-cjk/NotoSansCJK-{Black,Bold,*Light,Medium,Thin}.ttc
removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-Italic-VF.ttf removefrom google-noto-sans-vf-fonts /usr/share/fonts/google-noto-vf/NotoSans-Italic-VF.ttf
removefrom grep /etc/* /usr/share/locale/* removefrom grep /etc/* /usr/share/locale/*
removefrom gtk2 /usr/bin/update-gtk-immodules
removefrom gtk3 /usr/${libdir}/gtk-3.0/* removefrom gtk3 /usr/${libdir}/gtk-3.0/*
removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew} removefrom gzip /usr/bin/{gzexe,zcmp,zdiff,zegrep,zfgrep,zforce,zgrep,zless,zmore,znew}
removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids removefrom hwdata /usr/share/hwdata/oui.txt /usr/share/hwdata/pnp.ids
removefrom iproute --allbut /usr/sbin/{ip,routef,routel,rtpr} removefrom iproute --allbut /usr/sbin/{ip,routef,routel,rtpr}
removefrom kbd --allbut */bin/{dumpkeys,kbd_mode,loadkeys,setfont,unicode_*,chvt} removefrom kbd --allbut */bin/{dumpkeys,kbd_mode,loadkeys,setfont,unicode_*,chvt}
removefrom kmod /usr/sbin/weak-modules
removefrom less /etc/* removefrom less /etc/*
removefrom libX11-common /usr/share/X11/XErrorDB removefrom libX11-common /usr/share/X11/XErrorDB
removefrom libcanberra /usr/${libdir}/libcanberra-* removefrom libcanberra /usr/${libdir}/libcanberra-*
@ -212,7 +198,7 @@ removefrom linux-firmware /usr/lib/firmware/dvb*
removefrom linux-firmware /usr/lib/firmware/*_12mhz* removefrom linux-firmware /usr/lib/firmware/*_12mhz*
removefrom linux-firmware /usr/lib/firmware/v4l* removefrom linux-firmware /usr/lib/firmware/v4l*
removefrom linux-firmware /usr/lib/firmware/brcm/BCM-* removefrom linux-firmware /usr/lib/firmware/brcm/BCM-*
removefrom linux-firmware /usr/lib/firmware/ttusb-budget/dspbootcode.bin removefrom linux-firmware /usr/lib/firmware/ttusb-budget/dspbootcode.bin*
removefrom linux-firmware /usr/lib/firmware/emi26/* removefrom linux-firmware /usr/lib/firmware/emi26/*
removefrom linux-firmware /usr/lib/firmware/emi62/* removefrom linux-firmware /usr/lib/firmware/emi62/*
removefrom linux-firmware /usr/lib/firmware/cpia2/* removefrom linux-firmware /usr/lib/firmware/cpia2/*
@ -221,14 +207,14 @@ removefrom linux-firmware /usr/lib/firmware/vicam/*
removefrom linux-firmware /usr/lib/firmware/dsp56k/* removefrom linux-firmware /usr/lib/firmware/dsp56k/*
removefrom linux-firmware /usr/lib/firmware/sun/* removefrom linux-firmware /usr/lib/firmware/sun/*
removefrom linux-firmware /usr/lib/firmware/av7110/* removefrom linux-firmware /usr/lib/firmware/av7110/*
removefrom linux-firmware /usr/lib/firmware/usbdux/* removefrom linux-firmware /usr/lib/firmware/usbdux*
removefrom linux-firmware /usr/lib/firmware/f2255usb.bin removefrom linux-firmware /usr/lib/firmware/f2255usb.bin*
removefrom linux-firmware /usr/lib/firmware/lgs8g75.fw removefrom linux-firmware /usr/lib/firmware/lgs8g75.fw*
removefrom linux-firmware /usr/lib/firmware/TDA7706* removefrom linux-firmware /usr/lib/firmware/TDA7706*
removefrom linux-firmware /usr/lib/firmware/tlg2300_firmware.bin removefrom linux-firmware /usr/lib/firmware/tlg2300_firmware.bin*
removefrom linux-firmware /usr/lib/firmware/s5p-mfc* removefrom linux-firmware /usr/lib/firmware/s5p-mfc*
removefrom linux-firmware /usr/lib/firmware/go7007/* removefrom linux-firmware /usr/lib/firmware/go7007/*
removefrom linux-firmware /usr/lib/firmware/intel/IntcSST2.bin removefrom linux-firmware /usr/lib/firmware/intel/IntcSST2.bin*
removefrom linux-firmware /usr/lib/firmware/intel/fw_sst* removefrom linux-firmware /usr/lib/firmware/intel/fw_sst*
removefrom linux-firmware /usr/lib/firmware/intel/dsp* removefrom linux-firmware /usr/lib/firmware/intel/dsp*
removefrom linux-firmware /usr/lib/firmware/as102* removefrom linux-firmware /usr/lib/firmware/as102*
@ -271,7 +257,6 @@ removefrom openssh /usr/libexec/*
removefrom openssh-clients /etc/ssh/* /usr/bin/ssh-* removefrom openssh-clients /etc/ssh/* /usr/bin/ssh-*
removefrom openssh-clients /usr/libexec/* removefrom openssh-clients /usr/libexec/*
removefrom openssh-server /etc/ssh/* /usr/libexec/openssh/sftp-server removefrom openssh-server /etc/ssh/* /usr/libexec/openssh/sftp-server
removefrom openssl /usr/bin/*
removefrom pam /usr/sbin/* /usr/share/locale/* removefrom pam /usr/sbin/* /usr/share/locale/*
removefrom policycoreutils /etc/* /usr/bin/* /usr/share/locale/* removefrom policycoreutils /etc/* /usr/bin/* /usr/share/locale/*
removefrom polkit /usr/bin/* removefrom polkit /usr/bin/*
@ -294,22 +279,23 @@ removefrom smartmontools /usr/share/smartmontools/*
removefrom tar /usr/share/locale/* removefrom tar /usr/share/locale/*
removefrom usbutils /usr/bin/* removefrom usbutils /usr/bin/*
removefrom util-linux --allbut \ removefrom util-linux --allbut \
/usr/bin/{dmesg,eject,getopt,kill,login,lsblk,more,mount,umount,mountpoint,findmnt} \ /usr/bin/{chmem,eject,getopt,hexdump,login,lscpu,lsmem,lsblk} \
/etc/mtab /etc/pam.d/login /etc/pam.d/remote \ /etc/pam.d/login /etc/pam.d/remote \
/usr/sbin/{agetty,blkid,blockdev,clock,fdisk,fsck,fstrim,hwclock,losetup,zramctl} \ /usr/sbin/{clock,fdisk,fsfreeze,fstrim,hwclock,nologin,sfdisk,swaplabel,wipefs,zramctl}
/usr/sbin/{mkswap,swaplabel,nologin,sfdisk,swapoff,swapon,wipefs,partx,fsfreeze} \ removefrom util-linux-core --allbut \
/usr/bin/{logger,hexdump,flock,chmem,lsmem,lscpu} /usr/bin/{dmesg,findmnt,flock,kill,logger,more,mount,mountpoint,umount} \
/etc/mtab \
/usr/sbin/{agetty,blkid,blockdev,fsck,losetup,mkswap,partx,swapoff,swapon}
removefrom volume_key-libs /usr/share/locale/* removefrom volume_key-libs /usr/share/locale/*
removefrom wget /etc/* /usr/share/locale/* removefrom wget /etc/* /usr/share/locale/*
removefrom xorg-x11-drv-intel /usr/${libdir}/libI* removefrom xorg-x11-drv-intel /usr/${libdir}/libI*
removefrom xorg-x11-drv-openchrome /usr/${libdir}/libchrome*
removefrom xorg-x11-drv-wacom /usr/bin/* removefrom xorg-x11-drv-wacom /usr/bin/*
%if branding.release: %if branding.release:
removefrom ${branding.logos} /usr/share/plymouth/* removefrom ${branding.logos} /usr/share/plymouth/*
removefrom ${branding.logos} /etc/* removefrom ${branding.logos} /etc/*
removefrom ${branding.logos} /usr/share/icons/{Bluecurve,oxygen}/* removefrom ${branding.logos} /usr/share/icons/{Bluecurve,oxygen}/*
removefrom ${branding.logos} /usr/share/{firstboot,kde4,pixmaps}/* removefrom ${branding.logos} /usr/share/{kde4,pixmaps}/*
%endif %endif
## cleanup /boot/ leaving vmlinuz, and .*hmac files ## cleanup /boot/ leaving vmlinuz, and .*hmac files