commit: 33e9b1ddbff8508a869cde7025ced6f6b150412d Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jul 28 11:37:50 2018 +0000 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> CommitDate: Sat Jul 28 11:40:28 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e9b1dd
sys-fs/aufs4: Remove last-rited pkg Closes: https://bugs.gentoo.org/650126 profiles/package.mask | 5 - sys-fs/aufs4/Manifest | 14 --- sys-fs/aufs4/aufs4-0_pre20160219.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20160223.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20160627.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20160815.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20161010.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20161219.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20170130.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20170220.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20170313.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20170612.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20171002.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20171106.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20180219.ebuild | 184 -------------------------------- sys-fs/aufs4/aufs4-0_pre20180312.ebuild | 184 -------------------------------- sys-fs/aufs4/files/README.gentoo | 20 ---- sys-fs/aufs4/files/pax-4.patch | 89 --------------- sys-fs/aufs4/metadata.xml | 20 ---- 19 files changed, 2724 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 330441dbed3..d8608dfb9d4 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -429,11 +429,6 @@ media-libs/libglvnd # Masked for initial testing >=dev-db/mysql-connector-c++-8.0.0 -# Rick Farina <[email protected]> (04 Apr 2018) -# Violates PMS and does not work with stable portage. -# Masked for removal in 60 days, lift mask if bug #650126 is fixed -sys-fs/aufs4 - # Jeroen Roovers <[email protected]> (6 Apr 2018) # Requires >=dev-libs/icu-61.1 # https://bugs.gentoo.org/651698 diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest deleted file mode 100644 index d3fb157ba6f..00000000000 --- a/sys-fs/aufs4/Manifest +++ /dev/null @@ -1,14 +0,0 @@ -DIST aufs4-standalone-0_pre20160219.tar.xz 1049884 BLAKE2B 61a1059ddf1e7ea8338088f60f5b96112a723c18bedd508e8d35c89fc8354355b6db6ffc886d2fe09a12612b1fb790df7884315c6cfb0f60819f778b8db6f2af SHA512 95999199ac0d430a6ab2dbda75f34d9640179865d5be3b1db119c1e613f5bd167193dd7cf662ebcea9d81ad8008d9dbd8dd835d5a7a297456f8587364e7f16b1 -DIST aufs4-standalone-0_pre20160223.tar.xz 1072092 BLAKE2B 3aa9691be4fab031519d8f2b869d1225be9a6198d0a72efcf98b400a1cc220f2af7d32dc54228a52120c3cab3c887dc4e2b3b50f0f723a47a3da21219b0ed250 SHA512 adafd18416a43af076292ea216db73f0569f25ce34d03ebde5aea049745c47979cc4778eef8f671d48a5f7d7ac5751f788d286f467a106c6660412e88442b18e -DIST aufs4-standalone-0_pre20160627.tar.xz 1427036 BLAKE2B 69774951cec10bbd49999818a470924503b71f95d55db390314764a340ce5fec345eea50eef14e8b34459164546b61ff908827b39f442d5c9b117d60be972587 SHA512 c2e3d92fc6ca8968071a40d2773b63ec21fdd2bb12e8375dced30279ffcafcd06cacb0c20a6bb5378704c5de670426d0d92149bb5737507e3515b5df648e1b81 -DIST aufs4-standalone-0_pre20160815.tar.xz 1648360 BLAKE2B 75c228d82cf0c652c1281b1b9f6d7c95505065e2df7546871192a27ef39427d48e52e8b4520f50251b435bf9e711bd77290b0d1afa35cd9660ef88224d7304d1 SHA512 a9a86ce4fce04100704cce1acf04b8eeff6a2b81cc591d3ceeafa736a3a8e8fed59538f9301af6cb3ec496dd914b81a3134669ba8871624b2266cc3f731b9fae -DIST aufs4-standalone-0_pre20161010.tar.xz 1635556 BLAKE2B daae9be780c82ba44c94b5cd089f445e51df3a887987996d2bbb6285d65dfb210c75ef8aa8e217465330f43da71561cc7347eefbf1930da57f65d5c96950a2ff SHA512 520f47255ee33762f111f93ceeaaee9cf6136c13fb6968a7a7d49388c189e112875f076c5fecdad2123d137a2bc0b74e9c0e6e8913e75dfede30e7a65dd74616 -DIST aufs4-standalone-0_pre20161219.tar.xz 1823772 BLAKE2B 70ca052e2c8e716ef2c0921bab13b77d40126e49892d521dfec93b6b67518cbc6ae44293cfdc3fafa308b67e5d242ed319efe71f733c5ef3f128da682ad1edd2 SHA512 59fc0df19716d8f03e2547d98d6f412e921576d60afd783e5691a07c09b298ee61f491501e07ec154665a56d11b1887f94813ef5972254e6391251a48ba156c9 -DIST aufs4-standalone-0_pre20170130.tar.xz 1761280 BLAKE2B 7803ad55a6e10209554b359d8225e5f3208214fb011b3fb812b4a839e142a0611172268200e5b688bd233a4b1f8cbee7271a278da489759c1de574ec5da742af SHA512 beb121b36bb6056e48d5402b10bdfb8b6cd20d61b7d74221e5abd10226f58f40be1a0853e06a09cc1f94d50543030a9fd0a1c117570b1ad7467bf4156a1492ea -DIST aufs4-standalone-0_pre20170220.tar.xz 2115232 BLAKE2B 4db987bf926eca1d5d6e5c8cf9dc447f5d10c80575aac21504647ae490f4aa806f443dd2f9350451f02d3beb5bbd5f498133746ccf6ffc2738d508f242d7a8e0 SHA512 c68cf12573a0f3d9ec9419c63759d2b6f120eaafbbc005553c31d9c07b77d61612b903dc7ebdb2a8de8a52ded62e20b08cd32206b3cd3df196f0c1da82d472f7 -DIST aufs4-standalone-0_pre20170313.tar.xz 1883012 BLAKE2B 46ac87644085ece9f6a98043bd1cbc5f386d08a30227a16f798d68a69c0df7d7468ffafae1a41f757b56903ee8f3df900d45dfecb40b2069c6cd52f38f39cc8a SHA512 7d711e0ebdc38aa79d3b7cdb04c91f3029c233bacdadca87a8622d48826c261c678d6a2cda6b627a0db0f248b35448e0d9da30e2c8e2e42e3b1e3ae6327033ba -DIST aufs4-standalone-0_pre20170612.tar.xz 2017248 BLAKE2B 40fa98545d6ddd3685f9c56f7dc921f2215c451ed68e84720f30a196b7c10660b0930d12a110ef6c65364433a121a90b21eedadc8b5a2007217cbe0468100509 SHA512 2d0fd1dce7b1a421533e667420fc69a44c378753dccddc3768eebdb906a023e41378b38961004a58b1c4f2e3844c86f8cb4be238e634318a380881eab513acfa -DIST aufs4-standalone-0_pre20171002.tar.xz 2265048 BLAKE2B ae68812c547411bebd7e169e3bfa840536386a3cfdd876473f167372ec716c7df620329438c9024b185bb302d2053df5ded7026342a166d68187dc756a6e9560 SHA512 ee9d0e48fba6671fe4c5d3f533956c3eb0c6caa45fc4074be94f4427d84a5446cd4dc9f3ebf27fb56e697b24172ddd14a61c246f0414ebce8e372c204dfbb150 -DIST aufs4-standalone-0_pre20171106.tar.xz 2351120 BLAKE2B e29209475da3c39188eb9ec88bf91cd50d7d882fdd234e32e28741b500aa85427e98a23528a297f35562f81dc4f8e4932783917644b2eda0b4f2744ac15b700e SHA512 9a8c6f59b737133e423613365bb46fd197f05a93d459b6206a70807ffaa6763b7095b2f4780deb6e7882a2b464aaa185cf1760febbf3a674e8d0cf71c7ba72ee -DIST aufs4-standalone-0_pre20180219.tar.xz 2496676 BLAKE2B 61015534f74f9f2398b79643d9528c59f0069fefae3bf9382eea1f31db69fe22195ce8a929e2c25285b41fdc070d7f255effb6d408d3997d61dd83beda544452 SHA512 b667be0c2c2b9bcef66f81839364fa56871c2577b9b2389f0464b669a1404fd68928522bb5b3eb4c114b21b6e86201fb50eeaf167d194de187f305ebc0b75cb7 -DIST aufs4-standalone-0_pre20180312.tar.xz 2521856 BLAKE2B e226a6ba530fe9423d1671cee59501445cbc70419801420f6c5eb8c5fd3af3cce9301d9d32042ea8c4c704a847b4f46bd006c397871f7c9ee5dcb4e92c3ce7e9 SHA512 60e1dfb703706f21928645c51d1a4138187e7ea44d86ca5f2ee8a991a910974bc514340237a7c51397d658ca56e2cf32cfcf374eb8e060073266042e5ee42cee diff --git a/sys-fs/aufs4/aufs4-0_pre20160219.ebuild b/sys-fs/aufs4/aufs4-0_pre20160219.ebuild deleted file mode 100644 index cb3b25bc99a..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20160219.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20160223.ebuild b/sys-fs/aufs4/aufs4-0_pre20160223.ebuild deleted file mode 100644 index cb3b25bc99a..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20160223.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20160627.ebuild b/sys-fs/aufs4/aufs4-0_pre20160627.ebuild deleted file mode 100644 index 2ce209aa745..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20160627.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=5 -# highest supported version -KERN_MAX_VER=6 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20160815.ebuild b/sys-fs/aufs4/aufs4-0_pre20160815.ebuild deleted file mode 100644 index 2ce209aa745..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20160815.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=5 -# highest supported version -KERN_MAX_VER=6 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20161010.ebuild b/sys-fs/aufs4/aufs4-0_pre20161010.ebuild deleted file mode 100644 index 74da974872f..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20161010.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=8 -# highest supported version -KERN_MAX_VER=9 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20161219.ebuild b/sys-fs/aufs4/aufs4-0_pre20161219.ebuild deleted file mode 100644 index 74da974872f..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20161219.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=8 -# highest supported version -KERN_MAX_VER=9 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20170130.ebuild b/sys-fs/aufs4/aufs4-0_pre20170130.ebuild deleted file mode 100644 index ff94ecb3cd1..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20170130.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=9 -# highest supported version -KERN_MAX_VER=10 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20170220.ebuild b/sys-fs/aufs4/aufs4-0_pre20170220.ebuild deleted file mode 100644 index ff94ecb3cd1..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20170220.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=9 -# highest supported version -KERN_MAX_VER=10 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20170313.ebuild b/sys-fs/aufs4/aufs4-0_pre20170313.ebuild deleted file mode 100644 index 0be383f2e12..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20170313.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=9 -# highest supported version -KERN_MAX_VER=11 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20170612.ebuild b/sys-fs/aufs4/aufs4-0_pre20170612.ebuild deleted file mode 100644 index 551496bccb0..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20170612.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=10 -# highest supported version -KERN_MAX_VER=11 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20171002.ebuild b/sys-fs/aufs4/aufs4-0_pre20171002.ebuild deleted file mode 100644 index 2f61f36acc1..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20171002.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=13 -# highest supported version -KERN_MAX_VER=14 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20171106.ebuild b/sys-fs/aufs4/aufs4-0_pre20171106.ebuild deleted file mode 100644 index 2f61f36acc1..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20171106.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=13 -# highest supported version -KERN_MAX_VER=14 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20180219.ebuild b/sys-fs/aufs4/aufs4-0_pre20180219.ebuild deleted file mode 100644 index f2e2ccc44e6..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20180219.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=13 -# highest supported version -KERN_MAX_VER=15 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/aufs4-0_pre20180312.ebuild b/sys-fs/aufs4/aufs4-0_pre20180312.ebuild deleted file mode 100644 index 1917bdd71b8..00000000000 --- a/sys-fs/aufs4/aufs4-0_pre20180312.ebuild +++ /dev/null @@ -1,184 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -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=13 -# highest supported version -KERN_MAX_VER=16 -# 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 - - eapply_user -} - -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 -} diff --git a/sys-fs/aufs4/files/README.gentoo b/sys-fs/aufs4/files/README.gentoo deleted file mode 100644 index 64dfe94b4bd..00000000000 --- a/sys-fs/aufs4/files/README.gentoo +++ /dev/null @@ -1,20 +0,0 @@ -There several other patches in aufs3. They are all -optional. When you meet some problems, they will help you. You can find them -in the documentation directory. - - - aufs3-loopback.patch - Supports a nested loopback mount in a branch-fs. This patch is - unnecessary until aufs produces a message such like "you may want to try - another patch for loopback file". - - - vfs-ino.patch - Modifies a system global kernel internal function get_next_ino() in - order to stop assigning 0 for an inode-number. Not directly related to - aufs, but recommended generally. - - - tmpfs-idr.patch - Keeps the tmpfs inode number as the lowest value. Effective to reduce - the size of aufs XINO files for tmpfs branch. Also it prevents the - duplication of inode number, which is important for backup - tools, aubrsync or other utilities. When you find aufs XINO files for - tmpfs branch growing too much, try this patch. diff --git a/sys-fs/aufs4/files/pax-4.patch b/sys-fs/aufs4/files/pax-4.patch deleted file mode 100644 index cf216a5708c..00000000000 --- a/sys-fs/aufs4/files/pax-4.patch +++ /dev/null @@ -1,89 +0,0 @@ ---- a/fs/aufs/dynop.c 2012-10-09 15:41:32.652989534 -0400 -+++ b/fs/aufs/dynop.c 2012-10-09 15:41:58.562989820 -0400 -@@ -149,9 +149,11 @@ - #define DySet(func, dst, src, h_op, h_sb) do { \ - DyDbgInc(cnt); \ - if (h_op->func) { \ -- if (src.func) \ -- dst.func = src.func; \ -- else \ -+ if (src.func) { \ -+ pax_open_kernel(); \ -+ *(void **)&dst.func = src.func; \ -+ pax_close_kernel(); \ -+ } else \ - AuDbg("%s %s\n", au_sbtype(h_sb), #func); \ - } \ - } while (0) -@@ -159,7 +161,9 @@ - #define DySetForce(func, dst, src) do { \ - AuDebugOn(!src.func); \ - DyDbgInc(cnt); \ -- dst.func = src.func; \ -+ pax_open_kernel(); \ -+ *(void **)&dst.func = src.func; \ -+ pax_close_kernel(); \ - } while (0) - - #define DySetAop(func) \ -@@ -266,15 +270,17 @@ - */ - static void dy_adx(struct au_dyaop *dyaop, int do_dx) - { -+ pax_open_kernel(); - if (!do_dx) { -- dyaop->da_op.direct_IO = NULL; -- dyaop->da_op.get_xip_mem = NULL; -+ *(void **)&dyaop->da_op.direct_IO = NULL; -+ *(void **)&dyaop->da_op.get_xip_mem = NULL; - } else { -- dyaop->da_op.direct_IO = aufs_aop.direct_IO; -- dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem; -+ *(void **)&dyaop->da_op.direct_IO = aufs_aop.direct_IO; -+ *(void **)&dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem; - if (!dyaop->da_get_xip_mem) -- dyaop->da_op.get_xip_mem = NULL; -+ *(void **)&dyaop->da_op.get_xip_mem = NULL; - } -+ pax_close_kernel(); - } - - static struct au_dyaop *dy_aget(struct au_branch *br, ---- a/fs/aufs/f_op_sp.c 2012-10-09 15:41:32.652989534 -0400 -+++ b/fs/aufs/f_op_sp.c 2012-10-09 15:41:58.562989820 -0400 -@@ -104,7 +104,7 @@ - static int aufs_open_sp(struct inode *inode, struct file *file); - static struct au_sp_fop { - int done; -- struct file_operations fop; /* not 'const' */ -+ file_operations_no_const fop; /* not 'const' */ - spinlock_t spin; - } au_sp_fop[AuSp_Last] = { - [AuSp_FIFO] = { -@@ -157,8 +157,10 @@ - h_file = au_hf_top(file); - spin_lock(&p->spin); - if (!p->done) { -- p->fop = *h_file->f_op; -+ pax_open_kernel(); -+ memcpy((void *)&p->fop, h_file->f_op, sizeof(p->fop)); - p->fop.owner = THIS_MODULE; -+ pax_close_kernel(); - if (p->fop.aio_read) - p->fop.aio_read = aufs_aio_read_sp; - if (p->fop.aio_write) ---- a/fs/aufs/sysfs.c 2013-10-20 17:08:37.000000000 -0400 -+++ b/fs/aufs/sysfs.c 2013-10-19 17:08:29.000000000 -0400 -@@ -233,8 +233,10 @@ - for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) { - attr = &br_sysfs->attr; - sysfs_attr_init(attr); -- attr->name = br_sysfs->name; -- attr->mode = S_IRUGO; -+ pax_open_kernel(); -+ *(void **)&attr->name = br_sysfs->name; -+ *(void **)&attr->mode = S_IRUGO; -+ pax_close_kernel(); - br_sysfs++; - } - } diff --git a/sys-fs/aufs4/metadata.xml b/sys-fs/aufs4/metadata.xml deleted file mode 100644 index f0e5c642768..00000000000 --- a/sys-fs/aufs4/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> -<pkgmetadata> - <maintainer type="person"> - <email>[email protected]</email> - </maintainer> - <use> - <flag name="debug">Enable additional debugging support</flag> - <flag name="hfs">Enable hfs support</flag> - <flag name="fuse">Enable fuse support</flag> - <flag name="inotify">Enable inotify support</flag> - <flag name="kernel-patch">Patch the current kernel for aufs3 support</flag> - <flag name="nfs">Enable support for nfs export</flag> - <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag> - <flag name="ramfs">Enable initramfs/rootfs support</flag> - </use> - <upstream> - <remote-id type="sourceforge">aufs</remote-id> - </upstream> -</pkgmetadata>
