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/aufs4/files/, profiles/, sys-fs/aufs4/
Date: Sat, 28 Jul 2018 11:40:41
Message-Id: 1532778028.33e9b1ddbff8508a869cde7025ced6f6b150412d.mgorny@gentoo
1 commit: 33e9b1ddbff8508a869cde7025ced6f6b150412d
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Sat Jul 28 11:37:50 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=33e9b1dd
7
8 sys-fs/aufs4: Remove last-rited pkg
9
10 Closes: https://bugs.gentoo.org/650126
11
12 profiles/package.mask | 5 -
13 sys-fs/aufs4/Manifest | 14 ---
14 sys-fs/aufs4/aufs4-0_pre20160219.ebuild | 184 --------------------------------
15 sys-fs/aufs4/aufs4-0_pre20160223.ebuild | 184 --------------------------------
16 sys-fs/aufs4/aufs4-0_pre20160627.ebuild | 184 --------------------------------
17 sys-fs/aufs4/aufs4-0_pre20160815.ebuild | 184 --------------------------------
18 sys-fs/aufs4/aufs4-0_pre20161010.ebuild | 184 --------------------------------
19 sys-fs/aufs4/aufs4-0_pre20161219.ebuild | 184 --------------------------------
20 sys-fs/aufs4/aufs4-0_pre20170130.ebuild | 184 --------------------------------
21 sys-fs/aufs4/aufs4-0_pre20170220.ebuild | 184 --------------------------------
22 sys-fs/aufs4/aufs4-0_pre20170313.ebuild | 184 --------------------------------
23 sys-fs/aufs4/aufs4-0_pre20170612.ebuild | 184 --------------------------------
24 sys-fs/aufs4/aufs4-0_pre20171002.ebuild | 184 --------------------------------
25 sys-fs/aufs4/aufs4-0_pre20171106.ebuild | 184 --------------------------------
26 sys-fs/aufs4/aufs4-0_pre20180219.ebuild | 184 --------------------------------
27 sys-fs/aufs4/aufs4-0_pre20180312.ebuild | 184 --------------------------------
28 sys-fs/aufs4/files/README.gentoo | 20 ----
29 sys-fs/aufs4/files/pax-4.patch | 89 ---------------
30 sys-fs/aufs4/metadata.xml | 20 ----
31 19 files changed, 2724 deletions(-)
32
33 diff --git a/profiles/package.mask b/profiles/package.mask
34 index 330441dbed3..d8608dfb9d4 100644
35 --- a/profiles/package.mask
36 +++ b/profiles/package.mask
37 @@ -429,11 +429,6 @@ media-libs/libglvnd
38 # Masked for initial testing
39 >=dev-db/mysql-connector-c++-8.0.0
40
41 -# Rick Farina <zerochaos@g.o> (04 Apr 2018)
42 -# Violates PMS and does not work with stable portage.
43 -# Masked for removal in 60 days, lift mask if bug #650126 is fixed
44 -sys-fs/aufs4
45 -
46 # Jeroen Roovers <jer@g.o> (6 Apr 2018)
47 # Requires >=dev-libs/icu-61.1
48 # https://bugs.gentoo.org/651698
49
50 diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
51 deleted file mode 100644
52 index d3fb157ba6f..00000000000
53 --- a/sys-fs/aufs4/Manifest
54 +++ /dev/null
55 @@ -1,14 +0,0 @@
56 -DIST aufs4-standalone-0_pre20160219.tar.xz 1049884 BLAKE2B 61a1059ddf1e7ea8338088f60f5b96112a723c18bedd508e8d35c89fc8354355b6db6ffc886d2fe09a12612b1fb790df7884315c6cfb0f60819f778b8db6f2af SHA512 95999199ac0d430a6ab2dbda75f34d9640179865d5be3b1db119c1e613f5bd167193dd7cf662ebcea9d81ad8008d9dbd8dd835d5a7a297456f8587364e7f16b1
57 -DIST aufs4-standalone-0_pre20160223.tar.xz 1072092 BLAKE2B 3aa9691be4fab031519d8f2b869d1225be9a6198d0a72efcf98b400a1cc220f2af7d32dc54228a52120c3cab3c887dc4e2b3b50f0f723a47a3da21219b0ed250 SHA512 adafd18416a43af076292ea216db73f0569f25ce34d03ebde5aea049745c47979cc4778eef8f671d48a5f7d7ac5751f788d286f467a106c6660412e88442b18e
58 -DIST aufs4-standalone-0_pre20160627.tar.xz 1427036 BLAKE2B 69774951cec10bbd49999818a470924503b71f95d55db390314764a340ce5fec345eea50eef14e8b34459164546b61ff908827b39f442d5c9b117d60be972587 SHA512 c2e3d92fc6ca8968071a40d2773b63ec21fdd2bb12e8375dced30279ffcafcd06cacb0c20a6bb5378704c5de670426d0d92149bb5737507e3515b5df648e1b81
59 -DIST aufs4-standalone-0_pre20160815.tar.xz 1648360 BLAKE2B 75c228d82cf0c652c1281b1b9f6d7c95505065e2df7546871192a27ef39427d48e52e8b4520f50251b435bf9e711bd77290b0d1afa35cd9660ef88224d7304d1 SHA512 a9a86ce4fce04100704cce1acf04b8eeff6a2b81cc591d3ceeafa736a3a8e8fed59538f9301af6cb3ec496dd914b81a3134669ba8871624b2266cc3f731b9fae
60 -DIST aufs4-standalone-0_pre20161010.tar.xz 1635556 BLAKE2B daae9be780c82ba44c94b5cd089f445e51df3a887987996d2bbb6285d65dfb210c75ef8aa8e217465330f43da71561cc7347eefbf1930da57f65d5c96950a2ff SHA512 520f47255ee33762f111f93ceeaaee9cf6136c13fb6968a7a7d49388c189e112875f076c5fecdad2123d137a2bc0b74e9c0e6e8913e75dfede30e7a65dd74616
61 -DIST aufs4-standalone-0_pre20161219.tar.xz 1823772 BLAKE2B 70ca052e2c8e716ef2c0921bab13b77d40126e49892d521dfec93b6b67518cbc6ae44293cfdc3fafa308b67e5d242ed319efe71f733c5ef3f128da682ad1edd2 SHA512 59fc0df19716d8f03e2547d98d6f412e921576d60afd783e5691a07c09b298ee61f491501e07ec154665a56d11b1887f94813ef5972254e6391251a48ba156c9
62 -DIST aufs4-standalone-0_pre20170130.tar.xz 1761280 BLAKE2B 7803ad55a6e10209554b359d8225e5f3208214fb011b3fb812b4a839e142a0611172268200e5b688bd233a4b1f8cbee7271a278da489759c1de574ec5da742af SHA512 beb121b36bb6056e48d5402b10bdfb8b6cd20d61b7d74221e5abd10226f58f40be1a0853e06a09cc1f94d50543030a9fd0a1c117570b1ad7467bf4156a1492ea
63 -DIST aufs4-standalone-0_pre20170220.tar.xz 2115232 BLAKE2B 4db987bf926eca1d5d6e5c8cf9dc447f5d10c80575aac21504647ae490f4aa806f443dd2f9350451f02d3beb5bbd5f498133746ccf6ffc2738d508f242d7a8e0 SHA512 c68cf12573a0f3d9ec9419c63759d2b6f120eaafbbc005553c31d9c07b77d61612b903dc7ebdb2a8de8a52ded62e20b08cd32206b3cd3df196f0c1da82d472f7
64 -DIST aufs4-standalone-0_pre20170313.tar.xz 1883012 BLAKE2B 46ac87644085ece9f6a98043bd1cbc5f386d08a30227a16f798d68a69c0df7d7468ffafae1a41f757b56903ee8f3df900d45dfecb40b2069c6cd52f38f39cc8a SHA512 7d711e0ebdc38aa79d3b7cdb04c91f3029c233bacdadca87a8622d48826c261c678d6a2cda6b627a0db0f248b35448e0d9da30e2c8e2e42e3b1e3ae6327033ba
65 -DIST aufs4-standalone-0_pre20170612.tar.xz 2017248 BLAKE2B 40fa98545d6ddd3685f9c56f7dc921f2215c451ed68e84720f30a196b7c10660b0930d12a110ef6c65364433a121a90b21eedadc8b5a2007217cbe0468100509 SHA512 2d0fd1dce7b1a421533e667420fc69a44c378753dccddc3768eebdb906a023e41378b38961004a58b1c4f2e3844c86f8cb4be238e634318a380881eab513acfa
66 -DIST aufs4-standalone-0_pre20171002.tar.xz 2265048 BLAKE2B ae68812c547411bebd7e169e3bfa840536386a3cfdd876473f167372ec716c7df620329438c9024b185bb302d2053df5ded7026342a166d68187dc756a6e9560 SHA512 ee9d0e48fba6671fe4c5d3f533956c3eb0c6caa45fc4074be94f4427d84a5446cd4dc9f3ebf27fb56e697b24172ddd14a61c246f0414ebce8e372c204dfbb150
67 -DIST aufs4-standalone-0_pre20171106.tar.xz 2351120 BLAKE2B e29209475da3c39188eb9ec88bf91cd50d7d882fdd234e32e28741b500aa85427e98a23528a297f35562f81dc4f8e4932783917644b2eda0b4f2744ac15b700e SHA512 9a8c6f59b737133e423613365bb46fd197f05a93d459b6206a70807ffaa6763b7095b2f4780deb6e7882a2b464aaa185cf1760febbf3a674e8d0cf71c7ba72ee
68 -DIST aufs4-standalone-0_pre20180219.tar.xz 2496676 BLAKE2B 61015534f74f9f2398b79643d9528c59f0069fefae3bf9382eea1f31db69fe22195ce8a929e2c25285b41fdc070d7f255effb6d408d3997d61dd83beda544452 SHA512 b667be0c2c2b9bcef66f81839364fa56871c2577b9b2389f0464b669a1404fd68928522bb5b3eb4c114b21b6e86201fb50eeaf167d194de187f305ebc0b75cb7
69 -DIST aufs4-standalone-0_pre20180312.tar.xz 2521856 BLAKE2B e226a6ba530fe9423d1671cee59501445cbc70419801420f6c5eb8c5fd3af3cce9301d9d32042ea8c4c704a847b4f46bd006c397871f7c9ee5dcb4e92c3ce7e9 SHA512 60e1dfb703706f21928645c51d1a4138187e7ea44d86ca5f2ee8a991a910974bc514340237a7c51397d658ca56e2cf32cfcf374eb8e060073266042e5ee42cee
70
71 diff --git a/sys-fs/aufs4/aufs4-0_pre20160219.ebuild b/sys-fs/aufs4/aufs4-0_pre20160219.ebuild
72 deleted file mode 100644
73 index cb3b25bc99a..00000000000
74 --- a/sys-fs/aufs4/aufs4-0_pre20160219.ebuild
75 +++ /dev/null
76 @@ -1,184 +0,0 @@
77 -# Copyright 1999-2016 Gentoo Foundation
78 -# Distributed under the terms of the GNU General Public License v2
79 -
80 -EAPI=6
81 -
82 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
83 -
84 -AUFS_VERSION="${PV%%_p*}"
85 -# highest branch version
86 -PATCH_MAX_VER=4
87 -# highest supported version
88 -KERN_MAX_VER=5
89 -# lowest supported version
90 -KERN_MIN_VER=0
91 -
92 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
93 -HOMEPAGE="http://aufs.sourceforge.net/"
94 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
95 -
96 -LICENSE="GPL-2"
97 -SLOT="0"
98 -KEYWORDS="~amd64 ~x86"
99 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
100 -
101 -DEPEND="
102 - dev-util/patchutils
103 - dev-vcs/git"
104 -RDEPEND="
105 - sys-fs/aufs-util
106 - !sys-fs/aufs
107 - !sys-fs/aufs2
108 - !sys-fs/aufs3"
109 -
110 -S="${WORKDIR}"/${PN}-standalone
111 -
112 -MODULE_NAMES="aufs(misc:${S})"
113 -
114 -pkg_setup() {
115 - CONFIG_CHECK+=" !AUFS_FS"
116 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
117 - use nfs && CONFIG_CHECK+=" EXPORTFS"
118 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
119 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
120 - use pax_kernel && CONFIG_CHECK+=" PAX" \
121 - && ERROR_PAX="Please use hardened sources"
122 -
123 - # this is needed so merging a binpkg ${PN} is
124 - # possible w/out a kernel unpacked on the system
125 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
126 -
127 - get_version
128 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
129 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
130 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
131 -
132 - linux-mod_pkg_setup
133 -
134 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
135 - PATCH_BRANCH="x-rcN"
136 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
137 - PATCH_BRANCH="${KV_MINOR}".13+
138 - else
139 - PATCH_BRANCH="${KV_MINOR}"
140 - fi
141 -
142 - case ${KV_EXTRA} in
143 - "")
144 - elog "It seems you are using vanilla-sources with aufs4"
145 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
146 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
147 - ;;
148 - "-gentoo")
149 - elog "It seems you are using gentoo-sources with aufs4"
150 - elog "Please use sys-kernel/aufs-sources"
151 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
152 - ;;
153 - esac
154 -
155 - pushd "${T}" &> /dev/null || die
156 - unpack ${A}
157 -
158 - cd ${PN}-standalone || die
159 -
160 - local module_branch=origin/${PN}.${PATCH_BRANCH}
161 -
162 - einfo "Using ${module_branch} as patch source"
163 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
164 -
165 - combinediff \
166 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
167 - combinediff \
168 - "${T}"/combined-1.patch ${PN}-mmap.patch \
169 - > ${PN}-standalone-base-mmap-combined.patch
170 -
171 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
172 - if use kernel-patch; then
173 - cd ${KV_DIR}
174 - ewarn "Patching your kernel..."
175 - patch \
176 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
177 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
178 - > /dev/null
179 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
180 - ewarn "You need to compile your kernel with the applied patch"
181 - ewarn "to be able to load and use the aufs kernel module"
182 - else
183 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
184 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
185 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
186 - die "missing kernel patch, please apply it first"
187 - fi
188 - fi
189 -
190 - popd &> /dev/null
191 - export PKG_SETUP_HAS_BEEN_RAN=1
192 -}
193 -
194 -set_config() {
195 - for option in $*; do
196 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
197 - die "${option} is not a valid config option"
198 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
199 - done
200 -}
201 -
202 -src_prepare() {
203 - local module_branch=origin/${PN}.${PATCH_BRANCH}
204 -
205 - einfo "Using for module creation branch ${module_branch}"
206 - git checkout -q -b local-gentoo ${module_branch} || die
207 -
208 - # All config options to off
209 - sed "s:= y:=:g" -i config.mk || die
210 -
211 - set_config RDU BRANCH_MAX_127 SBILIST
212 -
213 - use debug && set_config DEBUG
214 - use fuse && set_config BR_FUSE POLL
215 - use hfs && set_config BR_HFSPLUS
216 - use inotify && set_config HNOTIFY HFSNOTIFY
217 - use nfs && set_config EXPORT
218 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
219 - use ramfs && set_config BR_RAMFS
220 -
221 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
222 -
223 - sed \
224 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
225 - -i Makefile || die
226 -
227 - eapply_user
228 -}
229 -
230 -src_compile() {
231 - local ARCH=x86
232 -
233 - emake \
234 - CC=$(tc-getCC) \
235 - LD=$(tc-getLD) \
236 - LDFLAGS="$(raw-ldflags)" \
237 - ARCH=$(tc-arch-kernel) \
238 - CONFIG_AUFS_FS=m \
239 - KDIR="${KV_OUT_DIR}"
240 -}
241 -
242 -src_install() {
243 - linux-mod_src_install
244 -
245 - use doc && dodoc -r Documentation
246 -
247 - use kernel-patch || \
248 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
249 -
250 - dodoc \
251 - Documentation/filesystems/aufs/README \
252 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
253 -
254 - readme.gentoo_create_doc
255 -}
256 -
257 -pkg_postinst() {
258 - readme.gentoo_print_elog
259 - linux-mod_pkg_postinst
260 -}
261
262 diff --git a/sys-fs/aufs4/aufs4-0_pre20160223.ebuild b/sys-fs/aufs4/aufs4-0_pre20160223.ebuild
263 deleted file mode 100644
264 index cb3b25bc99a..00000000000
265 --- a/sys-fs/aufs4/aufs4-0_pre20160223.ebuild
266 +++ /dev/null
267 @@ -1,184 +0,0 @@
268 -# Copyright 1999-2016 Gentoo Foundation
269 -# Distributed under the terms of the GNU General Public License v2
270 -
271 -EAPI=6
272 -
273 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
274 -
275 -AUFS_VERSION="${PV%%_p*}"
276 -# highest branch version
277 -PATCH_MAX_VER=4
278 -# highest supported version
279 -KERN_MAX_VER=5
280 -# lowest supported version
281 -KERN_MIN_VER=0
282 -
283 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
284 -HOMEPAGE="http://aufs.sourceforge.net/"
285 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
286 -
287 -LICENSE="GPL-2"
288 -SLOT="0"
289 -KEYWORDS="~amd64 ~x86"
290 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
291 -
292 -DEPEND="
293 - dev-util/patchutils
294 - dev-vcs/git"
295 -RDEPEND="
296 - sys-fs/aufs-util
297 - !sys-fs/aufs
298 - !sys-fs/aufs2
299 - !sys-fs/aufs3"
300 -
301 -S="${WORKDIR}"/${PN}-standalone
302 -
303 -MODULE_NAMES="aufs(misc:${S})"
304 -
305 -pkg_setup() {
306 - CONFIG_CHECK+=" !AUFS_FS"
307 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
308 - use nfs && CONFIG_CHECK+=" EXPORTFS"
309 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
310 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
311 - use pax_kernel && CONFIG_CHECK+=" PAX" \
312 - && ERROR_PAX="Please use hardened sources"
313 -
314 - # this is needed so merging a binpkg ${PN} is
315 - # possible w/out a kernel unpacked on the system
316 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
317 -
318 - get_version
319 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
320 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
321 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
322 -
323 - linux-mod_pkg_setup
324 -
325 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
326 - PATCH_BRANCH="x-rcN"
327 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
328 - PATCH_BRANCH="${KV_MINOR}".13+
329 - else
330 - PATCH_BRANCH="${KV_MINOR}"
331 - fi
332 -
333 - case ${KV_EXTRA} in
334 - "")
335 - elog "It seems you are using vanilla-sources with aufs4"
336 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
337 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
338 - ;;
339 - "-gentoo")
340 - elog "It seems you are using gentoo-sources with aufs4"
341 - elog "Please use sys-kernel/aufs-sources"
342 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
343 - ;;
344 - esac
345 -
346 - pushd "${T}" &> /dev/null || die
347 - unpack ${A}
348 -
349 - cd ${PN}-standalone || die
350 -
351 - local module_branch=origin/${PN}.${PATCH_BRANCH}
352 -
353 - einfo "Using ${module_branch} as patch source"
354 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
355 -
356 - combinediff \
357 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
358 - combinediff \
359 - "${T}"/combined-1.patch ${PN}-mmap.patch \
360 - > ${PN}-standalone-base-mmap-combined.patch
361 -
362 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
363 - if use kernel-patch; then
364 - cd ${KV_DIR}
365 - ewarn "Patching your kernel..."
366 - patch \
367 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
368 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
369 - > /dev/null
370 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
371 - ewarn "You need to compile your kernel with the applied patch"
372 - ewarn "to be able to load and use the aufs kernel module"
373 - else
374 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
375 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
376 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
377 - die "missing kernel patch, please apply it first"
378 - fi
379 - fi
380 -
381 - popd &> /dev/null
382 - export PKG_SETUP_HAS_BEEN_RAN=1
383 -}
384 -
385 -set_config() {
386 - for option in $*; do
387 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
388 - die "${option} is not a valid config option"
389 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
390 - done
391 -}
392 -
393 -src_prepare() {
394 - local module_branch=origin/${PN}.${PATCH_BRANCH}
395 -
396 - einfo "Using for module creation branch ${module_branch}"
397 - git checkout -q -b local-gentoo ${module_branch} || die
398 -
399 - # All config options to off
400 - sed "s:= y:=:g" -i config.mk || die
401 -
402 - set_config RDU BRANCH_MAX_127 SBILIST
403 -
404 - use debug && set_config DEBUG
405 - use fuse && set_config BR_FUSE POLL
406 - use hfs && set_config BR_HFSPLUS
407 - use inotify && set_config HNOTIFY HFSNOTIFY
408 - use nfs && set_config EXPORT
409 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
410 - use ramfs && set_config BR_RAMFS
411 -
412 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
413 -
414 - sed \
415 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
416 - -i Makefile || die
417 -
418 - eapply_user
419 -}
420 -
421 -src_compile() {
422 - local ARCH=x86
423 -
424 - emake \
425 - CC=$(tc-getCC) \
426 - LD=$(tc-getLD) \
427 - LDFLAGS="$(raw-ldflags)" \
428 - ARCH=$(tc-arch-kernel) \
429 - CONFIG_AUFS_FS=m \
430 - KDIR="${KV_OUT_DIR}"
431 -}
432 -
433 -src_install() {
434 - linux-mod_src_install
435 -
436 - use doc && dodoc -r Documentation
437 -
438 - use kernel-patch || \
439 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
440 -
441 - dodoc \
442 - Documentation/filesystems/aufs/README \
443 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
444 -
445 - readme.gentoo_create_doc
446 -}
447 -
448 -pkg_postinst() {
449 - readme.gentoo_print_elog
450 - linux-mod_pkg_postinst
451 -}
452
453 diff --git a/sys-fs/aufs4/aufs4-0_pre20160627.ebuild b/sys-fs/aufs4/aufs4-0_pre20160627.ebuild
454 deleted file mode 100644
455 index 2ce209aa745..00000000000
456 --- a/sys-fs/aufs4/aufs4-0_pre20160627.ebuild
457 +++ /dev/null
458 @@ -1,184 +0,0 @@
459 -# Copyright 1999-2016 Gentoo Foundation
460 -# Distributed under the terms of the GNU General Public License v2
461 -
462 -EAPI=6
463 -
464 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
465 -
466 -AUFS_VERSION="${PV%%_p*}"
467 -# highest branch version
468 -PATCH_MAX_VER=5
469 -# highest supported version
470 -KERN_MAX_VER=6
471 -# lowest supported version
472 -KERN_MIN_VER=0
473 -
474 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
475 -HOMEPAGE="http://aufs.sourceforge.net/"
476 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
477 -
478 -LICENSE="GPL-2"
479 -SLOT="0"
480 -KEYWORDS="~amd64 ~x86"
481 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
482 -
483 -DEPEND="
484 - dev-util/patchutils
485 - dev-vcs/git"
486 -RDEPEND="
487 - sys-fs/aufs-util
488 - !sys-fs/aufs
489 - !sys-fs/aufs2
490 - !sys-fs/aufs3"
491 -
492 -S="${WORKDIR}"/${PN}-standalone
493 -
494 -MODULE_NAMES="aufs(misc:${S})"
495 -
496 -pkg_setup() {
497 - CONFIG_CHECK+=" !AUFS_FS"
498 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
499 - use nfs && CONFIG_CHECK+=" EXPORTFS"
500 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
501 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
502 - use pax_kernel && CONFIG_CHECK+=" PAX" \
503 - && ERROR_PAX="Please use hardened sources"
504 -
505 - # this is needed so merging a binpkg ${PN} is
506 - # possible w/out a kernel unpacked on the system
507 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
508 -
509 - get_version
510 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
511 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
512 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
513 -
514 - linux-mod_pkg_setup
515 -
516 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
517 - PATCH_BRANCH="x-rcN"
518 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
519 - PATCH_BRANCH="${KV_MINOR}".13+
520 - else
521 - PATCH_BRANCH="${KV_MINOR}"
522 - fi
523 -
524 - case ${KV_EXTRA} in
525 - "")
526 - elog "It seems you are using vanilla-sources with aufs4"
527 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
528 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
529 - ;;
530 - "-gentoo")
531 - elog "It seems you are using gentoo-sources with aufs4"
532 - elog "Please use sys-kernel/aufs-sources"
533 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
534 - ;;
535 - esac
536 -
537 - pushd "${T}" &> /dev/null || die
538 - unpack ${A}
539 -
540 - cd ${PN}-standalone || die
541 -
542 - local module_branch=origin/${PN}.${PATCH_BRANCH}
543 -
544 - einfo "Using ${module_branch} as patch source"
545 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
546 -
547 - combinediff \
548 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
549 - combinediff \
550 - "${T}"/combined-1.patch ${PN}-mmap.patch \
551 - > ${PN}-standalone-base-mmap-combined.patch
552 -
553 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
554 - if use kernel-patch; then
555 - cd ${KV_DIR}
556 - ewarn "Patching your kernel..."
557 - patch \
558 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
559 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
560 - > /dev/null
561 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
562 - ewarn "You need to compile your kernel with the applied patch"
563 - ewarn "to be able to load and use the aufs kernel module"
564 - else
565 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
566 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
567 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
568 - die "missing kernel patch, please apply it first"
569 - fi
570 - fi
571 -
572 - popd &> /dev/null
573 - export PKG_SETUP_HAS_BEEN_RAN=1
574 -}
575 -
576 -set_config() {
577 - for option in $*; do
578 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
579 - die "${option} is not a valid config option"
580 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
581 - done
582 -}
583 -
584 -src_prepare() {
585 - local module_branch=origin/${PN}.${PATCH_BRANCH}
586 -
587 - einfo "Using for module creation branch ${module_branch}"
588 - git checkout -q -b local-gentoo ${module_branch} || die
589 -
590 - # All config options to off
591 - sed "s:= y:=:g" -i config.mk || die
592 -
593 - set_config RDU BRANCH_MAX_127 SBILIST
594 -
595 - use debug && set_config DEBUG
596 - use fuse && set_config BR_FUSE POLL
597 - use hfs && set_config BR_HFSPLUS
598 - use inotify && set_config HNOTIFY HFSNOTIFY
599 - use nfs && set_config EXPORT
600 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
601 - use ramfs && set_config BR_RAMFS
602 -
603 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
604 -
605 - sed \
606 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
607 - -i Makefile || die
608 -
609 - eapply_user
610 -}
611 -
612 -src_compile() {
613 - local ARCH=x86
614 -
615 - emake \
616 - CC=$(tc-getCC) \
617 - LD=$(tc-getLD) \
618 - LDFLAGS="$(raw-ldflags)" \
619 - ARCH=$(tc-arch-kernel) \
620 - CONFIG_AUFS_FS=m \
621 - KDIR="${KV_OUT_DIR}"
622 -}
623 -
624 -src_install() {
625 - linux-mod_src_install
626 -
627 - use doc && dodoc -r Documentation
628 -
629 - use kernel-patch || \
630 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
631 -
632 - dodoc \
633 - Documentation/filesystems/aufs/README \
634 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
635 -
636 - readme.gentoo_create_doc
637 -}
638 -
639 -pkg_postinst() {
640 - readme.gentoo_print_elog
641 - linux-mod_pkg_postinst
642 -}
643
644 diff --git a/sys-fs/aufs4/aufs4-0_pre20160815.ebuild b/sys-fs/aufs4/aufs4-0_pre20160815.ebuild
645 deleted file mode 100644
646 index 2ce209aa745..00000000000
647 --- a/sys-fs/aufs4/aufs4-0_pre20160815.ebuild
648 +++ /dev/null
649 @@ -1,184 +0,0 @@
650 -# Copyright 1999-2016 Gentoo Foundation
651 -# Distributed under the terms of the GNU General Public License v2
652 -
653 -EAPI=6
654 -
655 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
656 -
657 -AUFS_VERSION="${PV%%_p*}"
658 -# highest branch version
659 -PATCH_MAX_VER=5
660 -# highest supported version
661 -KERN_MAX_VER=6
662 -# lowest supported version
663 -KERN_MIN_VER=0
664 -
665 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
666 -HOMEPAGE="http://aufs.sourceforge.net/"
667 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
668 -
669 -LICENSE="GPL-2"
670 -SLOT="0"
671 -KEYWORDS="~amd64 ~x86"
672 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
673 -
674 -DEPEND="
675 - dev-util/patchutils
676 - dev-vcs/git"
677 -RDEPEND="
678 - sys-fs/aufs-util
679 - !sys-fs/aufs
680 - !sys-fs/aufs2
681 - !sys-fs/aufs3"
682 -
683 -S="${WORKDIR}"/${PN}-standalone
684 -
685 -MODULE_NAMES="aufs(misc:${S})"
686 -
687 -pkg_setup() {
688 - CONFIG_CHECK+=" !AUFS_FS"
689 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
690 - use nfs && CONFIG_CHECK+=" EXPORTFS"
691 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
692 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
693 - use pax_kernel && CONFIG_CHECK+=" PAX" \
694 - && ERROR_PAX="Please use hardened sources"
695 -
696 - # this is needed so merging a binpkg ${PN} is
697 - # possible w/out a kernel unpacked on the system
698 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
699 -
700 - get_version
701 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
702 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
703 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
704 -
705 - linux-mod_pkg_setup
706 -
707 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
708 - PATCH_BRANCH="x-rcN"
709 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
710 - PATCH_BRANCH="${KV_MINOR}".13+
711 - else
712 - PATCH_BRANCH="${KV_MINOR}"
713 - fi
714 -
715 - case ${KV_EXTRA} in
716 - "")
717 - elog "It seems you are using vanilla-sources with aufs4"
718 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
719 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
720 - ;;
721 - "-gentoo")
722 - elog "It seems you are using gentoo-sources with aufs4"
723 - elog "Please use sys-kernel/aufs-sources"
724 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
725 - ;;
726 - esac
727 -
728 - pushd "${T}" &> /dev/null || die
729 - unpack ${A}
730 -
731 - cd ${PN}-standalone || die
732 -
733 - local module_branch=origin/${PN}.${PATCH_BRANCH}
734 -
735 - einfo "Using ${module_branch} as patch source"
736 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
737 -
738 - combinediff \
739 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
740 - combinediff \
741 - "${T}"/combined-1.patch ${PN}-mmap.patch \
742 - > ${PN}-standalone-base-mmap-combined.patch
743 -
744 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
745 - if use kernel-patch; then
746 - cd ${KV_DIR}
747 - ewarn "Patching your kernel..."
748 - patch \
749 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
750 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
751 - > /dev/null
752 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
753 - ewarn "You need to compile your kernel with the applied patch"
754 - ewarn "to be able to load and use the aufs kernel module"
755 - else
756 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
757 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
758 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
759 - die "missing kernel patch, please apply it first"
760 - fi
761 - fi
762 -
763 - popd &> /dev/null
764 - export PKG_SETUP_HAS_BEEN_RAN=1
765 -}
766 -
767 -set_config() {
768 - for option in $*; do
769 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
770 - die "${option} is not a valid config option"
771 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
772 - done
773 -}
774 -
775 -src_prepare() {
776 - local module_branch=origin/${PN}.${PATCH_BRANCH}
777 -
778 - einfo "Using for module creation branch ${module_branch}"
779 - git checkout -q -b local-gentoo ${module_branch} || die
780 -
781 - # All config options to off
782 - sed "s:= y:=:g" -i config.mk || die
783 -
784 - set_config RDU BRANCH_MAX_127 SBILIST
785 -
786 - use debug && set_config DEBUG
787 - use fuse && set_config BR_FUSE POLL
788 - use hfs && set_config BR_HFSPLUS
789 - use inotify && set_config HNOTIFY HFSNOTIFY
790 - use nfs && set_config EXPORT
791 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
792 - use ramfs && set_config BR_RAMFS
793 -
794 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
795 -
796 - sed \
797 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
798 - -i Makefile || die
799 -
800 - eapply_user
801 -}
802 -
803 -src_compile() {
804 - local ARCH=x86
805 -
806 - emake \
807 - CC=$(tc-getCC) \
808 - LD=$(tc-getLD) \
809 - LDFLAGS="$(raw-ldflags)" \
810 - ARCH=$(tc-arch-kernel) \
811 - CONFIG_AUFS_FS=m \
812 - KDIR="${KV_OUT_DIR}"
813 -}
814 -
815 -src_install() {
816 - linux-mod_src_install
817 -
818 - use doc && dodoc -r Documentation
819 -
820 - use kernel-patch || \
821 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
822 -
823 - dodoc \
824 - Documentation/filesystems/aufs/README \
825 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
826 -
827 - readme.gentoo_create_doc
828 -}
829 -
830 -pkg_postinst() {
831 - readme.gentoo_print_elog
832 - linux-mod_pkg_postinst
833 -}
834
835 diff --git a/sys-fs/aufs4/aufs4-0_pre20161010.ebuild b/sys-fs/aufs4/aufs4-0_pre20161010.ebuild
836 deleted file mode 100644
837 index 74da974872f..00000000000
838 --- a/sys-fs/aufs4/aufs4-0_pre20161010.ebuild
839 +++ /dev/null
840 @@ -1,184 +0,0 @@
841 -# Copyright 1999-2016 Gentoo Foundation
842 -# Distributed under the terms of the GNU General Public License v2
843 -
844 -EAPI=6
845 -
846 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
847 -
848 -AUFS_VERSION="${PV%%_p*}"
849 -# highest branch version
850 -PATCH_MAX_VER=8
851 -# highest supported version
852 -KERN_MAX_VER=9
853 -# lowest supported version
854 -KERN_MIN_VER=0
855 -
856 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
857 -HOMEPAGE="http://aufs.sourceforge.net/"
858 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
859 -
860 -LICENSE="GPL-2"
861 -SLOT="0"
862 -KEYWORDS="~amd64 ~x86"
863 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
864 -
865 -DEPEND="
866 - dev-util/patchutils
867 - dev-vcs/git"
868 -RDEPEND="
869 - sys-fs/aufs-util
870 - !sys-fs/aufs
871 - !sys-fs/aufs2
872 - !sys-fs/aufs3"
873 -
874 -S="${WORKDIR}"/${PN}-standalone
875 -
876 -MODULE_NAMES="aufs(misc:${S})"
877 -
878 -pkg_setup() {
879 - CONFIG_CHECK+=" !AUFS_FS"
880 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
881 - use nfs && CONFIG_CHECK+=" EXPORTFS"
882 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
883 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
884 - use pax_kernel && CONFIG_CHECK+=" PAX" \
885 - && ERROR_PAX="Please use hardened sources"
886 -
887 - # this is needed so merging a binpkg ${PN} is
888 - # possible w/out a kernel unpacked on the system
889 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
890 -
891 - get_version
892 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
893 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
894 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
895 -
896 - linux-mod_pkg_setup
897 -
898 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
899 - PATCH_BRANCH="x-rcN"
900 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
901 - PATCH_BRANCH="${KV_MINOR}".13+
902 - else
903 - PATCH_BRANCH="${KV_MINOR}"
904 - fi
905 -
906 - case ${KV_EXTRA} in
907 - "")
908 - elog "It seems you are using vanilla-sources with aufs4"
909 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
910 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
911 - ;;
912 - "-gentoo")
913 - elog "It seems you are using gentoo-sources with aufs4"
914 - elog "Please use sys-kernel/aufs-sources"
915 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
916 - ;;
917 - esac
918 -
919 - pushd "${T}" &> /dev/null || die
920 - unpack ${A}
921 -
922 - cd ${PN}-standalone || die
923 -
924 - local module_branch=origin/${PN}.${PATCH_BRANCH}
925 -
926 - einfo "Using ${module_branch} as patch source"
927 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
928 -
929 - combinediff \
930 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
931 - combinediff \
932 - "${T}"/combined-1.patch ${PN}-mmap.patch \
933 - > ${PN}-standalone-base-mmap-combined.patch
934 -
935 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
936 - if use kernel-patch; then
937 - cd ${KV_DIR}
938 - ewarn "Patching your kernel..."
939 - patch \
940 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
941 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
942 - > /dev/null
943 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
944 - ewarn "You need to compile your kernel with the applied patch"
945 - ewarn "to be able to load and use the aufs kernel module"
946 - else
947 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
948 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
949 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
950 - die "missing kernel patch, please apply it first"
951 - fi
952 - fi
953 -
954 - popd &> /dev/null
955 - export PKG_SETUP_HAS_BEEN_RAN=1
956 -}
957 -
958 -set_config() {
959 - for option in $*; do
960 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
961 - die "${option} is not a valid config option"
962 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
963 - done
964 -}
965 -
966 -src_prepare() {
967 - local module_branch=origin/${PN}.${PATCH_BRANCH}
968 -
969 - einfo "Using for module creation branch ${module_branch}"
970 - git checkout -q -b local-gentoo ${module_branch} || die
971 -
972 - # All config options to off
973 - sed "s:= y:=:g" -i config.mk || die
974 -
975 - set_config RDU BRANCH_MAX_127 SBILIST
976 -
977 - use debug && set_config DEBUG
978 - use fuse && set_config BR_FUSE POLL
979 - use hfs && set_config BR_HFSPLUS
980 - use inotify && set_config HNOTIFY HFSNOTIFY
981 - use nfs && set_config EXPORT
982 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
983 - use ramfs && set_config BR_RAMFS
984 -
985 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
986 -
987 - sed \
988 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
989 - -i Makefile || die
990 -
991 - eapply_user
992 -}
993 -
994 -src_compile() {
995 - local ARCH=x86
996 -
997 - emake \
998 - CC=$(tc-getCC) \
999 - LD=$(tc-getLD) \
1000 - LDFLAGS="$(raw-ldflags)" \
1001 - ARCH=$(tc-arch-kernel) \
1002 - CONFIG_AUFS_FS=m \
1003 - KDIR="${KV_OUT_DIR}"
1004 -}
1005 -
1006 -src_install() {
1007 - linux-mod_src_install
1008 -
1009 - use doc && dodoc -r Documentation
1010 -
1011 - use kernel-patch || \
1012 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1013 -
1014 - dodoc \
1015 - Documentation/filesystems/aufs/README \
1016 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
1017 -
1018 - readme.gentoo_create_doc
1019 -}
1020 -
1021 -pkg_postinst() {
1022 - readme.gentoo_print_elog
1023 - linux-mod_pkg_postinst
1024 -}
1025
1026 diff --git a/sys-fs/aufs4/aufs4-0_pre20161219.ebuild b/sys-fs/aufs4/aufs4-0_pre20161219.ebuild
1027 deleted file mode 100644
1028 index 74da974872f..00000000000
1029 --- a/sys-fs/aufs4/aufs4-0_pre20161219.ebuild
1030 +++ /dev/null
1031 @@ -1,184 +0,0 @@
1032 -# Copyright 1999-2016 Gentoo Foundation
1033 -# Distributed under the terms of the GNU General Public License v2
1034 -
1035 -EAPI=6
1036 -
1037 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
1038 -
1039 -AUFS_VERSION="${PV%%_p*}"
1040 -# highest branch version
1041 -PATCH_MAX_VER=8
1042 -# highest supported version
1043 -KERN_MAX_VER=9
1044 -# lowest supported version
1045 -KERN_MIN_VER=0
1046 -
1047 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
1048 -HOMEPAGE="http://aufs.sourceforge.net/"
1049 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
1050 -
1051 -LICENSE="GPL-2"
1052 -SLOT="0"
1053 -KEYWORDS="~amd64 ~x86"
1054 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
1055 -
1056 -DEPEND="
1057 - dev-util/patchutils
1058 - dev-vcs/git"
1059 -RDEPEND="
1060 - sys-fs/aufs-util
1061 - !sys-fs/aufs
1062 - !sys-fs/aufs2
1063 - !sys-fs/aufs3"
1064 -
1065 -S="${WORKDIR}"/${PN}-standalone
1066 -
1067 -MODULE_NAMES="aufs(misc:${S})"
1068 -
1069 -pkg_setup() {
1070 - CONFIG_CHECK+=" !AUFS_FS"
1071 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
1072 - use nfs && CONFIG_CHECK+=" EXPORTFS"
1073 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
1074 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
1075 - use pax_kernel && CONFIG_CHECK+=" PAX" \
1076 - && ERROR_PAX="Please use hardened sources"
1077 -
1078 - # this is needed so merging a binpkg ${PN} is
1079 - # possible w/out a kernel unpacked on the system
1080 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
1081 -
1082 - get_version
1083 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
1084 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
1085 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
1086 -
1087 - linux-mod_pkg_setup
1088 -
1089 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
1090 - PATCH_BRANCH="x-rcN"
1091 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
1092 - PATCH_BRANCH="${KV_MINOR}".13+
1093 - else
1094 - PATCH_BRANCH="${KV_MINOR}"
1095 - fi
1096 -
1097 - case ${KV_EXTRA} in
1098 - "")
1099 - elog "It seems you are using vanilla-sources with aufs4"
1100 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
1101 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1102 - ;;
1103 - "-gentoo")
1104 - elog "It seems you are using gentoo-sources with aufs4"
1105 - elog "Please use sys-kernel/aufs-sources"
1106 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1107 - ;;
1108 - esac
1109 -
1110 - pushd "${T}" &> /dev/null || die
1111 - unpack ${A}
1112 -
1113 - cd ${PN}-standalone || die
1114 -
1115 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1116 -
1117 - einfo "Using ${module_branch} as patch source"
1118 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
1119 -
1120 - combinediff \
1121 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
1122 - combinediff \
1123 - "${T}"/combined-1.patch ${PN}-mmap.patch \
1124 - > ${PN}-standalone-base-mmap-combined.patch
1125 -
1126 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
1127 - if use kernel-patch; then
1128 - cd ${KV_DIR}
1129 - ewarn "Patching your kernel..."
1130 - patch \
1131 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
1132 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
1133 - > /dev/null
1134 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1135 - ewarn "You need to compile your kernel with the applied patch"
1136 - ewarn "to be able to load and use the aufs kernel module"
1137 - else
1138 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
1139 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
1140 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
1141 - die "missing kernel patch, please apply it first"
1142 - fi
1143 - fi
1144 -
1145 - popd &> /dev/null
1146 - export PKG_SETUP_HAS_BEEN_RAN=1
1147 -}
1148 -
1149 -set_config() {
1150 - for option in $*; do
1151 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
1152 - die "${option} is not a valid config option"
1153 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
1154 - done
1155 -}
1156 -
1157 -src_prepare() {
1158 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1159 -
1160 - einfo "Using for module creation branch ${module_branch}"
1161 - git checkout -q -b local-gentoo ${module_branch} || die
1162 -
1163 - # All config options to off
1164 - sed "s:= y:=:g" -i config.mk || die
1165 -
1166 - set_config RDU BRANCH_MAX_127 SBILIST
1167 -
1168 - use debug && set_config DEBUG
1169 - use fuse && set_config BR_FUSE POLL
1170 - use hfs && set_config BR_HFSPLUS
1171 - use inotify && set_config HNOTIFY HFSNOTIFY
1172 - use nfs && set_config EXPORT
1173 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
1174 - use ramfs && set_config BR_RAMFS
1175 -
1176 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
1177 -
1178 - sed \
1179 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
1180 - -i Makefile || die
1181 -
1182 - eapply_user
1183 -}
1184 -
1185 -src_compile() {
1186 - local ARCH=x86
1187 -
1188 - emake \
1189 - CC=$(tc-getCC) \
1190 - LD=$(tc-getLD) \
1191 - LDFLAGS="$(raw-ldflags)" \
1192 - ARCH=$(tc-arch-kernel) \
1193 - CONFIG_AUFS_FS=m \
1194 - KDIR="${KV_OUT_DIR}"
1195 -}
1196 -
1197 -src_install() {
1198 - linux-mod_src_install
1199 -
1200 - use doc && dodoc -r Documentation
1201 -
1202 - use kernel-patch || \
1203 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1204 -
1205 - dodoc \
1206 - Documentation/filesystems/aufs/README \
1207 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
1208 -
1209 - readme.gentoo_create_doc
1210 -}
1211 -
1212 -pkg_postinst() {
1213 - readme.gentoo_print_elog
1214 - linux-mod_pkg_postinst
1215 -}
1216
1217 diff --git a/sys-fs/aufs4/aufs4-0_pre20170130.ebuild b/sys-fs/aufs4/aufs4-0_pre20170130.ebuild
1218 deleted file mode 100644
1219 index ff94ecb3cd1..00000000000
1220 --- a/sys-fs/aufs4/aufs4-0_pre20170130.ebuild
1221 +++ /dev/null
1222 @@ -1,184 +0,0 @@
1223 -# Copyright 1999-2017 Gentoo Foundation
1224 -# Distributed under the terms of the GNU General Public License v2
1225 -
1226 -EAPI=6
1227 -
1228 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
1229 -
1230 -AUFS_VERSION="${PV%%_p*}"
1231 -# highest branch version
1232 -PATCH_MAX_VER=9
1233 -# highest supported version
1234 -KERN_MAX_VER=10
1235 -# lowest supported version
1236 -KERN_MIN_VER=0
1237 -
1238 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
1239 -HOMEPAGE="http://aufs.sourceforge.net/"
1240 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
1241 -
1242 -LICENSE="GPL-2"
1243 -SLOT="0"
1244 -KEYWORDS="~amd64 ~x86"
1245 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
1246 -
1247 -DEPEND="
1248 - dev-util/patchutils
1249 - dev-vcs/git"
1250 -RDEPEND="
1251 - sys-fs/aufs-util
1252 - !sys-fs/aufs
1253 - !sys-fs/aufs2
1254 - !sys-fs/aufs3"
1255 -
1256 -S="${WORKDIR}"/${PN}-standalone
1257 -
1258 -MODULE_NAMES="aufs(misc:${S})"
1259 -
1260 -pkg_setup() {
1261 - CONFIG_CHECK+=" !AUFS_FS"
1262 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
1263 - use nfs && CONFIG_CHECK+=" EXPORTFS"
1264 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
1265 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
1266 - use pax_kernel && CONFIG_CHECK+=" PAX" \
1267 - && ERROR_PAX="Please use hardened sources"
1268 -
1269 - # this is needed so merging a binpkg ${PN} is
1270 - # possible w/out a kernel unpacked on the system
1271 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
1272 -
1273 - get_version
1274 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
1275 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
1276 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
1277 -
1278 - linux-mod_pkg_setup
1279 -
1280 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
1281 - PATCH_BRANCH="x-rcN"
1282 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
1283 - PATCH_BRANCH="${KV_MINOR}".13+
1284 - else
1285 - PATCH_BRANCH="${KV_MINOR}"
1286 - fi
1287 -
1288 - case ${KV_EXTRA} in
1289 - "")
1290 - elog "It seems you are using vanilla-sources with aufs4"
1291 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
1292 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1293 - ;;
1294 - "-gentoo")
1295 - elog "It seems you are using gentoo-sources with aufs4"
1296 - elog "Please use sys-kernel/aufs-sources"
1297 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1298 - ;;
1299 - esac
1300 -
1301 - pushd "${T}" &> /dev/null || die
1302 - unpack ${A}
1303 -
1304 - cd ${PN}-standalone || die
1305 -
1306 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1307 -
1308 - einfo "Using ${module_branch} as patch source"
1309 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
1310 -
1311 - combinediff \
1312 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
1313 - combinediff \
1314 - "${T}"/combined-1.patch ${PN}-mmap.patch \
1315 - > ${PN}-standalone-base-mmap-combined.patch
1316 -
1317 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
1318 - if use kernel-patch; then
1319 - cd ${KV_DIR}
1320 - ewarn "Patching your kernel..."
1321 - patch \
1322 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
1323 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
1324 - > /dev/null
1325 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1326 - ewarn "You need to compile your kernel with the applied patch"
1327 - ewarn "to be able to load and use the aufs kernel module"
1328 - else
1329 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
1330 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
1331 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
1332 - die "missing kernel patch, please apply it first"
1333 - fi
1334 - fi
1335 -
1336 - popd &> /dev/null
1337 - export PKG_SETUP_HAS_BEEN_RAN=1
1338 -}
1339 -
1340 -set_config() {
1341 - for option in $*; do
1342 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
1343 - die "${option} is not a valid config option"
1344 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
1345 - done
1346 -}
1347 -
1348 -src_prepare() {
1349 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1350 -
1351 - einfo "Using for module creation branch ${module_branch}"
1352 - git checkout -q -b local-gentoo ${module_branch} || die
1353 -
1354 - # All config options to off
1355 - sed "s:= y:=:g" -i config.mk || die
1356 -
1357 - set_config RDU BRANCH_MAX_127 SBILIST
1358 -
1359 - use debug && set_config DEBUG
1360 - use fuse && set_config BR_FUSE POLL
1361 - use hfs && set_config BR_HFSPLUS
1362 - use inotify && set_config HNOTIFY HFSNOTIFY
1363 - use nfs && set_config EXPORT
1364 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
1365 - use ramfs && set_config BR_RAMFS
1366 -
1367 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
1368 -
1369 - sed \
1370 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
1371 - -i Makefile || die
1372 -
1373 - eapply_user
1374 -}
1375 -
1376 -src_compile() {
1377 - local ARCH=x86
1378 -
1379 - emake \
1380 - CC=$(tc-getCC) \
1381 - LD=$(tc-getLD) \
1382 - LDFLAGS="$(raw-ldflags)" \
1383 - ARCH=$(tc-arch-kernel) \
1384 - CONFIG_AUFS_FS=m \
1385 - KDIR="${KV_OUT_DIR}"
1386 -}
1387 -
1388 -src_install() {
1389 - linux-mod_src_install
1390 -
1391 - use doc && dodoc -r Documentation
1392 -
1393 - use kernel-patch || \
1394 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1395 -
1396 - dodoc \
1397 - Documentation/filesystems/aufs/README \
1398 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
1399 -
1400 - readme.gentoo_create_doc
1401 -}
1402 -
1403 -pkg_postinst() {
1404 - readme.gentoo_print_elog
1405 - linux-mod_pkg_postinst
1406 -}
1407
1408 diff --git a/sys-fs/aufs4/aufs4-0_pre20170220.ebuild b/sys-fs/aufs4/aufs4-0_pre20170220.ebuild
1409 deleted file mode 100644
1410 index ff94ecb3cd1..00000000000
1411 --- a/sys-fs/aufs4/aufs4-0_pre20170220.ebuild
1412 +++ /dev/null
1413 @@ -1,184 +0,0 @@
1414 -# Copyright 1999-2017 Gentoo Foundation
1415 -# Distributed under the terms of the GNU General Public License v2
1416 -
1417 -EAPI=6
1418 -
1419 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
1420 -
1421 -AUFS_VERSION="${PV%%_p*}"
1422 -# highest branch version
1423 -PATCH_MAX_VER=9
1424 -# highest supported version
1425 -KERN_MAX_VER=10
1426 -# lowest supported version
1427 -KERN_MIN_VER=0
1428 -
1429 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
1430 -HOMEPAGE="http://aufs.sourceforge.net/"
1431 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
1432 -
1433 -LICENSE="GPL-2"
1434 -SLOT="0"
1435 -KEYWORDS="~amd64 ~x86"
1436 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
1437 -
1438 -DEPEND="
1439 - dev-util/patchutils
1440 - dev-vcs/git"
1441 -RDEPEND="
1442 - sys-fs/aufs-util
1443 - !sys-fs/aufs
1444 - !sys-fs/aufs2
1445 - !sys-fs/aufs3"
1446 -
1447 -S="${WORKDIR}"/${PN}-standalone
1448 -
1449 -MODULE_NAMES="aufs(misc:${S})"
1450 -
1451 -pkg_setup() {
1452 - CONFIG_CHECK+=" !AUFS_FS"
1453 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
1454 - use nfs && CONFIG_CHECK+=" EXPORTFS"
1455 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
1456 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
1457 - use pax_kernel && CONFIG_CHECK+=" PAX" \
1458 - && ERROR_PAX="Please use hardened sources"
1459 -
1460 - # this is needed so merging a binpkg ${PN} is
1461 - # possible w/out a kernel unpacked on the system
1462 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
1463 -
1464 - get_version
1465 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
1466 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
1467 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
1468 -
1469 - linux-mod_pkg_setup
1470 -
1471 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
1472 - PATCH_BRANCH="x-rcN"
1473 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
1474 - PATCH_BRANCH="${KV_MINOR}".13+
1475 - else
1476 - PATCH_BRANCH="${KV_MINOR}"
1477 - fi
1478 -
1479 - case ${KV_EXTRA} in
1480 - "")
1481 - elog "It seems you are using vanilla-sources with aufs4"
1482 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
1483 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1484 - ;;
1485 - "-gentoo")
1486 - elog "It seems you are using gentoo-sources with aufs4"
1487 - elog "Please use sys-kernel/aufs-sources"
1488 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1489 - ;;
1490 - esac
1491 -
1492 - pushd "${T}" &> /dev/null || die
1493 - unpack ${A}
1494 -
1495 - cd ${PN}-standalone || die
1496 -
1497 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1498 -
1499 - einfo "Using ${module_branch} as patch source"
1500 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
1501 -
1502 - combinediff \
1503 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
1504 - combinediff \
1505 - "${T}"/combined-1.patch ${PN}-mmap.patch \
1506 - > ${PN}-standalone-base-mmap-combined.patch
1507 -
1508 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
1509 - if use kernel-patch; then
1510 - cd ${KV_DIR}
1511 - ewarn "Patching your kernel..."
1512 - patch \
1513 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
1514 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
1515 - > /dev/null
1516 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1517 - ewarn "You need to compile your kernel with the applied patch"
1518 - ewarn "to be able to load and use the aufs kernel module"
1519 - else
1520 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
1521 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
1522 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
1523 - die "missing kernel patch, please apply it first"
1524 - fi
1525 - fi
1526 -
1527 - popd &> /dev/null
1528 - export PKG_SETUP_HAS_BEEN_RAN=1
1529 -}
1530 -
1531 -set_config() {
1532 - for option in $*; do
1533 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
1534 - die "${option} is not a valid config option"
1535 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
1536 - done
1537 -}
1538 -
1539 -src_prepare() {
1540 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1541 -
1542 - einfo "Using for module creation branch ${module_branch}"
1543 - git checkout -q -b local-gentoo ${module_branch} || die
1544 -
1545 - # All config options to off
1546 - sed "s:= y:=:g" -i config.mk || die
1547 -
1548 - set_config RDU BRANCH_MAX_127 SBILIST
1549 -
1550 - use debug && set_config DEBUG
1551 - use fuse && set_config BR_FUSE POLL
1552 - use hfs && set_config BR_HFSPLUS
1553 - use inotify && set_config HNOTIFY HFSNOTIFY
1554 - use nfs && set_config EXPORT
1555 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
1556 - use ramfs && set_config BR_RAMFS
1557 -
1558 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
1559 -
1560 - sed \
1561 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
1562 - -i Makefile || die
1563 -
1564 - eapply_user
1565 -}
1566 -
1567 -src_compile() {
1568 - local ARCH=x86
1569 -
1570 - emake \
1571 - CC=$(tc-getCC) \
1572 - LD=$(tc-getLD) \
1573 - LDFLAGS="$(raw-ldflags)" \
1574 - ARCH=$(tc-arch-kernel) \
1575 - CONFIG_AUFS_FS=m \
1576 - KDIR="${KV_OUT_DIR}"
1577 -}
1578 -
1579 -src_install() {
1580 - linux-mod_src_install
1581 -
1582 - use doc && dodoc -r Documentation
1583 -
1584 - use kernel-patch || \
1585 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1586 -
1587 - dodoc \
1588 - Documentation/filesystems/aufs/README \
1589 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
1590 -
1591 - readme.gentoo_create_doc
1592 -}
1593 -
1594 -pkg_postinst() {
1595 - readme.gentoo_print_elog
1596 - linux-mod_pkg_postinst
1597 -}
1598
1599 diff --git a/sys-fs/aufs4/aufs4-0_pre20170313.ebuild b/sys-fs/aufs4/aufs4-0_pre20170313.ebuild
1600 deleted file mode 100644
1601 index 0be383f2e12..00000000000
1602 --- a/sys-fs/aufs4/aufs4-0_pre20170313.ebuild
1603 +++ /dev/null
1604 @@ -1,184 +0,0 @@
1605 -# Copyright 1999-2017 Gentoo Foundation
1606 -# Distributed under the terms of the GNU General Public License v2
1607 -
1608 -EAPI=6
1609 -
1610 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
1611 -
1612 -AUFS_VERSION="${PV%%_p*}"
1613 -# highest branch version
1614 -PATCH_MAX_VER=9
1615 -# highest supported version
1616 -KERN_MAX_VER=11
1617 -# lowest supported version
1618 -KERN_MIN_VER=0
1619 -
1620 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
1621 -HOMEPAGE="http://aufs.sourceforge.net/"
1622 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
1623 -
1624 -LICENSE="GPL-2"
1625 -SLOT="0"
1626 -KEYWORDS="~amd64 ~x86"
1627 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
1628 -
1629 -DEPEND="
1630 - dev-util/patchutils
1631 - dev-vcs/git"
1632 -RDEPEND="
1633 - sys-fs/aufs-util
1634 - !sys-fs/aufs
1635 - !sys-fs/aufs2
1636 - !sys-fs/aufs3"
1637 -
1638 -S="${WORKDIR}"/${PN}-standalone
1639 -
1640 -MODULE_NAMES="aufs(misc:${S})"
1641 -
1642 -pkg_setup() {
1643 - CONFIG_CHECK+=" !AUFS_FS"
1644 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
1645 - use nfs && CONFIG_CHECK+=" EXPORTFS"
1646 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
1647 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
1648 - use pax_kernel && CONFIG_CHECK+=" PAX" \
1649 - && ERROR_PAX="Please use hardened sources"
1650 -
1651 - # this is needed so merging a binpkg ${PN} is
1652 - # possible w/out a kernel unpacked on the system
1653 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
1654 -
1655 - get_version
1656 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
1657 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
1658 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
1659 -
1660 - linux-mod_pkg_setup
1661 -
1662 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
1663 - PATCH_BRANCH="x-rcN"
1664 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
1665 - PATCH_BRANCH="${KV_MINOR}".13+
1666 - else
1667 - PATCH_BRANCH="${KV_MINOR}"
1668 - fi
1669 -
1670 - case ${KV_EXTRA} in
1671 - "")
1672 - elog "It seems you are using vanilla-sources with aufs4"
1673 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
1674 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1675 - ;;
1676 - "-gentoo")
1677 - elog "It seems you are using gentoo-sources with aufs4"
1678 - elog "Please use sys-kernel/aufs-sources"
1679 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1680 - ;;
1681 - esac
1682 -
1683 - pushd "${T}" &> /dev/null || die
1684 - unpack ${A}
1685 -
1686 - cd ${PN}-standalone || die
1687 -
1688 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1689 -
1690 - einfo "Using ${module_branch} as patch source"
1691 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
1692 -
1693 - combinediff \
1694 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
1695 - combinediff \
1696 - "${T}"/combined-1.patch ${PN}-mmap.patch \
1697 - > ${PN}-standalone-base-mmap-combined.patch
1698 -
1699 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
1700 - if use kernel-patch; then
1701 - cd ${KV_DIR}
1702 - ewarn "Patching your kernel..."
1703 - patch \
1704 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
1705 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
1706 - > /dev/null
1707 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1708 - ewarn "You need to compile your kernel with the applied patch"
1709 - ewarn "to be able to load and use the aufs kernel module"
1710 - else
1711 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
1712 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
1713 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
1714 - die "missing kernel patch, please apply it first"
1715 - fi
1716 - fi
1717 -
1718 - popd &> /dev/null
1719 - export PKG_SETUP_HAS_BEEN_RAN=1
1720 -}
1721 -
1722 -set_config() {
1723 - for option in $*; do
1724 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
1725 - die "${option} is not a valid config option"
1726 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
1727 - done
1728 -}
1729 -
1730 -src_prepare() {
1731 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1732 -
1733 - einfo "Using for module creation branch ${module_branch}"
1734 - git checkout -q -b local-gentoo ${module_branch} || die
1735 -
1736 - # All config options to off
1737 - sed "s:= y:=:g" -i config.mk || die
1738 -
1739 - set_config RDU BRANCH_MAX_127 SBILIST
1740 -
1741 - use debug && set_config DEBUG
1742 - use fuse && set_config BR_FUSE POLL
1743 - use hfs && set_config BR_HFSPLUS
1744 - use inotify && set_config HNOTIFY HFSNOTIFY
1745 - use nfs && set_config EXPORT
1746 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
1747 - use ramfs && set_config BR_RAMFS
1748 -
1749 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
1750 -
1751 - sed \
1752 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
1753 - -i Makefile || die
1754 -
1755 - eapply_user
1756 -}
1757 -
1758 -src_compile() {
1759 - local ARCH=x86
1760 -
1761 - emake \
1762 - CC=$(tc-getCC) \
1763 - LD=$(tc-getLD) \
1764 - LDFLAGS="$(raw-ldflags)" \
1765 - ARCH=$(tc-arch-kernel) \
1766 - CONFIG_AUFS_FS=m \
1767 - KDIR="${KV_OUT_DIR}"
1768 -}
1769 -
1770 -src_install() {
1771 - linux-mod_src_install
1772 -
1773 - use doc && dodoc -r Documentation
1774 -
1775 - use kernel-patch || \
1776 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1777 -
1778 - dodoc \
1779 - Documentation/filesystems/aufs/README \
1780 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
1781 -
1782 - readme.gentoo_create_doc
1783 -}
1784 -
1785 -pkg_postinst() {
1786 - readme.gentoo_print_elog
1787 - linux-mod_pkg_postinst
1788 -}
1789
1790 diff --git a/sys-fs/aufs4/aufs4-0_pre20170612.ebuild b/sys-fs/aufs4/aufs4-0_pre20170612.ebuild
1791 deleted file mode 100644
1792 index 551496bccb0..00000000000
1793 --- a/sys-fs/aufs4/aufs4-0_pre20170612.ebuild
1794 +++ /dev/null
1795 @@ -1,184 +0,0 @@
1796 -# Copyright 1999-2017 Gentoo Foundation
1797 -# Distributed under the terms of the GNU General Public License v2
1798 -
1799 -EAPI=6
1800 -
1801 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
1802 -
1803 -AUFS_VERSION="${PV%%_p*}"
1804 -# highest branch version
1805 -PATCH_MAX_VER=10
1806 -# highest supported version
1807 -KERN_MAX_VER=11
1808 -# lowest supported version
1809 -KERN_MIN_VER=0
1810 -
1811 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
1812 -HOMEPAGE="http://aufs.sourceforge.net/"
1813 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
1814 -
1815 -LICENSE="GPL-2"
1816 -SLOT="0"
1817 -KEYWORDS="~amd64 ~x86"
1818 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
1819 -
1820 -DEPEND="
1821 - dev-util/patchutils
1822 - dev-vcs/git"
1823 -RDEPEND="
1824 - sys-fs/aufs-util
1825 - !sys-fs/aufs
1826 - !sys-fs/aufs2
1827 - !sys-fs/aufs3"
1828 -
1829 -S="${WORKDIR}"/${PN}-standalone
1830 -
1831 -MODULE_NAMES="aufs(misc:${S})"
1832 -
1833 -pkg_setup() {
1834 - CONFIG_CHECK+=" !AUFS_FS"
1835 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
1836 - use nfs && CONFIG_CHECK+=" EXPORTFS"
1837 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
1838 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
1839 - use pax_kernel && CONFIG_CHECK+=" PAX" \
1840 - && ERROR_PAX="Please use hardened sources"
1841 -
1842 - # this is needed so merging a binpkg ${PN} is
1843 - # possible w/out a kernel unpacked on the system
1844 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
1845 -
1846 - get_version
1847 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
1848 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
1849 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
1850 -
1851 - linux-mod_pkg_setup
1852 -
1853 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
1854 - PATCH_BRANCH="x-rcN"
1855 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
1856 - PATCH_BRANCH="${KV_MINOR}".13+
1857 - else
1858 - PATCH_BRANCH="${KV_MINOR}"
1859 - fi
1860 -
1861 - case ${KV_EXTRA} in
1862 - "")
1863 - elog "It seems you are using vanilla-sources with aufs4"
1864 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
1865 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1866 - ;;
1867 - "-gentoo")
1868 - elog "It seems you are using gentoo-sources with aufs4"
1869 - elog "Please use sys-kernel/aufs-sources"
1870 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
1871 - ;;
1872 - esac
1873 -
1874 - pushd "${T}" &> /dev/null || die
1875 - unpack ${A}
1876 -
1877 - cd ${PN}-standalone || die
1878 -
1879 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1880 -
1881 - einfo "Using ${module_branch} as patch source"
1882 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
1883 -
1884 - combinediff \
1885 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
1886 - combinediff \
1887 - "${T}"/combined-1.patch ${PN}-mmap.patch \
1888 - > ${PN}-standalone-base-mmap-combined.patch
1889 -
1890 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
1891 - if use kernel-patch; then
1892 - cd ${KV_DIR}
1893 - ewarn "Patching your kernel..."
1894 - patch \
1895 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
1896 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
1897 - > /dev/null
1898 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1899 - ewarn "You need to compile your kernel with the applied patch"
1900 - ewarn "to be able to load and use the aufs kernel module"
1901 - else
1902 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
1903 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
1904 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
1905 - die "missing kernel patch, please apply it first"
1906 - fi
1907 - fi
1908 -
1909 - popd &> /dev/null
1910 - export PKG_SETUP_HAS_BEEN_RAN=1
1911 -}
1912 -
1913 -set_config() {
1914 - for option in $*; do
1915 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
1916 - die "${option} is not a valid config option"
1917 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
1918 - done
1919 -}
1920 -
1921 -src_prepare() {
1922 - local module_branch=origin/${PN}.${PATCH_BRANCH}
1923 -
1924 - einfo "Using for module creation branch ${module_branch}"
1925 - git checkout -q -b local-gentoo ${module_branch} || die
1926 -
1927 - # All config options to off
1928 - sed "s:= y:=:g" -i config.mk || die
1929 -
1930 - set_config RDU BRANCH_MAX_127 SBILIST
1931 -
1932 - use debug && set_config DEBUG
1933 - use fuse && set_config BR_FUSE POLL
1934 - use hfs && set_config BR_HFSPLUS
1935 - use inotify && set_config HNOTIFY HFSNOTIFY
1936 - use nfs && set_config EXPORT
1937 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
1938 - use ramfs && set_config BR_RAMFS
1939 -
1940 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
1941 -
1942 - sed \
1943 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
1944 - -i Makefile || die
1945 -
1946 - eapply_user
1947 -}
1948 -
1949 -src_compile() {
1950 - local ARCH=x86
1951 -
1952 - emake \
1953 - CC=$(tc-getCC) \
1954 - LD=$(tc-getLD) \
1955 - LDFLAGS="$(raw-ldflags)" \
1956 - ARCH=$(tc-arch-kernel) \
1957 - CONFIG_AUFS_FS=m \
1958 - KDIR="${KV_OUT_DIR}"
1959 -}
1960 -
1961 -src_install() {
1962 - linux-mod_src_install
1963 -
1964 - use doc && dodoc -r Documentation
1965 -
1966 - use kernel-patch || \
1967 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
1968 -
1969 - dodoc \
1970 - Documentation/filesystems/aufs/README \
1971 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
1972 -
1973 - readme.gentoo_create_doc
1974 -}
1975 -
1976 -pkg_postinst() {
1977 - readme.gentoo_print_elog
1978 - linux-mod_pkg_postinst
1979 -}
1980
1981 diff --git a/sys-fs/aufs4/aufs4-0_pre20171002.ebuild b/sys-fs/aufs4/aufs4-0_pre20171002.ebuild
1982 deleted file mode 100644
1983 index 2f61f36acc1..00000000000
1984 --- a/sys-fs/aufs4/aufs4-0_pre20171002.ebuild
1985 +++ /dev/null
1986 @@ -1,184 +0,0 @@
1987 -# Copyright 1999-2017 Gentoo Foundation
1988 -# Distributed under the terms of the GNU General Public License v2
1989 -
1990 -EAPI=6
1991 -
1992 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
1993 -
1994 -AUFS_VERSION="${PV%%_p*}"
1995 -# highest branch version
1996 -PATCH_MAX_VER=13
1997 -# highest supported version
1998 -KERN_MAX_VER=14
1999 -# lowest supported version
2000 -KERN_MIN_VER=0
2001 -
2002 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
2003 -HOMEPAGE="http://aufs.sourceforge.net/"
2004 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
2005 -
2006 -LICENSE="GPL-2"
2007 -SLOT="0"
2008 -KEYWORDS="~amd64 ~x86"
2009 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
2010 -
2011 -DEPEND="
2012 - dev-util/patchutils
2013 - dev-vcs/git"
2014 -RDEPEND="
2015 - sys-fs/aufs-util
2016 - !sys-fs/aufs
2017 - !sys-fs/aufs2
2018 - !sys-fs/aufs3"
2019 -
2020 -S="${WORKDIR}"/${PN}-standalone
2021 -
2022 -MODULE_NAMES="aufs(misc:${S})"
2023 -
2024 -pkg_setup() {
2025 - CONFIG_CHECK+=" !AUFS_FS"
2026 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
2027 - use nfs && CONFIG_CHECK+=" EXPORTFS"
2028 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
2029 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
2030 - use pax_kernel && CONFIG_CHECK+=" PAX" \
2031 - && ERROR_PAX="Please use hardened sources"
2032 -
2033 - # this is needed so merging a binpkg ${PN} is
2034 - # possible w/out a kernel unpacked on the system
2035 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
2036 -
2037 - get_version
2038 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
2039 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
2040 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
2041 -
2042 - linux-mod_pkg_setup
2043 -
2044 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
2045 - PATCH_BRANCH="x-rcN"
2046 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
2047 - PATCH_BRANCH="${KV_MINOR}".13+
2048 - else
2049 - PATCH_BRANCH="${KV_MINOR}"
2050 - fi
2051 -
2052 - case ${KV_EXTRA} in
2053 - "")
2054 - elog "It seems you are using vanilla-sources with aufs4"
2055 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
2056 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
2057 - ;;
2058 - "-gentoo")
2059 - elog "It seems you are using gentoo-sources with aufs4"
2060 - elog "Please use sys-kernel/aufs-sources"
2061 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
2062 - ;;
2063 - esac
2064 -
2065 - pushd "${T}" &> /dev/null || die
2066 - unpack ${A}
2067 -
2068 - cd ${PN}-standalone || die
2069 -
2070 - local module_branch=origin/${PN}.${PATCH_BRANCH}
2071 -
2072 - einfo "Using ${module_branch} as patch source"
2073 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
2074 -
2075 - combinediff \
2076 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
2077 - combinediff \
2078 - "${T}"/combined-1.patch ${PN}-mmap.patch \
2079 - > ${PN}-standalone-base-mmap-combined.patch
2080 -
2081 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
2082 - if use kernel-patch; then
2083 - cd ${KV_DIR}
2084 - ewarn "Patching your kernel..."
2085 - patch \
2086 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
2087 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
2088 - > /dev/null
2089 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
2090 - ewarn "You need to compile your kernel with the applied patch"
2091 - ewarn "to be able to load and use the aufs kernel module"
2092 - else
2093 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
2094 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
2095 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
2096 - die "missing kernel patch, please apply it first"
2097 - fi
2098 - fi
2099 -
2100 - popd &> /dev/null
2101 - export PKG_SETUP_HAS_BEEN_RAN=1
2102 -}
2103 -
2104 -set_config() {
2105 - for option in $*; do
2106 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
2107 - die "${option} is not a valid config option"
2108 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
2109 - done
2110 -}
2111 -
2112 -src_prepare() {
2113 - local module_branch=origin/${PN}.${PATCH_BRANCH}
2114 -
2115 - einfo "Using for module creation branch ${module_branch}"
2116 - git checkout -q -b local-gentoo ${module_branch} || die
2117 -
2118 - # All config options to off
2119 - sed "s:= y:=:g" -i config.mk || die
2120 -
2121 - set_config RDU BRANCH_MAX_127 SBILIST
2122 -
2123 - use debug && set_config DEBUG
2124 - use fuse && set_config BR_FUSE POLL
2125 - use hfs && set_config BR_HFSPLUS
2126 - use inotify && set_config HNOTIFY HFSNOTIFY
2127 - use nfs && set_config EXPORT
2128 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
2129 - use ramfs && set_config BR_RAMFS
2130 -
2131 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
2132 -
2133 - sed \
2134 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
2135 - -i Makefile || die
2136 -
2137 - eapply_user
2138 -}
2139 -
2140 -src_compile() {
2141 - local ARCH=x86
2142 -
2143 - emake \
2144 - CC=$(tc-getCC) \
2145 - LD=$(tc-getLD) \
2146 - LDFLAGS="$(raw-ldflags)" \
2147 - ARCH=$(tc-arch-kernel) \
2148 - CONFIG_AUFS_FS=m \
2149 - KDIR="${KV_OUT_DIR}"
2150 -}
2151 -
2152 -src_install() {
2153 - linux-mod_src_install
2154 -
2155 - use doc && dodoc -r Documentation
2156 -
2157 - use kernel-patch || \
2158 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
2159 -
2160 - dodoc \
2161 - Documentation/filesystems/aufs/README \
2162 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
2163 -
2164 - readme.gentoo_create_doc
2165 -}
2166 -
2167 -pkg_postinst() {
2168 - readme.gentoo_print_elog
2169 - linux-mod_pkg_postinst
2170 -}
2171
2172 diff --git a/sys-fs/aufs4/aufs4-0_pre20171106.ebuild b/sys-fs/aufs4/aufs4-0_pre20171106.ebuild
2173 deleted file mode 100644
2174 index 2f61f36acc1..00000000000
2175 --- a/sys-fs/aufs4/aufs4-0_pre20171106.ebuild
2176 +++ /dev/null
2177 @@ -1,184 +0,0 @@
2178 -# Copyright 1999-2017 Gentoo Foundation
2179 -# Distributed under the terms of the GNU General Public License v2
2180 -
2181 -EAPI=6
2182 -
2183 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
2184 -
2185 -AUFS_VERSION="${PV%%_p*}"
2186 -# highest branch version
2187 -PATCH_MAX_VER=13
2188 -# highest supported version
2189 -KERN_MAX_VER=14
2190 -# lowest supported version
2191 -KERN_MIN_VER=0
2192 -
2193 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
2194 -HOMEPAGE="http://aufs.sourceforge.net/"
2195 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
2196 -
2197 -LICENSE="GPL-2"
2198 -SLOT="0"
2199 -KEYWORDS="~amd64 ~x86"
2200 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
2201 -
2202 -DEPEND="
2203 - dev-util/patchutils
2204 - dev-vcs/git"
2205 -RDEPEND="
2206 - sys-fs/aufs-util
2207 - !sys-fs/aufs
2208 - !sys-fs/aufs2
2209 - !sys-fs/aufs3"
2210 -
2211 -S="${WORKDIR}"/${PN}-standalone
2212 -
2213 -MODULE_NAMES="aufs(misc:${S})"
2214 -
2215 -pkg_setup() {
2216 - CONFIG_CHECK+=" !AUFS_FS"
2217 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
2218 - use nfs && CONFIG_CHECK+=" EXPORTFS"
2219 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
2220 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
2221 - use pax_kernel && CONFIG_CHECK+=" PAX" \
2222 - && ERROR_PAX="Please use hardened sources"
2223 -
2224 - # this is needed so merging a binpkg ${PN} is
2225 - # possible w/out a kernel unpacked on the system
2226 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
2227 -
2228 - get_version
2229 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
2230 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
2231 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
2232 -
2233 - linux-mod_pkg_setup
2234 -
2235 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
2236 - PATCH_BRANCH="x-rcN"
2237 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
2238 - PATCH_BRANCH="${KV_MINOR}".13+
2239 - else
2240 - PATCH_BRANCH="${KV_MINOR}"
2241 - fi
2242 -
2243 - case ${KV_EXTRA} in
2244 - "")
2245 - elog "It seems you are using vanilla-sources with aufs4"
2246 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
2247 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
2248 - ;;
2249 - "-gentoo")
2250 - elog "It seems you are using gentoo-sources with aufs4"
2251 - elog "Please use sys-kernel/aufs-sources"
2252 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
2253 - ;;
2254 - esac
2255 -
2256 - pushd "${T}" &> /dev/null || die
2257 - unpack ${A}
2258 -
2259 - cd ${PN}-standalone || die
2260 -
2261 - local module_branch=origin/${PN}.${PATCH_BRANCH}
2262 -
2263 - einfo "Using ${module_branch} as patch source"
2264 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
2265 -
2266 - combinediff \
2267 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
2268 - combinediff \
2269 - "${T}"/combined-1.patch ${PN}-mmap.patch \
2270 - > ${PN}-standalone-base-mmap-combined.patch
2271 -
2272 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
2273 - if use kernel-patch; then
2274 - cd ${KV_DIR}
2275 - ewarn "Patching your kernel..."
2276 - patch \
2277 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
2278 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
2279 - > /dev/null
2280 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
2281 - ewarn "You need to compile your kernel with the applied patch"
2282 - ewarn "to be able to load and use the aufs kernel module"
2283 - else
2284 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
2285 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
2286 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
2287 - die "missing kernel patch, please apply it first"
2288 - fi
2289 - fi
2290 -
2291 - popd &> /dev/null
2292 - export PKG_SETUP_HAS_BEEN_RAN=1
2293 -}
2294 -
2295 -set_config() {
2296 - for option in $*; do
2297 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
2298 - die "${option} is not a valid config option"
2299 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
2300 - done
2301 -}
2302 -
2303 -src_prepare() {
2304 - local module_branch=origin/${PN}.${PATCH_BRANCH}
2305 -
2306 - einfo "Using for module creation branch ${module_branch}"
2307 - git checkout -q -b local-gentoo ${module_branch} || die
2308 -
2309 - # All config options to off
2310 - sed "s:= y:=:g" -i config.mk || die
2311 -
2312 - set_config RDU BRANCH_MAX_127 SBILIST
2313 -
2314 - use debug && set_config DEBUG
2315 - use fuse && set_config BR_FUSE POLL
2316 - use hfs && set_config BR_HFSPLUS
2317 - use inotify && set_config HNOTIFY HFSNOTIFY
2318 - use nfs && set_config EXPORT
2319 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
2320 - use ramfs && set_config BR_RAMFS
2321 -
2322 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
2323 -
2324 - sed \
2325 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
2326 - -i Makefile || die
2327 -
2328 - eapply_user
2329 -}
2330 -
2331 -src_compile() {
2332 - local ARCH=x86
2333 -
2334 - emake \
2335 - CC=$(tc-getCC) \
2336 - LD=$(tc-getLD) \
2337 - LDFLAGS="$(raw-ldflags)" \
2338 - ARCH=$(tc-arch-kernel) \
2339 - CONFIG_AUFS_FS=m \
2340 - KDIR="${KV_OUT_DIR}"
2341 -}
2342 -
2343 -src_install() {
2344 - linux-mod_src_install
2345 -
2346 - use doc && dodoc -r Documentation
2347 -
2348 - use kernel-patch || \
2349 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
2350 -
2351 - dodoc \
2352 - Documentation/filesystems/aufs/README \
2353 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
2354 -
2355 - readme.gentoo_create_doc
2356 -}
2357 -
2358 -pkg_postinst() {
2359 - readme.gentoo_print_elog
2360 - linux-mod_pkg_postinst
2361 -}
2362
2363 diff --git a/sys-fs/aufs4/aufs4-0_pre20180219.ebuild b/sys-fs/aufs4/aufs4-0_pre20180219.ebuild
2364 deleted file mode 100644
2365 index f2e2ccc44e6..00000000000
2366 --- a/sys-fs/aufs4/aufs4-0_pre20180219.ebuild
2367 +++ /dev/null
2368 @@ -1,184 +0,0 @@
2369 -# Copyright 1999-2018 Gentoo Foundation
2370 -# Distributed under the terms of the GNU General Public License v2
2371 -
2372 -EAPI=6
2373 -
2374 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
2375 -
2376 -AUFS_VERSION="${PV%%_p*}"
2377 -# highest branch version
2378 -PATCH_MAX_VER=13
2379 -# highest supported version
2380 -KERN_MAX_VER=15
2381 -# lowest supported version
2382 -KERN_MIN_VER=0
2383 -
2384 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
2385 -HOMEPAGE="http://aufs.sourceforge.net/"
2386 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
2387 -
2388 -LICENSE="GPL-2"
2389 -SLOT="0"
2390 -KEYWORDS="~amd64 ~x86"
2391 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
2392 -
2393 -DEPEND="
2394 - dev-util/patchutils
2395 - dev-vcs/git"
2396 -RDEPEND="
2397 - sys-fs/aufs-util
2398 - !sys-fs/aufs
2399 - !sys-fs/aufs2
2400 - !sys-fs/aufs3"
2401 -
2402 -S="${WORKDIR}"/${PN}-standalone
2403 -
2404 -MODULE_NAMES="aufs(misc:${S})"
2405 -
2406 -pkg_setup() {
2407 - CONFIG_CHECK+=" !AUFS_FS"
2408 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
2409 - use nfs && CONFIG_CHECK+=" EXPORTFS"
2410 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
2411 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
2412 - use pax_kernel && CONFIG_CHECK+=" PAX" \
2413 - && ERROR_PAX="Please use hardened sources"
2414 -
2415 - # this is needed so merging a binpkg ${PN} is
2416 - # possible w/out a kernel unpacked on the system
2417 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
2418 -
2419 - get_version
2420 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
2421 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
2422 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
2423 -
2424 - linux-mod_pkg_setup
2425 -
2426 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
2427 - PATCH_BRANCH="x-rcN"
2428 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
2429 - PATCH_BRANCH="${KV_MINOR}".13+
2430 - else
2431 - PATCH_BRANCH="${KV_MINOR}"
2432 - fi
2433 -
2434 - case ${KV_EXTRA} in
2435 - "")
2436 - elog "It seems you are using vanilla-sources with aufs4"
2437 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
2438 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
2439 - ;;
2440 - "-gentoo")
2441 - elog "It seems you are using gentoo-sources with aufs4"
2442 - elog "Please use sys-kernel/aufs-sources"
2443 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
2444 - ;;
2445 - esac
2446 -
2447 - pushd "${T}" &> /dev/null || die
2448 - unpack ${A}
2449 -
2450 - cd ${PN}-standalone || die
2451 -
2452 - local module_branch=origin/${PN}.${PATCH_BRANCH}
2453 -
2454 - einfo "Using ${module_branch} as patch source"
2455 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
2456 -
2457 - combinediff \
2458 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
2459 - combinediff \
2460 - "${T}"/combined-1.patch ${PN}-mmap.patch \
2461 - > ${PN}-standalone-base-mmap-combined.patch
2462 -
2463 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
2464 - if use kernel-patch; then
2465 - cd ${KV_DIR}
2466 - ewarn "Patching your kernel..."
2467 - patch \
2468 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
2469 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
2470 - > /dev/null
2471 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
2472 - ewarn "You need to compile your kernel with the applied patch"
2473 - ewarn "to be able to load and use the aufs kernel module"
2474 - else
2475 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
2476 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
2477 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
2478 - die "missing kernel patch, please apply it first"
2479 - fi
2480 - fi
2481 -
2482 - popd &> /dev/null
2483 - export PKG_SETUP_HAS_BEEN_RAN=1
2484 -}
2485 -
2486 -set_config() {
2487 - for option in $*; do
2488 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
2489 - die "${option} is not a valid config option"
2490 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
2491 - done
2492 -}
2493 -
2494 -src_prepare() {
2495 - local module_branch=origin/${PN}.${PATCH_BRANCH}
2496 -
2497 - einfo "Using for module creation branch ${module_branch}"
2498 - git checkout -q -b local-gentoo ${module_branch} || die
2499 -
2500 - # All config options to off
2501 - sed "s:= y:=:g" -i config.mk || die
2502 -
2503 - set_config RDU BRANCH_MAX_127 SBILIST
2504 -
2505 - use debug && set_config DEBUG
2506 - use fuse && set_config BR_FUSE POLL
2507 - use hfs && set_config BR_HFSPLUS
2508 - use inotify && set_config HNOTIFY HFSNOTIFY
2509 - use nfs && set_config EXPORT
2510 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
2511 - use ramfs && set_config BR_RAMFS
2512 -
2513 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
2514 -
2515 - sed \
2516 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
2517 - -i Makefile || die
2518 -
2519 - eapply_user
2520 -}
2521 -
2522 -src_compile() {
2523 - local ARCH=x86
2524 -
2525 - emake \
2526 - CC=$(tc-getCC) \
2527 - LD=$(tc-getLD) \
2528 - LDFLAGS="$(raw-ldflags)" \
2529 - ARCH=$(tc-arch-kernel) \
2530 - CONFIG_AUFS_FS=m \
2531 - KDIR="${KV_OUT_DIR}"
2532 -}
2533 -
2534 -src_install() {
2535 - linux-mod_src_install
2536 -
2537 - use doc && dodoc -r Documentation
2538 -
2539 - use kernel-patch || \
2540 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
2541 -
2542 - dodoc \
2543 - Documentation/filesystems/aufs/README \
2544 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
2545 -
2546 - readme.gentoo_create_doc
2547 -}
2548 -
2549 -pkg_postinst() {
2550 - readme.gentoo_print_elog
2551 - linux-mod_pkg_postinst
2552 -}
2553
2554 diff --git a/sys-fs/aufs4/aufs4-0_pre20180312.ebuild b/sys-fs/aufs4/aufs4-0_pre20180312.ebuild
2555 deleted file mode 100644
2556 index 1917bdd71b8..00000000000
2557 --- a/sys-fs/aufs4/aufs4-0_pre20180312.ebuild
2558 +++ /dev/null
2559 @@ -1,184 +0,0 @@
2560 -# Copyright 1999-2018 Gentoo Foundation
2561 -# Distributed under the terms of the GNU General Public License v2
2562 -
2563 -EAPI=6
2564 -
2565 -inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
2566 -
2567 -AUFS_VERSION="${PV%%_p*}"
2568 -# highest branch version
2569 -PATCH_MAX_VER=13
2570 -# highest supported version
2571 -KERN_MAX_VER=16
2572 -# lowest supported version
2573 -KERN_MIN_VER=0
2574 -
2575 -DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
2576 -HOMEPAGE="http://aufs.sourceforge.net/"
2577 -SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
2578 -
2579 -LICENSE="GPL-2"
2580 -SLOT="0"
2581 -KEYWORDS="~amd64 ~x86"
2582 -IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
2583 -
2584 -DEPEND="
2585 - dev-util/patchutils
2586 - dev-vcs/git"
2587 -RDEPEND="
2588 - sys-fs/aufs-util
2589 - !sys-fs/aufs
2590 - !sys-fs/aufs2
2591 - !sys-fs/aufs3"
2592 -
2593 -S="${WORKDIR}"/${PN}-standalone
2594 -
2595 -MODULE_NAMES="aufs(misc:${S})"
2596 -
2597 -pkg_setup() {
2598 - CONFIG_CHECK+=" !AUFS_FS"
2599 - use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
2600 - use nfs && CONFIG_CHECK+=" EXPORTFS"
2601 - use fuse && CONFIG_CHECK+=" ~FUSE_FS"
2602 - use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
2603 - use pax_kernel && CONFIG_CHECK+=" PAX" \
2604 - && ERROR_PAX="Please use hardened sources"
2605 -
2606 - # this is needed so merging a binpkg ${PN} is
2607 - # possible w/out a kernel unpacked on the system
2608 - [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
2609 -
2610 - get_version
2611 - kernel_is lt 4 ${KERN_MIN_VER} 0 && \
2612 - die "the kernel version isn't supported by upstream anymore. Please upgrade."
2613 - kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
2614 -
2615 - linux-mod_pkg_setup
2616 -
2617 - if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
2618 - PATCH_BRANCH="x-rcN"
2619 - elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
2620 - PATCH_BRANCH="${KV_MINOR}".13+
2621 - else
2622 - PATCH_BRANCH="${KV_MINOR}"
2623 - fi
2624 -
2625 - case ${KV_EXTRA} in
2626 - "")
2627 - elog "It seems you are using vanilla-sources with aufs4"
2628 - elog "Please use sys-kernel/aufs-sources with USE=vanilla"
2629 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
2630 - ;;
2631 - "-gentoo")
2632 - elog "It seems you are using gentoo-sources with aufs4"
2633 - elog "Please use sys-kernel/aufs-sources"
2634 - elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
2635 - ;;
2636 - esac
2637 -
2638 - pushd "${T}" &> /dev/null || die
2639 - unpack ${A}
2640 -
2641 - cd ${PN}-standalone || die
2642 -
2643 - local module_branch=origin/${PN}.${PATCH_BRANCH}
2644 -
2645 - einfo "Using ${module_branch} as patch source"
2646 - git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
2647 -
2648 - combinediff \
2649 - ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
2650 - combinediff \
2651 - "${T}"/combined-1.patch ${PN}-mmap.patch \
2652 - > ${PN}-standalone-base-mmap-combined.patch
2653 -
2654 - if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
2655 - if use kernel-patch; then
2656 - cd ${KV_DIR}
2657 - ewarn "Patching your kernel..."
2658 - patch \
2659 - --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
2660 - < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
2661 - > /dev/null
2662 - epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
2663 - ewarn "You need to compile your kernel with the applied patch"
2664 - ewarn "to be able to load and use the aufs kernel module"
2665 - else
2666 - eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
2667 - eerror "Either enable the kernel-patch useflag to do it with this ebuild"
2668 - eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
2669 - die "missing kernel patch, please apply it first"
2670 - fi
2671 - fi
2672 -
2673 - popd &> /dev/null
2674 - export PKG_SETUP_HAS_BEEN_RAN=1
2675 -}
2676 -
2677 -set_config() {
2678 - for option in $*; do
2679 - grep -q "^CONFIG_AUFS_${option} =" config.mk || \
2680 - die "${option} is not a valid config option"
2681 - sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
2682 - done
2683 -}
2684 -
2685 -src_prepare() {
2686 - local module_branch=origin/${PN}.${PATCH_BRANCH}
2687 -
2688 - einfo "Using for module creation branch ${module_branch}"
2689 - git checkout -q -b local-gentoo ${module_branch} || die
2690 -
2691 - # All config options to off
2692 - sed "s:= y:=:g" -i config.mk || die
2693 -
2694 - set_config RDU BRANCH_MAX_127 SBILIST
2695 -
2696 - use debug && set_config DEBUG
2697 - use fuse && set_config BR_FUSE POLL
2698 - use hfs && set_config BR_HFSPLUS
2699 - use inotify && set_config HNOTIFY HFSNOTIFY
2700 - use nfs && set_config EXPORT
2701 - use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
2702 - use ramfs && set_config BR_RAMFS
2703 -
2704 - use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
2705 -
2706 - sed \
2707 - -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
2708 - -i Makefile || die
2709 -
2710 - eapply_user
2711 -}
2712 -
2713 -src_compile() {
2714 - local ARCH=x86
2715 -
2716 - emake \
2717 - CC=$(tc-getCC) \
2718 - LD=$(tc-getLD) \
2719 - LDFLAGS="$(raw-ldflags)" \
2720 - ARCH=$(tc-arch-kernel) \
2721 - CONFIG_AUFS_FS=m \
2722 - KDIR="${KV_OUT_DIR}"
2723 -}
2724 -
2725 -src_install() {
2726 - linux-mod_src_install
2727 -
2728 - use doc && dodoc -r Documentation
2729 -
2730 - use kernel-patch || \
2731 - doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
2732 -
2733 - dodoc \
2734 - Documentation/filesystems/aufs/README \
2735 - "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
2736 -
2737 - readme.gentoo_create_doc
2738 -}
2739 -
2740 -pkg_postinst() {
2741 - readme.gentoo_print_elog
2742 - linux-mod_pkg_postinst
2743 -}
2744
2745 diff --git a/sys-fs/aufs4/files/README.gentoo b/sys-fs/aufs4/files/README.gentoo
2746 deleted file mode 100644
2747 index 64dfe94b4bd..00000000000
2748 --- a/sys-fs/aufs4/files/README.gentoo
2749 +++ /dev/null
2750 @@ -1,20 +0,0 @@
2751 -There several other patches in aufs3. They are all
2752 -optional. When you meet some problems, they will help you. You can find them
2753 -in the documentation directory.
2754 -
2755 - - aufs3-loopback.patch
2756 - Supports a nested loopback mount in a branch-fs. This patch is
2757 - unnecessary until aufs produces a message such like "you may want to try
2758 - another patch for loopback file".
2759 -
2760 - - vfs-ino.patch
2761 - Modifies a system global kernel internal function get_next_ino() in
2762 - order to stop assigning 0 for an inode-number. Not directly related to
2763 - aufs, but recommended generally.
2764 -
2765 - - tmpfs-idr.patch
2766 - Keeps the tmpfs inode number as the lowest value. Effective to reduce
2767 - the size of aufs XINO files for tmpfs branch. Also it prevents the
2768 - duplication of inode number, which is important for backup
2769 - tools, aubrsync or other utilities. When you find aufs XINO files for
2770 - tmpfs branch growing too much, try this patch.
2771
2772 diff --git a/sys-fs/aufs4/files/pax-4.patch b/sys-fs/aufs4/files/pax-4.patch
2773 deleted file mode 100644
2774 index cf216a5708c..00000000000
2775 --- a/sys-fs/aufs4/files/pax-4.patch
2776 +++ /dev/null
2777 @@ -1,89 +0,0 @@
2778 ---- a/fs/aufs/dynop.c 2012-10-09 15:41:32.652989534 -0400
2779 -+++ b/fs/aufs/dynop.c 2012-10-09 15:41:58.562989820 -0400
2780 -@@ -149,9 +149,11 @@
2781 - #define DySet(func, dst, src, h_op, h_sb) do { \
2782 - DyDbgInc(cnt); \
2783 - if (h_op->func) { \
2784 -- if (src.func) \
2785 -- dst.func = src.func; \
2786 -- else \
2787 -+ if (src.func) { \
2788 -+ pax_open_kernel(); \
2789 -+ *(void **)&dst.func = src.func; \
2790 -+ pax_close_kernel(); \
2791 -+ } else \
2792 - AuDbg("%s %s\n", au_sbtype(h_sb), #func); \
2793 - } \
2794 - } while (0)
2795 -@@ -159,7 +161,9 @@
2796 - #define DySetForce(func, dst, src) do { \
2797 - AuDebugOn(!src.func); \
2798 - DyDbgInc(cnt); \
2799 -- dst.func = src.func; \
2800 -+ pax_open_kernel(); \
2801 -+ *(void **)&dst.func = src.func; \
2802 -+ pax_close_kernel(); \
2803 - } while (0)
2804 -
2805 - #define DySetAop(func) \
2806 -@@ -266,15 +270,17 @@
2807 - */
2808 - static void dy_adx(struct au_dyaop *dyaop, int do_dx)
2809 - {
2810 -+ pax_open_kernel();
2811 - if (!do_dx) {
2812 -- dyaop->da_op.direct_IO = NULL;
2813 -- dyaop->da_op.get_xip_mem = NULL;
2814 -+ *(void **)&dyaop->da_op.direct_IO = NULL;
2815 -+ *(void **)&dyaop->da_op.get_xip_mem = NULL;
2816 - } else {
2817 -- dyaop->da_op.direct_IO = aufs_aop.direct_IO;
2818 -- dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
2819 -+ *(void **)&dyaop->da_op.direct_IO = aufs_aop.direct_IO;
2820 -+ *(void **)&dyaop->da_op.get_xip_mem = aufs_aop.get_xip_mem;
2821 - if (!dyaop->da_get_xip_mem)
2822 -- dyaop->da_op.get_xip_mem = NULL;
2823 -+ *(void **)&dyaop->da_op.get_xip_mem = NULL;
2824 - }
2825 -+ pax_close_kernel();
2826 - }
2827 -
2828 - static struct au_dyaop *dy_aget(struct au_branch *br,
2829 ---- a/fs/aufs/f_op_sp.c 2012-10-09 15:41:32.652989534 -0400
2830 -+++ b/fs/aufs/f_op_sp.c 2012-10-09 15:41:58.562989820 -0400
2831 -@@ -104,7 +104,7 @@
2832 - static int aufs_open_sp(struct inode *inode, struct file *file);
2833 - static struct au_sp_fop {
2834 - int done;
2835 -- struct file_operations fop; /* not 'const' */
2836 -+ file_operations_no_const fop; /* not 'const' */
2837 - spinlock_t spin;
2838 - } au_sp_fop[AuSp_Last] = {
2839 - [AuSp_FIFO] = {
2840 -@@ -157,8 +157,10 @@
2841 - h_file = au_hf_top(file);
2842 - spin_lock(&p->spin);
2843 - if (!p->done) {
2844 -- p->fop = *h_file->f_op;
2845 -+ pax_open_kernel();
2846 -+ memcpy((void *)&p->fop, h_file->f_op, sizeof(p->fop));
2847 - p->fop.owner = THIS_MODULE;
2848 -+ pax_close_kernel();
2849 - if (p->fop.aio_read)
2850 - p->fop.aio_read = aufs_aio_read_sp;
2851 - if (p->fop.aio_write)
2852 ---- a/fs/aufs/sysfs.c 2013-10-20 17:08:37.000000000 -0400
2853 -+++ b/fs/aufs/sysfs.c 2013-10-19 17:08:29.000000000 -0400
2854 -@@ -233,8 +233,10 @@
2855 - for (i = 0; i < ARRAY_SIZE(br->br_sysfs); i++) {
2856 - attr = &br_sysfs->attr;
2857 - sysfs_attr_init(attr);
2858 -- attr->name = br_sysfs->name;
2859 -- attr->mode = S_IRUGO;
2860 -+ pax_open_kernel();
2861 -+ *(void **)&attr->name = br_sysfs->name;
2862 -+ *(void **)&attr->mode = S_IRUGO;
2863 -+ pax_close_kernel();
2864 - br_sysfs++;
2865 - }
2866 - }
2867
2868 diff --git a/sys-fs/aufs4/metadata.xml b/sys-fs/aufs4/metadata.xml
2869 deleted file mode 100644
2870 index f0e5c642768..00000000000
2871 --- a/sys-fs/aufs4/metadata.xml
2872 +++ /dev/null
2873 @@ -1,20 +0,0 @@
2874 -<?xml version="1.0" encoding="UTF-8"?>
2875 -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
2876 -<pkgmetadata>
2877 - <maintainer type="person">
2878 - <email>jlec@g.o</email>
2879 - </maintainer>
2880 - <use>
2881 - <flag name="debug">Enable additional debugging support</flag>
2882 - <flag name="hfs">Enable hfs support</flag>
2883 - <flag name="fuse">Enable fuse support</flag>
2884 - <flag name="inotify">Enable inotify support</flag>
2885 - <flag name="kernel-patch">Patch the current kernel for aufs3 support</flag>
2886 - <flag name="nfs">Enable support for nfs export</flag>
2887 - <flag name="pax_kernel">Apply patch needed for pax enabled kernels</flag>
2888 - <flag name="ramfs">Enable initramfs/rootfs support</flag>
2889 - </use>
2890 - <upstream>
2891 - <remote-id type="sourceforge">aufs</remote-id>
2892 - </upstream>
2893 -</pkgmetadata>