diff options
author | Martin Schlemmer <azarah@gentoo.org> | 2004-01-30 04:35:10 +0000 |
---|---|---|
committer | Martin Schlemmer <azarah@gentoo.org> | 2004-01-30 04:35:10 +0000 |
commit | fee3cb0734d2244fdaff92159a9b213e5a23006d (patch) | |
tree | f3a7cf48d6b6422abbb85c9d82dbeb814fcc5544 /sys-apps/module-init-tools | |
parent | fix bug #39808, touching .keep files obsolete. (diff) | |
download | historical-fee3cb0734d2244fdaff92159a9b213e5a23006d.tar.gz historical-fee3cb0734d2244fdaff92159a9b213e5a23006d.tar.bz2 historical-fee3cb0734d2244fdaff92159a9b213e5a23006d.zip |
Update version, fixing bug #39397.
Diffstat (limited to 'sys-apps/module-init-tools')
-rw-r--r-- | sys-apps/module-init-tools/ChangeLog | 8 | ||||
-rw-r--r-- | sys-apps/module-init-tools/Manifest | 14 | ||||
-rw-r--r-- | sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre8 | 2 | ||||
-rw-r--r-- | sys-apps/module-init-tools/module-init-tools-3.0_pre8.ebuild | 163 |
4 files changed, 180 insertions, 7 deletions
diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog index 2f59ae69e5a9..7021669ca01a 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-2004 Gentoo Technologies, Inc.; Distributed under the GPL -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.50 2004/01/26 22:43:54 dorileo Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.51 2004/01/30 04:35:10 azarah Exp $ + +*module-init-tools-3.0_pre8 (30 Jan 2004) + + 30 Jan 2004; Martin Schlemmer <azarah@gentoo.org> + module-init-tools-3.0_pre8.ebuild: + Update version, fixing bug #39397. *module-init-tools-3.0_pre7 (26 Jan 2004) diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest index 59146ef13330..8d6883d2b84d 100644 --- a/sys-apps/module-init-tools/Manifest +++ b/sys-apps/module-init-tools/Manifest @@ -1,12 +1,14 @@ -MD5 9185e61a37a71767b86071045dc2dc7b ChangeLog 10667 -MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 -MD5 30c7b3baa10baeb2093ecd80a9ed6abd module-init-tools-0.9.15_pre4.ebuild 4469 -MD5 38b704a286623cb836079a3b5a484eff module-init-tools-3.0_pre5.ebuild 4469 MD5 bee6cfcd9fc91bfe4f9324b222efc46a module-init-tools-3.0_pre6.ebuild 4472 +MD5 d37b1007f3a52a6ec5fc5d5c61650ed2 ChangeLog 10961 +MD5 38b704a286623cb836079a3b5a484eff module-init-tools-3.0_pre5.ebuild 4469 +MD5 816d67b3618124b1b61c815c236b1ceb module-init-tools-3.0_pre8.ebuild 4472 MD5 56dea92c8c455626ba6d96e41ed2fc33 module-init-tools-3.0_pre7.ebuild 4473 -MD5 3094756336026a6697bd37484bf68fb1 files/digest-module-init-tools-0.9.15_pre4 150 +MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 +MD5 30c7b3baa10baeb2093ecd80a9ed6abd module-init-tools-0.9.15_pre4.ebuild 4469 MD5 4b22ce79fdc8ce1efad2ac57c7f1fe34 files/digest-module-init-tools-3.0_pre5 147 MD5 31a22342ff13f0e1c09bcc1d4a995f69 files/digest-module-init-tools-3.0_pre6 147 +MD5 3b1c6bac51fe4b9fc4730c64bd278cf5 files/digest-module-init-tools-3.0_pre7 147 MD5 07aa415fd57ac42cd0c11527edc9782d files/module-init-tools-0.9.15-legacy-modext-support.patch 481 +MD5 3094756336026a6697bd37484bf68fb1 files/digest-module-init-tools-0.9.15_pre4 150 MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch 382 -MD5 3b1c6bac51fe4b9fc4730c64bd278cf5 files/digest-module-init-tools-3.0_pre7 147 +MD5 f529587727374346bb838dba0854f561 files/digest-module-init-tools-3.0_pre8 147 diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre8 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre8 new file mode 100644 index 000000000000..b1da006d82d2 --- /dev/null +++ b/sys-apps/module-init-tools/files/digest-module-init-tools-3.0_pre8 @@ -0,0 +1,2 @@ +MD5 bb8d33e000d0ed9f623a1e8ab467ab32 module-init-tools-3.0-pre8.tar.bz2 120705 +MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135 diff --git a/sys-apps/module-init-tools/module-init-tools-3.0_pre8.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0_pre8.ebuild new file mode 100644 index 000000000000..38f115758ff0 --- /dev/null +++ b/sys-apps/module-init-tools/module-init-tools-3.0_pre8.ebuild @@ -0,0 +1,163 @@ +# Copyright 1999-2004 Gentoo Technologies, Inc. +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0_pre8.ebuild,v 1.1 2004/01/30 04:35:10 azarah Exp $ + +# This ebuild includes backwards compatability for stable 2.4 kernels +IUSE="" + +inherit flag-o-matic eutils gnuconfig + +MYP="${P/_pre/-pre}" +S="${WORKDIR}/${MYP}" +MODUTILS_PV="2.4.26" +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/kernel/people/rusty/modules/old/${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 ~ia64 ~ppc64 ~hppa" +LICENSE="GPL-2" +SLOT="0" + +DEPEND="virtual/glibc + sys-libs/zlib" + +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 + + # Support legacy .o modules + cd ${S}; epatch ${FILESDIR}/${PN}-0.9.15-legacy-modext-support.patch + + cd ${S} + rm -f missing + automake --add-missing +} + +src_compile() { + + # If running mips64, we need updated configure data + use mips && gnuconfig_update + + local myconf= + + filter-flags -fPIC + + einfo "Building modutils..." + cd ${WORKDIR}/modutils-${MODUTILS_PV} + + econf \ + --disable-strip \ + --prefix=/ \ + --disable-insmod-static \ + --disable-zlib \ + ${myconf} + + emake || die "emake modutils failed" + einfo "Building module-init-tools..." + cd ${S} + + econf \ + --prefix=/ \ + --enable-zlib \ + ${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" + dosym $runme /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 +} + |