From: Mike Frysinger Date: Wed, 6 Oct 2004 00:15:33 +0000 (+0000) Subject: look for /boot/vmlinuz instead of /vmlinuz #63080 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8557e4b4801e9ddd14960de2f500f4dcf0f32c5e;p=gentoo.git look for /boot/vmlinuz instead of /vmlinuz #63080 --- diff --git a/sys-apps/debianutils/Manifest b/sys-apps/debianutils/Manifest index 4c0d38129f98..d84d00b2f64a 100644 --- a/sys-apps/debianutils/Manifest +++ b/sys-apps/debianutils/Manifest @@ -2,16 +2,16 @@ Hash: SHA1 MD5 6bb319db9fdf7098486ca2d5ab78494e ChangeLog 6309 -MD5 53d18d0342eaea1943704acbf6d945cb debianutils-1.16.7-r4.ebuild 1461 +MD5 2083afe5b8c10f2452906351965c3969 debianutils-1.16.7-r4.ebuild 1488 MD5 9a09f8d531c582e78977dbfd96edc1f2 metadata.xml 164 MD5 a497960da56a8ef8cb07158e15407c18 files/debianutils-1.16.7-gcc33.patch 2588 -MD5 233aa843e605b70a65b0b7f0dee0cbab files/debianutils-1.16.7-gentoo.patch 2964 +MD5 61f8a46fc4a88304676eb068580fe842 files/debianutils-1.16.7-gentoo.patch 3274 MD5 3f67e66ea1d7aa13843f253310322f51 files/debianutils-compress.patch 743 MD5 f668f7cf3760bd5f131cec5de5602523 files/digest-debianutils-1.16.7-r4 69 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.9.10 (GNU/Linux) -iD8DBQFBYzcMHTu7gpaalycRAiKgAKCUMf9LApnnxNijN+sPMdlZuqdNLACfbb7O -tlhA3AmRLwJoOohECln4O+A= -=kpRC +iD8DBQFBYzkrHTu7gpaalycRAgUrAKD5oEEAndyGKs84Kb9p6kSU8th5mACg6zaV +men8sOytrcdub1iI4xG1kS0= +=G0fp -----END PGP SIGNATURE----- diff --git a/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild b/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild index a146d0194bbe..74e0763c37b8 100644 --- a/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild +++ b/sys-apps/debianutils/debianutils-1.16.7-r4.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/debianutils/debianutils-1.16.7-r4.ebuild,v 1.12 2004/09/16 02:19:55 pvdabeel Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/debianutils/debianutils-1.16.7-r4.ebuild,v 1.13 2004/10/06 00:15:33 vapier Exp $ inherit eutils @@ -53,15 +53,15 @@ src_install() { insopts -m755 exeinto /usr/sbin doexe savelog - dosbin installkernel + dosbin installkernel || die "installkernel" into /usr - dosbin mkboot + dosbin mkboot || die "mkboot" into /usr doman mktemp.1 tempfile.1 run-parts.8 savelog.8 \ installkernel.8 mkboot.8 cd debian - dodoc changelog control copyright + dodoc changelog control fi } diff --git a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch index 2962fa2d8ed5..a003edfe201e 100644 --- a/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch +++ b/sys-apps/debianutils/files/debianutils-1.16.7-gentoo.patch @@ -38,6 +38,15 @@ diff -urN debianutils-1.16.7.old/installkernel debianutils-1.16.7/installkernel } # check whether LILO is installed +@@ -90,7 +90,7 @@ + + # make a boot disk + makedisk () { +- kernel=${1:-/vmlinuz} ++ kernel=${1:-/boot/vmlinuz} + if [ ! -r $kernel ] ; then + echo "Error: Can't read $kernel." + exit 1 @@ -96,7 +102,7 @@ fi @@ -93,3 +102,5 @@ diff -urN debianutils-1.16.7.old/installkernel debianutils-1.16.7/installkernel } +--- /usr/sbin/mkboot.orig 2004-10-05 20:12:50.198385480 -0400 ++++ /usr/sbin/mkboot 2004-10-05 20:13:29.477414160 -0400