summaryrefslogtreecommitdiff
path: root/extra/v86d
diff options
context:
space:
mode:
authorNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-13 11:58:27 -0300
committerNicolás Reynolds <fauno@kiwwwi.com.ar>2012-04-13 11:58:27 -0300
commit8e5c27c1b5d01d353df2542166d50f9f456b2597 (patch)
tree227eed66652cffc0e872b75e7fe601cb23214cdb /extra/v86d
parent394988e4c3a3ab21e5d79481ac3f3295045af987 (diff)
parent7ff5465d0386f06bea97ef956397c305d6f7e07f (diff)
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts: community/smalltalk/PKGBUILD extra/crypto++/PKGBUILD extra/libpciaccess/PKGBUILD extra/postfix/PKGBUILD extra/samba/PKGBUILD extra/xorg-server/PKGBUILD libre/gstreamer0.10-bad-libre/PKGBUILD multilib/gcc-multilib/PKGBUILD multilib/lib32-libpciaccess/PKGBUILD
Diffstat (limited to 'extra/v86d')
-rw-r--r--extra/v86d/PKGBUILD20
-rw-r--r--extra/v86d/v86d2
-rw-r--r--extra/v86d/v86d_hook2
3 files changed, 11 insertions, 13 deletions
diff --git a/extra/v86d/PKGBUILD b/extra/v86d/PKGBUILD
index d142a2f8b..13ad5db3f 100644
--- a/extra/v86d/PKGBUILD
+++ b/extra/v86d/PKGBUILD
@@ -1,25 +1,19 @@
-# $Id: PKGBUILD 129979 2011-06-30 18:07:08Z thomas $
+# $Id: PKGBUILD 156008 2012-04-11 12:26:27Z tomegun $
# Maintainer: Thomas Baechler <thomas@archlinux.org>
pkgname=v86d
pkgver=0.1.10
-pkgrel=2
+pkgrel=3
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.7')
-backup=('etc/modprobe.d/uvesafb.conf')
options=('!makeflags')
source=(http://dev.gentoo.org/~spock/projects/uvesafb/archive/v86d-$pkgver.tar.bz2
v86d
v86d_hook
modprobe.uvesafb)
-md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0'
- '2748ca01397e5c4435f87692f7d042a8'
- '813958b8f6c75a7063e4858f31509694'
- '2d7cc8dc6a41916a13869212d0191147')
build() {
cd "$srcdir/v86d-$pkgver"
@@ -32,7 +26,11 @@ package() {
cd "$srcdir/v86d-$pkgver"
make DESTDIR="$pkgdir" install
- install -D -m644 "$srcdir/v86d" "$pkgdir/lib/initcpio/install/v86d"
- install -D -m644 "$srcdir/v86d_hook" "$pkgdir/lib/initcpio/hooks/v86d"
- install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/etc/modprobe.d/uvesafb.conf"
+ install -D -m644 "$srcdir/v86d" "$pkgdir/usr/lib/initcpio/install/v86d"
+ install -D -m644 "$srcdir/v86d_hook" "$pkgdir/usr/lib/initcpio/hooks/v86d"
+ install -D -m644 "$srcdir/modprobe.uvesafb" "$pkgdir/usr/lib/modprobe.d/uvesafb.conf"
}
+md5sums=('51c792ba7b874ad8c43f0d3da4cfabe0'
+ 'b20042d1e5354958b62d4944998d68aa'
+ '5f75b8bc4a7ddf595014591e5db263cb'
+ '2d7cc8dc6a41916a13869212d0191147')
diff --git a/extra/v86d/v86d b/extra/v86d/v86d
index 2065b8e64..81735816e 100644
--- a/extra/v86d/v86d
+++ b/extra/v86d/v86d
@@ -1,6 +1,6 @@
build() {
add_binary "/sbin/v86d"
- add_file "/etc/modprobe.d/uvesafb.conf"
+ add_file "/usr/lib/modprobe.d/uvesafb.conf"
MODULES="uvesafb"
SCRIPT="v86d"
}
diff --git a/extra/v86d/v86d_hook b/extra/v86d/v86d_hook
index e5dff01c1..2b4375e15 100644
--- a/extra/v86d/v86d_hook
+++ b/extra/v86d/v86d_hook
@@ -1,4 +1,4 @@
run_hook()
{
/sbin/modprobe uvesafb
-} \ No newline at end of file
+}