1 |
jlec 11/10/31 14:46:12 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: aufs2-2.2_p20111031.ebuild |
5 |
aufs2-2.1_p20111031.ebuild |
6 |
Removed: aufs2-0_p20110627.ebuild |
7 |
Log: |
8 |
Version Bump, cleaned old |
9 |
|
10 |
(Portage version: 2.2.0_alpha72/cvs/Linux x86_64) |
11 |
|
12 |
Revision Changes Path |
13 |
1.46 sys-fs/aufs2/ChangeLog |
14 |
|
15 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/ChangeLog?rev=1.46&view=markup |
16 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/ChangeLog?rev=1.46&content-type=text/plain |
17 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/ChangeLog?r1=1.45&r2=1.46 |
18 |
|
19 |
Index: ChangeLog |
20 |
=================================================================== |
21 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v |
22 |
retrieving revision 1.45 |
23 |
retrieving revision 1.46 |
24 |
diff -u -r1.45 -r1.46 |
25 |
--- ChangeLog 14 Sep 2011 07:40:24 -0000 1.45 |
26 |
+++ ChangeLog 31 Oct 2011 14:46:12 -0000 1.46 |
27 |
@@ -1,6 +1,26 @@ |
28 |
# ChangeLog for sys-fs/aufs2 |
29 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
30 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.45 2011/09/14 07:40:24 nativemad Exp $ |
31 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/ChangeLog,v 1.46 2011/10/31 14:46:12 jlec Exp $ |
32 |
+ |
33 |
+*aufs2-2.2_p20111031 (31 Oct 2011) |
34 |
+*aufs2-2.1_p20111031 (31 Oct 2011) |
35 |
+ |
36 |
+ 31 Oct 2011; Justin Lecher <jlec@g.o> -aufs2-0_p20110627.ebuild, |
37 |
+ +aufs2-2.1_p20111031.ebuild, +aufs2-2.2_p20111031.ebuild, |
38 |
+ -files/aufs2-base-27.patch, -files/aufs2-standalone-27.patch, |
39 |
+ -files/aufs2-base-28.patch, -files/aufs2-standalone-28.patch, |
40 |
+ -files/aufs2-base-29.patch, -files/aufs2-standalone-29.patch, |
41 |
+ -files/aufs2-base-30.patch, -files/aufs2-standalone-30.patch, |
42 |
+ -files/aufs2-base-31.patch, -files/aufs2-standalone-31.patch, |
43 |
+ -files/aufs2-base-32.patch, -files/aufs2-standalone-32.patch, |
44 |
+ -files/aufs2-base-33.patch, -files/aufs2-standalone-33.patch, |
45 |
+ -files/aufs2-base-34.patch, -files/aufs2-standalone-34.patch, |
46 |
+ -files/aufs2-base-35.patch, -files/aufs2-standalone-35.patch, |
47 |
+ -files/aufs2-base-36.patch, -files/aufs2-standalone-36.patch, |
48 |
+ -files/aufs2-base-37.patch, -files/aufs2-standalone-37.patch, |
49 |
+ -files/aufs2-base-38.patch, -files/aufs2-standalone-38.patch, |
50 |
+ -files/aufs2-base-39.patch, -files/aufs2-standalone-39.patch: |
51 |
+ Version Bump, cleaned old |
52 |
|
53 |
14 Sep 2011; Andreas Schuerch <nativemad@g.o> |
54 |
aufs2-2.1_p20110817.ebuild: |
55 |
|
56 |
|
57 |
|
58 |
1.1 sys-fs/aufs2/aufs2-2.2_p20111031.ebuild |
59 |
|
60 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/aufs2-2.2_p20111031.ebuild?rev=1.1&view=markup |
61 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/aufs2-2.2_p20111031.ebuild?rev=1.1&content-type=text/plain |
62 |
|
63 |
Index: aufs2-2.2_p20111031.ebuild |
64 |
=================================================================== |
65 |
# Copyright 1999-2011 Gentoo Foundation |
66 |
# Distributed under the terms of the GNU General Public License v2 |
67 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-2.2_p20111031.ebuild,v 1.1 2011/10/31 14:46:12 jlec Exp $ |
68 |
|
69 |
EAPI=4 |
70 |
|
71 |
inherit linux-mod multilib toolchain-funcs |
72 |
|
73 |
AUFS_VERSION="${PV%%_p*}" |
74 |
|
75 |
DESCRIPTION="An entirely re-designed and re-implemented Unionfs" |
76 |
HOMEPAGE="http://aufs.sourceforge.net/" |
77 |
SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" |
78 |
|
79 |
LICENSE="GPL-2" |
80 |
SLOT="0" |
81 |
KEYWORDS="~amd64 ~x86" |
82 |
IUSE="debug fuse pax_kernel hfs inotify kernel-patch nfs ramfs" |
83 |
|
84 |
DEPEND="dev-vcs/git" |
85 |
RDEPEND=" |
86 |
!sys-fs/aufs |
87 |
!sys-fs/aufs3" |
88 |
|
89 |
S="${WORKDIR}"/${PN}-standalone |
90 |
|
91 |
MODULE_NAMES="aufs(misc:${S})" |
92 |
|
93 |
pkg_setup() { |
94 |
CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL" |
95 |
use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" |
96 |
use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS" |
97 |
use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" |
98 |
use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" |
99 |
|
100 |
# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system |
101 |
[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return |
102 |
|
103 |
get_version |
104 |
kernel_is lt 2 6 35 && die "kernel too old" |
105 |
kernel_is gt 2 6 39 && die "kernel too new, please use sys-fs/aufs3" |
106 |
|
107 |
linux-mod_pkg_setup |
108 |
if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-standalone-${KV_PATCH}.patch >/dev/null && \ |
109 |
patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-base-${KV_PATCH}.patch >/dev/null ); then |
110 |
if use kernel-patch; then |
111 |
cd ${KV_DIR} |
112 |
ewarn "Patching your kernel..." |
113 |
patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-standalone-${KV_PATCH}.patch >/dev/null |
114 |
patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-base-${KV_PATCH}.patch >/dev/null |
115 |
epatch "${FILESDIR}"/${AUFS_VERSION}/${PN}-{base,standalone}-${KV_PATCH}.patch |
116 |
ewarn "You need to compile your kernel with the applied patch" |
117 |
ewarn "to be able to load and use the aufs kernel module" |
118 |
else |
119 |
eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" |
120 |
eerror "Either enable the kernel-patch useflag to do it with this ebuild" |
121 |
eerror "or apply ${FILESDIR}/${PN}-base-${KV_PATCH}.patch and" |
122 |
eerror "${FILESDIR}/${PN}-standalone-${KV_PATCH}.patch by hand" |
123 |
die "missing kernel patch, please apply it first" |
124 |
fi |
125 |
fi |
126 |
export PKG_SETUP_HAS_BEEN_RAN=1 |
127 |
} |
128 |
|
129 |
set_config() { |
130 |
for option in $*; do |
131 |
grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" |
132 |
sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die |
133 |
done |
134 |
} |
135 |
|
136 |
src_prepare() { |
137 |
local branch=origin/aufs${AUFS_VERSION}-${KV_PATCH} |
138 |
git checkout -q $branch || die |
139 |
|
140 |
# All config options to off |
141 |
sed "s:= y:=:g" -i config.mk || die |
142 |
|
143 |
set_config RDU BRANCH_MAX_127 SBILIST |
144 |
|
145 |
use debug && set_config DEBUG |
146 |
use fuse && set_config BR_FUSE POLL |
147 |
use hfs && set_config BR_HFSPLUS |
148 |
use inotify && set_config HNOTIFY HFSNOTIFY |
149 |
use nfs && set_config EXPORT |
150 |
use nfs && use amd64 && set_config INO_T_64 |
151 |
use ramfs && set_config BR_RAMFS |
152 |
|
153 |
if use pax_kernel ; then |
154 |
epatch "${FILESDIR}"/pax.patch |
155 |
fi |
156 |
|
157 |
sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die |
158 |
sed -i "s:__user::g" include/linux/aufs_type.h || die |
159 |
|
160 |
cd "${WORKDIR}"/${PN}-util |
161 |
git checkout -q origin/aufs${AUFS_VERSION} |
162 |
sed -i "/LDFLAGS += -static -s/d" Makefile || die |
163 |
sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die |
164 |
} |
165 |
|
166 |
src_compile() { |
167 |
local ARCH=x86 |
168 |
|
169 |
emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} |
170 |
|
171 |
cd "${WORKDIR}"/${PN}-util |
172 |
emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include |
173 |
} |
174 |
|
175 |
src_install() { |
176 |
linux-mod_src_install |
177 |
dodoc README |
178 |
docinto design |
179 |
dodoc design/*.txt |
180 |
cd "${WORKDIR}"/${PN}-util |
181 |
emake DESTDIR="${D}" KDIR=${KV_DIR} install |
182 |
docinto |
183 |
newdoc README README-utils |
184 |
} |
185 |
|
186 |
|
187 |
|
188 |
1.1 sys-fs/aufs2/aufs2-2.1_p20111031.ebuild |
189 |
|
190 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/aufs2-2.1_p20111031.ebuild?rev=1.1&view=markup |
191 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs2/aufs2-2.1_p20111031.ebuild?rev=1.1&content-type=text/plain |
192 |
|
193 |
Index: aufs2-2.1_p20111031.ebuild |
194 |
=================================================================== |
195 |
# Copyright 1999-2011 Gentoo Foundation |
196 |
# Distributed under the terms of the GNU General Public License v2 |
197 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs2/aufs2-2.1_p20111031.ebuild,v 1.1 2011/10/31 14:46:12 jlec Exp $ |
198 |
|
199 |
EAPI=4 |
200 |
|
201 |
inherit linux-mod multilib toolchain-funcs |
202 |
|
203 |
AUFS_VERSION="${PV%%_p*}" |
204 |
|
205 |
DESCRIPTION="An entirely re-designed and re-implemented Unionfs" |
206 |
HOMEPAGE="http://aufs.sourceforge.net/" |
207 |
SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" |
208 |
|
209 |
LICENSE="GPL-2" |
210 |
SLOT="0" |
211 |
KEYWORDS="~amd64 ~x86" |
212 |
IUSE="debug fuse pax_kernel hfs inotify kernel-patch nfs ramfs" |
213 |
|
214 |
DEPEND="dev-vcs/git" |
215 |
RDEPEND=" |
216 |
!sys-fs/aufs |
217 |
!sys-fs/aufs3" |
218 |
|
219 |
S="${WORKDIR}"/${PN}-standalone |
220 |
|
221 |
MODULE_NAMES="aufs(misc:${S})" |
222 |
|
223 |
pkg_setup() { |
224 |
CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL" |
225 |
use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" |
226 |
use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS" |
227 |
use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" |
228 |
use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" |
229 |
|
230 |
# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system |
231 |
[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return |
232 |
|
233 |
get_version |
234 |
kernel_is lt 2 6 31 && die "kernel too old" |
235 |
kernel_is gt 2 6 34 && die "kernel too new" |
236 |
|
237 |
linux-mod_pkg_setup |
238 |
if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${KV_PATCH}.patch >/dev/null && \ |
239 |
patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${KV_PATCH}.patch >/dev/null ); then |
240 |
if use kernel-patch; then |
241 |
cd ${KV_DIR} |
242 |
ewarn "Patching your kernel..." |
243 |
patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-standalone-${KV_PATCH}.patch >/dev/null |
244 |
patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${AUFS_VERSION}/${PN}-base-${KV_PATCH}.patch >/dev/null |
245 |
epatch "${FILESDIR}"/${AUFS_VERSION}/${PN}-{base,standalone}-${KV_PATCH}.patch |
246 |
ewarn "You need to compile your kernel with the applied patch" |
247 |
ewarn "to be able to load and use the aufs kernel module" |
248 |
else |
249 |
eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" |
250 |
eerror "Either enable the kernel-patch useflag to do it with this ebuild" |
251 |
eerror "or apply ${FILESDIR}/${PN}-base-${KV_PATCH}.patch and" |
252 |
eerror "${FILESDIR}/${PN}-standalone-${KV_PATCH}.patch by hand" |
253 |
die "missing kernel patch, please apply it first" |
254 |
fi |
255 |
fi |
256 |
export PKG_SETUP_HAS_BEEN_RAN=1 |
257 |
} |
258 |
|
259 |
set_config() { |
260 |
for option in $*; do |
261 |
grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" |
262 |
sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die |
263 |
done |
264 |
} |
265 |
|
266 |
src_prepare() { |
267 |
local branch=origin/aufs${AUFS_VERSION}-${KV_PATCH} |
268 |
git checkout -q $branch || die |
269 |
|
270 |
# All config options to off |
271 |
sed "s:= y:=:g" -i config.mk || die |
272 |
|
273 |
set_config RDU BRANCH_MAX_127 SBILIST |
274 |
|
275 |
use debug && set_config DEBUG |
276 |
use fuse && set_config BR_FUSE POLL |
277 |
use hfs && set_config BR_HFSPLUS |
278 |
use inotify && set_config HNOTIFY HFSNOTIFY |
279 |
use nfs && set_config EXPORT |
280 |
use nfs && use amd64 && set_config INO_T_64 |
281 |
use ramfs && set_config BR_RAMFS |
282 |
|
283 |
if use pax_kernel ; then |
284 |
epatch "${FILESDIR}"/pax.patch |
285 |
fi |
286 |
|
287 |
sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die |
288 |
sed -i "s:__user::g" include/linux/aufs_type.h || die |
289 |
|
290 |
cd "${WORKDIR}"/${PN}-util |
291 |
git checkout -q origin/aufs${AUFS_VERSION} |
292 |
sed -i "/LDFLAGS += -static -s/d" Makefile || die |
293 |
sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die |
294 |
} |
295 |
|
296 |
src_compile() { |
297 |
local ARCH=x86 |
298 |
|
299 |
emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR} |
300 |
|
301 |
cd "${WORKDIR}"/${PN}-util |
302 |
emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include |
303 |
} |
304 |
|
305 |
src_install() { |
306 |
linux-mod_src_install |
307 |
dodoc README |
308 |
docinto design |
309 |
dodoc design/*.txt |
310 |
cd "${WORKDIR}"/${PN}-util |
311 |
emake DESTDIR="${D}" KDIR=${KV_DIR} install |
312 |
docinto |
313 |
newdoc README README-utils |
314 |
} |