2.6 support
This patch adds preliminar support for .ko kernel modules.
Please apply.
--
ciao, |
Marco | [3654 coOaZqA3WDJk2]
diff -ur ORIG.debian-installer/build/Makefile debian-installer/build/Makefile
--- ORIG.debian-installer/build/Makefile 2003-12-14 17:19:16.000000000 +0100
+++ debian-installer/build/Makefile 2003-12-17 12:51:18.000000000 +0100
@@ -294,7 +294,7 @@
# and alters their names to end in -reduced to indicate that
# they have been modified.
set -e; \
- for package in $$(dpkg -S `find $(TREE)/lib -type f -not -name '*.o' -not -name '*.dep' -not -name 'S[0-9][0-9]*' | \
+ for package in $$(dpkg -S `find $(TREE)/lib -type f -not -name '*.o' -not -name '*.ko' -not -name '*.dep' -not -name 'S[0-9][0-9]*' | \
sed s:$(TREE)/::` | cut -d : -f 1 | \
sort | uniq); do \
dpkg -s $$package | sed "s/$$package/$$package-reduced/g" \
@@ -322,15 +322,15 @@
set -e; \
if [ -e $(TREE)/etc/pcmcia/config ]; then \
./pcmcia-config-reduce.pl $(TREE)/etc/pcmcia/config \
- `if [ -d "$(DRIVEREXTRASDIR)" ]; then find $(DRIVEREXTRASDIR)/lib/modules -name \*.o; fi` \
- `find $(TREE)/lib/modules/ -name \*.o` > \
+ `if [ -d "$(DRIVEREXTRASDIR)" ]; then find $(DRIVEREXTRASDIR)/lib/modules -name \*.o -name \*.ko; fi` \
+ `find $(TREE)/lib/modules/ -name \*.o -name \*.ko` > \
$(TREE)/etc/pcmcia/config.reduced; \
mv -f $(TREE)/etc/pcmcia/config.reduced $(TREE)/etc/pcmcia/config; \
fi
# Strip all kernel modules, just in case they haven't already been
set -e; \
- for module in `find $(TREE)/lib/modules/ -name '*.o'`; do \
+ for module in `find $(TREE)/lib/modules/ -name '*.o' -name '*.ko'`; do \
strip -R .comment -R .note -g $$module; \
done
diff -ur ORIG.debian-installer/build/pcmcia-config-reduce.pl debian-installer/build/pcmcia-config-reduce.pl
--- ORIG.debian-installer/build/pcmcia-config-reduce.pl 2003-09-26 08:07:53.000000000 +0200
+++ debian-installer/build/pcmcia-config-reduce.pl 2003-12-17 12:48:39.000000000 +0100
@@ -2,7 +2,7 @@
# reduces the config file given as the first parameter, to contain only
# entries for the modules listd as the rest of the parameters.
my $file = shift;
-my %modules = map { s/.*\///; s/\.o$//; $_ => 1} @ARGV;
+my %modules = map { s/.*\///; s/\.k?o$//; $_ => 1} @ARGV;
open (IN, $file) || die "open $file: $!";
$/="\n\n";
my %devices;
diff -ur ORIG.debian-installer/tools/cdrom-detect/debian/cdrom-detect.postinst debian-installer/tools/cdrom-detect/debian/cdrom-detect.postinst
--- ORIG.debian-installer/tools/cdrom-detect/debian/cdrom-detect.postinst 2003-12-13 01:12:36.000000000 +0100
+++ debian-installer/tools/cdrom-detect/debian/cdrom-detect.postinst 2003-12-17 12:55:57.000000000 +0100
@@ -65,7 +65,7 @@
db_get cdrom-detect/manual_config
modules=none
- for i in `ls -1 /lib/modules/*/kernel/drivers/cdrom/ | sed -e 's/.o$//'`
+ for i in `ls -1 /lib/modules/*/kernel/drivers/cdrom/ | sed -re 's/.k?o$//'`
do
modules="$modules, $i"
done
diff -ur ORIG.debian-installer/tools/ddetect/ethdetect.sh debian-installer/tools/ddetect/ethdetect.sh
--- ORIG.debian-installer/tools/ddetect/ethdetect.sh 2003-12-08 22:54:29.000000000 +0100
+++ debian-installer/tools/ddetect/ethdetect.sh 2003-12-17 12:56:23.000000000 +0100
@@ -45,7 +45,7 @@
while [ -z "`sed -e "s/lo://" < /proc/net/dev | grep "[a-z0-9]*:[ ]*[0-9]*"`" ]
do
CHOICES=""
- for mod in $(find /lib/modules/*/kernel/drivers/net -type f | sed s/\.o$// | sed 's/.*\///' | sort); do
+ for mod in $(find /lib/modules/*/kernel/drivers/net -type f | sed -re s/\.k?o$// | sed 's/.*\///' | sort); do
if [ -z "$CHOICES" ]; then
CHOICES="$mod"
else
diff -ur ORIG.debian-installer/tools/ddetect/hw-detect.sh debian-installer/tools/ddetect/hw-detect.sh
--- ORIG.debian-installer/tools/ddetect/hw-detect.sh 2003-12-08 22:54:29.000000000 +0100
+++ debian-installer/tools/ddetect/hw-detect.sh 2003-12-17 12:57:25.000000000 +0100
@@ -87,9 +87,10 @@
# Some pci chipsets are needed or there can be DMA or other problems.
get_ide_chipset_info() {
- for ide_module in /lib/modules/*/kernel/drivers/ide/pci/*.o; do
+ for ide_module in /lib/modules/*/kernel/drivers/ide/pci/*.o \
+ /lib/modules/*/kernel/drivers/ide/pci/*.ko; do
if [ -e $ide_module ]; then
- baseidemod=$(echo $ide_module | sed s/\.o$// | sed 's/.*\///')
+ baseidemod=$(echo $ide_module | sed -re s/\.k?o$// | sed 's/.*\///')
echo "$baseidemod:IDE chipset support"
fi
done
@@ -176,7 +177,7 @@
db_progress INFO hw-detect/load_progress_step
log "Trying to load module '$module'"
- if find /lib/modules/`uname -r`/ | grep -q /${module}\\.o
+ if find /lib/modules/`uname -r`/ | grep -q /${module}\\.k?o
then
if load_modules "$module"
then
Reply to: