diff options
author | Shackra Sislock <none@none> | 2012-07-26 01:05:32 -0600 |
---|---|---|
committer | Shackra Sislock <none@none> | 2012-07-26 01:05:32 -0600 |
commit | d774c9b2244c9cc711224a2536b524f6df8c8db7 (patch) | |
tree | 607d1072955bc7b4feee84fdc1bd4e13cc507127 /libre/virtualbox-modules | |
parent | 8f4802b2d269869354619e783ec9be78f18c5c8a (diff) | |
parent | fecda1c35086e350c5264c4631e7c4f27e401f5e (diff) |
moving kervala_libsquish to kervalasquish and adding the common.cmake CMake module, see http://dev.ryzom.com/issues/1485#note-5
Diffstat (limited to 'libre/virtualbox-modules')
-rw-r--r-- | libre/virtualbox-modules/PKGBUILD | 8 | ||||
-rw-r--r-- | libre/virtualbox-modules/linux34.patch | 12 | ||||
-rw-r--r-- | libre/virtualbox-modules/virtualbox-modules.install | 6 | ||||
-rw-r--r-- | libre/virtualbox-modules/virtualbox-parabola-modules.install | 6 |
4 files changed, 10 insertions, 22 deletions
diff --git a/libre/virtualbox-modules/PKGBUILD b/libre/virtualbox-modules/PKGBUILD index f965869f7..5e0feec6d 100644 --- a/libre/virtualbox-modules/PKGBUILD +++ b/libre/virtualbox-modules/PKGBUILD @@ -6,7 +6,7 @@ pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') pkgver=4.1.18 -pkgrel=4 +pkgrel=5 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') @@ -18,7 +18,7 @@ md5sums=('38db0a87cba659b484af868b0c2bd3ac' '4c88bd122677a35f68abd76eb01b378b' 'ed1341881437455d9735875ddf455fbe') -_extramodules=extramodules-3.4-LIBRE +_extramodules=extramodules-3.5-LIBRE _kernver="$(cat /usr/lib/modules/${_extramodules}/version || true)" export KERN_DIR=/usr/lib/modules/${_kernver}/build @@ -53,7 +53,7 @@ package_virtualbox-parabola-modules(){ pkgdesc="Additions only for Parabola guests (kernel modules)" license=('GPL') install=virtualbox-parabola-modules.install - depends=('linux-libre>=3.4' 'linux-libre<3.5') + depends=('linux-libre>=3.5' 'linux-libre<3.6') replaces=('virtualbox-archlinux-modules') conflicts=('virtualbox-archlinux-modules') provides=("virtualbox-archlinux-modules=$pkgver") @@ -79,7 +79,7 @@ package_virtualbox-modules(){ pkgdesc="Kernel modules for VirtualBox" license=('GPL') install=virtualbox-modules.install - depends=('linux-libre>=3.4' 'linux-libre<3.5') + depends=('linux-libre>=3.5' 'linux-libre<3.6') source "$srcdir/VirtualBox-${pkgver}/env.sh" diff --git a/libre/virtualbox-modules/linux34.patch b/libre/virtualbox-modules/linux34.patch deleted file mode 100644 index 05ec78557..000000000 --- a/libre/virtualbox-modules/linux34.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -Nur VirtualBox-4.1.14.orig/Config.kmk VirtualBox-4.1.14/Config.kmk ---- VirtualBox-4.1.14.orig/Config.kmk 2012-04-26 16:56:21.000000000 +0000 -+++ VirtualBox-4.1.14/Config.kmk 2012-05-21 14:35:22.348398884 +0000 -@@ -2856,7 +2856,7 @@ - TEMPLATE_VBOXR0DRV_CFLAGS.amd64 = -m64 -mno-red-zone -mcmodel=kernel -mno-sse -mno-mmx -mno-sse2 -mno-3dnow \ - -fno-reorder-blocks -ffreestanding -fno-asynchronous-unwind-tables -funit-at-a-time \ - -Wno-sign-compare -Wdeclaration-after-statement --TEMPLATE_VBOXR0DRV_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti -+TEMPLATE_VBOXR0DRV_CXXFLAGS = $(filter-out -Wstrict-prototypes -Wno-pointer-sign -ffreestanding -Wdeclaration-after-statement -Werror-implicit-function-declaration,$(TEMPLATE_VBOXR0DRV_CFLAGS) $(TEMPLATE_VBOXR0DRV_CFLAGS.$(KBUILD_TARGET_ARCH))) -fno-exceptions -fno-rtti -fpermissive - ifndef VBOX_LINUX_VERSION_2_4 - # 2.6 - TEMPLATE_VBOXR0DRV_SYSSUFF = .ko diff --git a/libre/virtualbox-modules/virtualbox-modules.install b/libre/virtualbox-modules/virtualbox-modules.install index b178686e2..3f2a12a3f 100644 --- a/libre/virtualbox-modules/virtualbox-modules.install +++ b/libre/virtualbox-modules/virtualbox-modules.install @@ -3,17 +3,17 @@ post_install() { ===> You must load vboxdrv module before starting VirtualBox: ===> # modprobe vboxdrv EOF - EXTRAMODULES='extramodules-3.4-LIBRE' + EXTRAMODULES='extramodules-3.5-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.4-LIBRE' + EXTRAMODULES='extramodules-3.5-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) echo 'In order to use the new version, reload all virtualbox modules manually.' } post_remove() { - EXTRAMODULES='extramodules-3.4-LIBRE' + EXTRAMODULES='extramodules-3.5-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } diff --git a/libre/virtualbox-modules/virtualbox-parabola-modules.install b/libre/virtualbox-modules/virtualbox-parabola-modules.install index 31575fb9d..c3419c991 100644 --- a/libre/virtualbox-modules/virtualbox-parabola-modules.install +++ b/libre/virtualbox-modules/virtualbox-parabola-modules.install @@ -2,16 +2,16 @@ post_install() { cat << EOF ===> You may want to load vboxguest, vboxsf and vboxvideo EOF - EXTRAMODULES='extramodules-3.4-LIBRE' + EXTRAMODULES='extramodules-3.5-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_upgrade() { - EXTRAMODULES='extramodules-3.4-LIBRE' + EXTRAMODULES='extramodules-3.5-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } post_remove() { - EXTRAMODULES='extramodules-3.4-LIBRE' + EXTRAMODULES='extramodules-3.5-LIBRE' depmod $(cat /usr/lib/modules/$EXTRAMODULES/version) } |