version bump - bug #71958.
authorRobin H. Johnson <robbat2@gentoo.org>
Mon, 22 Nov 2004 10:10:08 +0000 (10:10 +0000)
committerRobin H. Johnson <robbat2@gentoo.org>
Mon, 22 Nov 2004 10:10:08 +0000 (10:10 +0000)
sys-apps/module-init-tools/ChangeLog
sys-apps/module-init-tools/Manifest
sys-apps/module-init-tools/files/digest-module-init-tools-3.1 [new file with mode: 0644]
sys-apps/module-init-tools/files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch [new file with mode: 0644]
sys-apps/module-init-tools/module-init-tools-3.1.ebuild [new file with mode: 0644]

index b95db9a9666442770c59d548cd463f84c66b0324..ca94debde00f5d7d098817ef72e40a0431b80b6c 100644 (file)
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.70 2004/10/03 09:44:09 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.71 2004/11/22 10:10:08 robbat2 Exp $
+
+*module-init-tools-3.1 (22 Nov 2004)
+
+  22 Nov 2004; Robin H. Johnson <robbat2@gentoo.org>
+  +files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch,
+  +module-init-tools-3.1.ebuild:
+  version bump - bug #71958.
 
   03 Oct 2004; Mike Frysinger <vapier@gentoo.org>
   module-init-tools-3.0-r2.ebuild:
index 399db8b4319165367c64ba9ce0b8fd94c1b4d1dc..8b82f65a807af6dbf619f4be01db4de21a14d85d 100644 (file)
@@ -1,17 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 ec9bb45f8eefb40291acb0500b8e331b ChangeLog 13788
+MD5 17b89011a2567b4045c58539ff173fcb module-init-tools-3.1.ebuild 5354
+MD5 40ac5bc82fec26ae4798037c058edcc4 ChangeLog 14013
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
 MD5 5710fb42e858a845378c3fb2d024f796 module-init-tools-3.0-r2.ebuild 5336
-MD5 469d7fc1f915c60585afc8d895b1668a files/digest-module-init-tools-3.0-r2 142
 MD5 d179298a960a2576683689fe19818c8b files/generate-modprobe-assume-kernel.patch 3767
-MD5 07aa415fd57ac42cd0c11527edc9782d files/module-init-tools-0.9.15-legacy-modext-support.patch 481
 MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch 382
+MD5 813f2779e10e8f29d9e1d58dda93a5e3 files/digest-module-init-tools-3.1 142
+MD5 0562a7a338175d0b6100ef7958b0ef5e files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch 3766
+MD5 469d7fc1f915c60585afc8d895b1668a files/digest-module-init-tools-3.0-r2 142
+MD5 07aa415fd57ac42cd0c11527edc9782d files/module-init-tools-0.9.15-legacy-modext-support.patch 481
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.9.10 (GNU/Linux)
+Version: GnuPG v1.2.6 (GNU/Linux)
+Comment: Robbat2 @ Orbis-Terrarum Networks
 
