diff --git a/packages/audio/pulseaudio/install b/packages/audio/pulseaudio/install index 6dd8c7a1b8..89b4fc1a60 100755 --- a/packages/audio/pulseaudio/install +++ b/packages/audio/pulseaudio/install @@ -23,8 +23,8 @@ mkdir -p $INSTALL/etc/pulse cp $PKG_DIR/config/default.pa $INSTALL/etc/pulse cp $PKG_BUILD/src/system.pa $INSTALL/etc/pulse -mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules $INSTALL/lib/udev/rules.d +mkdir -p $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules $INSTALL/usr/lib/udev/rules.d mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/src/.libs/pacat $INSTALL/usr/bin diff --git a/packages/devel/usbmuxd/install b/packages/devel/usbmuxd/install index 5757d1b4c8..f48e0e6084 100755 --- a/packages/devel/usbmuxd/install +++ b/packages/devel/usbmuxd/install @@ -28,5 +28,5 @@ mkdir -p $INSTALL/usr/lib mkdir -p $INSTALL/usr/sbin cp -P $PKG_BUILD/build/daemon/usbmuxd $INSTALL/usr/sbin -mkdir -p $INSTALL/lib/udev/rules.d - cp -P $PKG_BUILD/build/udev/*.rules $INSTALL/lib/udev/rules.d +mkdir -p $INSTALL/usr/lib/udev/rules.d + cp -P $PKG_BUILD/build/udev/*.rules $INSTALL/usr/lib/udev/rules.d diff --git a/packages/multimedia/crystalhd/install b/packages/multimedia/crystalhd/install index b39ef43bc2..15caef385c 100755 --- a/packages/multimedia/crystalhd/install +++ b/packages/multimedia/crystalhd/install @@ -30,8 +30,8 @@ mkdir -p $INSTALL/lib/firmware mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/linux_lib/libcrystalhd/*.so* $INSTALL/usr/lib -mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/driver/linux/*.rules $INSTALL/lib/udev/rules.d +mkdir -p $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/driver/linux/*.rules $INSTALL/usr/lib/udev/rules.d mkdir -p $INSTALL/lib/modules/$VER/crystalhd cp $PKG_BUILD/driver/linux/crystalhd.ko $INSTALL/lib/modules/$VER/crystalhd diff --git a/packages/network/bluez/install b/packages/network/bluez/install index 19e4d5c3c0..ee8540ddfc 100755 --- a/packages/network/bluez/install +++ b/packages/network/bluez/install @@ -34,15 +34,15 @@ mkdir -p $INSTALL/etc/bluetooth mkdir -p $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/src/bluetooth.conf $INSTALL/etc/dbus-1/system.d -mkdir -p $INSTALL/lib/udev -# not needed: cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/lib/udev -# not needed: chmod +x $INSTALL/lib/udev/bluetooth_serial - cp $PKG_BUILD/tools/hid2hci $INSTALL/lib/udev +mkdir -p $INSTALL/usr/lib/udev +# not needed: cp $PKG_BUILD/scripts/bluetooth_serial $INSTALL/usr/lib/udev +# not needed: chmod +x $INSTALL/usr/lib/udev/bluetooth_serial + cp $PKG_BUILD/tools/hid2hci $INSTALL/usr/lib/udev -mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/scripts/97-bluetooth.rules $INSTALL/lib/udev/rules.d -# todo: cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/lib/udev/rules.d -# not needed: cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/lib/udev/rules.d +mkdir -p $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/scripts/97-bluetooth.rules $INSTALL/usr/lib/udev/rules.d +# todo: cp $PKG_BUILD/scripts/97-bluetooth-hid2hci.rules $INSTALL/usr/lib/udev/rules.d +# not needed: cp $PKG_BUILD/scripts/97-bluetooth-serial.rules $INSTALL/usr/lib/udev/rules.d mkdir -p $INSTALL/usr/lib cp -P $PKG_BUILD/lib/.libs/libbluetooth.so* $INSTALL/usr/lib diff --git a/packages/network/ethtool/install b/packages/network/ethtool/install index 59c3dd5651..dcd2fb7e72 100755 --- a/packages/network/ethtool/install +++ b/packages/network/ethtool/install @@ -25,5 +25,3 @@ mkdir -p $INSTALL/usr/sbin cp $PKG_BUILD/ethtool $INSTALL/usr/sbin -mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_DIR/udev.d/*.rules $INSTALL/lib/udev/rules.d \ No newline at end of file diff --git a/packages/sysutils/remote/eventlircd/install b/packages/sysutils/remote/eventlircd/install index 7e4837fce5..b9e8029395 100755 --- a/packages/sysutils/remote/eventlircd/install +++ b/packages/sysutils/remote/eventlircd/install @@ -25,11 +25,11 @@ mkdir -p $INSTALL/usr/sbin cp $PKG_BUILD/src/eventlircd $INSTALL/usr/sbin -mkdir -p $INSTALL/lib/udev - cp $PKG_BUILD/udev/lircd_helper $INSTALL/lib/udev - chmod +x $INSTALL/lib/udev/lircd_helper - cp $PKG_BUILD/udev/wakeup_enable $INSTALL/lib/udev - chmod +x $INSTALL/lib/udev/wakeup_enable +mkdir -p $INSTALL/usr/lib/udev + cp $PKG_BUILD/udev/lircd_helper $INSTALL/usr/lib/udev + chmod +x $INSTALL/usr/lib/udev/lircd_helper + cp $PKG_BUILD/udev/wakeup_enable $INSTALL/usr/lib/udev + chmod +x $INSTALL/usr/lib/udev/wakeup_enable mkdir -p $INSTALL/etc/eventlircd.d cp $PKG_DIR/evmap/*.evmap $INSTALL/etc/eventlircd.d diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build index 8acffaf7b1..a27286425b 100755 --- a/packages/sysutils/udev/build +++ b/packages/sysutils/udev/build @@ -31,8 +31,9 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \ --build=$HOST_NAME \ --prefix=/usr \ --sysconfdir=/etc \ - --sbindir=/sbin \ - --libexecdir=/lib/udev \ + --bindir=/usr/bin \ + --sbindir=/usr/bin \ + --libexecdir=/usr/lib/udev \ --localstatedir=/var \ --disable-silent-rules \ --disable-static \ diff --git a/packages/sysutils/udev/init.d/13_udev-trigger b/packages/sysutils/udev/init.d/13_udev-trigger index 65f1cebc65..18b5f503d2 100644 --- a/packages/sysutils/udev/init.d/13_udev-trigger +++ b/packages/sysutils/udev/init.d/13_udev-trigger @@ -24,10 +24,10 @@ # runlevels: openelec, installer, textmode progress "request udev events from the kernel (type: subsystems)" - /sbin/udevadm trigger --type=subsystems --action=add + udevadm trigger --type=subsystems --action=add progress "request udev events from the kernel (type: devices)" - /sbin/udevadm trigger --type=devices --action=add + udevadm trigger --type=devices --action=add progress "watching udev event queue from the kernel" - /sbin/udevadm settle & + udevadm settle & diff --git a/packages/sysutils/udev/install b/packages/sysutils/udev/install index 20f83e0763..ca46e0b7cb 100755 --- a/packages/sysutils/udev/install +++ b/packages/sysutils/udev/install @@ -32,38 +32,38 @@ add_group tape 33 add_group tty 5 add_group video 39 -mkdir -p $INSTALL/sbin - cp $PKG_BUILD/$1/udevadm $INSTALL/sbin - cp $PKG_BUILD/$1/udevd $INSTALL/sbin +mkdir -p $INSTALL/usr/bin + cp $PKG_BUILD/$1/udevadm $INSTALL/usr/bin + cp $PKG_BUILD/$1/udevd $INSTALL/usr/bin mkdir -p $INSTALL/usr/lib cp -PR $PKG_BUILD/libudev/.libs/libudev.so* $INSTALL/usr/lib cp -PR $PKG_BUILD/extras/gudev/.libs/libgudev*.so* $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libgudev*.*T -mkdir -p $INSTALL/lib/udev +mkdir -p $INSTALL/usr/lib/udev for i in accelerometer ata_id cdrom_id collect firmware input_id mtd_probe path_id scsi_id usb-db usb_id v4l_id; do - cp $PKG_BUILD/extras/$i/$i $INSTALL/lib/udev + cp $PKG_BUILD/extras/$i/$i $INSTALL/usr/lib/udev done - cp $PKG_BUILD/extras/usb-db/pci-db $INSTALL/lib/udev + cp $PKG_BUILD/extras/usb-db/pci-db $INSTALL/usr/lib/udev -mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/extras/accelerometer/61-accelerometer.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/extras/firmware/50-firmware.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/rules/rules.d/50-udev-default.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/extras/cdrom_id/60-cdrom_id.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/rules/rules.d/60-persistent-alsa.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/rules/rules.d/60-persistent-input.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/rules/rules.d/60-persistent-serial.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/rules/rules.d/60-persistent-storage-tape.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/rules/rules.d/60-persistent-storage.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/extras/v4l_id/60-persistent-v4l.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/extras/mtd_probe/75-probe_mtd.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/rules/rules.d/78-sound-card.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/rules/rules.d/80-drivers.rules $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/rules/rules.d/95-udev-late.rules $INSTALL/lib/udev/rules.d +mkdir -p $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/accelerometer/61-accelerometer.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/firmware/50-firmware.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/50-udev-default.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/cdrom_id/60-cdrom_id.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/60-persistent-alsa.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/60-persistent-input.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/60-persistent-serial.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/60-persistent-storage-tape.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/60-persistent-storage.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/v4l_id/60-persistent-v4l.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/mtd_probe/75-probe_mtd.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/78-sound-card.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/80-drivers.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/rules/rules.d/95-udev-late.rules $INSTALL/usr/lib/udev/rules.d -mkdir -p $INSTALL/lib/udev/devices +mkdir -p $INSTALL/usr/lib/udev/devices mkdir -p $INSTALL/etc/udev cp $PKG_BUILD/udev.conf $INSTALL/etc/udev diff --git a/packages/sysutils/udisks/init.d/15_automount b/packages/sysutils/udisks/init.d/15_automount index bdaec73e5e..66d4d68a7e 100644 --- a/packages/sysutils/udisks/init.d/15_automount +++ b/packages/sysutils/udisks/init.d/15_automount @@ -24,4 +24,4 @@ # runlevels: openelec, installer, textmode progress "request events from the kernel (subsystem: block)" - /sbin/udevadm trigger --subsystem-match=block --action=add & + udevadm trigger --subsystem-match=block --action=add & diff --git a/packages/sysutils/udisks/install b/packages/sysutils/udisks/install index db9474e26d..f3ba306b35 100755 --- a/packages/sysutils/udisks/install +++ b/packages/sysutils/udisks/install @@ -25,14 +25,14 @@ mkdir -p $INSTALL/etc/dbus-1/system.d cp $PKG_BUILD/data/org.freedesktop.UDisks.conf $INSTALL/etc/dbus-1/system.d -mkdir -p $INSTALL/lib/udev - cp -P $PKG_BUILD/src/probers/udisks-dm-export $INSTALL/lib/udev - cp -P $PKG_BUILD/src/probers/udisks-part-id $INSTALL/lib/udev - cp -P $PKG_BUILD/src/probers/udisks-probe-ata-smart $INSTALL/lib/udev - cp -P $PKG_BUILD/src/probers/udisks-probe-sas-expander $INSTALL/lib/udev +mkdir -p $INSTALL/usr/lib/udev + cp -P $PKG_BUILD/src/probers/udisks-dm-export $INSTALL/usr/lib/udev + cp -P $PKG_BUILD/src/probers/udisks-part-id $INSTALL/usr/lib/udev + cp -P $PKG_BUILD/src/probers/udisks-probe-ata-smart $INSTALL/usr/lib/udev + cp -P $PKG_BUILD/src/probers/udisks-probe-sas-expander $INSTALL/usr/lib/udev -mkdir -p $INSTALL/lib/udev/rules.d -# cp $PKG_BUILD/data/80-udisks.rules $INSTALL/lib/udev/rules.d +mkdir -p $INSTALL/usr/lib/udev/rules.d +# cp $PKG_BUILD/data/80-udisks.rules $INSTALL/usr/lib/udev/rules.d mkdir -p $INSTALL/sbin cp -P $PKG_BUILD/tools/umount.udisks $INSTALL/sbin diff --git a/packages/sysutils/v4l-utils/install b/packages/sysutils/v4l-utils/install index 035878ddeb..d5935ab8b0 100755 --- a/packages/sysutils/v4l-utils/install +++ b/packages/sysutils/v4l-utils/install @@ -25,8 +25,8 @@ mkdir -p $INSTALL/usr/bin cp $PKG_BUILD/utils/keytable/ir-keytable $INSTALL/usr/bin -mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_BUILD/utils/keytable/*.rules $INSTALL/lib/udev/rules.d +mkdir -p $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/utils/keytable/*.rules $INSTALL/usr/lib/udev/rules.d mkdir -p $INSTALL/etc cp $PKG_BUILD/utils/keytable/rc_maps.cfg $INSTALL/etc diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install index 2998966072..ac7a347123 100755 --- a/packages/x11/xserver/xorg-server/install +++ b/packages/x11/xserver/xorg-server/install @@ -30,8 +30,8 @@ XORG_DST="$INSTALL/$XORG_PATH_MODULES" mkdir -p $INSTALL/usr/bin cp $XORG_SRC/Xorg $INSTALL/usr/bin -mkdir -p $INSTALL/lib/udev - cp $PKG_DIR/scripts/xorg_start $INSTALL/lib/udev +mkdir -p $INSTALL/usr/lib/udev + cp $PKG_DIR/scripts/xorg_start $INSTALL/usr/lib/udev mkdir -p $XORG_DST cp -P $XORG_SRC/exa/.libs/libexa.so $XORG_DST diff --git a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules index ebc76a2736..31b10b620a 100644 --- a/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules +++ b/packages/x11/xserver/xorg-server/udev.d/97-xorg.rules @@ -42,6 +42,6 @@ GOTO="end_video" # start Xorg LABEL="start_xorg" -ENV{xorg_driver}=="?*", RUN+="/lib/udev/xorg_start" +ENV{xorg_driver}=="?*", RUN+="xorg_start" LABEL="end_video" diff --git a/scripts/install b/scripts/install index cfc0abb316..a4a81a8e35 100755 --- a/scripts/install +++ b/scripts/install @@ -54,8 +54,8 @@ if [ -d $PKG_DIR/profile.d ]; then fi if [ -d $PKG_DIR/udev.d ]; then - mkdir -p $INSTALL/lib/udev/rules.d - cp $PKG_DIR/udev.d/*.rules $INSTALL/lib/udev/rules.d + mkdir -p $INSTALL/usr/lib/udev/rules.d + cp $PKG_DIR/udev.d/*.rules $INSTALL/usr/lib/udev/rules.d fi if [ -d $PKG_DIR/init.network ]; then