1 |
jlec 12/11/29 21:24:36 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: aufs3-3_p20121129.ebuild |
5 |
Log: |
6 |
sys-fs/aufs3: Version BUmp |
7 |
|
8 |
(Portage version: 2.2.0_alpha142/cvs/Linux x86_64, signed Manifest commit with key 8009D6F070EB7916) |
9 |
|
10 |
Revision Changes Path |
11 |
1.34 sys-fs/aufs3/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/ChangeLog?rev=1.34&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/ChangeLog?rev=1.34&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/ChangeLog?r1=1.33&r2=1.34 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v |
20 |
retrieving revision 1.33 |
21 |
retrieving revision 1.34 |
22 |
diff -u -r1.33 -r1.34 |
23 |
--- ChangeLog 26 Nov 2012 20:36:26 -0000 1.33 |
24 |
+++ ChangeLog 29 Nov 2012 21:24:36 -0000 1.34 |
25 |
@@ -1,6 +1,27 @@ |
26 |
# ChangeLog for sys-fs/aufs3 |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.33 2012/11/26 20:36:26 jlec Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.34 2012/11/29 21:24:36 jlec Exp $ |
30 |
+ |
31 |
+*aufs3-3_p20121129 (29 Nov 2012) |
32 |
+ |
33 |
+ 29 Nov 2012; Justin Lecher <jlec@g.o> |
34 |
+ +files/3_p20121129/aufs3-base-0.patch, |
35 |
+ +files/3_p20121129/aufs3-standalone-0.patch, |
36 |
+ +files/3_p20121129/aufs3-base-1.patch, |
37 |
+ +files/3_p20121129/aufs3-standalone-1.patch, |
38 |
+ +files/3_p20121129/aufs3-base-2.patch, |
39 |
+ +files/3_p20121129/aufs3-standalone-2.patch, +aufs3-3_p20121129.ebuild, |
40 |
+ +files/3_p20121129/aufs3-base-3.patch, |
41 |
+ +files/3_p20121129/aufs3-standalone-3.patch, |
42 |
+ +files/3_p20121129/aufs3-base-4.patch, |
43 |
+ +files/3_p20121129/aufs3-standalone-4.patch, |
44 |
+ +files/3_p20121129/aufs3-base-x-rcN.patch, |
45 |
+ +files/3_p20121129/aufs3-base-5.patch, |
46 |
+ +files/3_p20121129/aufs3-standalone-x-rcN.patch, |
47 |
+ +files/3_p20121129/aufs3-standalone-5.patch, |
48 |
+ +files/3_p20121129/aufs3-base-6.patch, |
49 |
+ +files/3_p20121129/aufs3-standalone-6.patch: |
50 |
+ Version BUmp |
51 |
|
52 |
26 Nov 2012; Justin Lecher <jlec@g.o> -aufs3-3_p20120109.ebuild, |
53 |
aufs3-3_p20120430.ebuild, -aufs3-3_p20120523.ebuild, |
54 |
|
55 |
|
56 |
|
57 |
1.1 sys-fs/aufs3/aufs3-3_p20121129.ebuild |
58 |
|
59 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121129.ebuild?rev=1.1&view=markup |
60 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121129.ebuild?rev=1.1&content-type=text/plain |
61 |
|
62 |
Index: aufs3-3_p20121129.ebuild |
63 |
=================================================================== |
64 |
# Copyright 1999-2012 Gentoo Foundation |
65 |
# Distributed under the terms of the GNU General Public License v2 |
66 |
# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20121129.ebuild,v 1.1 2012/11/29 21:24:36 jlec Exp $ |
67 |
|
68 |
EAPI=4 |
69 |
|
70 |
inherit eutils flag-o-matic linux-mod multilib toolchain-funcs |
71 |
|
72 |
AUFS_VERSION="${PV%%_p*}" |
73 |
# highest branch version |
74 |
PATCH_MAX_VER=6 |
75 |
# highest supported version |
76 |
KERN_MAX_VER=7 |
77 |
# highest util branch version |
78 |
UTIL_MAX_VER=0 |
79 |
|
80 |
DESCRIPTION="An entirely re-designed and re-implemented Unionfs" |
81 |
HOMEPAGE="http://aufs.sourceforge.net/" |
82 |
SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz" |
83 |
|
84 |
LICENSE="GPL-2" |
85 |
SLOT="0" |
86 |
KEYWORDS="~amd64 ~x86" |
87 |
IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs" |
88 |
|
89 |
DEPEND="dev-vcs/git" |
90 |
RDEPEND=" |
91 |
!sys-fs/aufs |
92 |
!sys-fs/aufs2" |
93 |
|
94 |
S="${WORKDIR}"/${P}/${PN}-standalone |
95 |
|
96 |
MODULE_NAMES="aufs(misc:${S})" |
97 |
|
98 |
pkg_setup() { |
99 |
CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL !AUFS_FS" |
100 |
use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY" |
101 |
use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS" |
102 |
use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS" |
103 |
use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS" |
104 |
|
105 |
# this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system |
106 |
[ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return |
107 |
|
108 |
get_version |
109 |
kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2" |
110 |
kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new" |
111 |
|
112 |
linux-mod_pkg_setup |
113 |
|
114 |
if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then |
115 |
PATCH_BRANCH="x-rcN" |
116 |
else |
117 |
PATCH_BRANCH="${KV_MINOR}" |
118 |
fi |
119 |
|
120 |
if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then |
121 |
UTIL_BRANCH="x-rcN" |
122 |
elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then |
123 |
UTIL_BRANCH="${UTIL_MAX_VER}" |
124 |
else |
125 |
UTIL_BRANCH="${KV_MINOR}" |
126 |
fi |
127 |
|
128 |
if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \ |
129 |
patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then |
130 |
if use kernel-patch; then |
131 |
cd ${KV_DIR} |
132 |
ewarn "Patching your kernel..." |
133 |
patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null |
134 |
patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PV}/${PN}-base-${PATCH_BRANCH}.patch >/dev/null |
135 |
epatch "${FILESDIR}"/${PV}/${PN}-{base,standalone}-${PATCH_BRANCH}.patch |
136 |
ewarn "You need to compile your kernel with the applied patch" |
137 |
ewarn "to be able to load and use the aufs kernel module" |
138 |
else |
139 |
eerror "You need to apply a patch to your kernel to compile and run the ${PN} module" |
140 |
eerror "Either enable the kernel-patch useflag to do it with this ebuild" |
141 |
eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and" |
142 |
eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand" |
143 |
die "missing kernel patch, please apply it first" |
144 |
fi |
145 |
fi |
146 |
export PKG_SETUP_HAS_BEEN_RAN=1 |
147 |
} |
148 |
|
149 |
set_config() { |
150 |
for option in $*; do |
151 |
grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option" |
152 |
sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die |
153 |
done |
154 |
} |
155 |
|
156 |
src_prepare() { |
157 |
local module_branch=origin/${PN}.${PATCH_BRANCH} |
158 |
local util_branch=origin/${PN}.${UTIL_BRANCH} |
159 |
|
160 |
einfo "Using for module creation branch ${module_branch}" |
161 |
git checkout -q -b local-gentoo ${module_branch} || die |
162 |
|
163 |
# All config options to off |
164 |
sed "s:= y:=:g" -i config.mk || die |
165 |
|
166 |
set_config RDU BRANCH_MAX_127 SBILIST |
167 |
|
168 |
use debug && set_config DEBUG |
169 |
use fuse && set_config BR_FUSE POLL |
170 |
use hfs && set_config BR_HFSPLUS |
171 |
use inotify && set_config HNOTIFY HFSNOTIFY |
172 |
use nfs && set_config EXPORT |
173 |
use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64 |
174 |
use ramfs && set_config BR_RAMFS |
175 |
|
176 |
use pax_kernel && epatch "${FILESDIR}"/pax-2.patch |
177 |
|
178 |
sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die |
179 |
sed -i "s:__user::g" include/linux/aufs_type.h || die |
180 |
|
181 |
cd "${WORKDIR}"/${PN/3}-util |
182 |
|
183 |
einfo "Using for utils building branch ${util_branch}" |
184 |
git checkout -b local-gentoo ${util_branch} || die |
185 |
sed -i "/LDFLAGS += -static -s/d" Makefile || die |
186 |
sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die |
187 |
} |
188 |
|
189 |
src_compile() { |
190 |
local ARCH=x86 |
191 |
|
192 |
emake CC=$(tc-getCC) LD=$(tc-getLD) LDFLAGS="$(raw-ldflags)" ARCH=$(tc-arch-kernel) CONFIG_AUFS_FS=m KDIR=${KV_OUT_DIR} |
193 |
|
194 |
cd "${WORKDIR}"/${PN/3}-util |
195 |
emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_OUT_DIR} C_INCLUDE_PATH="${S}"/include |
196 |
} |
197 |
|
198 |
src_install() { |
199 |
linux-mod_src_install |
200 |
|
201 |
insinto /usr/share/doc/${PF} |
202 |
|
203 |
use doc && doins -r Documentation |
204 |
|
205 |
dodoc Documentation/filesystems/aufs/README |
206 |
|
207 |
cd "${WORKDIR}"/${PN/3}-util |
208 |
emake DESTDIR="${D}" KDIR=${KV_OUT_DIR} install |
209 |
|
210 |
newdoc README README-utils |
211 |
} |