[Debian-eeepc-commits] [SCM] A live-helper based Debian live & installer image for the Eee PC. branch, master, updated. 1.0b1-75-gc08b865

[Darren Salt]

The following commit has been merged in the master branch:
commit c08b8656bd6f75891c996a8b2db71b0b02678233
Author: Darren Salt <linux at youmustbejoking.demon.co.uk>
Date:   Sat Jan 2 16:06:15 2010 +0000

    Refactor module removal.

diff --git a/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh b/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh
index d70ec69..71546a2 100755
--- a/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh
+++ b/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh
@@ -1,81 +1,57 @@
 #!/bin/sh -e
+del_except ()
+{
+    DIR="$1"
+    EXCEPT="-not -name *usb*.ko"
+    shift
+    while [ $# != 0 ]; do
+	EXCEPT="$EXCEPT -not -name $1"
+	shift
+    done
+    find $DIR -type f $EXCEPT -delete
+}
+
 cd /lib/modules/*/kernel
-find \
-	arch/x86/kernel/cpu/cpufreq \
-	drivers/ata \
-	drivers/block/paride \
-	drivers/char/agp \
-	drivers/char/hw_random \
-	drivers/char/ipmi \
-	drivers/char/pcmcia \
-	drivers/char/tpm \
-	drivers/edac \
-	drivers/firewire \
-	drivers/gpu/drm \
-	drivers/hwmon \
-	drivers/i2c \
-	drivers/ide \
-	drivers/ieee802154 \
-	drivers/infiniband \
-	drivers/input/gameport \
-	drivers/isdn \
-	drivers/media/dvb/ttpci \
-	drivers/mfd \
-	drivers/mtd \
-	drivers/net/pcmcia \
-	drivers/net/tokenring \
-	drivers/parport \
-	drivers/pcmcia \
-	drivers/platform/x86 \
-	drivers/power \
-	drivers/regulator \
-	drivers/scsi/*/ \
-	drivers/staging/comedi \
-	drivers/telephony \
-	drivers/uio \
-	drivers/video \
-	drivers/w1 \
-	drivers/watchdog \
-	sound/i2c \
-	sound/isa \
-	sound/pci \
-	sound/pcmcia \
-	-type f \
-	-not -name acpi-cpufreq.ko \
-	-not -name wmi.ko \
-	-not -name intel-agp.ko \
-	-not -name agpgart.ko \
-	-not -name ide-core.ko \
-	-not -name ide-\*generic.ko \
-	-not -name ide-gd_mod.ko \
-	-not -name piix.ko \
-	-not -name ata_generic.ko \
-	-not -name libata.ko \
-	-not -name ata_piix.ko \
-	-not -name pata_sch.ko \
-	-not -name drm\* \
-	-not -name i915.ko \
-	-not -name i2c-core.ko \
-	-not -name i2c-algo-bit.ko \
-	-not -name i2c-i801.ko \
-	-not -name i2c-isch.ko \
-	-not -name coretemp.ko \
-	-not -name eeepc-laptop.ko \
-	-not -name fb\* \
-	-not -name uvesafb.ko \
-	-not -name output.ko \
-	-not -name sys\* \
-	-not -name iTCO_wdt.ko \
-	-not -name wdt*.ko \
-	-not -name \*-hda-\* \
-	-not -name \*usb\* \
-	-delete
+del_except arch/x86/kernel/cpu/cpufreq	acpi-cpufreq.ko
+del_except drivers/ata			libata.ko ata_generic.ko ata_piix.ko pata_sch.ko
+del_except drivers/block/paride
+del_except drivers/char/agp		agpgart.ko intel-agp.ko
+del_except drivers/char/hw_random
+del_except drivers/char/ipmi
+del_except drivers/char/pcmcia
+del_except drivers/char/tpm
+del_except drivers/edac
+del_except drivers/firewire
+del_except drivers/gpu/drm		drm\*.ko i915.ko
+del_except drivers/hwmon		coretemp.ko
+del_except drivers/i2c			i2c-core.ko i2c-algo-bit.ko i2c-i801.ko i2c-isch.ko i2c-tiny-usb.ko
+del_except drivers/ide			ide-core.ko ide-gd_mod.ko ide-\*generic.ko piix.ko
+del_except drivers/ieee802154
+del_except drivers/infiniband
+del_except drivers/input/gameport
+del_except drivers/isdn
+del_except drivers/media/dvb/ttpci
+del_except drivers/mfd
+del_except drivers/mtd
+del_except drivers/net/pcmcia
+del_except drivers/net/tokenring
+del_except drivers/parport
+del_except drivers/pcmcia
+del_except drivers/platform/x86		eeepc-laptop.ko wmi.ko
+del_except drivers/power
+del_except drivers/regulator
+del_except drivers/scsi/*
+del_except drivers/staging/comedi
+del_except drivers/telephony
+del_except drivers/uio
+del_except drivers/video		fb\*.ko output.ko sys\*.ko uvesafb.ko
+del_except drivers/w1
+del_except drivers/watchdog		iTCO_wdt.ko wdt\*.ko
+del_except sound/i2c
+del_except sound/isa
+del_except sound/pci			\*-hda-\*.ko
+del_except sound/pcmcia
 
 find -mindepth 1 -type d | sort -r | xargs rmdir --ignore-fail-on-non-empty
 
-cd /usr/lib/dri
-find . -type f \
-	-not -name i915_dri.so \
-	-not -name i965_dri.so \
-	-delete
-
+del_except /usr/lib/dri 		i915_dri.so i965_dri.so

-- 
A live-helper based Debian live & installer image for the Eee PC.