Force the kernel-dir to be KV_DIR (bug #233910, thanks to Ambroz Bizjak).

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

4 files changed, 25 insertions, 9 deletions

diff --git a/sys-fs/vhba/ChangeLog b/sys-fs/vhba/ChangeLog
index 3eb98a5b3286..87d2687f61fb 100644
--- a/sys-fs/vhba/ChangeLog
+++ b/sys-fs/vhba/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/vhba
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.11 2009/09/06 21:18:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/ChangeLog,v 1.12 2009/09/19 11:18:45 dev-zero Exp $
+
+  19 Sep 2009; Tiziano Müller <dev-zero@gentoo.org>
+  +files/1.2.1-kerneldir.patch, vhba-1.2.1.ebuild:
+  Force the kernel-dir to be KV_DIR (bug #233910, thanks to Ambroz Bizjak).
 
   06 Sep 2009; Robin H. Johnson <robbat2@gentoo.org> vhba-1.0.0.ebuild,
   vhba-1.1.0.ebuild, vhba-1.2.1.ebuild:
diff --git a/sys-fs/vhba/Manifest b/sys-fs/vhba/Manifest
index 9f229efb79a0..1ed492d9db5a 100644
--- a/sys-fs/vhba/Manifest
+++ b/sys-fs/vhba/Manifest
@@ -1,3 +1,4 @@
+AUX 1.2.1-kerneldir.patch 441 RMD160 cd1f07b3aeecbf366ec5f9fea82dac4522b43aab SHA1 eab633c92585725a51bc726d856143de8d1c56c2 SHA256 c71326954d480aa9440cb84dd3d93023d06cbd266bac52a54fcbeb8cae4b5bc5
 AUX 1.2.1-parallel_build.patch 407 RMD160 ea79001e78a46fa3e0e317cbd46b84e320d3744c SHA1 9574f541729acaa29c3f08c0a4abde373e10aa0a SHA256 bda2f1efd960e53dc4a01ca119991a5a8c16cb80f9c052309e42bc9f939b4491
 AUX vhba-1.0.0-makefile.patch 778 RMD160 4782607437fd3f55162d3086472933376b574d90 SHA1 61f7b098c654bb83b117c0760e4c8c9d365d8282 SHA256 ff8512f15f13de655c39168a9e000a5a3dfd6ae8b89789bc3ae6c8610ae6725a
 AUX vhba-1.0.0-scatterlist.patch 583 RMD160 7d1af6d447705df0644056258f67a0cb74a43381 SHA1 ba11da0b2c77b3ad47f8185fc134716c20568fb3 SHA256 eae66a805ee1e599f65ff5487ba2e8535a30d5d8a9cc8a8b95d166425e65fc95
@@ -7,6 +8,6 @@ DIST vhba-module-1.1.0.tar.bz2 13667 RMD160 c68bc151f7889978c65d9e221da2a37954b5
 DIST vhba-module-1.2.1.tar.bz2 6585 RMD160 ecdbbd40f34b68816b0eefe43a64a4c664b31580 SHA1 5226b3dd16d793cd58a712e8ca44f3b45194e248 SHA256 1ab729d029c49e5e6231cdec3b9f88f17c44a292fe77f2bfbab506b62999a3ae
 EBUILD vhba-1.0.0.ebuild 2041 RMD160 ab0c2c99bf7e22e91124bce24afeb7cbdd90ace6 SHA1 0a442b7c30c077a7e6fef830ae15c77b7fb39566 SHA256 90a3f61c375216f7be4ea9b1e232923178ecf169e618e681d32849b81ba3e3e6
 EBUILD vhba-1.1.0.ebuild 1654 RMD160 fde31152bff28f2b8d7f1848cf17f892df2f43cf SHA1 7a70b36cfbb69568b5757ad88ce942995477a15b SHA256 c258b4673794a01bb5296f549843360420cb81e5843c0363610061f9216606d1
-EBUILD vhba-1.2.1.ebuild 1573 RMD160 515319cadf6f0cfaf68cdcbef59ae86fc1600343 SHA1 e4d826340d0eb5ecf6b22e7a27784276bd610f5c SHA256 524a2550be14fa5e4b1621b94cee7d214cebded397b6322399dd2095850e98cd
-MISC ChangeLog 2945 RMD160 97bf4a19af29ea7447371944da81e7be2f69d087 SHA1 0d35e3fc9dfd1254a9d903dad87d6f84b72cff77 SHA256 151b9aedc2a5a0ac049513b8fcc752d034bd045a765dbbb7f4e94ef1b1c93f9f
+EBUILD vhba-1.2.1.ebuild 1508 RMD160 8a3b06bae47c0d192a6f5177579530352faf3416 SHA1 7c0bf3e32ced60663711d605d298fa649283ebbb SHA256 0b2aa6c2c14940f6c94983f53896c7b753f5936d873e9648ead953cbfffe42de
+MISC ChangeLog 3127 RMD160 e6ddb102224d4198f6a2d029ce361b5151ff5754 SHA1 4dab1f9ed1a318bd16741b1b7b119678c8aa298c SHA256 de7075900bc11516431e2651ad0d592705184a41be67139c928a3e7b8254f0fd
 MISC metadata.xml 225 RMD160 461e7786d6f2b4ad0796cdbd8da127d2aa1d9c88 SHA1 7e14b4551dd441a467b812e3b4c4f3fd795e5a58 SHA256 1c4c96d3ac062761d9e938c233751ff32b23e2c21aff1e38df6a37ffa0e97cb1
diff --git a/sys-fs/vhba/files/1.2.1-kerneldir.patch b/sys-fs/vhba/files/1.2.1-kerneldir.patch
new file mode 100644
index 000000000000..7388d5414462
--- /dev/null
+++ b/sys-fs/vhba/files/1.2.1-kerneldir.patch
@@ -0,0 +1,12 @@
+diff -Naur vhba-module-1.2.1.orig/Makefile vhba-module-1.2.1/Makefile
+--- vhba-module-1.2.1.orig/Makefile	2009-09-19 13:10:07.790478925 +0200
++++ vhba-module-1.2.1/Makefile	2009-09-19 13:16:03.484646317 +0200
+@@ -9,7 +9,7 @@
+ ifndef KERNELRELEASE
+ 	KERNELRELEASE := `uname -r`
+ endif
+-KDIR := /lib/modules/$(KERNELRELEASE)/build
++KDIR ?= /lib/modules/$(KERNELRELEASE)/build
+ KMAKE := $(MAKE) -C $(KDIR) M=$(PWD)
+ 
+ all: kernel.api.h modules
diff --git a/sys-fs/vhba/vhba-1.2.1.ebuild b/sys-fs/vhba/vhba-1.2.1.ebuild
index 0c725f744a49..efb582ae34af 100644
--- a/sys-fs/vhba/vhba-1.2.1.ebuild
+++ b/sys-fs/vhba/vhba-1.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-1.2.1.ebuild,v 1.2 2009/09/06 21:18:46 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/vhba/vhba-1.2.1.ebuild,v 1.3 2009/09/19 11:18:45 dev-zero Exp $
 
 EAPI="2"
 
@@ -25,15 +25,14 @@ BUILD_TARGETS="all"
 pkg_setup() {
 	CONFIG_CHECK="~BLK_DEV_SR ~CHR_DEV_SG"
 	check_extra_config
-	BUILD_PARAMS="KERNELDIR=${KV_DIR}"
+	BUILD_PARAMS="KDIR=${KV_DIR}"
 	linux-mod_pkg_setup
 }
 
 src_prepare() {
-	epatch "${FILESDIR}/${PV}-parallel_build.patch"
-	sed -i \
-		-e "s:/lib/modules/\$(KERNELRELEASE)/build:${KERNEL_DIR}:g" \
-		Makefile || die "sed failed"
+	epatch \
+		"${FILESDIR}/${PV}-parallel_build.patch" \
+		"${FILESDIR}/${PV}-kerneldir.patch"
 }
 
 src_install() {