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

[Ben Armstrong]

The following commit has been merged in the master branch:
commit 05ecd215e1498df332381909b069808216da6352
Merge: 5414118dc144bd412d8ef895ae0650d35056cc51 a0f6effb3f342ef5cdadbd188a0915a0643522e9
Author: Ben Armstrong <synrg at debian.org>
Date:   Sun Dec 27 21:16:08 2009 -0400

    Merge branch 'master' of ssh://git.debian.org/git/debian-eeepc/eeepc-live
    
    Conflicts:
    	config/chroot_local-hooks/rm-non-eee-kernel-modules.sh

diff --combined config/chroot_local-hooks/rm-non-eee-kernel-modules.sh
index 631c883,0fbc0db..096347a
--- a/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh
+++ b/config/chroot_local-hooks/rm-non-eee-kernel-modules.sh
@@@ -1,6 -1,8 +1,8 @@@
- #!/bin/sh
- cd /lib/modules/2.6.32-trunk-686/kernel
- find	drivers/ata \
+ #!/bin/sh -e
+ cd /lib/modules/*/kernel
+ find \
+ 	arch/x86/kernel/cpu/cpufreq \
+ 	drivers/ata \
  	drivers/block/paride \
  	drivers/char/agp \
  	drivers/char/hw_random \
@@@ -36,7 -38,9 +38,9 @@@
  	sound/i2c \
  	sound/isa \
  	sound/pci \
+ 	sound/pcmcia \
  	-type f \
+ 	-not -name acpi-cpufreq.ko \
  	-not -name intel-agp.ko \
  	-not -name agpgart.ko \
  	-not -name ide-core.ko \
@@@ -58,9 -62,4 +62,12 @@@
  	-not -name \*-hda-\* \
  	-not -name \*usb\* \
  	-delete
++
+ find -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
 +

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