summaryrefslogtreecommitdiff
path: root/sys-fs
diff options
context:
space:
mode:
authorThomas Sachau <tommy@gentoo.org>2010-07-26 11:33:14 +0000
committerThomas Sachau <tommy@gentoo.org>2010-07-26 11:33:14 +0000
commitf1713f08b74a75ea4d5846f99e69dcad5d1dd4a1 (patch)
tree874e9d64a4ff8f1b9176da1907aa6f339959177f /sys-fs
parentStable for HPPA (bug #327597). (diff)
downloadgentoo-2-f1713f08b74a75ea4d5846f99e69dcad5d1dd4a1.tar.gz
gentoo-2-f1713f08b74a75ea4d5846f99e69dcad5d1dd4a1.tar.bz2
gentoo-2-f1713f08b74a75ea4d5846f99e69dcad5d1dd4a1.zip
Version bump
(Portage version: 2.2_rc67-r8/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs')
-rw-r--r--sys-fs/aufs2/ChangeLog8
-rw-r--r--sys-fs/aufs2/aufs2-0_p20100726.ebuild (renamed from sys-fs/aufs2/aufs2-0_p20100405.ebuild)14
2 files changed, 16 insertions, 6 deletions
diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index 844c3735026a..917a96115b48 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,12 @@
# ChangeLog for sys-fs/aufs2
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.23 2010/06/22 16:58:38 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.24 2010/07/26 11:33:14 tommy Exp $
+
+*aufs2-0_p20100726 (26 Jul 2010)
+
+ 26 Jul 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+ -aufs2-0_p20100405.ebuild, +aufs2-0_p20100726.ebuild:
+ Version bump
22 Jun 2010; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
aufs2-0_p20100524.ebuild, +files/pax.patch:
diff --git a/sys-fs/aufs2/aufs2-0_p20100405.ebuild b/sys-fs/aufs2/aufs2-0_p20100726.ebuild
index a2789e4a5224..c3ac3d083fc8 100644
--- a/sys-fs/aufs2/aufs2-0_p20100405.ebuild
+++ b/sys-fs/aufs2/aufs2-0_p20100726.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100405.ebuild,v 1.3 2010/05/17 17:04:58 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20100726.ebuild,v 1.1 2010/07/26 11:33:14 tommy Exp $
EAPI="2"
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug inotify kernel-patch nfs ramfs"
+IUSE="debug inotify hardened kernel-patch nfs ramfs"
DEPEND="dev-vcs/git"
RDEPEND="!sys-fs/aufs"
@@ -28,7 +28,7 @@ pkg_setup() {
get_version
kernel_is lt 2 6 27 && die "kernel too old"
- kernel_is gt 2 6 33 && die "kernel too new"
+ kernel_is gt 2 6 34 && die "kernel too new"
if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \
patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null ); then
@@ -59,11 +59,15 @@ src_prepare() {
sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die
fi
if use inotify; then
- sed -i "s:HNOTIFY =:HNOTIFY = y:g" config.mk || die
+ sed -i -e "s:AUFS_HNOTIFY =:AUFS_HNOTIFY = y:g" \
+ -e "s:AUFS_HINOTIFY =:AUFS_HINOTIFY = y:g" config.mk || die
fi
if use ramfs; then
sed -i "s:RAMFS =:RAMFS = y:g" config.mk || die
fi
+ if use hardened ; then
+ epatch "${FILESDIR}"/pax.patch
+ fi
cd "${WORKDIR}"/${PN}-util
sed -i "/LDFLAGS += -static -s/d" Makefile || die
@@ -85,7 +89,7 @@ src_install() {
docinto design
dodoc design/*.txt || die
cd "${WORKDIR}"/${PN}-util
- emake DESTDIR="${D}" install || die
+ emake DESTDIR="${D}" KDIR=${KV_DIR} install || die
docinto
newdoc README README-utils || die
}