diff options
| author |   Tiziano Müller <dev-zero@gentoo.org> | 2009-09-19 11:18:46 +0000 |
|---|---|---|
| committer | Tiziano Müller <dev-zero@gentoo.org> | 2009-09-19 11:18:46 +0000 |
| commit | 801647f7039121bbaa2b17d66f7c139d8d72a61a (patch) | |
| tree | a0c7f7e7d5edd2dac6c85850800b70697310deb6 /sys-fs/vhba | |
| parent | x11-proto/xcmiscproto: bump to 1.2.0 (diff) | |
| download | gentoo-2-801647f7039121bbaa2b17d66f7c139d8d72a61a.tar.gz gentoo-2-801647f7039121bbaa2b17d66f7c139d8d72a61a.tar.bz2 gentoo-2-801647f7039121bbaa2b17d66f7c139d8d72a61a.zip | |
Force the kernel-dir to be KV_DIR (bug #233910, thanks to Ambroz Bizjak).
(Portage version: 2.2_rc40/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/vhba')
| -rw-r--r-- | sys-fs/vhba/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/vhba/files/1.2.1-kerneldir.patch | 12 | ||||
| -rw-r--r-- | sys-fs/vhba/vhba-1.2.1.ebuild | 11 |
3 files changed, 22 insertions, 7 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/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() { |