Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=interim.git;a=commitdiff;h=583a8b4bdc697d8b8f39478918b3675b1fc52b5f
commit 583a8b4bdc697d8b8f39478918b3675b1fc52b5f Author: Janos Kovacs <[EMAIL PROTECTED]> Date: Sat Jun 7 19:33:50 2008 +0200 virtualbox-1.6.2-1-i686 * review FrugalBuild * deleted unnecessary patchs * closes FS#2875 diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index ae9ddb7..3d17713 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -1,39 +1,33 @@ # Compiling Time: 3.03 SBU -# Maintainer: Janny <[EMAIL PROTECTED]> +# Maintainer: Janos Kovacs <[EMAIL PROTECTED]> # Contributor: AlexExtreme <[EMAIL PROTECTED]> pkgname=virtualbox realname=VirtualBox -pkgver=1.5.6_1 -pkgrel=9 +pkgver=1.6.2 +pkgrel=1 pkgdesc="InnoTek VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org"; -_F_kernelmod_scriptlet=$pkgname.install Finclude kernel-module -depends=([EMAIL PROTECTED] 'gcc' 'xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ - 'hal' 'libstdc++5' 'alsa-lib') +_F_kernelmod_scriptlet=${pkgname}.install +depends=([EMAIL PROTECTED] 'xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ + 'hal' 'libstdc++5' 'alsa-lib' 'qt4') +makedepends=([EMAIL PROTECTED] 'gcc-4.1') # For get-vbox-additions rodepends=('wget') groups=('xapps-extra') archs=('i686' '!x86_64') up2date="lynx -dump http://www.virtualbox.org/wiki/Downloads | grep 'OSE tarball' | sed 's/.*VirtualBox //' | sed 's/ OSE.*//'" -source=(http://www.virtualbox.org/download/$(echo $pkgver|sed 's/_.*//')/${realname}-${pkgver/_/-}_OSE.tar.bz2 \ - vboxsvc virtualbox get-vbox-additions README.Frugalware 60-virtualbox.rules \ - use-o3-to-workaround-gcc-ice.diff virtualbox-gcc43-fixes.diff virtualbox-validate-op-gcc43.diff \ - kernel-2.6.25.patch) -sha1sums=('1cb11c012b9143e14f2eada645757cae8886d0d1' \ +source=(http://www.virtualbox.org/download/${pkgver}/${realname}-${pkgver}-OSE.tar.bz2 \ + vboxsvc virtualbox get-vbox-additions README.Frugalware 60-virtualbox.rules) +_F_cd_path="${realname}-${pkgver}" +options=('scriptlet' 'genscriptlet') +sha1sums=('6811a580b70e651f36002f344033e1db1858fdef' \ 'e32ebff11bb235b50f8826b70d85dbcf4a56aee4' \ '3c0c856b9ad5f186405e87cf6eac09f1060b62cd' \ '07f49d0c5fac8311ec87d1a38a981de9ba3a4e07' \ '155be5405f4c91e5c7f4a51b5bac8fc4760a894c' \ - 'b9cb188f62148603b78a0b8c04b6fff369bb7b62' \ - 'f8875f474975d33ef2c8707bde4710c7c72f9727' \ - '17f6f99a344ac9a088fef826249a38e6cce2c11d' \ - 'c2d014abf3801f0a87142fc3a6d08a782cd5ef9c' \ - '6dfbfe1c50b78b17a6091e229abef77bf6e084ee') -_F_cd_path="${realname}-$(echo $pkgver|sed 's/_.*//')_OSE" -vboxrealpkgver="$(echo $pkgver|sed 's/_.*//')" -options=('scriptlet') + 'b9cb188f62148603b78a0b8c04b6fff369bb7b62') _F_desktop_name="$realname" _F_desktop_desc="InnoTek VirtualBox virtualization program" @@ -43,11 +37,6 @@ _F_desktop_categories="System;" build() { Fcd - Fpatchall - - # Desktop file - Ffilerel src/VBox/Installer/linux/VBox.png /usr/share/pixmaps/vbox.png - Fdesktop2 ## yeah fscking realize is 2007 and xfree died long time ago .. WTH! Fsed '/usr/X11R6/bin/xterm' '/usr/bin/xterm' \ @@ -56,26 +45,12 @@ build() { Fsed 'X11R6/' '' Config.kmk # Configure and load our options - ./configure \ - --disable-pulse \ - --with-xalan="-lxalan-c" \ - --with-xerces="-lxerces-c" \ - --with-qt-dir="/usr/lib/qt" || Fdie + ./configure --with-gcc-compat=/usr/bin/gcc-4.1 --disable-pulse || Fdie source ./env.sh || Fdie - # Build verbose so we can see what this *nice* kmk is doing ... -- crazy -- - # FIXME: figure the other kmk crap switches and force building with our LDFLAGS etc -- crazy -- - #kmk KBUILD_VERBOSE=2 \ - # TOOL_GCC3_CFLAGS="${CFLAGS}" TOOL_GCC3_CXXFLAGS="${CXXFLAGS}" TOOL_GCC3_LDFLAGS="${LDFLAGS}" \ - # TOOL_GCC3_CFLAGS.release="${CFLAGS}" TOOL_GCC3_CXXFLAGS.release="${CXXFLAGS}" all || Fdie - kmk KBUILD_VERBOSE=2 all || Fdie # Kernel module - # Always create the dirs before 'make ...' because there is a check to test the dirs - # Anyway this is a 'chroot|cross building' problem only -- crazy -- - # FIXME: kill that from here and use the kernel-module-src tarball - # there is no need to rebuild all that while an kernel bump -- crazy -- Fmkdir ${_F_kernelmod_dir}/kernel/misc cd out/linux.x86/release/bin/src || Fdie make KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=$Fdestdir/${_F_kernelmod_dir} \ @@ -89,18 +64,20 @@ build() { rm -rf sdk src tst* testcase additions/src || Fdie rm -f vboxdrv.ko SUPInstall SUPUninstall || Fdie cp -R * $Fdestdir/usr/lib/VirtualBox/ || Fdie - ## FIXME: that has to be done different - crazy - for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox vditool additions/vboxadd-timesync ; do chmod 0755 $Fdestdir/usr/lib/VirtualBox/${each} || Fdie done + # Desktop file + Fln "/usr/lib/VirtualBox/VBox.png" "/usr/share/pixmaps/vbox.png" + Fdesktop2 + # Install the wrappers - # FIXME: these wrappers are weird , do it different in 0.9 -- crazy -- Fexerel $Fsrcdir/vboxsvc /usr/bin/vboxsvc Fexerel $Fsrcdir/virtualbox /usr/bin/virtualbox - ## do it automagically so we don't forget to bump the version by accident =) (FS#2760) Fsed "version=" "version=$vboxrealpkgver" $Fsrcdir/get-vbox-additions Fexerel $Fsrcdir/get-vbox-additions /usr/bin/get-vbox-additions + ## udev rule Fexerel $Fsrcdir/60-virtualbox.rules /etc/udev/rules.d/60-virtualbox.rules diff --git a/source/xapps-extra/virtualbox/kernel-2.6.25.patch b/source/xapps-extra/virtualbox/kernel-2.6.25.patch deleted file mode 100644 index 41f1b60..0000000 --- a/source/xapps-extra/virtualbox/kernel-2.6.25.patch +++ /dev/null @@ -1,144 +0,0 @@ -diff -ur virtualbox-ose_1.5.6/r0drv/linux/the-linux-kernel.h virtualbox-ose/r0drv/linux/the-linux-kernel.h ---- src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2008-02-23 11:10:06.000000000 +0100 -+++ src/VBox/Runtime/r0drv/linux/the-linux-kernel.h 2008-02-27 01:57:20.000000000 +0100 -@@ -225,12 +225,16 @@ - #undef bool - - /* -- * There are post-2.6.24 kernels (confusingly with unchanged version number) -- * which eliminate macros which were marked as deprecated. -+ * The 2.6.25 kernel eliminates macros that were marked as deprecated and eliminates -+ * routine change_page_attr() in favor of the set_pages_* API. - */ - #ifndef __attribute_used__ - #define __attribute_used__ __used - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) -+int change_page_attr(struct page *page, int numpages, pgprot_t prot); -+#endif -+ - #endif - -diff -ur virtualbox-ose_1.5.6/linux/SUPDrv-linux.c virtualbox-ose/linux/SUPDrv-linux.c ---- src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2008-02-23 11:10:05.000000000 +0100 -+++ src/VBox/HostDrivers/Support/linux/SUPDrv-linux.c 2008-02-27 01:54:17.000000000 +0100 -@@ -2069,6 +2069,17 @@ - /* GCC C++ hack. */ - unsigned __gxx_personality_v0 = 0xcccccccc; - -+/* Add the change_page_attr routine for kernels 2.6.25 or later */ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 25) -+int change_page_attr(struct page *page, int numpages, pgprot_t prot) -+{ -+ /* use the set_pages_* API */ -+ if (pgprot_val(prot) & _PAGE_NX) -+ set_pages_nx(page, numpages); -+ set_pages_uc(page, numpages); -+ return 0; -+} -+#endif - - module_init(VBoxSupDrvInit); - module_exit(VBoxSupDrvUnload); -Index: src/VBox/Additions/linux/sharedfolders/vfsmod.c -=================================================================== ---- src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 7549) -+++ src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 7550) -@@ -224,7 +224,11 @@ - sb->s_blocksize = 1024; - sb->s_op = &sf_super_ops; - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ iroot = iget_locked (sb, 0); -+#else - iroot = iget (sb, 0); -+#endif - if (!iroot) { - err = -ENOMEM; /* XXX */ - LogFunc(("could not get root inode\n")); -@@ -234,6 +238,10 @@ - sf_init_inode (sf_g, iroot, &fsinfo); - SET_INODE_INFO (iroot, sf_i); - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ unlock_new_inode(iroot); -+#endif -+ - droot = d_alloc_root (iroot); - if (!droot) { - err = -ENOMEM; /* XXX */ -@@ -296,10 +304,12 @@ - the only thing that is known about inode at this point is its index - hence we can't do anything here, and let lookup/whatever with the - job to properly fill then [inode] */ -+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25) - static void - sf_read_inode (struct inode *inode) - { - } -+#endif - - /* vfs is done with [sb] (umount called) call [sf_glob_free] to unmap - the folder and free [sf_g] */ -@@ -337,7 +347,9 @@ - - static struct super_operations sf_super_ops = { - .clear_inode = sf_clear_inode, -+#if LINUX_VERSION_CODE < KERNEL_VERSION (2, 6, 25) - .read_inode = sf_read_inode, -+#endif - .put_super = sf_put_super, - .statfs = sf_statfs, - .remount_fs = sf_remount_fs -Index: src/VBox/Additions/linux/sharedfolders/dirops.c -=================================================================== ---- src/VBox/Additions/linux/sharedfolders/dirops.c (revision 7549) -+++ src/VBox/Additions/linux/sharedfolders/dirops.c (revision 7550) -@@ -291,7 +291,11 @@ - } - - ino = iunique (parent->i_sb, 1); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ inode = iget_locked (parent->i_sb, ino); -+#else - inode = iget (parent->i_sb, ino); -+#endif - if (!inode) { - LogFunc(("iget failed\n")); - err = -ENOMEM; /* XXX: ??? */ -@@ -301,6 +305,10 @@ - SET_INODE_INFO (inode, sf_new_i); - sf_init_inode (sf_g, inode, &fsinfo); - sf_new_i->path = path; -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ unlock_new_inode(inode); -+#endif - } - - sf_i->force_restat = 0; -@@ -342,7 +350,11 @@ - } - - ino = iunique (parent->i_sb, 1); -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ inode = iget_locked (parent->i_sb, ino); -+#else - inode = iget (parent->i_sb, ino); -+#endif - if (!inode) { - LogFunc(("iget failed. caller=%s\n", caller)); - err = -ENOMEM; -@@ -358,6 +370,11 @@ - sf_new_i->force_restat = 1; - - d_instantiate (dentry, inode); -+ -+#if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 25) -+ unlock_new_inode(inode); -+#endif -+ - return 0; - - fail1: diff --git a/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff b/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff deleted file mode 100644 index f3346be..0000000 --- a/source/xapps-extra/virtualbox/use-o3-to-workaround-gcc-ice.diff +++ /dev/null @@ -1,14 +0,0 @@ ---- src/recompiler/Makefile.kmk -+++ src/recompiler/Makefile.kmk -@@ -231,9 +231,9 @@ - - # Extra flags for these source modules. - target-i386/op.c_CFLAGS = -O2 -fno-strict-aliasing -fomit-frame-pointer -falign-functions=0 -fno-reorder-blocks -fno-optimize-sibling-calls --target-i386/op.c_CFLAGS.x86 = -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2 -+target-i386/op.c_CFLAGS.x86 = -O3 -fno-gcse -fno-instrument-functions -mpreferred-stack-boundary=2 - target-i386/op.c_CFLAGS.darwin.x86 = -m128bit-long-double -mpreferred-stack-boundary=4 --target-i386/helper.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse -+target-i386/helper.c_CFLAGS.x86 = -O3 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse - cpu-exec.c_CFLAGS.x86 = -O2 -fomit-frame-pointer -fno-strict-aliasing -fno-gcse - - diff --git a/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff b/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff deleted file mode 100644 index a508fb2..0000000 --- a/source/xapps-extra/virtualbox/virtualbox-gcc43-fixes.diff +++ /dev/null @@ -1,21 +0,0 @@ ---- src/VBox/Main/VMMDevInterface.cpp.old 2008-01-27 16:50:02.000000000 +0100 -+++ src/VBox/Main/VMMDevInterface.cpp 2008-01-27 16:50:28.000000000 +0100 -@@ -27,6 +27,7 @@ - #include <VBox/VBoxGuest.h> - #include <VBox/shflsvc.h> - #include <iprt/asm.h> -+#include <stdlib.h> - - #ifdef VBOX_HGCM - #include "hgcm/HGCM.h" ---- src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp.old 2008-01-27 16:49:32.000000000 +0100 -+++ src/VBox/Frontends/VirtualBox/src/VBoxGlobal.cpp 2008-01-27 16:49:48.000000000 +0100 -@@ -28,6 +28,8 @@ - #include "VBoxRegistrationDlg.h" - #endif - -+#include <stdlib.h> -+ - #include <qapplication.h> - #include <qmessagebox.h> - #include <qpixmap.h> diff --git a/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff b/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff deleted file mode 100644 index 34ac3ba..0000000 --- a/source/xapps-extra/virtualbox/virtualbox-validate-op-gcc43.diff +++ /dev/null @@ -1,13 +0,0 @@ -Index: src/recompiler/InnoTek/op-validate.sed -=================================================================== ---- src/recompiler/InnoTek/op-validate.sed.orig -+++ src/recompiler/InnoTek/op-validate.sed -@@ -63,6 +63,8 @@ s/^[[:blank:]]*ret[[:blank:]]*\n*[[:blan - /\.Lfe[0-9][0-9]*:/d - /\.LFE[0-9][0-9]*:/d - /size[[:space:]]/d -+/p2align[[:space:]]/d -+/^[/#][[:space:]]0[[:space:]]\"\"[[:space:]]2[[:space:]]*$/d - /^[/#]NO_APP[[:space:]]*$/d - /^$/!b bad - b end _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
