Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-fs/aufs3/, profiles/, sys-fs/aufs3/files/
Date: Sat, 28 Jul 2018 11:40:40
Message-Id: 1532778028.a95a109ee3764449f885760fd08b628185977163.mgorny@gentoo
1 commit: a95a109ee3764449f885760fd08b628185977163
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 28 11:37:23 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Sat Jul 28 11:40:28 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a95a109e
7
8 sys-fs/aufs3: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/650126
11
12 profiles/package.mask | 1 -
13 sys-fs/aufs3/Manifest | 5 -
14 sys-fs/aufs3/aufs3-3_p20160219.ebuild | 184 ----------------------------------
15 sys-fs/aufs3/aufs3-3_p20160223.ebuild | 184 ----------------------------------
16 sys-fs/aufs3/aufs3-3_p20160627.ebuild | 184 ----------------------------------
17 sys-fs/aufs3/aufs3-3_p20160815.ebuild | 184 ----------------------------------
18 sys-fs/aufs3/aufs3-3_p20160822.ebuild | 184 ----------------------------------
19 sys-fs/aufs3/files/README.gentoo | 20 ----
20 sys-fs/aufs3/files/pax-3.11.patch | 89 ----------------
21 sys-fs/aufs3/metadata.xml | 20 ----
22 10 files changed, 1055 deletions(-)
23
24 diff --git a/profiles/package.mask b/profiles/package.mask
25 index 8c56e8d6082..330441dbed3 100644
26 --- a/profiles/package.mask
27 +++ b/profiles/package.mask
28 @@ -432,7 +432,6 @@ media-libs/libglvnd
29 # Rick Farina <zerochaos@g.o> (04 Apr 2018)
30 # Violates PMS and does not work with stable portage.
31 # Masked for removal in 60 days, lift mask if bug #650126 is fixed
32 -sys-fs/aufs3
33 sys-fs/aufs4
34
35 # Jeroen Roovers <jer@g.o> (6 Apr 2018)
36
37 diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
38 deleted file mode 100644
39 index f417411d215..00000000000
40 --- a/sys-fs/aufs3/Manifest
41 +++ /dev/null
42 @@ -1,5 +0,0 @@
43 -DIST aufs3-standalone-3_p20160219.tar.xz 3256736 BLAKE2B e76a3d239b8b3d4325b33158aebd6154c52f56b5ddcfa997c148e00fcaa8b4af5daaa6794f81d2fd6e45f540815fdb89b71b2b9f861252a2569b34ee11698909 SHA512 af65cb3d9890c05ec24d64d27759d8c0fa98f35887d62a7ec77ebc496ec9de02563bc5a3e05b67c342926b062fe077c7a8de543291177a4e0210b2159027e1af
44 -DIST aufs3-standalone-3_p20160223.tar.xz 3270932 BLAKE2B 12ce1f1b4babc70521e27f835f504c9779148b525c2b041f4c02f628517fee72915474ccbffe63ac1eb309e6ec5430d5c1359b5b83e7a89df5a69b2ba53fa0c7 SHA512 37805b54a2471def5948d3484349de7bfc4fee09788b36b9589aba2006484cf330bb642f27862d74a528999cf2e7fa4888b5d46b54bb3e7f8468c6857f34730f
45 -DIST aufs3-standalone-3_p20160627.tar.xz 3443904 BLAKE2B df8d6917bc7141b024315ff4ff3d175dd78146f856c3d8e8b6889fd13cbf67887cc543353bb1643cde927b50b7858711d305b2bb71cab79211fbb2dbbb629224 SHA512 6c6256d5f042dbcde26abfb665fdfd8eee4193104fc3270371fdf503a560dd888b5306e3cfe4c6a1f95cd669b41279573dfc54aec8b5b5327220fa055bbbdb3d
46 -DIST aufs3-standalone-3_p20160815.tar.xz 3501932 BLAKE2B 49fb402f6f651ed46a6d71011a2e581dda857f01deb632d7a2581ef3b68d3c7939692f30a61b1b3adb401d1ee1f4274f0c0ed0c5cb31ea17cff2c61dd47e56e0 SHA512 502a1516e0e9f307a9e29669799f9572b225b38ed7c790130bd9d9c01fcb83d2bf81ca5d27136827b595838e9ee42544d9be130bf632be6a61cdf7e07d0f9676
47 -DIST aufs3-standalone-3_p20160822.tar.xz 3515768 BLAKE2B dd41a95d807a83aa958ff6e1e9d265b9ad8170ac4b93243ed73baa205fd80097172b5891d11fe30b13e78649d6bd58bb054ac179ee4c98dab7b76519e8678e91 SHA512 b3f6dc4883f565f73a81ff3aaf90bdca41419fe506c16b027e471e9901dce83a1e4d7a217574b686389433e2d7b280a53c0dbe805fad709f83cd5a689a53cc13
48
49 diff --git a/sys-fs/aufs3/aufs3-3_p20160219.ebuild b/sys-fs/aufs3/aufs3-3_p20160219.ebuild
50 deleted file mode 100644
51 index 8c40ec61abb..00000000000
52 --- a/sys-fs/aufs3/aufs3-3_p20160219.ebuild
53 +++ /dev/null
54 @@ -1,184 +0,0 @@
55 -# Copyright 1999-2016 Gentoo Foundation
56 -# Distributed under the terms of the GNU General Public License v2
57 -
58 -EAPI=6
59 -
60 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
61 -
62 -AUFS_VERSION="${PV%%_p*}"
63 -# highest branch version
64 -PATCH_MAX_VER=19
65 -# highest supported version
66 -KERN_MAX_VER=20
67 -# lowest supported version
68 -KERN_MIN_VER=18
69 -
70 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
71 -HOMEPAGE="http://aufs.sourceforge.net/"
72 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
73 -
74 -LICENSE="GPL-2"
75 -SLOT="0"
76 -KEYWORDS="amd64 x86"
77 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
78 -
79 -DEPEND="
80 - dev-util/patchutils
81 - dev-vcs/git"
82 -RDEPEND="
83 - sys-fs/aufs-util
84 - !sys-fs/aufs
85 - !sys-fs/aufs2
86 - !sys-fs/aufs4"
87 -
88 -S="${WORKDIR}"/${PN}-standalone
89 -
90 -MODULE_NAMES="aufs(misc:${S})"
91 -
92 -pkg_setup() {
93 - CONFIG_CHECK+=" !AUFS_FS"
94 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
95 - use nfs && CONFIG_CHECK+=" EXPORTFS"
96 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
97 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
98 - use pax_kernel && CONFIG_CHECK+=" PAX" \
99 - && ERROR_PAX="Please use hardened sources"
100 -
101 - # this is needed so merging a binpkg ${PN} is
102 - # possible w/out a kernel unpacked on the system
103 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
104 -
105 - get_version
106 - kernel_is lt 3 ${KERN_MIN_VER} 0 && \
107 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
108 - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
109 -
110 - linux-mod_pkg_setup
111 -
112 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
113 - PATCH_BRANCH="x-rcN"
114 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
115 - PATCH_BRANCH="${KV_MINOR}".25+
116 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
117 - PATCH_BRANCH="${KV_MINOR}".1+
118 - else
119 - PATCH_BRANCH="${KV_MINOR}"
120 - fi
121 -
122 - case ${KV_EXTRA} in
123 - "")
124 - elog "It seems you are using vanilla-sources with aufs3"
125 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
126 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
127 - ;;
128 - "-gentoo")
129 - elog "It seems you are using gentoo-sources with aufs3"
130 - elog "Please use sys-kernel/aufs-sources"
131 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
132 - ;;
133 - esac
134 -
135 - pushd "${T}" &> /dev/null || die
136 - unpack ${A}
137 -
138 - cd ${PN}-standalone || die
139 -
140 - local module_branch=origin/${PN}.${PATCH_BRANCH}
141 -
142 - einfo "Using ${module_branch} as patch source"
143 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
144 -
145 - combinediff \
146 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
147 - combinediff \
148 - "${T}"/combined-1.patch ${PN}-mmap.patch \
149 - > ${PN}-standalone-base-mmap-combined.patch
150 -
151 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
152 - if use kernel-patch; then
153 - cd ${KV_DIR}
154 - ewarn "Patching your kernel..."
155 - patch \
156 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
157 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
158 - > /dev/null
159 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
160 - ewarn "You need to compile your kernel with the applied patch"
161 - ewarn "to be able to load and use the aufs kernel module"
162 - else
163 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
164 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
165 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
166 - die "missing kernel patch, please apply it first"
167 - fi
168 - fi
169 -
170 - popd &> /dev/null
171 - export PKG_SETUP_HAS_BEEN_RAN=1
172 -}
173 -
174 -set_config() {
175 - for option in $*; do
176 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
177 - die "${option} is not a valid config option"
178 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
179 - done
180 -}
181 -
182 -src_prepare() {
183 - local module_branch=origin/${PN}.${PATCH_BRANCH}
184 -
185 - einfo "Using for module creation branch ${module_branch}"
186 - git checkout -q -b local-gentoo ${module_branch} || die
187 -
188 - # All config options to off
189 - sed "s:= y:=:g" -i config.mk || die
190 -
191 - set_config RDU BRANCH_MAX_127 SBILIST
192 -
193 - use debug && set_config DEBUG
194 - use fuse && set_config BR_FUSE POLL
195 - use hfs && set_config BR_HFSPLUS
196 - use inotify && set_config HNOTIFY HFSNOTIFY
197 - use nfs && set_config EXPORT
198 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
199 - use ramfs && set_config BR_RAMFS
200 -
201 - use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
202 -
203 - sed \
204 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
205 - -i Makefile || die
206 -}
207 -
208 -src_compile() {
209 - local ARCH=x86
210 -
211 - emake \
212 - CC=$(tc-getCC) \
213 - LD=$(tc-getLD) \
214 - LDFLAGS="$(raw-ldflags)" \
215 - ARCH=$(tc-arch-kernel) \
216 - CONFIG_AUFS_FS=m \
217 - KDIR="${KV_OUT_DIR}"
218 -}
219 -
220 -src_install() {
221 - linux-mod_src_install
222 -
223 - use doc && dodoc -r Documentation
224 -
225 - use kernel-patch || \
226 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
227 -
228 - dodoc \
229 - Documentation/filesystems/aufs/README \
230 - "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
231 -
232 - readme.gentoo_create_doc
233 -}
234 -
235 -pkg_postinst() {
236 - readme.gentoo_print_elog
237 - linux-mod_pkg_postinst
238 -}
239
240 diff --git a/sys-fs/aufs3/aufs3-3_p20160223.ebuild b/sys-fs/aufs3/aufs3-3_p20160223.ebuild
241 deleted file mode 100644
242 index 2a786f02ab2..00000000000
243 --- a/sys-fs/aufs3/aufs3-3_p20160223.ebuild
244 +++ /dev/null
245 @@ -1,184 +0,0 @@
246 -# Copyright 1999-2016 Gentoo Foundation
247 -# Distributed under the terms of the GNU General Public License v2
248 -
249 -EAPI=6
250 -
251 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
252 -
253 -AUFS_VERSION="${PV%%_p*}"
254 -# highest branch version
255 -PATCH_MAX_VER=19
256 -# highest supported version
257 -KERN_MAX_VER=20
258 -# lowest supported version
259 -KERN_MIN_VER=18
260 -
261 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
262 -HOMEPAGE="http://aufs.sourceforge.net/"
263 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
264 -
265 -LICENSE="GPL-2"
266 -SLOT="0"
267 -KEYWORDS="~amd64 ~x86"
268 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
269 -
270 -DEPEND="
271 - dev-util/patchutils
272 - dev-vcs/git"
273 -RDEPEND="
274 - sys-fs/aufs-util
275 - !sys-fs/aufs
276 - !sys-fs/aufs2
277 - !sys-fs/aufs4"
278 -
279 -S="${WORKDIR}"/${PN}-standalone
280 -
281 -MODULE_NAMES="aufs(misc:${S})"
282 -
283 -pkg_setup() {
284 - CONFIG_CHECK+=" !AUFS_FS"
285 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
286 - use nfs && CONFIG_CHECK+=" EXPORTFS"
287 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
288 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
289 - use pax_kernel && CONFIG_CHECK+=" PAX" \
290 - && ERROR_PAX="Please use hardened sources"
291 -
292 - # this is needed so merging a binpkg ${PN} is
293 - # possible w/out a kernel unpacked on the system
294 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
295 -
296 - get_version
297 - kernel_is lt 3 ${KERN_MIN_VER} 0 && \
298 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
299 - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
300 -
301 - linux-mod_pkg_setup
302 -
303 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
304 - PATCH_BRANCH="x-rcN"
305 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
306 - PATCH_BRANCH="${KV_MINOR}".25+
307 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
308 - PATCH_BRANCH="${KV_MINOR}".1+
309 - else
310 - PATCH_BRANCH="${KV_MINOR}"
311 - fi
312 -
313 - case ${KV_EXTRA} in
314 - "")
315 - elog "It seems you are using vanilla-sources with aufs3"
316 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
317 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
318 - ;;
319 - "-gentoo")
320 - elog "It seems you are using gentoo-sources with aufs3"
321 - elog "Please use sys-kernel/aufs-sources"
322 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
323 - ;;
324 - esac
325 -
326 - pushd "${T}" &> /dev/null || die
327 - unpack ${A}
328 -
329 - cd ${PN}-standalone || die
330 -
331 - local module_branch=origin/${PN}.${PATCH_BRANCH}
332 -
333 - einfo "Using ${module_branch} as patch source"
334 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
335 -
336 - combinediff \
337 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
338 - combinediff \
339 - "${T}"/combined-1.patch ${PN}-mmap.patch \
340 - > ${PN}-standalone-base-mmap-combined.patch
341 -
342 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
343 - if use kernel-patch; then
344 - cd ${KV_DIR}
345 - ewarn "Patching your kernel..."
346 - patch \
347 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
348 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
349 - > /dev/null
350 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
351 - ewarn "You need to compile your kernel with the applied patch"
352 - ewarn "to be able to load and use the aufs kernel module"
353 - else
354 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
355 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
356 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
357 - die "missing kernel patch, please apply it first"
358 - fi
359 - fi
360 -
361 - popd &> /dev/null
362 - export PKG_SETUP_HAS_BEEN_RAN=1
363 -}
364 -
365 -set_config() {
366 - for option in $*; do
367 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
368 - die "${option} is not a valid config option"
369 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
370 - done
371 -}
372 -
373 -src_prepare() {
374 - local module_branch=origin/${PN}.${PATCH_BRANCH}
375 -
376 - einfo "Using for module creation branch ${module_branch}"
377 - git checkout -q -b local-gentoo ${module_branch} || die
378 -
379 - # All config options to off
380 - sed "s:= y:=:g" -i config.mk || die
381 -
382 - set_config RDU BRANCH_MAX_127 SBILIST
383 -
384 - use debug && set_config DEBUG
385 - use fuse && set_config BR_FUSE POLL
386 - use hfs && set_config BR_HFSPLUS
387 - use inotify && set_config HNOTIFY HFSNOTIFY
388 - use nfs && set_config EXPORT
389 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
390 - use ramfs && set_config BR_RAMFS
391 -
392 - use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
393 -
394 - sed \
395 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
396 - -i Makefile || die
397 -}
398 -
399 -src_compile() {
400 - local ARCH=x86
401 -
402 - emake \
403 - CC=$(tc-getCC) \
404 - LD=$(tc-getLD) \
405 - LDFLAGS="$(raw-ldflags)" \
406 - ARCH=$(tc-arch-kernel) \
407 - CONFIG_AUFS_FS=m \
408 - KDIR="${KV_OUT_DIR}"
409 -}
410 -
411 -src_install() {
412 - linux-mod_src_install
413 -
414 - use doc && dodoc -r Documentation
415 -
416 - use kernel-patch || \
417 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
418 -
419 - dodoc \
420 - Documentation/filesystems/aufs/README \
421 - "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
422 -
423 - readme.gentoo_create_doc
424 -}
425 -
426 -pkg_postinst() {
427 - readme.gentoo_print_elog
428 - linux-mod_pkg_postinst
429 -}
430
431 diff --git a/sys-fs/aufs3/aufs3-3_p20160627.ebuild b/sys-fs/aufs3/aufs3-3_p20160627.ebuild
432 deleted file mode 100644
433 index 2a786f02ab2..00000000000
434 --- a/sys-fs/aufs3/aufs3-3_p20160627.ebuild
435 +++ /dev/null
436 @@ -1,184 +0,0 @@
437 -# Copyright 1999-2016 Gentoo Foundation
438 -# Distributed under the terms of the GNU General Public License v2
439 -
440 -EAPI=6
441 -
442 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
443 -
444 -AUFS_VERSION="${PV%%_p*}"
445 -# highest branch version
446 -PATCH_MAX_VER=19
447 -# highest supported version
448 -KERN_MAX_VER=20
449 -# lowest supported version
450 -KERN_MIN_VER=18
451 -
452 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
453 -HOMEPAGE="http://aufs.sourceforge.net/"
454 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
455 -
456 -LICENSE="GPL-2"
457 -SLOT="0"
458 -KEYWORDS="~amd64 ~x86"
459 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
460 -
461 -DEPEND="
462 - dev-util/patchutils
463 - dev-vcs/git"
464 -RDEPEND="
465 - sys-fs/aufs-util
466 - !sys-fs/aufs
467 - !sys-fs/aufs2
468 - !sys-fs/aufs4"
469 -
470 -S="${WORKDIR}"/${PN}-standalone
471 -
472 -MODULE_NAMES="aufs(misc:${S})"
473 -
474 -pkg_setup() {
475 - CONFIG_CHECK+=" !AUFS_FS"
476 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
477 - use nfs && CONFIG_CHECK+=" EXPORTFS"
478 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
479 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
480 - use pax_kernel && CONFIG_CHECK+=" PAX" \
481 - && ERROR_PAX="Please use hardened sources"
482 -
483 - # this is needed so merging a binpkg ${PN} is
484 - # possible w/out a kernel unpacked on the system
485 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
486 -
487 - get_version
488 - kernel_is lt 3 ${KERN_MIN_VER} 0 && \
489 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
490 - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
491 -
492 - linux-mod_pkg_setup
493 -
494 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
495 - PATCH_BRANCH="x-rcN"
496 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
497 - PATCH_BRANCH="${KV_MINOR}".25+
498 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
499 - PATCH_BRANCH="${KV_MINOR}".1+
500 - else
501 - PATCH_BRANCH="${KV_MINOR}"
502 - fi
503 -
504 - case ${KV_EXTRA} in
505 - "")
506 - elog "It seems you are using vanilla-sources with aufs3"
507 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
508 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
509 - ;;
510 - "-gentoo")
511 - elog "It seems you are using gentoo-sources with aufs3"
512 - elog "Please use sys-kernel/aufs-sources"
513 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
514 - ;;
515 - esac
516 -
517 - pushd "${T}" &> /dev/null || die
518 - unpack ${A}
519 -
520 - cd ${PN}-standalone || die
521 -
522 - local module_branch=origin/${PN}.${PATCH_BRANCH}
523 -
524 - einfo "Using ${module_branch} as patch source"
525 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
526 -
527 - combinediff \
528 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
529 - combinediff \
530 - "${T}"/combined-1.patch ${PN}-mmap.patch \
531 - > ${PN}-standalone-base-mmap-combined.patch
532 -
533 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
534 - if use kernel-patch; then
535 - cd ${KV_DIR}
536 - ewarn "Patching your kernel..."
537 - patch \
538 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
539 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
540 - > /dev/null
541 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
542 - ewarn "You need to compile your kernel with the applied patch"
543 - ewarn "to be able to load and use the aufs kernel module"
544 - else
545 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
546 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
547 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
548 - die "missing kernel patch, please apply it first"
549 - fi
550 - fi
551 -
552 - popd &> /dev/null
553 - export PKG_SETUP_HAS_BEEN_RAN=1
554 -}
555 -
556 -set_config() {
557 - for option in $*; do
558 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
559 - die "${option} is not a valid config option"
560 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
561 - done
562 -}
563 -
564 -src_prepare() {
565 - local module_branch=origin/${PN}.${PATCH_BRANCH}
566 -
567 - einfo "Using for module creation branch ${module_branch}"
568 - git checkout -q -b local-gentoo ${module_branch} || die
569 -
570 - # All config options to off
571 - sed "s:= y:=:g" -i config.mk || die
572 -
573 - set_config RDU BRANCH_MAX_127 SBILIST
574 -
575 - use debug && set_config DEBUG
576 - use fuse && set_config BR_FUSE POLL
577 - use hfs && set_config BR_HFSPLUS
578 - use inotify && set_config HNOTIFY HFSNOTIFY
579 - use nfs && set_config EXPORT
580 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
581 - use ramfs && set_config BR_RAMFS
582 -
583 - use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
584 -
585 - sed \
586 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
587 - -i Makefile || die
588 -}
589 -
590 -src_compile() {
591 - local ARCH=x86
592 -
593 - emake \
594 - CC=$(tc-getCC) \
595 - LD=$(tc-getLD) \
596 - LDFLAGS="$(raw-ldflags)" \
597 - ARCH=$(tc-arch-kernel) \
598 - CONFIG_AUFS_FS=m \
599 - KDIR="${KV_OUT_DIR}"
600 -}
601 -
602 -src_install() {
603 - linux-mod_src_install
604 -
605 - use doc && dodoc -r Documentation
606 -
607 - use kernel-patch || \
608 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
609 -
610 - dodoc \
611 - Documentation/filesystems/aufs/README \
612 - "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
613 -
614 - readme.gentoo_create_doc
615 -}
616 -
617 -pkg_postinst() {
618 - readme.gentoo_print_elog
619 - linux-mod_pkg_postinst
620 -}
621
622 diff --git a/sys-fs/aufs3/aufs3-3_p20160815.ebuild b/sys-fs/aufs3/aufs3-3_p20160815.ebuild
623 deleted file mode 100644
624 index 2a786f02ab2..00000000000
625 --- a/sys-fs/aufs3/aufs3-3_p20160815.ebuild
626 +++ /dev/null
627 @@ -1,184 +0,0 @@
628 -# Copyright 1999-2016 Gentoo Foundation
629 -# Distributed under the terms of the GNU General Public License v2
630 -
631 -EAPI=6
632 -
633 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
634 -
635 -AUFS_VERSION="${PV%%_p*}"
636 -# highest branch version
637 -PATCH_MAX_VER=19
638 -# highest supported version
639 -KERN_MAX_VER=20
640 -# lowest supported version
641 -KERN_MIN_VER=18
642 -
643 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
644 -HOMEPAGE="http://aufs.sourceforge.net/"
645 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
646 -
647 -LICENSE="GPL-2"
648 -SLOT="0"
649 -KEYWORDS="~amd64 ~x86"
650 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
651 -
652 -DEPEND="
653 - dev-util/patchutils
654 - dev-vcs/git"
655 -RDEPEND="
656 - sys-fs/aufs-util
657 - !sys-fs/aufs
658 - !sys-fs/aufs2
659 - !sys-fs/aufs4"
660 -
661 -S="${WORKDIR}"/${PN}-standalone
662 -
663 -MODULE_NAMES="aufs(misc:${S})"
664 -
665 -pkg_setup() {
666 - CONFIG_CHECK+=" !AUFS_FS"
667 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
668 - use nfs && CONFIG_CHECK+=" EXPORTFS"
669 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
670 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
671 - use pax_kernel && CONFIG_CHECK+=" PAX" \
672 - && ERROR_PAX="Please use hardened sources"
673 -
674 - # this is needed so merging a binpkg ${PN} is
675 - # possible w/out a kernel unpacked on the system
676 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
677 -
678 - get_version
679 - kernel_is lt 3 ${KERN_MIN_VER} 0 && \
680 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
681 - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
682 -
683 - linux-mod_pkg_setup
684 -
685 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
686 - PATCH_BRANCH="x-rcN"
687 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
688 - PATCH_BRANCH="${KV_MINOR}".25+
689 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
690 - PATCH_BRANCH="${KV_MINOR}".1+
691 - else
692 - PATCH_BRANCH="${KV_MINOR}"
693 - fi
694 -
695 - case ${KV_EXTRA} in
696 - "")
697 - elog "It seems you are using vanilla-sources with aufs3"
698 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
699 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
700 - ;;
701 - "-gentoo")
702 - elog "It seems you are using gentoo-sources with aufs3"
703 - elog "Please use sys-kernel/aufs-sources"
704 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
705 - ;;
706 - esac
707 -
708 - pushd "${T}" &> /dev/null || die
709 - unpack ${A}
710 -
711 - cd ${PN}-standalone || die
712 -
713 - local module_branch=origin/${PN}.${PATCH_BRANCH}
714 -
715 - einfo "Using ${module_branch} as patch source"
716 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
717 -
718 - combinediff \
719 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
720 - combinediff \
721 - "${T}"/combined-1.patch ${PN}-mmap.patch \
722 - > ${PN}-standalone-base-mmap-combined.patch
723 -
724 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
725 - if use kernel-patch; then
726 - cd ${KV_DIR}
727 - ewarn "Patching your kernel..."
728 - patch \
729 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
730 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
731 - > /dev/null
732 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
733 - ewarn "You need to compile your kernel with the applied patch"
734 - ewarn "to be able to load and use the aufs kernel module"
735 - else
736 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
737 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
738 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
739 - die "missing kernel patch, please apply it first"
740 - fi
741 - fi
742 -
743 - popd &> /dev/null
744 - export PKG_SETUP_HAS_BEEN_RAN=1
745 -}
746 -
747 -set_config() {
748 - for option in $*; do
749 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
750 - die "${option} is not a valid config option"
751 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
752 - done
753 -}
754 -
755 -src_prepare() {
756 - local module_branch=origin/${PN}.${PATCH_BRANCH}
757 -
758 - einfo "Using for module creation branch ${module_branch}"
759 - git checkout -q -b local-gentoo ${module_branch} || die
760 -
761 - # All config options to off
762 - sed "s:= y:=:g" -i config.mk || die
763 -
764 - set_config RDU BRANCH_MAX_127 SBILIST
765 -
766 - use debug && set_config DEBUG
767 - use fuse && set_config BR_FUSE POLL
768 - use hfs && set_config BR_HFSPLUS
769 - use inotify && set_config HNOTIFY HFSNOTIFY
770 - use nfs && set_config EXPORT
771 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
772 - use ramfs && set_config BR_RAMFS
773 -
774 - use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
775 -
776 - sed \
777 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
778 - -i Makefile || die
779 -}
780 -
781 -src_compile() {
782 - local ARCH=x86
783 -
784 - emake \
785 - CC=$(tc-getCC) \
786 - LD=$(tc-getLD) \
787 - LDFLAGS="$(raw-ldflags)" \
788 - ARCH=$(tc-arch-kernel) \
789 - CONFIG_AUFS_FS=m \
790 - KDIR="${KV_OUT_DIR}"
791 -}
792 -
793 -src_install() {
794 - linux-mod_src_install
795 -
796 - use doc && dodoc -r Documentation
797 -
798 - use kernel-patch || \
799 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
800 -
801 - dodoc \
802 - Documentation/filesystems/aufs/README \
803 - "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
804 -
805 - readme.gentoo_create_doc
806 -}
807 -
808 -pkg_postinst() {
809 - readme.gentoo_print_elog
810 - linux-mod_pkg_postinst
811 -}
812
813 diff --git a/sys-fs/aufs3/aufs3-3_p20160822.ebuild b/sys-fs/aufs3/aufs3-3_p20160822.ebuild
814 deleted file mode 100644
815 index 2a786f02ab2..00000000000
816 --- a/sys-fs/aufs3/aufs3-3_p20160822.ebuild
817 +++ /dev/null
818 @@ -1,184 +0,0 @@
819 -# Copyright 1999-2016 Gentoo Foundation
820 -# Distributed under the terms of the GNU General Public License v2
821 -
822 -EAPI=6
823 -
824 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
825 -
826 -AUFS_VERSION="${PV%%_p*}"
827 -# highest branch version
828 -PATCH_MAX_VER=19
829 -# highest supported version
830 -KERN_MAX_VER=20
831 -# lowest supported version
832 -KERN_MIN_VER=18
833 -
834 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
835 -HOMEPAGE="http://aufs.sourceforge.net/"
836 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs3-standalone-${PV}.tar.xz"
837 -
838 -LICENSE="GPL-2"
839 -SLOT="0"
840 -KEYWORDS="~amd64 ~x86"
841 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
842 -
843 -DEPEND="
844 - dev-util/patchutils
845 - dev-vcs/git"
846 -RDEPEND="
847 - sys-fs/aufs-util
848 - !sys-fs/aufs
849 - !sys-fs/aufs2
850 - !sys-fs/aufs4"
851 -
852 -S="${WORKDIR}"/${PN}-standalone
853 -
854 -MODULE_NAMES="aufs(misc:${S})"
855 -
856 -pkg_setup() {
857 - CONFIG_CHECK+=" !AUFS_FS"
858 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
859 - use nfs && CONFIG_CHECK+=" EXPORTFS"
860 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
861 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
862 - use pax_kernel && CONFIG_CHECK+=" PAX" \
863 - && ERROR_PAX="Please use hardened sources"
864 -
865 - # this is needed so merging a binpkg ${PN} is
866 - # possible w/out a kernel unpacked on the system
867 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
868 -
869 - get_version
870 - kernel_is lt 3 ${KERN_MIN_VER} 0 && \
871 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
872 - kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
873 -
874 - linux-mod_pkg_setup
875 -
876 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
877 - PATCH_BRANCH="x-rcN"
878 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "25" ]]; then
879 - PATCH_BRANCH="${KV_MINOR}".25+
880 - elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
881 - PATCH_BRANCH="${KV_MINOR}".1+
882 - else
883 - PATCH_BRANCH="${KV_MINOR}"
884 - fi
885 -
886 - case ${KV_EXTRA} in
887 - "")
888 - elog "It seems you are using vanilla-sources with aufs3"
889 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
890 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
891 - ;;
892 - "-gentoo")
893 - elog "It seems you are using gentoo-sources with aufs3"
894 - elog "Please use sys-kernel/aufs-sources"
895 - elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
896 - ;;
897 - esac
898 -
899 - pushd "${T}" &> /dev/null || die
900 - unpack ${A}
901 -
902 - cd ${PN}-standalone || die
903 -
904 - local module_branch=origin/${PN}.${PATCH_BRANCH}
905 -
906 - einfo "Using ${module_branch} as patch source"
907 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
908 -
909 - combinediff \
910 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
911 - combinediff \
912 - "${T}"/combined-1.patch ${PN}-mmap.patch \
913 - > ${PN}-standalone-base-mmap-combined.patch
914 -
915 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
916 - if use kernel-patch; then
917 - cd ${KV_DIR}
918 - ewarn "Patching your kernel..."
919 - patch \
920 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
921 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
922 - > /dev/null
923 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
924 - ewarn "You need to compile your kernel with the applied patch"
925 - ewarn "to be able to load and use the aufs kernel module"
926 - else
927 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
928 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
929 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
930 - die "missing kernel patch, please apply it first"
931 - fi
932 - fi
933 -
934 - popd &> /dev/null
935 - export PKG_SETUP_HAS_BEEN_RAN=1
936 -}
937 -
938 -set_config() {
939 - for option in $*; do
940 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
941 - die "${option} is not a valid config option"
942 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
943 - done
944 -}
945 -
946 -src_prepare() {
947 - local module_branch=origin/${PN}.${PATCH_BRANCH}
948 -
949 - einfo "Using for module creation branch ${module_branch}"
950 - git checkout -q -b local-gentoo ${module_branch} || die
951 -
952 - # All config options to off
953 - sed "s:= y:=:g" -i config.mk || die
954 -
955 - set_config RDU BRANCH_MAX_127 SBILIST
956 -
957 - use debug && set_config DEBUG
958 - use fuse && set_config BR_FUSE POLL
959 - use hfs && set_config BR_HFSPLUS
960 - use inotify && set_config HNOTIFY HFSNOTIFY
961 - use nfs && set_config EXPORT
962 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
963 - use ramfs && set_config BR_RAMFS
964 -
965 - use pax_kernel && epatch "${FILESDIR}"/pax-3.11.patch
966 -
967 - sed \
968 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
969 - -i Makefile || die
970 -}
971 -
972 -src_compile() {
973 - local ARCH=x86
974 -
975 - emake \
976 - CC=$(tc-getCC) \
977 - LD=$(tc-getLD) \
978 - LDFLAGS="$(raw-ldflags)" \
979 - ARCH=$(tc-arch-kernel) \
980 - CONFIG_AUFS_FS=m \
981 - KDIR="${KV_OUT_DIR}"
982 -}
983 -
984 -src_install() {
985 - linux-mod_src_install
986 -
987 - use doc && dodoc -r Documentation
988 -
989 - use kernel-patch || \
990 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
991 -
992 - dodoc \
993 - Documentation/filesystems/aufs/README \
994 - "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
995 -
996 - readme.gentoo_create_doc
997 -}
998 -
999 -pkg_postinst() {
1000 - readme.gentoo_print_elog
1001 - linux-mod_pkg_postinst
1002 -}
1003
1004 diff --git a/sys-fs/aufs3/files/README.gentoo b/sys-fs/aufs3/files/README.gentoo
1005 deleted file mode 100644
1006 index 64dfe94b4bd..00000000000
1007 --- a/sys-fs/aufs3/files/README.gentoo
1008 +++ /dev/null
1009 @@ -1,20 +0,0 @@
1010 -There several other patches in aufs3. They are all
1011 -optional. When you meet some problems, they will help you. You can find them
1012 -in the documentation directory.
1013 -
1014 - - aufs3-loopback.patch
1015 - Supports a nested loopback mount in a branch-fs. This patch is
1016 - unnecessary until aufs produces a message such like "you may want to try
1017 - another patch for loopback file".
1018 -
1019 - - vfs-ino.patch
1020 - Modifies a system global kernel internal function get_next_ino() in
1021 - order to stop assigning 0 for an inode-number. Not directly related to
1022 - aufs, but recommended generally.
1023 -
1024 - - tmpfs-idr.patch
1025 - Keeps the tmpfs inode number as the lowest value. Effective to reduce
1026 - the size of aufs XINO files for tmpfs branch. Also it prevents the
1027 - duplication of inode number, which is important for backup
1028 - tools, aubrsync or other utilities. When you find aufs XINO files for
1029 - tmpfs branch growing too much, try this patch.
1030
1031 diff --git a/sys-fs/aufs3/files/pax-3.11.patch b/sys-fs/aufs3/files/pax-3.11.patch
1032 deleted file mode 100644
1033 index cf216a5708c..00000000000
1034 --- a/sys-fs/aufs3/files/pax-3.11.patch
1035 +++ /dev/null
1036 @@ -1,89 +0,0 @@
1037 ---- a/fs/aufs/dynop.c 2012-10-09 15:41:32.652989534 -0400
1038 -+++ b/fs/aufs/dynop.c 2012-10-09 15:41:58.562989820 -0400
1039 -@@ -149,9 +149,11 @@
1040 - #define DySet(func, dst, src, h_op, h_sb) do { \
1041 - DyDbgInc(cnt); \
1042 - if (h_op->func) { \
1043 -- if (src.func) \
1044 -- dst.func = src.func; \
1045 -- else \
1046 -+ if (src.func) { \
1047 -+ pax_open_kernel(); \
1048 -+ *(void **)&dst.func = src.func; \
1049 -+ pax_close_kernel(); \
1050 -+ } else \
1051 - AuDbg("%s %s\n", au_sbtype(h_sb), #func); \
1052 - } \
1053 - } while (0)
1054 -@@ -159,7 +161,9 @@
1055 - #define DySetForce(func, dst, src) do { \
1056 - AuDebugOn(!src.func); \
1057 - DyDbgInc(cnt); \
1058 -- dst.func = src.func; \
1059 -+ pax_open_kernel(); \
1060 -+ *(void **)&dst.func = src.func; \
1061 -+ pax_close_kernel(); \
1062 - } while (0)
1063 -
1064 - #define DySetAop(func) \
1065 -@@ -266,15 +270,17 @@
1066 - */
1067 - static void dy_adx(struct au_dyaop *dyaop, int do_dx)
1068 - {
1069 -+ pax_open_kernel();
1070 - if (!do_dx) {
1071 -- dyaop->da_op.direct_IO = NULL;
1072 -- dyaop->da_op.get_xip_mem = NULL;
1073 -+ *(void **)&dyaop->da_op.direct_IO = NULL;
1074 -+ *(void **)&dyaop->da_op.get_xip_mem = NULL;
1075 - } else {
1076 -- dyaop->da_op.direct_IO = aufs_aop.direct_IO;
1077 -- dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
1078 -+ *(void **)&dyaop->da_op.direct_IO = aufs_aop.direct_IO;
1079 -+ *(void **)&dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
1080 - if (!dyaop->da_get_xip_mem)
1081 -- dyaop->da_op.get_xip_mem = NULL;
1082 -+ *(void **)&dyaop->da_op.get_xip_mem = NULL;
1083 - }
1084 -+ pax_close_kernel();
1085 - }
1086 -
1087 - static struct au_dyaop *dy_aget(struct au_branch *br,
1088 ---- a/fs/aufs/f_op_sp.c 2012-10-09 15:41:32.652989534 -0400
1089 -+++ b/fs/aufs/f_op_sp.c 2012-10-09 15:41:58.562989820 -0400
1090 -@@ -104,7 +104,7 @@
1091 - static int aufs_open_sp(struct inode *inode, struct file *file);
1092 - static struct au_sp_fop {
1093 - int done;
1094 -- struct file_operations fop; /* not 'const' */
1095 -+ file_operations_no_const fop; /* not 'const' */
1096 - spinlock_t spin;
1097 - } au_sp_fop[AuSp_Last] = {
1098 - [AuSp_FIFO] = {
1099 -@@ -157,8 +157,10 @@
1100 - h_file = au_hf_top(file);
1101 - spin_lock(&p->spin);
1102 - if (!p->done) {
1103 -- p->fop = *h_file->f_op;
1104 -+ pax_open_kernel();
1105 -+ memcpy((void *)&p->fop, h_file->f_op, sizeof(p->fop));
1106 - p->fop.owner = THIS_MODULE;
1107 -+ pax_close_kernel();
1108 - if (p->fop.aio_read)
1109 - p->fop.aio_read = aufs_aio_read_sp;
1110 - if (p->fop.aio_write)
1111 ---- a/fs/aufs/sysfs.c 2013-10-20 17:08:37.000000000 -0400
1112 -+++ b/fs/aufs/sysfs.c 2013-10-19 17:08:29.000000000 -0400
1113 -@@ -233,8 +233,10 @@
1114 - for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) {
1115 - attr = &br_sysfs->attr;
1116 - sysfs_attr_init(attr);
1117 -- attr->name = br_sysfs->name;
1118 -- attr->mode = S_IRUGO;
1119 -+ pax_open_kernel();
1120 -+ *(void **)&attr->name = br_sysfs->name;
1121 -+ *(void **)&attr->mode = S_IRUGO;
1122 -+ pax_close_kernel();
1123 - br_sysfs++;
1124 - }
1125 - }
1126
1127 diff --git a/sys-fs/aufs3/metadata.xml b/sys-fs/aufs3/metadata.xml
1128 deleted file mode 100644
1129 index f0e5c642768..00000000000
1130 --- a/sys-fs/aufs3/metadata.xml
1131 +++ /dev/null
1132 @@ -1,20 +0,0 @@
1133 -<?xml version="1.0" encoding="UTF-8"?>
1134 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
1135 -<pkgmetadata>
1136 - <maintainer type="person">
1137 - <email>jlec@g.o</email>
1138 - </maintainer>
1139 - <use>
1140 - <flag name="debug">Enable additional debugging support</flag>
1141 - <flag name="hfs">Enable hfs support</flag>
1142 - <flag name="fuse">Enable fuse support</flag>
1143 - <flag name="inotify">Enable inotify support</flag>
1144 - <flag name="kernel-patch">Patch the current kernel for aufs3 support</flag>
1145 - <flag name="nfs">Enable support for nfs export</flag>
1146 - <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
1147 - <flag name="ramfs">Enable initramfs/rootfs support</flag>
1148 - </use>
1149 - <upstream>
1150 - <remote-id type="sourceforge">aufs</remote-id>
1151 - </upstream>
1152 -</pkgmetadata>