summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-01-12 15:19:03 +0000
committerJustin Lecher <jlec@gentoo.org>2013-01-12 15:19:03 +0000
commit35c75fadd205826f73e4d2be7abf9bb6097d1203 (patch)
tree4588f6896c0e5c86cb8229ad1d8ae5f876d5e9bd /sys-fs/aufs3
parentVersion bump redis to 2.6.8 (bug 451378). (diff)
downloadgentoo-2-35c75fadd205826f73e4d2be7abf9bb6097d1203.tar.gz
gentoo-2-35c75fadd205826f73e4d2be7abf9bb6097d1203.tar.bz2
gentoo-2-35c75fadd205826f73e4d2be7abf9bb6097d1203.zip
sys-fs/aufs3: Fix header file location for <linux-3.7, #451384
(Portage version: 2.2.0_alpha151/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916)
Diffstat (limited to 'sys-fs/aufs3')
-rw-r--r--sys-fs/aufs3/ChangeLog5
-rw-r--r--sys-fs/aufs3/aufs3-3_p20130107.ebuild8
2 files changed, 10 insertions, 3 deletions
diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog
index abc2218bebce..bc65c1cec142 100644
--- a/sys-fs/aufs3/ChangeLog
+++ b/sys-fs/aufs3/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for sys-fs/aufs3
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.43 2013/01/09 09:57:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.44 2013/01/12 15:19:03 jlec Exp $
+
+ 12 Jan 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20130107.ebuild:
+ Fix header file location for <linux-3.7, #451384
09 Jan 2013; Justin Lecher <jlec@gentoo.org> aufs3-3_p20130107.ebuild:
Fix for now location of header file, #450810
diff --git a/sys-fs/aufs3/aufs3-3_p20130107.ebuild b/sys-fs/aufs3/aufs3-3_p20130107.ebuild
index 58b5e042c7c7..95c113247360 100644
--- a/sys-fs/aufs3/aufs3-3_p20130107.ebuild
+++ b/sys-fs/aufs3/aufs3-3_p20130107.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20130107.ebuild,v 1.2 2013/01/09 09:57:00 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20130107.ebuild,v 1.3 2013/01/12 15:19:03 jlec Exp $
EAPI=4
@@ -114,7 +114,11 @@ src_prepare() {
use pax_kernel && epatch "${FILESDIR}"/pax-2.patch
sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
- sed -i "s:__user::g" include/uapi/linux/aufs_type.h || die
+ if [[ ${KV_MINOR} -lt 7 ]]; then
+ sed -i "s:__user::g" include/linux/aufs_type.h || die
+ else
+ sed -i "s:__user::g" include/uapi/linux/aufs_type.h || die
+ fi
cd "${WORKDIR}"/${P}/${PN/3}-util