Add back in support for USE=no-old-linux with newer modules-update script #66504.

(Portage version: 2.1_pre10-r2)

3 files changed, 168 insertions, 1 deletions

diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog
index b81112564580..2bd9be7fe21d 100644
--- a/sys-apps/module-init-tools/ChangeLog
+++ b/sys-apps/module-init-tools/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/module-init-tools
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.103 2006/04/27 22:37:20 antarus Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.104 2006/05/04 02:25:23 vapier Exp $
+
+*module-init-tools-3.2.2-r1 (04 May 2006)
+
+  04 May 2006; Mike Frysinger <vapier@gentoo.org>
+  +module-init-tools-3.2.2-r1.ebuild:
+  Add back in support for USE=no-old-linux with newer modules-update script
+  #66504.
 
   27 Apr 2006; Alec Warner <antarus@gentoo.org>
   files/digest-module-init-tools-3.0-r2,
diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.2.2-r1 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.2.2-r1
new file mode 100644
index 000000000000..9feb51ae55ac
--- /dev/null
+++ b/sys-apps/module-init-tools/files/digest-module-init-tools-3.2.2-r1
@@ -0,0 +1,6 @@
+MD5 a1ad0a09d3231673f70d631f3f5040e9 module-init-tools-3.2.2.tar.bz2 169182
+RMD160 42abfe10709315180898106e3c7c1ce916e01166 module-init-tools-3.2.2.tar.bz2 169182
+SHA256 c080f7e42e60456eab33051026da388b5d21a360e9d2bee26ce9991427a758aa module-init-tools-3.2.2.tar.bz2 169182
+MD5 bac989c74ed10f3bf86177fc5b4b89b6 modutils-2.4.27.tar.bz2 234963
+RMD160 3179d364106859cf6dbd1fad82d8356337634735 modutils-2.4.27.tar.bz2 234963
+SHA256 ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0 modutils-2.4.27.tar.bz2 234963
diff --git a/sys-apps/module-init-tools/module-init-tools-3.2.2-r1.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2.2-r1.ebuild
new file mode 100644
index 000000000000..8e1bb890d5d1
--- /dev/null
+++ b/sys-apps/module-init-tools/module-init-tools-3.2.2-r1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2006 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.2.2-r1.ebuild,v 1.1 2006/05/04 02:25:23 vapier Exp $
+
+inherit flag-o-matic eutils toolchain-funcs fixheadtails
+
+MODUTILS_PV="2.4.27"
+
+MY_P="${P/_pre/-pre}"
+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/${MY_P}.tar.bz2
+	mirror://kernel/linux/kernel/people/rusty/modules/old/${MY_P}.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 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+IUSE="no-old-linux"
+# The test code runs `make clean && configure` and screws up src_compile()
+RESTRICT="test"
+
+DEPEND="sys-libs/zlib
+	>=sys-apps/baselayout-1.12.0_pre19
+	!virtual/modutils"
+PROVIDE="virtual/modutils"
+
+S=${WORKDIR}/${MY_P}
+
+src_unpack() {
+	unpack ${A}
+
+	# Patches for old modutils
+	if ! use no-old-linux ; then
+		cd "${WORKDIR}"/modutils-${MODUTILS_PV}
+		epatch "${FILESDIR}"/modutils-2.4.27-alias.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-gcc.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-flex.patch
+		epatch "${FILESDIR}"/modutils-2.4.27-no-nested-function.patch
+	fi
+
+	# Fixes for new module-init-tools
+	cd "${S}"
+	ht_fix_file tests/test-depmod/10badcommand.sh
+	# Test fails due since it needs to write to /lib/modules so disable it
+	rm -f tests/test-depmod/01backcompat.sh
+
+	# 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.
+	epatch "${FILESDIR}"/${PN}-3.1_generate-modprobe-assume-kernel.patch
+
+	# Abort if we fail to run modprobe, bug #68689
+	epatch "${FILESDIR}"/${PN}-3.2_pre7-abort-on-modprobe-failure.patch
+
+	# make sure we don't try to regen the manpages
+	touch *.5
+
+	rm -f missing
+	automake --add-missing || die
+}
+
+src_compile() {
+	# Configure script uses BUILDCFLAGS for cross-compiles but this
+	# defaults to CFLAGS which can be bad mojo
+	export BUILDCFLAGS=-pipe
+	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"
+		emake || die "emake modutils failed"
+
+		einfo "Building module-init-tools ..."
+		cd "${S}"
+	fi
+
+	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"
+}
+
+modutils_src_install() {
+	cd "${WORKDIR}"/modutils-${MODUTILS_PV}
+	einstall prefix="${D}" || die
+	docinto modutils-${MODUTILS_PV}
+	dodoc CREDITS ChangeLog NEWS README TODO
+
+	# remove man pages provided by the man-pages package now #124127
+	rm -r "${D}"/usr/share/man/man2
+
+	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 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
+}
+
+src_install() {
+	use no-old-linux || modutils_src_install
+
+	cd "${S}"
+	make install DESTDIR="${D}" || die
+	dosym modprobe.conf.5 /usr/share/man/man5/modprobe.d.5
+
+	# 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 || die
+
+	doman *.[1-8]
+	docinto /
+	dodoc AUTHORS ChangeLog INSTALL NEWS README TODO
+}