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/aufs3/
Date: Mon, 02 Nov 2015 07:48:05
Message-Id: 1446450472.27f2b8d238141a83e9f6b1b4f2ca8d25cf0374cc.jlec@gentoo
1 commit: 27f2b8d238141a83e9f6b1b4f2ca8d25cf0374cc
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Nov 2 07:30:34 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Nov 2 07:47:52 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27f2b8d2
7
8 sys-fs/aufs3: Bump to latest aufs release
9
10 Package-Manager: portage-2.2.23
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 sys-fs/aufs3/Manifest | 1 +
14 sys-fs/aufs3/aufs3-3_p20151102.ebuild | 172 ++++++++++++++++++++++++++++++++++
15 2 files changed, 173 insertions(+)
16
17 diff --git a/sys-fs/aufs3/Manifest b/sys-fs/aufs3/Manifest
18 index e341564..97fb667 100644
19 --- a/sys-fs/aufs3/Manifest
20 +++ b/sys-fs/aufs3/Manifest
21 @@ -7,3 +7,4 @@ DIST aufs3-standalone-3_p20150525.tar.xz 2988108 SHA256 117be76206e67425c4144174
22 DIST aufs3-standalone-3_p20150608.tar.xz 3015460 SHA256 cdf92d07f45becfeb70ea3314e554ea9c8766a2815c3aa6c8d634b5307c76d5d SHA512 4d29d2d4908cd7a4471bc3efe5c23e57d41765937c700eee8593a5c07d7e84e12e6093ef4338b6bd4e9e6f0e44674557a659fd5fa5257a79b381385d208c2209 WHIRLPOOL ccf68e64eb5bc1893c2e5d50c6fc3eaf4e71fd06949ae16e4343734dca39f7f016ab0a08796d444efe55947a8645193979c0dccce702d8c38e46207bfde4f1ad
23 DIST aufs3-standalone-3_p20150622.tar.xz 3063280 SHA256 2fa44f9df9d58df7a5251ebd2cec206fa90ca8e110c1f657df18e62adb170517 SHA512 fe7a62249130d68f72b14f21b57e5d6db402f56637afc876068d916e78884d08476c804ac58ef06eeb9e13e0a2e1cb75ac782f83054f1c06cb85c74a3c48ba01 WHIRLPOOL 7f85a5324d51e148c97109357c13fcab76121d25ee006211d2212f9c6d352330be110569848c8ca96421bc4582025c73030329d7e501837e4d18cafd6002f153
24 DIST aufs3-standalone-3_p20151012.tar.xz 3122148 SHA256 f54f1f19bec26f653939e00b30007a465a1f555356ec3886f2a5970276494d0e SHA512 fcf251f358c0dfb66387744d1a1339b2bbcc979c7cc86d01068d108abd6a765c69ecce56cc182d385006febf5abf093fb2c2af77e4cc149134ac413a26b4118f WHIRLPOOL 06be7483792bceea58b26d733c1eed6f69ddd81cd49617550c3414e1800964690b69c1ee9f12b1d48887d051d6b0488a009a56aec0df7cbcc5625ca27f9043f8
25 +DIST aufs3-standalone-3_p20151102.tar.xz 3139016 SHA256 8d43e3c3c744ddfd250321d7a43ac98c77ff93d2775674f3c7a71183260702fb SHA512 0c0f261dc295d7b33560796f7baef761d802eac4de6b09be9a8f41689f3458149c271025e45d053fb188f56b6b2d6e5a02e159b0fefef090cbb0b44cfad78c4a WHIRLPOOL 1bcd9292362b27c564b5450c84b5f22bb16b2498b34507a78bf30df25c034bce4112ddec688f632f39cd935f1dd15dcf7f18213dc0d13a63aed1e2873da2d89b
26
27 diff --git a/sys-fs/aufs3/aufs3-3_p20151102.ebuild b/sys-fs/aufs3/aufs3-3_p20151102.ebuild
28 new file mode 100644
29 index 0000000..9930d1e
30 --- /dev/null
31 +++ b/sys-fs/aufs3/aufs3-3_p20151102.ebuild
32 @@ -0,0 +1,172 @@
33 +# Copyright 1999-2015 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +# $Id$
36 +
37 +EAPI=5
38 +
39 +inherit eutils flag-o-matic linux-info linux-mod multilib readme.gentoo toolchain-funcs
40 +
41 +AUFS_VERSION="${PV%%_p*}"
42 +# highest branch version
43 +PATCH_MAX_VER=19
44 +# highest supported version
45 +KERN_MAX_VER=20
46 +# lowest supported version
47 +KERN_MIN_VER=14
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/aufs3-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/aufs4"
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" && ERROR_PAX="Please use hardened sources"
78 +
79 + # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
80 + [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
81 +
82 + get_version
83 + kernel_is lt 3 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
84 + kernel_is gt 3 ${KERN_MAX_VER} 99 && die "kernel too new"
85 +
86 + linux-mod_pkg_setup
87 +
88 + if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
89 + PATCH_BRANCH="x-rcN"
90 + elif [[ "${KV_MINOR}" == "14" ]] && [[ "${KV_PATCH}" -ge "21" ]]; then
91 + PATCH_BRANCH="${KV_MINOR}".21+
92 + elif [[ "${KV_MINOR}" == "18" ]] && [[ "${KV_PATCH}" -ge "1" ]]; then
93 + PATCH_BRANCH="${KV_MINOR}".1+
94 + else
95 + PATCH_BRANCH="${KV_MINOR}"
96 + fi
97 +
98 + case ${KV_EXTRA} in
99 + "")
100 + elog "It seems you are using vanilla-sources with aufs3"
101 + elog "Please use sys-kernel/aufs-sources with USE=vanilla"
102 + elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
103 + ;;
104 + "-gentoo")
105 + elog "It seems you are using gentoo-sources with aufs3"
106 + elog "Please use sys-kernel/aufs-sources"
107 + elog "This will save you the nasty reemerge of sys-fs/aufs3 on every kernel upgrade"
108 + ;;
109 + esac
110 +
111 + pushd "${T}" &> /dev/null
112 + unpack ${A}
113 + cd ${PN}-standalone || die
114 + local module_branch=origin/${PN}.${PATCH_BRANCH}
115 + einfo "Using ${module_branch} as patch source"
116 + git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
117 + combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
118 + combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
119 + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
120 + if use kernel-patch; then
121 + cd ${KV_DIR}
122 + ewarn "Patching your kernel..."
123 + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
124 + epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
125 + ewarn "You need to compile your kernel with the applied patch"
126 + ewarn "to be able to load and use the aufs kernel module"
127 + else
128 + eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
129 + eerror "Either enable the kernel-patch useflag to do it with this ebuild"
130 + eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
131 + die "missing kernel patch, please apply it first"
132 + fi
133 + fi
134 + popd &> /dev/null
135 + export PKG_SETUP_HAS_BEEN_RAN=1
136 +}
137 +
138 +set_config() {
139 + for option in $*; do
140 + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
141 + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
142 + done
143 +}
144 +
145 +src_prepare() {
146 + local module_branch=origin/${PN}.${PATCH_BRANCH}
147 +
148 + einfo "Using for module creation branch ${module_branch}"
149 + git checkout -q -b local-gentoo ${module_branch} || die
150 +
151 + # All config options to off
152 + sed "s:= y:=:g" -i config.mk || die
153 +
154 + set_config RDU BRANCH_MAX_127 SBILIST
155 +
156 + use debug && set_config DEBUG
157 + use fuse && set_config BR_FUSE POLL
158 + use hfs && set_config BR_HFSPLUS
159 + use inotify && set_config HNOTIFY HFSNOTIFY
160 + use nfs && set_config EXPORT
161 + use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
162 + use ramfs && set_config BR_RAMFS
163 +
164 + if use pax_kernel; then
165 + if kernel_is ge 3 11; then
166 + epatch "${FILESDIR}"/pax-3.11.patch
167 + else
168 + epatch "${FILESDIR}"/pax-3.patch
169 + fi
170 + fi
171 +
172 + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
173 +}
174 +
175 +src_compile() {
176 + local ARCH=x86
177 +
178 + emake \
179 + CC=$(tc-getCC) \
180 + LD=$(tc-getLD) \
181 + LDFLAGS="$(raw-ldflags)" \
182 + ARCH=$(tc-arch-kernel) \
183 + CONFIG_AUFS_FS=m \
184 + KDIR="${KV_OUT_DIR}"
185 +}
186 +
187 +src_install() {
188 + linux-mod_src_install
189 +
190 + insinto /usr/share/doc/${PF}
191 +
192 + use doc && doins -r Documentation
193 +
194 + use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
195 +
196 + dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs3-loopback,vfs-ino,tmpfs-idr}.patch
197 +
198 + readme.gentoo_create_doc
199 +}
200 +
201 +pkg_postinst() {
202 + readme.gentoo_pkg_postinst
203 + linux-mod_pkg_postinst
204 +}