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: Mon, 21 Dec 2015 10:53:05
Message-Id: 1450695039.9bad55710628dd34589c6872d68bafe3c194cb61.jlec@gentoo
1 commit: 9bad55710628dd34589c6872d68bafe3c194cb61
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Mon Dec 21 10:50:39 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Mon Dec 21 10:50:39 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9bad5571
7
8 sys-fs/aufs4: Bump to latest aufs release
9
10 Package-Manager: portage-2.2.26
11 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
12
13 sys-fs/aufs4/Manifest | 1 +
14 sys-fs/aufs4/aufs4-0_pre20151221.ebuild | 164 ++++++++++++++++++++++++++++++++
15 2 files changed, 165 insertions(+)
16
17 diff --git a/sys-fs/aufs4/Manifest b/sys-fs/aufs4/Manifest
18 index 91d5164..2f6f689 100644
19 --- a/sys-fs/aufs4/Manifest
20 +++ b/sys-fs/aufs4/Manifest
21 @@ -11,3 +11,4 @@ DIST aufs4-standalone-0_pre20151012.tar.xz 651492 SHA256 3cb564a71a4d4fe4f16c941
22 DIST aufs4-standalone-0_pre20151102.tar.xz 677588 SHA256 5e0aa085e42dacc45991e49e485bf4f20cb911c71c8d5363ef2986733cb3d9ef SHA512 b4973078f31c50bb58afeb4fc5216a34d31b1dd4de60a5dd172962935becad60820146e22e39e88fc16a4c7a74e21923f02a77d6b0d8cd8aeef946806ed97932 WHIRLPOOL e04651079f1f04a74c330786ff3bbe72c367657ad8d0351ce251a4287ddee65231df410436f86474e6418b3e848eaa370f930376a2a1ad9fe57280b4d75be4cb
23 DIST aufs4-standalone-0_pre20151109.tar.xz 697760 SHA256 6dc6341cf729106d0f53b36f100c8d561992985f8dd8000a0956d716b10321a9 SHA512 dcacf98040bd51ad974582e1129b1993d8945b19449dd1e9ce855a5eb1502b05ab67196fa0f61e10eb45a3496d9866c0137122486ef9021704a59a41a7ffa944 WHIRLPOOL 2fd61080044b11f05514d55c9edabb345109cd217a7fcafdae3cc9c2cf8322a998da0f6416e20782ae9dfebd9483d7d87c3280bdf86d718bc2df993e11f2925a
24 DIST aufs4-standalone-0_pre20151116.tar.xz 741280 SHA256 362d56dac519b35e73cb93b0ed61442e9cfd01da463ab92579f7e231543dec66 SHA512 425adac57115b61af0d0db713cf60dfbd2820464b4e9beae84ae14bb2e37d99b4e940a67c82aae1fb7b1693a4c812e606239e7f7b254d62105da14973200b40e WHIRLPOOL 5d336ba26ffc4a9daa2675f28d88b53a306224bc42b2751f3cbe7d1fa2c34d93fb0babec82ff6aa844de56cfc5ddda17fc9deb5f1e6d43efc4b3a19389096be0
25 +DIST aufs4-standalone-0_pre20151221.tar.xz 782884 SHA256 7871f3159418956ab7498df800cf082c55ea84af82720c2fe254cfe0ddbb090f SHA512 a0f5e0af490209b3ac76bcb8c2ac31dcff05d881b9dad314c701ac84b990c26b0b5beb59f36ce5e373b6548052eeda1389bd8ba39a5be15b9eeea13dfc9b2c65 WHIRLPOOL 92cf2595e167a47f571d565a61e69dee779b8a7dc52400492eb52bf9107936787d570f48af517d935fedb8ef89cfafcdde0b8c0bae2968dd3e69a80b58e42f5d
26
27 diff --git a/sys-fs/aufs4/aufs4-0_pre20151221.ebuild b/sys-fs/aufs4/aufs4-0_pre20151221.ebuild
28 new file mode 100644
29 index 0000000..e30e5f2
30 --- /dev/null
31 +++ b/sys-fs/aufs4/aufs4-0_pre20151221.ebuild
32 @@ -0,0 +1,164 @@
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=3
44 +# highest supported version
45 +KERN_MAX_VER=4
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" && 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 4 ${KERN_MIN_VER} 0 && die "the kernel version isn't supported by upstream anymore. Please upgrade."
84 + kernel_is gt 4 ${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 + else
91 + PATCH_BRANCH="${KV_MINOR}"
92 + fi
93 +
94 + case ${KV_EXTRA} in
95 + "")
96 + elog "It seems you are using vanilla-sources with aufs4"
97 + elog "Please use sys-kernel/aufs-sources with USE=vanilla"
98 + elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
99 + ;;
100 + "-gentoo")
101 + elog "It seems you are using gentoo-sources with aufs4"
102 + elog "Please use sys-kernel/aufs-sources"
103 + elog "This will save you the nasty reemerge of sys-fs/aufs4 on every kernel upgrade"
104 + ;;
105 + esac
106 +
107 + pushd "${T}" &> /dev/null
108 + unpack ${A}
109 + cd ${PN}-standalone || die
110 + local module_branch=origin/${PN}.${PATCH_BRANCH}
111 + einfo "Using ${module_branch} as patch source"
112 + git checkout -q -b local-${PN}.${PATCH_BRANCH} ${module_branch} || die
113 + combinediff ${PN}-base.patch ${PN}-standalone.patch > "${T}"/combined-1.patch
114 + combinediff "${T}"/combined-1.patch ${PN}-mmap.patch > ${PN}-standalone-base-mmap-combined.patch
115 + if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < ${PN}-standalone-base-mmap-combined.patch > /dev/null ); then
116 + if use kernel-patch; then
117 + cd ${KV_DIR}
118 + ewarn "Patching your kernel..."
119 + patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch >/dev/null
120 + epatch "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
121 + ewarn "You need to compile your kernel with the applied patch"
122 + ewarn "to be able to load and use the aufs kernel module"
123 + else
124 + eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
125 + eerror "Either enable the kernel-patch useflag to do it with this ebuild"
126 + eerror "or apply "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch by hand"
127 + die "missing kernel patch, please apply it first"
128 + fi
129 + fi
130 + popd &> /dev/null
131 + export PKG_SETUP_HAS_BEEN_RAN=1
132 +}
133 +
134 +set_config() {
135 + for option in $*; do
136 + grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
137 + sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
138 + done
139 +}
140 +
141 +src_prepare() {
142 + local module_branch=origin/${PN}.${PATCH_BRANCH}
143 +
144 + einfo "Using for module creation branch ${module_branch}"
145 + git checkout -q -b local-gentoo ${module_branch} || die
146 +
147 + # All config options to off
148 + sed "s:= y:=:g" -i config.mk || die
149 +
150 + set_config RDU BRANCH_MAX_127 SBILIST
151 +
152 + use debug && set_config DEBUG
153 + use fuse && set_config BR_FUSE POLL
154 + use hfs && set_config BR_HFSPLUS
155 + use inotify && set_config HNOTIFY HFSNOTIFY
156 + use nfs && set_config EXPORT
157 + use nfs && ( use amd64 || use ppc64 ) && set_config INO_T_64
158 + use ramfs && set_config BR_RAMFS
159 +
160 + if use pax_kernel; then
161 + epatch "${FILESDIR}"/pax-4.patch
162 + fi
163 +
164 + sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
165 +}
166 +
167 +src_compile() {
168 + local ARCH=x86
169 +
170 + emake \
171 + CC=$(tc-getCC) \
172 + LD=$(tc-getLD) \
173 + LDFLAGS="$(raw-ldflags)" \
174 + ARCH=$(tc-arch-kernel) \
175 + CONFIG_AUFS_FS=m \
176 + KDIR="${KV_OUT_DIR}"
177 +}
178 +
179 +src_install() {
180 + linux-mod_src_install
181 +
182 + insinto /usr/share/doc/${PF}
183 +
184 + use doc && doins -r Documentation
185 +
186 + use kernel-patch || doins "${T}"/${PN}-standalone/${PN}-standalone-base-mmap-combined.patch
187 +
188 + dodoc Documentation/filesystems/aufs/README "${T}"/${PN}-standalone/{aufs4-loopback,vfs-ino,tmpfs-idr}.patch
189 +
190 + readme.gentoo_create_doc
191 +}
192 +
193 +pkg_postinst() {
194 + readme.gentoo_pkg_postinst
195 + linux-mod_pkg_postinst
196 +}