fix for 2.6 kernel pci module autoloading

5 files changed, 101 insertions, 6 deletions

diff --git a/sys-apps/hotplug/ChangeLog b/sys-apps/hotplug/ChangeLog
index 7ec4f11a0f36..9592b4ca94b5 100644
--- a/sys-apps/hotplug/ChangeLog
+++ b/sys-apps/hotplug/ChangeLog
@@ -1,10 +1,16 @@
 # ChangeLog for sys-apps/hotplug
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.26 2003/12/18 22:50:47 gmsoft Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/ChangeLog,v 1.27 2003/12/22 04:12:36 drobbins Exp $
 
   18 Dec 2003; Guy Martin <gmsoft@gentoo.org> hotplug-20030805-r2.ebuild:
   Marked stable on hppa.
 
+*hotplug-20030805-r3 (21 Dec 2003)
+
+  21 Dec 2003; Daniel Robbins <drobbins@gentoo.org> hotplug-20030805-r3.ebuild:
+  New patch to allow hotplug to work with kernel 2.6. This is needed to patch
+  around some unfinished code in the hotplug sources.
+
 *hotplug-20030805-r2 (12 Nov 2003)
 
   12 Nov 2003; Daniel Robbins <drobbins@gentoo.org> hotplug-20030805-r2.ebuild:
diff --git a/sys-apps/hotplug/Manifest b/sys-apps/hotplug/Manifest
index 57d4afc52bc0..ce607271b16e 100644
--- a/sys-apps/hotplug/Manifest
+++ b/sys-apps/hotplug/Manifest
@@ -1,17 +1,20 @@
-MD5 9b9512e8c24dda0d9e961769a1fa6049 ChangeLog 4603
 MD5 5ab9b61479b8fafefcaca30dbdbb314d hotplug-20020826-r2.ebuild 1563
+MD5 95eed4ffc6aac22db5d1030f2d528e2e hotplug-20030805.ebuild 1530
+MD5 dbc0a1e284337e1bce85ecec7e8f8be0 hotplug-20030805-r2.ebuild 1893
 MD5 8adbe30df2fad3fcdc443742156ddce5 hotplug-20030501-r2.ebuild 1517
 MD5 b2727f7bdfca2e4987d2d65063533e98 hotplug-20030805-r1.ebuild 1753
-MD5 dbc0a1e284337e1bce85ecec7e8f8be0 hotplug-20030805-r2.ebuild 1893
-MD5 95eed4ffc6aac22db5d1030f2d528e2e hotplug-20030805.ebuild 1530
+MD5 7a1aeede667851d810bae3f744bac241 ChangeLog 4854
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
+MD5 c5742abca9a441044fd53e26c65e9827 hotplug-20030805-r3.ebuild 1936
 MD5 0e5a1a005fcfa0e242be02e9ef99de7a files/digest-hotplug-20020826-r2 224
-MD5 40927deb2fb37aa51529d46a9b55e051 files/digest-hotplug-20030501-r2 154
 MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805 151
+MD5 9f13f3363b85caac03bfb623c652b4fa files/kernel-26-fix.patch 816
+MD5 1bd9ddb0959318fe56dec239c8265fb1 files/usb.confd 291
+MD5 40927deb2fb37aa51529d46a9b55e051 files/digest-hotplug-20030501-r2 154
 MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r1 151
 MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r2 151
+MD5 a3281f5b866be688f79d9a46d060180a files/digest-hotplug-20030805-r3 151
 MD5 d8a0d8878d8904a779bda401d86268b1 files/firmware.agent 1188
 MD5 7c4681458effb34f299cbc4b9245098c files/hotplug.functions.patch 522
 MD5 d9a8d760dd153d10eb3e74fb1c4d8ad2 files/hotplug.rc 810
 MD5 92547b2263d5423d874565504d2324f7 files/usb.agent.diff 886
