From 1db55761bdd8e6d07639c0958bdf52ca119aac37 Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Mon, 27 Jun 2011 08:12:45 +0000 Subject: Version Bump (Portage version: 2.2.0_alpha41/cvs/Linux x86_64) --- sys-fs/aufs2/ChangeLog | 8 ++- sys-fs/aufs2/aufs2-0_p20110627.ebuild | 116 ++++++++++++++++++++++++++++++++++ sys-fs/aufs2/metadata.xml | 14 ++-- 3 files changed, 130 insertions(+), 8 deletions(-) create mode 100644 sys-fs/aufs2/aufs2-0_p20110627.ebuild (limited to 'sys-fs') diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog index 99beb7eff7be..a2a39d2b8751 100644 --- a/sys-fs/aufs2/ChangeLog +++ b/sys-fs/aufs2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/aufs2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.37 2011/06/20 05:49:29 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.38 2011/06/27 08:12:45 jlec Exp $ + +*aufs2-0_p20110627 (27 Jun 2011) + + 27 Jun 2011; Justin Lecher +aufs2-0_p20110627.ebuild, + metadata.xml: + Version Bump *aufs2-0_p20110620 (20 Jun 2011) diff --git a/sys-fs/aufs2/aufs2-0_p20110627.ebuild b/sys-fs/aufs2/aufs2-0_p20110627.ebuild new file mode 100644 index 000000000000..d333348c5e70 --- /dev/null +++ b/sys-fs/aufs2/aufs2-0_p20110627.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20110627.ebuild,v 1.1 2011/06/27 08:12:45 jlec Exp $ + +EAPI="4" + +inherit linux-mod multilib toolchain-funcs + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug fuse hardened hfs inotify kernel-patch nfs ramfs" + +DEPEND="dev-vcs/git" +RDEPEND="!sys-fs/aufs" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +pkg_setup() { + CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL" + use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" + use nfs && CONFIG_CHECK="${CONFIG_CHECK} ~EXPORTFS" + use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" + use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" + + # this is needed so merging a binpkg aufs2 is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + + get_version + kernel_is lt 2 6 31 && die "kernel too old" + kernel_is gt 2 6 39 && die "kernel too new" + + linux-mod_pkg_setup + 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 + if use kernel-patch; then + cd ${KV_DIR} + ewarn "Patching your kernel..." + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null + epatch "${FILESDIR}"/aufs2-{base,standalone}-${KV_PATCH}.patch + ewarn "You need to compile your kernel with the applied patch" + ewarn "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}/aufs2-base-${KV_PATCH}.patch and" + eerror "${FILESDIR}/aufs2-standalone-${KV_PATCH}.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + export PKG_SETUP_HAS_BEEN_RAN=1 +} + +set_config() { + for option in $*; do + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die + done +} + +src_prepare() { + local branch=origin/aufs2.1-${KV_PATCH} + git checkout -q $branch || die + + # All config options to off + sed "s:= y:=:g" -i config.mk || die + + set_config RDU BRANCH_MAX_127 SBILIST + + use debug && set_config DEBUG + use fuse && set_config BR_FUSE POLL + use hfs && set_config BR_HFSPLUS + use inotify && set_config HNOTIFY HFSNOTIFY + use nfs && set_config EXPORT + use nfs && use amd64 && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + if use hardened ; then + epatch "${FILESDIR}"/pax.patch + fi + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die + sed -i "s:__user::g" include/linux/aufs_type.h || die + + cd "${WORKDIR}"/${PN}-util + git checkout -q origin/aufs2.1 + sed -i "/LDFLAGS += -static -s/d" Makefile || die + sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die +} + +src_compile() { + local ARCH=x86 + + emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} + + cd "${WORKDIR}"/${PN}-util + emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include +} + +src_install() { + linux-mod_src_install + dodoc README + docinto design + dodoc design/*.txt + cd "${WORKDIR}"/${PN}-util + emake DESTDIR="${D}" KDIR=${KV_DIR} install + docinto + newdoc README README-utils +} diff --git a/sys-fs/aufs2/metadata.xml b/sys-fs/aufs2/metadata.xml index 1e6c9230d346..c2ca689756c0 100644 --- a/sys-fs/aufs2/metadata.xml +++ b/sys-fs/aufs2/metadata.xml @@ -9,12 +9,12 @@ tommy@gentoo.org - Enable additional debugging support - Enable inotify support - Patch the current kernel for aufs2 support - Enable support for nfs export - Enable initramfs/rootfs support - Enable fuse support - Enable hfs support + Enable additional debugging support + Enable inotify support + Patch the current kernel for aufs2 support + Enable support for nfs export + Enable initramfs/rootfs support + Enable fuse support + Enable hfs support -- cgit v1.2.3-65-gdbad