| 1 |
tommy 10/11/30 21:25:04 |
| 2 |
|
| 3 |
Modified: metadata.xml ChangeLog |
| 4 |
Added: aufs2-0_p20101122.ebuild |
| 5 |
Removed: aufs2-0_p20100726.ebuild |
| 6 |
Log: |
| 7 |
Version bump, drop old |
| 8 |
|
| 9 |
(Portage version: 2.2.0_alpha6-r1/cvs/Linux x86_64) |
| 10 |
|
| 11 |
Revision Changes Path |
| 12 |
1.5 sys-fs/aufs2/metadata.xml |
| 13 |
|
| 14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/metadata.xml?rev=1.5&view=markup |
| 15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/metadata.xml?rev=1.5&content-type=text/plain |
| 16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/metadata.xml?r1=1.4&r2=1.5 |
| 17 |
|
| 18 |
Index: metadata.xml |
| 19 |
=================================================================== |
| 20 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs2/metadata.xml,v |
| 21 |
retrieving revision 1.4 |
| 22 |
retrieving revision 1.5 |
| 23 |
diff -u -r1.4 -r1.5 |
| 24 |
--- metadata.xml 26 Nov 2009 18:01:48 -0000 1.4 |
| 25 |
+++ metadata.xml 30 Nov 2010 21:25:04 -0000 1.5 |
| 26 |
@@ -5,6 +5,9 @@ |
| 27 |
<maintainer> |
| 28 |
<email>tommy@g.o</email> |
| 29 |
</maintainer> |
| 30 |
+ <maintainer> |
| 31 |
+ <email>jlec@g.o</email> |
| 32 |
+ </maintainer> |
| 33 |
<use> |
| 34 |
<flag name='debug'>Enable additional debugging support</flag> |
| 35 |
<flag name='inotify'>Enable inotify support</flag> |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.28 sys-fs/aufs2/ChangeLog |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/ChangeLog?rev=1.28&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/ChangeLog?rev=1.28&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/ChangeLog?r1=1.27&r2=1.28 |
| 44 |
|
| 45 |
Index: ChangeLog |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v |
| 48 |
retrieving revision 1.27 |
| 49 |
retrieving revision 1.28 |
| 50 |
diff -u -r1.27 -r1.28 |
| 51 |
--- ChangeLog 11 Aug 2010 21:11:37 -0000 1.27 |
| 52 |
+++ ChangeLog 30 Nov 2010 21:25:04 -0000 1.28 |
| 53 |
@@ -1,6 +1,13 @@ |
| 54 |
# ChangeLog for sys-fs/aufs2 |
| 55 |
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 |
| 56 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.27 2010/08/11 21:11:37 tommy Exp $ |
| 57 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.28 2010/11/30 21:25:04 tommy Exp $ |
| 58 |
+ |
| 59 |
+*aufs2-0_p20101122 (30 Nov 2010) |
| 60 |
+ |
| 61 |
+ 30 Nov 2010; Thomas Sachau (Tommy[D]) <tommy@g.o> |
| 62 |
+ -aufs2-0_p20100726.ebuild, +aufs2-0_p20101122.ebuild, |
| 63 |
+ +files/aufs2-base-36.patch, +files/aufs2-standalone-36.patch: |
| 64 |
+ Version bump, remove old |
| 65 |
|
| 66 |
11 Aug 2010; Thomas Sachau (Tommy[D]) <tommy@g.o> |
| 67 |
aufs2-0_p20100809.ebuild: |
| 68 |
|
| 69 |
|
| 70 |
|
| 71 |
1.1 sys-fs/aufs2/aufs2-0_p20101122.ebuild |
| 72 |
|
| 73 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/aufs2-0_p20101122.ebuild?rev=1.1&view=markup |
| 74 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/aufs2-0_p20101122.ebuild?rev=1.1&content-type=text/plain |
| 75 |
|
| 76 |
Index: aufs2-0_p20101122.ebuild |
| 77 |
=================================================================== |
| 78 |
# Copyright 1999-2010 Gentoo Foundation |
| 79 |
# Distributed under the terms of the GNU General Public License v2 |
| 80 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-0_p20101122.ebuild,v 1.1 2010/11/30 21:25:04 tommy Exp $ |
| 81 |
|
| 82 |
EAPI="2" |
| 83 |
|
| 84 |
inherit linux-mod multilib toolchain-funcs |
| 85 |
|
| 86 |
DESCRIPTION="An entirely re-designed and re-implemented Unionfs" |
| 87 |
HOMEPAGE="http://aufs.sourceforge.net" |
| 88 |
SRC_URI="mirror://gentoo/${P}.tar.bz2" |
| 89 |
|
| 90 |
LICENSE="GPL-2" |
| 91 |
SLOT="0" |
| 92 |
KEYWORDS="~amd64 ~x86" |
| 93 |
IUSE="debug inotify hardened kernel-patch nfs ramfs" |
| 94 |
|
| 95 |
DEPEND="dev-vcs/git" |
| 96 |
RDEPEND="!sys-fs/aufs" |
| 97 |
|
| 98 |
S=${WORKDIR}/${PN}-standalone |
| 99 |
|
| 100 |
MODULE_NAMES="aufs(misc:${S})" |
| 101 |
|
| 102 |
pkg_setup() { |
| 103 |
# this is needed so merging a binpkg aufs2 is possible w/out a kernel unpacked on the system |
| 104 |
[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return |
| 105 |
|
| 106 |
get_version |
| 107 |
kernel_is lt 2 6 31 && die "kernel too old" |
| 108 |
kernel_is gt 2 6 36 && die "kernel too new" |
| 109 |
|
| 110 |
linux-mod_pkg_setup |
| 111 |
if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null && \ |
| 112 |
patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null ); then |
| 113 |
if use kernel-patch; then |
| 114 |
cd ${KV_DIR} |
| 115 |
ewarn "Patching your kernel..." |
| 116 |
patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-standalone-${KV_PATCH}.patch >/dev/null |
| 117 |
patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/aufs2-base-${KV_PATCH}.patch >/dev/null |
| 118 |
epatch "${FILESDIR}"/aufs2-{base,standalone}-${KV_PATCH}.patch |
| 119 |
elog "You need to compile your kernel with the applied patch" |
| 120 |
elog "to be able to load and use the aufs kernel module" |
| 121 |
else |
| 122 |
eerror "You need to apply a patch to your kernel to compile and run the aufs2 module" |
| 123 |
eerror "Either enable the kernel-patch useflag to do it with this ebuild" |
| 124 |
eerror "or apply ${FILESDIR}/aufs2-base-${KV_PATCH}.patch and" |
| 125 |
eerror "${FILESDIR}/aufs2-standalone-${KV_PATCH}.patch by hand" |
| 126 |
die "missing kernel patch, please apply it first" |
| 127 |
fi |
| 128 |
fi |
| 129 |
export PKG_SETUP_HAS_BEEN_RAN=1 |
| 130 |
} |
| 131 |
|
| 132 |
src_prepare() { |
| 133 |
local branch=origin/aufs2.1-${KV_PATCH} |
| 134 |
git checkout -q $branch || die |
| 135 |
if ! use debug; then |
| 136 |
sed -i "s:DEBUG = y:DEBUG =:g" config.mk || die |
| 137 |
fi |
| 138 |
if use inotify; then |
| 139 |
sed -i -e "s:AUFS_HNOTIFY =:AUFS_HNOTIFY = y:g" \ |
| 140 |
-e "s:AUFS_HINOTIFY =:AUFS_HINOTIFY = y:g" config.mk || die |
| 141 |
fi |
| 142 |
if use ramfs; then |
| 143 |
sed -i "s:RAMFS =:RAMFS = y:g" config.mk || die |
| 144 |
fi |
| 145 |
if use hardened ; then |
| 146 |
epatch "${FILESDIR}"/pax.patch |
| 147 |
fi |
| 148 |
|
| 149 |
sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die |
| 150 |
sed -i "s:__user::g" include/linux/aufs_type.h || die |
| 151 |
cd "${WORKDIR}"/${PN}-util |
| 152 |
git checkout -q origin/aufs2.1 |
| 153 |
sed -i "/LDFLAGS += -static -s/d" Makefile || die |
| 154 |
sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die |
| 155 |
} |
| 156 |
|
| 157 |
src_compile() { |
| 158 |
local myargs="" ARCH=x86 |
| 159 |
use nfs && myargs="CONFIG_EXPORTFS=y CONFIG_AUFS_EXPORT=y " |
| 160 |
use nfs && use amd64 && myargs+="CONFIG_AUFS_INO_T_64=y" |
| 161 |
emake CC=$(tc-getCC) CONFIG_AUFS_FS=m ${myargs} KDIR=${KV_DIR} || die |
| 162 |
cd "${WORKDIR}"/${PN}-util |
| 163 |
emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include || die |
| 164 |
} |
| 165 |
|
| 166 |
src_install() { |
| 167 |
linux-mod_src_install |
| 168 |
dodoc README || die |
| 169 |
docinto design |
| 170 |
dodoc design/*.txt || die |
| 171 |
cd "${WORKDIR}"/${PN}-util |
| 172 |
emake DESTDIR="${D}" KDIR=${KV_DIR} install || die |
| 173 |
docinto |
| 174 |
newdoc README README-utils || die |
| 175 |
} |
Archives