fix ksyms links #35601

7 files changed, 25 insertions, 376 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index 345d630a3071..8311fdcb7fa3 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,10 @@
 # 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.68 2004/10/02 15:36:16 swegener Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.69 2004/10/03 06:40:46 vapier Exp $
+
+  03 Oct 2004; Mike Frysinger <vapier@gentoo.org>
+  module-init-tools-3.0-r2.ebuild:
+  Fix the ksyms links #35601.
 
   02 Sep 2004; Mike Frysinger <vapier@gentoo.org>
   module-init-tools-3.0-r1.ebuild, module-init-tools-3.0-r2.ebuild,
diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest
index b79cc29677b2..8e400f6a6ab5 100644
--- a/sys-apps/module-init-tools/Manifest
+++ b/sys-apps/module-init-tools/Manifest
@@ -1,13 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 8eebfc58cb86a551ea8cba265ab14267 ChangeLog 13491
+MD5 5405ce61dcbe6feb1b365f2e030c5cdc ChangeLog 13605
 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164
-MD5 af2d546ff83fed54622d02878d9d0e26 module-init-tools-3.0-r1.ebuild 4692
-MD5 819b0094570fc7400ddc4dc3c06ed46b module-init-tools-3.0-r2.ebuild 4995
-MD5 f0f2eb7f73361774923f599307aa151f module-init-tools-3.0.ebuild 4668
-MD5 83210e779956a7d7b917a6fb8202dd4b files/digest-module-init-tools-3.0 142
-MD5 83210e779956a7d7b917a6fb8202dd4b files/digest-module-init-tools-3.0-r1 142
+MD5 cbcb04474eda7d3c27c48b869c5e65e5 module-init-tools-3.0-r2.ebuild 5110
 MD5 83210e779956a7d7b917a6fb8202dd4b 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
@@ -15,7 +11,7 @@ MD5 060ce311606657915548168939e965b4 files/modutils-2.4.22-no-above-below.patch
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.9.10 (GNU/Linux)
 
-iD8DBQFBXsr2I1lqEGTUzyQRAgfvAKCDoDEzwnIYHt99L4qLt+jbXysdmwCeKZof
-1avEI+FEJhNyvnz47cCidgs=
-=1Xve
+iD8DBQFBX574HTu7gpaalycRAk9uAJ97krl7/ekMbT1uUN7F0Hr6UPuJ0wCfVXjw
+uNHWfL3OmTsFSLLzSYTafsw=
+=t6nr
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.0
deleted file mode 100644
index 43cd7b6234e9..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f8bfc480c4168978eca7037cd341da07 module-init-tools-3.0.tar.bz2 120768
-MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.0-r1
deleted file mode 100644
index 43cd7b6234e9..000000000000
--- a/sys-apps/module-init-tools/files/digest-module-init-tools-3.0-r1
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 f8bfc480c4168978eca7037cd341da07 module-init-tools-3.0.tar.bz2 120768
-MD5 704c8d2834bcaa6f31d4ad79d154157a modutils-2.4.26.tar.bz2 235135
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild
deleted file mode 100644
index a1fde6a2e659..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.0-r1.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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.0-r1.ebuild,v 1.5 2004/09/02 13:27:04 vapier 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.26"
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc ~sparc ~alpha ~mips ~ia64 ~arm ~ppc64 ~hppa ~s390"
-IUSE=""
-
-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)
-	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
-	export WANT_AUTOMAKE=1.6
-	automake --add-missing
-}
-
-src_compile() {
-
-	# If running mips64, we need updated configure data
-	gnuconfig_update
-
-	local myconf=
-
-	filter-flags -fPIC
-
-	einfo "Building modutils..."
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-
-	econf \
-		--disable-strip \
-		--prefix=/ \
-		--enable-insmod-static \
-		--disable-zlib \
-		${myconf} || die "econf failed"
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		mymake="ARCH=hppa"
-	fi
-
-	emake ${mymake} || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		${myconf} || die "econf failed"
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		mymake="ARCH=hppa"
-	fi
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}" ${mymake}
-
-	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 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
-
-	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
-}
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 98cb3bb308de..239ef91f250b 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-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.0-r2.ebuild,v 1.8 2004/09/02 13:27:04 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/module-init-tools-3.0-r2.ebuild,v 1.9 2004/10/03 06:40:46 vapier Exp $
 
 # This ebuild includes backwards compatability for stable 2.4 kernels
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://kernel/linux/kernel/people/rusty/modules/${MYP}.tar.bz2
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="x86 ppc sparc mips alpha arm hppa amd64 ia64 ppc64 s390"
+KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sparc x86"
 IUSE=""
 
 DEPEND="virtual/libc
@@ -59,49 +59,43 @@ src_unpack() {
 }
 
 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} || die "econf failed"
-
+		|| die "econf failed"
+	local mymake=""
 	if [ "${ARCH}" = "hppa" ]
 	then
 		mymake="ARCH=hppa"
 	fi
-
 	emake ${mymake} || die "emake modutils failed"
+
 	einfo "Building module-init-tools..."
 	cd ${S}
-
 	econf \
 		--prefix=/ \
 		--enable-zlib \
-		${myconf} || die "econf failed"
-
+		|| die "econf failed"
 	emake || die "emake module-init-tools failed"
 }
 
-src_install () {
-
+src_install() {
+	local mymake=""
 	if [ "${ARCH}" = "hppa" ]
 	then
 		mymake="ARCH=hppa"
 	fi
-
 	cd ${WORKDIR}/modutils-${MODUTILS_PV}
 	einstall prefix="${D}" ${mymake}
 
 	docinto modutils-${MODUTILS_PV}
-	dodoc COPYING CREDITS ChangeLog NEWS README TODO
+	dodoc CREDITS ChangeLog NEWS README TODO
 
 	cd ${S}
 	# This copies the old version of modutils to *.old so it still works
@@ -131,6 +125,11 @@ src_install () {
 	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
 
 	einstall prefix=${D}
 
@@ -158,7 +157,7 @@ src_install () {
 
 	doman *.[1-8]
 	docinto /
-	dodoc AUTHORS COPYING ChangeLog INSTALL NEWS README TODO
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
 }
 
 pkg_postinst() {
diff --git a/sys-apps/module-init-tools/module-init-tools-3.0.ebuild b/sys-apps/module-init-tools/module-init-tools-3.0.ebuild
deleted file mode 100644
index a1e52d230159..000000000000
--- a/sys-apps/module-init-tools/module-init-tools-3.0.ebuild
+++ /dev/null
@@ -1,173 +0,0 @@
-# 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.0.ebuild,v 1.12 2004/09/02 13:27:04 vapier 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.26"
-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"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="x86 amd64 ppc sparc ~alpha mips ~ia64 arm ppc64 hppa s390"
-IUSE=""
-
-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)
-	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
-	export WANT_AUTOMAKE=1.6
-	automake --add-missing
-}
-
-src_compile() {
-
-	# If running mips64, we need updated configure data
-	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} || die "econf failed"
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		mymake="ARCH=hppa"
-	fi
-
-	emake ${mymake} || die "emake modutils failed"
-	einfo "Building module-init-tools..."
-	cd ${S}
-
-	econf \
-		--prefix=/ \
-		--enable-zlib \
-		${myconf} || die "econf failed"
-
-	emake || die "emake module-init-tools failed"
-}
-
-src_install () {
-
-	if [ "${ARCH}" = "hppa" ]
-	then
-		mymake="ARCH=hppa"
-	fi
-
-	cd ${WORKDIR}/modutils-${MODUTILS_PV}
-	einstall prefix="${D}" ${mymake}
-
-	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
-}