From 634971f2f6dab5bcad8d7ea688eb033e311c802f Mon Sep 17 00:00:00 2001 From: Lucas Hazel Date: Sat, 12 Dec 2009 00:55:14 +1100 Subject: [PATCH] hal: move udev rules to /lib --- hal/.footprint | 7 ++++--- hal/Pkgfile | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/hal/.footprint b/hal/.footprint index d05065570..577a8d54f 100644 --- a/hal/.footprint +++ b/hal/.footprint @@ -1,6 +1,10 @@ drwxr-xr-x root/root etc/ drwxr-xr-x root/root etc/rc.d/ -rwxr-xr-x root/root etc/rc.d/hald +drwxr-xr-x root/root lib/ +drwxr-xr-x root/root lib/udev/ +drwxr-xr-x root/root lib/udev/rules.d/ +-rw-r--r-- root/root lib/udev/rules.d/90-hal.rules drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/hal-device @@ -115,9 +119,6 @@ lrwxrwxrwx root/root usr/lib/libhal.so.1 -> libhal.so.1.0.0 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/hal-storage.pc -rw-r--r-- root/root usr/lib/pkgconfig/hal.pc -drwxr-xr-x root/root usr/lib/udev/ -drwxr-xr-x root/root usr/lib/udev/rules.d/ --rw-r--r-- root/root usr/lib/udev/rules.d/90-hal.rules drwxr-xr-x root/root usr/man/ drwxr-xr-x root/root usr/man/man1/ -rw-r--r-- root/root usr/man/man1/hal-disable-polling.1.gz diff --git a/hal/Pkgfile b/hal/Pkgfile index 12a61257b..0d98975da 100644 --- a/hal/Pkgfile +++ b/hal/Pkgfile @@ -6,7 +6,7 @@ name=hal version=0.5.14 -release=1 +release=2 source=(http://hal.freedesktop.org/releases/$name-$version.tar.gz \ hal.conf rc.hald) @@ -22,6 +22,7 @@ build() { --with-hal-user=haldaemon \ --with-hal-group=haldaemon \ --with-dbus-sys=/usr/etc/dbus-1/system.d \ + --with-udev-prefix=/lib \ --with-hwdata=/usr/share \ --disable-policy-kit \ --disable-console-kit @@ -30,7 +31,6 @@ build() { make DESTDIR=$PKG install install -D -o root -g root -m 0755 $SRC/rc.hald \ $PKG/etc/rc.d/hald - mv $PKG/usr/udev $PKG/etc/ rm -rf $PKG/usr/share/{doc,locale} rm -rf $PKG/usr/share/gtk-doc cp $SRC/hal.conf $PKG/usr/etc/dbus-1/system.d/