From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 7509A1388C1 for ; Tue, 23 Feb 2016 12:08:18 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EFEF6E0788; Tue, 23 Feb 2016 12:08:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 0BD70E0788 for ; Tue, 23 Feb 2016 12:08:14 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AFA773406C2 for ; Tue, 23 Feb 2016 12:08:13 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3309815FB for ; Tue, 23 Feb 2016 12:08:12 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1456229267.5e80f12f5b688a9a6a022cdc27d88e8af58670cd.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/aufs4/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-fs/aufs4/Manifest sys-fs/aufs4/aufs4-0_pre20160223.ebuild X-VCS-Directories: sys-fs/aufs4/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 5e80f12f5b688a9a6a022cdc27d88e8af58670cd X-VCS-Branch: master Date: Tue, 23 Feb 2016 12:08:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 86a811f2-5230-4e63-bf5e-14fb37c93d4f X-Archives-Hash: 5b0e4dd290383365aa0fcb097a2413b1 commit: 5e80f12f5b688a9a6a022cdc27d88e8af58670cd Author: Justin Lecher gentoo org> AuthorDate: Tue Feb 23 09:29:10 2016 +0000 Commit: Justin Lecher gentoo org> CommitDate: Tue Feb 23 12:07:47 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e80f12f sys-fs/aufs4: Bump to latest aufs release Package-Manager: portage-2.2.27 Signed-off-by: Justin Lecher gentoo.org> sys-fs/aufs4/Manifest | 1 + sys-fs/aufs4/aufs4-0_pre20160223.ebuild | 183 ++++++++++++++++++++++++++++++++ 2 files changed, 184 insertions(+) diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest index e8b933e..13c7471 100644 --- a/sys-fs/aufs4/Manifest +++ b/sys-fs/aufs4/Manifest @@ -1 +1,2 @@ DIST aufs4-standalone-0_pre20160219.tar.xz 1049884 SHA256 22d0f723ff52190670da0e3dc4a3f0b81ba0b3b6f287484cf81165c6cd4b2040 SHA512 95999199ac0d430a6ab2dbda75f34d9640179865d5be3b1db119c1e613f5bd167193dd7cf662ebcea9d81ad8008d9dbd8dd835d5a7a297456f8587364e7f16b1 WHIRLPOOL a8b7a9c80c7715d0f75c9ee15e78bfbef2db11d4d9fea6ac1e8163f86b735c57b7e6a5612ac269fbcc2c483537a06c1e7704b9c3db2c7dff09b08d228ba607a1 +DIST aufs4-standalone-0_pre20160223.tar.xz 1072092 SHA256 46c9e0bb68902fb92028a435fab9d31a6193407af8c29d8ce0cdefd2e841b723 SHA512 adafd18416a43af076292ea216db73f0569f25ce34d03ebde5aea049745c47979cc4778eef8f671d48a5f7d7ac5751f788d286f467a106c6660412e88442b18e WHIRLPOOL c41763b4abb78afb291a4fbe7e1010ffc6c82a62a9d8b8b0cd23ecff65ae8f6142265f7de9f4e5ee260e0f98ca04f08881778ad7035ecde6e0c910d8a38e3be7 diff --git a/sys-fs/aufs4/aufs4-0_pre20160223.ebuild b/sys-fs/aufs4/aufs4-0_pre20160223.ebuild new file mode 100644 index 0000000..391d3e9 --- /dev/null +++ b/sys-fs/aufs4/aufs4-0_pre20160223.ebuild @@ -0,0 +1,183 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs + +AUFS_VERSION="${PV%%_p*}" +# highest branch version +PATCH_MAX_VER=4 +# highest supported version +KERN_MAX_VER=5 +# lowest supported version +KERN_MIN_VER=0 + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-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/aufs3" + +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 4 ${KERN_MIN_VER} 0 && \ + die "the kernel version isn't supported by upstream anymore. Please upgrade." + kernel_is gt 4 ${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}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then + PATCH_BRANCH="${KV_MINOR}".13+ + else + PATCH_BRANCH="${KV_MINOR}" + fi + + case ${KV_EXTRA} in + "") + elog "It seems you are using vanilla-sources with aufs4" + elog "Please use sys-kernel/aufs-sources with USE=vanilla" + elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade" + ;; + "-gentoo") + elog "It seems you are using gentoo-sources with aufs4" + elog "Please use sys-kernel/aufs-sources" + elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade" + ;; + esac + + pushd "${T}" &> /dev/null || die + 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 + + use pax_kernel && epatch "${FILESDIR}"/pax-4.patch + + sed \ + -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \ + -i 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 + + use doc && dodoc -r Documentation + + use kernel-patch || \ + doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch + + dodoc \ + Documentation/filesystems/aufs/README \ + "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_print_elog + linux-mod_pkg_postinst +}