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

[Evangelos Foutras]

    Date: Friday, June 28, 2013 @ 20:16:15
  Author: foutrelis
Revision: 93207

Fix depmod commands to also work for kernels other than the one built against.

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                             |   30 ++++++++++++++----------------
 virtualbox-guest-modules-lts.install |   13 ++++++++-----
 virtualbox-host-modules-lts.install  |   13 ++++++++-----
 3 files changed, 30 insertions(+), 26 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-28 17:53:32 UTC (rev 93206)
+++ PKGBUILD	2013-06-28 18:16:15 UTC (rev 93207)
@@ -10,17 +10,19 @@
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-lts'
-             'linux-lts-headers'
+makedepends=('linux-lts>=3.0' 'linux-lts<3.1'
+             'linux-lts-headers>=3.0' 'linux-lts-headers<3.1'
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver"
              'expac'
              'sed'
              'bc')
 
+# remember to also adjust the .install files and the package deps below
+_extramodules=extramodules-3.0-lts
+
 build() {
-  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
+  _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -33,38 +35,34 @@
 }
 
 package_virtualbox-host-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
+  _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
+  depends=('linux-lts>=3.0' 'linux-lts<3.1')
   replaces=('virtualbox-modules-lts')
   conflicts=('virtualbox-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-host-modules-lts.install
 
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules-lts.install"
 }
 
 package_virtualbox-guest-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
+  _kernver=$(cat /usr/lib/modules/$_extramodules/version)
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
+  depends=('linux-lts>=3.0' 'linux-lts<3.1')
   replaces=('virtualbox-archlinux-modules-lts')
   conflicts=('virtualbox-archlinux-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-guest-modules-lts.install
 
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+  install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  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-06-28 17:53:32 UTC (rev 93206)
+++ virtualbox-guest-modules-lts.install	2013-06-28 18:16:15 UTC (rev 93207)
@@ -1,18 +1,21 @@
-VERSION=''
+_depmod() {
+  EXTRAMODULES='extramodules-3.0-lts'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-  depmod $VERSION
+  _depmod
 }
 
 post_upgrade() {
-  depmod $VERSION
+  _depmod
 }
 
 post_remove() {
-  depmod $VERSION
+  _depmod
 }
 
 # vim:set ts=2 sw=2 et:

Modified: virtualbox-host-modules-lts.install
===================================================================
--- virtualbox-host-modules-lts.install	2013-06-28 17:53:32 UTC (rev 93206)
+++ virtualbox-host-modules-lts.install	2013-06-28 18:16:15 UTC (rev 93207)
@@ -1,20 +1,23 @@
-VERSION=''
+_depmod() {
+  EXTRAMODULES='extramodules-3.0-lts'
+  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
 
 post_install() {
-cat << EOF
+  cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-  depmod $VERSION
+  _depmod
 }
 
 post_upgrade() {
-  depmod $VERSION
+  _depmod
   echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-  depmod $VERSION
+  _depmod
 }
 
 # vim:set ts=2 sw=2 et: