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

[Sébastien Luttringer]

    Date: Saturday, September 7, 2013 @ 02:03:02
  Author: seblu
Revision: 96874

upgpkg: virtualbox-modules-lts 4.2.18-1

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

--------------------------------------+
 PKGBUILD                             |    9 +---
 build.sh                             |   65 +++++++++++++++++++++++++--------
 virtualbox-guest-modules-lts.install |    2 -
 virtualbox-host-modules-lts.install  |    2 -
 4 files changed, 55 insertions(+), 23 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-09-07 00:02:01 UTC (rev 96873)
+++ PKGBUILD	2013-09-07 00:03:02 UTC (rev 96874)
@@ -5,8 +5,8 @@
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.16
-pkgrel=2
+pkgver=4.2.18
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
@@ -13,10 +13,7 @@
 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')
+             "virtualbox-guest-dkms>=$pkgver")
 
 # remember to also adjust the .install files and the package deps below
 _extramodules=extramodules-3.0-lts

Modified: build.sh
===================================================================
--- build.sh	2013-09-07 00:02:01 UTC (rev 96873)
+++ build.sh	2013-09-07 00:03:02 UTC (rev 96874)
@@ -1,25 +1,60 @@
 #!/bin/bash
+# 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() {
+  url="https://www.archlinux.org/packages/$1/x86_64/$2/"
+  curkernel=$(wget -qO- "$url"|sed -nr "s/.*<h2>$2 ([0-9]+)\.([0-9]+).*<\/h2>.*/\1.\2/p")
+  nextkernel=${curkernel%.*}.$(( ${curkernel#*.}+1))
 
-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
+  echo "** Current kernel: $curkernel"
+  echo "** Next kernel: $nextkernel"
 
+  sed -ri \
+    -e "s/(_?extramodules=).*-(ARCH|lts).*/\1extramodules-$curkernel-\2/i" \
+    -e "s/(linux.*>=)[0-9]+.[0-9]+/\1$curkernel/" \
+    -e "s/(linux.*<)[0-9]+.[0-9]+/\1$nextkernel/" \
+    PKGBUILD *.install
+}
 
+# $1: repo
+# $2: arch
+build() {
+  _pwd=$PWD
+  cd /var/empty
+  makechrootpkg -cu -I "$_pwd"/../../virtualbox/trunk/virtualbox-host-dkms-*-$arch.pkg.tar.xz -r "$1"
+  makechrootpkg -I "$_pwd"/../../virtualbox/trunk/virtualbox-guest-dkms-*-$arch.pkg.tar.xz  -r "$1"
+  cd "$_pwd"
+  makechrootpkg -n -r "$1"
+}
+
+(( $# == 1 )) || usage
+
+# detect lts case
+grep -q linux-lts PKGBUILD && suf=-lts
+
+case $1 in
+  extra)
+    update core linux$suf-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/extra-$arch $arch
+    done
+  ;;
+  testing)
+    update testing linux$suf-headers
+    for arch in i686 x86_64; do
+      build /var/lib/archbuild/testing-$arch $arch
+    done
+  ;;
+  *)
+    usage
+  ;;
+esac
+
 # vim:set ts=2 sw=2 ft=sh et:

Modified: virtualbox-guest-modules-lts.install
===================================================================
--- virtualbox-guest-modules-lts.install	2013-09-07 00:02:01 UTC (rev 96873)
+++ virtualbox-guest-modules-lts.install	2013-09-07 00:03:02 UTC (rev 96874)
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.0-lts'
+  EXTRAMODULES=extramodules-3.0-lts
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }
 

Modified: virtualbox-host-modules-lts.install
===================================================================
--- virtualbox-host-modules-lts.install	2013-09-07 00:02:01 UTC (rev 96873)
+++ virtualbox-host-modules-lts.install	2013-09-07 00:03:02 UTC (rev 96874)
@@ -1,5 +1,5 @@
 _depmod() {
-  EXTRAMODULES='extramodules-3.0-lts'
+  EXTRAMODULES=extramodules-3.0-lts
   depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
 }