Gentoo Archives: gentoo-commits

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