From 6c2cc50051831fa502a8b082a312ca90e7039f3f Mon Sep 17 00:00:00 2001 From: "Justin M. Forbes" Date: Sun, 26 Apr 2020 21:15:20 -0500 Subject: kernel-5.7.0-0.rc3.1 * Sun Apr 26 2020 CKI@GitLab [5.7.0-0.rc3.1] - v5.7-rc3 rebase - Add cec to the filter overrides ("Justin M. Forbes") - Add overrides to filter-modules.sh ("Justin M. Forbes") - Adjust the changelog update script to not push anything (Jeremy Cline) - Drop --target noarch from the rh-rpms make target (Jeremy Cline) Resolves: rhbz# Signed-off-by: Justin M. Forbes --- filter-modules.sh.rhel | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) (limited to 'filter-modules.sh.rhel') diff --git a/filter-modules.sh.rhel b/filter-modules.sh.rhel index 55c7109e7..726a6d92c 100755 --- a/filter-modules.sh.rhel +++ b/filter-modules.sh.rhel @@ -13,8 +13,11 @@ # subsys should be in kernel-modules on all arches, please change the defaults # listed here. +# Overrides is individual modules which need to remain in kernel-core due to deps. +overrides="cec" + # Set the default dirs/modules to filter out -driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media/common media/dvb-core media/dvb-frontends media/firewire media/i2c media/mc media/mmc media/pci media/platform media/radio media/rc media/spi media/tuners media/usb media/v4l2-core memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1" +driverdirs="atm auxdisplay bcma bluetooth firewire fmc iio infiniband isdn leds media memstick mfd mmc mtd nfc ntb pcmcia platform power ssb staging tty uio uwb w1" chardrvs="mwave pcmcia" @@ -143,6 +146,20 @@ do filter_ko $1 ${mod} done +# Now process the override list to bring those modules back into core +for mod in ${overrides} +do + grep -v -e "/${mod}.ko" k-d.list > k-d.list.tmp + if [ $? -ne 0 ] + then + echo "Couldn't save ${mod}.ko Skipping." + else + grep -e "/${mod}.ko" k-d.list >> $filelist + mv k-d.list.tmp k-d.list + fi + +done + # Go through our generated drivers list and remove the .ko files. We'll # restore them later. for mod in `cat k-d.list` -- cgit