SPECS (AC-branch): VirtualBox.spec - edit src in prep - ac kernel ...

[glen]

Author: glen                         Date: Fri Feb 29 18:01:08 2008 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- edit src in prep
- ac kernel doesn't do local Module.symvers, and missing syms aren't fatal

---- Files affected:
SPECS:
   VirtualBox.spec (1.44.2.7 -> 1.44.2.8) 

---- Diffs:

================================================================
Index: SPECS/VirtualBox.spec
diff -u SPECS/VirtualBox.spec:1.44.2.7 SPECS/VirtualBox.spec:1.44.2.8
--- SPECS/VirtualBox.spec:1.44.2.7	Fri Feb 29 18:07:06 2008
+++ SPECS/VirtualBox.spec	Fri Feb 29 19:01:03 2008
@@ -315,6 +315,11 @@
 ../src/VBox/HostDrivers/Support/linux/export_modules modules.tar.gz && \
 	tar -zxf modules.tar.gz && rm -f modules.tar.gz
 
+%ifarch %{x8664}
+# HACK, is this really safe on x86_64?
+sed -i -e '/#.*define.*RTMEMALLOC_EXEC_HEAP/d' vboxadd/r0drv/linux/alloc-r0drv-linux.c vboxvfs/r0drv/linux/alloc-r0drv-linux.c
+%endif
+
 %build
 %if %{with userspace}
 ./configure \
@@ -327,14 +332,9 @@
 
 %if %{with kernel}
 cd PLD-MODULE-BUILD
-%ifarch %{x8664}
-# HACK, is this really safe on x86_64?
-sed -i -e 's:#.*define.*RTMEMALLOC_EXEC_HEAP::g' vboxadd/r0drv/linux/alloc-r0drv-linux.c vboxvfs/r0drv/linux/alloc-r0drv-linux.c
-%endif
 %build_kernel_modules -m vboxadd -C vboxadd
 %build_kernel_modules -m vboxdrv -C vboxdrv
-cp -a vboxadd/Module.symvers vboxvfs
-%build_kernel_modules -m vboxvfs -C vboxvfs -c
+%build_kernel_modules -m vboxvfs -C vboxvfs
 cd ..
 %endif
 
@@ -385,10 +385,10 @@
 
 install out/linux.%{outdir}/release/bin/VBox.png $RPM_BUILD_ROOT%{_pixmapsdir}/VBox.png
 install %{SOURCE4} $RPM_BUILD_ROOT%{_desktopdir}/%{pname}.desktop
-%endif
 
 install -d $RPM_BUILD_ROOT/etc/udev/rules.d
 install udev.conf $RPM_BUILD_ROOT/etc/udev/rules.d/virtualbox.rules
+%endif
 
 %if %{with kernel}
 %install_kernel_modules -m PLD-MODULE-BUILD/vboxadd/vboxadd -d misc
@@ -552,6 +552,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44.2.8  2008-02-29 18:01:03  glen
+- edit src in prep
+- ac kernel doesn't do local Module.symvers, and missing syms aren't fatal
+
 Revision 1.44.2.7  2008-02-29 17:07:06  glen
 - no kver for -udev
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/VirtualBox.spec?r1=1.44.2.7&r2=1.44.2.8&f=u