diff options
| author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
|---|---|---|
| committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2011-07-12 10:57:14 -0300 |
| commit | 66873986693bc3c8812d12f3919f1977b9a30674 (patch) | |
| tree | 14a385b80dfa23890d9d864dd89fafb61dd38ff2 /extra/v86d | |
| parent | fa448c3d0b12a414235560d2cbd14eb74aace7bd (diff) | |
| parent | e03f4b9bc9da3327de94bc58aa92ecb836c1580d (diff) | |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
community/puzzles/PKGBUILD
core/lvm2/PKGBUILD
core/mdadm/PKGBUILD
libre/kernel26-libre/PKGBUILD
multilib-testing/lib32-mesa/PKGBUILD
testing/mesa/PKGBUILD
Diffstat (limited to 'extra/v86d')
| -rw-r--r-- | extra/v86d/PKGBUILD | 8 | ||||
| -rw-r--r-- | extra/v86d/v86d | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD index bf75201a1..d142a2f8b 100644 --- a/extra/v86d/PKGBUILD +++ b/extra/v86d/PKGBUILD @@ -1,15 +1,15 @@ -# $Id: PKGBUILD 119572 2011-04-12 13:37:13Z eric $ +# $Id: PKGBUILD 129979 2011-06-30 18:07:08Z thomas $ # Maintainer: Thomas Baechler <thomas@archlinux.org> pkgname=v86d pkgver=0.1.10 -pkgrel=1 +pkgrel=2 pkgdesc="userspace helper for uvesafb that runs x86 code in an emulated environment" arch=("i686" "x86_64" 'mips64el') url="http://dev.gentoo.org/~spock/projects/uvesafb/" license=('GPL2') depends=('glibc') -conflicts=('mkinitcpio<0.5.99') +conflicts=('mkinitcpio<0.7') backup=('etc/modprobe.d/uvesafb.conf') options=('!makeflags') source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2 @@ -17,7 +17,7 @@ source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.b v86d_hook modprobe.uvesafb) md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0' - '33f3131e7bf041ed6a67e92bff272f4c' + '2748ca01397e5c4435f87692f7d042a8' '813958b8f6c75a7063e4858f31509694' '2d7cc8dc6a41916a13869212d0191147') diff --git a/extra/v86d/v86d b/extra/v86d/v86d index 57383fe78..2065b8e64 100644 --- a/extra/v86d/v86d +++ b/extra/v86d/v86d @@ -1,4 +1,4 @@ -install() { +build() { add_binary "/sbin/v86d" add_file "/etc/modprobe.d/uvesafb.conf" MODULES="uvesafb" |