Merge branch 'master' of ssh://gparabola/srv/git/abslibre

5 files changed, 29 insertions, 30 deletions

diff --git a/libre/virtualbox-libre-modules/.directory b/libre/virtualbox-libre-modules/.directory
deleted file mode 100755
index 9f6471595..000000000
--- a/libre/virtualbox-libre-modules/.directory
+++ /dev/null
@@ -1,3 +0,0 @@
-[Dolphin]
-Timestamp=2012,8,16,6,34,39
-Version=3
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
index 1ecee7b2c..067a95fdd 100755..100644
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ b/libre/virtualbox-libre-modules/PKGBUILD
@@ -6,19 +6,20 @@
 
 pkgbase=virtualbox-libre-modules
 pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.4
-pkgrel=2
+pkgver=4.2.6
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
 makedepends=('linux-libre-headers'
-             "virtualbox-libre-host-source>=$pkgver"
-             "virtualbox-libre-guest-source>=$pkgver"
-             'expac')
+             "virtualbox-libre-host-dkms>=$pkgver"
+             "virtualbox-libre-guest-dkms>=$pkgver"
+             'expac'
+             'bc')
 
 build() {
-  # current kernel libre version
   _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -31,16 +32,17 @@ build() {
 }
 
 package_virtualbox-libre-host-modules(){
-  pkgdesc='Host kernel libre modules for VirtualBox'
-  depends=('linux-libre>=3.6' 'linux-libre<3.7')
+  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
+
+  pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
+#  depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-host-modules=${pkgver}")
   replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
   install=virtualbox-libre-host-modules.install
 
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
-
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
@@ -49,17 +51,18 @@ package_virtualbox-libre-host-modules(){
 }
 
 package_virtualbox-libre-guest-modules(){
-  pkgdesc='Guest kernel libre modules for VirtualBox'
+  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
+  _extraver=extramodules-${_kernver%.*}-LIBRE
+
+  pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
   license=('GPL')
-  depends=('linux-libre>=3.6' 'linux-libre<3.7')
+#  depends=("linux-libre>=${_kernver%.*}" "linux-libre<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=('linux-libre>=3.7' 'linux-libre<3.8')
   provides=("virtualbox-guest-modules=${pkgver}")
   replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
   install=virtualbox-libre-guest-modules.install
 
-  _kernver=$(expac -Q '%v' linux-libre-headers)-LIBRE
-  _extraver=extramodules-${_kernver%.*}-LIBRE
-
   install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
   install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
@@ -67,5 +70,4 @@ package_virtualbox-libre-guest-modules(){
   sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-libre-guest-modules.install"
 }
 
-
 # vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh
index f798a615d..6152ec21d 100755
--- a/libre/virtualbox-libre-modules/build.sh
+++ b/libre/virtualbox-libre-modules/build.sh
@@ -6,12 +6,12 @@ if (( $# != 1 )); then
   exit 1
 fi
 
-linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
+linux32 makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
 linux32 makechrootpkg -r /var/lib/archbuild/$1-i686
 
-makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-source-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-source-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -cuI ../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
+makechrootpkg -I ../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
 makechrootpkg -r /var/lib/archbuild/$1-x86_64
 
 
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
index caf59aa13..41b5ac73a 100755..100644
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
@@ -2,16 +2,16 @@ post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    EXTRAMODULES='extramodules-3.6-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.6-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.6-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
index 8605cf20a..1ac430c3b 100755..100644
--- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
+++ b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
@@ -3,17 +3,17 @@ cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 
 post_upgrade() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
     echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    EXTRAMODULES='extramodules-3.5-LIBRE'
+    EXTRAMODULES='extramodules-3.7-LIBRE'
     depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }