- install rel files (works now on x86_64 th)

[packages/VirtualBox.git] / VirtualBox.spec

diff --git a/VirtualBox.spec b/VirtualBox.spec
index e6c2e26c6173c180a1b88efb6aa352acac59a061..6cda03af542f72d4ffb0436e062178093741c4a0 100644 (file)
--- a/VirtualBox.spec
+++ b/VirtualBox.spec
@@ -226,10 +226,17 @@ install %{SOURCE1} .
 KDIR="%{_builddir}/%{buildsubdir}/kernel"
 mkdir -p $KDIR
 cp -Ra %{_kernelsrcdir}/include $KDIR
+%ifarch %{x8664} %{ix86}
+if [ -d $KDIR/include/asm-x86 ]; then
+ln -sf $KDIR/include/asm-x86 $KDIR/include/asm
 %ifarch %{x8664}
-ln -sf $KDIR/include/asm-x86_64 $KDIR/include/asm
+else
+       ln -sf $KDIR/include/asm-x86_64 $KDIR/include/asm
 %else
-ln -sf $KDIR/include/asm-i386 $KDIR/include/asm
+else
+       ln -sf $KDIR/include/asm-i386 $KDIR/include/asm
+%endif
+fi
 %endif
 
 %if %{with dist_kernel}
@@ -255,6 +262,11 @@ rm -rf PLD-MODULE-BUILD && mkdir PLD-MODULE-BUILD && cd PLD-MODULE-BUILD
 ../src/VBox/Additions/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 '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
@@ -281,7 +293,7 @@ for f in {VBox{BFE,Manage,SDL,SVC,XPCOMIPCD},VirtualBox,vditool}; do
        ln -s %{_libdir}/VirtualBox/VirtualBox-wrapper.sh $RPM_BUILD_ROOT%{_bindir}/$f
 done
 
-install out/linux.%{outdir}/release/bin/VBox*.so \
+install out/linux.%{outdir}/release/bin/VBox*.{so,rel} \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox
 install out/linux.%{outdir}/release/bin/{VBox{DD,DD2}{GC.gc,R0.r0},VMM{GC.gc,R0.r0},*.xpt} \
        $RPM_BUILD_ROOT%{_libdir}/VirtualBox