[arch-commits] Commit in virtualbox-modules-arch/repos (11 files)
Sébastien Luttringer
seblu at archlinux.org
Sun Apr 17 23:27:07 UTC 2016
Date: Monday, April 18, 2016 @ 01:27:06
Author: seblu
Revision: 171278
archrelease: copy trunk to community-i686, community-x86_64
Added:
virtualbox-modules-arch/repos/community-x86_64/PKGBUILD
(from rev 171277, virtualbox-modules-arch/trunk/PKGBUILD)
virtualbox-modules-arch/repos/community-x86_64/build.sh
(from rev 171277, virtualbox-modules-arch/trunk/build.sh)
virtualbox-modules-arch/repos/community-x86_64/virtualbox-modules-arch.install
(from rev 171277, virtualbox-modules-arch/trunk/virtualbox-modules-arch.install)
Deleted:
virtualbox-modules-arch/repos/community-i686/PKGBUILD
virtualbox-modules-arch/repos/community-i686/build.sh
virtualbox-modules-arch/repos/community-i686/virtualbox-guest-modules.install
virtualbox-modules-arch/repos/community-i686/virtualbox-host-modules.install
virtualbox-modules-arch/repos/community-x86_64/PKGBUILD
virtualbox-modules-arch/repos/community-x86_64/build.sh
virtualbox-modules-arch/repos/community-x86_64/virtualbox-guest-modules.install
virtualbox-modules-arch/repos/community-x86_64/virtualbox-host-modules.install
---------------------------------------------------+
/PKGBUILD | 74 ++++++++++++++++++++
/build.sh | 61 ++++++++++++++++
community-i686/PKGBUILD | 69 ------------------
community-i686/build.sh | 61 ----------------
community-i686/virtualbox-guest-modules.install | 21 -----
community-i686/virtualbox-host-modules.install | 23 ------
community-x86_64/PKGBUILD | 69 ------------------
community-x86_64/build.sh | 61 ----------------
community-x86_64/virtualbox-guest-modules.install | 21 -----
community-x86_64/virtualbox-host-modules.install | 23 ------
community-x86_64/virtualbox-modules-arch.install | 23 ++++++
11 files changed, 158 insertions(+), 348 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2016-04-17 23:17:35 UTC (rev 171277)
+++ community-i686/PKGBUILD 2016-04-17 23:27:06 UTC (rev 171278)
@@ -1,69 +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=5.0.14
-pkgrel=4
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('linux>=4.4' 'linux<4.5'
- 'linux-headers>=4.4' 'linux-headers<4.5'
- "virtualbox-host-dkms>=$pkgver"
- "virtualbox-guest-dkms>=$pkgver")
-
-# remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-4.4-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>=4.4' 'linux<4.5')
- 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>=4.4' 'linux<4.5')
- 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: community-i686/build.sh
===================================================================
--- community-i686/build.sh 2016-04-17 23:17:35 UTC (rev 171277)
+++ community-i686/build.sh 2016-04-17 23:27:06 UTC (rev 171278)
@@ -1,61 +0,0 @@
-#!/bin/bash
-# lazyness can be enhanced everyday
-
-shopt -s nullglob
-
-usage() {
- echo "usage: $0 extra"
- echo " $0 testing"
- exit 1
-}
-
-# $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")
- case $curkernel in
- 3.19) nextkernel="4.0";;
- *) nextkernel=${curkernel%.*}.$((${curkernel#*.}+1));;
- esac
-
- 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() {
- _files=("$PWD"/../../virtualbox/trunk/virtualbox-*-dkms-*-$arch.pkg.tar.xz)
- makechrootpkg -c -u "${_files[@]/#/-I}" -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 x86_64 i686; do
- build /var/lib/archbuild/extra-$arch $arch
- done
- ;;
- testing)
- update testing linux$suf-headers
- for arch in x86_64 i686; do
- build /var/lib/archbuild/testing-$arch $arch
- done
- ;;
- *)
- usage
- ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
Deleted: community-i686/virtualbox-guest-modules.install
===================================================================
--- community-i686/virtualbox-guest-modules.install 2016-04-17 23:17:35 UTC (rev 171277)
+++ community-i686/virtualbox-guest-modules.install 2016-04-17 23:27:06 UTC (rev 171278)
@@ -1,21 +0,0 @@
-_depmod() {
- EXTRAMODULES=extramodules-4.4-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: community-i686/virtualbox-host-modules.install
===================================================================
--- community-i686/virtualbox-host-modules.install 2016-04-17 23:17:35 UTC (rev 171277)
+++ community-i686/virtualbox-host-modules.install 2016-04-17 23:27:06 UTC (rev 171278)
@@ -1,23 +0,0 @@
-_depmod() {
- EXTRAMODULES=extramodules-4.4-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:
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2016-04-17 23:17:35 UTC (rev 171277)
+++ community-x86_64/PKGBUILD 2016-04-17 23:27:06 UTC (rev 171278)
@@ -1,69 +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=5.0.14
-pkgrel=4
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('linux>=4.4' 'linux<4.5'
- 'linux-headers>=4.4' 'linux-headers<4.5'
- "virtualbox-host-dkms>=$pkgver"
- "virtualbox-guest-dkms>=$pkgver")
-
-# remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-4.4-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>=4.4' 'linux<4.5')
- 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>=4.4' 'linux<4.5')
- 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-arch/repos/community-x86_64/PKGBUILD (from rev 171277, virtualbox-modules-arch/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2016-04-17 23:27:06 UTC (rev 171278)
@@ -0,0 +1,74 @@
+# $Id$
+# Maintainer: Sébastien Luttringer
+# Contributor: Ionut Biru <ibiru at archlinux.org>
+
+pkgbase=virtualbox-modules-arch
+pkgname=('virtualbox-host-modules-arch' 'virtualbox-guest-modules-arch')
+pkgver=5.0.16
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://virtualbox.org'
+license=('GPL')
+makedepends=('linux>=4.5' 'linux<4.6'
+ 'linux-headers>=4.5' 'linux-headers<4.6'
+ "virtualbox-host-dkms>=$pkgver"
+ "virtualbox-guest-dkms>=$pkgver")
+
+# remember to also adjust the .install files and the package deps below
+_extramodules=extramodules-4.5-ARCH
+
+package_virtualbox-host-modules-arch(){
+ _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
+ pkgdesc='Virtualbox host kernel modules for Arch Kernel'
+ depends=('linux>=4.5' 'linux<4.6')
+ replaces=('virtualbox-modules' 'virtualbox-host-modules')
+ conflicts=('virtualbox-modules' 'virtualbox-host-modules'
+ 'virtualbox-host-dkms')
+ provides=('VIRTUALBOX-HOST-MODULES')
+ install=virtualbox-modules-arch.install
+
+ cd "/var/lib/dkms/vboxhost/${pkgver}_OSE/$_kernver/$CARCH/module"
+ install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+ install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
+
+ # compress earch modules individually
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ # systemd module loading
+ install -Dm644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ printf "vboxdrv\nvboxpci\nvboxnetadp\nvboxnetflt\n" > \
+ "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+}
+
+package_virtualbox-guest-modules-arch(){
+ _kernver="$(cat /usr/lib/modules/$_extramodules/version)"
+ pkgdesc='Virtualbox guest kernel modules for Arch Kernel'
+ license=('GPL')
+ depends=('linux>=4.5' 'linux<4.6')
+ replaces=('virtualbox-archlinux-modules' 'virtualbox-guest-modules')
+ conflicts=('virtualbox-archlinux-modules' 'virtualbox-guest-modules'
+ 'virtualbox-guest-dkms')
+ provides=('VIRTUALBOX-GUEST-MODULES')
+ install=virtualbox-modules-arch.install
+
+ cd "/var/lib/dkms/vboxguest/${pkgver}_OSE/$_kernver/$CARCH/module"
+ install -dm755 "$pkgdir/usr/lib/modules/$_extramodules/"
+ install -m644 * "$pkgdir/usr/lib/modules/$_extramodules/"
+
+ # compress earch modules individually
+ find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
+
+ # systemd module loading
+ install -Dm644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+ printf "vboxguest\nvboxsf\nvboxvideo\n" > \
+ "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
+}
+
+# vim:set ts=2 sw=2 et:
+
+
+
+
+
+
+
Deleted: community-x86_64/build.sh
===================================================================
--- community-x86_64/build.sh 2016-04-17 23:17:35 UTC (rev 171277)
+++ community-x86_64/build.sh 2016-04-17 23:27:06 UTC (rev 171278)
@@ -1,61 +0,0 @@
-#!/bin/bash
-# lazyness can be enhanced everyday
-
-shopt -s nullglob
-
-usage() {
- echo "usage: $0 extra"
- echo " $0 testing"
- exit 1
-}
-
-# $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")
- case $curkernel in
- 3.19) nextkernel="4.0";;
- *) nextkernel=${curkernel%.*}.$((${curkernel#*.}+1));;
- esac
-
- 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() {
- _files=("$PWD"/../../virtualbox/trunk/virtualbox-*-dkms-*-$arch.pkg.tar.xz)
- makechrootpkg -c -u "${_files[@]/#/-I}" -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 x86_64 i686; do
- build /var/lib/archbuild/extra-$arch $arch
- done
- ;;
- testing)
- update testing linux$suf-headers
- for arch in x86_64 i686; do
- build /var/lib/archbuild/testing-$arch $arch
- done
- ;;
- *)
- usage
- ;;
-esac
-
-# vim:set ts=2 sw=2 ft=sh et:
Copied: virtualbox-modules-arch/repos/community-x86_64/build.sh (from rev 171277, virtualbox-modules-arch/trunk/build.sh)
===================================================================
--- community-x86_64/build.sh (rev 0)
+++ community-x86_64/build.sh 2016-04-17 23:27:06 UTC (rev 171278)
@@ -0,0 +1,61 @@
+#!/bin/bash
+# lazyness can be enhanced everyday
+
+shopt -s nullglob
+
+usage() {
+ echo "usage: $0 extra"
+ echo " $0 testing"
+ exit 1
+}
+
+# $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")
+ case $curkernel in
+ 3.19) nextkernel="4.0";;
+ *) nextkernel=${curkernel%.*}.$((${curkernel#*.}+1));;
+ esac
+
+ 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() {
+ _files=("$PWD"/../../virtualbox/trunk/virtualbox-*-dkms-*-$arch.pkg.tar.xz)
+ makechrootpkg -c -u "${_files[@]/#/-I}" -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 x86_64 i686; do
+ build /var/lib/archbuild/extra-$arch $arch
+ done
+ ;;
+ testing)
+ update testing linux$suf-headers
+ for arch in x86_64 i686; do
+ build /var/lib/archbuild/testing-$arch $arch
+ done
+ ;;
+ *)
+ usage
+ ;;
+esac
+
+# vim:set ts=2 sw=2 ft=sh et:
Deleted: community-x86_64/virtualbox-guest-modules.install
===================================================================
--- community-x86_64/virtualbox-guest-modules.install 2016-04-17 23:17:35 UTC (rev 171277)
+++ community-x86_64/virtualbox-guest-modules.install 2016-04-17 23:27:06 UTC (rev 171278)
@@ -1,21 +0,0 @@
-_depmod() {
- EXTRAMODULES=extramodules-4.4-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: community-x86_64/virtualbox-host-modules.install
===================================================================
--- community-x86_64/virtualbox-host-modules.install 2016-04-17 23:17:35 UTC (rev 171277)
+++ community-x86_64/virtualbox-host-modules.install 2016-04-17 23:27:06 UTC (rev 171278)
@@ -1,23 +0,0 @@
-_depmod() {
- EXTRAMODULES=extramodules-4.4-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-arch/repos/community-x86_64/virtualbox-modules-arch.install (from rev 171277, virtualbox-modules-arch/trunk/virtualbox-modules-arch.install)
===================================================================
--- community-x86_64/virtualbox-modules-arch.install (rev 0)
+++ community-x86_64/virtualbox-modules-arch.install 2016-04-17 23:27:06 UTC (rev 171278)
@@ -0,0 +1,23 @@
+_depmod() {
+ EXTRAMODULES=extramodules-4.5-ARCH
+ depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+}
+
+post_install() {
+ cat << EOF
+==> Virtualbox kernel modules will be loaded at boot time by systemd-modules-load.
+==> In order to use them right now, you may want to load them manually.
+==> Read modules-load.d man page to disable module boot loading.'
+EOF
+ _depmod
+}
+
+post_upgrade() {
+ _depmod
+}
+
+post_remove() {
+ _depmod
+}
+
+# vim:set ts=2 sw=2 et:
More information about the arch-commits
mailing list