udev: change firmware dir back to /lib/firmware, change udev dir back to /lib/udev, disable rule-generator

Signed-off-by: Stephan Raue <stephan@openelec.tv>
This commit is contained in:
Stephan Raue 2012-01-25 23:40:33 +01:00
parent f3202e5ffe
commit 7fc021498f
4 changed files with 37 additions and 37 deletions

View File

@ -33,7 +33,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
--sysconfdir=/etc \
--bindir=/usr/bin \
--sbindir=/usr/bin \
--libexecdir=/usr/lib \
--libexecdir=/lib \
--localstatedir=/var \
--disable-silent-rules \
--disable-static \
@ -43,7 +43,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
--disable-gtk-doc-pdf \
--disable-debug \
--disable-logging \
--enable-rule_generator \
--disable-rule_generator \
--enable-hwdb \
--disable-udev_acl \
--enable-gudev \
@ -53,7 +53,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \
--enable-edd \
--without-selinux \
--without-systemdsystemunitdir \
--with-firmware-path="/storage/.config/firmware:/usr/lib/firmware" \
--with-firmware-path="/storage/.config/firmware:/lib/firmware" \
--with-pci-ids-path=/usr/share/pci.ids \
--with-usb-ids-path=/usr/share/usb.ids \
--with-gnu-ld \

View File

@ -26,4 +26,4 @@
progress "starting udev daemon"
echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
mkdir -p /dev/rules.d
/usr/lib/udev/udevd --daemon
/lib/udev/udevd --daemon

View File

@ -40,39 +40,39 @@ mkdir -p $INSTALL/usr/lib
cp -PR $PKG_BUILD/src/extras/gudev/.libs/libgudev*.so* $INSTALL/usr/lib
rm -rf $INSTALL/usr/lib/libgudev*.*T
mkdir -p $INSTALL/usr/lib/udev
mkdir -p $INSTALL/lib/udev
for i in accelerometer ata_id cdrom_id collect mtd_probe scsi_id v4l_id; do
cp $PKG_BUILD/src/extras/$i/$i $INSTALL/usr/lib/udev
cp $PKG_BUILD/src/extras/$i/$i $INSTALL/lib/udev
done
cp $PKG_BUILD/src/udevd $INSTALL/usr/lib/udev
cp $PKG_BUILD/src/edd_id $INSTALL/usr/lib/udev
cp $PKG_BUILD/src/extras/rule_generator/rule_generator.functions $INSTALL/usr/lib/udev
cp $PKG_BUILD/src/extras/rule_generator/write_cd_rules $INSTALL/usr/lib/udev
cp $PKG_BUILD/src/extras/rule_generator/write_net_rules $INSTALL/usr/lib/udev
chmod +x $INSTALL/usr/lib/udev/write_cd_rules
chmod +x $INSTALL/usr/lib/udev/write_net_rules
cp $PKG_BUILD/src/udevd $INSTALL/lib/udev
cp $PKG_BUILD/src/edd_id $INSTALL/lib/udev
# cp $PKG_BUILD/src/extras/rule_generator/rule_generator.functions $INSTALL/lib/udev
# cp $PKG_BUILD/src/extras/rule_generator/write_cd_rules $INSTALL/lib/udev
# cp $PKG_BUILD/src/extras/rule_generator/write_net_rules $INSTALL/lib/udev
# chmod +x $INSTALL/lib/udev/write_cd_rules
# chmod +x $INSTALL/lib/udev/write_net_rules
mkdir -p $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/src/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/src/extras/v4l_id/60-persistent-v4l.rules $INSTALL/usr/lib/udev/rules.d
cp $PKG_BUILD/src/extras/accelerometer/61-accelerometer.rules $INSTALL/usr/lib/udev/rules.d
cp $PKG_BUILD/src/extras/edd_id/61-persistent-storage-edd.rules $INSTALL/usr/lib/udev/rules.d
cp $PKG_BUILD/src/extras/rule_generator/75-cd-aliases-generator.rules $INSTALL/usr/lib/udev/rules.d
cp $PKG_BUILD/src/extras/rule_generator/75-persistent-net-generator.rules $INSTALL/usr/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/75-net-description.rules $INSTALL/usr/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/75-tty-description.rules $INSTALL/usr/lib/udev/rules.d
cp $PKG_BUILD/src/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/rules.d
cp $PKG_BUILD/rules/rules.d/50-udev-default.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/src/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/src/extras/v4l_id/60-persistent-v4l.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/src/extras/accelerometer/61-accelerometer.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/src/extras/edd_id/61-persistent-storage-edd.rules $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/src/extras/rule_generator/75-cd-aliases-generator.rules $INSTALL/lib/udev/rules.d
# cp $PKG_BUILD/src/extras/rule_generator/75-persistent-net-generator.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/75-net-description.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/rules/rules.d/75-tty-description.rules $INSTALL/lib/udev/rules.d
cp $PKG_BUILD/src/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/devices
mkdir -p $INSTALL/lib/udev/devices
mkdir -p $INSTALL/etc/udev
cp $PKG_BUILD/src/udev.conf $INSTALL/etc/udev

View File

@ -6,10 +6,10 @@ diff -Naur udev-175/extras/rule_generator/write_cd_rules udev-175.patch/extras/r
fi
-RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules"
+RULES_FILE="/run/udev/rules.d/70-persistent-cd.rules"
+RULES_FILE="/run/udev/70-persistent-cd.rules"
-. /lib/udev/rule_generator.functions
+. /usr/lib/udev/rule_generator.functions
+. /lib/udev/rule_generator.functions
find_next_available() {
raw_find_next_available "$(find_all_rules 'SYMLINK\+=' "$1")"
@ -21,10 +21,10 @@ diff -Naur udev-175/extras/rule_generator/write_net_rules udev-175.patch/extras/
fi
-RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules'
+RULES_FILE='/run/udev/rules.d/70-persistent-net.rules'
+RULES_FILE='/run/udev/70-persistent-net.rules'
-. /lib/udev/rule_generator.functions
+. /usr/lib/udev/rule_generator.functions
+. /lib/udev/rule_generator.functions
interface_name_taken() {
local value="$(find_all_rules 'NAME=' $INTERFACE)"