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: Sat, 25 Feb 2017 10:52:35
Message-Id: 1488019945.e6a2b2cd60d85ca53ad470ef880c9384a1068264.jlec@gentoo
1 commit: e6a2b2cd60d85ca53ad470ef880c9384a1068264
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Sat Feb 25 10:14:34 2017 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Sat Feb 25 10:52:25 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a2b2cd
7
8 sys-fs/aufs4: Bump to latest aufs release
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 sys-fs/aufs4/Manifest | 1 +
14 sys-fs/aufs4/aufs4-0_pre20170220.ebuild | 185 ++++++++++++++++++++++++++++++++
15 2 files changed, 186 insertions(+)
16
17 diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
18 index a3da854c2a..5a50b0714f 100644
19 --- a/sys-fs/aufs4/Manifest
20 +++ b/sys-fs/aufs4/Manifest
21 @@ -5,3 +5,4 @@ DIST aufs4-standalone-0_pre20160815.tar.xz 1648360 SHA256 35b2b8c558a9927eb60790
22 DIST aufs4-standalone-0_pre20161010.tar.xz 1635556 SHA256 86d9ba7c401640a990991ca7dbea587ac755253791e0d325ec77ca01730359e3 SHA512 520f47255ee33762f111f93ceeaaee9cf6136c13fb6968a7a7d49388c189e112875f076c5fecdad2123d137a2bc0b74e9c0e6e8913e75dfede30e7a65dd74616 WHIRLPOOL 6b8b1836093ba29bfbf24a6a02231c9514a406d99a5b78bd9db660d388efc9f6e09957b11bc5c3f1f4dc71188a37822e708d48bf5940627881373897b08f3c85
23 DIST aufs4-standalone-0_pre20161219.tar.xz 1823772 SHA256 92554aa017279d31c3a3228f32dee70f7dee3cdd105b4f281f16e92900120d24 SHA512 59fc0df19716d8f03e2547d98d6f412e921576d60afd783e5691a07c09b298ee61f491501e07ec154665a56d11b1887f94813ef5972254e6391251a48ba156c9 WHIRLPOOL 8470f594e6ebb6d56da9b4c20d1b372a77aac2e0b7e009e15f76d082b8ad51b287ccc1da7f64cbcb4d513af4780795b811dea1b1f953e306bb23d56a72453a36
24 DIST aufs4-standalone-0_pre20170130.tar.xz 1761280 SHA256 ea854a64dabfb6b2d6c6befd96f4cad75dc1c827399b8ad2f72c2ed495e9c18c SHA512 beb121b36bb6056e48d5402b10bdfb8b6cd20d61b7d74221e5abd10226f58f40be1a0853e06a09cc1f94d50543030a9fd0a1c117570b1ad7467bf4156a1492ea WHIRLPOOL 39e75962842e4de6c151c9fd3c414bd0e7ce268be6fad699f97ebff3480b1a5f6a9966445035967dd4ec96423847b797dd72c9ae8f1067c152c83cf0ca488a85
25 +DIST aufs4-standalone-0_pre20170220.tar.xz 2115232 SHA256 96dcb9d94d1d2358a61e9d5cdfb9c9e6e4886018f5d24a76ab8deb7e03b7f04f SHA512 c68cf12573a0f3d9ec9419c63759d2b6f120eaafbbc005553c31d9c07b77d61612b903dc7ebdb2a8de8a52ded62e20b08cd32206b3cd3df196f0c1da82d472f7 WHIRLPOOL a2a3f10d003999a9498978a7b0d013cf918070cad975bfe54429d158d980943864fd810178a0639925d54c33974d13fa782950c77756469c646ebc57ddd6f917
26
27 diff --git a/sys-fs/aufs4/aufs4-0_pre20170220.ebuild b/sys-fs/aufs4/aufs4-0_pre20170220.ebuild
28 new file mode 100644
29 index 0000000000..7081a57ac5
30 --- /dev/null
31 +++ b/sys-fs/aufs4/aufs4-0_pre20170220.ebuild
32 @@ -0,0 +1,185 @@
33 +# Copyright 1999-2017 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +# $Id$
36 +
37 +EAPI=6
38 +
39 +inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo-r1 toolchain-funcs
40 +
41 +AUFS_VERSION="${PV%%_p*}"
42 +# highest branch version
43 +PATCH_MAX_VER=9
44 +# highest supported version
45 +KERN_MAX_VER=10
46 +# lowest supported version
47 +KERN_MIN_VER=0
48 +
49 +DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
50 +HOMEPAGE="http://aufs.sourceforge.net/"
51 +SRC_URI="https://dev.gentoo.org/~jlec/distfiles/aufs4-standalone-${PV}.tar.xz"
52 +
53 +LICENSE="GPL-2"
54 +SLOT="0"
55 +KEYWORDS="~amd64 ~x86"
56 +IUSE="debug doc fuse hfs inotify kernel-patch nfs pax_kernel ramfs"
57 +
58 +DEPEND="
59 + dev-util/patchutils
60 + dev-vcs/git"
61 +RDEPEND="
62 + sys-fs/aufs-util
63 + !sys-fs/aufs
64 + !sys-fs/aufs2
65 + !sys-fs/aufs3"
66 +
67 +S="${WORKDIR}"/${PN}-standalone
68 +
69 +MODULE_NAMES="aufs(misc:${S})"
70 +
71 +pkg_setup() {
72 + CONFIG_CHECK+=" !AUFS_FS"
73 + use inotify && CONFIG_CHECK+=" ~FSNOTIFY"
74 + use nfs && CONFIG_CHECK+=" EXPORTFS"
75 + use fuse && CONFIG_CHECK+=" ~FUSE_FS"
76 + use hfs && CONFIG_CHECK+=" ~HFSPLUS_FS"
77 + use pax_kernel && CONFIG_CHECK+=" PAX" \
78 + && ERROR_PAX="Please use hardened sources"
79 +
80 + # this is needed so merging a binpkg ${PN} is
81 + # possible w/out a kernel unpacked on the system
82 + [[ -n "$PKG_SETUP_HAS_BEEN_RAN" ]] && return
83 +
84 + get_version
85 + kernel_is lt 4 ${KERN_MIN_VER} 0 && \
86 + die "the kernel version isn't supported by upstream anymore. Please upgrade."
87 + kernel_is gt 4 ${KERN_MAX_VER} 99 && die "kernel too new"
88 +
89 + linux-mod_pkg_setup
90 +
91 + if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
92 + PATCH_BRANCH="x-rcN"
93 + elif [[ "${KV_MINOR}" == "1" ]] && [[ "${KV_PATCH}" -ge "13" ]]; then
94 + PATCH_BRANCH="${KV_MINOR}".13+
95 + else
96 + PATCH_BRANCH="${KV_MINOR}"
97 + fi
98 +
99 + case ${KV_EXTRA} in
100 + "")
101 + elog "It seems you are using vanilla-sources with aufs4"
102 + elog "Please use sys-kernel/aufs-sources with USE=vanilla"
103 + elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
104 + ;;
105 + "-gentoo")
106 + elog "It seems you are using gentoo-sources with aufs4"
107 + elog "Please use sys-kernel/aufs-sources"
108 + elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
109 + ;;
110 + esac
111 +
112 + pushd "${T}" &> /dev/null || die
113 + unpack ${A}
114 +
115 + cd ${PN}-standalone || die
116 +
117 + local module_branch=origin/${PN}.${PATCH_BRANCH}
118 +
119 + einfo "Using ${module_branch} as patch source"
120 + git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
121 +
122 + combinediff \
123 + ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
124 + combinediff \
125 + "${T}"/combined-1.patch ${PN}-mmap.patch \
126 + > ${PN}-standalone-base-mmap-combined.patch
127 +
128 + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
129 + if use kernel-patch; then
130 + cd ${KV_DIR}
131 + ewarn "Patching your kernel..."
132 + patch \
133 + --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} \
134 + < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch \
135 + > /dev/null
136 + epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
137 + ewarn "You need to compile your kernel with the applied patch"
138 + ewarn "to be able to load and use the aufs kernel module"
139 + else
140 + eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
141 + eerror "Either enable the kernel-patch useflag to do it with this ebuild"
142 + eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
143 + die "missing kernel patch, please apply it first"
144 + fi
145 + fi
146 +
147 + popd &> /dev/null
148 + export PKG_SETUP_HAS_BEEN_RAN=1
149 +}
150 +
151 +set_config() {
152 + for option in $*; do
153 + grep -q "^CONFIG_AUFS_${option} =" config.mk || \
154 + die "${option} is not a valid config option"
155 + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
156 + done
157 +}
158 +
159 +src_prepare() {
160 + local module_branch=origin/${PN}.${PATCH_BRANCH}
161 +
162 + einfo "Using for module creation branch ${module_branch}"
163 + git checkout -q -b local-gentoo ${module_branch} || die
164 +
165 + # All config options to off
166 + sed "s:= y:=:g" -i config.mk || die
167 +
168 + set_config RDU BRANCH_MAX_127 SBILIST
169 +
170 + use debug && set_config DEBUG
171 + use fuse && set_config BR_FUSE POLL
172 + use hfs && set_config BR_HFSPLUS
173 + use inotify && set_config HNOTIFY HFSNOTIFY
174 + use nfs && set_config EXPORT
175 + use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
176 + use ramfs && set_config BR_RAMFS
177 +
178 + use pax_kernel && epatch "${FILESDIR}"/pax-4.patch
179 +
180 + sed \
181 + -e "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" \
182 + -i Makefile || die
183 +
184 + eapply_user
185 +}
186 +
187 +src_compile() {
188 + local ARCH=x86
189 +
190 + emake \
191 + CC=$(tc-getCC) \
192 + LD=$(tc-getLD) \
193 + LDFLAGS="$(raw-ldflags)" \
194 + ARCH=$(tc-arch-kernel) \
195 + CONFIG_AUFS_FS=m \
196 + KDIR="${KV_OUT_DIR}"
197 +}
198 +
199 +src_install() {
200 + linux-mod_src_install
201 +
202 + use doc && dodoc -r Documentation
203 +
204 + use kernel-patch || \
205 + doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
206 +
207 + dodoc \
208 + Documentation/filesystems/aufs/README \
209 + "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
210 +
211 + readme.gentoo_create_doc
212 +}
213 +
214 +pkg_postinst() {
215 + readme.gentoo_print_elog
216 + linux-mod_pkg_postinst
217 +}