From 51982da3860079fc871afe69354f25da8d53214f Mon Sep 17 00:00:00 2001 From: Justin Lecher Date: Sun, 11 Aug 2013 12:55:47 +0000 Subject: sys-fs/aufs3: Bump to latest aufs release (Portage version: 2.2.0_alpha196/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!) --- sys-fs/aufs3/ChangeLog | 7 +- sys-fs/aufs3/aufs3-3_p20130811.ebuild | 138 ++++++++++++++++++++++++++++++++++ 2 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 sys-fs/aufs3/aufs3-3_p20130811.ebuild (limited to 'sys-fs') diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog index 2b703deb573d..aa7d0dab060c 100644 --- a/sys-fs/aufs3/ChangeLog +++ b/sys-fs/aufs3/ChangeLog @@ -1,6 +1,11 @@ # 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.63 2013/07/22 06:46:18 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.64 2013/08/11 12:55:47 jlec Exp $ + +*aufs3-3_p20130811 (11 Aug 2013) + + 11 Aug 2013; Justin Lecher +aufs3-3_p20130811.ebuild: + Bump to latest aufs release *aufs3-3_p20130722 (22 Jul 2013) diff --git a/sys-fs/aufs3/aufs3-3_p20130811.ebuild b/sys-fs/aufs3/aufs3-3_p20130811.ebuild new file mode 100644 index 000000000000..cc0d1ed73ab1 --- /dev/null +++ b/sys-fs/aufs3/aufs3-3_p20130811.ebuild @@ -0,0 +1,138 @@ +# 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_p20130811.ebuild,v 1.1 2013/08/11 12:55:47 jlec Exp $ + +EAPI=5 + +inherit eutils flag-o-matic linux-info linux-mod multilib toolchain-funcs + +AUFS_VERSION="${PV%%_p*}" +# highest branch version +PATCH_MAX_VER=10 +# highest supported version +KERN_MAX_VER=11 + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" + +DEPEND=" + dev-util/patchutils + dev-vcs/git" +RDEPEND=" + sys-fs/aufs-util + !sys-fs/aufs + !sys-fs/aufs2" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +pkg_setup() { + kernel_is lt 3 9 && CONFIG_CHECK+=" ~EXPERIMENTAL" + CONFIG_CHECK+=" !AUFS_FS" + use inotify && CONFIG_CHECK+=" ~FSNOTIFY" + use nfs && CONFIG_CHECK+=" EXPORTFS" + use fuse && CONFIG_CHECK+=" ~FUSE_FS" + use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" + use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources" + + # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + + get_version + kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2" + kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" + + linux-mod_pkg_setup + + if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then + PATCH_BRANCH="x-rcN" + else + PATCH_BRANCH="${KV_MINOR}" + fi + + pushd "${T}" &> /dev/null + unpack ${A} + cd ${PN}-standalone || die + local module_branch=origin/${PN}.${PATCH_BRANCH} + git checkout -q -b local-gentoo ${module_branch} || die + combinediff ${PN}-base.patch ${PN}-standalone.patch > ${PN}-standalone-base-combined.patch + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-combined.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} < "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch >/dev/null + epatch "${T}"/${PN}-standalone/${PN}-standalone-base-combined.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 ${PN} module" + eerror "Either enable the kernel-patch useflag to do it with this ebuild" + eerror "or apply ${EPRFIX}/usr/share/doc/${PF}/${PN}-standalone-base-combined.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + popd &> /dev/null + 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 module_branch=origin/${PN}.${PATCH_BRANCH} + + einfo "Using for module creation branch ${module_branch}" + git checkout -q -b local-gentoo ${module_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 || use ppc64 ) && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + use pax_kernel && epatch "${FILESDIR}"/pax-3.patch + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die +} + +src_compile() { + local ARCH=x86 + + emake \ + CC=$(tc-getCC) \ + LD=$(tc-getLD) \ + LDFLAGS="$(raw-ldflags)" \ + ARCH=$(tc-arch-kernel) \ + CONFIG_AUFS_FS=m \ + KDIR="${KV_OUT_DIR}" +} + +src_install() { + linux-mod_src_install + + insinto /usr/share/doc/${PF} + + use doc && doins -r Documentation + + use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-combined.patch + + dodoc Documentation/filesystems/aufs/README +} -- cgit v1.2.3-65-gdbad