-MD5 1bd9ddb0959318fe56dec239c8265fb1 files/usb.confd 291
diff --git a/sys-apps/hotplug/files/digest-hotplug-20030805-r3 b/sys-apps/hotplug/files/digest-hotplug-20030805-r3
new file mode 100644
index 000000000000..faa1d90068fa
--- /dev/null
+++ b/sys-apps/hotplug/files/digest-hotplug-20030805-r3
@@ -0,0 +1,2 @@
+MD5 200eef33ddfcee9c023a3a7797ac6919 hotplug-2003_08_05.tar.gz 42537
+MD5 a0db235527f911f91473e04f752fbffe hotplug-20030805-gentoo-patches.tar.bz2 1991
diff --git a/sys-apps/hotplug/files/kernel-26-fix.patch b/sys-apps/hotplug/files/kernel-26-fix.patch
new file mode 100644
index 000000000000..3d44c9703dd7
--- /dev/null
+++ b/sys-apps/hotplug/files/kernel-26-fix.patch
@@ -0,0 +1,18 @@
+diff -urN hotplug-2003_08_05/etc/hotplug/hotplug.functions hotplug-2003_08_05.new/etc/hotplug/hotplug.functions
+--- hotplug-2003_08_05/etc/hotplug/hotplug.functions	2003-12-21 21:01:32.936579696 -0700
++++ hotplug-2003_08_05.new/etc/hotplug/hotplug.functions	2003-12-21 21:02:59.632399928 -0700
+@@ -88,13 +88,7 @@
+     FILENAME=$2
+     DESCRIPTION=$3
+ 
+-    # should we use usbmodules, pcimodules?  not on 2.5+, because sysfs
+-    # ought to expose the data we need to find all candidate drivers.
+-    # (on 2.5.48 it does for usb; but maybe not yet for pci.)
+-    case "$KERNEL" in
+-    2.2*|2.3*|2.4*)	LISTER=`type -p ${TYPE}modules` ;;
+-    *)			LISTER="" ;;
+-    esac
++    LISTER=`type -p ${TYPE}modules` 
+ 
+     if [ "$LISTER" != "" ]; then
+ 	# lister programs MIGHT be preferable to parsing from shell scripts:
diff --git a/sys-apps/hotplug/hotplug-20030805-r3.ebuild b/sys-apps/hotplug/hotplug-20030805-r3.ebuild
new file mode 100644
index 000000000000..c583a54fe2f6
--- /dev/null
+++ b/sys-apps/hotplug/hotplug-20030805-r3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hotplug/hotplug-20030805-r3.ebuild,v 1.1 2003/12/22 04:12:36 drobbins Exp $
+
+inherit eutils
+
+# source maintainers named it hotplug-YYYY_MM_DD instead of hotplug-YYYYMMDD
+MY_P=${PN}-${PV:0:4}_${PV:4:2}_${PV:6:2}
+S=${WORKDIR}/${MY_P}
+DESCRIPTION="USB and PCI hotplug scripts"
+HOMEPAGE="http://linux-hotplug.sourceforge.net"
+SRC_URI="mirror://sourceforge/linux-hotplug/${MY_P}.tar.gz
+	mirror://gentoo/${P}-gentoo-patches.tar.bz2"
+
+SLOT="0"
+LICENSE="GPL-2"
+KEYWORDS="x86 amd64 ~ppc hppa ~sparc ~alpha ~mips ~arm"
+
+# hotplug needs pcimodules utility provided by pcitutils-2.1.9-r1
+DEPEND=">=sys-apps/pciutils-2.1.9 >=sys-apps/usbutils-0.9"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	EPATCH_SUFFIX="patch" epatch ${WORKDIR}/hotplug-patches
+
+	# The following patch prevents bogus messages of the flavor
+	# "missing kernel or user mode driver prism2_usb".  It has been
+	# mentioned on the linux-hotplug mailing list.
+	epatch ${FILESDIR}/hotplug.functions.patch
+
+	cd ${S}/etc/hotplug/
+	cat ${FILESDIR}/usb.agent.diff | patch usb.agent || die
+	epatch ${FILESDIR}/kernel-26-fix.patch || die
+}
+
+src_install() {
+	into /
+	dosbin sbin/hotplug
+	doman *.8
+	dodoc README ChangeLog
+
+	cd ${S}/etc/hotplug
+	insinto /etc/hotplug
+	doins blacklist hotplug.functions usb.distmap usb.handmap usb.usermap
+	exeinto /etc/hotplug
+	doexe *.agent *.rc ${FILESDIR}/firmware.agent
+	dodir /usr/lib/hotplug/firmware
+	dodir /etc/hotplug/usb /etc/hotplug/pci
+	cd ${S}/etc/hotplug.d/default
+	exeinto /etc/hotplug.d/default
+	doexe default.hotplug
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/hotplug.rc hotplug
+
+	insinto /etc/conf.d
+	newins ${FILESDIR}/usb.confd usb
+	dodir /var/run/usb
+}
+
+pkg_postinst() {
+	ewarn "WARNING: The fxload program was spliced off this package"
+	ewarn "WARNING: emerge fxload if you need it"
+}
+