[arch-commits] Commit in virtualbox-modules/repos/community-i686 (8 files)
Sébastien Luttringer
seblu at nymeria.archlinux.org
Fri Sep 6 23:05:23 UTC 2013
Date: Saturday, September 7, 2013 @ 01:05:23
Author: seblu
Revision: 96862
archrelease: copy trunk to community-i686
Added:
virtualbox-modules/repos/community-i686/PKGBUILD
(from rev 96861, virtualbox-modules/trunk/PKGBUILD)
virtualbox-modules/repos/community-i686/build.sh
(from rev 96861, virtualbox-modules/trunk/build.sh)
virtualbox-modules/repos/community-i686/virtualbox-guest-modules.install
(from rev 96861, virtualbox-modules/trunk/virtualbox-guest-modules.install)
virtualbox-modules/repos/community-i686/virtualbox-host-modules.install
(from rev 96861, virtualbox-modules/trunk/virtualbox-host-modules.install)
Deleted:
virtualbox-modules/repos/community-i686/PKGBUILD
virtualbox-modules/repos/community-i686/build.sh
virtualbox-modules/repos/community-i686/virtualbox-guest-modules.install
virtualbox-modules/repos/community-i686/virtualbox-host-modules.install
----------------------------------+
PKGBUILD | 127 ++++++++++++++++++-------------------
build.sh | 80 ++++++++++++++++-------
virtualbox-guest-modules.install | 42 ++++++------
virtualbox-host-modules.install | 46 ++++++-------
4 files changed, 161 insertions(+), 134 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2013-09-06 23:05:16 UTC (rev 96861)
+++ PKGBUILD 2013-09-06 23:05:23 UTC (rev 96862)
@@ -1,65 +0,0 @@
-# $Id$
-# Maintainer: Ionut Biru <ibiru at archlinux.org>
-# Maintainer: Sébastien Luttringer
-
-pkgbase=virtualbox-modules
-pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.16
-pkgrel=9
-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'
- "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.10-ARCH
-
-build() {
- _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
- # build host modules
- msg2 'Host modules'
- dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
- # build guest modules
- msg2 'Guest modules'
- dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
-}
-
-package_virtualbox-host-modules(){
- _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
- pkgdesc='Host kernel modules for VirtualBox'
- depends=('linux>=3.10' 'linux<3.11')
- replaces=('virtualbox-modules')
- conflicts=('virtualbox-modules')
- install=virtualbox-host-modules.install
-
- cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
- install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
- install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-}
-
-package_virtualbox-guest-modules(){
- _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
- pkgdesc='Guest kernel modules for VirtualBox'
- license=('GPL')
- depends=('linux>=3.10' 'linux<3.11')
- replaces=('virtualbox-archlinux-modules')
- conflicts=('virtualbox-archlinux-modules')
- install=virtualbox-guest-modules.install
-
- cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
- install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
- install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
- find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-}
-
-# vim:set ts=2 sw=2 et:
Copied: virtualbox-modules/repos/community-i686/PKGBUILD (from rev 96861, virtualbox-modules/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2013-09-06 23:05:23 UTC (rev 96862)
@@ -0,0 +1,62 @@
+# $Id$
+# Maintainer: Ionut Biru <ibiru at archlinux.org>
+# Maintainer: Sébastien Luttringer
+
+pkgbase=virtualbox-modules
+pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
+pkgver=4.2.18
+pkgrel=1
+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'
+ "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
+
+build() {
+ _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
+ # build host modules
+ msg2 'Host modules'
+ dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
+ # build guest modules
+ msg2 'Guest modules'
+ dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
+}
+
+package_virtualbox-host-modules(){
+ _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
+ pkgdesc='Host kernel modules for VirtualBox'
+ depends=('linux>=3.10' 'linux<3.11')
+ replaces=('virtualbox-modules')
+ conflicts=('virtualbox-modules')
+ install=virtualbox-host-modules.install
+
+ cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
+ install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+ install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+}
+
+package_virtualbox-guest-modules(){
+ _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
+ pkgdesc='Guest kernel modules for VirtualBox'
+ license=('GPL')
+ depends=('linux>=3.10' 'linux<3.11')
+ replaces=('virtualbox-archlinux-modules')
+ conflicts=('virtualbox-archlinux-modules')
+ install=virtualbox-guest-modules.install
+
+ cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
+ install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+ install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: build.sh
===================================================================
--- build.sh 2013-09-06 23:05:16 UTC (rev 96861)
+++ build.sh 2013-09-06 23:05:23 UTC (rev 96862)
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if (( $# != 1 )); then
- 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
-
-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
-
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: virtualbox-modules/repos/community-i686/build.sh (from rev 96861, virtualbox-modules/trunk/build.sh)
===================================================================
--- build.sh (rev 0)
+++ build.sh 2013-09-06 23:05:23 UTC (rev 96862)
@@ -0,0 +1,55 @@
+#!/bin/bash -e
+# lazyness can be enhanced everyday
+
+usage() {
+ echo "usage: $0 extra"
+ echo " $0 testing"
+ exit 1
+}
+
+# $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/')
+ 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:
Deleted: virtualbox-guest-modules.install
===================================================================
--- virtualbox-guest-modules.install 2013-09-06 23:05:16 UTC (rev 96861)
+++ virtualbox-guest-modules.install 2013-09-06 23:05:23 UTC (rev 96862)
@@ -1,21 +0,0 @@
-_depmod() {
- EXTRAMODULES='extramodules-3.10-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
- cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
- _depmod
-}
-
-post_upgrade() {
- _depmod
-}
-
-post_remove() {
- _depmod
-}
-
-# vim:set ts=2 sw=2 et:
Copied: virtualbox-modules/repos/community-i686/virtualbox-guest-modules.install (from rev 96861, virtualbox-modules/trunk/virtualbox-guest-modules.install)
===================================================================
--- virtualbox-guest-modules.install (rev 0)
+++ virtualbox-guest-modules.install 2013-09-06 23:05:23 UTC (rev 96862)
@@ -0,0 +1,21 @@
+_depmod() {
+ EXTRAMODULES=extramodules-3.10-ARCH
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+ cat << EOF
+===> You may want to load vboxguest, vboxsf and vboxvideo
+EOF
+ _depmod
+}
+
+post_upgrade() {
+ _depmod
+}
+
+post_remove() {
+ _depmod
+}
+
+# vim:set ts=2 sw=2 et:
Deleted: virtualbox-host-modules.install
===================================================================
--- virtualbox-host-modules.install 2013-09-06 23:05:16 UTC (rev 96861)
+++ virtualbox-host-modules.install 2013-09-06 23:05:23 UTC (rev 96862)
@@ -1,23 +0,0 @@
-_depmod() {
- EXTRAMODULES='extramodules-3.10-ARCH'
- depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
- cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
- _depmod
-}
-
-post_upgrade() {
- _depmod
- echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
- _depmod
-}
-
-# vim:set ts=2 sw=2 et:
Copied: virtualbox-modules/repos/community-i686/virtualbox-host-modules.install (from rev 96861, virtualbox-modules/trunk/virtualbox-host-modules.install)
===================================================================
--- virtualbox-host-modules.install (rev 0)
+++ virtualbox-host-modules.install 2013-09-06 23:05:23 UTC (rev 96862)
@@ -0,0 +1,23 @@
+_depmod() {
+ EXTRAMODULES=extramodules-3.10-ARCH
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+ cat << EOF
+===> You must load vboxdrv module before starting VirtualBox:
+===> # modprobe vboxdrv
+EOF
+ _depmod
+}
+
+post_upgrade() {
+ _depmod
+ echo 'In order to use the new version, reload all virtualbox modules manually.'
+}
+
+post_remove() {
+ _depmod
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list