Update VLC and xscreensaver

[hvlinux.git] / stage2 / pkg / udev

diff --git a/stage2/pkg/udev b/stage2/pkg/udev
old mode 100755 (executable)
new mode 100644 (file)
index ba93614..4ad5210
--- a/stage2/pkg/udev
+++ b/stage2/pkg/udev
@@ -1,29 +1,31 @@
 #!/bin/bash
 
-CONFIGURE_OPTS="\
-    --sbindir=/sbin \
-    --with-rootlibdir=/lib \
-    --libexecdir=/lib/udev \
-    --docdir=/usr/share/doc/${PACKAGE} \
-    --disable-extras \
-    --disable-introspection \
-    ${CONFIGURE_OPTS}"
+hvconfig_pre()
+{
+    # --disable-keymap: to remove gperf dependency
+
+    CONFIGURE_OPTS="\
+        ${CONFIGURE_OPTS} \
+        --exec-prefix="" \
+        --libexecdir=/lib \
+        --with-usb-ids-path=no \
+        --with-pci-ids-path=no \
+        --disable-keymap \
+        --disable-introspection"
+}
 
 hvbuild_post()
 {
-    # Udev has to be configured in order to work properly, as its default
-    # configuration does not cover all devices. First install two extra
-    # rules files from Udev to help support device-mapper and RAID setups:
-    install -m644 -v rules/packages/64-*.rules \
-        /lib/udev/rules.d/
-
-    # Now install a file to create symlinks for certain hand-held devices:
-    install -m644 -v rules/packages/40-pilot-links.rules \
-        /lib/udev/rules.d/
+    install -v -m755 ${SCRDIR}/misc/udev/udev-create-persistent-net.sh \
+        /usr/local/bin
+    install -v -m644 ${SCRDIR}/misc/udev/10-media-automount.rules \
+        /etc/udev/rules.d/
+    install -v -m644 ${SCRDIR}/misc/udev/11-sd-card-automount.rules \
+        /etc/udev/rules.d/
 
-    # Now install a file to handle ISDN devices:
-    install -m644 -v rules/packages/40-isdn.rules \
-        /lib/udev/rules.d/
+    mv /lib/pkgconfig/{gudev-*.pc,libudev.pc} /usr/lib/pkgconfig
+    rmdir /lib/pkgconfig
 
-    install -m755 ${SCRDIR}/misc/udev-create-persistent-net.sh /usr/local/bin
+    sed -i -e "s/\(SYMLINK+=\"cdrom\)\"/\1 dvd\"/" \
+        /lib/udev/rules.d/60-cdrom_id.rules
 }