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