commit:     11a5ae216b137fff419a2d69652aee87c565d684
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 16 10:10:12 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Mon Nov 16 11:12:45 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11a5ae21

sys-fs/aufs3: Bump to latest aufs release

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 sys-fs/aufs3/Manifest                 |   1 +
 sys-fs/aufs3/aufs3-3_p20151116.ebuild | 172 ++++++++++++++++++++++++++++++++++
 2 files changed, 173 insertions(+)

diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
index 39a81bc..45bd244 100644
--- a/sys-fs/aufs3/Manifest
+++ b/sys-fs/aufs3/Manifest
@@ -9,3 +9,4 @@ DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 
2fa44f9df9d58df7a5251ebd
 DIST aufs3-standalone-3_p20151012.tar.xz 3122148 SHA256 
f54f1f19bec26f653939e00b30007a465a1f555356ec3886f2a5970276494d0e SHA512 
fcf251f358c0dfb66387744d1a1339b2bbcc979c7cc86d01068d108abd6a765c69ecce56cc182d385006febf5abf093fb2c2af77e4cc149134ac413a26b4118f
 WHIRLPOOL 
06be7483792bceea58b26d733c1eed6f69ddd81cd49617550c3414e1800964690b69c1ee9f12b1d48887d051d6b0488a009a56aec0df7cbcc5625ca27f9043f8
 DIST aufs3-standalone-3_p20151102.tar.xz 3139016 SHA256 
8d43e3c3c744ddfd250321d7a43ac98c77ff93d2775674f3c7a71183260702fb SHA512 
0c0f261dc295d7b33560796f7baef761d802eac4de6b09be9a8f41689f3458149c271025e45d053fb188f56b6b2d6e5a02e159b0fefef090cbb0b44cfad78c4a
 WHIRLPOOL 
1bcd9292362b27c564b5450c84b5f22bb16b2498b34507a78bf30df25c034bce4112ddec688f632f39cd935f1dd15dcf7f18213dc0d13a63aed1e2873da2d89b
 DIST aufs3-standalone-3_p20151109.tar.xz 3151124 SHA256 
1fe9341fe93a469d3a17604c90f949304e035e687f1fc3fac4c9f76d93b9535d SHA512 
3f3e018e5236e6e8d67c3d0dd13eb38dd9d72ec32c0e572bb9f3b4fb85b4ee7d9d50a5cf63bb6432c5625e8d98655e3f0c228bd66b79fae680dbe866553cbc40
 WHIRLPOOL 
28d853afe21c8ce5a1ae9a9b5394db87b823bd791e14c5c5d15f3943ff3c67b0ce2bf28b2287f4ce9fc79feeb44127f9a26ba888a8449859b9414880d6748762
+DIST aufs3-standalone-3_p20151116.tar.xz 3164412 SHA256 
6702030b4a90b168d8ee227856caeaf999eec91e83bf96517d93cb1242d98ccd SHA512 
40bdb947fd3da48d1d245c18cad3a23f61301e596e3b2b9b82b9915c239941af0b55c8491b408c66c07721385de365093601f764b43f096a432d76452f9d76e1
 WHIRLPOOL 
e07ac272cc37eb74776b93030f3a201c8e2e0a7e73777c7e1140a41c83ac58b1e8c77fc4d52dfe9027d10442b5f6a1f11ea1a35a3b36ce8d87bd725f48cb5c3d

diff --git a/sys-fs/aufs3/aufs3-3_p20151116.ebuild 
b/sys-fs/aufs3/aufs3-3_p20151116.ebuild
new file mode 100644
index 0000000..9930d1e
--- /dev/null
+++ b/sys-fs/aufs3/aufs3-3_p20151116.ebuild
@@ -0,0 +1,172 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo 
toolchain-funcs
+
+AUFS_VERSION="${PV%%_p*}"
+# highest branch version
+PATCH_MAX_VER=19
+# highest supported version
+KERN_MAX_VER=20
+# lowest supported version
+KERN_MIN_VER=14
+
+DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
+HOMEPAGE="http://aufs.sourceforge.net/";
+SRC_URI="https://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
+       !sys-fs/aufs4"
+
+S="${WORKDIR}"/${PN}-standalone
+
+MODULE_NAMES="aufs(misc:${S})"
+
+pkg_setup() {
+       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 ${KERN_MIN_VER} 0 && die "the kernel version isn't 
supported by upstream anymore. Please upgrade."
+       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"
+       elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
+               PATCH_BRANCH="${KV_MINOR}".21+
+       elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
+               PATCH_BRANCH="${KV_MINOR}".1+
+       else
+               PATCH_BRANCH="${KV_MINOR}"
+       fi
+
+       case ${KV_EXTRA} in
+                       "")
+                               elog "It seems you are using vanilla-sources 
with aufs3"
+                               elog "Please use sys-kernel/aufs-sources with 
USE=vanilla"
+                               elog "This will save you the nasty reemerge of 
sys-fs/aufs3 on every kernel upgrade"
+                       ;;
+                       "-gentoo")
+                               elog "It seems you are using gentoo-sources 
with aufs3"
+                               elog "Please use sys-kernel/aufs-sources"
+                               elog "This will save you the nasty reemerge of 
sys-fs/aufs3 on every kernel upgrade"
+                       ;;
+       esac
+
+       pushd "${T}" &> /dev/null
+       unpack ${A}
+       cd ${PN}-standalone || die
+       local module_branch=origin/${PN}.${PATCH_BRANCH}
+       einfo "Using ${module_branch} as patch source"
+       git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
+       combinediff ${PN}-base.patch ${PN}-standalone.patch  > 
"${T}"/combined-1.patch
+       combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > 
${PN}-standalone-base-mmap-combined.patch
+       if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < 
${PN}-standalone-base-mmap-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-mmap-combined.patch 
>/dev/null
+                       epatch 
"${T}"/${PN}-standalone/${PN}-standalone-base-mmap-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 
"${T}"/${PN}-standalone/${PN}-standalone-base-mmap-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
+
+       if use pax_kernel; then
+               if kernel_is ge 3 11; then
+                       epatch "${FILESDIR}"/pax-3.11.patch
+               else
+                       epatch "${FILESDIR}"/pax-3.patch
+               fi
+       fi
+
+       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-mmap-combined.patch
+
+       dodoc Documentation/filesystems/aufs/README 
"${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
+
+       readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+       readme.gentoo_pkg_postinst
+       linux-mod_pkg_postinst
+}

Reply via email to