commit: a95a109ee3764449f885760fd08b628185977163 Author: Michał Górny <mgorny <AT> gentoo <DOT> org> AuthorDate: Sat Jul 28 11:37:23 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=a95a109e
sys-fs/aufs3: Remove last-rited pkg Closes: https://bugs.gentoo.org/650126 profiles/package.mask | 1 - sys-fs/aufs3/Manifest | 5 - sys-fs/aufs3/aufs3-3_p20160219.ebuild | 184 ---------------------------------- sys-fs/aufs3/aufs3-3_p20160223.ebuild | 184 ---------------------------------- sys-fs/aufs3/aufs3-3_p20160627.ebuild | 184 ---------------------------------- sys-fs/aufs3/aufs3-3_p20160815.ebuild | 184 ---------------------------------- sys-fs/aufs3/aufs3-3_p20160822.ebuild | 184 ---------------------------------- sys-fs/aufs3/files/README.gentoo | 20 ---- sys-fs/aufs3/files/pax-3.11.patch | 89 ---------------- sys-fs/aufs3/metadata.xml | 20 ---- 10 files changed, 1055 deletions(-) diff --git a/profiles/package.mask b/profiles/package.mask index 8c56e8d6082..330441dbed3 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -432,7 +432,6 @@ media-libs/libglvnd # Rick Farina <zeroch...@gentoo.org> (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/aufs3 sys-fs/aufs4 # Jeroen Roovers <j...@gentoo.org> (6 Apr 2018) diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest deleted file mode 100644 index f417411d215..00000000000 --- a/sys-fs/aufs3/Manifest +++ /dev/null @@ -1,5 +0,0 @@ -DIST aufs3-standalone-3_p20160219.tar.xz 3256736 BLAKE2B e76a3d239b8b3d4325b33158aebd6154c52f56b5ddcfa997c148e00fcaa8b4af5daaa6794f81d2fd6e45f540815fdb89b71b2b9f861252a2569b34ee11698909 SHA512 af65cb3d9890c05ec24d64d27759d8c0fa98f35887d62a7ec77ebc496ec9de02563bc5a3e05b67c342926b062fe077c7a8de543291177a4e0210b2159027e1af -DIST aufs3-standalone-3_p20160223.tar.xz 3270932 BLAKE2B 12ce1f1b4babc70521e27f835f504c9779148b525c2b041f4c02f628517fee72915474ccbffe63ac1eb309e6ec5430d5c1359b5b83e7a89df5a69b2ba53fa0c7 SHA512 37805b54a2471def5948d3484349de7bfc4fee09788b36b9589aba2006484cf330bb642f27862d74a528999cf2e7fa4888b5d46b54bb3e7f8468c6857f34730f -DIST aufs3-standalone-3_p20160627.tar.xz 3443904 BLAKE2B df8d6917bc7141b024315ff4ff3d175dd78146f856c3d8e8b6889fd13cbf67887cc543353bb1643cde927b50b7858711d305b2bb71cab79211fbb2dbbb629224 SHA512 6c6256d5f042dbcde26abfb665fdfd8eee4193104fc3270371fdf503a560dd888b5306e3cfe4c6a1f95cd669b41279573dfc54aec8b5b5327220fa055bbbdb3d -DIST aufs3-standalone-3_p20160815.tar.xz 3501932 BLAKE2B 49fb402f6f651ed46a6d71011a2e581dda857f01deb632d7a2581ef3b68d3c7939692f30a61b1b3adb401d1ee1f4274f0c0ed0c5cb31ea17cff2c61dd47e56e0 SHA512 502a1516e0e9f307a9e29669799f9572b225b38ed7c790130bd9d9c01fcb83d2bf81ca5d27136827b595838e9ee42544d9be130bf632be6a61cdf7e07d0f9676 -DIST aufs3-standalone-3_p20160822.tar.xz 3515768 BLAKE2B dd41a95d807a83aa958ff6e1e9d265b9ad8170ac4b93243ed73baa205fd80097172b5891d11fe30b13e78649d6bd58bb054ac179ee4c98dab7b76519e8678e91 SHA512 b3f6dc4883f565f73a81ff3aaf90bdca41419fe506c16b027e471e9901dce83a1e4d7a217574b686389433e2d7b280a53c0dbe805fad709f83cd5a689a53cc13 diff --git a/sys-fs/aufs3/aufs3-3_p20160219.ebuild b/sys-fs/aufs3/aufs3-3_p20160219.ebuild deleted file mode 100644 index 8c40ec61abb..00000000000 --- a/sys-fs/aufs3/aufs3-3_p20160219.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=19 -# highest supported version -KERN_MAX_VER=20 -# lowest supported version -KERN_MIN_VER=18 - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/"; -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" - -DEPEND=" - dev-util/patchutils - dev-vcs/git" -RDEPEND=" - sys-fs/aufs-util - !sys-fs/aufs - !sys-fs/aufs2 - !sys-fs/aufs4" - -S="${WORKDIR}"/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - CONFIG_CHECK+=" !AUFS_FS" - use inotify && CONFIG_CHECK+=" ~FSNOTIFY" - use nfs && CONFIG_CHECK+=" EXPORTFS" - use fuse && CONFIG_CHECK+=" ~FUSE_FS" - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" - use pax_kernel && CONFIG_CHECK+=" PAX" \ - && ERROR_PAX="Please use hardened sources" - - # this is needed so merging a binpkg ${PN} is - # possible w/out a kernel unpacked on the system - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return - - get_version - kernel_is lt 3 ${KERN_MIN_VER} 0 && \ - die "the kernel version isn't supported by upstream anymore. Please upgrade." - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" - - linux-mod_pkg_setup - - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then - PATCH_BRANCH="x-rcN" - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then - PATCH_BRANCH="${KV_MINOR}".25+ - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then - PATCH_BRANCH="${KV_MINOR}".1+ - else - PATCH_BRANCH="${KV_MINOR}" - fi - - case ${KV_EXTRA} in - "") - elog "It seems you are using vanilla-sources with aufs3" - elog "Please use sys-kernel/aufs-sources with USE=vanilla" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - "-gentoo") - elog "It seems you are using gentoo-sources with aufs3" - elog "Please use sys-kernel/aufs-sources" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - esac - - pushd "${T}" &> /dev/null || 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-3.11.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/{aufs3-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/aufs3/aufs3-3_p20160223.ebuild b/sys-fs/aufs3/aufs3-3_p20160223.ebuild deleted file mode 100644 index 2a786f02ab2..00000000000 --- a/sys-fs/aufs3/aufs3-3_p20160223.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=19 -# highest supported version -KERN_MAX_VER=20 -# lowest supported version -KERN_MIN_VER=18 - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/"; -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" - -DEPEND=" - dev-util/patchutils - dev-vcs/git" -RDEPEND=" - sys-fs/aufs-util - !sys-fs/aufs - !sys-fs/aufs2 - !sys-fs/aufs4" - -S="${WORKDIR}"/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - CONFIG_CHECK+=" !AUFS_FS" - use inotify && CONFIG_CHECK+=" ~FSNOTIFY" - use nfs && CONFIG_CHECK+=" EXPORTFS" - use fuse && CONFIG_CHECK+=" ~FUSE_FS" - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" - use pax_kernel && CONFIG_CHECK+=" PAX" \ - && ERROR_PAX="Please use hardened sources" - - # this is needed so merging a binpkg ${PN} is - # possible w/out a kernel unpacked on the system - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return - - get_version - kernel_is lt 3 ${KERN_MIN_VER} 0 && \ - die "the kernel version isn't supported by upstream anymore. Please upgrade." - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" - - linux-mod_pkg_setup - - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then - PATCH_BRANCH="x-rcN" - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then - PATCH_BRANCH="${KV_MINOR}".25+ - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then - PATCH_BRANCH="${KV_MINOR}".1+ - else - PATCH_BRANCH="${KV_MINOR}" - fi - - case ${KV_EXTRA} in - "") - elog "It seems you are using vanilla-sources with aufs3" - elog "Please use sys-kernel/aufs-sources with USE=vanilla" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - "-gentoo") - elog "It seems you are using gentoo-sources with aufs3" - elog "Please use sys-kernel/aufs-sources" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - esac - - pushd "${T}" &> /dev/null || 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-3.11.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/{aufs3-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/aufs3/aufs3-3_p20160627.ebuild b/sys-fs/aufs3/aufs3-3_p20160627.ebuild deleted file mode 100644 index 2a786f02ab2..00000000000 --- a/sys-fs/aufs3/aufs3-3_p20160627.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=19 -# highest supported version -KERN_MAX_VER=20 -# lowest supported version -KERN_MIN_VER=18 - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/"; -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" - -DEPEND=" - dev-util/patchutils - dev-vcs/git" -RDEPEND=" - sys-fs/aufs-util - !sys-fs/aufs - !sys-fs/aufs2 - !sys-fs/aufs4" - -S="${WORKDIR}"/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - CONFIG_CHECK+=" !AUFS_FS" - use inotify && CONFIG_CHECK+=" ~FSNOTIFY" - use nfs && CONFIG_CHECK+=" EXPORTFS" - use fuse && CONFIG_CHECK+=" ~FUSE_FS" - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" - use pax_kernel && CONFIG_CHECK+=" PAX" \ - && ERROR_PAX="Please use hardened sources" - - # this is needed so merging a binpkg ${PN} is - # possible w/out a kernel unpacked on the system - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return - - get_version - kernel_is lt 3 ${KERN_MIN_VER} 0 && \ - die "the kernel version isn't supported by upstream anymore. Please upgrade." - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" - - linux-mod_pkg_setup - - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then - PATCH_BRANCH="x-rcN" - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then - PATCH_BRANCH="${KV_MINOR}".25+ - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then - PATCH_BRANCH="${KV_MINOR}".1+ - else - PATCH_BRANCH="${KV_MINOR}" - fi - - case ${KV_EXTRA} in - "") - elog "It seems you are using vanilla-sources with aufs3" - elog "Please use sys-kernel/aufs-sources with USE=vanilla" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - "-gentoo") - elog "It seems you are using gentoo-sources with aufs3" - elog "Please use sys-kernel/aufs-sources" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - esac - - pushd "${T}" &> /dev/null || 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-3.11.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/{aufs3-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/aufs3/aufs3-3_p20160815.ebuild b/sys-fs/aufs3/aufs3-3_p20160815.ebuild deleted file mode 100644 index 2a786f02ab2..00000000000 --- a/sys-fs/aufs3/aufs3-3_p20160815.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=19 -# highest supported version -KERN_MAX_VER=20 -# lowest supported version -KERN_MIN_VER=18 - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/"; -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" - -DEPEND=" - dev-util/patchutils - dev-vcs/git" -RDEPEND=" - sys-fs/aufs-util - !sys-fs/aufs - !sys-fs/aufs2 - !sys-fs/aufs4" - -S="${WORKDIR}"/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - CONFIG_CHECK+=" !AUFS_FS" - use inotify && CONFIG_CHECK+=" ~FSNOTIFY" - use nfs && CONFIG_CHECK+=" EXPORTFS" - use fuse && CONFIG_CHECK+=" ~FUSE_FS" - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" - use pax_kernel && CONFIG_CHECK+=" PAX" \ - && ERROR_PAX="Please use hardened sources" - - # this is needed so merging a binpkg ${PN} is - # possible w/out a kernel unpacked on the system - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return - - get_version - kernel_is lt 3 ${KERN_MIN_VER} 0 && \ - die "the kernel version isn't supported by upstream anymore. Please upgrade." - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" - - linux-mod_pkg_setup - - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then - PATCH_BRANCH="x-rcN" - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then - PATCH_BRANCH="${KV_MINOR}".25+ - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then - PATCH_BRANCH="${KV_MINOR}".1+ - else - PATCH_BRANCH="${KV_MINOR}" - fi - - case ${KV_EXTRA} in - "") - elog "It seems you are using vanilla-sources with aufs3" - elog "Please use sys-kernel/aufs-sources with USE=vanilla" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - "-gentoo") - elog "It seems you are using gentoo-sources with aufs3" - elog "Please use sys-kernel/aufs-sources" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - esac - - pushd "${T}" &> /dev/null || 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-3.11.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/{aufs3-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/aufs3/aufs3-3_p20160822.ebuild b/sys-fs/aufs3/aufs3-3_p20160822.ebuild deleted file mode 100644 index 2a786f02ab2..00000000000 --- a/sys-fs/aufs3/aufs3-3_p20160822.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=19 -# highest supported version -KERN_MAX_VER=20 -# lowest supported version -KERN_MIN_VER=18 - -DESCRIPTION="An entirely re-designed and re-implemented Unionfs" -HOMEPAGE="http://aufs.sourceforge.net/"; -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"; - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs" - -DEPEND=" - dev-util/patchutils - dev-vcs/git" -RDEPEND=" - sys-fs/aufs-util - !sys-fs/aufs - !sys-fs/aufs2 - !sys-fs/aufs4" - -S="${WORKDIR}"/${PN}-standalone - -MODULE_NAMES="aufs(misc:${S})" - -pkg_setup() { - CONFIG_CHECK+=" !AUFS_FS" - use inotify && CONFIG_CHECK+=" ~FSNOTIFY" - use nfs && CONFIG_CHECK+=" EXPORTFS" - use fuse && CONFIG_CHECK+=" ~FUSE_FS" - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS" - use pax_kernel && CONFIG_CHECK+=" PAX" \ - && ERROR_PAX="Please use hardened sources" - - # this is needed so merging a binpkg ${PN} is - # possible w/out a kernel unpacked on the system - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return - - get_version - kernel_is lt 3 ${KERN_MIN_VER} 0 && \ - die "the kernel version isn't supported by upstream anymore. Please upgrade." - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" - - linux-mod_pkg_setup - - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then - PATCH_BRANCH="x-rcN" - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then - PATCH_BRANCH="${KV_MINOR}".25+ - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then - PATCH_BRANCH="${KV_MINOR}".1+ - else - PATCH_BRANCH="${KV_MINOR}" - fi - - case ${KV_EXTRA} in - "") - elog "It seems you are using vanilla-sources with aufs3" - elog "Please use sys-kernel/aufs-sources with USE=vanilla" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - "-gentoo") - elog "It seems you are using gentoo-sources with aufs3" - elog "Please use sys-kernel/aufs-sources" - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" - ;; - esac - - pushd "${T}" &> /dev/null || 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-3.11.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/{aufs3-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/aufs3/files/README.gentoo b/sys-fs/aufs3/files/README.gentoo deleted file mode 100644 index 64dfe94b4bd..00000000000 --- a/sys-fs/aufs3/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/aufs3/files/pax-3.11.patch b/sys-fs/aufs3/files/pax-3.11.patch deleted file mode 100644 index cf216a5708c..00000000000 --- a/sys-fs/aufs3/files/pax-3.11.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/aufs3/metadata.xml b/sys-fs/aufs3/metadata.xml deleted file mode 100644 index f0e5c642768..00000000000 --- a/sys-fs/aufs3/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>j...@gentoo.org</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>
