summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Schlemmer <azarah@gentoo.org>2003-07-12 18:56:15 +0000
committerMartin Schlemmer <azarah@gentoo.org>2003-07-12 18:56:15 +0000
commitedf92b987a280e7e31a69165919eff9aae350917 (patch)
tree418524558471176d04c35a38f07a541fc5a76994 /sys-apps
parentInclude of config file fixups (diff)
downloadgentoo-2-edf92b987a280e7e31a69165919eff9aae350917.tar.gz
gentoo-2-edf92b987a280e7e31a69165919eff9aae350917.tar.bz2
gentoo-2-edf92b987a280e7e31a69165919eff9aae350917.zip
Include of config file fixups
Diffstat (limited to 'sys-apps')
-rw-r--r--sys-apps/module-init-tools/ChangeLog11
-rw-r--r--sys-apps/module-init-tools/Manifest5
-rw-r--r--sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r12
-rw-r--r--sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch13
-rw-r--r--sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild169
5 files changed, 197 insertions, 3 deletions
diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index 0c75da2a325d..b05ec0e9e7ae 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,15 @@
# ChangeLog for sys-apps/module-init-tools
# Copyright 2002 Gentoo Technologies, Inc.; Distributed under the GPL
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.26 2003/06/02 09:53:32 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.27 2003/07/12 18:54:54 azarah Exp $
+
+*module-init-tools-0.9.12-r1 (12 Jul 2003)
+
+ 12 Jul 2003; Martin Schlemmer <azarah@gentoo.org>
+ module-init-tools-0.9.12-r1.ebuild,
+ files/module-init-tools-0.9.12-includes-should-override.patch:
+ Module options/aliases already accuired, should be replaced by
+ newer if they are aquired from a file 'included' after the original
+ options/aliases ...
*module-init-tools-0.9.12 (02 Jun 2003)
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index 346b52bb4f97..78da86abc806 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,6 +1,7 @@
-MD5 2a7e77ac964c3c6ec3b0ab291134998f ChangeLog 6611
+MD5 574ec6b4ddcb67e47e3bd00d43b3d826 ChangeLog 6968
+MD5 677553c32e89612435d8adbb6051f3ee module-init-tools-0.9.12.ebuild 4545
MD5 3ba562f50268420056ee5a9447e6412e module-init-tools-0.9.10-r5.ebuild 4729
-MD5 0cdda54a008a376d36e747bc437b1206 module-init-tools-0.9.12-r1.ebuild 4767
+MD5 b379a57373c2b8746e1016dd8ea37d56 module-init-tools-0.9.12-r1.ebuild 4770
MD5 e689a2069d63d7e2b802ebef7db506a0 module-init-tools-0.9.11-r3.ebuild 4540
MD5 5730ed074b4a6d84e113b52fff303f12 module-init-tools-0.9.11a.ebuild 4546
MD5 28295a2b93ba19ae91062a0078c078f6 files/module-init-tools-0.9.10-be-quiet-for-devfsd.patch 3327
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1
new file mode 100644
index 000000000000..da7deba7e67b
--- /dev/null
+++ b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.12-r1
@@ -0,0 +1,2 @@
+MD5 d61517a904d005fd83c954dd7fe49f27 module-init-tools-0.9.12.tar.bz2 112896
+MD5 2c0cca3ef6330a187c6ef4fe41ecaa4d modutils-2.4.25.tar.bz2 220530
diff --git a/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch b/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch
new file mode 100644
index 000000000000..44947b306bec
--- /dev/null
+++ b/sys-apps/module-init-tools/files/module-init-tools-0.9.12-includes-should-override.patch
@@ -0,0 +1,13 @@
+--- module-init-tools-0.9.12/modprobe.c.orig 2003-07-12 20:00:52.000000000 +0200
++++ module-init-tools-0.9.12/modprobe.c 2003-07-12 20:28:04.000000000 +0200
+@@ -1015,7 +1015,9 @@ static char *read_config(const char *fil
+ newresult = read_config(newfilename, 1, name,
+ dump_only, removing,
+ options, commands);
+- if (!result)
++ /* Files included override aliases, etc that was
++ * already set ... */
++ if (newresult)
+ result = newresult;
+ }
+ } else if (strcmp(cmd, "options") == 0) {
diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild
new file mode 100644
index 000000000000..1d6fa17f3be3
--- /dev/null
+++ b/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild
@@ -0,0 +1,169 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License, v2 or later
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-0.9.12-r1.ebuild,v 1.1 2003/07/12 18:54:54 azarah Exp $
+
+# This ebuild includes backwards compatability for stable 2.4 kernels
+IUSE=""
+
+inherit flag-o-matic
+inherit eutils
+
+MYP="${P/_pre1/-pre}"
+S="${WORKDIR}/${MYP}"
+MODUTILS_PV="2.4.25"
+DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
+SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
+ mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
+
+KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~arm"
+LICENSE="GPL-2"
+SLOT="0"
+
+DEPEND="virtual/glibc"
+PROVIDE="virtual/modutils"
+
+src_unpack() {
+ unpack ${A}
+
+ # With the b0rked modutils, "modprobe hid" does work. But if something
+ # (like hotplug) tries to auto-load hid (because another module needs it,
+ # via the kernel module auto-loader) and keybdev.o or mousedev.o don't
+ # exist, then the "above" clause fails and the hid module never gets
+ # loaded, and then things like USB will fail. Thus we remove it all
+ # together.
+ #
+ # <drobbins@gentoo.org> (26 Mar 2003)
+ cd ${WORKDIR}/modutils-${MODUTILS_PV}
+ epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
+
+ # A hack to have absolutely no output if:
+ #
+ # 1) we have no logging enabled
+ #
+ # 2) our config file is /etc/modprobe.devfs or /etc/modules.devfs
+ #
+ # 3) with the module name starting with '/dev/'.
+ #
+ # Rasionale: This is what modprobe from modutils does.
+ #
+ # <azarah@gentoo.org> (17 Mar 2003)
+ cd ${S}; epatch ${FILESDIR}/${PN}-0.9.11-be-quiet-for-devfsd.patch
+
+ # Module options/aliases already accuired, should be replaced by
+ # newer if they are aquired from a file 'included' after the original
+ # options/aliases ...
+ #
+ # <azarah@gentoo.org> (12 July 2003)
+ epatch ${FILESDIR}/${P}-includes-should-override.patch
+}
+
+src_compile() {
+ local myconf=
+
+ filter-flags -fPIC
+
+ einfo "Building modutils..."
+ cd ${WORKDIR}/modutils-${MODUTILS_PV}
+
+ econf \
+ --disable-strip \
+ --prefix=/ \
+ --enable-insmod-static \
+ --disable-zlib \
+ ${myconf}
+
+ emake || die "emake modutils failed"
+ einfo "Building module-init-tools..."
+ cd ${S}
+
+ econf \
+ --prefix=/ \
+ ${myconf}
+
+ emake || die "emake module-init-tools failed"
+}
+
+src_install () {
+
+ cd ${WORKDIR}/modutils-${MODUTILS_PV}
+ einstall prefix="${D}"
+
+ docinto modutils-${MODUTILS_PV}
+ dodoc COPYING CREDITS ChangeLog NEWS README TODO
+
+ cd ${S}
+ # This copies the old version of modutils to *.old so it still works
+ # with kernels <= 2.4; new versions will execve() the .old version if
+ # a 2.4 kernel is running...
+ # This code was borrowed from the module-init-tools Makefile
+ local runme
+ local f
+ for f in lsmod modprobe rmmod depmod insmod modinfo
+ do
+ if [ -L ${D}/sbin/${f} ]
+ then
+ einfo "Moving symlink $f to ${f}.old"
+ #runme = the target of the symlink with a .old tagged on.
+ runme=`ls -l ${D}/sbin/${f} | sed 's/.* -> //'`.old
+ [ ! -e ${D}/sbin/${runme} ] || einfo "${D}/sbin/${runme} not found"
+ ln -snf $runme ${D}/sbin/${f} || die
+ elif [ -e ${D}/sbin/${f} ]
+ then
+ einfo "Moving executable $f to ${f}.old"
+ fi
+ mv -f ${D}/sbin/${f} ${D}/sbin/${f}.old;
+ done
+ # Move the man pages as well. We only do this for the man pages of the
+ # tools that module-init-tools will replace.
+ for f in ${D}/usr/share/man/man8/{lsmod,modprobe,rmmod,depmod,insmod}.8
+ do
+ mv -f ${f} ${f%\.*}.old.${f##*\.}
+ done
+
+ einstall prefix=${D}
+
+ # Install compat symlink
+ dosym ../bin/lsmod /sbin/lsmod
+ dosym ../sbin/insmod.old /bin/lsmod.old
+ # Install the modules.conf2modprobe.conf tool, so we can update
+ # modprobe.conf.
+ into /
+ dosbin ${S}/generate-modprobe.conf
+ # Create the new modprobe.conf
+ dodir /etc
+ rm -f ${D}/etc/modprobe.conf
+ if [ ! -f ${ROOT}/etc/modprobe.devfs ]
+ then
+ # Support file for the devfs hack .. needed else modprobe borks.
+ # Baselayout-1.8.6.3 or there abouts will have a modules-update that
+ # will correctly generate /etc/modprobe.devfs ....
+ echo "### This file is automatically generated by modules-update" \
+ > ${D}/etc/modprobe.devfs
+ else
+ # This is dynamic, so we do not want this in the package ...
+ rm -f ${D}/etc/modprobe.devfs
+ fi
+
+ doman *.[1-8]
+ docinto /
+ dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+}
+
+pkg_postinst() {
+ if [ "${ROOT}" = "/" ]
+ then
+ einfo "Updating config files..."
+ if [ -x /sbin/modules-update ]
+ then
+ /sbin/modules-update
+ elif [ -x /sbin/update-modules ]
+ then
+ /sbin/update-modules
+ elif [ -x /usr/sbin/update-modules ]
+ then
+ /usr/sbin/update-modules
+ fi
+ fi
+}
+