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: ChangeLog aufs3-3_p20120430.ebuild
Date: Mon, 30 Apr 2012 06:03:58
Message-Id: 20120430060349.696DD2004B@flycatcher.gentoo.org
1 jlec 12/04/30 06:03:49
2
3 Modified: ChangeLog
4 Added: aufs3-3_p20120430.ebuild
5 Log:
6 sys-fs/aufs3: Version Bump
7
8 (Portage version: 2.2.0_alpha101/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.12 sys-fs/aufs3/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/ChangeLog?rev=1.12&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/ChangeLog?rev=1.12&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/ChangeLog?r1=1.11&r2=1.12
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v
20 retrieving revision 1.11
21 retrieving revision 1.12
22 diff -u -r1.11 -r1.12
23 --- ChangeLog 28 Apr 2012 06:59:11 -0000 1.11
24 +++ ChangeLog 30 Apr 2012 06:03:49 -0000 1.12
25 @@ -1,6 +1,12 @@
26 # ChangeLog for sys-fs/aufs3
27 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.11 2012/04/28 06:59:11 jlec Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/ChangeLog,v 1.12 2012/04/30 06:03:49 jlec Exp $
30 +
31 +*aufs3-3_p20120430 (30 Apr 2012)
32 +
33 + 30 Apr 2012; Justin Lecher <jlec@g.o> files/aufs3-base-x-rcN.patch,
34 + files/aufs3-standalone-x-rcN.patch, +aufs3-3_p20120430.ebuild:
35 + Version Bump
36
37 28 Apr 2012; Justin Lecher <jlec@g.o> aufs3-3_p20120402.ebuild,
38 +files/parallel.patch:
39
40
41
42 1.1 sys-fs/aufs3/aufs3-3_p20120430.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120430.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120430.ebuild?rev=1.1&content-type=text/plain
46
47 Index: aufs3-3_p20120430.ebuild
48 ===================================================================
49 # Copyright 1999-2012 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/sys-fs/aufs3/aufs3-3_p20120430.ebuild,v 1.1 2012/04/30 06:03:49 jlec Exp $
52
53 EAPI=4
54
55 inherit linux-mod multilib toolchain-funcs
56
57 AUFS_VERSION="${PV%%_p*}"
58 PATCH_MAX_VER="3"
59 UTIL_MAX_VER="0"
60
61 DESCRIPTION="An entirely re-designed and re-implemented Unionfs"
62 HOMEPAGE="http://aufs.sourceforge.net/"
63 SRC_URI="http://dev.gentoo.org/~jlec/distfiles/${P}.tar.xz"
64
65 LICENSE="GPL-2"
66 SLOT="0"
67 KEYWORDS="~amd64 ~x86"
68 IUSE="debug doc fuse pax_kernel hfs inotify kernel-patch nfs ramfs"
69
70 DEPEND="dev-vcs/git"
71 RDEPEND="
72 !sys-fs/aufs
73 !sys-fs/aufs2"
74
75 S="${WORKDIR}"/${PN}-standalone
76
77 MODULE_NAMES="aufs(misc:${S})"
78
79 pkg_setup() {
80 CONFIG_CHECK="${CONFIG_CHECK} ~EXPERIMENTAL"
81 use inotify && CONFIG_CHECK="${CONFIG_CHECK} ~FSNOTIFY"
82 use nfs && CONFIG_CHECK="${CONFIG_CHECK} EXPORTFS"
83 use fuse && CONFIG_CHECK="${CONFIG_CHECK} ~FUSE_FS"
84 use hfs && CONFIG_CHECK="${CONFIG_CHECK} ~HFSPLUS_FS"
85
86 # this is needed so merging a binpkg ${PN} is possible w/out a kernel unpacked on the system
87 [ -n "$PKG_SETUP_HAS_BEEN_RAN" ] && return
88
89 get_version
90 kernel_is lt 3 0 0 && die "kernel too old, Please use sys-fs/aufs2"
91 kernel_is gt 3 4 99 && die "kernel too new"
92
93 linux-mod_pkg_setup
94
95 if [[ "${KV_MINOR}" -gt "${PATCH_MAX_VER}" ]]; then
96 PATCH_BRANCH="x-rcN"
97 else
98 PATCH_BRANCH="${KV_MINOR}"
99 fi
100
101 if [[ "${PATCH_BRANCH}" == "x-rcN" ]]; then
102 UTIL_BRANCH="x-rcN"
103 elif [[ "${KV_MINOR}" -gt "${UTIL_MAX_VER}" ]]; then
104 UTIL_BRANCH="${UTIL_MAX_VER}"
105 else
106 UTIL_BRANCH="${KV_MINOR}"
107 fi
108
109 if ! ( patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null && \
110 patch -p1 --dry-run --force -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null ); then
111 if use kernel-patch; then
112 cd ${KV_DIR}
113 ewarn "Patching your kernel..."
114 patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-standalone-${PATCH_BRANCH}.patch >/dev/null
115 patch --no-backup-if-mismatch --force -p1 -R -d ${KV_DIR} < "${FILESDIR}"/${PN}-base-${PATCH_BRANCH}.patch >/dev/null
116 epatch "${FILESDIR}"/${PN}-{base,standalone}-${PATCH_BRANCH}.patch
117 ewarn "You need to compile your kernel with the applied patch"
118 ewarn "to be able to load and use the aufs kernel module"
119 else
120 eerror "You need to apply a patch to your kernel to compile and run the ${PN} module"
121 eerror "Either enable the kernel-patch useflag to do it with this ebuild"
122 eerror "or apply ${FILESDIR}/${PN}-base-${PATCH_BRANCH}.patch and"
123 eerror "${FILESDIR}/${PN}-standalone-${PATCH_BRANCH}.patch by hand"
124 die "missing kernel patch, please apply it first"
125 fi
126 fi
127 export PKG_SETUP_HAS_BEEN_RAN=1
128 }
129
130 set_config() {
131 for option in $*; do
132 grep -q "^CONFIG_AUFS_${option} =" config.mk || die "${option} is not a valid config option"
133 sed "/^CONFIG_AUFS_${option}/s:=:= y:g" -i config.mk || die
134 done
135 }
136
137 src_prepare() {
138 local module_branch=origin/${PN}.${PATCH_BRANCH}
139 local util_branch=origin/${PN}.${UTIL_BRANCH}
140
141 einfo "Using for module creation branch ${module_branch}"
142 git checkout -q -b local-gentoo ${module_branch} || die
143
144 # All config options to off
145 sed "s:= y:=:g" -i config.mk || die
146
147 set_config RDU BRANCH_MAX_127 SBILIST
148
149 use debug && set_config DEBUG
150 use fuse && set_config BR_FUSE POLL
151 use hfs && set_config BR_HFSPLUS
152 use inotify && set_config HNOTIFY HFSNOTIFY
153 use nfs && set_config EXPORT
154 use nfs && use amd64 && set_config INO_T_64
155 use ramfs && set_config BR_RAMFS
156
157 use pax_kernel && epatch "${FILESDIR}"/pax.patch
158
159 sed -i "s:aufs.ko usr/include/linux/aufs_type.h:aufs.ko:g" Makefile || die
160 sed -i "s:__user::g" include/linux/aufs_type.h || die
161
162 cd "${WORKDIR}"/${PN/3}-util
163
164 einfo "Using for utils building branch ${util_branch}"
165 git checkout -b local-gentoo ${util_branch} || die
166 sed -i "/LDFLAGS += -static -s/d" Makefile || die
167 sed -i -e "s:m 644 -s:m 644:g" -e "s:/usr/lib:/usr/$(get_libdir):g" libau/Makefile || die
168 }
169
170 src_compile() {
171 local ARCH=x86
172
173 emake CC=$(tc-getCC) CONFIG_AUFS_FS=m KDIR=${KV_DIR}
174
175 cd "${WORKDIR}"/${PN/3}-util
176 emake CC=$(tc-getCC) AR=$(tc-getAR) KDIR=${KV_DIR} C_INCLUDE_PATH="${S}"/include
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 dodoc README
187
188 cd "${WORKDIR}"/${PN/3}-util
189 emake DESTDIR="${D}" KDIR=${KV_DIR} install
190
191 newdoc README README-utils
192 }