-iD8DBQFBX88CHTu7gpaalycRAtyVAKDcmK6C0GeSWbLHyreeQ1MQ2Ee7PgCgy9vq
-BaIGpYO3Gr0KvE61XifqUBM=
-=P1Ff
+iD8DBQFBobsBPpIsIjIzwiwRAhisAKC2NRuv7o0n9t9xhJFmO2h9jGVnfwCgnFAe
+W91rmnY267ob+QKSGo3BwWc=
+=W1kW
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.1 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.1
new file mode 100644 (file)
index 0000000..b5aeb80
--- /dev/null
@@ -0,0 +1,2 @@
+MD5 8ddecbcf0e56aef8617f67a3906faf3e module-init-tools-3.1.tar.bz2 123114
+MD5 bac989c74ed10f3bf86177fc5b4b89b6 modutils-2.4.27.tar.bz2 234963
diff --git a/sys-apps/module-init-tools/files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch b/sys-apps/module-init-tools/files/module-init-tools-3.1_generate-modprobe-assume-kernel.patch
new file mode 100644 (file)
index 0000000..3d6fcf9
--- /dev/null
@@ -0,0 +1,58 @@
+--- generate-modprobe.conf.old 2004-11-22 01:21:02.457213616 -0800
++++ generate-modprobe.conf     2004-11-22 01:23:26.803269680 -0800
+@@ -1,20 +1,33 @@
+-#! /bin/sh -e
+-
++#!/bin/bash
++#
+ # Naive shell script to translate modules.conf + defaults to modprobe.conf
+ # Normal caveats apply, as with any machine translation.
+-if [ $# -gt 2 ] || [ x"$1" = x--help ]; then
+-    echo "Usage: $0 [--stdin] [modprobe.conf]"
+-    echo "   Converts your current modules setup to modprobe.conf."
+-    echo "   Don't trust it too much."
+-    echo " Version 0.1"
+-    exit 1
+-fi
++#
++# Updated 07 May 2004 by Aron Griffis <agriffis@gentoo.org> to support
++# --assume-kernel option for Gentoo LiveCD building.  See
++# http://bugs.gentoo.org/show_bug.cgi?id=49927
+ 
++# Parse command-line
+ STDIN=
+-if [ "$1" = "--stdin" ]; then
+-  STDIN=1
+-  shift
+-fi
++KV=`uname -r`
++while [[ "$1" == --* ]]; do
++    case "$1" in
++      --assume-kernel=*)
++          KV=${1#*=}
++          ;;
++      --stdin)
++          STDIN=1
++          ;;
++      *)
++          echo "Usage: $0 [--stdin] [--assume-kernel=n.n.n] [modprobe.conf]"
++          echo "   Converts your current modules setup to modprobe.conf."
++          echo "   Don't trust it too much."
++          echo " Version 0.1"
++          exit 1
++          ;;
++    esac
++    shift
++done
+ 
+ # Set up output if specified.
+ if [ $# -eq 1 ]; then exec > $1; fi
+@@ -221,7 +234,7 @@
+       ($0 $MODULE)
+       ;;
+     # Ignore default lines which are not required any more.
+-    "path[boot]=/lib/modules/boot"|"path[toplevel]=/lib/modules/`uname -r`"|"path[toplevel]=/lib/modules/2.4"|"path[kernel]=/lib/modules/kernel"|"path[fs]=/lib/modules/fs"|"path[net]=/lib/modules/net"|"path[scsi]=/lib/modules/scsi"|"path[block]=/lib/modules/block"|"path[cdrom]=/lib/modules/cdrom"|"path[ipv4]=/lib/modules/ipv4"|"path[ipv6]=/lib/modules/ipv6"|"path[sound]=/lib/modules/sound"|"path[fc4]=/lib/modules/fc4"|"path[video]=/lib/modules/video"|"path[misc]=/lib/modules/misc"|"path[pcmcia]=/lib/modules/pcmcia"|"path[atm]=/lib/modules/atm"|"path[usb]=/lib/modules/usb"|"path[ide]=/lib/modules/ide"|"path[ieee1394]=/lib/modules/ieee1394"|"path[mtd]=/lib/modules/mtd"|"generic_stringfile=/lib/modules/`uname -r`/modules.generic_string"|"pcimapfile=/lib/modules/`uname -r`/modules.pcimap"|"isapnpmapfile=/lib/modules/`uname -r`/modules.isapnpmap"|"usbmapfile=/lib/modules/`uname -r`/modules.usbmap"|"parportmapfile=/lib/modules/`uname -r`/modules.parportmap"|"ieee1394mapfile=/lib/modules/`uname -r`/modules.ieee1394map"|"pnpbiosmapfile=/lib/modules/`uname -r`/modules.pnpbiosmap"|"depfile=/lib/modules/`uname -r`/modules.dep"|"persistdir=/var/lib/modules/persist")
++    "path[boot]=/lib/modules/boot"|"path[toplevel]=/lib/modules/$KV"|"path[toplevel]=/lib/modules/2.4"|"path[kernel]=/lib/modules/kernel"|"path[fs]=/lib/modules/fs"|"path[net]=/lib/modules/net"|"path[scsi]=/lib/modules/scsi"|"path[block]=/lib/modules/block"|"path[cdrom]=/lib/modules/cdrom"|"path[ipv4]=/lib/modules/ipv4"|"path[ipv6]=/lib/modules/ipv6"|"path[sound]=/lib/modules/sound"|"path[fc4]=/lib/modules/fc4"|"path[video]=/lib/modules/video"|"path[misc]=/lib/modules/misc"|"path[pcmcia]=/lib/modules/pcmcia"|"path[atm]=/lib/modules/atm"|"path[usb]=/lib/modules/usb"|"path[ide]=/lib/modules/ide"|"path[ieee1394]=/lib/modules/ieee1394"|"path[mtd]=/lib/modules/mtd"|"generic_stringfile=/lib/modules/$KV/modules.generic_string"|"pcimapfile=/lib/modules/$KV/modules.pcimap"|"isapnpmapfile=/lib/modules/$KV/modules.isapnpmap"|"usbmapfile=/lib/modules/$KV/modules.usbmap"|"parportmapfile=/lib/modules/$KV/modules.parportmap"|"ieee1394mapfile=/lib/modules/$KV/modules.ieee1394map"|"pnpbiosmapfile=/lib/modules/$KV/modules.pnpbiosmap"|"depfile=/lib/modules/$KV/modules.dep"|"persistdir=/var/lib/modules/persist")
+       ;;
+ 
+     # Ignore prune lines unless they end in .o or .ko, which would
diff --git a/sys-apps/module-init-tools/module-init-tools-3.1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.1.ebuild
new file mode 100644 (file)
index 0000000..cb6af89
--- /dev/null
@@ -0,0 +1,181 @@
+# Copyright 1999-2004 Gentoo Foundation
+# 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.1.ebuild,v 1.1 2004/11/22 10:10:08 robbat2 Exp $
+
+# This ebuild includes backwards compatability for stable 2.4 kernels
+
+inherit flag-o-matic eutils gnuconfig
+
+MYP="${P/_pre/-pre}"
+S="${WORKDIR}/${MYP}"
+MODUTILS_PV="2.4.27"
+DESCRIPTION="Kernel module tools for the development kernel >=2.5.48"
+HOMEPAGE="http://www.kernel.org/pub/linux/kernel/people/rusty/modules"
+SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
+       mirror://kernel/linux/kernel/people/rusty/modules/old/${MYP}.tar.bz2
+       !no-old-linux? ( mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.tar.bz2 )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="no-old-linux"
+
+DEPEND="virtual/libc
+       sys-libs/zlib
+       !virtual/modutils"
+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)
+       if ! use no-old-linux ; then
+               cd ${WORKDIR}/modutils-${MODUTILS_PV}
+               epatch ${FILESDIR}/modutils-2.4.22-no-above-below.patch
+       fi
+
+       # Support legacy .o modules
+       cd ${S}; epatch ${FILESDIR}/${PN}-0.9.15-legacy-modext-support.patch
+
+       # Fix bug 49926: This patch allows generate-modprobe.conf to
+       # accept the --assume-kernel=x.x.x option for generating livecds.
+       # This is a companion to a patch in baselayout-1.9.0 which allows
+       # the same flag to modules-update.
+       cd ${S}; epatch ${FILESDIR}/${PN}-3.1_generate-modprobe-assume-kernel.patch
+
+       cd ${S}
+       rm -f missing
+       export WANT_AUTOMAKE=1.6
+       automake --add-missing
+
+       cd ${S}
+       gnuconfig_update
+       if ! use no-old-linux ; then
+               cp config.{guess,sub} ${WORKDIR}/modutils-${MODUTILS_PV}/
+       fi
+}
+
+src_compile() {
+       filter-flags -fPIC
+
+       if ! use no-old-linux ; then
+               einfo "Building modutils..."
+               cd ${WORKDIR}/modutils-${MODUTILS_PV}
+               econf \
+                       --disable-strip \
+                       --prefix=/ \
+                       --enable-insmod-static \
+                       --disable-zlib \
+                       || die "econf failed"
+               local mymake=""
+               [ "${ARCH}" = "hppa" ] && mymake="ARCH=hppa"
+               emake ${mymake} || die "emake modutils failed"
+       fi
+
+       einfo "Building module-init-tools..."
+       cd ${S}
+       econf \
+               --prefix=/ \
+               --enable-zlib \
+               || die "econf failed"
+       emake || die "emake module-init-tools failed"
+}
+
+src_install() {
+       if ! use no-old-linux ; then
+               local mymake=""
+               [ "${ARCH}" = "hppa" ] && mymake="ARCH=hppa"
+               cd ${WORKDIR}/modutils-${MODUTILS_PV}
+               einstall prefix="${D}" ${mymake}
+
+               docinto modutils-${MODUTILS_PV}
+               dodoc 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 insmod.static 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
+               # Fix the ksyms links #35601
+               for f in ksyms kallsyms ; do
+                       dosym insmod.old /sbin/${f}
+                       dosym insmod.static.old /sbin/${f}.static
+               done
+       fi
+
+       cd ${S}
+       einstall prefix=${D}
+
+       # Install compat symlink
+       dosym ../bin/lsmod /sbin/lsmod
+       use no-old-linux || 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 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
+}