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

[Sébastien Luttringer]

    Date: Saturday, September 7, 2013 @ 01:05:16
  Author: seblu
Revision: 96861

upgpkg: virtualbox-modules 4.2.18-1

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

----------------------------------+
 PKGBUILD                         |   19 ++++-------
 build.sh                         |   62 +++++++++++++++++++++++++++----------
 virtualbox-guest-modules.install |    2 -
 virtualbox-host-modules.install  |    2 -
 4 files changed, 56 insertions(+), 29 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-06 22:00:34 UTC (rev 96860)
+++ PKGBUILD	2013-09-06 23:05:16 UTC (rev 96861)
@@ -4,21 +4,18 @@
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.16
-pkgrel=11
+pkgver=4.2.18
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux>=3.11' 'linux<3.12'
-             'linux-headers>=3.11' 'linux-headers<3.12'
+makedepends=('linux>=3.10' 'linux<3.11'
+             'linux-headers>=3.10' 'linux-headers<3.11'
              "virtualbox-host-dkms>=$pkgver"
-             "virtualbox-guest-dkms>=$pkgver"
-             'expac'
-             'sed'
-             'bc')
+             "virtualbox-guest-dkms>=$pkgver")
 
 # remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-3.11-ARCH
+_extramodules=extramodules-3.10-ARCH
 
 build() {
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
@@ -36,7 +33,7 @@
 package_virtualbox-host-modules(){
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=('linux>=3.11' 'linux<3.12')
+  depends=('linux>=3.10' 'linux<3.11')
   replaces=('virtualbox-modules')
   conflicts=('virtualbox-modules')
   install=virtualbox-host-modules.install
@@ -51,7 +48,7 @@
   _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=('linux>=3.11' 'linux<3.12')
+  depends=('linux>=3.10' 'linux<3.11')
   replaces=('virtualbox-archlinux-modules')
   conflicts=('virtualbox-archlinux-modules')
   install=virtualbox-guest-modules.install

Modified: build.sh
===================================================================
--- build.sh	2013-09-06 22:00:34 UTC (rev 96860)
+++ build.sh	2013-09-06 23:05:16 UTC (rev 96861)
@@ -1,25 +1,55 @@
-#!/bin/bash
+#!/bin/bash -e
+# lazyness can be enhanced everyday
 
-set -e
-
-if (( $# != 1 )); then
+usage() {
   echo "usage: $0 extra"
   echo "       $0 testing"
   exit 1
-fi
+}
 
-here=$PWD
-cd /var/empty
-linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-cd "$here"
-linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
+# $1: reference package
+update() {
+  # expac is required
+  type -p expac >/dev/null
 
-cd /var/empty
-makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-cd "$here"
-makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
+  curkernel=$(expac -S '%v' "$1"|sed -r 's/([0-9]+)\.([0-9]+).*/\1.\2/')
+  nextkernel=${curkernel%.*}.$(( ${curkernel#*.}+1))
 
+  sed -ri \
+    -e "s/(_?extramodules=).*/\1extramodules-$curkernel-ARCH/i" \
+    -e "s/(linux.*>=)[0-9]+.[0-9]+/\1$curkernel/" \
+    -e "s/(linux.*<)[0-9]+.[0-9]+/\1$nextkernel/" \
+    PKGBUILD *.install
+}
 
+# $1: repo
+build() {
+  _pwd=$PWD
+  cd /var/empty
+  makechrootpkg -cu -I "$_pwd"/../../virtualbox/trunk/virtualbox-host-dkms-*-i686.pkg.tar.xz -r "$1"
+  makechrootpkg -I "$_pwd"/../../virtualbox/trunk/virtualbox-guest-dkms-*-i686.pkg.tar.xz  -r "$1"
+  cd "$_pwd"
+  makechrootpkg -n -r "$1"
+}
+
+(( $# == 1 )) || usage
+
+case $1 in
+  extra)
+    update core/linux-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/extra-$arch
+    done
+  ;;
+  testing)
+    update testing/linux-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/testing-$arch
+    done
+  ;;
+  *)
+    usage
+  ;;
+esac
+
 # vim:set ts=2 sw=2 ft=sh et:

Modified: virtualbox-guest-modules.install
===================================================================
--- virtualbox-guest-modules.install	2013-09-06 22:00:34 UTC (rev 96860)
+++ virtualbox-guest-modules.install	2013-09-06 23:05:16 UTC (rev 96861)
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.11-ARCH'
+  EXTRAMODULES=extramodules-3.10-ARCH
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 

Modified: virtualbox-host-modules.install
===================================================================
--- virtualbox-host-modules.install	2013-09-06 22:00:34 UTC (rev 96860)
+++ virtualbox-host-modules.install	2013-09-06 23:05:16 UTC (rev 96861)
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.11-ARCH'
+  EXTRAMODULES=extramodules-3.10-ARCH
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }