From: Mike Frysinger Date: Fri, 13 Apr 2007 18:28:43 +0000 (+0000) Subject: Push out incremental updates to update-modules files. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=43ae70e576c448ef2cf38dcd5001dea5c8f2e3ba;p=gentoo.git Push out incremental updates to update-modules files. Package-Manager: portage-2.1.2.3 --- diff --git a/sys-apps/module-init-tools/ChangeLog b/sys-apps/module-init-tools/ChangeLog index b4b318fb87b4..ba77bceb721e 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 1999-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.126 2007/04/07 09:56:25 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/module-init-tools/ChangeLog,v 1.127 2007/04/13 18:28:43 vapier Exp $ + +*module-init-tools-3.2.2-r3 (13 Apr 2007) + + 13 Apr 2007; Mike Frysinger + +module-init-tools-3.2.2-r3.ebuild: + Push out incremental updates to update-modules files. 07 Apr 2007; Mike Frysinger -files/modules-update, +files/update-modules, +files/update-modules.8, diff --git a/sys-apps/module-init-tools/Manifest b/sys-apps/module-init-tools/Manifest index 1f0d98bf0bbd..d92de1a3ca76 100644 --- a/sys-apps/module-init-tools/Manifest +++ b/sys-apps/module-init-tools/Manifest @@ -47,25 +47,25 @@ RMD160 6d82ea356c1751ad46cf1c30e0fe237e7a4f50f2 files/update-modules.8 3210 SHA256 4e352ee28ecaf79fac2a0216b8b4b52ced864cd258752f33213d1ac8f4a5849c files/update-modules.8 3210 DIST module-init-tools-3.2.2.tar.bz2 169182 RMD160 42abfe10709315180898106e3c7c1ce916e01166 SHA1 b51e8ac170be23a1f2e301a1dddd47a47ec2186a SHA256 c080f7e42e60456eab33051026da388b5d21a360e9d2bee26ce9991427a758aa DIST modutils-2.4.27.tar.bz2 234963 RMD160 3179d364106859cf6dbd1fad82d8356337634735 SHA1 fa268b48d98e0efab349d45fa7fb2372d58320c1 SHA256 ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0 -EBUILD module-init-tools-3.2.2-r2.ebuild 5321 RMD160 ae7f5a7a6db385cbf3cb70f85bf2c2ee8b98df74 SHA1 ed0507b828861929fccf40b18897d3b1f023db98 SHA256 f4bbe769df7424305d46eb67dea135049f50de0d9a34486f967e9bfb3ef3bb87 -MD5 ef2015c8a7d76941190e86749e946ad0 module-init-tools-3.2.2-r2.ebuild 5321 -RMD160 ae7f5a7a6db385cbf3cb70f85bf2c2ee8b98df74 module-init-tools-3.2.2-r2.ebuild 5321 -SHA256 f4bbe769df7424305d46eb67dea135049f50de0d9a34486f967e9bfb3ef3bb87 module-init-tools-3.2.2-r2.ebuild 5321 -MISC ChangeLog 22624 RMD160 59a7bbe3ea238bc0155f54be8f233e4eb1a2de11 SHA1 eb93008a8a1caea84cf50ff177346ba8c9e07b66 SHA256 7a78d9afc2ba8775982f1526c7f6f78da11faacf81abffc04dfbfafc27c9fd72 -MD5 36b37fa8ad91257e0ac8e1820c00cee3 ChangeLog 22624 -RMD160 59a7bbe3ea238bc0155f54be8f233e4eb1a2de11 ChangeLog 22624 -SHA256 7a78d9afc2ba8775982f1526c7f6f78da11faacf81abffc04dfbfafc27c9fd72 ChangeLog 22624 +EBUILD module-init-tools-3.2.2-r3.ebuild 5320 RMD160 24ca7f4e06b1f53190c0ec742ad4b7c0a00ceae2 SHA1 17c6a5d2ddb00cae6772507897c59f070d9fc012 SHA256 de996ba3371d6191f4160ad9e7562303fa4a81c5fdf304680927f37bcb38fd49 +MD5 e083857c6fd4f4c7a2777e4f4f66aca3 module-init-tools-3.2.2-r3.ebuild 5320 +RMD160 24ca7f4e06b1f53190c0ec742ad4b7c0a00ceae2 module-init-tools-3.2.2-r3.ebuild 5320 +SHA256 de996ba3371d6191f4160ad9e7562303fa4a81c5fdf304680927f37bcb38fd49 module-init-tools-3.2.2-r3.ebuild 5320 +MISC ChangeLog 22812 RMD160 8782948e25ab40bd5bc1b10db36bce017c00b7d6 SHA1 8e1e8d4b03b948eb24e66c74d31bf9a5085b4e1c SHA256 32756948df49e2d8d651351e550e7eb93618cbb70efe251902c8c20e744cb5bb +MD5 381b34bc33afa84333f5acbbba831783 ChangeLog 22812 +RMD160 8782948e25ab40bd5bc1b10db36bce017c00b7d6 ChangeLog 22812 +SHA256 32756948df49e2d8d651351e550e7eb93618cbb70efe251902c8c20e744cb5bb ChangeLog 22812 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 metadata.xml 164 -MD5 de56fee3dadb3285694b097dfa7848a0 files/digest-module-init-tools-3.2.2-r2 524 -RMD160 dfc478dc854fdd48bb3526ef421d560becb4a37e files/digest-module-init-tools-3.2.2-r2 524 -SHA256 a0137b244c6cab76e8a2cb31e651484992231b823af1d8d4fc2e1a5db10fe5f6 files/digest-module-init-tools-3.2.2-r2 524 +MD5 de56fee3dadb3285694b097dfa7848a0 files/digest-module-init-tools-3.2.2-r3 524 +RMD160 dfc478dc854fdd48bb3526ef421d560becb4a37e files/digest-module-init-tools-3.2.2-r3 524 +SHA256 a0137b244c6cab76e8a2cb31e651484992231b823af1d8d4fc2e1a5db10fe5f6 files/digest-module-init-tools-3.2.2-r3 524 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.3 (GNU/Linux) -iD8DBQFGF2rh8bi6rjpTunYRAhbcAKC9ZOQTX9EtViJIUygrD2Lolz+dMQCgrNxE -DusdOj0J8gnKezPf/hOma/4= -=QH4J +iD8DBQFGH8wP8bi6rjpTunYRAsvYAJ4giAVPA5vUw+Fvr0Md0QHnTuNfHACg0IvF +lB3CCR2X0umekrx9eNIsiMA= +=k0FR -----END PGP SIGNATURE----- diff --git a/sys-apps/module-init-tools/files/digest-module-init-tools-3.2.2-r3 b/sys-apps/module-init-tools/files/digest-module-init-tools-3.2.2-r3 new file mode 100644 index 000000000000..9feb51ae55ac --- /dev/null +++ b/sys-apps/module-init-tools/files/digest-module-init-tools-3.2.2-r3 @@ -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-r3.ebuild b/sys-apps/module-init-tools/module-init-tools-3.2.2-r3.ebuild new file mode 100644 index 000000000000..8313604ca84a --- /dev/null +++ b/sys-apps/module-init-tools/module-init-tools-3.2.2-r3.ebuild @@ -0,0 +1,166 @@ +# Copyright 1999-2007 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-r3.ebuild,v 1.1 2007/04/13 18:28:43 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 2.6 kernel" +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.7-r2 + !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 + epatch "${FILESDIR}"/modutils-2.4.27-hppa.patch + epatch "${FILESDIR}"/modutils-2.4.27-build.patch #154281 + 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 + + epatch "${FILESDIR}"/${PN}-3.2.2-handle-dupliate-aliases.patch #149426 + + # make sure we link dynamically with zlib; our zlib.so is in /lib vs + # /usr/lib so it's safe to link with. fixes ugly textrels as well. + sed -i \ + -e 's:-Wl,-Bstatic -lz -Wl,-Bdynamic:-lz:' \ + configure || die + + # make sure we don't try to regen the manpages + touch *.5 +} + +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" + emake || 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}" + emake 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 "${FILESDIR}"/update-modules || die + dosym update-modules /sbin/modules-update + doman "${FILESDIR}"/update-modules.8 + + doman *.[1-8] + docinto / + dodoc AUTHORS ChangeLog INSTALL NEWS README TODO +} + +pkg_postinst() { + # cheat to keep users happy + if [[ -e ${ROOT}/etc/init.d/modules ]] ; then + sed -i 's:modules-update:update-modules:' /etc/init.d/modules + fi +}