From e3872864be25f7421015bef2732fa57c0c9fb726 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 4 Aug 2018 08:53:53 +0100 Subject: gentoo resync : 04.08.2018 --- sys-fs/Manifest.gz | Bin 22008 -> 21856 bytes sys-fs/aufs3/Manifest | 13 - 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 - sys-fs/aufs4/Manifest | 31 -- 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 - sys-fs/davl/Manifest | 2 +- sys-fs/davl/davl-1.2.4-r2.ebuild | 4 +- sys-fs/fatresize/Manifest | 4 + sys-fs/fatresize/fatresize-1.0.4.ebuild | 28 ++ .../fatresize/files/fatresize-1.0.4-version.patch | 9 + sys-fs/fatresize/metadata.xml | 7 + sys-fs/lsscsi/Manifest | 2 + sys-fs/lsscsi/lsscsi-0.30.ebuild | 14 + sys-fs/mtpfs/Manifest | 3 +- .../files/mtpfs-1.1-unitialized-variable.patch | 4 +- sys-fs/mtpfs/mtpfs-1.1-r4.ebuild | 55 +++ sys-fs/udev/Manifest | 11 +- sys-fs/udev/files/233-fix-includes.patch | 38 -- sys-fs/udev/files/233-format-warnings.patch | 84 ---- sys-fs/udev/metadata.xml | 2 - sys-fs/udev/udev-216.ebuild | 485 --------------------- sys-fs/udev/udev-225-r1.ebuild | 426 ------------------ sys-fs/udev/udev-233.ebuild | 405 ----------------- sys-fs/zfs-kmod/Manifest | 6 +- sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild | 2 +- sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild | 2 +- sys-fs/zfs-kmod/zfs-kmod-9999.ebuild | 2 +- 50 files changed, 133 insertions(+), 5260 deletions(-) delete mode 100644 sys-fs/aufs3/Manifest delete mode 100644 sys-fs/aufs3/aufs3-3_p20160219.ebuild delete mode 100644 sys-fs/aufs3/aufs3-3_p20160223.ebuild delete mode 100644 sys-fs/aufs3/aufs3-3_p20160627.ebuild delete mode 100644 sys-fs/aufs3/aufs3-3_p20160815.ebuild delete mode 100644 sys-fs/aufs3/aufs3-3_p20160822.ebuild delete mode 100644 sys-fs/aufs3/files/README.gentoo delete mode 100644 sys-fs/aufs3/files/pax-3.11.patch delete mode 100644 sys-fs/aufs3/metadata.xml delete mode 100644 sys-fs/aufs4/Manifest delete mode 100644 sys-fs/aufs4/aufs4-0_pre20160219.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20160223.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20160627.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20160815.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20161010.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20161219.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20170130.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20170220.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20170313.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20170612.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20171002.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20171106.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20180219.ebuild delete mode 100644 sys-fs/aufs4/aufs4-0_pre20180312.ebuild delete mode 100644 sys-fs/aufs4/files/README.gentoo delete mode 100644 sys-fs/aufs4/files/pax-4.patch delete mode 100644 sys-fs/aufs4/metadata.xml create mode 100644 sys-fs/fatresize/Manifest create mode 100644 sys-fs/fatresize/fatresize-1.0.4.ebuild create mode 100644 sys-fs/fatresize/files/fatresize-1.0.4-version.patch create mode 100644 sys-fs/fatresize/metadata.xml create mode 100644 sys-fs/lsscsi/lsscsi-0.30.ebuild create mode 100644 sys-fs/mtpfs/mtpfs-1.1-r4.ebuild delete mode 100644 sys-fs/udev/files/233-fix-includes.patch delete mode 100644 sys-fs/udev/files/233-format-warnings.patch delete mode 100644 sys-fs/udev/udev-216.ebuild delete mode 100644 sys-fs/udev/udev-225-r1.ebuild delete mode 100644 sys-fs/udev/udev-233.ebuild (limited to 'sys-fs') diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz index 3b3a9b6435f2..aac62723232f 100644 Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest deleted file mode 100644 index d970d3e1fc8a..000000000000 --- a/sys-fs/aufs3/Manifest +++ /dev/null @@ -1,13 +0,0 @@ -AUX README.gentoo 911 BLAKE2B 7575bac5a6bb7788b2c96797d27030f5029816a28bd5495feb56c41ac016ca2dbea5d3220ef2c386229bacb875ef6912a122c394045a7669a106ef8e0ecd15cb SHA512 f22f1e1fae62c7a03230194c05701dc03502b84a52cfc8aacb5fbfab2c1f8bed9d4f3f97d0095578d497b09f818a3a45a04ef8527983e0cbfa9db10baeb1b691 -AUX pax-3.11.patch 2722 BLAKE2B b501869ab70073fac83f645ecc1e5c7fc27a6670fa18b1aff65dde47eeed59760c34941b549d0d800ad629f5faedc3e9f7c386e2b55d15d75623eb6a3e0885e1 SHA512 dc7e8eba4aa01552ec0d44636db99aa7c3d9af11f1182165ad7da383f9ed4cd92e4b9aef779b3d2bcb62797fd7d673ae35294ee1b9b768320be5bb5a03893de8 -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 -EBUILD aufs3-3_p20160219.ebuild 5163 BLAKE2B 6d716342ddf33967c636176dc8d64650a1855f0f0f01a09f197a5d76c5f41e22885f4b86357e35c23e04b99f173a9c9f77b19b07e566e19458f90ed74ca1fa72 SHA512 67991d3aa05dfc4589d86022c9f088f05d8ce9b802e9eba9bf7433e98462a6ca5f2811080e28341383f2fddc3f35fdcef64c8899060d42b5e1c215afa4ba3151 -EBUILD aufs3-3_p20160223.ebuild 5165 BLAKE2B c8f9063a6e7075cc159a101ce3c4d719d2c9aa823af43ddc155d60c3c13a6a188a1aff11d3d427eba376f7bd9c0254b05908d56cf50e6e05692da6885f99c5e8 SHA512 fa351d2b7b80bc8ea214e709fabaff8c04afca77133207cf0f991268c5f23482d622d5d61a6246486bece5deec5d70656d4db330736fab7dceb35c7af391e216 -EBUILD aufs3-3_p20160627.ebuild 5165 BLAKE2B c8f9063a6e7075cc159a101ce3c4d719d2c9aa823af43ddc155d60c3c13a6a188a1aff11d3d427eba376f7bd9c0254b05908d56cf50e6e05692da6885f99c5e8 SHA512 fa351d2b7b80bc8ea214e709fabaff8c04afca77133207cf0f991268c5f23482d622d5d61a6246486bece5deec5d70656d4db330736fab7dceb35c7af391e216 -EBUILD aufs3-3_p20160815.ebuild 5165 BLAKE2B c8f9063a6e7075cc159a101ce3c4d719d2c9aa823af43ddc155d60c3c13a6a188a1aff11d3d427eba376f7bd9c0254b05908d56cf50e6e05692da6885f99c5e8 SHA512 fa351d2b7b80bc8ea214e709fabaff8c04afca77133207cf0f991268c5f23482d622d5d61a6246486bece5deec5d70656d4db330736fab7dceb35c7af391e216 -EBUILD aufs3-3_p20160822.ebuild 5165 BLAKE2B c8f9063a6e7075cc159a101ce3c4d719d2c9aa823af43ddc155d60c3c13a6a188a1aff11d3d427eba376f7bd9c0254b05908d56cf50e6e05692da6885f99c5e8 SHA512 fa351d2b7b80bc8ea214e709fabaff8c04afca77133207cf0f991268c5f23482d622d5d61a6246486bece5deec5d70656d4db330736fab7dceb35c7af391e216 -MISC metadata.xml 809 BLAKE2B fd2f52def4a155a56b0ef2d20f1abac271cc9e55eb4d1164cc7f0686180ab1397c897220e71c7075bb148632f45d30a00fbe7c2513424b44b122a31e5d432c2f SHA512 043c012f55866721363c82fd80007c4ed8420fd8eec95459aac9fb913d855a0be5f135035ba5e3fcab668641ca61897d71ea8e48c1d45f171d418c812620d576 diff --git a/sys-fs/aufs3/aufs3-3_p20160219.ebuild b/sys-fs/aufs3/aufs3-3_p20160219.ebuild deleted file mode 100644 index 8c40ec61abbe..000000000000 --- 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 2a786f02ab2c..000000000000 --- 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 2a786f02ab2c..000000000000 --- 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 2a786f02ab2c..000000000000 --- 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 2a786f02ab2c..000000000000 --- 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 64dfe94b4bda..000000000000 --- 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 cf216a5708ca..000000000000 --- 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 f0e5c642768d..000000000000 --- a/sys-fs/aufs3/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - jlec@gentoo.org - - - Enable additional debugging support - Enable hfs support - Enable fuse support - Enable inotify support - Patch the current kernel for aufs3 support - Enable support for nfs export - Apply patch needed for pax enabled kernels - Enable initramfs/rootfs support - - - aufs - - diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest deleted file mode 100644 index 9981295669e3..000000000000 --- a/sys-fs/aufs4/Manifest +++ /dev/null @@ -1,31 +0,0 @@ -AUX README.gentoo 911 BLAKE2B 7575bac5a6bb7788b2c96797d27030f5029816a28bd5495feb56c41ac016ca2dbea5d3220ef2c386229bacb875ef6912a122c394045a7669a106ef8e0ecd15cb SHA512 f22f1e1fae62c7a03230194c05701dc03502b84a52cfc8aacb5fbfab2c1f8bed9d4f3f97d0095578d497b09f818a3a45a04ef8527983e0cbfa9db10baeb1b691 -AUX pax-4.patch 2722 BLAKE2B b501869ab70073fac83f645ecc1e5c7fc27a6670fa18b1aff65dde47eeed59760c34941b549d0d800ad629f5faedc3e9f7c386e2b55d15d75623eb6a3e0885e1 SHA512 dc7e8eba4aa01552ec0d44636db99aa7c3d9af11f1182165ad7da383f9ed4cd92e4b9aef779b3d2bcb62797fd7d673ae35294ee1b9b768320be5bb5a03893de8 -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 -EBUILD aufs4-0_pre20160219.ebuild 5069 BLAKE2B c57f8b6f2917b74c1c4715b1314087b5a7c3a9fc06c6124358e36e9a3677489aad587e616db120f2026302315940370597812642ac2dcfd3d95fc65480552b5d SHA512 5482bc519f49fe439f6cdc5e2a5c7041fe9359ca6804f9757f6d3b1a5ca9387e4e52735500a5c1038a6f21e22684039811fab51afb337d123980cf14132fa6f7 -EBUILD aufs4-0_pre20160223.ebuild 5069 BLAKE2B c57f8b6f2917b74c1c4715b1314087b5a7c3a9fc06c6124358e36e9a3677489aad587e616db120f2026302315940370597812642ac2dcfd3d95fc65480552b5d SHA512 5482bc519f49fe439f6cdc5e2a5c7041fe9359ca6804f9757f6d3b1a5ca9387e4e52735500a5c1038a6f21e22684039811fab51afb337d123980cf14132fa6f7 -EBUILD aufs4-0_pre20160627.ebuild 5069 BLAKE2B 03f78d0d097baee870a08f47162aaa24ebdfd48dc20e2556405433d77b3d60bd1c79d23fa99998e12438f806549580d8d0ae7ca1ee161b8e655915c999176361 SHA512 ee12cf58211697584c8314b46acc150c8e0e1ecf4a003883c0e9666df128d2298f46506e6248e1671e3a8ea677336331e4e98502a3d8636821023e29fe446ba4 -EBUILD aufs4-0_pre20160815.ebuild 5069 BLAKE2B 03f78d0d097baee870a08f47162aaa24ebdfd48dc20e2556405433d77b3d60bd1c79d23fa99998e12438f806549580d8d0ae7ca1ee161b8e655915c999176361 SHA512 ee12cf58211697584c8314b46acc150c8e0e1ecf4a003883c0e9666df128d2298f46506e6248e1671e3a8ea677336331e4e98502a3d8636821023e29fe446ba4 -EBUILD aufs4-0_pre20161010.ebuild 5069 BLAKE2B 49a99f3293ac8c5fb27867335bed6d35b6fc14490955466e77be36b3a689d53bffbe8bc899927abfe06bde1d55e32c7ff29f68d7590a34e43be67934653ec43a SHA512 fd486f8b5c4447479686aeb65d15f5992c20d72c31e6524cb4ced86a7ef4f96bd36d9f2a3252d87beda191f80bc7e042fe57ad7bf3335bf796813d59293a90a0 -EBUILD aufs4-0_pre20161219.ebuild 5069 BLAKE2B 49a99f3293ac8c5fb27867335bed6d35b6fc14490955466e77be36b3a689d53bffbe8bc899927abfe06bde1d55e32c7ff29f68d7590a34e43be67934653ec43a SHA512 fd486f8b5c4447479686aeb65d15f5992c20d72c31e6524cb4ced86a7ef4f96bd36d9f2a3252d87beda191f80bc7e042fe57ad7bf3335bf796813d59293a90a0 -EBUILD aufs4-0_pre20170130.ebuild 5070 BLAKE2B 1a768b97ef65e5e13b5232df5a59ec8dbc30291b055a734cbcd73c31be4ededcb29342314161989af7ef5e1173448a4574916bd20b8caec37a3bf1166416ffc0 SHA512 756b514a6d2d86692e872a2e513f95ae9b0387b44d1ffdd506eb9c698eef74b601de45d24dd02e75610aa8e6fbef91bd44c10b34c006a3cdad17b74b8d17a5b5 -EBUILD aufs4-0_pre20170220.ebuild 5070 BLAKE2B 1a768b97ef65e5e13b5232df5a59ec8dbc30291b055a734cbcd73c31be4ededcb29342314161989af7ef5e1173448a4574916bd20b8caec37a3bf1166416ffc0 SHA512 756b514a6d2d86692e872a2e513f95ae9b0387b44d1ffdd506eb9c698eef74b601de45d24dd02e75610aa8e6fbef91bd44c10b34c006a3cdad17b74b8d17a5b5 -EBUILD aufs4-0_pre20170313.ebuild 5070 BLAKE2B 89ca6fd4bf156461e2ed89c084a91b114cca675caff0be7ea6a52c7302c29e9b18a30ad34659a718248759e2877cb438a7aa4b8d61df60e5791cebbd91e30947 SHA512 7af320fd64d5da1edfd1a5c2eb4b433a2b03c9ee85cc6d40e71af086856589cc66d92336223a4d36c2ec08cabf1bf5c8f225b9935f3da86429718752efaca939 -EBUILD aufs4-0_pre20170612.ebuild 5071 BLAKE2B 085a65234f9876aa1f384c6dd0268abf7db6a6f05019cca2162277a0984adcac5ee2c12546f8be802f5fa634ab1973bf7e5acb8d1f5527d818d0c6ad41e6ad72 SHA512 967961b3757a59705eddb781d470893deb54080fa70f52609d0228830fafb94737dd40b5e3269601b92f50e65795738809c1bde433949f9f504a575639e0d3b3 -EBUILD aufs4-0_pre20171002.ebuild 5071 BLAKE2B 4880e26029183fa18ab0bc5df9af980810ce036340d0d834fcfd168ab8021f57ba8a9c1f8232511df875c42a860aeba02d5eb7913ee0db7014d2c3dbd63bfee2 SHA512 f345d4d1bc473bbb8e46ff468f9ccd89c1b49ccfacc75b8807fd30670af447b930ebba4b67a19dfffd1c7d299793431c0d8168f2bf7ae42e46e5cb36afcb9aca -EBUILD aufs4-0_pre20171106.ebuild 5071 BLAKE2B 4880e26029183fa18ab0bc5df9af980810ce036340d0d834fcfd168ab8021f57ba8a9c1f8232511df875c42a860aeba02d5eb7913ee0db7014d2c3dbd63bfee2 SHA512 f345d4d1bc473bbb8e46ff468f9ccd89c1b49ccfacc75b8807fd30670af447b930ebba4b67a19dfffd1c7d299793431c0d8168f2bf7ae42e46e5cb36afcb9aca -EBUILD aufs4-0_pre20180219.ebuild 5071 BLAKE2B 0c349c6ca4b487c2878d522df58f36d3208006e9d435cca68305209c910dbf093ad0b7670e9041d1af90ae1bacfd399b6233d57cba721bc9777eddf1d668828f SHA512 6d76fb718d2d5f9a2e3df5ecc1b2c37f174085e1dbc5f7483850e313bfe9d49115439161c2b1b294abab8eb8a0464317c992da6885bc291f3fbc0ef03f2a92bb -EBUILD aufs4-0_pre20180312.ebuild 5071 BLAKE2B 00121f1ea8244f49692666be28059379f9bdf595c7631c510a5016e2c51ae8de90f89593073991825d46fb9aadc2b1a7492f21fc60ab8c4a03f77126974355c7 SHA512 4f67e80ce62e3267bfe2dedcdace83a58e1cdf415707bbd69476d6dc4ed4ae473e4b499040a431b01dc7bed4de1ab2efd3230588d50bc4d25d6f1523a0045e12 -MISC metadata.xml 809 BLAKE2B fd2f52def4a155a56b0ef2d20f1abac271cc9e55eb4d1164cc7f0686180ab1397c897220e71c7075bb148632f45d30a00fbe7c2513424b44b122a31e5d432c2f SHA512 043c012f55866721363c82fd80007c4ed8420fd8eec95459aac9fb913d855a0be5f135035ba5e3fcab668641ca61897d71ea8e48c1d45f171d418c812620d576 diff --git a/sys-fs/aufs4/aufs4-0_pre20160219.ebuild b/sys-fs/aufs4/aufs4-0_pre20160219.ebuild deleted file mode 100644 index cb3b25bc99ab..000000000000 --- 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 cb3b25bc99ab..000000000000 --- 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 2ce209aa7456..000000000000 --- 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 2ce209aa7456..000000000000 --- 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 74da974872fd..000000000000 --- 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 74da974872fd..000000000000 --- 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 ff94ecb3cd1c..000000000000 --- 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 ff94ecb3cd1c..000000000000 --- 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 0be383f2e126..000000000000 --- 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 551496bccb00..000000000000 --- 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 2f61f36acc1d..000000000000 --- 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 2f61f36acc1d..000000000000 --- 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 f2e2ccc44e69..000000000000 --- 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 1917bdd71b81..000000000000 --- 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 64dfe94b4bda..000000000000 --- 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 cf216a5708ca..000000000000 --- 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 f0e5c642768d..000000000000 --- a/sys-fs/aufs4/metadata.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - jlec@gentoo.org - - - Enable additional debugging support - Enable hfs support - Enable fuse support - Enable inotify support - Patch the current kernel for aufs3 support - Enable support for nfs export - Apply patch needed for pax enabled kernels - Enable initramfs/rootfs support - - - aufs - - diff --git a/sys-fs/davl/Manifest b/sys-fs/davl/Manifest index 3993ff942c47..a37d32b9cb00 100644 --- a/sys-fs/davl/Manifest +++ b/sys-fs/davl/Manifest @@ -1,5 +1,5 @@ AUX davl-1.2.1-asneeded.patch 921 BLAKE2B 76ab317401b4f66dad575be14056a7e88760f9db4b3e4b40057b3729c3e4221ab45b8df759f4def1be40d8a4dc82cabd2553aacbcaa0c4c7fffa4bddfc1be334 SHA512 6f5bc5fb0a8e3ab220f9ea32bdec7c04209a412d9ead78aa0198088ddb5c7c8ac01536ac0356470d84e1347504023e015e0cbbadd16c53271142a4f694d9f8fe AUX davl-1.2.4-fragment.patch 1051 BLAKE2B 283920bd6ff70fde735269962e211b5c40ed356a67536619867b5a7409a8a57c534ea15c8206250950eafed14f4ce59b888794d50ec2c15d01463064e37577e3 SHA512 28ae8da5d2f2a910cbbd5b7f5a97de3fb5a0700d070f9f1e7b4b4462dec6f334ad486b298b3bcc7a8314c56b3215245b55880884bbaaf2e03ca9961b0595c133 DIST davl-1.2.4.tar.bz2 47539 BLAKE2B bf07c23dd8d81289e91b5eec68f2d8995ae7851aa9cbc9b551f76a2d0fd90144ac7047b8c2ce71a2ef99fec2233bc491a3760b4da0fa01cf5f0211b94c869795 SHA512 71c33c0bfaca7c7557541517ec9e7b084e4d50e7504e02d412442566c6046c8a68fe4020e05a3e2da5c9309bd75ba06abba8f16fad96b476b5c961814d24d602 -EBUILD davl-1.2.4-r2.ebuild 679 BLAKE2B 00e15f41b86c6ed540063f6c8cc240c4dfb0786607ae9529553faa4939c7b267b4b1346e7772b63516e56b66f9456c3fbab056dfbfccba6e9cd53061e5bf0343 SHA512 05c01d0348328874ffad9b174178e8dbf2d1db5e76372d9fefe0b749081bf0e2847a32aabd734c40aaa5dbcd9f00900024b40f9ec479ca7d48e02d512c707fc3 +EBUILD davl-1.2.4-r2.ebuild 672 BLAKE2B 30c71bfc459b46067d93e53986170aab42839c88b3cd7695f3b37c9e32388988305e1abd06805c59a4fdd96dbfc6adca60433ee3ed54b1b4ea3f91c5db187e3a SHA512 80414c7f42f97fa53a5fe376eac28804e4e0bb2c75176cc3865176e4b67427c661c7c290c421413c10f9718314f7265a357c5c3e0b707d30fe68abc45f6e450b MISC metadata.xml 246 BLAKE2B 72fd90b06a5dc5216019573b9028c01d7ed1e3928c1b97ce3e79839a9a68cd8aed33cecc81291046c8ae4678ce2873e518139b303d9129a99c2f3da9020478ab SHA512 432831d7b45256845a789fe5b611fc5192ea2cc3186ed8ce04cf28f44756187c3343f7f156fc039017c9af2e842c09b36918ee48b9cd07139ef0e9278c41a35f diff --git a/sys-fs/davl/davl-1.2.4-r2.ebuild b/sys-fs/davl/davl-1.2.4-r2.ebuild index 7d27600f6a5d..0fdc23693d0f 100644 --- a/sys-fs/davl/davl-1.2.4-r2.ebuild +++ b/sys-fs/davl/davl-1.2.4-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~x86" IUSE="" RDEPEND=">=x11-libs/gtk+-2.6:2" diff --git a/sys-fs/fatresize/Manifest b/sys-fs/fatresize/Manifest new file mode 100644 index 000000000000..dab8c1814f04 --- /dev/null +++ b/sys-fs/fatresize/Manifest @@ -0,0 +1,4 @@ +AUX fatresize-1.0.4-version.patch 203 BLAKE2B 1d9b66cadb04b4deb8798997db50b03abcebbe110c103817805eccd1a2c29331644b90b80aa7ae7091a75f2b7359437151ecfba26638c5f40386014f2a61b7ca SHA512 e1ee0ac7fc08be32c7b34cc8ea27da9baa9e6d5d38b10f2cd9be3614820cab4a8d787fd503ffd85cd65d8de065fa920f0dd5937b861eda48487e0759155957f6 +DIST fatresize-1.0.4.tar.gz 115159 BLAKE2B 16bdfc28bb58f9694adccc7d04dc7c26dc72ce0e859787f66c2aa9c560ce987f20374e9f5166b79ac9501878e06f072c9102ce2f4e3bc2afa694e2a13ecb8e07 SHA512 36b67f7d5e4ccb03b98fb8a788c40f430464a40765a9092deab3292ff736fcb07288c4b5b30143a18125f4b3de1225ce32b5643b344ec207ca332a87981fe18f +EBUILD fatresize-1.0.4.ebuild 483 BLAKE2B 1d8658694b3bfdfd7e1201f458b4173ed6cdef3d77e9d8dd6a62912b8428ae20bab6a209158a12148587da8f800d7b8ba2b93bd90d29c34e667ca3e01a3751bf SHA512 f5d37df573692c6222fb9cc3205c074f3a083c5c5ac7dff1b106e793fc33dd24b86957993e86e651ff09db1124ee4381942b959f7048870871cc137b6d62d884 +MISC metadata.xml 210 BLAKE2B bb9591af5406abbf589664053ab6e5cb38933fe6ef97c11609405392b050b26cff8e94e04e85e5798124abd46283bee67b2a74923a5041616df15aaa9cff6da9 SHA512 f7cbe57a24b67a28696f91061ad8bd61d7d4cf3d59d20c3dcc6a4921e29672d00ecf3ece70a8813399d2467ebd626f8f829300e81fc722e9aaa527e213a5fb54 diff --git a/sys-fs/fatresize/fatresize-1.0.4.ebuild b/sys-fs/fatresize/fatresize-1.0.4.ebuild new file mode 100644 index 000000000000..cfdd713b6f02 --- /dev/null +++ b/sys-fs/fatresize/fatresize-1.0.4.ebuild @@ -0,0 +1,28 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit autotools + +DESCRIPTION="Resize FAT partitions using libparted" +HOMEPAGE="https://github.com/ya-mouse/fatresize" +SRC_URI="${HOMEPAGE}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND=" + sys-block/parted +" +RDEPEND=" + ${DEPEND} +" +PATCHES=( + "${FILESDIR}"/${P}-version.patch +) + +src_prepare() { + default + eautoreconf +} diff --git a/sys-fs/fatresize/files/fatresize-1.0.4-version.patch b/sys-fs/fatresize/files/fatresize-1.0.4-version.patch new file mode 100644 index 000000000000..88a42a9c1089 --- /dev/null +++ b/sys-fs/fatresize/files/fatresize-1.0.4-version.patch @@ -0,0 +1,9 @@ +--- a/configure.ac ++++ b/configure.ac +@@ -1,5 +1,5 @@ + AC_PREREQ(2.50) +-AC_INIT(fatresize, 1.0.3, [mouse@ya.ru]) ++AC_INIT(fatresize, 1.0.4, [mouse@ya.ru]) + + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) diff --git a/sys-fs/fatresize/metadata.xml b/sys-fs/fatresize/metadata.xml new file mode 100644 index 000000000000..5ba62861f1c4 --- /dev/null +++ b/sys-fs/fatresize/metadata.xml @@ -0,0 +1,7 @@ + + + + +jer@gentoo.org + + diff --git a/sys-fs/lsscsi/Manifest b/sys-fs/lsscsi/Manifest index 96defc16dc86..aea965321db2 100644 --- a/sys-fs/lsscsi/Manifest +++ b/sys-fs/lsscsi/Manifest @@ -1,6 +1,8 @@ AUX lsscsi-0.28-sysmacros.patch 1232 BLAKE2B 655fd3daf9da57c30b2e65632e863e9ec7794421ab86c21bd5895bd2b25edb0fc8e5635dffe7b3661c6556e061c92179ec60574948024c505bdb6393c0f272fc SHA512 d597b32f42a9616476cd54ceb7480cd34850289dd3c0fff8d0d54aad22a6fbc473613f18ab011819de7eeefb4232ad0152630a6da03cc02057b3d9eec763ac62 DIST lsscsi-0.28.tgz 150259 BLAKE2B e8376f306c61ebcbef055ba603bf42ece4dab13bd7755a1a90df64d9d70997943e73388c5a56b182d2fa3aed7aad8afeeab9ff89dd1ae9d0178f740de701503d SHA512 6d5cf8ebc42af0d8dbe8f2a1e90f4c429d058f184027318686fd22bc117e66c0b1847e4c97964d3d0e1b7bf4a5f1e296e1e3575ed2f5ff999eef70bdfb9ea4d4 DIST lsscsi-0.29.tgz 353116 BLAKE2B 6374410cadf7fb091f6dcc99bf9435b0af56bc603bbecdeadb76407efc5b2f6106a0fc65f9705d6dfe4cdbbd66494b8a966caffb08bb350d2e6128ee881546d9 SHA512 2c595cfc738815c9231ac078e47215ac46c1283bc8ad784a898eaef6d64f41311a9a08c96ea0dc9379bd79fe6c6ff4d2af176cea5aecaca74a0fa255746d84ad +DIST lsscsi-0.30.tgz 190598 BLAKE2B e22000c4c03fe31f40e6e95dbb6875fdf9266cb103108dc93748d2b245f2dc7edd93da7d3bf3b176187a2d8cace78ce1f7ce8f42da1454c05d8fd308e02db3b3 SHA512 ea1ba2bd2892b7e7feff0bf08ea09ffcdc38d21e4dba2cdce598d8ffde926a5908f2d02116d692bf4747b76c76c1c35974569583cb2da75eb49553959368dc76 EBUILD lsscsi-0.28.ebuild 424 BLAKE2B aa2f6df0b61816d547c8670bb06cd65f8f16402c3ff1c3164b905eef22565097f43383127dcf7820576527d8598bdef51687add0faf88d526666c0abd78845dd SHA512 4efed74f282adc66f35b6c2308ffea8a4d96a815a15406622eb52cf2077e3fcb9480f98b2882bc3e57127d7543ea4d36da122348dd5952f5231a9a072e1adf4f EBUILD lsscsi-0.29.ebuild 347 BLAKE2B 9a97690b644ee2daf3b812375fb7a3102f1c050f7418c48882bcfc017a7b94148638486dfa9ac456143fbdf895b295fcec96c62dc1879b919d7cb90313aaf067 SHA512 e0fb12ae5cecb6d7fb229b11892820fc47265c3ed26f963c04aab34a51e5240ac7633ed03b6dddce1552608ebe1da092164a87e466fc278a842f85cd61fa28ad +EBUILD lsscsi-0.30.ebuild 377 BLAKE2B aac0c30fcbd3b83940dab241e9bae9b62a8e31c36bbb293aa09997ed2a7d4483e1c73e89519c79ef2b546be0726ec24b8a29a9a8b5ad50028031cd5ddc55d4ef SHA512 d437e2da55502b0dbfc524c66409a3a90c255df0b92a27fb63d49059d1b5b9e9deec473e5abd0646be8e468f9ef2183e9b9cc10494c9e8ce08dfc810b25408df MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555 diff --git a/sys-fs/lsscsi/lsscsi-0.30.ebuild b/sys-fs/lsscsi/lsscsi-0.30.ebuild new file mode 100644 index 000000000000..e7efcd7baa08 --- /dev/null +++ b/sys-fs/lsscsi/lsscsi-0.30.ebuild @@ -0,0 +1,14 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +DESCRIPTION="SCSI sysfs query tool" +HOMEPAGE="http://sg.danny.cz/scsi/lsscsi.html" +SRC_URI="http://sg.danny.cz/scsi/${P}.tgz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +S="${WORKDIR}/${PN}-030r154" diff --git a/sys-fs/mtpfs/Manifest b/sys-fs/mtpfs/Manifest index ad8b044df71e..25d10ed4cc56 100644 --- a/sys-fs/mtpfs/Manifest +++ b/sys-fs/mtpfs/Manifest @@ -1,6 +1,6 @@ AUX mtpfs-1.1-fix-mutex-crash.patch 2115 BLAKE2B 13e74f735cf415d3b8a1139244d4c8f90a4d7d4482cda4de732ba6141e5988b5bd04faf29c8855897469f7e221414dd042be7042ff6c0a1349eec63c76df417c SHA512 800e1dd3d2b76503ee7ba03bbdce8cd43c6a64b4444d3f2f9b49e155b86b005c98ff2019043cbc440762ed8c4dc675a4666fe0fa4bfbc3c89971a2aeb16538e1 AUX mtpfs-1.1-g_printf.patch 166 BLAKE2B 73c28b822a2ec2cc016bcf4adb037ec4b7b24dc49ecd7c5ad118edc09e970524c7976a95c04de4c5adeae575930912fb7eaf65c175226cff4f5665d2801606b1 SHA512 97ba9291dbcad22c149f5edb89fd67a92b678843caa7b1fa397c9d2c6205bfc591c31696f108732eef9b20bfe767df8e33d5a356d8e975c02eb0a28f773f2006 -AUX mtpfs-1.1-unitialized-variable.patch 346 BLAKE2B 268dd92455df8f41385c145b26046eed8bcaa0cd935d8733da4df1e5219f6d3029cc5e3e6d3b92f5e14b49dec5a181b987f265698b32257fdfb5b0a8117f4927 SHA512 17bec46c584435ff4e636a0b66c612605cdf2ecb029c92058be4e97981758edef31fef7ec31f2e79816fa0c6c3590fe8730abadbe0cbcef825abecdd05aeae8c +AUX mtpfs-1.1-unitialized-variable.patch 346 BLAKE2B a0d2c486ecb01a11af0f4ef486a28d8dd7d09fd5516372fb37e8adf5010a00e4fe6972bfc5f0ee4baa5e801276df5a54d55c1c9942f0790477384ecd015b1d1a SHA512 a61beb4a5c5cfb2d6682e3962a63697c7c9bfd2692780c2a9cb0d0c5cf3f8e2ef545a1c3cb4c91329e9991ee27db37322b030c8fdcfb0eb40a81b1293d48f884 AUX mtpfs-1.1-wking-patches/0001-Use-GMutex-instead-of-GStaticMutex.patch 1793 BLAKE2B 84e05f0d2c1b6b93595e6705c0ae415214f90009abbbadc79e3ac8e925734b3a91bbcbfc7b11bc6ca0c268efabe1801fcebf4d7370bc6d8c81b574c8aa376a01 SHA512 a6277bc8a80f65dc685560510ee510367269243826d80f8ef69af5baff1ca6cefc5fec203bd96f997ab1aa111f85404a7fa4c3bffc8f3d0338f090e576773587 AUX mtpfs-1.1-wking-patches/0002-Free-rawdevices-after-opening-the-connected-device.patch 872 BLAKE2B 10c959ca9061679c103f1a2e96efe0836f137b10ed0011e064665441191e77e739202c498cafcd4c4932fd2b5571af17c90ec14ebe96201668c9e2054953f303 SHA512 281093f81abba85ab2c2cde33ffb19db330332b57366bb3a9574a2f1c0c3378ac55915b421f9ed853212849f629b0bace0ddec5890d5fe521821acdfe6a50277 AUX mtpfs-1.1-wking-patches/0003-Allocate-additional-byte-for-trailing-null.patch 2016 BLAKE2B 2a8475e6ff89fa5f2409869518d08ead93161227e9484bde32adacfcb4f8ea0c0ab80451e4a226f7d78a75667de363b0b7bc5b21b10f661a062fcb0456867891 SHA512 23d1cf5b70795c5b09d935bd3ca0f362a24f79047072068f48a61a390f3db3010602a79047034a6cb9496ba36012e238ec306bd7849086df6f8166b8f3ed0fbd @@ -12,4 +12,5 @@ DIST mtpfs-1.0.tar.gz 104242 BLAKE2B b29e0cd88a726affbe0810ceac38378c60b97de99ea DIST mtpfs-1.1.tar.gz 108329 BLAKE2B 7172c1ca0b31a532d0ba1068874c0fd4012dd80da4684d69fa36355126be0c56d79570d5fe5f42876d1a98f49bbc21b0f446c08e28b62e20583bbfd4d7054f62 SHA512 627f1a5efa024276f58857e0cb2a2b3057ab9ba6c26d8dcba9de066f4c0efc56a5c991e000e67763b874ee9feb1d9a1e176872b56dd13b146823e8724f2052c8 EBUILD mtpfs-1.0.ebuild 986 BLAKE2B 4fc769add8ee8c1c12cc8cec6c69ae9c00fc543fdbf63095296ded1a4a0127fe204f711522ca58c2c95a480f71cba184a27571b0006df085f485cc18fa575f1a SHA512 9069b27f5d76131502438c1bbc9d329efa5c295a4a36403e14119c887eeb5d0e5523cbfa15ed3d63b4f2af8651d15aa7cd5e435c42d765f3c80b62f2109f6c4d EBUILD mtpfs-1.1-r3.ebuild 1269 BLAKE2B c3da55f5770aa13f8cfec7f5e00c61c4a057fdc6de780ff066e4972579d7fe3368e64f8231c8c677444cdb863a1560c04fa7e7ebd685788969c04433eefafd48 SHA512 c12f11172555e927eb4335bebfe05105c6346db378a8e838fc4186947f9bf8dec66e07126401219cfdefc68d9683a108f0ca450cd4d0bb31c35d20099c159f79 +EBUILD mtpfs-1.1-r4.ebuild 1247 BLAKE2B 116b2f9f385bdd45b16afdc6754c9bed2c331117896de9b377fa4c29b6e3e69d44279ab4aeefa57628406bcd4676aee1b6669eab30af0b5d62956f74f48716f3 SHA512 5f3a21822f025eabffea89fcd46092dffcd6095103f6ba7fcd0660454a10e49e4e2d97a603573d4ec25c1fef7acb3a502ed1ce68a69e1ee4819264bcd4a926c5 MISC metadata.xml 684 BLAKE2B e83930dc207e798257d2e2a2cdb065ce462e232a20c33514034852099cb3e6683fbd2905b90e328cee8b50b84e6c9f887698a1c920d164f5f910174531ab7ad4 SHA512 725d050ed87be3de8beff0e97178452e806261e704aaaaf523982deb2fc803c771949bee9ac0651747323b3294d584470e49e4877a3cf5e8f2301f477a543955 diff --git a/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch b/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch index fb49624515b8..f322d4770ab2 100644 --- a/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch +++ b/sys-fs/mtpfs/files/mtpfs-1.1-unitialized-variable.patch @@ -1,6 +1,6 @@ https://bugs.gentoo.org/556690 ---- mtpfs.c.old 2015-08-04 21:56:13.080712801 +0200 -+++ mtpfs.c 2015-08-04 21:20:54.822965092 +0200 +--- a/mtpfs.c 2015-08-04 21:56:13.080712801 +0200 ++++ b/mtpfs.c 2015-08-04 21:20:54.822965092 +0200 @@ -1324,7 +1324,7 @@ main (int argc, char *argv[]) LIBMTP_raw_device_t * rawdevices; int numrawdevices; diff --git a/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild new file mode 100644 index 000000000000..e97428f4e0d5 --- /dev/null +++ b/sys-fs/mtpfs/mtpfs-1.1-r4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DESCRIPTION="A FUSE filesystem providing access to MTP devices" +HOMEPAGE="https://www.adebenham.com/mtpfs/" +SRC_URI="https://www.adebenham.com/files/mtp/${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug mad" + +RDEPEND="dev-libs/glib:2 + >=media-libs/libmtp-1.1.2 + sys-fs/fuse + mad? ( + media-libs/libid3tag + media-libs/libmad + )" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +DOCS=(AUTHORS NEWS README) + +PATCHES=( "${FILESDIR}"/${P}-fix-mutex-crash.patch + "${FILESDIR}"/${P}-unitialized-variable.patch + "${FILESDIR}"/${P}-wking-patches/ + "${FILESDIR}"/${P}-g_printf.patch ) + +src_prepare() { + default + sed -e "/#include / a\ + #include " -i mtpfs.h id3read.c || die #implicit +} + +src_configure() { + econf $(use_enable debug) \ + $(use_enable mad) +} + +pkg_postinst() { + einfo "To mount your MTP device, issue:" + einfo " /usr/bin/mtpfs " + echo + einfo "To unmount your MTP device, issue:" + einfo " /usr/bin/fusermount -u " + + if use debug; then + echo + einfo "You have enabled debugging output." + einfo "Please make sure you run mtpfs with the -d flag." + fi +} diff --git a/sys-fs/udev/Manifest b/sys-fs/udev/Manifest index 4a496ca3c809..2c22697243ed 100644 --- a/sys-fs/udev/Manifest +++ b/sys-fs/udev/Manifest @@ -1,19 +1,10 @@ -AUX 233-fix-includes.patch 1053 BLAKE2B 77e46c52bfed92e86e784dba346198413672de31c33f7fdfc4dc63786b1dd47a6c3f80d4bf0873a57fc676f3b72a4a27e7dd2e94ef2bd2ac0b4d7fcc1f8dc7bc SHA512 a4df18879862a17c6135a51591677c7e1ab8a98e5f2ba4eaec8e9275e4345c85a84ccd5bf2f8d8c6da51fd9152711681fd71eec86aab311e24bfe5469940f5ab -AUX 233-format-warnings.patch 3837 BLAKE2B be24951d2b3b70c6596c9fdabf6faf7492791b3ea5310aff77462ab05fca1c82026e7aabe4fd3656dc486e5d11ce8138c64740c66f75a6151107a86282b90958 SHA512 491cdbdb75e1ef338cd660fd89c776e3dd2881922eb04f505dda985104f14813e9da9e758393d906ff224e9e03888cafd05f7e665f71c43580a2989af54981bc AUX 236-uucp-group.patch 743 BLAKE2B 6dd28f1096d25cd776f66b1e574874d840a287b645701620459d5f5a5aec40784aca3ba86018911b5274e3643d17bd4b19dbe5fcad8a1ce4477ed136eae9bbdb SHA512 481400b0fd66ccfd559353a54e6d00749a10de3e67b304eeac0e63346ca404abc9e744c0dfaadc7783a231db929dc1cd4d97bf6e5bf585d7c41e03331c4e37ba AUX 239-basic-add-missing-comma-in-raw_clone-assembly-for-sp.patch 1098 BLAKE2B 7e846f475ae42e3c0e461b042042adca0475dc88d49a6bacea257381235f755dbd67569b8119efd7f25e68d64dbcd2b50a922df0f91c51ec16fe52cec65f9523 SHA512 2c8064540b669aa90a26bbd1d5af0b1afff030598a1a11bfe32a9c7f7ee59860acecfcdc7a94066c8ba6b62534432c28f72739dbbe16047958e5362a46d52215 -DIST systemd-216.tar.xz 3612960 BLAKE2B 677fa79e7a8dae5d62f37115c3087d89c46a28515c1fe48abbd77016ee41565583e407913b5a9738908436a2ccc36a1d3305392d8dfa5ac053a44ca66d587611 SHA512 f4eee6664368168eafd61939f1355ac21c7eeecce6247de98ef36f40bb6a942d12c006ced4ee15f3d8f11699c194990222d5a5115b45f2aa81f2a1abafebbdd2 -DIST systemd-225.tar.gz 3878442 BLAKE2B 24bf9f6bfdd7d7c585829c1b172f73e669e137020b990ecd07dffafbe6890f1819e6c8efd5b322008473a62007a4a6f6ab2fb209be7db4ecb89a2bc01d60aaab SHA512 35b3946509c7b01660da4370d3c51ff0e6a537dadd9dbb0a039c4f7ed552fd4e02ebac6eb8a788f61f1e3ba99444238d959051dd004c174b027729a80368ac19 -DIST systemd-233.tar.gz 4660737 BLAKE2B 38cdd74543447b3c02391b328428fed169fe2cf2df6e9341dcaf2f7d3d977612ec102301e144c1cada90d61e9e9bda3b2faaef708c8ff4bd0b52b143760a83b2 SHA512 5ad5329ea116d973cf67096f7e7ad28e9ea0905696e9451291f1d25e5064f4a9bfcfae87e912996c6a38397e9f4a148d4ccecfa9b70f7ecdf04deadb61784c8e DIST systemd-236.tar.gz 6759035 BLAKE2B 0fc26bd67fb6cc3b0565c763fc26e38186c4b05c3d38652b73a2189dfbfb46382dba239f7f6f889eec57ad1d8f69d4098745c8f4ca16a707aa23b7771f2328f3 SHA512 1a9672960e03e05c09e41fb8cfe9b0f25e867fd43f37f8371515ddddfdbd4270afd746a6da733f6d1d3b2cc43db1ecc7a9f2245f2dac2ec233db74e9e70e4f6d DIST systemd-238.tar.gz 6954022 BLAKE2B 9b5cc36a7234c0d037a2656ee1e5ed54186a394b8be41771ebc29c903d3efcecf7f13f004a6d1695c022923bd0d540a243e897852f07e810f73fd3163f688dde SHA512 c0f272b022308d3bd94679184e102a8dc85de55310bda205a458ea33c77c7733e5c8c8e5b15f786ba3e0ce59e7c6a9bf0d5a0950517c6b91e0f345950129b9c8 DIST systemd-239.tar.gz 7157293 BLAKE2B 975f6215c8bb6662d6e161f637e1fece22930c0190b3c31a8fc4cb1a10600546a252704ac95590d9d14e495fcd06082a590e6d755e36603a41b3a396d579d8b0 SHA512 fd44590dfd148504c5ed1e67521efce50d84b627b7fc77015fa95dfa76d7a42297c56cc89eff40181809732024b16d48f2a87038cf435e0c63bc2b95ecd86b0f -DIST udev-216-patches-2.tar.xz 1264 BLAKE2B b1bbb6b1b7734edc3352b4352a45b4b5df4715b0fc92c4936798aa93fb078755b7795f475d7bc42392ad8ef57853e9ce2507c66cc9bfbd37e6fe22ada4c156cc SHA512 1f5912f3bbc3e40a4efad9de8b1fab2b3a750f3f23c9f2e33a581658959d22cf23f9ff1b8f51597874e7bca1d0f757f37fd5550b4112160261559524eda261f4 -EBUILD udev-216.ebuild 15081 BLAKE2B adc66d5478de63a817c208832802557672c072368d98495b9d1e8f53d790a4171bbe451503c81efd53d293e43426cb1b44acc0f8ae755dfe33a8138665c35b5a SHA512 8884c4ab00af90cd6e910e6137674f9dbe6baa846876a16e6048e6960dba74dd685407a24343e9e20f61d18299b1900f7eab1b9c9eab726ddba9a62ebd826709 -EBUILD udev-225-r1.ebuild 13436 BLAKE2B 551c495815193eeaf89dd70e1b0d969bb717200f18eedd241b6a308cbfe62388c5fb9bcd801597482f5c4f8451475c61b628b4f38de1df01d62a7cce11361cfb SHA512 b3310daf82972b710c37a6ee25776369bc09beac4926ea056d73421bd01627f93c2aaacdb2bd2b0819989629d82eea619d475ae4c6cd4179be2201cf7ec632a7 -EBUILD udev-233.ebuild 12904 BLAKE2B 53e3f5f68bf504acf0085f5e957894c1a3462bdcf8282e2399787a6d2ccf0a3b409116cbac5a3df22432d7576604807c8400755102731031416e9cec3a899fca SHA512 d7bc4f8d9c68ce67b25de78669301b39816c1ab2221e498dcf27c80c62466db99db32581648e5aab79fd960989c498cd035794c3f80666c388d363e6a9628c9c EBUILD udev-236-r1.ebuild 10048 BLAKE2B cd7b1f1b4edaf2dec245c9b00e1f19af56e3f4b21f6de1535f062d9deaa16107efc9f873dc50928604562da3c8877cdfff70c5489bec15cbcfa952b9bf4ff8ca SHA512 e6dca2f55c992a025cefc67b06df09d402fdd8438cfd819419a70de6ea2b26e58e380781aa66f0d63bf682b4500ab94f6b552117969851ddd892bb8a6415f4ee EBUILD udev-238.ebuild 9595 BLAKE2B 9b475a74399ce0fc0187d8dd265fe7cc4c615080a4bb7ba6fd22cb8876570d78232ea5b36c02b0de2581c540a798cefd9d17d23d59c7c494969a7ab3d9e0cd6f SHA512 0c219e93fa5f35821d83707ffb061c3a01a5b6f1788ca4cc72cb1a89039f648d87f159c80c7cade5048babbd6456e7c6e6e794fbf2240cae0170ec0dec4d49f0 EBUILD udev-239.ebuild 9686 BLAKE2B fc36f38c3634825efc120fc97c6f08d530068def4fe1d471fc94c4ccceae524fece9bc610277fd3e00fdf94ca10bdd176d9f47a6fed14a0ea2681da3fbe6c377 SHA512 905e177799fa810c260a07e4f684de80f9ae9f1d8dc182a81c1d89c7ec5b8db5bd80e58ccc0f73013f9dc5b0c4ed25f48c470f8f10491bf2e3298b9f229613e5 EBUILD udev-9999.ebuild 9607 BLAKE2B c175d2eed5f59f08225701dab78983864208fb1fd2a4a2d2dd6ba90d35cbc7ecb3b39929ceae89e845433d8261845fbd773f01321c0f32434594bc7f65453920 SHA512 3593e0e706fb81c82a3f031580e338d85cdbc0bf48b4c86c4466041a9ab6c4a2e4b91e35ded2ea7e104f65a3dd28728f5169fccbc9d570eb4f5284de2fe978f5 -MISC metadata.xml 680 BLAKE2B 3f6b21eff391977d69921da6eeb7f48ae6c706dd856e12c4b0126f0db4ced358925374bed23d950d957a58b5447e087ad98301aa1f75dd140a1cd816ef1d2426 SHA512 2e90cdfb013904211fba8404c6b96ad940dfaea05eebe7592e3fa185dec9b16b738cc7661fd466990788accf8c261a596bcb08477e879e0e18fcc91cdce65c5e +MISC metadata.xml 476 BLAKE2B 5d293590663fda69b35a5f434b64827de86ac14831536e873c38d1e3baa8575cc02cc45525726046103b73212c02852dce6c407fe7c02705370e4b6402771686 SHA512 552311593b07f4f3d41e406fe99606d79973d9c69e5e448ffcdf3f6d1e04ea6b59c97b022ad2fe7fedbf0c627e2b45efc293dc1065e7cec035c2e48c85c3495d diff --git a/sys-fs/udev/files/233-fix-includes.patch b/sys-fs/udev/files/233-fix-includes.patch deleted file mode 100644 index 44b06214f89d..000000000000 --- a/sys-fs/udev/files/233-fix-includes.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 284d1cd0a12cad96a5ea61d1afb0dd677dbd147e Mon Sep 17 00:00:00 2001 -From: Matija Skala -Date: Wed, 15 Mar 2017 13:21:10 +0100 -Subject: [PATCH] fix includes - -linux/sockios.h is needed for the SIOCGSTAMPNS macro - -xlocale.h is included indirectly in glibc and doesn't even exist in -other libcs ---- - src/basic/parse-util.c | 1 - - src/libsystemd-network/sd-lldp.c | 1 + - 2 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/basic/parse-util.c b/src/basic/parse-util.c -index 6e58ced6f5..d86700736d 100644 ---- a/src/basic/parse-util.c -+++ b/src/basic/parse-util.c -@@ -23,7 +23,6 @@ - #include - #include - #include --#include - - #include "alloc-util.h" - #include "extract-word.h" -diff --git a/src/libsystemd-network/sd-lldp.c b/src/libsystemd-network/sd-lldp.c -index 0702241506..39ddb2461a 100644 ---- a/src/libsystemd-network/sd-lldp.c -+++ b/src/libsystemd-network/sd-lldp.c -@@ -19,6 +19,7 @@ - ***/ - - #include -+#include - - #include "sd-lldp.h" - diff --git a/sys-fs/udev/files/233-format-warnings.patch b/sys-fs/udev/files/233-format-warnings.patch deleted file mode 100644 index 7bb08f0a3201..000000000000 --- a/sys-fs/udev/files/233-format-warnings.patch +++ /dev/null @@ -1,84 +0,0 @@ -From 3e7d14d78c4d15ec7789299216cbf5c58e61547b Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= -Date: Sat, 3 Jun 2017 05:41:17 -0400 -Subject: [PATCH] sd-bus: silence format warnings in kdbus code (#6072) -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The code is mostly correct, but gcc is trying to outsmart us, and emits a -warning for a "llu vs lu" mismatch, even though they are the same size (on alpha): - -src/libsystemd/sd-bus/bus-control.c: In function ‘kernel_get_list’: -src/libsystemd/sd-bus/bus-control.c:267:42: error: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka long unsigned int}’ [-Werror=format=] - if (asprintf(&n, ":1.%llu", name->id) < 0) { - ^ -src/libsystemd/sd-bus/bus-control.c: In function ‘bus_get_name_creds_kdbus’: -src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%llu’ expects argument of type ‘long long unsigned int’, but argument 3 has type ‘__u64 {aka long unsigned int}’ [-Werror=format=] - if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) { - ^ -This is hard to work around properly, because kdbus.h uses __u64 which is -defined-differently-despite-being-the-same-size then uint64_t. Thus the simple -solution of using %PRIu64 fails on amd64: - -src/libsystemd/sd-bus/bus-control.c:714:47: error: format ‘%lu’ expects argument of type ‘long unsigned int’, but argument 3 has type ‘__u64 {aka long long unsigned int}’ [-Werror=format=] - if (asprintf(&c->unique_name, ":1.%"PRIu64, conn_info->id) < 0) { - ^~~~~~ - -Let's just avoid the whole issue for now by silencing the warning. -After the next release, we should just get rid of the kdbus code. - -Fixes #5561. ---- - src/libsystemd/sd-bus/bus-control.c | 6 ++++++ - src/libsystemd/sd-bus/bus-kernel.c | 2 ++ - 2 files changed, 8 insertions(+) - -diff --git a/src/libsystemd/sd-bus/bus-control.c b/src/libsystemd/sd-bus/bus-control.c -index 9e58ffbd8..303ae0f23 100644 ---- a/src/libsystemd/sd-bus/bus-control.c -+++ b/src/libsystemd/sd-bus/bus-control.c -@@ -264,10 +264,13 @@ static int kernel_get_list(sd_bus *bus, uint64_t flags, char ***x) { - if ((flags & KDBUS_LIST_UNIQUE) && name->id != previous_id && !(name->flags & KDBUS_HELLO_ACTIVATOR)) { - char *n; - -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat" - if (asprintf(&n, ":1.%llu", name->id) < 0) { - r = -ENOMEM; - goto fail; - } -+#pragma GCC diagnostic pop - - r = strv_consume(x, n); - if (r < 0) -@@ -711,10 +714,13 @@ int bus_get_name_creds_kdbus( - } - - if (mask & SD_BUS_CREDS_UNIQUE_NAME) { -+#pragma GCC diagnostic push -+#pragma GCC diagnostic ignored "-Wformat" - if (asprintf(&c->unique_name, ":1.%llu", conn_info->id) < 0) { - r = -ENOMEM; - goto fail; - } -+#pragma GCC diagnostic pop - - c->mask |= SD_BUS_CREDS_UNIQUE_NAME; - } -diff --git a/src/libsystemd/sd-bus/bus-kernel.c b/src/libsystemd/sd-bus/bus-kernel.c -index c82caeb3f..ca6aee7c0 100644 ---- a/src/libsystemd/sd-bus/bus-kernel.c -+++ b/src/libsystemd/sd-bus/bus-kernel.c -@@ -51,6 +51,8 @@ - #include "user-util.h" - #include "util.h" - -+#pragma GCC diagnostic ignored "-Wformat" -+ - #define UNIQUE_NAME_MAX (3+DECIMAL_STR_MAX(uint64_t)) - - int bus_kernel_parse_unique_name(const char *s, uint64_t *id) { --- -2.13.2 - diff --git a/sys-fs/udev/metadata.xml b/sys-fs/udev/metadata.xml index e6e0979044dd..39f61746d0df 100644 --- a/sys-fs/udev/metadata.xml +++ b/sys-fs/udev/metadata.xml @@ -5,8 +5,6 @@ udev-bugs@gentoo.org - Enable the userspace firmware loader (DEPRECATED, replaced by the in-kernel loader starting from 3.8) - Build the gobject interface library Enable kernel module loading/unloading support using sys-apps/kmod diff --git a/sys-fs/udev/udev-216.ebuild b/sys-fs/udev/udev-216.ebuild deleted file mode 100644 index 3d009073e05b..000000000000 --- a/sys-fs/udev/udev-216.ebuild +++ /dev/null @@ -1,485 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" - inherit git-2 - patchset= -else - patchset=2 - SRC_URI="https://www.freedesktop.org/software/systemd/systemd-${PV}.tar.xz" - if [[ -n "${patchset}" ]]; then - SRC_URI+=" - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="acl doc +firmware-loader gudev introspection +kmod selinux static-libs" - -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/util-linux-2.20 - acl? ( sys-apps/acl ) - gudev? ( >=dev-libs/glib-2.34.3[${MULTILIB_USEDEP}] ) - introspection? ( >=dev-libs/gobject-introspection-1.38 ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - != -r4 to skip some parallel build issues -DEPEND="${COMMON_DEPEND} - dev-util/gperf - >=sys-apps/coreutils-8.16 - sys-libs/libcap - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-3.7 - doc? ( >=dev-util/gtk-doc-1.18 )" -# Try with `emerge -C docbook-xml-dtd` to see the build failure without DTDs -if [[ ${PV} = 9999* ]]; then - DEPEND="${DEPEND} - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt" -fi -RDEPEND="${COMMON_DEPEND} - ! "${T}"/40-gentoo.rules - # Gentoo specific floppy and usb groups - SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" - SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - EOF - - # change rules back to group uucp instead of dialout for now wrt #454556 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - # apply user patches - epatch_user - - if [[ ! -e configure ]]; then - if use doc; then - gtkdocize --docdir docs || die "gtkdocize failed" - else - echo 'EXTRA_DIST =' > docs/gtk-doc.make - fi - eautoreconf - else - check_default_rules - elibtoolize - fi - - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \ - configure || die - - if ! use elibc_glibc; then #443030 - echo '#define secure_getenv(x) NULL' >> config.h.in - sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die - fi -} - -multilib_src_configure() { - tc-export CC #463846 - export cc_cv_CFLAGS__flto=no #502950 - - # Keep sorted by ./configure --help and only pass --disable flags - # when *required* to avoid external deps or unnecessary compile - local econf_args - econf_args=( - ac_cv_search_cap_init= - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF} - $(multilib_native_use_enable static-libs static) - --disable-nls - $(multilib_native_use_enable doc gtk-doc) - $(multilib_native_use_enable introspection) - --disable-python-devel - --disable-dbus - $(multilib_native_use_enable kmod) - --disable-seccomp - $(multilib_native_use_enable selinux) - --disable-xz - --disable-lz4 - --disable-pam - $(multilib_native_use_enable acl) - --disable-gcrypt - --disable-audit - --disable-libcryptsetup - --disable-qrencode - --disable-microhttpd - --disable-gnutls - --disable-libcurl - --disable-libidn - --disable-readahead - --disable-quotacheck - --disable-logind - --disable-polkit - --disable-myhostname - $(use_enable gudev) - $(multilib_is_native_abi || echo "--disable-manpages") - --enable-split-usr - --with-html-dir=/usr/share/doc/${PF}/html - --without-python - --with-bashcompletiondir="$(get_bashcompdir)" - $(use firmware-loader && echo "--with-firmware-path=/lib/firmware/updates:/lib/firmware") - --with-rootprefix= - $(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)") - ) - - # Use pregenerated copies when possible wrt #480924 - [[ ${PV} = 9999* ]] || econf_args+=( --disable-manpages ) - - ECONF_SOURCE=${S} econf "${econf_args[@]}" -} - -multilib_src_compile() { - echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra - emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES - - # Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4, - # but not everything -- separate building of the binaries as a workaround, - # which will force internal libraries required for the helpers to be built - # early enough, like eg. libsystemd-shared.la - if multilib_is_native_abi; then - local lib_targets=( libudev.la ) - use gudev && lib_targets+=( libgudev-1.0.la ) - emake "${lib_targets[@]}" - - local exec_targets=( - systemd-udevd - udevadm - ) - emake "${exec_targets[@]}" - - local helper_targets=( - ata_id - cdrom_id - collect - scsi_id - v4l_id - accelerometer - mtd_probe - ) - emake "${helper_targets[@]}" - - if [[ ${PV} = 9999* ]]; then - local man_targets=( - man/udev.conf.5 - man/systemd.link.5 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.8 - ) - emake "${man_targets[@]}" - fi - - if use doc; then - emake -C docs/libudev - use gudev && emake -C docs/gudev - fi - else - local lib_targets=( libudev.la ) - use gudev && lib_targets+=( libgudev-1.0.la ) - emake "${lib_targets[@]}" - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - local lib_LTLIBRARIES="libudev.la" \ - pkgconfiglib_DATA="src/libudev/libudev.pc" - - local targets=( - install-libLTLIBRARIES - install-includeHEADERS - install-libgudev_includeHEADERS - install-rootbinPROGRAMS - install-rootlibexecPROGRAMS - install-udevlibexecPROGRAMS - install-dist_udevconfDATA - install-dist_udevrulesDATA - install-girDATA - install-pkgconfiglibDATA - install-sharepkgconfigDATA - install-typelibsDATA - install-dist_docDATA - libudev-install-hook - install-directories-hook - install-dist_bashcompletionDATA - install-dist_networkDATA - ) - - if use gudev; then - lib_LTLIBRARIES+=" libgudev-1.0.la" - pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc" - fi - - # add final values of variables: - targets+=( - rootlibexec_PROGRAMS=systemd-udevd - rootbin_PROGRAMS=udevadm - lib_LTLIBRARIES="${lib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" - INSTALL_DIRS='$(sysconfdir)/udev/rules.d \ - $(sysconfdir)/udev/hwdb.d \ - $(sysconfdir)/systemd/network' - dist_bashcompletion_DATA="shell-completion/bash/udevadm" - dist_network_DATA="network/99-default.link" - ) - emake -j1 DESTDIR="${D}" "${targets[@]}" - - if use doc; then - emake -C docs/libudev DESTDIR="${D}" install - use gudev && emake -C docs/gudev DESTDIR="${D}" install - fi - - if [[ ${PV} = 9999* ]]; then - doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} - else - doman "${S}"/man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} - fi - else - local lib_LTLIBRARIES="libudev.la" \ - pkgconfiglib_DATA="src/libudev/libudev.pc" \ - include_HEADERS="src/libudev/libudev.h" - - local targets=( - install-libLTLIBRARIES - install-includeHEADERS - install-pkgconfiglibDATA - ) - - if use gudev; then - lib_LTLIBRARIES+=" libgudev-1.0.la" - pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc" - fi - - targets+=( - lib_LTLIBRARIES="${lib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" - include_HEADERS="${include_HEADERS}" - ) - emake -j1 DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - dodoc TODO - - prune_libtool_files --all - rm -f \ - "${D}"/lib/udev/rules.d/99-systemd.rules \ - "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} - - # see src_prepare() for content of 40-gentoo.rules - insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules - - # maintainer note: by not letting the upstream build-sys create the .so - # link, you also avoid a parallel make problem - mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8 - - if ! [[ ${PV} = 9999* ]]; then - insinto /usr/share/doc/${PF}/html/gudev - doins "${S}"/docs/gudev/html/* - - insinto /usr/share/doc/${PF}/html/libudev - doins "${S}"/docs/libudev/html/* - fi -} - -pkg_preinst() { - local htmldir - for htmldir in gudev libudev; do - if [[ -d ${ROOT%/}/usr/share/gtk-doc/html/${htmldir} ]]; then - rm -rf "${ROOT%/}"/usr/share/gtk-doc/html/${htmldir} - fi - if [[ -d ${D}/usr/share/doc/${PF}/html/${htmldir} ]]; then - dosym ../../doc/${PF}/html/${htmldir} \ - /usr/share/gtk-doc/html/${htmldir} - fi - done -} - -pkg_postinst() { - mkdir -p "${ROOT%/}"/run - - # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 - # So try to remove it here (will only work if empty). - rmdir "${ROOT%/}"/dev/loop 2>/dev/null - if [[ -d ${ROOT%/}/dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - local fstab="${ROOT%/}"/etc/fstab dev path fstype rest - while read -r dev path fstype rest; do - if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then - ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" - ewarn "filesystem. Otherwise udev won't be able to boot." - ewarn "See, https://bugs.gentoo.org/453186" - fi - done < "${fstab}" - - if [[ -d ${ROOT%/}/usr/lib/udev ]]; then - ewarn - ewarn "Please re-emerge all packages on your system which install" - ewarn "rules and helpers in /usr/lib/udev. They should now be in" - ewarn "/lib/udev." - ewarn - ewarn "One way to do this is to run the following command:" - ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" - ewarn "Note that qfile can be found in app-portage/portage-utils" - fi - - local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules - local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules - for old_rules in "${old_cd_rules}" "${old_net_rules}"; do - if [[ -f ${old_rules} ]]; then - ewarn - ewarn "File ${old_rules} is from old udev installation but if you still use it," - ewarn "rename it to something else starting with 70- to silence this deprecation" - ewarn "warning." - fi - done - - elog - elog "Starting from version >= 197 the new predictable network interface names are" - elog "used by default, see:" - elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c" - elog - elog "Example command to get the information for the new interface name before booting" - elog "(replace with, for example, eth0):" - elog "# udevadm test-builtin net_id /sys/class/net/ 2> /dev/null" - elog - elog "You can use either kernel parameter \"net.ifnames=0\", create empty" - elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" - elog "to disable the feature." - - if has_version 'sys-apps/biosdevname'; then - ewarn - ewarn "You can replace the functionality of sys-apps/biosdevname which has been" - ewarn "detected to be installed with the new predictable network interface names." - fi - - ewarn - ewarn "You need to restart udev as soon as possible to make the upgrade go" - ewarn "into effect." - ewarn "The method you use to do this depends on your init system." - if has_version 'sys-apps/openrc'; then - ewarn "For sys-apps/openrc users it is:" - ewarn "# /etc/init.d/udev --nodeps restart" - fi - - elog - elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" - elog "fixing known issues visit:" - elog "https://wiki.gentoo.org/wiki/Udev" - elog "https://wiki.gentoo.org/wiki/Udev/upgrade" - - # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, - # do the same for 80-net-setup-link.rules to keep the old behavior - local net_move=no - local net_name_slot_sym=no - local net_rules_path="${ROOT%/}"/etc/udev/rules.d - local net_name_slot="${net_rules_path}"/80-net-name-slot.rules - local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ ! -e ${net_setup_link} ]]; then - [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes - if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then - net_move=yes - net_name_slot_sym=yes - fi - fi - if [[ ${net_move} == yes ]]; then - ebegin "Copying ${net_name_slot} to ${net_setup_link}" - - if [[ ${net_name_slot_sym} == yes ]]; then - ln -nfs /dev/null "${net_setup_link}" - else - cp "${net_name_slot}" "${net_setup_link}" - fi - eend $? - fi - - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - - # Update hwdb database in case the format is changed by udev version. - if has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - [[ -z ${REPLACING_VERSIONS} ]] && udev_reload - fi -} diff --git a/sys-fs/udev/udev-225-r1.ebuild b/sys-fs/udev/udev-225-r1.ebuild deleted file mode 100644 index ee167a2d7eca..000000000000 --- a/sys-fs/udev/udev-225-r1.ebuild +++ /dev/null @@ -1,426 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools bash-completion-r1 eutils linux-info multilib multilib-minimal toolchain-funcs udev user versionator - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" - inherit git-r3 -else - patchset= - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - if [[ -n "${patchset}" ]]; then - SRC_URI+=" - https://dev.gentoo.org/~ssuominen/${P}-patches-${patchset}.tar.xz - https://dev.gentoo.org/~williamh/dist/${P}-patches-${patchset}.tar.xz" - fi - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="acl +kmod selinux static-libs" - -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/util-linux-2.24 - sys-libs/libcap[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - != -r4 to skip some parallel build issues -DEPEND="${COMMON_DEPEND} - dev-util/gperf - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-3.9 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt" -RDEPEND="${COMMON_DEPEND} - ! "${T}"/40-gentoo.rules - # Gentoo specific floppy and usb groups - SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" - SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - EOF - - # change rules back to group uucp instead of dialout for now wrt #454556 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - # stub out the am_path_libcrypt function - echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4 - - # apply user patches - epatch_user - - eautoreconf - - if ! [[ ${PV} = 9999* ]]; then - check_default_rules - fi - - # Restore possibility of running --enable-static wrt #472608 - sed -i \ - -e '/--enable-static is not supported by systemd/s:as_fn_error:echo:' \ - configure || die - - if ! use elibc_glibc; then #443030 - echo '#define secure_getenv(x) NULL' >> config.h.in - sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die - fi -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - multilib-minimal_src_configure -} - -multilib_src_configure() { - tc-export CC #463846 - export cc_cv_CFLAGS__flto=no #502950 - export cc_cv_CFLAGS__Werror_shadow=no #554454 - - # Keep sorted by ./configure --help and only pass --disable flags - # when *required* to avoid external deps or unnecessary compile - local econf_args - econf_args=( - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF} - $(multilib_native_use_enable static-libs static) - --disable-nls - --disable-dbus - $(multilib_native_use_enable kmod) - --disable-xkbcommon - --disable-seccomp - $(multilib_native_use_enable selinux) - --disable-xz - --disable-lz4 - --disable-pam - $(multilib_native_use_enable acl) - --disable-gcrypt - --disable-audit - --disable-libcryptsetup - --disable-qrencode - --disable-microhttpd - --disable-gnuefi - --disable-gnutls - --disable-libcurl - --disable-libidn - --disable-quotacheck - --disable-logind - --disable-polkit - --disable-myhostname - $(multilib_is_native_abi || echo "--disable-manpages") - --enable-split-usr - --without-python - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootprefix= - $(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)") - --disable-elfutils - ) - - if ! multilib_is_native_abi; then - econf_args+=( - MOUNT_{CFLAGS,LIBS}=' ' - ) - fi - - ECONF_SOURCE=${S} econf "${econf_args[@]}" -} - -multilib_src_compile() { - echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra - emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES - - # Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4, - # but not everything -- separate building of the binaries as a workaround, - # which will force internal libraries required for the helpers to be built - # early enough, like eg. libsystemd-shared.la - if multilib_is_native_abi; then - local lib_targets=( libudev.la ) - emake "${lib_targets[@]}" - - local exec_targets=( - systemd-udevd - udevadm - ) - emake "${exec_targets[@]}" - - local helper_targets=( - ata_id - cdrom_id - collect - scsi_id - v4l_id - mtd_probe - ) - emake "${helper_targets[@]}" - - local man_targets=( - man/udev.conf.5 - man/systemd.link.5 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.8 - ) - emake "${man_targets[@]}" - else - local lib_targets=( libudev.la ) - emake "${lib_targets[@]}" - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - local lib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - - local targets=( - install-libLTLIBRARIES - install-includeHEADERS - install-rootbinPROGRAMS - install-rootlibexecPROGRAMS - install-udevlibexecPROGRAMS - install-dist_udevconfDATA - install-dist_udevrulesDATA - install-pkgconfiglibDATA - install-pkgconfigdataDATA - install-dist_docDATA - libudev-install-hook - install-directories-hook - install-dist_bashcompletionDATA - install-dist_networkDATA - ) - - # add final values of variables: - targets+=( - rootlibexec_PROGRAMS=systemd-udevd - rootbin_PROGRAMS=udevadm - lib_LTLIBRARIES="${lib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" - pkgconfigdata_DATA="src/udev/udev.pc" - INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' - dist_bashcompletion_DATA="shell-completion/bash/udevadm" - dist_network_DATA="network/99-default.link" - ) - emake -j1 DESTDIR="${D}" "${targets[@]}" - doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} - else - local lib_LTLIBRARIES="libudev.la" - local pkgconfiglib_DATA="src/libudev/libudev.pc" - local include_HEADERS="src/libudev/libudev.h" - - local targets=( - install-libLTLIBRARIES - install-includeHEADERS - install-pkgconfiglibDATA - ) - - targets+=( - lib_LTLIBRARIES="${lib_LTLIBRARIES}" - pkgconfiglib_DATA="${pkgconfiglib_DATA}" - include_HEADERS="${include_HEADERS}" - ) - emake -j1 DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - dodoc TODO - - prune_libtool_files --all - rm -f "${D}"/lib/udev/rules.d/99-systemd.rules - rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} - - # see src_prepare() for content of 40-gentoo.rules - insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules - - # maintainer note: by not letting the upstream build-sys create the .so - # link, you also avoid a parallel make problem - mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8 -} - -pkg_postinst() { - mkdir -p "${ROOT%/}"/run - - # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 - # So try to remove it here (will only work if empty). - rmdir "${ROOT%/}"/dev/loop 2>/dev/null - if [[ -d ${ROOT%/}/dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - local fstab="${ROOT%/}"/etc/fstab dev path fstype rest - while read -r dev path fstype rest; do - if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then - ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" - ewarn "filesystem. Otherwise udev won't be able to boot." - ewarn "See, https://bugs.gentoo.org/453186" - fi - done < "${fstab}" - - if [[ -d ${ROOT%/}/usr/lib/udev ]]; then - ewarn - ewarn "Please re-emerge all packages on your system which install" - ewarn "rules and helpers in /usr/lib/udev. They should now be in" - ewarn "/lib/udev." - ewarn - ewarn "One way to do this is to run the following command:" - ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" - ewarn "Note that qfile can be found in app-portage/portage-utils" - fi - - local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules - local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules - for old_rules in "${old_cd_rules}" "${old_net_rules}"; do - if [[ -f ${old_rules} ]]; then - ewarn - ewarn "File ${old_rules} is from old udev installation but if you still use it," - ewarn "rename it to something else starting with 70- to silence this deprecation" - ewarn "warning." - fi - done - - elog - elog "Starting from version >= 197 the new predictable network interface names are" - elog "used by default, see:" - elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c" - elog - elog "Example command to get the information for the new interface name before booting" - elog "(replace with, for example, eth0):" - elog "# udevadm test-builtin net_id /sys/class/net/ 2> /dev/null" - elog - elog "You can use either kernel parameter \"net.ifnames=0\", create empty" - elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" - elog "to disable the feature." - - if has_version 'sys-apps/biosdevname'; then - ewarn - ewarn "You can replace the functionality of sys-apps/biosdevname which has been" - ewarn "detected to be installed with the new predictable network interface names." - fi - - ewarn - ewarn "You need to restart udev as soon as possible to make the upgrade go" - ewarn "into effect." - ewarn "The method you use to do this depends on your init system." - if has_version 'sys-apps/openrc'; then - ewarn "For sys-apps/openrc users it is:" - ewarn "# /etc/init.d/udev --nodeps restart" - fi - - elog - elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" - elog "fixing known issues visit:" - elog "https://wiki.gentoo.org/wiki/Udev" - elog "https://wiki.gentoo.org/wiki/Udev/upgrade" - - # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, - # do the same for 80-net-setup-link.rules to keep the old behavior - local net_move=no - local net_name_slot_sym=no - local net_rules_path="${ROOT%/}"/etc/udev/rules.d - local net_name_slot="${net_rules_path}"/80-net-name-slot.rules - local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ ! -e ${net_setup_link} ]]; then - [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes - if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then - net_move=yes - net_name_slot_sym=yes - fi - fi - if [[ ${net_move} == yes ]]; then - ebegin "Copying ${net_name_slot} to ${net_setup_link}" - - if [[ ${net_name_slot_sym} == yes ]]; then - ln -nfs /dev/null "${net_setup_link}" - else - cp "${net_name_slot}" "${net_setup_link}" - fi - eend $? - fi - - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - - # Update hwdb database in case the format is changed by udev version. - if has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - [[ -z ${REPLACING_VERSIONS} ]] && udev_reload - fi -} diff --git a/sys-fs/udev/udev-233.ebuild b/sys-fs/udev/udev-233.ebuild deleted file mode 100644 index 9ca311c705fc..000000000000 --- a/sys-fs/udev/udev-233.ebuild +++ /dev/null @@ -1,405 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools bash-completion-r1 linux-info ltprune multilib-minimal toolchain-funcs udev user versionator - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd" - inherit git-r3 -else - SRC_URI="https://github.com/systemd/systemd/archive/v${PV}.tar.gz -> systemd-${PV}.tar.gz" - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86" -fi - -DESCRIPTION="Linux dynamic and persistent device naming support (aka userspace devfs)" -HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd" - -LICENSE="LGPL-2.1 MIT GPL-2" -SLOT="0" -IUSE="acl +kmod selinux" - -RESTRICT="test" - -COMMON_DEPEND=">=sys-apps/util-linux-2.27.1[${MULTILIB_USEDEP}] - sys-libs/libcap[${MULTILIB_USEDEP}] - acl? ( sys-apps/acl ) - kmod? ( >=sys-apps/kmod-16 ) - selinux? ( >=sys-libs/libselinux-2.1.9 ) - != -r4 to skip some parallel build issues -DEPEND="${COMMON_DEPEND} - dev-util/gperf - >=dev-util/intltool-0.50 - >=sys-apps/coreutils-8.16 - virtual/os-headers - virtual/pkgconfig - >=sys-devel/make-3.82-r4 - >=sys-kernel/linux-headers-3.9 - app-text/docbook-xml-dtd:4.2 - app-text/docbook-xml-dtd:4.5 - app-text/docbook-xsl-stylesheets - dev-libs/libxslt" -RDEPEND="${COMMON_DEPEND} - ! "${T}"/40-gentoo.rules - # Gentoo specific floppy and usb groups - ACTION=="add", SUBSYSTEM=="block", KERNEL=="fd[0-9]", GROUP="floppy" - ACTION=="add", SUBSYSTEM=="usb", ENV{DEVTYPE}=="usb_device", GROUP="usb" - EOF - - # change rules back to group uucp instead of dialout for now wrt #454556 - sed -i -e 's/GROUP="dialout"/GROUP="uucp"/' rules/*.rules || die - - # stub out the am_path_libcrypt function - echo 'AC_DEFUN([AM_PATH_LIBGCRYPT],[:])' > m4/gcrypt.m4 - - default - - eautoreconf - - if ! [[ ${PV} = 9999* ]]; then - check_default_rules - fi - - if ! use elibc_glibc; then #443030 - echo '#define secure_getenv(x) NULL' >> config.h.in - sed -i -e '/error.*secure_getenv/s:.*:#define secure_getenv(x) NULL:' src/shared/missing.h || die - fi -} - -src_configure() { - # Prevent conflicts with i686 cross toolchain, bug 559726 - tc-export AR CC NM OBJCOPY RANLIB - multilib-minimal_src_configure -} - -multilib_src_configure() { - tc-export CC #463846 - export cc_cv_CFLAGS__flto=no #502950 - export cc_cv_CFLAGS__Werror_shadow=no #554454 - export cc_cv_LDFLAGS__Wl__fuse_ld_gold=no #573874 - - # Keep sorted by ./configure --help and only pass --disable flags - # when *required* to avoid external deps or unnecessary compile - local econf_args - econf_args=( - --libdir=/usr/$(get_libdir) - --docdir=/usr/share/doc/${PF} - --disable-nls - --disable-dbus - $(multilib_native_use_enable kmod) - --disable-xkbcommon - --disable-seccomp - $(multilib_native_use_enable selinux) - --disable-xz - --disable-lz4 - --disable-pam - $(multilib_native_use_enable acl) - --disable-gcrypt - --disable-audit - --disable-libcryptsetup - --disable-qrencode - --disable-microhttpd - --disable-gnuefi - --disable-gnutls - --disable-libcurl - --disable-libidn - --disable-quotacheck - --disable-logind - --disable-polkit - --disable-myhostname - $(multilib_is_native_abi || echo "--disable-manpages") - --enable-split-usr - --without-python - --with-bashcompletiondir="$(get_bashcompdir)" - --with-rootprefix= - $(multilib_is_native_abi && echo "--with-rootlibdir=/$(get_libdir)") - --disable-elfutils - ) - - if ! multilib_is_native_abi; then - econf_args+=( - MOUNT_{CFLAGS,LIBS}=' ' - ) - fi - - ECONF_SOURCE=${S} econf "${econf_args[@]}" -} - -multilib_src_compile() { - echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra - emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES - - # Most of the parallel build problems were solved by >=sys-devel/make-3.82-r4, - # but not everything -- separate building of the binaries as a workaround, - # which will force internal libraries required for the helpers to be built - # early enough, like eg. libsystemd-shared.la - if multilib_is_native_abi; then - local lib_targets=( libudev.la ) - emake "${lib_targets[@]}" - - local exec_targets=( - systemd-udevd - udevadm - ) - emake "${exec_targets[@]}" - - local helper_targets=( - ata_id - cdrom_id - collect - scsi_id - v4l_id - mtd_probe - ) - emake "${helper_targets[@]}" - - local man_targets=( - man/udev.conf.5 - man/systemd.link.5 - man/udev.7 - man/systemd-udevd.service.8 - man/udevadm.8 - ) - emake "${man_targets[@]}" - else - local lib_targets=( libudev.la ) - emake "${lib_targets[@]}" - fi -} - -multilib_src_install() { - if multilib_is_native_abi; then - local targets=( - install-includeHEADERS - install-rootbinPROGRAMS - install-rootlibLTLIBRARIES - install-rootlibexecPROGRAMS - install-udevlibexecPROGRAMS - install-dist_udevconfDATA - install-dist_udevrulesDATA - install-pkgconfiglibDATA - install-pkgconfigdataDATA - install-dist_docDATA - install-directories-hook - install-dist_bashcompletionDATA - install-dist_networkDATA - rootlibexec_PROGRAMS=systemd-udevd - rootbin_PROGRAMS=udevadm - rootlib_LTLIBRARIES="libudev.la" - pkgconfiglib_DATA="src/libudev/libudev.pc" - pkgconfigdata_DATA="src/udev/udev.pc" - INSTALL_DIRS='$(sysconfdir)/udev/rules.d $(sysconfdir)/udev/hwdb.d $(sysconfdir)/systemd/network' - dist_bashcompletion_DATA="shell-completion/bash/udevadm" - dist_network_DATA="network/99-default.link" - ) - emake -j1 DESTDIR="${D}" "${targets[@]}" - doman man/{udev.conf.5,systemd.link.5,udev.7,systemd-udevd.service.8,udevadm.8} - - # Compatibility symlink for software that looks for libudev.so - # without using pkg-config - dosym ../../$(get_libdir)/libudev.so.1 \ - /usr/$(get_libdir)/libudev.so - else - local targets=( - install-libLTLIBRARIES - install-includeHEADERS - install-pkgconfiglibDATA - lib_LTLIBRARIES="libudev.la" - pkgconfiglib_DATA="src/libudev/libudev.pc" - include_HEADERS="src/libudev/libudev.h" - ) - - emake -j1 DESTDIR="${D}" "${targets[@]}" - fi -} - -multilib_src_install_all() { - dodoc TODO - - prune_libtool_files --all - rm -f "${D}"/lib/udev/rules.d/99-systemd.rules - rm -f "${D}"/usr/share/doc/${PF}/{LICENSE.*,GVARIANT-SERIALIZATION,DIFFERENCES,PORTING-DBUS1,sd-shutdown.h} - - # see src_prepare() for content of 40-gentoo.rules - insinto /lib/udev/rules.d - doins "${T}"/40-gentoo.rules - - # maintainer note: by not letting the upstream build-sys create the .so - # link, you also avoid a parallel make problem - mv "${D}"/usr/share/man/man8/systemd-udevd{.service,}.8 -} - -pkg_postinst() { - mkdir -p "${ROOT%/}"/run - - # "losetup -f" is confused if there is an empty /dev/loop/, Bug #338766 - # So try to remove it here (will only work if empty). - rmdir "${ROOT%/}"/dev/loop 2>/dev/null - if [[ -d ${ROOT%/}/dev/loop ]]; then - ewarn "Please make sure your remove /dev/loop," - ewarn "else losetup may be confused when looking for unused devices." - fi - - local fstab="${ROOT%/}"/etc/fstab dev path fstype rest - while read -r dev path fstype rest; do - if [[ ${path} == /dev && ${fstype} != devtmpfs ]]; then - ewarn "You need to edit your /dev line in ${fstab} to have devtmpfs" - ewarn "filesystem. Otherwise udev won't be able to boot." - ewarn "See, https://bugs.gentoo.org/453186" - fi - done < "${fstab}" - - if [[ -d ${ROOT%/}/usr/lib/udev ]]; then - ewarn - ewarn "Please re-emerge all packages on your system which install" - ewarn "rules and helpers in /usr/lib/udev. They should now be in" - ewarn "/lib/udev." - ewarn - ewarn "One way to do this is to run the following command:" - ewarn "emerge -av1 \$(qfile -q -S -C /usr/lib/udev)" - ewarn "Note that qfile can be found in app-portage/portage-utils" - fi - - local old_cd_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-cd.rules - local old_net_rules="${ROOT%/}"/etc/udev/rules.d/70-persistent-net.rules - for old_rules in "${old_cd_rules}" "${old_net_rules}"; do - if [[ -f ${old_rules} ]]; then - ewarn - ewarn "File ${old_rules} is from old udev installation but if you still use it," - ewarn "rename it to something else starting with 70- to silence this deprecation" - ewarn "warning." - fi - done - - elog - elog "Starting from version >= 197 the new predictable network interface names are" - elog "used by default, see:" - elog "https://www.freedesktop.org/wiki/Software/systemd/PredictableNetworkInterfaceNames" - elog "https://cgit.freedesktop.org/systemd/systemd/tree/src/udev/udev-builtin-net_id.c" - elog - elog "Example command to get the information for the new interface name before booting" - elog "(replace with, for example, eth0):" - elog "# udevadm test-builtin net_id /sys/class/net/ 2> /dev/null" - elog - elog "You can use either kernel parameter \"net.ifnames=0\", create empty" - elog "file /etc/systemd/network/99-default.link, or symlink it to /dev/null" - elog "to disable the feature." - - if has_version 'sys-apps/biosdevname'; then - ewarn - ewarn "You can replace the functionality of sys-apps/biosdevname which has been" - ewarn "detected to be installed with the new predictable network interface names." - fi - - ewarn - ewarn "You need to restart udev as soon as possible to make the upgrade go" - ewarn "into effect." - ewarn "The method you use to do this depends on your init system." - if has_version 'sys-apps/openrc'; then - ewarn "For sys-apps/openrc users it is:" - ewarn "# /etc/init.d/udev --nodeps restart" - fi - - elog - elog "For more information on udev on Gentoo, upgrading, writing udev rules, and" - elog "fixing known issues visit:" - elog "https://wiki.gentoo.org/wiki/Udev" - elog "https://wiki.gentoo.org/wiki/Udev/upgrade" - - # If user has disabled 80-net-name-slot.rules using a empty file or a symlink to /dev/null, - # do the same for 80-net-setup-link.rules to keep the old behavior - local net_move=no - local net_name_slot_sym=no - local net_rules_path="${ROOT%/}"/etc/udev/rules.d - local net_name_slot="${net_rules_path}"/80-net-name-slot.rules - local net_setup_link="${net_rules_path}"/80-net-setup-link.rules - if [[ ! -e ${net_setup_link} ]]; then - [[ -f ${net_name_slot} && $(sed -e "/^#/d" -e "/^\W*$/d" ${net_name_slot} | wc -l) == 0 ]] && net_move=yes - if [[ -L ${net_name_slot} && $(readlink ${net_name_slot}) == /dev/null ]]; then - net_move=yes - net_name_slot_sym=yes - fi - fi - if [[ ${net_move} == yes ]]; then - ebegin "Copying ${net_name_slot} to ${net_setup_link}" - - if [[ ${net_name_slot_sym} == yes ]]; then - ln -nfs /dev/null "${net_setup_link}" - else - cp "${net_name_slot}" "${net_setup_link}" - fi - eend $? - fi - - # https://cgit.freedesktop.org/systemd/systemd/commit/rules/50-udev-default.rules?id=3dff3e00e044e2d53c76fa842b9a4759d4a50e69 - # https://bugs.gentoo.org/246847 - # https://bugs.gentoo.org/514174 - enewgroup input - - # Update hwdb database in case the format is changed by udev version. - if has_version 'sys-apps/hwids[udev]'; then - udevadm hwdb --update --root="${ROOT%/}" - # Only reload when we are not upgrading to avoid potential race w/ incompatible hwdb.bin and the running udevd - # https://cgit.freedesktop.org/systemd/systemd/commit/?id=1fab57c209035f7e66198343074e9cee06718bda - [[ -z ${REPLACING_VERSIONS} ]] && udev_reload - fi -} diff --git a/sys-fs/zfs-kmod/Manifest b/sys-fs/zfs-kmod/Manifest index 42eeddb54e02..e27f79cfdb51 100644 --- a/sys-fs/zfs-kmod/Manifest +++ b/sys-fs/zfs-kmod/Manifest @@ -3,7 +3,7 @@ DIST zfs-0.7.8.tar.gz 6514969 BLAKE2B 689d96ad7afeb422cbeca724f248ac56b6fcdc0a7e DIST zfs-0.7.9.tar.gz 6548649 BLAKE2B aa2f1b9d0ba0eda1af7d420c43d65d5d4183169cfe97c693356e1e0b15967ea512c25454f2d77285600f2209d778e4299f420754932e403a390b87b4f488dc94 SHA512 af5d9c320885ee84019fb04250c4b12c7ac3bb3d1037b1961ec4584701a737558374dc22521743e197356efb1d1f0ced9beff675ae9cfcccf3cd8407467f18fa EBUILD zfs-kmod-0.6.5.11.ebuild 4067 BLAKE2B 9ef7ef08382771987aa2c71ffe917c9321744f935f74da1553ed88a4732399c16522c70b069fd51082ee3c6c540d71038cd888a690530aa5b554958460a74c80 SHA512 eca5ec333c7dcf5a4815e6eeb8ef9c9f4449ccc1746b3100aee9042b824c0175c491a4d34726864eb80fb3be55c3bc8e8c2d860948ffb7cfd5417857d7723384 EBUILD zfs-kmod-0.7.8.ebuild 4053 BLAKE2B f678c78a5e4c13c2e6339c8b859ae396d62a1403a895b3a53677f5999f63ff08c608e382c51b7bde0e7a4e092eddbca90d84ab808a105a7923a81cd6d18815d0 SHA512 863030a139ca6f7cb0e4a8dbe870fe6123782b74b8ec0e4353ee3020512922663b11fc3b374206a52fcbcf114ccfb9002ba5a895398981e562ef09f4f5b87db6 -EBUILD zfs-kmod-0.7.9.ebuild 4053 BLAKE2B f678c78a5e4c13c2e6339c8b859ae396d62a1403a895b3a53677f5999f63ff08c608e382c51b7bde0e7a4e092eddbca90d84ab808a105a7923a81cd6d18815d0 SHA512 863030a139ca6f7cb0e4a8dbe870fe6123782b74b8ec0e4353ee3020512922663b11fc3b374206a52fcbcf114ccfb9002ba5a895398981e562ef09f4f5b87db6 -EBUILD zfs-kmod-0.7.9999.ebuild 4112 BLAKE2B 8de7c6141fb29223abb3dfa371af43135b876e4791ec2ea140624f2b105efbee1eef37ec8059adfe147d0bce81ed9968a4921395ada10dac8a2a14059ca4ec48 SHA512 57af0f45a19b938e0aff46e1f7628fd4a81dcc41e32a2e6a345f5901ea9d10cd8a797873bb2c338d58c502007cf54e8ff378da2a4c7746ae5061a66caa5b58b3 -EBUILD zfs-kmod-9999.ebuild 2754 BLAKE2B e3f6c8f5420724380a1a355c64650c70e808400e59dd2f09d882f81f8afb4484d46c37b477744e9efcdd99a6b2ad75065d54794f900f0ff45000b2dac4c5d92c SHA512 4591269a50de3e4c4a0a14e86bf3489d8f2898c34a9c173cda78cc97bd524f374bd11484c71854a635791ba3eae0d357730332ba1c91d204ef2636260c8d292a +EBUILD zfs-kmod-0.7.9.ebuild 4053 BLAKE2B 3fd50c6fd61ea5074d30dc614d96e3536842b1d91e3d9857482e0f4e0c5e38d4b838c04008a8b2f160c2e89c8ea8938e02bb6fc8f8f67c1e98a89d19085eec89 SHA512 a8384a821aee26b7daae6548bfd60d64ce5d7bff00a963818c35cfefbf3215c559de402e6892964486252453f9cb60ace6131e798c556288b8c476b1f5808841 +EBUILD zfs-kmod-0.7.9999.ebuild 4112 BLAKE2B a5876296e76423f8d12f7ad5eb095c58b2147f92cdad8a69b476f8950e7c463502f145e4d5c2ca3d91fc905a5aed36a3d713e6f1b35ee34bf6d143cbe557b1d7 SHA512 7d3166cb609cea9432e4124f2848c736fee562ac7a1fd3ecb87af9915b458be17b7d6cf36b86d28c5ed8fdb62a021e8c0dcc018c1dc254fcc5e6a0ee5f78d51e +EBUILD zfs-kmod-9999.ebuild 2754 BLAKE2B d52f0ccea482eed0d40aabba47a221a3b495f5526813fd82c69e25853d86784c89bc627cde0ab44dc752310abf01fd43f166eaca7319fa414e7f87bfcb5583f3 SHA512 2ebdf596169ba9b74f8fe9b7e759f951bad26b8fbb323fdc13847ec307be5df4816582dc18612a2a4ebf168cfa3c6c2548b9b79b66a789cc9a26e8ef94c9b413 MISC metadata.xml 666 BLAKE2B 45ed040273833c94523c3531f36c739d0d482fbdba09cb229e6b0be80c3cfd2f124e1d90facc19c1109be3e19255f2428aeb14da106f2a39b59a0549704debbf SHA512 eea336c56df7d0b4e0f259ce88d837e2700a4733e1e70ec484ed4e3246abddb928f21f8e912822f778d626b962b092f803a0bf0ce1b812891d53d1a31f06cac9 diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild index c8153afff87b..eb47997ccea6 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9.ebuild @@ -65,7 +65,7 @@ pkg_setup() { kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" [ ${PV} != "9999" ] && \ - { kernel_is le 4 16 || die "Linux 4.16 is the latest supported version."; } + { kernel_is le 4 17 || die "Linux 4.17 is the latest supported version."; } check_extra_config } diff --git a/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild index 75ba206896f1..b16a30dc7d69 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-0.7.9999.ebuild @@ -66,7 +66,7 @@ pkg_setup() { kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" [[ ${PV} != *"9999" ]] && \ - { kernel_is le 4 15 || die "Linux 4.15 is the latest supported version."; } + { kernel_is le 4 17 || die "Linux 4.17 is the latest supported version."; } check_extra_config } diff --git a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild index 370cba95127a..08cf1e872b2a 100644 --- a/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild +++ b/sys-fs/zfs-kmod/zfs-kmod-9999.ebuild @@ -68,7 +68,7 @@ pkg_setup() { kernel_is ge 2 6 32 || die "Linux 2.6.32 or newer required" [ ${PV} != "9999" ] && \ - { kernel_is le 4 16 || die "Linux 4.16 is the latest supported version."; } + { kernel_is le 4 17 || die "Linux 4.17 is the latest supported version."; } check_extra_config } -- cgit v1.2.3