[arch-commits] Commit in virtualbox-modules-lts/trunk (3 files)

[Sébastien Luttringer]

    Date: Thursday, May 9, 2013 @ 02:38:10
  Author: seblu
Revision: 90213

Sync to virtualbox-modules (add support of .0 release)

Modified:
  virtualbox-modules-lts/trunk/PKGBUILD
  virtualbox-modules-lts/trunk/virtualbox-guest-modules-lts.install
  virtualbox-modules-lts/trunk/virtualbox-host-modules-lts.install

--------------------------------------+
 PKGBUILD                             |   34 ++++++++++++++++-----------------
 virtualbox-guest-modules-lts.install |   10 +++++----
 virtualbox-host-modules-lts.install  |   12 ++++++-----
 3 files changed, 30 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-05-09 00:26:24 UTC (rev 90212)
+++ PKGBUILD	2013-05-09 00:38:10 UTC (rev 90213)
@@ -10,15 +10,17 @@
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-lts-headers'
+makedepends=('linux-lts'
+             'linux-lts-headers'
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver"
              'expac'
+             'sed'
              'bc')
 
 build() {
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-
+  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -31,40 +33,38 @@
 }
 
 package_virtualbox-host-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-  _extraver=extramodules-${_kernver%.*}-lts
-
+  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=("linux-lts>=${_kernver%.*}" "linux-lts<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
   replaces=('virtualbox-modules-lts')
   conflicts=('virtualbox-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-host-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules-lts.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules-lts.install"
 }
 
 package_virtualbox-guest-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-  _extraver=extramodules-${_kernver%.*}-lts
-
+  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=("linux-lts>=${_kernver%.*}" "linux-lts<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
   replaces=('virtualbox-archlinux-modules-lts')
   conflicts=('virtualbox-archlinux-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-guest-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules-lts.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules-lts.install"
 }
 
 # vim:set ts=2 sw=2 et:

Modified: virtualbox-guest-modules-lts.install
===================================================================
--- virtualbox-guest-modules-lts.install	2013-05-09 00:26:24 UTC (rev 90212)
+++ virtualbox-guest-modules-lts.install	2013-05-09 00:38:10 UTC (rev 90213)
@@ -1,16 +1,18 @@
-EXTRAMODULES='extramodules-3.0-lts'
+VERSION=''
 
 post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
+
+# vim:set ts=2 sw=2 et:

Modified: virtualbox-host-modules-lts.install
===================================================================
--- virtualbox-host-modules-lts.install	2013-05-09 00:26:24 UTC (rev 90212)
+++ virtualbox-host-modules-lts.install	2013-05-09 00:38:10 UTC (rev 90213)
@@ -1,18 +1,20 @@
-EXTRAMODULES='extramodules-3.0-lts'
+VERSION=''
 
 post_install() {
 cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
+  depmod $VERSION
+  echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
+
+# vim:set ts=2 sw=2 et: