diff options
| -rw-r--r-- | sys-fs/aufs2/ChangeLog | 8 | ||||
| -rw-r--r-- | sys-fs/aufs2/Manifest | 11 | ||||
| -rw-r--r-- | sys-fs/aufs2/aufs2-0_p20110120-r1.ebuild | 116 | ||||
| -rw-r--r-- | sys-fs/aufs2/aufs2-0_p20110120.ebuild | 4 |
4 files changed, 131 insertions, 8 deletions
diff --git a/sys-fs/aufs2/ChangeLog b/sys-fs/aufs2/ChangeLog index 15a6529f4293..29b6135e7d79 100644 --- a/sys-fs/aufs2/ChangeLog +++ b/sys-fs/aufs2/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for sys-fs/aufs2 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.33 2011/02/27 13:09:23 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.34 2011/03/06 08:33:14 jlec Exp $ + +*aufs2-0_p20110120-r1 (06 Mar 2011) + + 06 Mar 2011; Justin Lecher <jlec@gentoo.org> aufs2-0_p20110120.ebuild, + +aufs2-0_p20110120-r1.ebuild: + Fixed wrong setting for HFS support, #357303; rewrite config setter 27 Feb 2011; Justin Lecher <jlec@gentoo.org> aufs2-0_p20100809.ebuild, aufs2-0_p20101122.ebuild, aufs2-0_p20110120.ebuild, metadata.xml: diff --git a/sys-fs/aufs2/Manifest b/sys-fs/aufs2/Manifest index 1418869822e9..1908b036f5b7 100644 --- a/sys-fs/aufs2/Manifest +++ b/sys-fs/aufs2/Manifest @@ -30,13 +30,14 @@ DIST aufs2-0_p20101122.tar.bz2 14124185 RMD160 b4b94438b916bb3972c55e6c3edc37eec DIST aufs2-0_p20110120.tar.bz2 2325118 RMD160 2b756ad239c7d96e04789bc1bff23b064da03eba SHA1 ee58cf1bdeaca6eaad352353a792b40494fc0b44 SHA256 93e0e6b1c862fa2565932200350b8bcb313f9db129f51e44b37e17fbc3c2b9b7 EBUILD aufs2-0_p20100809.ebuild 3246 RMD160 dd5d214ff7bb1d3a39dd84721fb6bd59831b17f4 SHA1 da5f6fb0655efc218290d490f9a87fa23db9c53f SHA256 2597286e0afea3ce7437fb634d24c9d3d0e7ba299fa2e8422c52e2ddbcb2e43a EBUILD aufs2-0_p20101122.ebuild 3411 RMD160 a5ca24e39c5eddbab3036b37a199e76aded2f8c8 SHA1 0e5760c4f044354cb1d0681d0ec2b86503cf1855 SHA256 b30c59f14dfa04f64c0c3a78f2dffe61437dd1ef6beaaef5ac7da283697d9e47 -EBUILD aufs2-0_p20110120.ebuild 4026 RMD160 356ad03351d74b1a0bc759ca0089f4647eb46221 SHA1 7b6e97ec45c43db21ce2cd87b3b3daf3559c8456 SHA256 059bc0b705560697ded7e43df6c20b061065040ce219ad4d69c38920492e91c8 -MISC ChangeLog 7096 RMD160 e9fc12ed9def5e7df039cbcac2cb8f07920324fe SHA1 1950e1596bf1c3adf801360580bbf2f6e8dd71b8 SHA256 eaa697c7061d041877ec106cb59973b4fb16fd5825bd7383e3a6c9a4d2fc1255 +EBUILD aufs2-0_p20110120-r1.ebuild 3850 RMD160 b86dd0ea31680f9f80058bfafe92d1940ffcebc8 SHA1 3e302c987c07fd193b25c11e78e0c53e932a7005 SHA256 73348b51ff1c24ef58ddb49839b3283a2d4df28b55f02b21eec1b1b3c0813259 +EBUILD aufs2-0_p20110120.ebuild 4032 RMD160 fa40443f4ae8b30dc2bddbd9b59890186e37b35b SHA1 e033f1c20a82daf9b991863deb742506815f15ee SHA256 39d9581633fc0f05e96361526578d1f206349a0fb4cb070976062ea5129cbe2d +MISC ChangeLog 7309 RMD160 cef7e9393985005c2e7185b222efe7558387194a SHA1 ad0b5bfc151cd03e992448b348505a218dc3434a SHA256 00f8e462ed29529ba2ea5039c70704b397d82faa6439fdd7e3e88d3bc8fac442 MISC metadata.xml 704 RMD160 592d993abdffb3af8519a0ca331548e0e45593dd SHA1 311576b500cde5fae84f621393371e30c5f791e5 SHA256 71b9740f4dfe687701efd3465500fb99ca9e2ec8a9f14379580fa58b45db5e05 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iEYEARECAAYFAk1qTQkACgkQgAnW8HDreRYPowCgoeBfVnPPNpeV4pLdeAW5G/cB -7PwAn37M+Anx1whT+Wuc+k2QaAkRumd0 -=HPfq +iEYEARECAAYFAk1zRtcACgkQgAnW8HDreRZInQCgyfx44wTzeq4dDpqINc+SV1KQ +q2EAoIM4LycYLlBmM1jFAmH6OdK5vZGW +=Ww3u -----END PGP SIGNATURE----- diff --git a/sys-fs/aufs2/aufs2-0_p20110120-r1.ebuild b/sys-fs/aufs2/aufs2-0_p20110120-r1.ebuild new file mode 100644 index 000000000000..c715edecec92 --- /dev/null +++ b/sys-fs/aufs2/aufs2-0_p20110120-r1.ebuild @@ -0,0 +1,116 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20110120-r1.ebuild,v 1.1 2011/03/06 08:33:14 jlec Exp $ + +EAPI="4" + +inherit linux-mod multilib toolchain-funcs + +DESCRIPTION="An entirely re-designed and re-implemented Unionfs" +HOMEPAGE="http://aufs.sourceforge.net" +SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug fuse hardened hfs inotify kernel-patch nfs ramfs" + +DEPEND="dev-vcs/git" +RDEPEND="!sys-fs/aufs" + +S="${WORKDIR}"/${PN}-standalone + +MODULE_NAMES="aufs(misc:${S})" + +pkg_setup() { + CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL" + use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" + use nfs && CONFIG_CHECK="${CONFIG_CHECK} ~EXPORTFS" + use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" + use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" + + # this is needed so merging a binpkg aufs2 is possible w/out a kernel unpacked on the system + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return + + get_version + kernel_is lt 2 6 31 && die "kernel too old" + kernel_is gt 2 6 37 && die "kernel too new" + + linux-mod_pkg_setup + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \ + patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.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} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null + epatch "${FILESDIR}"/aufs2-{base,standalone}-${KV_PATCH}.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 aufs2 module" + eerror "Either enable the kernel-patch useflag to do it with this ebuild" + eerror "or apply ${FILESDIR}/aufs2-base-${KV_PATCH}.patch and" + eerror "${FILESDIR}/aufs2-standalone-${KV_PATCH}.patch by hand" + die "missing kernel patch, please apply it first" + fi + fi + 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 branch=origin/aufs2.1-${KV_PATCH} + git checkout -q $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 && set_config INO_T_64 + use ramfs && set_config BR_RAMFS + + if use hardened ; then + epatch "${FILESDIR}"/pax.patch + fi + + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die + sed -i "s:__user::g" include/linux/aufs_type.h || die + + cd "${WORKDIR}"/${PN}-util + git checkout -q origin/aufs2.1 + sed -i "/LDFLAGS += -static -s/d" Makefile || die + sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die +} + +src_compile() { + local ARCH=x86 + + emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} || die + + cd "${WORKDIR}"/${PN}-util + emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include || die +} + +src_install() { + linux-mod_src_install + dodoc README || die + docinto design + dodoc design/*.txt || die + cd "${WORKDIR}"/${PN}-util + emake DESTDIR="${D}" KDIR=${KV_DIR} install || die + docinto + newdoc README README-utils || die +} diff --git a/sys-fs/aufs2/aufs2-0_p20110120.ebuild b/sys-fs/aufs2/aufs2-0_p20110120.ebuild index 809cf97bcbfd..ed0085aaec3a 100644 --- a/sys-fs/aufs2/aufs2-0_p20110120.ebuild +++ b/sys-fs/aufs2/aufs2-0_p20110120.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20110120.ebuild,v 1.3 2011/02/27 13:09:23 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20110120.ebuild,v 1.4 2011/03/06 08:33:14 jlec Exp $ EAPI="2" @@ -84,7 +84,7 @@ src_prepare() { fi if use hfs; then - sed -i "s:AUFS_BR_FUSE =:AUFS_BR_FUSE = y:g" config.mk || die + sed -i "s:AUFS_BR_HFSPLUS =:AUFS_BR_HFSPLUS = y:g" config.mk || die fi if use hardened ; then |