Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=eb6fe5b80809d438b4ab7a21a99b8d69d9c627de
commit eb6fe5b80809d438b4ab7a21a99b8d69d9c627de Author: Janos Kovacs <[email protected]> Date: Fri Jan 2 15:02:50 2009 +0100 virtualbox-2.1.0-1-i686 - version bump diff --git a/source/xapps-extra/virtualbox/60-virtualbox.rules b/source/xapps-extra/virtualbox/60-virtualbox.rules deleted file mode 100644 index 39b988a..0000000 --- a/source/xapps-extra/virtualbox/60-virtualbox.rules +++ /dev/null @@ -1 +0,0 @@ -KERNEL=="vboxdrv", NAME="%k", OWNER="root", GROUP="users", MODE="0666" diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index bd25003..78de43c 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -4,45 +4,33 @@ pkgname=virtualbox realname=VirtualBox -pkgver=2.0.6 -pkgrel=3 +pkgver=2.1.0 +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"; -Finclude kernel-module -_F_kernelmod_scriptlet=${pkgname}.install -install=${pkgname}.install -depends=(${depen...@]} 'xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ +depends=('xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'qt' 'libidl' 'sdl' \ 'hal' 'libstdc++5' 'alsa-lib' 'qt4-linguist') -makedepends=(${makedepen...@]} 'gcc-4.1') +makedepends=('kernel-source' 'kernel-headers' 'gcc-4.1') # For get-vbox-additions -rodepends=('wget') +rodepends=('wget' 'virtualbox-modules') groups=('xapps-extra') archs=('i686' '!x86_64') up2date="lynx -dump ${url}|grep released|sed 's/.* \([0-9.]*\) .*/\1/;q'" source=(http://download.virtualbox.org/virtualbox/${pkgver}/${realname}-${pkgver}-OSE.tar.bz2 \ - vboxsvc virtualbox get-vbox-additions 60-virtualbox.rules virtualbox.install README.Frugalware) + vboxsvc virtualbox get-vbox-additions README.Frugalware) _F_cd_path="${realname}-${pkgver}" options=('scriptlet' 'genscriptlet') -sha1sums=('e0f43d59b3309b37fe1703fb19b234f590598733' \ +sha1sums=('a6ad07118c4a1161c4afa44ccb95db25ef07b7e0' \ 'e32ebff11bb235b50f8826b70d85dbcf4a56aee4' \ '3c0c856b9ad5f186405e87cf6eac09f1060b62cd' \ '07f49d0c5fac8311ec87d1a38a981de9ba3a4e07' \ - 'b9cb188f62148603b78a0b8c04b6fff369bb7b62' \ - 'bf4bee9647bb3bf941ae99f3b4dd775f17df16dc' \ '155be5405f4c91e5c7f4a51b5bac8fc4760a894c') -_F_desktop_name="$realname" -_F_desktop_desc="InnoTek VirtualBox virtualization program" -_F_desktop_icon="vbox.png" -_F_desktop_exec="virtualbox" -_F_desktop_categories="System;" - build() { Fcd - ## yeah fscking realize is 2007 and xfree died long time ago .. WTH! Fsed '/usr/X11R6/bin/xterm' '/usr/bin/xterm' \ - src/VBox/Runtime/VBox/RTAssertDoBreakpoint-vbox.cpp + src/VBox/Runtime/VBox/RTAssertShouldPanic-vbox.cpp Fsed 'X11R6/' '' configure Fsed 'X11R6/' '' Config.kmk @@ -51,15 +39,7 @@ build() { --disable-pulse --disable-hardening || Fdie source ./env.sh || Fdie - kmk KBUILD_VERBOSE=2 all || Fdie - - # Kernel module - 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} \ - MODULE_DIR=${Fdestdir}/${_F_kernelmod_dir}/kernel/misc || Fdie - make KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=$Fdestdir/${_F_kernelmod_dir} \ - MODULE_DIR=${Fdestdir}/${_F_kernelmod_dir}/kernel/misc INSTALL_MOD_PATH=${Fdestdir} install || Fdie + kmk all || Fdie # Install it cd ${Fsrcdir}/${_F_cd_path}/out/linux.x86/release/bin || Fdie @@ -67,13 +47,15 @@ build() { rm -rf sdk src tst* testcase additions/src || Fdie rm -f vboxdrv.ko SUPInstall SUPUninstall || Fdie cp -R * ${Fdestdir}/usr/lib/VirtualBox/ || Fdie - for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox vditool additions/vboxadd-timesync ; do + for each in VBox{BFE,Manage,SDL,SVC,XPCOMIPCD,Tunctl} VirtualBox additions/vboxadd-timesync ; do # vditool chmod 0755 ${Fdestdir}/usr/lib/VirtualBox/${each} || Fdie done # Desktop file - Fln "/usr/lib/VirtualBox/VBox.png" "/usr/share/pixmaps/vbox.png" - Fdesktop2 + sed -i '/DocPath/d' ${Fdestdir}/usr/lib/VirtualBox/VirtualBox.desktop || Fdie + Fsed 'VirtualBox' 'virtualbox' ${Fdestdir}/usr/lib/VirtualBox/VirtualBox.desktop + Fln "/usr/lib/VirtualBox/VirtualBox.desktop" "/usr/share/applications/VirtualBox.desktop" + Fln "/usr/lib/VirtualBox/VBox.png" "/usr/share/pixmaps/VBox.png" # Install the wrappers Fexerel ${Fsrcdir}/vboxsvc /usr/bin/vboxsvc @@ -81,13 +63,8 @@ build() { 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 - ## Hacking files permission chmod 4511 ${Fdestdir}/usr/lib/VirtualBox/{VirtualBox,VBoxSDL,VBoxHeadless} || Fdie - - Fbuild_kernelmod_scriptlet } # optimization OK diff --git a/source/xapps-extra/virtualbox/virtualbox.install b/source/xapps-extra/virtualbox/virtualbox.install deleted file mode 100644 index 0ead8eb..0000000 --- a/source/xapps-extra/virtualbox/virtualbox.install +++ /dev/null @@ -1,63 +0,0 @@ - -common_install() -{ - /sbin/depmod -ea $_F_kernelmod_uname - echo -n "updating desktop database..." - if update-desktop-database > /dev/null 2>&1 ; then - echo " done." - else - echo " failed." - fi -} - -post_install() -{ - common_install - if ! grep -q vboxdrv /etc/sysconfig/modules; then - echo vboxdrv >>/etc/sysconfig/modules - fi - - if [ -e /lib/modules/`uname -r`/kernel/misc/vboxdrv.ko ]; then - modprobe vboxdrv - fi -} -pre_upgrade() -{ - # and that means there isn't vboxdrv in /etc/sysconfig/modules , add it here - # do not force in later upgrade(s) - # to be removed in 0.9 - if ! grep -q vboxdrv /etc/sysconfig/modules; then - echo vboxdrv >>/etc/sysconfig/modules - fi -} - -post_upgrade() -{ - common_install - ## if that exisit we bumped / upgraded the package only no new kernel - ## on a new kernel we do nothing because one has to reboot anyway - if [ -e /lib/modules/`uname -r`/kernel/misc/vboxdrv.ko ]; then - ## see if is loaded , if yes kill it and modprobe again if not do nothing - if grep -q vboxdrv /proc/modules; then - echo -n "reloading vboxdrv kernel module.." - rmmod vboxdrv - sleep 1 - modprobe vboxdrv - echo " done." - fi - fi -} - - -post_remove() -{ - if grep -q vboxdrv /proc/modules; then - rmmod vboxdrv - fi - sed '/^vboxdrv/d' -i /etc/sysconfig/modules - common_install -} - -op=$1 -shift -$op $* _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
