Package: kernel-wedge
Version: 2.21
Severity: normal
Tags: patch
Hi,
I'm attaching a patch that adds support for kernel of FreeBSD.
It's very non-intrusive. Only two scripts are modified minimaly. As for the
modules/ dir, I opted for adding a new hierrachy in modules/kfreebsd/. This
way, kfreebsd-kernel-di packages can "#include <kfreebsd/fubar>" without
interfering with the Linux ones.
-- System Information:
Debian Release: testing/unstable
Architecture: kfreebsd-i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: GNU/kFreeBSD 6.0-1-686
Locale: LANG=en_US, LC_CTYPE=en_US (charmap=ANSI_X3.4-1968) (ignored: LC_ALL
set to C)
Versions of packages kernel-wedge depends on:
ii debhelper 5.0.33 helper programs for debian/rules
ii make 3.81-1 The GNU version of the "make" util
kernel-wedge recommends no packages.
-- no debconf information
diff -Nur kernel-wedge-2.21.old/commands/copy-modules
kernel-wedge-2.21/commands/copy-modules
--- kernel-wedge-2.21.old/commands/copy-modules 2005-09-15 03:18:25.000000000
+0200
+++ kernel-wedge-2.21/commands/copy-modules 2006-04-27 20:32:46.000000000
+0200
@@ -56,7 +56,7 @@
# Prefer modules in the kernel subdir, but failing
# that search the whole thing, to find third-party,
# etc modules.
- match="$(find $moddir/kernel $moddir \
+ match="$(find `ls -d $moddir/kernel 2>/dev/null`
$moddir \
-name $module.o -or -name $module.ko \
| head -n 1 | sed "s!$moddir/!!")"
@@ -78,6 +78,7 @@
flavour=$2
installedname=$3
arch=$(dpkg-architecture -qDEB_HOST_ARCH)
+os=$(dpkg-architecture -qDEB_HOST_ARCH_OS)
home=$PWD
trap 'rm -rf $tmpdir' EXIT
@@ -105,6 +106,7 @@
modlistdir=modules/$arch
fi
+if [ "$os" = "linux" ] ; then
if [ ! -e "$moddir/modules.dep" ]; then
echo "no $moddir/modules.dep. This file is required by kernel-wedge" >&2
exit 1
@@ -129,6 +131,7 @@
echo "If this is intentional, touch $home/no-modules" >&2
exit 1
fi
+fi
mkdir $tmpdir/module-deps $tmpdir/module-list
diff -Nur kernel-wedge-2.21.old/commands/install-files
kernel-wedge-2.21/commands/install-files
--- kernel-wedge-2.21.old/commands/install-files 2005-08-08
04:29:21.000000000 +0200
+++ kernel-wedge-2.21/commands/install-files 2006-04-27 19:57:19.000000000
+0200
@@ -44,11 +44,16 @@
"$sourcedir/boot/vmlinux-$installedname",
"debian/kernel-image-$kernelversion-$flavour-di/boot/vmlinux$extraname");
}
- else {
+ elsif (-e "$sourcedir/boot/vmlinuz-$installedname") {
doit("install", "-D", "-m", 644,
"$sourcedir/boot/vmlinuz-$installedname",
"debian/kernel-image-$kernelversion-$flavour-di/boot/vmlinuz$extraname");
}
+ else {
+ doit("install", "-D", "-m", 644,
+ "$sourcedir/boot/kfreebsd-$installedname.gz",
+
"debian/kernel-image-$kernelversion-$flavour-di/boot/kfreebsd$extraname.gz");
+ }
doit("install", "-D", "-m", 644,
"$sourcedir/boot/System.map-$installedname",
"debian/kernel-image-$kernelversion-$flavour-di/boot/System.map$extraname")
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/acpi-modules
kernel-wedge-2.21/modules/kfreebsd/acpi-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/acpi-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/acpi-modules 2006-04-26
15:03:53.000000000 +0200
@@ -0,0 +1 @@
+acpi
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/cdrom-core-modules
kernel-wedge-2.21/modules/kfreebsd/cdrom-core-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/cdrom-core-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/cdrom-core-modules 2006-04-26
16:49:56.000000000 +0200
@@ -0,0 +1,3 @@
+# SCSI cd
+cd ?
+atapicd ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/ext2-modules
kernel-wedge-2.21/modules/kfreebsd/ext2-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/ext2-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/ext2-modules 2006-04-26
15:08:51.000000000 +0200
@@ -0,0 +1 @@
+ext2fs
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/fat-modules
kernel-wedge-2.21/modules/kfreebsd/fat-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/fat-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/fat-modules 2006-04-26
15:10:08.000000000 +0200
@@ -0,0 +1,2 @@
+msdosfs
+msdosfs_iconv ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/firewire-core-modules
kernel-wedge-2.21/modules/kfreebsd/firewire-core-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/firewire-core-modules
1970-01-01 01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/firewire-core-modules 2006-04-26
16:51:52.000000000 +0200
@@ -0,0 +1,5 @@
+firewire ?
+# SCSI over FireWire (Requires scbus and da)
+sbp ?
+# Ethernet over FireWire (non-standard!)
+fwe ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/floppy-modules
kernel-wedge-2.21/modules/kfreebsd/floppy-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/floppy-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/floppy-modules 2006-04-27
20:24:13.000000000 +0200
@@ -0,0 +1,2 @@
+fdc
+atapifd ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/ide-core-modules
kernel-wedge-2.21/modules/kfreebsd/ide-core-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/ide-core-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/ide-core-modules 2006-04-26
16:34:35.000000000 +0200
@@ -0,0 +1 @@
+ata ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/ide-modules
kernel-wedge-2.21/modules/kfreebsd/ide-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/ide-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/ide-modules 2006-04-26
15:17:21.000000000 +0200
@@ -0,0 +1,4 @@
+atadisk ?
+ataraid ?
+cd9660 ?
+cd9660_iconv ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/ipv6-modules
kernel-wedge-2.21/modules/kfreebsd/ipv6-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/ipv6-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/ipv6-modules 2006-04-27
20:21:41.000000000 +0200
@@ -0,0 +1,2 @@
+if_gif
+if_faith
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/isa-pnp-modules
kernel-wedge-2.21/modules/kfreebsd/isa-pnp-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/isa-pnp-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/isa-pnp-modules 2006-04-26
16:39:35.000000000 +0200
@@ -0,0 +1 @@
+isa ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/loop-modules
kernel-wedge-2.21/modules/kfreebsd/loop-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/loop-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/loop-modules 2006-04-26
16:52:07.000000000 +0200
@@ -0,0 +1,3 @@
+loop ?
+# aka cloop
+geom_uzip ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/md-modules
kernel-wedge-2.21/modules/kfreebsd/md-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/md-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/md-modules 2006-04-26
16:39:50.000000000 +0200
@@ -0,0 +1 @@
+md ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/nfs-modules
kernel-wedge-2.21/modules/kfreebsd/nfs-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/nfs-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/nfs-modules 2006-04-26
15:23:28.000000000 +0200
@@ -0,0 +1 @@
+nfsclient
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/nic-modules
kernel-wedge-2.21/modules/kfreebsd/nic-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/nic-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/nic-modules 2006-04-26
16:59:47.000000000 +0200
@@ -0,0 +1,16 @@
+# Some very common nic modules.
+# 3Com Etherlink III
+if_ep ?
+# RealTek 8129/8139
+if_rl ?
+# Intel PRO/100 Ethernet
+if_fxp ?
+# National Semiconductor
+sis
+# ne2k
+if_ed ?
+#tg3
+# aka "tulip" ?
+if_dc ?
+# Winbond W89C840F
+if_wb ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/nic-pcmcia-modules
kernel-wedge-2.21/modules/kfreebsd/nic-pcmcia-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/nic-pcmcia-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/nic-pcmcia-modules 2006-04-26
16:40:46.000000000 +0200
@@ -0,0 +1,2 @@
+# Common pcmcia nic modules.
+if_ed ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/nic-usb-modules
kernel-wedge-2.21/modules/kfreebsd/nic-usb-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/nic-usb-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/nic-usb-modules 2006-04-26
16:51:36.000000000 +0200
@@ -0,0 +1,12 @@
+# ADMtek USB Ethernet
+aue ?
+# ASIX Electronics USB Ethernet
+axe ?
+# Generic USB over Ethernet
+cdce ?
+# CATC USB Ethernet
+cue ?
+# Kawasaki LSI USB Ethernet
+kue ?
+# RealTek RTL8150 USB Ethernet
+rue ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/parport-modules
kernel-wedge-2.21/modules/kfreebsd/parport-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/parport-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/parport-modules 2006-04-27
20:11:20.000000000 +0200
@@ -0,0 +1,2 @@
+ppc ?
+ppbus
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/pcmcia-modules
kernel-wedge-2.21/modules/kfreebsd/pcmcia-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/pcmcia-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/pcmcia-modules 2006-04-26
16:51:00.000000000 +0200
@@ -0,0 +1,6 @@
+# cardbus (yenta) bridge
+cbb ?
+# PC Card (16-bit) bus
+pccard ?
+# CardBus (32-bit) bus
+cardbus ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/plip-modules
kernel-wedge-2.21/modules/kfreebsd/plip-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/plip-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/plip-modules 2005-05-13
22:51:47.000000000 +0200
@@ -0,0 +1 @@
+plip
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/ppp-modules
kernel-wedge-2.21/modules/kfreebsd/ppp-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/ppp-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/ppp-modules 2006-04-26
16:43:29.000000000 +0200
@@ -0,0 +1,5 @@
+if_ppp
+ng_ppp
+ng_pppoe
+ng_sppp
+sppp
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/reiserfs-modules
kernel-wedge-2.21/modules/kfreebsd/reiserfs-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/reiserfs-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/reiserfs-modules 2006-04-26
16:11:31.000000000 +0200
@@ -0,0 +1,2 @@
+# Not available currently on all kernel versions, so marked optional.
+reiserfs ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/scsi-common-modules
kernel-wedge-2.21/modules/kfreebsd/scsi-common-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/scsi-common-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/scsi-common-modules 2006-04-26
16:43:56.000000000 +0200
@@ -0,0 +1,4 @@
+aic ?
+aic7xxx ?
+bt ?
+sym ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/scsi-core-modules
kernel-wedge-2.21/modules/kfreebsd/scsi-core-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/scsi-core-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/scsi-core-modules 2006-04-26
16:44:06.000000000 +0200
@@ -0,0 +1,4 @@
+scbus ?
+ch ?
+da ?
+sa ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/serial-modules
kernel-wedge-2.21/modules/kfreebsd/serial-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/serial-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/serial-modules 2006-04-26
16:44:13.000000000 +0200
@@ -0,0 +1 @@
+sio ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/ufs-modules
kernel-wedge-2.21/modules/kfreebsd/ufs-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/ufs-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/ufs-modules 2006-04-26
16:38:37.000000000 +0200
@@ -0,0 +1 @@
+ufs ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/usb-modules
kernel-wedge-2.21/modules/kfreebsd/usb-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/usb-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/usb-modules 2006-04-26
16:09:58.000000000 +0200
@@ -0,0 +1,4 @@
+ohci ?
+uhci ?
+ehci ?
+usb ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/usb-storage-modules
kernel-wedge-2.21/modules/kfreebsd/usb-storage-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/usb-storage-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/usb-storage-modules 2006-04-26
16:44:21.000000000 +0200
@@ -0,0 +1 @@
+umass ?
diff -Nur kernel-wedge-2.21.old/modules/kfreebsd/xfs-modules
kernel-wedge-2.21/modules/kfreebsd/xfs-modules
--- kernel-wedge-2.21.old/modules/kfreebsd/xfs-modules 1970-01-01
01:00:00.000000000 +0100
+++ kernel-wedge-2.21/modules/kfreebsd/xfs-modules 2005-05-13
22:51:47.000000000 +0200
@@ -0,0 +1,2 @@
+# Not available currently on all kernel versions, so marked optional.
+xfs ?
