Date: Saturday, September 7, 2013 @ 02:01:50 Author: seblu Revision: 96872
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 | 10 +++++----- build.sh | 20 ++++++++++++-------- virtualbox-guest-modules.install | 2 +- virtualbox-host-modules.install | 2 +- 4 files changed, 19 insertions(+), 15 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2013-09-06 23:55:44 UTC (rev 96871) +++ PKGBUILD 2013-09-07 00:01:50 UTC (rev 96872) @@ -9,13 +9,13 @@ arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('linux>=3.10' 'linux<3.11' - 'linux-headers>=3.10' 'linux-headers<3.11' +makedepends=('linux>=3.11' 'linux<3.12' + 'linux-headers>=3.11' 'linux-headers<3.12' "virtualbox-host-dkms>=$pkgver" "virtualbox-guest-dkms>=$pkgver") # remember to also adjust the .install files and the package deps below -_extramodules=extramodules-3.10-ARCH +_extramodules=extramodules-3.11-ARCH build() { _kernver="$(cat /usr/lib/modules/$_extramodules/version)" @@ -33,7 +33,7 @@ package_virtualbox-host-modules(){ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Host kernel modules for VirtualBox' - depends=('linux>=3.10' 'linux<3.11') + depends=('linux>=3.11' 'linux<3.12') replaces=('virtualbox-modules') conflicts=('virtualbox-modules') install=virtualbox-host-modules.install @@ -48,7 +48,7 @@ _kernver="$(cat /usr/lib/modules/$_extramodules/version)" pkgdesc='Guest kernel modules for VirtualBox' license=('GPL') - depends=('linux>=3.10' 'linux<3.11') + depends=('linux>=3.11' 'linux<3.12') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') install=virtualbox-guest-modules.install Modified: build.sh =================================================================== --- build.sh 2013-09-06 23:55:44 UTC (rev 96871) +++ build.sh 2013-09-07 00:01:50 UTC (rev 96872) @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/bin/bash # lazyness can be enhanced everyday usage() { @@ -9,14 +9,15 @@ # $1: reference package update() { - # expac is required - type -p expac >/dev/null - - curkernel=$(expac -S '%v' "$1"|sed -r 's/([0-9]+)\.([0-9]+).*/\1.\2/') + 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)) + echo "** Current kernel: $curkernel" + echo "** Next kernel: $nextkernel" + sed -ri \ - -e "s/(_?extramodules=).*/\1extramodules-$curkernel-ARCH/i" \ + -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 @@ -35,15 +36,18 @@ (( $# == 1 )) || usage +# detect lts case +grep -q linux-lts PKGBUILD && suf=-lts + case $1 in extra) - update core/linux-headers + update core linux$suf-headers for arch in i686 x86_64; do build /var/lib/archbuild/extra-$arch $arch done ;; testing) - update testing/linux-headers + update testing linux$suf-headers for arch in i686 x86_64; do build /var/lib/archbuild/testing-$arch $arch done Modified: virtualbox-guest-modules.install =================================================================== --- virtualbox-guest-modules.install 2013-09-06 23:55:44 UTC (rev 96871) +++ virtualbox-guest-modules.install 2013-09-07 00:01:50 UTC (rev 96872) @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES=extramodules-3.10-ARCH + EXTRAMODULES=extramodules-3.11-ARCH depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } Modified: virtualbox-host-modules.install =================================================================== --- virtualbox-host-modules.install 2013-09-06 23:55:44 UTC (rev 96871) +++ virtualbox-host-modules.install 2013-09-07 00:01:50 UTC (rev 96872) @@ -1,5 +1,5 @@ _depmod() { - EXTRAMODULES=extramodules-3.10-ARCH + EXTRAMODULES=extramodules-3.11-ARCH depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) }