diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:49:17 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-05-28 02:49:17 -0300 |
| commit | 8240941c15534492c2b4dbd1095725eb501fd454 (patch) | |
| tree | feb703caeab59cda9125c599fab609c0cae86e20 /community/virtualbox | |
| parent | 71f4d216a731d8b2e0309d32113b2ae1aca5c4f5 (diff) | |
| parent | a084559f421a288dd77f81e458161f95ae8d1be9 (diff) | |
Merge branch 'master' of ssh://vparabola/srv/git/projects/abslibre-mips64el
Conflicts:
.gitignore
community/virtualbox/PKGBUILD
extra/transmission/PKGBUILD
libre/pacman/PKGBUILD
Diffstat (limited to 'community/virtualbox')
| -rw-r--r-- | community/virtualbox/PKGBUILD | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/community/virtualbox/PKGBUILD b/community/virtualbox/PKGBUILD index 0e267725f..ee557ebee 100644 --- a/community/virtualbox/PKGBUILD +++ b/community/virtualbox/PKGBUILD @@ -15,14 +15,8 @@ source=(http://download.virtualbox.org/virtualbox/${pkgver}/VirtualBox-${pkgver} http://download.virtualbox.org/virtualbox/${pkgver}/UserManual.pdf virtualbox-4-makeself-check.patch virtualbox-4-mkisofs-check.patch 10-vboxdrv.rules 60-vboxguest.rules vboxdrv-reference.patch LocalConfig.kmk vboxdrv.sh -<<<<<<< HEAD - 18-system-xorg.patch gcc46.patch) -_kernver=2.6.38-LIBRE -======= 18-system-xorg.patch - change_default_driver_dir.patch) -_kernver=2.6.38-ARCH ->>>>>>> 33feb015eb09eee76827f359e685fce981d88111 +_kernver=2.6.38-LIBRE build() { cd "$srcdir/VirtualBox-${pkgver}_OSE" |