Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=1ebb6dfc330c2d9dff56deacea3077df0a3c9a44
commit 1ebb6dfc330c2d9dff56deacea3077df0a3c9a44 Author: crazy <[email protected]> Date: Thu Oct 19 23:45:24 2017 +0200 virtualbox-5.2.0-1-x86_64 * Version bump * updated FB to work with 5.2* changes * please note for host-only-network-GUI 'vboxnetadp' and 'vboxnetflt' need to be loaded too .. I guess is time to re-add some wrapper. diff --git a/source/xapps-extra/virtualbox/FrugalBuild b/source/xapps-extra/virtualbox/FrugalBuild index e1c99b6..d3f7e3d 100644 --- a/source/xapps-extra/virtualbox/FrugalBuild +++ b/source/xapps-extra/virtualbox/FrugalBuild @@ -11,16 +11,16 @@ USE_VBOX_DEBUG=${USE_VBOX_DEBUG:-"n"} pkgname=virtualbox realname=VirtualBox -pkgver=5.1.30 +pkgver=5.2.0 pkgextra= -pkgrel=2 +pkgrel=1 pkgdesc="Oracle VirtualBox is a family of powerful x86 virtualization products for enterprise as well as home use." url="http://www.virtualbox.org"; depends=('xerces-c>=2.8.0' 'xalan-c>=1.10.0-2' 'iasl' 'dev86' 'libxslt' 'libxcursor' 'libidl' 'sdl' \ 'alsa-lib>=1.1.4.1' 'curl' 'libxmu' 'libuuid' 'libcap' 'qt5-base>=5.9.2' 'qt5-x11extras>=5.9.2' \ 'libvpx>=1.6.0' 'lvm2' 'libgl' 'libxext' 'libx11' 'libpulse' 'libglu' 'libxrandr' 'libxcomposite' \ 'libxinerama' 'libvncserver' 'iproute2') -makedepends=('cdrtools' 'x11-protos' 'qt5-tools>=5.9.2' 'mesa-libgl-headers') +makedepends=('cdrtools' 'x11-protos' 'qt5-tools>=5.9.2' 'mesa-libgl-headers' 'nasm' 'yasm') rodepends=("virtualbox-modules>=$pkgver") groups=('xapps-extra') archs=('x86_64') @@ -32,8 +32,7 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/${realname}-${pkgver 60-vboxguest.rules \ vboxservice.service \ virtualbox-guest-utils.conf \ - modules-depmod.patch \ - kernel-module-guest-depmod.patch) + depmod.patch) _F_kernelmod_scriptlet="$startdir/$pkgname.install" Finclude kernel-module @@ -48,14 +47,13 @@ Finclude kernel-module options=('scriptlet' 'nostrip' 'genscriptlet') ## we strip manually in build() _F_cd_path="${realname}-${pkgver}" -sha1sums=('85fbf2471887dbb275aece68dde117802e0d0ef0' \ +sha1sums=('875704b2bbea3eb8161b7277b10df3dea5a748e2' \ 'aa931ae19edd8585150738f0efd8fedf5175a6d3' \ '5e66ffd4607dafd9b55dc2b6e7591ef6892d4d49' \ '08199d8e7906cb793277b798805d38ce386460d8' \ '28fb53322691d32a82de87e63672229ea5b7159e' \ '80ba54b1e13f0e8f53a84ca3f25df617fb53ae4c' \ - 'ca94de464d516b434c458c1c255c41c06799b941' \ - '1634d3d18a4d645734088d06588c37dc50e06c03') + '4cd9c9ca67626d184136d95d82c28556e5e3e55e') subpkgs=("$pkgname-modules" "$pkgname-guest-additions") subdescs=('Kernel modules for VirtualBox' 'VirtualBox guest Additions') @@ -94,6 +92,7 @@ build() { fi VboxSrcDir=${_F_cd_path}/out/linux.amd64/${VBoxBuildType}/bin + Fpatchall # Configure and load our options Fexec ./configure \ @@ -188,11 +187,10 @@ build() { # host kernel modules Fexec cd $Fsrcdir/${_F_cd_path}/out/linux.amd64/release/bin/src || Fdie - Fpatch modules-depmod.patch Fmkdir ${_F_kernelmod_dir}/kernel/misc - Fexec make KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} MODULE_DIR=${Fdestdir}/${_F_kernelmod_dir}/kernel/misc || Fdie - Fexec 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 + Fexec make V=1 KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} INSTALL_MOD_DIR=kernel/misc KERN_VER=${_F_kernelmod_uname} || Fdie + Fexec make V=1 KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} INSTALL_MOD_DIR=kernel/misc KERN_VER=${_F_kernelmod_uname} INSTALL_MOD_PATH=${Fdestdir} install || Fdie #cleanup first Fexec rm -rf fw_tmp || Fdie @@ -238,13 +236,10 @@ build() { # guest kernel modules Fexec cd $Fsrcdir/${_F_cd_path}/out/linux.amd64/release/bin/additions/src || Fdie - Fpatch kernel-module-guest-depmod.patch Fmkdir ${_F_kernelmod_dir}/kernel/misc - Fexec make KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} \ - MODULE_DIR=${Fdestdir}/${_F_kernelmod_dir}/kernel/misc || Fdie - Fexec 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 + Fexec make V=1 KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} INSTALL_MOD_DIR=kernel/misc KERN_VER=${_F_kernelmod_uname} || Fdie + Fexec make V=1 KERN_DIR=${_F_kernelmod_dir}/build MODULE_DIR_TST=${Fdestdir}/${_F_kernelmod_dir} INSTALL_MOD_DIR=kernel/misc KERN_VER=${_F_kernelmod_uname} INSTALL_MOD_PATH=${Fdestdir} install || Fdie ## remove video one is in staging now Frm ${_F_kernelmod_dir}/kernel/misc/vboxvideo* diff --git a/source/xapps-extra/virtualbox/depmod.patch b/source/xapps-extra/virtualbox/depmod.patch new file mode 100644 index 0000000..a010818 --- /dev/null +++ b/source/xapps-extra/virtualbox/depmod.patch @@ -0,0 +1,13 @@ +diff -Naur VirtualBox-5.2.0/src/VBox/Installer/linux/Makefile.include.footer VirtualBox-5.2.0-p/src/VBox/Installer/linux/Makefile.include.footer +--- VirtualBox-5.2.0/src/VBox/Installer/linux/Makefile.include.footer 2017-10-18 09:12:51.000000000 +0200 ++++ VirtualBox-5.2.0-p/src/VBox/Installer/linux/Makefile.include.footer 2017-10-19 21:59:33.607843277 +0200 +@@ -63,8 +63,7 @@ + + install: $(MODULE) + @mkdir -p $(MODULE_DIR); \ +- install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \ +- PATH="$(PATH):/bin:/sbin" depmod -a; ++ install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); + + clean: + for f in $(sort $(dir $(OBJS))); do rm -f $$f/*.o $$f/.*.cmd $$f/.*.flags; done diff --git a/source/xapps-extra/virtualbox/kernel-module-guest-depmod.patch b/source/xapps-extra/virtualbox/kernel-module-guest-depmod.patch deleted file mode 100644 index 3221da0..0000000 --- a/source/xapps-extra/virtualbox/kernel-module-guest-depmod.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- vboxguest/Makefile.include.footer 2017-04-28 17:04:21.000000000 +0200 -+++ vboxguest.new/Makefile.include.footer 2017-05-14 22:11:48.000000000 +0200 -@@ -92,7 +92,6 @@ - install: $(MODULE) - @mkdir -p $(MODULE_DIR); \ - install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \ -- PATH="$(PATH):/bin:/sbin" depmod -a; - - endif # eq($(MAKECMDGOALS),clean) - -diff -Naur vboxsf/Makefile.include.footer vboxsf.new/Makefile.include.footer ---- vboxsf/Makefile.include.footer 2017-04-28 17:04:21.000000000 +0200 -+++ vboxsf.new/Makefile.include.footer 2017-05-14 22:11:48.000000000 +0200 -@@ -92,7 +92,6 @@ - install: $(MODULE) - @mkdir -p $(MODULE_DIR); \ - install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \ -- PATH="$(PATH):/bin:/sbin" depmod -a; - - endif # eq($(MAKECMDGOALS),clean) - -diff -Naur vboxvideo/Makefile.include.footer vboxvideo.new/Makefile.include.footer ---- vboxvideo/Makefile.include.footer 2017-04-28 17:04:21.000000000 +0200 -+++ vboxvideo.new/Makefile.include.footer 2017-05-14 22:11:48.000000000 +0200 -@@ -92,7 +92,6 @@ - install: $(MODULE) - @mkdir -p $(MODULE_DIR); \ - install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \ -- PATH="$(PATH):/bin:/sbin" depmod -a; - - endif # eq($(MAKECMDGOALS),clean) - diff --git a/source/xapps-extra/virtualbox/modules-depmod.patch b/source/xapps-extra/virtualbox/modules-depmod.patch deleted file mode 100644 index e033657..0000000 --- a/source/xapps-extra/virtualbox/modules-depmod.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur vboxdrv/Makefile vboxdrv.new/Makefile ---- vboxdrv/Makefile 2017-05-14 21:39:53.000000000 +0200 -+++ vboxdrv.new/Makefile 2017-05-14 21:57:19.000000000 +0200 -@@ -306,7 +306,6 @@ - install: $(MODULE) - @mkdir -p $(MODULE_DIR); \ - install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \ -- PATH="$(PATH):/bin:/sbin" depmod -a; \ - rm -f /etc/vbox/module_not_compiled - - install_rpm: $(MODULE) -diff -Naur vboxnetadp/Makefile vboxnetadp.new/Makefile ---- vboxnetadp/Makefile 2017-05-14 21:39:53.000000000 +0200 -+++ vboxnetadp.new/Makefile 2017-05-14 21:57:19.000000000 +0200 -@@ -208,7 +208,6 @@ - install: $(MODULE) - @mkdir -p $(MODULE_DIR); \ - install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \ -- PATH="$(PATH):/bin:/sbin" depmod -a; \ - rm -f /etc/vbox/module_not_compiled - - install_rpm: $(MODULE) -diff -Naur vboxnetflt/Makefile vboxnetflt.new/Makefile ---- vboxnetflt/Makefile 2017-05-14 21:39:53.000000000 +0200 -+++ vboxnetflt.new/Makefile 2017-05-14 21:57:19.000000000 +0200 -@@ -212,7 +212,6 @@ - install: $(MODULE) - @mkdir -p $(MODULE_DIR); \ - install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \ -- PATH="$(PATH):/bin:/sbin" depmod -a; \ - rm -f /etc/vbox/module_not_compiled - - install_rpm: $(MODULE) -diff -Naur vboxpci/Makefile vboxpci.new/Makefile ---- vboxpci/Makefile 2017-05-14 21:39:53.000000000 +0200 -+++ vboxpci.new/Makefile 2017-05-14 21:57:19.000000000 +0200 -@@ -211,7 +211,6 @@ - install: $(MODULE) - @mkdir -p $(MODULE_DIR); \ - install -m 0644 -o root -g root $(MODULE).$(MODULE_EXT) $(MODULE_DIR); \ -- PATH="$(PATH):/bin:/sbin" depmod -a; - - install_rpm: $(MODULE) - @mkdir -p $(MODULE_DIR); \ _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
