From 5146a22af3fe3a3919c60515dbc1796b1508bba3 Mon Sep 17 00:00:00 2001 From: Michael Marineau Date: Sat, 13 Jan 2007 01:56:48 +0000 Subject: [PATCH] Fix module install location Package-Manager: portage-2.1.1-r2 --- sys-cluster/cman-kernel/ChangeLog | 8 ++++++-- sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild | 6 +++--- sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild | 6 +++--- sys-cluster/dlm-kernel/ChangeLog | 8 ++++++-- sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild | 6 +++--- sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild | 6 +++--- 6 files changed, 24 insertions(+), 16 deletions(-) diff --git a/sys-cluster/cman-kernel/ChangeLog b/sys-cluster/cman-kernel/ChangeLog index 57dd92c6ee96..06c55a2971d3 100644 --- a/sys-cluster/cman-kernel/ChangeLog +++ b/sys-cluster/cman-kernel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/cman-kernel -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/ChangeLog,v 1.23 2006/10/19 10:45:18 xmerlin Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/ChangeLog,v 1.24 2007/01/13 01:56:48 marineam Exp $ + + 13 Jan 2007; Michael Marineau + cman-kernel-1.02.00-r1.ebuild, cman-kernel-1.03.00.ebuild: + Fix module install path for bug #158572 19 Oct 2006; Christian Zoffoli cman-kernel-1.02.00-r1.ebuild, cman-kernel-1.03.00.ebuild: diff --git a/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild b/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild index 8454ecd90587..299084f1241a 100644 --- a/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild +++ b/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild @@ -1,6 +1,6 @@ -# 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-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild,v 1.9 2006/10/19 10:45:18 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-1.02.00-r1.ebuild,v 1.10 2007/01/13 01:56:48 marineam Exp $ inherit eutils linux-mod linux-info @@ -47,7 +47,7 @@ src_compile() { } src_install() { - emake DESTDIR=${D} install || die "install error" + emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install error" rm -f ${D}/usr/include/cluster/* } diff --git a/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild b/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild index e183c78acd12..02e0f0c2bc92 100644 --- a/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild +++ b/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild @@ -1,6 +1,6 @@ -# 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-cluster/cman-kernel/cman-kernel-1.03.00.ebuild,v 1.6 2006/10/19 10:45:18 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cman-kernel/cman-kernel-1.03.00.ebuild,v 1.7 2007/01/13 01:56:48 marineam Exp $ inherit linux-mod linux-info @@ -38,7 +38,7 @@ src_compile() { } src_install() { - emake DESTDIR=${D} install || die "install error" + emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install error" rm -f ${D}/usr/include/cluster/* } diff --git a/sys-cluster/dlm-kernel/ChangeLog b/sys-cluster/dlm-kernel/ChangeLog index 5f3b885fd8bd..aa89ca0d3a6e 100644 --- a/sys-cluster/dlm-kernel/ChangeLog +++ b/sys-cluster/dlm-kernel/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-cluster/dlm-kernel -# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/ChangeLog,v 1.25 2006/10/19 10:46:10 xmerlin Exp $ +# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/ChangeLog,v 1.26 2007/01/13 01:55:27 marineam Exp $ + + 13 Jan 2007; Michael Marineau + dlm-kernel-1.02.00-r1.ebuild, dlm-kernel-1.03.00.ebuild: + Fix module install path for bug #158572 19 Oct 2006; Christian Zoffoli dlm-kernel-1.02.00-r1.ebuild, dlm-kernel-1.03.00.ebuild: diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild index b1e640dee335..bbb236123d00 100644 --- a/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild +++ b/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild @@ -1,6 +1,6 @@ -# 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-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild,v 1.8 2006/10/19 10:46:10 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.02.00-r1.ebuild,v 1.9 2007/01/13 01:55:27 marineam Exp $ inherit eutils linux-mod linux-info @@ -49,7 +49,7 @@ src_compile() { } src_install() { - emake DESTDIR=${D} install || die "install problem" + emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem" rm -f ${D}/usr/include/cluster/* } diff --git a/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild b/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild index 1c5264e03a21..f4293ce32471 100644 --- a/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild +++ b/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild @@ -1,6 +1,6 @@ -# 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-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild,v 1.5 2006/10/19 10:46:10 xmerlin Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/dlm-kernel/dlm-kernel-1.03.00.ebuild,v 1.6 2007/01/13 01:55:27 marineam Exp $ inherit eutils linux-mod linux-info @@ -40,7 +40,7 @@ src_compile() { } src_install() { - emake DESTDIR=${D} install || die "install problem" + emake DESTDIR=${D} module_dir=${D}/lib/modules/${KV_FULL} install || die "install problem" rm -f ${D}/usr/include/cluster/* } -- 2.26.2