summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVikraman Choudhury <vikraman@gentoo.org>2015-05-31 07:06:18 +0000
committerVikraman Choudhury <vikraman@gentoo.org>2015-05-31 07:06:18 +0000
commit98e7a9f6e8fc4ff679ed7fa05070145c3c6ee3f5 (patch)
tree1d0d21c854038938e9446cc5cae9227a8656191f /sys-block
parentAdd dependency on ruby interpreter via the new ruby-single.eclass, fixing bug... (diff)
downloadgentoo-2-98e7a9f6e8fc4ff679ed7fa05070145c3c6ee3f5.tar.gz
gentoo-2-98e7a9f6e8fc4ff679ed7fa05070145c3c6ee3f5.tar.bz2
gentoo-2-98e7a9f6e8fc4ff679ed7fa05070145c3c6ee3f5.zip
Fix build with linux 4.0. Fixes bug 549492.
(Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key B0A72FD2)
Diffstat (limited to 'sys-block')
-rw-r--r--sys-block/rts5229/ChangeLog10
-rw-r--r--sys-block/rts5229/rts5229-1.07-r5.ebuild (renamed from sys-block/rts5229/rts5229-1.07-r4.ebuild)16
2 files changed, 18 insertions, 8 deletions
diff --git a/sys-block/rts5229/ChangeLog b/sys-block/rts5229/ChangeLog
index 27e0a3a59428..1546d7828e7c 100644
--- a/sys-block/rts5229/ChangeLog
+++ b/sys-block/rts5229/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-block/rts5229
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/rts5229/ChangeLog,v 1.6 2014/08/14 18:00:43 vikraman Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-block/rts5229/ChangeLog,v 1.7 2015/05/31 07:06:18 vikraman Exp $
+
+*rts5229-1.07-r5 (31 May 2015)
+
+ 31 May 2015; Vikraman Choudhury (vikraman) <vikraman@gentoo.org>
+ +rts5229-1.07-r5.ebuild, -rts5229-1.07-r4.ebuild:
+ Fix build with linux 4.0. Fixes bug 549492.
*rts5229-1.07-r4 (14 Aug 2014)
diff --git a/sys-block/rts5229/rts5229-1.07-r4.ebuild b/sys-block/rts5229/rts5229-1.07-r5.ebuild
index f954a9993d32..cb765e7e9ffb 100644
--- a/sys-block/rts5229/rts5229-1.07-r4.ebuild
+++ b/sys-block/rts5229/rts5229-1.07-r5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-block/rts5229/rts5229-1.07-r4.ebuild,v 1.1 2014/08/14 18:00:43 vikraman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-block/rts5229/rts5229-1.07-r5.ebuild,v 1.1 2015/05/31 07:06:18 vikraman Exp $
EAPI=4
@@ -24,10 +24,14 @@ MODULE_NAMES="rts5229(misc/drivers/scsi)"
BUILD_TARGETS="default"
src_prepare() {
- sed -i -e 's/\/lib\/modules\/\$(shell uname -r)\/build\//\$(KERNELDIR)/g' Makefile || die "Sed failed!"
- [ ${KV_MAJOR} -ge 3 ] && [ ${KV_MINOR} -ge 8 ] && epatch "${FILESDIR}/${PN}-linux-3.8.patch"
- [ ${KV_MAJOR} -ge 3 ] && [ ${KV_MINOR} -ge 10 ] && epatch "${FILESDIR}/${PN}-linux-3.10.patch"
- sed -i -e '/__DATE__/d' rtsx.c || die "Sed failed!"
+ sed -e 's/\/lib\/modules\/\$(shell uname -r)\/build\//\$(KERNELDIR)/g' \
+ -i Makefile || die "Sed failed!"
+ ([ ${KV_MAJOR} -gt 3 ] || ([ ${KV_MAJOR} -eq 3 ] && [ ${KV_MINOR} -ge 8 ])) \
+ && epatch "${FILESDIR}/${PN}-linux-3.8.patch"
+ ([ ${KV_MAJOR} -gt 3 ] || ([ ${KV_MAJOR} -eq 3 ] && [ ${KV_MINOR} -ge 10 ])) \
+ && epatch "${FILESDIR}/${PN}-linux-3.10.patch"
+ sed -e '/__DATE__/d' \
+ -i rtsx.c || die "Sed failed!"
}
pkg_setup() {