Gentoo Archives: gentoo-commits

From: "Justin Lecher (jlec)" <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-fs/aufs3: aufs3-3_p20140602.ebuild ChangeLog aufs3-3_p20140526.ebuild
Date: Mon, 02 Jun 2014 09:23:23
Message-Id: 20140602092319.8957D2004E@flycatcher.gentoo.org
1 jlec 14/06/02 09:23:19
2
3 Modified: ChangeLog aufs3-3_p20140526.ebuild
4 Added: aufs3-3_p20140602.ebuild
5 Log:
6 sys-fs/aufs3: Version Bump
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)
9
10 Revision Changes Path
11 1.93 sys-fs/aufs3/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/ChangeLog?rev=1.93&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/ChangeLog?rev=1.93&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/ChangeLog?r1=1.92&r2=1.93
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v
20 retrieving revision 1.92
21 retrieving revision 1.93
22 diff -u -r1.92 -r1.93
23 --- ChangeLog 26 May 2014 06:29:25 -0000 1.92
24 +++ ChangeLog 2 Jun 2014 09:23:19 -0000 1.93
25 @@ -1,6 +1,12 @@
26 # ChangeLog for sys-fs/aufs3
27 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.92 2014/05/26 06:29:25 jlec Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.93 2014/06/02 09:23:19 jlec Exp $
30 +
31 +*aufs3-3_p20140602 (02 Jun 2014)
32 +
33 + 02 Jun 2014; Justin Lecher <jlec@g.o> aufs3-3_p20140526.ebuild,
34 + +aufs3-3_p20140602.ebuild:
35 + Version Bump
36
37 *aufs3-3_p20140526 (26 May 2014)
38
39
40
41
42 1.2 sys-fs/aufs3/aufs3-3_p20140526.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140526.ebuild?rev=1.2&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140526.ebuild?rev=1.2&content-type=text/plain
46 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140526.ebuild?r1=1.1&r2=1.2
47
48 Index: aufs3-3_p20140526.ebuild
49 ===================================================================
50 RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140526.ebuild,v
51 retrieving revision 1.1
52 retrieving revision 1.2
53 diff -u -r1.1 -r1.2
54 --- aufs3-3_p20140526.ebuild 26 May 2014 06:29:25 -0000 1.1
55 +++ aufs3-3_p20140526.ebuild 2 Jun 2014 09:23:19 -0000 1.2
56 @@ -1,6 +1,6 @@
57 # Copyright 1999-2014 Gentoo Foundation
58 # Distributed under the terms of the GNU General Public License v2
59 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140526.ebuild,v 1.1 2014/05/26 06:29:25 jlec Exp $
60 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140526.ebuild,v 1.2 2014/06/02 09:23:19 jlec Exp $
61
62 EAPI=5
63
64 @@ -36,7 +36,7 @@
65 MODULE_NAMES="aufs(misc:${S})"
66
67 pkg_setup() {
68 -# CONFIG_CHECK+=" !AUFS_FS"
69 + CONFIG_CHECK+=" !AUFS_FS"
70 use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
71 use nfs && CONFIG_CHECK+=" EXPORTFS"
72 use fuse && CONFIG_CHECK+=" ~FUSE_FS"
73
74
75
76 1.1 sys-fs/aufs3/aufs3-3_p20140602.ebuild
77
78 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140602.ebuild?rev=1.1&view=markup
79 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140602.ebuild?rev=1.1&content-type=text/plain
80
81 Index: aufs3-3_p20140602.ebuild
82 ===================================================================
83 # Copyright 1999-2014 Gentoo Foundation
84 # Distributed under the terms of the GNU General Public License v2
85 # $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20140602.ebuild,v 1.1 2014/06/02 09:23:19 jlec Exp $
86
87 EAPI=5
88
89 inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
90
91 AUFS_VERSION="${PV%%_p*}"
92 # highest branch version
93 PATCH_MAX_VER=14
94 # highest supported version
95 KERN_MAX_VER=15
96 # lowest supported version
97 KERN_MIN_VER=10
98
99 DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
100 HOMEPAGE="http://aufs.sourceforge.net/"
101 SRC_URI="http://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
102
103 LICENSE="GPL-2"
104 SLOT="0"
105 KEYWORDS="~amd64 ~x86"
106 IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
107
108 DEPEND="
109 dev-util/patchutils
110 dev-vcs/git"
111 RDEPEND="
112 sys-fs/aufs-util
113 !sys-fs/aufs
114 !sys-fs/aufs2"
115
116 S="${WORKDIR}"/${PN}-standalone
117
118 MODULE_NAMES="aufs(misc:${S})"
119
120 pkg_setup() {
121 CONFIG_CHECK+=" !AUFS_FS"
122 use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
123 use nfs && CONFIG_CHECK+=" EXPORTFS"
124 use fuse && CONFIG_CHECK+=" ~FUSE_FS"
125 use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
126 use pax_kernel && CONFIG_CHECK+=" PAX" && ERROR_PAX="Please use hardened sources"
127
128 # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
129 [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
130
131 get_version
132 kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
133 kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
134
135 linux-mod_pkg_setup
136
137 if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
138 PATCH_BRANCH="x-rcN"
139 elif [[ "${KV_MINOR}" == "10" ]] && [[ "${KV_PATCH}" -ge "28" ]]; then
140 PATCH_BRANCH="${KV_MINOR}".x
141 elif [[ "${KV_MINOR}" == "12" ]]; then
142 PATCH_BRANCH="${KV_MINOR}".x
143 else
144 PATCH_BRANCH="${KV_MINOR}"
145 fi
146
147 case ${KV_EXTRA} in
148 "")
149 elog "It seems you are using vanilla-sources with aufs3"
150 elog "Please use sys-kernel/aufs-sources with USE=vanilla"
151 elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
152 ;;
153 "-gentoo")
154 elog "It seems you are using gentoo-sources with aufs3"
155 elog "Please use sys-kernel/aufs-sources"
156 elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
157 ;;
158 esac
159
160 pushd "${T}" &> /dev/null
161 unpack ${A}
162 cd ${PN}-standalone || die
163 local module_branch=origin/${PN}.${PATCH_BRANCH}
164 einfo "Using ${module_branch} as patch source"
165 git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
166 combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
167 combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
168 if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
169 if use kernel-patch; then
170 cd ${KV_DIR}
171 ewarn "Patching your kernel..."
172 patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
173 epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
174 ewarn "You need to compile your kernel with the applied patch"
175 ewarn "to be able to load and use the aufs kernel module"
176 else
177 eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
178 eerror "Either enable the kernel-patch useflag to do it with this ebuild"
179 eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
180 die "missing kernel patch, please apply it first"
181 fi
182 fi
183 popd &> /dev/null
184 export PKG_SETUP_HAS_BEEN_RAN=1
185 }
186
187 set_config() {
188 for option in $*; do
189 grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
190 sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
191 done
192 }
193
194 src_prepare() {
195 local module_branch=origin/${PN}.${PATCH_BRANCH}
196
197 einfo "Using for module creation branch ${module_branch}"
198 git checkout -q -b local-gentoo ${module_branch} || die
199
200 # All config options to off
201 sed "s:= y:=:g" -i config.mk || die
202
203 set_config RDU BRANCH_MAX_127 SBILIST
204
205 use debug && set_config DEBUG
206 use fuse && set_config BR_FUSE POLL
207 use hfs && set_config BR_HFSPLUS
208 use inotify && set_config HNOTIFY HFSNOTIFY
209 use nfs && set_config EXPORT
210 use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
211 use ramfs && set_config BR_RAMFS
212
213 if use pax_kernel; then
214 if kernel_is ge 3 11; then
215 epatch "${FILESDIR}"/pax-3.11.patch
216 else
217 epatch "${FILESDIR}"/pax-3.patch
218 fi
219 fi
220
221 sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
222 }
223
224 src_compile() {
225 local ARCH=x86
226
227 emake \
228 CC=$(tc-getCC) \
229 LD=$(tc-getLD) \
230 LDFLAGS="$(raw-ldflags)" \
231 ARCH=$(tc-arch-kernel) \
232 CONFIG_AUFS_FS=m \
233 KDIR="${KV_OUT_DIR}"
234 }
235
236 src_install() {
237 linux-mod_src_install
238
239 insinto /usr/share/doc/${PF}
240
241 use doc && doins -r Documentation
242
243 use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
244
245 dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-ibitmap}.patch
246
247 readme.gentoo_create_doc
248 }
249
250 pkg_postinst() {
251 readme.gentoo_pkg_postinst
252 linux-mod_pkg_postinst
253 }