From dfd65997479f766819d033655bbeecfcd224f7ea Mon Sep 17 00:00:00 2001 From: Stefan Schweizer Date: Sat, 4 Mar 2006 20:16:03 +0000 Subject: version bump, add kdump patches from fastboot mailing list, use make install, sanitize init script thanks to David Danier in bug 124966 Package-Manager: portage-2.1_pre4-r1 --- sys-apps/kexec-tools/ChangeLog | 10 +++++- sys-apps/kexec-tools/Manifest | 28 +++++++--------- .../kexec-tools/files/digest-kexec-tools-1.101-r2 | 6 ++++ sys-apps/kexec-tools/files/kexec.init | 12 +++---- sys-apps/kexec-tools/kexec-tools-1.101-r2.ebuild | 39 ++++++++++++++++++++++ 5 files changed, 72 insertions(+), 23 deletions(-) create mode 100644 sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r2 create mode 100644 sys-apps/kexec-tools/kexec-tools-1.101-r2.ebuild (limited to 'sys-apps/kexec-tools') diff --git a/sys-apps/kexec-tools/ChangeLog b/sys-apps/kexec-tools/ChangeLog index 1c86e6dc9498..8e1449b5272f 100644 --- a/sys-apps/kexec-tools/ChangeLog +++ b/sys-apps/kexec-tools/ChangeLog @@ -1,6 +1,14 @@ # 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.7 2006/02/25 07:52:23 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/ChangeLog,v 1.8 2006/03/04 20:16:02 genstef Exp $ + +*kexec-tools-1.101-r2 (04 Mar 2006) + + 04 Mar 2006; Stefan Schweizer files/kexec.init, + +kexec-tools-1.101-r2.ebuild: + version bump, add kdump patches from fastboot mailing list, use make + install, sanitize init script thanks to David Danier in bug + 124966 25 Feb 2006; Mike Frysinger +files/kexec-tools-1.101-ppc64.patch, kexec-tools-1.101-r1.ebuild: diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest index 11114377d0b5..4ae39af24ffe 100644 --- a/sys-apps/kexec-tools/Manifest +++ b/sys-apps/kexec-tools/Manifest @@ -1,9 +1,6 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -MD5 de811f0d2ddcf5d1b6cb65b3fd8dcb23 ChangeLog 1790 -RMD160 ffdc13f135a95e5f07b6f2984b2cfeb9fbe9ab87 ChangeLog 1790 -SHA256 9afe18405298e878b4569fc8ef6dd2bb3d7f71b70c824922c1b89d35c5f1c148 ChangeLog 1790 +MD5 fb19bf83a55a1752e034ae176d6bb621 ChangeLog 2089 +RMD160 dafc53e27e4f4e8c79efd7bbe3cd4ceceb9efd7b ChangeLog 2089 +SHA256 17918109bc9d74ed2b828f50c5fe8052c7158948d34bcd929426592232c88c97 ChangeLog 2089 MD5 3346c0b5fcc5f5974c6edb1a43acec3e files/digest-kexec-tools-1.100-r1 69 RMD160 6326a608159ea456b61b75608861780468223112 files/digest-kexec-tools-1.100-r1 69 SHA256 6ab79427cb76ce30305a1340a22c9d0be2020f2bffdbca0e4a2a33c18a078377 files/digest-kexec-tools-1.100-r1 69 @@ -13,6 +10,9 @@ SHA256 06f8aa9da2146c6dceda65ba43d06ff3b2d10075f8fdfcbf19c5a54aca5775e5 files/di MD5 66fbf8cb76d68e3bc10effd7fec63974 files/digest-kexec-tools-1.101-r1 69 RMD160 ee4dc52fb7a55ff6830b5a18ad436b762ea87059 files/digest-kexec-tools-1.101-r1 69 SHA256 06f8aa9da2146c6dceda65ba43d06ff3b2d10075f8fdfcbf19c5a54aca5775e5 files/digest-kexec-tools-1.101-r1 69 +MD5 9bb6706221e952f27222dba65edce106 files/digest-kexec-tools-1.101-r2 524 +RMD160 c0338b3b272d88333520e40ba82ce6106c87b8f2 files/digest-kexec-tools-1.101-r2 524 +SHA256 04082cd3388f72eb41e4cff5c357702e468db0daef708cef566ad94891e07bcc files/digest-kexec-tools-1.101-r2 524 MD5 df309b1ada2cd833888ea0227e414c8a files/kexec-tools-1.101-LDFLAGS.patch 361 RMD160 ef5b21154a127e962ff5bb208972982738e457dd files/kexec-tools-1.101-LDFLAGS.patch 361 SHA256 a5ec5ae9c369583f3b86668b2e05034d7f42ef25ec1fb93204c61aeee83c0089 files/kexec-tools-1.101-LDFLAGS.patch 361 @@ -22,25 +22,21 @@ SHA256 01fb1e1f7c27866eefed97f32a56206810d1b697e444e2b9392f2b1eb887504b files/ke MD5 d6017250a94f6bd50a9744694b02da7f files/kexec.conf 292 RMD160 6c15a82e351b1ac7502653ca953d7b8990897485 files/kexec.conf 292 SHA256 903f05d97d1357ac404199c73b51db70b5c8f070a74b46cedd08352dc506f95f files/kexec.conf 292 -MD5 a7abfebdf076007dc64c9959610551d1 files/kexec.init 1293 -RMD160 217f03243404ce35cedbcb40ebe9ffe4b2e09f81 files/kexec.init 1293 -SHA256 db99b0c85bd59078a677982cfed907f1d2e959a8dc440dd6f619ca7d09ae1e5c files/kexec.init 1293 +MD5 03b1b23109d3d9aebe5146e5ad05e0b7 files/kexec.init 1293 +RMD160 1ad6cfe8815b1ae505fb13a6cf0dfeca730da334 files/kexec.init 1293 +SHA256 5f92d09628581db12b32efdfd7438c81e6d6406d760d767c48a60e36fa0c9fde files/kexec.init 1293 MD5 5ccd33e89ab18e2a83476d6a60fa9030 kexec-tools-1.100-r1.ebuild 692 RMD160 fdc2dd34664b7d6645cc6bec34343be82485c136 kexec-tools-1.100-r1.ebuild 692 SHA256 91efb7a513d2d732b0633f11d8d57f496adcfacda928d2dd796dd89e059dc39a kexec-tools-1.100-r1.ebuild 692 MD5 0f79442f8f3a7cac58a21fd8523ba33e kexec-tools-1.101-r1.ebuild 840 RMD160 50b1402d380304d4696661b4766cc72a981f2c0b kexec-tools-1.101-r1.ebuild 840 SHA256 ba9598db609c43ca823cfddebe2c4bb5c3fead13c616d0dd1ee23dbfbdd8e5f4 kexec-tools-1.101-r1.ebuild 840 +MD5 da8b2c4043a3c59e99be42fa090ff9e8 kexec-tools-1.101-r2.ebuild 1105 +RMD160 01b521376e29cdbb8dd21595438f079cc58187e2 kexec-tools-1.101-r2.ebuild 1105 +SHA256 e491bfdcc5d76ebcf687e326cd864d04b13894e50cbd293afb837bd07dd12e3b kexec-tools-1.101-r2.ebuild 1105 MD5 905c6adbdbf88509d95c342774b3b931 kexec-tools-1.101.ebuild 694 RMD160 46718374a88036f482a7b91e71c246826b85d996 kexec-tools-1.101.ebuild 694 SHA256 8d376d441f12b40e4795513ed6ac8f9c752e10f55dff3e0e565f2deab57f71a2 kexec-tools-1.101.ebuild 694 MD5 6e89ba8198764bfd079a0cfa18dca593 metadata.xml 264 RMD160 ff3b07b3794623e4733a4dd289cffc9606d6e432 metadata.xml 264 SHA256 62bbe388ec16f0c4a20cfbb752b05fdefd1349254c494cdea67c096bb553c06b metadata.xml 264 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.2.1 (GNU/Linux) - -iD8DBQFEAAzq2+ySkm8kpY0RAsTZAKCWqt2ENiYN/xbhOGpVBR1q1I8PVwCfQwL7 -R6JR3wTKDG4PxHJmqOzQaDU= -=YeoI ------END PGP SIGNATURE----- diff --git a/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r2 b/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r2 new file mode 100644 index 000000000000..58ea05500edf --- /dev/null +++ b/sys-apps/kexec-tools/files/digest-kexec-tools-1.101-r2 @@ -0,0 +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 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.init b/sys-apps/kexec-tools/files/kexec.init index dea576fd8e8f..a7d0ba707879 100755 --- a/sys-apps/kexec-tools/files/kexec.init +++ b/sys-apps/kexec-tools/files/kexec.init @@ -1,7 +1,7 @@ #!/sbin/runscript # 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/files/kexec.init,v 1.5 2006/01/20 20:39:09 genstef Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/kexec-tools/files/kexec.init,v 1.6 2006/03/04 20:16:03 genstef Exp $ depend() { need checkfs @@ -9,7 +9,7 @@ depend() { start() { [ -z "$KNAME" ] && KNAME="bzImage" - [ -z "$BOOTPATH" ] && BOOTPATH="/boot" + [ -z "$BOOTPART" ] && BOOTPART="/boot" [ -z "$BOOTMOUNT" ] && BOOTMOUNT=1 [ -z "$ROOTPART" ] && ROOTPART="`cut -f 1 -d' ' /etc/mtab | grep / | tr '\n' '\t' | cut -f 1`" [ -z "$KPARAM" ] && KPARAM="`sed -r 's:root=[a-zA-Z0-9/]+\s*::g' /proc/cmdline`" @@ -22,7 +22,7 @@ start() { LOCS="`cut -f 2 -d' ' /etc/mtab | tr '\n' ' '`" for x in $LOCS do - if [ "$x" == "$BOOTPATH" ] + if [ "$x" == "$BOOTPART" ] then MNT=0 fi @@ -30,18 +30,18 @@ start() { if [ $MNT -eq 1 -a $BOOTMOUNT -eq 1 ] then - /bin/mount $BOOTPATH + /bin/mount $BOOTPART if [ $? -ne 0 ] then eerror "Couldn't mount $BOOTPART" MNT="0" fi fi - kexec -l $BOOTPATH/$KNAME --append="root=$ROOTPART $KPARAM" $INITRDOPT + kexec -l $BOOTPART/$KNAME --append="root=$ROOTPART $KPARAM" $INITRDOPT RES=$? if [ $MNT -eq 1 -a $BOOTMOUNT -eq 1 ] then - /bin/umount $BOOTPATH + /bin/umount $BOOTPART if [ $? -ne 0 ]; then eerror "Couldn't umount $BOOTPART" fi diff --git a/sys-apps/kexec-tools/kexec-tools-1.101-r2.ebuild b/sys-apps/kexec-tools/kexec-tools-1.101-r2.ebuild new file mode 100644 index 000000000000..d236645f6d33 --- /dev/null +++ b/sys-apps/kexec-tools/kexec-tools-1.101-r2.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2006 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-r2.ebuild,v 1.1 2006/03/04 20:16:02 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" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="zlib" +DEPEND="zlib? ( sys-libs/zlib )" + +src_unpack() { + unpack ${A} + cd "${S}" + epatch "${DISTDIR}"/kexec-tools-1.101-kdump7.patch + epatch "${FILESDIR}"/${P}-LDFLAGS.patch + epatch "${FILESDIR}"/${P}-ppc64.patch +} + +src_compile() { + econf $(use_with zlib) || die "econf failed" + emake || die "emake failed" +} + +src_install() { + make DESTDIR="${D}" install || die "make install failed" + + doman kexec/kexec.8 + dodoc News AUTHORS TODO + + newinitd "${FILESDIR}"/kexec.init kexec + newconfd "${FILESDIR}"/kexec.conf kexec +} -- cgit v1.2.3-65-gdbad