diff options
author | Daniel Robbins <drobbins@gentoo.org> | 2003-03-24 23:26:58 +0000 |
---|---|---|
committer | Daniel Robbins <drobbins@gentoo.org> | 2003-03-24 23:26:58 +0000 |
commit | f0283ba74330aceced2f6b693aff413cb37cf797 (patch) | |
tree | 829b92a303e8051e5735997630479aa1ad266e6f /sys-apps/module-init-tools | |
parent | version bump w/ new hyriand patch (diff) | |
download | historical-f0283ba74330aceced2f6b693aff413cb37cf797.tar.gz historical-f0283ba74330aceced2f6b693aff413cb37cf797.tar.bz2 historical-f0283ba74330aceced2f6b693aff413cb37cf797.zip |
New rev with fixes for immediate testing (masked)
Diffstat (limited to 'sys-apps/module-init-tools')
3 files changed, 167 insertions, 1 deletions
diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog index 2b10b72397de..6d4a9c59991b 100644 --- a/sys-apps/module-init-tools/ChangeLog +++ b/sys-apps/module-init-tools/ChangeLog @@ -1,6 +1,12 @@ # 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.18 2003/03/15 06:11:23 azarah Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.19 2003/03/24 23:26:58 drobbins Exp $ + +*module-init-tools-0.9.10-r5 (24 Mar 2003) + + 24 Mar 2003; Daniel Robbins <drobbins@gentoo.org>: new rev to include a + PROVIDE="virtual/module-tools" and an unmasking for x86. Bumped modutils + to 2.4.24. 15 March 2003; Martin Schlemmer <azarah@gentoo.org> module-init-tools-0.9.10-be-quiet-for-devfsd.patch : Tweak slightly to be more effective on recursive calls. diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r5 b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r5 new file mode 100644 index 000000000000..06ecbad3d4d4 --- /dev/null +++ b/sys-apps/module-init-tools/files/digest-module-init-tools-0.9.10-r5 @@ -0,0 +1,2 @@ +MD5 f8a88214e06d102a2044af3b95256f2a module-init-tools-0.9.10.tar.bz2 99143 +MD5 16170af2981db98367c6f140a1534668 modutils-2.4.24.tar.bz2 220279 diff --git a/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild b/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild new file mode 100644 index 000000000000..708429b862a4 --- /dev/null +++ b/sys-apps/module-init-tools/module-init-tools-0.9.10-r5.ebuild @@ -0,0 +1,158 @@ +# 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.10-r5.ebuild,v 1.1 2003/03/24 23:26:58 drobbins Exp $ + +# This ebuild includes backwards compatability for stable 2.4 kernels +IUSE="" + +inherit flag-o-matic +inherit eutils + +# Note to Azarah: +# +# Hi Azarah :) That "above" and "below" stuff messes up 2.4 modutils too, +# but for different reasons. So I am removing all the weird hacks to keep +# "above" and "below" since they are no longer necessary. +# +# <drobbins@gentoo.org> (24 March 2003) + +MYP="${P/_pre1/-pre}" +S="${WORKDIR}/${MYP}" +MODUTILS_PV="2.4.24" +DESCRIPTION="Kernel module tools for the development kernel >=2.5.48" +SRC_URI="http://www.kernel.org/pub/linux/kernel/people/rusty/modules/${MYP}.tar.bz2 + http://www.kernel.org/pub/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2" +HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules" +KEYWORDS="-*" +LICENSE="GPL-2" +SLOT="0" +DEPEND="virtual/glibc" +RDEPEND=">=sys-apps/devfsd-1.3.25-r1" +PROVIDE="virtual/modutils" + +pkg_setup() { + check_KV + + if [ ! -f /lib/modules/${KV}/modules.dep ] + then + eerror "Please compile and install a kernel first!" + die "Please compile and install a kernel first!" + fi +} + +src_unpack() { + unpack ${A} + + cd ${S} + # Fix recursive calls to modprobe not honoring -s, -q, -v and -C + epatch ${FILESDIR}/${P}-fix-recursion.patch + # Never output to stdout if logging was requested + epatch ${FILESDIR}/${P}-no-stdout-on-log.patch + cd ${WORKDIR}/modutils-${MODUTILS_PV} + epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch + cd ${S} + + # If we call modprobe with '-C /dev/modules.conf' and the "module name" + # starts with '/dev', modprobe from modutils-2.4.22 do not print any + # errors: + # + # gateway root # modprobe /dev/sd1 + # modprobe: Can't locate module /dev/sd1 + # gateway root # modprobe -C /etc/modules.conf /dev/sd1 + # modprobe: Can't locate module /dev/sd1 + # gateway root # modprobe -C /etc/modules.devfs /dev/sd1 + # gateway root # modprobe foo + # modprobe: Can't locate module foo + # gateway root # modprobe -C /etc/modules.conf foo + # modprobe: Can't locate module foo + # gateway root # modprobe -C /etc/modules.devfs foo + # modprobe: Can't locate module foo + # gateway root # + # gateway root # modprobe -C /etc/modules.devfs /dev/sd1 && echo yes + # yes + # gateway root # modprobe -C /etc/modules.devfs foo && echo yes + # modprobe: Can't locate module foo + # gateway root # + epatch ${FILESDIR}/${P}-be-quiet-for-devfsd.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 + for f in lsmod modprobe rmmod depmod insmod; do + if [ -L ${D}/sbin/${f} ]; then + ln -sf `ls -l ${D}/sbin/${f} | \ + sed 's/.* -> //'`.old ${D}/sbin/${f}; + fi; + mv ${D}/sbin/${f} ${D}/sbin/${f}.old; + done + einstall prefix=${D} + # 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 + + 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 +} |