1 |
polynomial-c 11/06/30 15:53:49 |
2 |
|
3 |
Modified: virtualbox-guest-additions-3.2.12.ebuild ChangeLog |
4 |
Log: |
5 |
Fixed compilation with linux kernel >=2.6.33 (bug #373585) |
6 |
|
7 |
(Portage version: 2.2.0_alpha41/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.6 app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild?rev=1.6&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild?rev=1.6&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild?r1=1.5&r2=1.6 |
15 |
|
16 |
Index: virtualbox-guest-additions-3.2.12.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild,v |
19 |
retrieving revision 1.5 |
20 |
retrieving revision 1.6 |
21 |
diff -u -r1.5 -r1.6 |
22 |
--- virtualbox-guest-additions-3.2.12.ebuild 3 Feb 2011 07:55:48 -0000 1.5 |
23 |
+++ virtualbox-guest-additions-3.2.12.ebuild 30 Jun 2011 15:53:49 -0000 1.6 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2011 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild,v 1.5 2011/02/03 07:55:48 tomka Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-3.2.12.ebuild,v 1.6 2011/06/30 15:53:49 polynomial-c Exp $ |
29 |
|
30 |
inherit eutils linux-mod |
31 |
|
32 |
@@ -15,17 +15,17 @@ |
33 |
IUSE="X" |
34 |
|
35 |
RDEPEND="X? ( ~x11-drivers/xf86-video-virtualbox-${PV} |
36 |
- ~x11-drivers/xf86-input-virtualbox-${PV} |
37 |
- x11-apps/xrandr |
38 |
- x11-apps/xrefresh |
39 |
- x11-libs/libXmu |
40 |
- x11-libs/libX11 |
41 |
- x11-libs/libXt |
42 |
- x11-libs/libXext |
43 |
- x11-libs/libXau |
44 |
- x11-libs/libXdmcp |
45 |
- x11-libs/libSM |
46 |
- x11-libs/libICE )" |
47 |
+ ~x11-drivers/xf86-input-virtualbox-${PV} |
48 |
+ x11-apps/xrandr |
49 |
+ x11-apps/xrefresh |
50 |
+ x11-libs/libXmu |
51 |
+ x11-libs/libX11 |
52 |
+ x11-libs/libXt |
53 |
+ x11-libs/libXext |
54 |
+ x11-libs/libXau |
55 |
+ x11-libs/libXdmcp |
56 |
+ x11-libs/libSM |
57 |
+ x11-libs/libICE )" |
58 |
DEPEND="${RDEPEND} |
59 |
>=dev-util/kbuild-0.1.5-r1 |
60 |
>=dev-lang/yasm-0.6.2 |
61 |
@@ -39,150 +39,155 @@ |
62 |
BUILD_TARGETS="all" |
63 |
BUILD_TARGET_ARCH="${ARCH}" |
64 |
MODULE_NAMES="vboxguest(misc:${WORKDIR}/vboxguest:${WORKDIR}/vboxguest) |
65 |
- vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)" |
66 |
+ vboxsf(misc:${WORKDIR}/vboxsf:${WORKDIR}/vboxsf)" |
67 |
|
68 |
S=${WORKDIR}/${MY_P/-OSE/_OSE} |
69 |
|
70 |
pkg_setup() { |
71 |
- linux-mod_pkg_setup |
72 |
- BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" |
73 |
- enewgroup vboxguest |
74 |
- enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest |
75 |
+ linux-mod_pkg_setup |
76 |
+ BUILD_PARAMS="KERN_DIR=${KV_DIR} KERNOUT=${KV_OUT_DIR}" |
77 |
+ enewgroup vboxguest |
78 |
+ enewuser vboxguest -1 /bin/sh /var/run/vboxguest vboxguest |
79 |
} |
80 |
|
81 |
src_unpack() { |
82 |
- unpack ${A} |
83 |
+ unpack ${A} |
84 |
|
85 |
- # Create and unpack a tarball with the sources of the Linux guest |
86 |
- # kernel modules, to include all the needed files |
87 |
- "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz" |
88 |
- unpack ./vbox-kmod.tar.gz |
89 |
- |
90 |
- # PaX fixes (see bug #298988) |
91 |
- epatch "${FILESDIR}"/vboxguest-log-use-c99.patch |
92 |
- |
93 |
- # Remove shipped binaries (kBuild,yasm), see bug #232775 |
94 |
- cd "${S}" |
95 |
- rm -rf kBuild/bin tools |
96 |
- |
97 |
- # Disable things unused or splitted into separate ebuilds |
98 |
- cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk |
99 |
- |
100 |
- # stupid new header references... |
101 |
- for vboxheader in {product,revision}-generated.h ; do |
102 |
- for mdir in vbox{guest,sf} ; do |
103 |
- ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ |
104 |
- "${WORKDIR}/${mdir}/${vboxheader}" |
105 |
- done |
106 |
+ # Create and unpack a tarball with the sources of the Linux guest |
107 |
+ # kernel modules, to include all the needed files |
108 |
+ "${MY_P/-OSE/_OSE}"/src/VBox/Additions/linux/export_modules "${WORKDIR}/vbox-kmod.tar.gz" |
109 |
+ unpack ./vbox-kmod.tar.gz |
110 |
+ |
111 |
+ if kernel_is -ge 2 6 33 ; then |
112 |
+ # evil patch for new kernels - header moved |
113 |
+ grep -lR linux/autoconf.h * | xargs sed -i -e \ |
114 |
+ 's:<linux/autoconf.h>:<generated/autoconf.h>:' |
115 |
+ fi |
116 |
+ |
117 |
+ # PaX fixes (see bug #298988) |
118 |
+ epatch "${FILESDIR}"/vboxguest-log-use-c99.patch |
119 |
+ |
120 |
+ # Remove shipped binaries (kBuild,yasm), see bug #232775 |
121 |
+ cd "${S}" |
122 |
+ rm -rf kBuild/bin tools |
123 |
+ |
124 |
+ # Disable things unused or splitted into separate ebuilds |
125 |
+ cp "${FILESDIR}/${PN}-3-localconfig" LocalConfig.kmk |
126 |
+ |
127 |
+ # stupid new header references... |
128 |
+ for vboxheader in {product,revision}-generated.h ; do |
129 |
+ for mdir in vbox{guest,sf} ; do |
130 |
+ ln -sf "${S}"/out/linux.${ARCH}/release/${vboxheader} \ |
131 |
+ "${WORKDIR}/${mdir}/${vboxheader}" |
132 |
done |
133 |
+ done |
134 |
} |
135 |
|
136 |
src_compile() { |
137 |
- # build the user-space tools, warnings are harmless |
138 |
- ./configure --nofatal \ |
139 |
- --disable-xpcom \ |
140 |
- --disable-sdl-ttf \ |
141 |
- --disable-pulse \ |
142 |
- --disable-alsa \ |
143 |
- --build-headless || die "configure failed" |
144 |
- source ./env.sh |
145 |
- |
146 |
- for each in /src/VBox/{Runtime,Additions/common} \ |
147 |
- /src/VBox/Additions/linux/{sharedfolders,daemon} ; do |
148 |
- cd "${S}"${each} |
149 |
- MAKE="kmk" emake TOOL_YASM_AS=yasm \ |
150 |
- KBUILD_PATH="${S}/kBuild" \ |
151 |
- || die "kmk VBoxControl failed" |
152 |
- done |
153 |
- |
154 |
- if use X; then |
155 |
- cd "${S}"/src/VBox/Additions/x11/VBoxClient |
156 |
- MAKE="kmk" emake TOOL_YASM_AS=yasm \ |
157 |
- KBUILD_PATH="${S}/kBuild" \ |
158 |
- || die "kmk VBoxClient failed" |
159 |
- fi |
160 |
- |
161 |
- # Now creating the kernel modules. We must do this _after_ |
162 |
- # we compiled the user-space tools as we need two of the |
163 |
- # automatically generated header files. (>=3.2.0) |
164 |
- linux-mod_src_compile |
165 |
+ # build the user-space tools, warnings are harmless |
166 |
+ ./configure --nofatal \ |
167 |
+ --disable-xpcom \ |
168 |
+ --disable-sdl-ttf \ |
169 |
+ --disable-pulse \ |
170 |
+ --disable-alsa \ |
171 |
+ --build-headless || die "configure failed" |
172 |
+ source ./env.sh |
173 |
+ |
174 |
+ for each in /src/VBox/{Runtime,Additions/common} \ |
175 |
+ /src/VBox/Additions/linux/{sharedfolders,daemon} ; do |
176 |
+ cd "${S}"${each} |
177 |
+ MAKE="kmk" emake TOOL_YASM_AS=yasm \ |
178 |
+ KBUILD_PATH="${S}/kBuild" \ |
179 |
+ || die "kmk VBoxControl failed" |
180 |
+ done |
181 |
+ |
182 |
+ if use X; then |
183 |
+ cd "${S}"/src/VBox/Additions/x11/VBoxClient |
184 |
+ MAKE="kmk" emake TOOL_YASM_AS=yasm \ |
185 |
+ KBUILD_PATH="${S}/kBuild" \ |
186 |
+ || die "kmk VBoxClient failed" |
187 |
+ fi |
188 |
+ |
189 |
+ # Now creating the kernel modules. We must do this _after_ |
190 |
+ # we compiled the user-space tools as we need two of the |
191 |
+ # automatically generated header files. (>=3.2.0) |
192 |
+ linux-mod_src_compile |
193 |
} |
194 |
|
195 |
src_install() { |
196 |
- linux-mod_src_install |
197 |
+ linux-mod_src_install |
198 |
|
199 |
- cd "${S}"/out/linux.${ARCH}/release/bin/additions |
200 |
+ cd "${S}"/out/linux.${ARCH}/release/bin/additions |
201 |
|
202 |
- insinto /sbin |
203 |
- newins mount.vboxsf mount.vboxsf |
204 |
- fperms 4755 /sbin/mount.vboxsf |
205 |
- |
206 |
- newinitd "${FILESDIR}"/${PN}-7.initd ${PN} |
207 |
- |
208 |
- insinto /usr/sbin/ |
209 |
- newins VBoxService vboxguest-service |
210 |
- fperms 0755 /usr/sbin/vboxguest-service |
211 |
- |
212 |
- insinto /usr/bin |
213 |
- doins VBoxControl |
214 |
- fperms 0755 /usr/bin/VBoxControl |
215 |
- |
216 |
- # VBoxClient user service and xrandr wrapper |
217 |
- if use X; then |
218 |
- doins VBoxClient |
219 |
- fperms 0755 /usr/bin/VBoxClient |
220 |
- |
221 |
- cd "${S}"/src/VBox/Additions/x11/Installer |
222 |
- newins 98vboxadd-xclient VBoxClient-all |
223 |
- fperms 0755 /usr/bin/VBoxClient-all |
224 |
- fi |
225 |
- |
226 |
- # udev rule for vboxdrv |
227 |
- dodir /etc/udev/rules.d |
228 |
- echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ |
229 |
- >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" |
230 |
- echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ |
231 |
- >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" |
232 |
- |
233 |
- # VBoxClient autostart file |
234 |
- insinto /etc/xdg/autostart |
235 |
- doins "${FILESDIR}"/vboxclient.desktop |
236 |
- |
237 |
- # sample xorg.conf |
238 |
- insinto /usr/share/doc/${PF} |
239 |
- doins "${FILESDIR}"/xorg.conf.vbox |
240 |
+ insinto /sbin |
241 |
+ newins mount.vboxsf mount.vboxsf |
242 |
+ fperms 4755 /sbin/mount.vboxsf |
243 |
+ |
244 |
+ newinitd "${FILESDIR}"/${PN}-7.initd ${PN} |
245 |
+ |
246 |
+ insinto /usr/sbin/ |
247 |
+ newins VBoxService vboxguest-service |
248 |
+ fperms 0755 /usr/sbin/vboxguest-service |
249 |
+ |
250 |
+ insinto /usr/bin |
251 |
+ doins VBoxControl |
252 |
+ fperms 0755 /usr/bin/VBoxControl |
253 |
+ |
254 |
+ # VBoxClient user service and xrandr wrapper |
255 |
+ if use X; then |
256 |
+ doins VBoxClient |
257 |
+ fperms 0755 /usr/bin/VBoxClient |
258 |
+ cd "${S}"/src/VBox/Additions/x11/Installer |
259 |
+ newins 98vboxadd-xclient VBoxClient-all |
260 |
+ fperms 0755 /usr/bin/VBoxClient-all |
261 |
+ fi |
262 |
+ |
263 |
+ # udev rule for vboxdrv |
264 |
+ dodir /etc/udev/rules.d |
265 |
+ echo 'KERNEL=="vboxguest", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ |
266 |
+ >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" |
267 |
+ echo 'KERNEL=="vboxuser", OWNER="vboxguest", GROUP="vboxguest", MODE="0660"' \ |
268 |
+ >> "${D}/etc/udev/rules.d/60-virtualbox-guest-additions.rules" |
269 |
+ |
270 |
+ # VBoxClient autostart file |
271 |
+ insinto /etc/xdg/autostart |
272 |
+ doins "${FILESDIR}"/vboxclient.desktop |
273 |
+ |
274 |
+ # sample xorg.conf |
275 |
+ insinto /usr/share/doc/${PF} |
276 |
+ doins "${FILESDIR}"/xorg.conf.vbox |
277 |
} |
278 |
|
279 |
pkg_postinst() { |
280 |
- linux-mod_pkg_postinst |
281 |
- if ! useq X ; then |
282 |
- elog "use flag X is off, enable it to install the" |
283 |
- elog "X Window System input and video drivers" |
284 |
- fi |
285 |
- elog "" |
286 |
- elog "Please add users to the \"vboxguest\" group so they can" |
287 |
- elog "benefit from seamless mode, auto-resize and clipboard." |
288 |
- elog "" |
289 |
- elog "Please add:" |
290 |
- elog "/etc/init.d/${PN}" |
291 |
- elog "to the default runlevel in order to start" |
292 |
- elog "needed services." |
293 |
- elog "To use the VirtualBox X drivers, use the following" |
294 |
- elog "file as your /etc/X11/xorg.conf:" |
295 |
- elog " /usr/share/doc/${PF}/xorg.conf.xorg" |
296 |
- elog "" |
297 |
- elog "Also make sure you use the Mesa library for OpenGL:" |
298 |
- elog " eselect opengl set xorg-x11" |
299 |
- elog "" |
300 |
- elog "An autostart .desktop file has been installed to start" |
301 |
- elog "VBoxClient in desktop sessions." |
302 |
- elog "" |
303 |
- elog "You can mount shared folders with:" |
304 |
- elog " mount -t vboxsf <shared_folder_name> <mount_point>" |
305 |
- elog "" |
306 |
- elog "Warning:" |
307 |
- elog "this ebuild is only needed if you are running gentoo" |
308 |
- elog "inside a VirtualBox Virtual Machine, you don't need" |
309 |
- elog "it to run VirtualBox itself." |
310 |
- elog "" |
311 |
+ linux-mod_pkg_postinst |
312 |
+ if ! useq X ; then |
313 |
+ elog "use flag X is off, enable it to install the" |
314 |
+ elog "X Window System input and video drivers" |
315 |
+ fi |
316 |
+ elog "" |
317 |
+ elog "Please add users to the \"vboxguest\" group so they can" |
318 |
+ elog "benefit from seamless mode, auto-resize and clipboard." |
319 |
+ elog "" |
320 |
+ elog "Please add:" |
321 |
+ elog "/etc/init.d/${PN}" |
322 |
+ elog "to the default runlevel in order to start" |
323 |
+ elog "needed services." |
324 |
+ elog "To use the VirtualBox X drivers, use the following" |
325 |
+ elog "file as your /etc/X11/xorg.conf:" |
326 |
+ elog " /usr/share/doc/${PF}/xorg.conf.xorg" |
327 |
+ elog "" |
328 |
+ elog "Also make sure you use the Mesa library for OpenGL:" |
329 |
+ elog " eselect opengl set xorg-x11" |
330 |
+ elog "" |
331 |
+ elog "An autostart .desktop file has been installed to start" |
332 |
+ elog "VBoxClient in desktop sessions." |
333 |
+ elog "" |
334 |
+ elog "You can mount shared folders with:" |
335 |
+ elog " mount -t vboxsf <shared_folder_name> <mount_point>" |
336 |
+ elog "" |
337 |
+ elog "Warning:" |
338 |
+ elog "this ebuild is only needed if you are running gentoo" |
339 |
+ elog "inside a VirtualBox Virtual Machine, you don't need" |
340 |
+ elog "it to run VirtualBox itself." |
341 |
+ elog "" |
342 |
} |
343 |
|
344 |
|
345 |
|
346 |
1.70 app-emulation/virtualbox-guest-additions/ChangeLog |
347 |
|
348 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog?rev=1.70&view=markup |
349 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog?rev=1.70&content-type=text/plain |
350 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog?r1=1.69&r2=1.70 |
351 |
|
352 |
Index: ChangeLog |
353 |
=================================================================== |
354 |
RCS file: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v |
355 |
retrieving revision 1.69 |
356 |
retrieving revision 1.70 |
357 |
diff -u -r1.69 -r1.70 |
358 |
--- ChangeLog 28 Jun 2011 20:50:39 -0000 1.69 |
359 |
+++ ChangeLog 30 Jun 2011 15:53:49 -0000 1.70 |
360 |
@@ -1,6 +1,11 @@ |
361 |
# ChangeLog for app-emulation/virtualbox-guest-additions |
362 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
363 |
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.69 2011/06/28 20:50:39 polynomial-c Exp $ |
364 |
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/virtualbox-guest-additions/ChangeLog,v 1.70 2011/06/30 15:53:49 polynomial-c Exp $ |
365 |
+ |
366 |
+ 30 Jun 2011; Lars Wendler <polynomial-c@g.o> |
367 |
+ virtualbox-guest-additions-3.2.12.ebuild: |
368 |
+ Fixed compilation with linux kernel >=2.6.33. Thanks to Jimis Hol for |
369 |
+ reporting this issue in bug #373585. |
370 |
|
371 |
*virtualbox-guest-additions-4.0.10 (28 Jun 2011) |