Gentoo Archives: gentoo-commits

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