Adjust inotify useflag, require useflag for kernel patch

(Portage version: 2.2_rc33/cvs/Linux x86_64)

4 files changed, 43 insertions, 122 deletions

diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog
index d908d68f03c4..c24fee42bede 100644
--- a/sys-fs/aufs2/ChangeLog
+++ b/sys-fs/aufs2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/aufs2
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.4 2009/06/07 18:51:23 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.5 2009/06/12 17:40:30 tommy Exp $
+
+*aufs2-0_p20090601-r1 (12 Jun 2009)
+
+  12 Jun 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
+  -aufs2-0_p20090504.ebuild, -aufs2-0_p20090601.ebuild,
+  +aufs2-0_p20090601-r1.ebuild, metadata.xml:
+  Adjust inotify useflag, require useflag for kernel patch
 
   07 Jun 2009; Thomas Sachau (Tommy[D]) <tommy@gentoo.org>
   aufs2-0_p20090601.ebuild:
diff --git a/sys-fs/aufs2/aufs2-0_p20090504.ebuild b/sys-fs/aufs2/aufs2-0_p20090504.ebuild
deleted file mode 100644
index 5852765342c8..000000000000
--- a/sys-fs/aufs2/aufs2-0_p20090504.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20090504.ebuild,v 1.2 2009/05/24 18:30:08 maekke Exp $
-
-EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"
-
-inherit git linux-mod toolchain-funcs
-
-DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
-HOMEPAGE="http://aufs.sourceforge.net"
-SRC_URI=""
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="hinotify debug"
-
-DEPEND=""
-RDEPEND="!sys-fs/aufs"
-
-MODULE_NAMES="aufs(misc:${S})"
-
-pkg_setup() {
-	get_version
-	if ! grep -qs "EXPORT_SYMBOL(deny_write_access);" ${KV_DIR}/fs/namei.c; then
-		ewarn "Patching your kernel..."
-		cd ${KV_DIR}
-		if kernel_is eq 2 6 27; then
-			epatch "${FILESDIR}"/aufs2-standalone.patch
-		elif kernel_is eq 2 6 28; then
-			epatch "${FILESDIR}"/aufs2-standalone.patch
-		elif kernel_is eq 2 6 29; then
-			epatch "${FILESDIR}"/aufs2-standalone-29.patch
-		else
-			die "no supported kernel found"
-		fi
-		elog "You need to compile your kernel with the applied patch"
-		elog "to be able to load and use the aufs kernel module"
-	fi
-
-	linux-mod_pkg_setup
-}
-src_unpack() {
-	if kernel_is eq 2 6 27; then
-		EGIT_BRANCH="aufs2-27"
-		EGIT_TREE="bb1af7c7e7b5367f1bdc65586712a2519c032f07"
-	elif kernel_is eq 2 6 28; then
-		EGIT_BRANCH="aufs2-28"
-		EGIT_TREE="a69e4ba24b8b6896bc2a654b5b4436102fcd0441"
-	elif kernel_is eq 2 6 29; then
-		EGIT_BRANCH="aufs2-29"
-		EGIT_TREE="64b47672ffed5dd1ac4754146641494a69dd88ad"
-	else
-		die "no supported kernel found"
-	fi
-	git_src_unpack
-	cd "${S}"
-	echo -e "CONFIG_AUFS_BRANCH_MAX_127 = y\nAUFS_DEF_CONFIG = -DCONFIG_AUFS_MODULE -UCONFIG_AUFS" >> fs/aufs/magic.mk
-
-	use hinotify && echo "CONFIG_AUFS_HINOTIFY = y" >> fs/aufs/magic.mk
-	use debug && echo "CONFIG_AUFS_DEBUG = y" >> fs/aufs/magic.mk
-
-	tail -n 14 config.mk >> fs/aufs/magic.mk
-	echo -e "ccflags-y += -I\${S}/include\nccflags-y += \${AUFS_DEF_CONFIG}" >> fs/aufs/magic.mk
-
-	EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git"
-	EGIT_TREE="cf1c9a7766a2605dd95ceecc0ac0a5396e784f6d"
-	EGIT_PROJECT="aufs2-utils"
-	EGIT_BRANCH=""
-	S=${S}-utils
-	git_src_unpack
-	cd "${S}"
-	epatch "${FILESDIR}"/utils-Makefile.patch
-	S=${S/-utils}
-}
-
-src_compile() {
-	ARCH=i386
-	use amd64 && ARCH=x86_64
-	emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} || die
-	cd "${S}"-utils
-	emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include || die
-}
-
-src_install() {
-	linux-mod_src_install
-	doman Documentation/filesystems/aufs/aufs.5 || die
-	dodoc Documentation/filesystems/aufs/README || die
-	docinto design
-	dodoc Documentation/filesystems/aufs/design/*.txt || die
-	cd "${S}"-utils
-	emake DESTDIR="${D}" install || die
-	docinto
-	newdoc README README-utils || die
-}
diff --git a/sys-fs/aufs2/aufs2-0_p20090601.ebuild b/sys-fs/aufs2/aufs2-0_p20090601-r1.ebuild
index 665a540e3fa6..7de92c2ca103 100644
--- a/sys-fs/aufs2/aufs2-0_p20090601.ebuild
+++ b/sys-fs/aufs2/aufs2-0_p20090601-r1.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/aufs2/aufs2-0_p20090601.ebuild,v 1.2 2009/06/07 18:51:23 tommy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20090601-r1.ebuild,v 1.1 2009/06/12 17:40:30 tommy Exp $
 
 EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-standalone.git"
 
@@ -12,52 +12,60 @@ SRC_URI=""
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug hinotify ramfs"
+KEYWORDS="~amd64"
+IUSE="debug inotify kernel-patch ramfs"
 
 DEPEND=""
 RDEPEND="!sys-fs/aufs"
 
 MODULE_NAMES="aufs(misc:${S})"
 
-pkg_setup() {
-	get_version
-	if ! grep -qs "EXPORT_SYMBOL(deny_write_access);" ${KV_DIR}/fs/namei.c; then
-		ewarn "Patching your kernel..."
-		cd ${KV_DIR}
-		if kernel_is eq 2 6 27; then
-			epatch "${FILESDIR}"/aufs2-standalone.patch
-		elif kernel_is eq 2 6 28; then
-			epatch "${FILESDIR}"/aufs2-standalone.patch
-		elif kernel_is eq 2 6 29; then
-			epatch "${FILESDIR}"/aufs2-standalone-29.patch
-		else
-			die "no supported kernel found"
-		fi
-		elog "You need to compile your kernel with the applied patch"
-		elog "to be able to load and use the aufs kernel module"
-	fi
-
-	linux-mod_pkg_setup
-}
-src_unpack() {
+get_kernelpatch() {
+	KERNELPATCH=""
 	if kernel_is eq 2 6 27; then
+		KERNELPATCH="aufs2-standalone.patch"
 		EGIT_BRANCH="aufs2-27"
 		EGIT_TREE="8e8d6394f50d9cfdc434766ea2434018788ca111"
 	elif kernel_is eq 2 6 28; then
+		KERNELPATCH="aufs2-standalone.patch"
 		EGIT_BRANCH="aufs2-28"
 		EGIT_TREE="78e9abebac8f283dd4f113f392a9943a7b212b0e"
 	elif kernel_is eq 2 6 29; then
+		KERNELPATCH="aufs2-standalone-29.patch"
 		EGIT_BRANCH="aufs2-29"
 		EGIT_TREE="d2db0dbfac69b5a04df5a78a454a2c9b8c658aa6"
 	else
 		die "no supported kernel found"
 	fi
+}
+
+pkg_setup() {
+	get_version
+	get_kernelpatch
+	if ! patch -p1 --dry-run --force -R -d ${KV_DIR} <"${FILESDIR}"/${KERNELPATCH} >/dev/null; then
+		if use kernel-patch; then
+			cd ${KV_DIR}
+			ewarn "Patching your kernel..."
+			patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} <"${FILESDIR}"/${KERNELPATCH} >/dev/null
+			epatch "${FILESDIR}"/${KERNELPATCH}
+			einfo "You need to compile your kernel with the applied patch"
+			einfo "to be able to load and use the aufs kernel module"
+		else
+			eerror "You need to apply a patch to your kernel to compile and run the aufs2 module"
+			eerror "Either enable the kernel-patch useflag to do it with this ebuild"
+			eerror "or apply ${FILESDIR}/${KERNELPATCH} by hand"
+			die "missing kernel patch, please apply it first"
+		fi
+	fi
+	linux-mod_pkg_setup
+}
+
+src_unpack() {
 	git_src_unpack
 	cd "${S}"
 
 	use debug || sed -i "s:DEBUG = y:DEBUG =:g" config.mk
-	use hinotify && sed -i  "s:HINOTIFY =:HINOTIFY = y:g" config.mk
+	use inotify && sed -i  "s:HINOTIFY =:HINOTIFY = y:g" config.mk
 	use ramfs && sed -i  "s:RAMFS =:RAMFS = y:g" config.mk
 
 	EGIT_REPO_URI="http://git.c3sl.ufpr.br/pub/scm/aufs/aufs2-util.git"
diff --git a/sys-fs/aufs2/metadata.xml b/sys-fs/aufs2/metadata.xml
index 0187df67f6be..b29110b81439 100644
--- a/sys-fs/aufs2/metadata.xml
+++ b/sys-fs/aufs2/metadata.xml
@@ -7,7 +7,8 @@
 	</maintainer>
 	<use>
 		<flag name='debug'>Enable additional debugging support</flag>
-		<flag name='hinotify'>Enable hinotify support</flag>
+		<flag name='inotify'>Enable inotify support</flag>
+		<flag name='kernel-patch'>Patch the current kernel for aufs2 support</flag>
 		<flag name='ramfs'>Enable initramfs/rootfs support</flag>
 	</use>
 </pkgmetadata>