diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-07 11:24:34 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-11-07 11:24:34 -0300 |
commit | a607668699d0ed030ac69ed31969dfa266439e38 (patch) | |
tree | 5b3e076437e78d8624668454afc1d82750d54c8a /libre | |
parent | 6b015d22b5b59eddb6e8c40989017d8492ac912c (diff) | |
parent | a4d309341dbcd3c28ee68e818c1d5ef54114adf8 (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community-testing/libraw/PKGBUILD
community-testing/virtualbox-modules/PKGBUILD
community-testing/virtualbox-modules/virtualbox-modules.install
community-testing/virtualbox/PKGBUILD
community-testing/virtualbox/vboxdrv-reference.patch
community-testing/virtualbox/virtualbox.install
community-testing/vtk/PKGBUILD
community/audex/PKGBUILD
community/critter/PKGBUILD
community/egoboo/PKGBUILD
community/fcgiwrap/PKGBUILD
community/hping/PKGBUILD
community/libesmtp/PKGBUILD
community/lockdev/PKGBUILD
community/pidgin-musictracker/PKGBUILD
community/pidgin-otr/PKGBUILD
community/pylibacl/PKGBUILD
community/pypanel/PKGBUILD
community/rdiff-backup/PKGBUILD
community/steghide/PKGBUILD
community/tabbed/PKGBUILD
community/transset-df/PKGBUILD
community/wyrd/PKGBUILD
core/openldap/PKGBUILD
core/sqlite3/PKGBUILD
extra/fltk/PKGBUILD
extra/thunar/PKGBUILD
extra/xfce4-clipman-plugin/PKGBUILD
multilib/lib32-acl/PKGBUILD
multilib/lib32-alsa-oss/PKGBUILD
multilib/lib32-glib2/PKGBUILD
multilib/lib32-libffi/PKGBUILD
multilib/lib32-libmng/PKGBUILD
multilib/lib32-libpciaccess/PKGBUILD
multilib/lib32-libusb-compat/PKGBUILD
multilib/lib32-libusb/PKGBUILD
multilib/wine/PKGBUILD
Diffstat (limited to 'libre')
5 files changed, 8 insertions, 14 deletions
diff --git a/libre/virtualbox-parabola-modules/60-vboxguest.rules b/libre/virtualbox-parabola-modules/60-vboxguest.rules index d64575709..6285f7249 100644 --- a/libre/virtualbox-parabola-modules/60-vboxguest.rules +++ b/libre/virtualbox-parabola-modules/60-vboxguest.rules @@ -1,3 +1,2 @@ ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600" ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666" - diff --git a/libre/virtualbox-parabola-modules/LocalConfig.kmk b/libre/virtualbox-parabola-modules/LocalConfig.kmk index 1fb0b88bd..af79f90cd 100644 --- a/libre/virtualbox-parabola-modules/LocalConfig.kmk +++ b/libre/virtualbox-parabola-modules/LocalConfig.kmk @@ -17,4 +17,3 @@ VBOX_BLD_PYTHON = python2 VBOX_JAVA_HOME = /usr/lib/jvm/java-6-openjdk VBOX_GCC_WERR = VBOX_GCC_WARN = - diff --git a/libre/virtualbox-parabola-modules/PKGBUILD b/libre/virtualbox-parabola-modules/PKGBUILD index 7012d5943..d077c092a 100644 --- a/libre/virtualbox-parabola-modules/PKGBUILD +++ b/libre/virtualbox-parabola-modules/PKGBUILD @@ -4,11 +4,11 @@ pkgbase=virtualbox-modules pkgname=('virtualbox-modules' 'virtualbox-parabola-modules') pkgver=4.1.4 -pkgrel=3 +pkgrel=3.1 arch=('i686' 'x86_64') url='http://virtualbox.org' license=('GPL') -makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers') +makedepends=('libstdc++5' 'bin86' 'dev86' 'iasl' 'libxslt' 'libxml2' 'libpng' 'libidl2' 'xalan-c' 'sdl' 'linux-headers' 'linux-libre') [[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc') source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver}.tar.bz2 LocalConfig.kmk 60-vboxguest.rules) @@ -17,12 +17,13 @@ md5sums=('dc6e6801b3823332b6ca2e9915221aae' 'ed1341881437455d9735875ddf455fbe') _extramodules=extramodules-3.1-LIBRE -_kernver="$(cat /lib/modules/${_extramodules}/version)" - -export KERN_DIR=/lib/modules/${_kernver}/build -export KERN_INCL=/usr/src/linux-${_kernver}/include/ build() { + _kernver="$(cat /lib/modules/${_extramodules}/version)" + + export KERN_DIR=/lib/modules/${_kernver}/build + export KERN_INCL=/usr/src/linux-${_kernver}/include/ + cd "$srcdir/VirtualBox-${pkgver}_OSE" cp "$srcdir/LocalConfig.kmk" . @@ -100,7 +101,3 @@ package_virtualbox-modules(){ sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "$startdir/virtualbox-modules.install" } - -md5sums=('dc6e6801b3823332b6ca2e9915221aae' - 'b566518ba3ba3a513b91a75283cdedf8' - '13ff08388a54fd48cc04523380f26af6') diff --git a/libre/virtualbox-parabola-modules/virtualbox-modules.install b/libre/virtualbox-parabola-modules/virtualbox-modules.install index 0706681bf..b57135999 100644 --- a/libre/virtualbox-parabola-modules/virtualbox-modules.install +++ b/libre/virtualbox-parabola-modules/virtualbox-modules.install @@ -16,4 +16,4 @@ post_upgrade() { post_remove() { EXTRAMODULES='extramodules-3.1-LIBRE' depmod $(cat /lib/modules/$EXTRAMODULES/version) - +} diff --git a/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install b/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install index decf303e9..8801d8c49 100644 --- a/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install +++ b/libre/virtualbox-parabola-modules/virtualbox-parabola-modules.install @@ -15,4 +15,3 @@ post_remove() { EXTRAMODULES='extramodules-3.1-LIBRE' depmod $(cat /lib/modules/$EXTRAMODULES/version) } - |