From: Stefan Schweizer Date: Tue, 6 Mar 2007 18:03:52 +0000 (+0000) Subject: Do not use linux-headers incorrectly, thanks to Sheldon Hearn in bug 169610 Package-Manager: portage-2.1.2-r12 --- diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog index 702431cffbf3..18be87bbd51c 100644 --- a/sys-apps/kexec-tools/ChangeLog +++ b/sys-apps/kexec-tools/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-apps/kexec-tools -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.12 2006/11/05 10:30:05 blubb Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.13 2007/03/06 18:03:52 genstef Exp $ + + 06 Mar 2007; +files/kexec-linux-headers.patch, + -kexec-tools-1.101.ebuild, kexec-tools-1.101-r3.ebuild: + Do not use linux-headers incorrectly, thanks to Sheldon Hearn + in bug 169610 05 Nov 2006; kexec-tools-1.101-r3.ebuild: stable on amd64 diff --git a/sys-apps/kexec-tools/files/digest-kexec-tools-1.101 b/sys-apps/kexec-tools/files/digest-kexec-tools-1.101 deleted file mode 100644 index 149cf7fed2ca..000000000000 --- a/sys-apps/kexec-tools/files/digest-kexec-tools-1.101 +++ /dev/null @@ -1,3 +0,0 @@ -MD5 b4f7ffcc294d41a6a4c40d6e44b7734d kexec-tools-1.101.tar.gz 206785 -RMD160 2c6cb949f1f9ac2871a5616d890edbe0bc43768a kexec-tools-1.101.tar.gz 206785 -SHA256 280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38 kexec-tools-1.101.tar.gz 206785 diff --git a/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r3 b/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r3 index 58ea05500edf..80408fd5a799 100644 --- a/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r3 +++ b/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r3 @@ -1,6 +1,6 @@ -MD5 00f62d42ec4ee7e738a3ed6d1e80687e kexec-tools-1.101-kdump7.patch 187536 -RMD160 0f333311d606f7613497242fdcd0ffc65a582ff5 kexec-tools-1.101-kdump7.patch 187536 -SHA256 da1101b92101f349d011e8c832d426f91521a5747f0de375a5dc33201dcb2f15 kexec-tools-1.101-kdump7.patch 187536 +MD5 eb7cd98db3c94914ca51f8b42dcd8e4b kexec-tools-1.101-kdump10.patch 246975 +RMD160 67a94b54c848a2c85bfd0801766f02d76c44bba7 kexec-tools-1.101-kdump10.patch 246975 +SHA256 6ca5dd055d1714bb6c2e7aad44c84171673573d95ca832f06f37eaa39d926863 kexec-tools-1.101-kdump10.patch 246975 MD5 b4f7ffcc294d41a6a4c40d6e44b7734d kexec-tools-1.101.tar.gz 206785 RMD160 2c6cb949f1f9ac2871a5616d890edbe0bc43768a kexec-tools-1.101.tar.gz 206785 SHA256 280b34fefa12c3d7a3e432c3730fe5d0d56e8d169c28b695cce9ba6d8dbe6e38 kexec-tools-1.101.tar.gz 206785 diff --git a/sys-apps/kexec-tools/files/kexec-linux-headers.patch b/sys-apps/kexec-tools/files/kexec-linux-headers.patch new file mode 100644 index 000000000000..ad865f7a6aae --- /dev/null +++ b/sys-apps/kexec-tools/files/kexec-linux-headers.patch @@ -0,0 +1,11 @@ +--- kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c.orig 2007-03-06 18:30:40.000000000 +0100 ++++ kexec-tools-1.101/kexec/arch/i386/kexec-multiboot-x86.c 2007-03-06 18:28:51.000000000 +0100 +@@ -47,7 +47,7 @@ + #include + #include + #include +-#include ++#include + #include + #include "../../kexec.h" + #include "../../kexec-elf.h" diff --git a/sys-apps/kexec-tools/kexec-tools-1.101-r3.ebuild b/sys-apps/kexec-tools/kexec-tools-1.101-r3.ebuild index f0819ecfde86..ca5e42b874f3 100644 --- a/sys-apps/kexec-tools/kexec-tools-1.101-r3.ebuild +++ b/sys-apps/kexec-tools/kexec-tools-1.101-r3.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2006 Gentoo Foundation +# Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-1.101-r3.ebuild,v 1.3 2006/11/05 10:30:05 blubb Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-1.101-r3.ebuild,v 1.4 2007/03/06 18:03:52 genstef Exp $ inherit eutils DESCRIPTION="Load another kernel from the currently executing Linux kernel" HOMEPAGE="http://www.xmission.com/~ebiederm/files/kexec/" SRC_URI="http://www.xmission.com/~ebiederm/files/kexec/${P}.tar.gz - http://lse.sourceforge.net/kdump/patches/1.101-kdump7/kexec-tools-1.101-kdump7.patch" + http://lse.sourceforge.net/kdump/patches/1.101-kdump10/kexec-tools-1.101-kdump10.patch" LICENSE="GPL-2" SLOT="0" @@ -18,9 +18,10 @@ DEPEND="zlib? ( sys-libs/zlib )" src_unpack() { unpack ${A} cd "${S}" - epatch "${DISTDIR}"/kexec-tools-1.101-kdump7.patch + epatch "${DISTDIR}"/kexec-tools-1.101-kdump10.patch epatch "${FILESDIR}"/${P}-LDFLAGS.patch epatch "${FILESDIR}"/${P}-ppc64.patch + epatch "${FILESDIR}"/kexec-linux-headers.patch } src_compile() { @@ -29,7 +30,7 @@ src_compile() { } src_install() { - make DESTDIR="${D}" install || die "make install failed" + emake DESTDIR="${D}" install || die "emake install failed" doman kexec/kexec.8 dodoc News AUTHORS TODO diff --git a/sys-apps/kexec-tools/kexec-tools-1.101.ebuild b/sys-apps/kexec-tools/kexec-tools-1.101.ebuild deleted file mode 100644 index e49e4b123323..000000000000 --- a/sys-apps/kexec-tools/kexec-tools-1.101.ebuild +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright 1999-2005 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/kexec-tools-1.101.ebuild,v 1.3 2005/12/01 08:13:23 vapier Exp $ - -DESCRIPTION="Load another kernel from the currently executing Linux kernel" -HOMEPAGE="http://www.xmission.com/~ebiederm/files/kexec/" -SRC_URI="http://www.xmission.com/~ebiederm/files/kexec/${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 x86" -IUSE="" - -src_install() { - into / - dosbin objdir*/build/sbin/kexec || die "dosbin failed" - doman kexec/kexec.8 - dodoc News AUTHORS TODO - - newinitd ${FILESDIR}/kexec.init kexec - newconfd ${FILESDIR}/kexec.conf kexec -}