From: Justin Lecher Date: Mon, 17 Nov 2014 08:15:48 +0000 (+0000) Subject: sys-fs/aufs3: Bump to latest aufs3 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=31c99c83b89803d13ebffef12407e359c8011c81;p=gentoo.git sys-fs/aufs3: Bump to latest aufs3 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xB9D4F231BD1558AB! --- diff --git a/sys-fs/aufs3/ChangeLog b/sys-fs/aufs3/ChangeLog index c320197b4a18..707290ff168e 100644 --- a/sys-fs/aufs3/ChangeLog +++ b/sys-fs/aufs3/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for sys-fs/aufs3 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.111 2014/11/04 08:11:48 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.112 2014/11/17 08:15:48 jlec Exp $ + +*aufs3-3_p20141110 (17 Nov 2014) + + 17 Nov 2014; Justin Lecher +aufs3-3_p20141110.ebuild: + Bump to latest aufs3 *aufs3-3_p20141103 (04 Nov 2014) diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest index c2d83246b1b7..78754f72ed29 100644 --- a/sys-fs/aufs3/Manifest +++ b/sys-fs/aufs3/Manifest @@ -13,6 +13,7 @@ DIST aufs3-standalone-3_p20141006.tar.xz 2446748 SHA256 c3910c597b82f61cbf6a6d93 DIST aufs3-standalone-3_p20141013.tar.xz 2453692 SHA256 fb979ebfe479a31ba99ddb908378dbc8415eeb8eb31cadeae114b17c891c6442 SHA512 ccdda830787d853105b7fed2d2d559541090a50a05ed95e393ed07344ab316f80420a32c61a00b13babc98eb0ca76a1161b654ad14aa6604ebcaf7e8babaf6cf WHIRLPOOL 1d377ae270fe015d1abfd84000b65fc4e4636b7f7db5ea687ee4806729184db602aec0c691551b7c8beb3cf1350e9d9452041f5835d314db7a2dd50cbef97d37 DIST aufs3-standalone-3_p20141020.tar.xz 2490912 SHA256 7bf64e2f119a4bfb2d1a275cd2cd90420b8b8e12fd53de4f35c4b7ae8ee73502 SHA512 e47be3c283478319cbeadde59a97c0861e151f88612b646f1255f4de4fac30147a979245fffa93db9daa2023ef1c21868f9d064fc1c5b218d292db52b6c61d57 WHIRLPOOL 6b461bab22a9f1231cf2c5768a2773b2d1243604602edcd7aa44e6c6a17437769de47510ff6e4b791cec2dc408b8d64758f3d88655ae59e2a95dffdbf5377801 DIST aufs3-standalone-3_p20141103.tar.xz 2485948 SHA256 d945f143956e6d32d2ffe89337fbf8687acf8178b6355e9ccf06e25861ce055b SHA512 e1a5c4b0a665a2d7c6f06413837bf732ce09ea6c59551d9eb741024fc201314eeffaf75d8b768d6d254fd0b563a44f905adba1291ce95eb2b0db34b550588e35 WHIRLPOOL 6402d72b4e1b91cc2bb7e08845d565acdd379553120cf20c8af3ee0148c75e785a54dcf03485b959462647542a0e1517ad7623914c3271df0cf8f2d2e5b664eb +DIST aufs3-standalone-3_p20141110.tar.xz 2484416 SHA256 7832f2ee3f088340250bedc05ac56f2fe2488e6d603f3206733626bca704cf2e SHA512 50e812e50a6206b0b1184c654f97b7e7da913c323aeb8462bb2315bee7ef960da70f8c8b22bc0857a72b206773c1c802c070b1230a9c7b1974a2512ddcfe380b WHIRLPOOL bf5b993e94763b6e051ed0167fab19703f42574fbc6708ffdd8f9ad9cd2e22b85e508b21ebf2d43a8e4093d40ce59bf527282b6e0c0d0c3481660aa947093ac4 EBUILD aufs3-3_p20140811.ebuild 5289 SHA256 90423edfc0dc22d1142b3cf29cff610ed0a9a8101a200a9333195e6e75f41d38 SHA512 d2fd015adee71aeb5cc5937b2f3dbfd682525d5c127ae23aa7c3531276420f675f08460bc3ce36e5fc49acc1ce38bb97d5f9dd2a0833770376ff0383653d65e3 WHIRLPOOL b7d8a2c3df0549725ba2fe8bc4d3a009101b239de8a3ff7553bba36097d74487ee1c7737eabf8b593b419a1b284ffc1e5aaaa1e7d2391f5df9bc5254d51bdd49 EBUILD aufs3-3_p20140818.ebuild 5289 SHA256 1ec07186d0b8c186fcfeec3af7ba6380a23c42ed9a9b92c2b83135f4b3e4e493 SHA512 8668411990b4e184ead86d4e2d670243a52885e9cbc4434b1129d6c6a172ccfdc93276277e320f366cb8fc41c461229e9c68d5598d94b6f756c51f70879efe1c WHIRLPOOL 1948e50544ebdf819120ca7480cf3f584fb3d98b4f0550de994682a4cccee47daa4d84b9589df06c396ada53f58d098cb132c3d4c14005f1f176c83492a3007a EBUILD aufs3-3_p20140908.ebuild 5289 SHA256 7f710603aa95a8fe1e5ee9927db6107b0212e292c10d7bbf3da2cdf2e6d60f87 SHA512 4e44d470bfcf4e04764ff640bcb5ca61196ae796e1ba41a8884cdd3a5d7484b1e79c5c93f56264bbf72f5099048d4bb7f35e787c4e185da57d7149575fc4372b WHIRLPOOL ffd516d99b7acffd6b308a3cea3ced65545780515e86a89f7b80991001a05ffd059b5320204b559ab4099e419a9ffcfd262b31b87d369e7b798e9716a45bb96a @@ -21,24 +22,25 @@ EBUILD aufs3-3_p20141006.ebuild 5289 SHA256 19de9bf12519cee342a9fcd77eb23f80183f EBUILD aufs3-3_p20141013.ebuild 5362 SHA256 c1779ae745ec4ebcc5c0ee4231a1bf5b27347193d21240d50fa27784de0008f5 SHA512 c1b8dc092d2dcd6125b9cfddf63a510b6107d6892ef69f3473f6687af6460c394319748cf22213b19439d0af4b99ae203277a2478a7f67b1a264a23da3c53a27 WHIRLPOOL 7d5a349f38bf9ffa584e58d7e1214180ac72053597850cd2c07b4c691f088ed1f4d2965e2d802de005f83be3d08c7482f227513d2556ae594a2b18ead879c8e2 EBUILD aufs3-3_p20141020.ebuild 5362 SHA256 f9ed3035bff6bb7889240de972e6f9337da06c8c2381c54519b030bb0cfe6fb2 SHA512 b346d10a4a039244f2d8d51dbae60f7c99f47c1b11f07c1692b1963b2c822d71851b76138873ef7f5edb385a63d1229b5f874178b2dc4c6202ee006a1b0bb185 WHIRLPOOL 2523e0d0ccc858216ebcdd316e01281fc6945c5321aba5c4b966ab0134b3346c6439af004612c843b5b4a0c7986ec478c9ccbae6a886e648c8ae87cf634ed791 EBUILD aufs3-3_p20141103.ebuild 5499 SHA256 7c5621fd2c7dd855d60cbfb506c872978e289283e0bdfbad31388f1da3b674d2 SHA512 7504500eac278d365a7208fe4b91502d646bc2662734f60ddfed6120f24d1a72b26535add7310aefa47795b5ca9e5b4cff763839fc0bf87e5dff78eacb0f8f5a WHIRLPOOL 087ce2f1307d70a7d35522fba3edb5fd876a113be6cbd6493b2705612bd2f939f00e605481b53cd437e06126cce610c7fb312d54331a33dfab81f29a67aec8f7 -MISC ChangeLog 26665 SHA256 6d8ad779ae4e1f6ed889036288fa059e1e746a8ad7fe45529ec3559a69dc250c SHA512 8b10851f64bfa903baead5df72958180392baab10fad069d4c9861d544e83821e073c24d18d58a72253d6d0282991604bd4820eed72149e14995ead20917ac96 WHIRLPOOL 526044a1d94f098dc5854090e52f8c06d94de0487e8b77be3717e5794bab04d4b6fba8c644db99a919506041a9de0bd1e180b8dfeb206c05fc92434abd4c5f4e +EBUILD aufs3-3_p20141110.ebuild 5499 SHA256 6622a6f1e4114777af9982ea89636e5087800e68fb712b75738906798f20eb80 SHA512 8cc804f6e9509f75122b156a47299ba202bfd9b9c3ae496b467d70758de15235dd26748db4bf03255cbf421ef2085e2a664341bfb3bb27102986eb5ee48451a8 WHIRLPOOL 0aa3188585f63603d2c1599486f1bc9a090ff9ca6200bdef6db6bd79620a6afe455dfed08b5fc46ad5e76a1f9296f9d484b38ed6e3e47292489e710563283e9a +MISC ChangeLog 26797 SHA256 007287bd71db18e0556bf8eae9c4a998f1e61da24cb0aad8407cc2f99b2c135f SHA512 a1972566f29c0596d0b48eb3f68c960f932ac99216ffb26c1bc18ae8304b604fb7f3f1402022b1fc7d239285387dcfb05f9e80d1097b3b13e171cd387813db38 WHIRLPOOL fb98f72e0a67e7b3521c5a4c893c78702a4c8803d07ba932e732da08141f92700faa151b75df8e1d8e2ae9d1985a077dc0c1d8f1066ee39bbd69619de2bc60b3 MISC metadata.xml 717 SHA256 3c55d0a76fa9856c7079674c14f0bfa18c454848aa652f26669b207905ee09aa SHA512 28a8b5b0e55ea607135f34da28025698b578bd6db14f48865ed4996745fccda6a05b0882a5fd13185005517b577231f6c1e01b192add81fddfd0e66b86fc8d4c WHIRLPOOL cd4f9b75f8b5aa5dad559af879445a86740c7cdfab6bd7d97d3ddba5596c139ed2c52b5447b66698078f476a65c3b4355d9f6377e70a54d9cd063e060a0ce2ce -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0 -iQJ8BAEBCgBmBQJUWIpFXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQJ8BAEBCgBmBQJUaa6zXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC -OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirbp4P/iN1ggq5yPhOULI+zkPCBt5l -ZiJtTk7FW1PPh8m49iiOlwKjIR9lScaUiucndwLqDNCX/rJcuxY5CR7WnFLkLpX2 -Y36wurUvVn9MElIyNakI6UvvtcejnrFbkFI17NWuH5hcQGH9TZMGbwenbj85Xbt5 -b6MfICH+7RfdSjPi5wiw5rhMhD0NxCpWw8hAeV2XInnRec3QoWAGLHT3WGJEJUrK -hklWxgWt1no6li25j1dckozozcab2pTYZf0Ous2EKAR1LIEpLN2Jn5QZkLgtDoqa -dT5lZbThGRq7//m8OI9pjCFk3zzoq783ss1HnquvMTbfPjuVSGansSf8ZvtT3FTy -SqUxxMdGack0L53Uy9Q+ZPTq2vJ29rH0JtwYnNlNJ+pdgY0AfRcbNZz8vo/7vlZi -Sp1CecLFUqVA7w1VSk50IlwBEw2SGg7hPkA7P5C44r/bObcepErsJZtlmFREELsi -TA5a+Ombhk+S8s6U1tV59wppg/BUCMzc5gBZfNXt8d55HwShucsT4dJOJm7mwvOy -C9raTjqoK+yCMbi4hzAMYk2jJNZDJsIInXR4ArI6N8wtpH90UAvBA5KTYvc3Z35G -x4Jt1NyySxvkohOhlM6H7Pc5Hbc+HKbuClirCPsMGtsBLxCQJAfG6k4sCf/iaYn0 -gWLQ2fo3Wk4p0OKzhLc7 -=U0D2 +OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVir1PAP/i2fQi2pjWNEM+RnNkz/MiPw +CfxNJQ1z/kLsAIqqxvvmWygR1pjdS5SH6jUCUhUNFYo9UY4hhHVIwQ+plhbc4M3b +guxdOjHE888uOwseEQitohqxXUKoNsjKH0T4QGHnlimMQn+TIQTP/xPzG0MDhaUT +xwUuiISbxogf78/Pn0w5UuOf/MG/WL0UGhHmyqFWKOOiPD9xU+MV/gpOSduyibiV +Oq7yNZ8BHjYTsltrYHemu5vlpCaH5tJYzoCnEAEB7JsgmCk6nmAtdeKe7PNsPUOP +l7Tqtg4JxXJyvbEsGQ2fGU5DZp3sfzB82YwlY6U+FgBb2hFtsTl2S5VnAqR63797 +BatiWP95IaE+mwqTSiNTkufxc4Ja6L7QI/4XwfbyER+OHXUwCU3x2XDiLVgCR95N +eVzYAVGOl53h6nFA83kgkbyqx9sZ8VakCVNMIInjZDNM+Cywc2JjIJBTF0puNV0s +LKHp6pVCq/1QkQNeVpfmkLEaOfCTNTNDA8Jjxk5v2Y51jXQ0URsmqPjH+yxGjj/V +xDrq9PAATRl6GpuHcHzfzGJtgeMT8OV0ZhmvoXY1bx+2Jv7/osHVnCm3id3x7Rj2 +yhU4cLfe37Js+PbgYMJRf/GpUb2XXYOs5jynKz1BUUOhPV5m6u+lLpuUJscHeyhZ +VI12FV+jk0cQ+uEOe+1h +=GKf7 -----END PGP SIGNATURE----- diff --git a/sys-fs/aufs3/aufs3-3_p20141110.ebuild b/sys-fs/aufs3/aufs3-3_p20141110.ebuild new file mode 100644 index 000000000000..9a4eaeac92b6 --- /dev/null +++ b/sys-fs/aufs3/aufs3-3_p20141110.ebuild @@ -0,0 +1,177 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20141110.ebuild,v 1.1 2014/11/17 08:15:48 jlec Exp $ + +EAPI=5 + +inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs + +AUFS_VERSION="${PV%%_p*}" +# highest branch version +PATCH_MAX_VER=17 +# highest supported version +KERN_MAX_VER=18 +# lowest supported version +KERN_MIN_VER=10 + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net/" +SRC_URI="http://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" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +README_GENTOO_SUFFIX="-r1" + +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}" == "10" ]] && [[ "${KV_PATCH}" -ge "28" ]]; then + PATCH_BRANCH="${KV_MINOR}".x + elif [[ "${KV_MINOR}" == "12" ]]; then + PATCH_BRANCH="${KV_MINOR}".x + elif [[ "${KV_MINOR}" == "12" ]] && [[ "${KV_PATCH}" -ge "31" ]]; then + PATCH_BRANCH="${KV_MINOR}".31+ + elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then + PATCH_BRANCH="${KV_MINOR}".12+ + else + PATCH_BRANCH="${KV_MINOR}" + fi + + case ${KV_EXTRA} in + "") + elog "It seems you are using vanilla-sources with aufs3" + elog "Please use sys-kernel/aufs-sources with USE=vanilla" + elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" + ;; + "-gentoo") + elog "It seems you are using gentoo-sources with aufs3" + elog "Please use sys-kernel/aufs-sources" + elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade" + ;; + esac + + pushd "${T}" &> /dev/null + unpack ${A} + cd ${PN}-standalone || die + local module_branch=origin/${PN}.${PATCH_BRANCH} + einfo "Using ${module_branch} as patch source" + git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die + combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch + combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then + if use kernel-patch; then + cd ${KV_DIR} + ewarn "Patching your kernel..." + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null + epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch + ewarn "You need to compile your kernel with the applied patch" + ewarn "to be able to load and use the aufs kernel module" + else + eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" + eerror "Either enable the kernel-patch useflag to do it with this ebuild" + eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + popd &> /dev/null + export PKG_SETUP_HAS_BEEN_RAN=1 +} + +set_config() { + for option in $*; do + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die + done +} + +src_prepare() { + local module_branch=origin/${PN}.${PATCH_BRANCH} + + einfo "Using for module creation branch ${module_branch}" + git checkout -q -b local-gentoo ${module_branch} || die + + # All config options to off + sed "s:= y:=:g" -i config.mk || die + + set_config RDU BRANCH_MAX_127 SBILIST + + use debug && set_config DEBUG + use fuse && set_config BR_FUSE POLL + use hfs && set_config BR_HFSPLUS + use inotify && set_config HNOTIFY HFSNOTIFY + use nfs && set_config EXPORT + use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + if use pax_kernel; then + if kernel_is ge 3 11; then + epatch "${FILESDIR}"/pax-3.11.patch + else + epatch "${FILESDIR}"/pax-3.patch + fi + fi + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die +} + +src_compile() { + local ARCH=x86 + + emake \ + CC=$(tc-getCC) \ + LD=$(tc-getLD) \ + LDFLAGS="$(raw-ldflags)" \ + ARCH=$(tc-arch-kernel) \ + CONFIG_AUFS_FS=m \ + KDIR="${KV_OUT_DIR}" +} + +src_install() { + linux-mod_src_install + + insinto /usr/share/doc/${PF} + + use doc && doins -r Documentation + + use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch + + dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch + + readme.gentoo_create_doc +} + +pkg_postinst() { + readme.gentoo_pkg_postinst + linux-mod_pkg_postinst +}