- Our zlib.so is in /lib vs /usr/lib so it should be safe for us to link with just -lz - By not linking with -Wl,-Bstatic -lz -Wl,-Bsynamic we save a few on the final linked elf executable binary sizes. This also fixes text relocations that were showing up in this package.

(Portage version: 2.0.51.19)

5 files changed, 216 insertions, 21 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index dfd8456ceced..0c93e972d742 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-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.77 2005/02/18 20:03:14 chainsaw Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.78 2005/03/20 23:00:12 solar Exp $
+
+*module-init-tools-3.1-r1 (20 Mar 2005)
+
+  20 Mar 2005; <solar@gentoo.org> module-init-tools-3.0-r2.ebuild,
+  +module-init-tools-3.1-r1.ebuild:
+  - Our zlib.so is in /lib vs /usr/lib so it should be safe for us to link with
+  just -lz - By not linking with -Wl,-Bstatic -lz -Wl,-Bsynamic we save a few
+  bytes on the final linked elf executable binary sizes. This also fixes text
+  relocations that were showing up in this package.
 
   18 Feb 2005; Tony Vroon <chainsaw@gentoo.org>
   +files/modutils-2.4.27-gcc4.patch, module-init-tools-3.1.ebuild:
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index c9921cffc7ea..7fe950e97e64 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,24 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 9aa2d9dc0c5d86a58788e346acca57d9 module-init-tools-3.0-r2.ebuild 5489
+MD5 327c04af529335985a75aec3040299fb module-init-tools-3.1-r1.ebuild 5858
 MD5 187b1843b513986bf51359562552db9f module-init-tools-3.1.ebuild 5711
+MD5 86fb436de850345dbe22de06aca4debc ChangeLog 15438
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 e527e3debd30abf012b019aa7e8a1a56 ChangeLog 15005
-MD5 d5504b6d6ed1ef697275b3a48a1e49e7 files/modutils-2.4.27-gcc34.patch 231
-MD5 97fd0899fb54b236e35bdd1bd5fae336 files/modutils-2.4.27-PATH_MAX.patch 309
-MD5 813f2779e10e8f29d9e1d58dda93a5e3 files/digest-module-init-tools-3.1 142
-MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch 382
+MD5 cf8437ed8a562d52f6af36f791949b96 module-init-tools-3.0-r2.ebuild 5469
 MD5 d179298a960a2576683689fe19818c8b files/generate-modprobe-assume-kernel.patch 3767
+MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch 382
 MD5 2da5de5fa7c26cdef6a84788452653e6 files/modutils-2.4.27-gcc4.patch 6052
-MD5 07aa415fd57ac42cd0c11527edc9782d files/module-init-tools-0.9.15-legacy-modext-support.patch 481
-MD5 469d7fc1f915c60585afc8d895b1668a files/digest-module-init-tools-3.0-r2 142
+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 34f20e2837caff74cef9cca766e1e0c4 files/3.1-modprobe.d.5.bz2 2288
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.0-ecc0.1.6 (GNU/Linux)
-
-iD8DBQFCFkqBp5vW4rUFj5oRApQaAJ90wJrvdmJNORz8kr3wuTM/RcqxGgCcCnOn
-j5+0FhubkkPP68QPaV5Yefw=
-=QrMy
------END PGP SIGNATURE-----
+MD5 469d7fc1f915c60585afc8d895b1668a files/digest-module-init-tools-3.0-r2 142
+MD5 813f2779e10e8f29d9e1d58dda93a5e3 files/digest-module-init-tools-3.1-r1 142
+MD5 97fd0899fb54b236e35bdd1bd5fae336 files/modutils-2.4.27-PATH_MAX.patch 309
+MD5 d5504b6d6ed1ef697275b3a48a1e49e7 files/modutils-2.4.27-gcc34.patch 231
+MD5 07aa415fd57ac42cd0c11527edc9782d files/module-init-tools-0.9.15-legacy-modext-support.patch 481
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.1-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.1-r1
new file mode 100644
index 000000000000..b5aeb806ca12
--- /dev/null
+++ b/sys-apps/module-init-tools/files/digest-module-init-tools-3.1-r1
@@ -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/module-init-tools-3.0-r2.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
index c94ebb8feb45..a029c4b272c8 100644
--- a/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
+++ b/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 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.0-r2.ebuild,v 1.13 2005/01/12 14:31:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild,v 1.14 2005/03/20 23:00:12 solar Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 
@@ -66,7 +66,6 @@ src_unpack() {
 }
 
 src_compile() {
-	filter-flags -fPIC
 
 #	if ! use no-old-linux ; then
 		einfo "Building modutils..."
diff --git a/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild
new file mode 100644
index 000000000000..ce30b160e00e
--- /dev/null
+++ b/sys-apps/module-init-tools/module-init-tools-3.1-r1.ebuild
@@ -0,0 +1,193 @@
+# Copyright 1999-2005 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-r1.ebuild,v 1.1 2005/03/20 23:00:12 solar Exp $
+
+inherit flag-o-matic eutils gnuconfig toolchain-funcs
+
+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
+	mirror://kernel/linux/utils/kernel/modutils/v2.4/modutils-${MODUTILS_PV}.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=""
+#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
+		epatch ${FILESDIR}/modutils-2.4.27-PATH_MAX.patch
+		epatch ${FILESDIR}/modutils-2.4.27-gcc34.patch
+		epatch ${FILESDIR}/modutils-2.4.27-gcc4.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}
+	# make sure we don't try to regen the manpages
+	cp ${FILESDIR}/${PV}-modprobe.d.5.bz2 modprobe.d.5.bz2
+	bunzip2 modprobe.d.5.bz2
+	touch *.5
+
+	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() {
+	export BUILDCC="$(tc-getBUILD_CC)"
+
+#	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"
+
+	# Our zlib.so is in /lib vs /usr/lib so it's safe to link with.
+	# this also fixes text relocations that were showing up in this pkg
+	emake LDADD="-lz" || 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
+}