From 9ee7725a88225bdd17acf9667ed370b75d534353 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Sun, 4 Dec 2011 17:33:49 +0100 Subject: [PATCH] udev: add rules generator, add 'edd' support Signed-off-by: Stephan Raue --- packages/sysutils/udev/build | 4 +- packages/sysutils/udev/install | 11 ++++- .../udev-175-002-rules_generator_path.patch | 46 +++++++++++++++++++ 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 packages/sysutils/udev/patches/udev-175-002-rules_generator_path.patch diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build index 1c503aaee6..229a8f710f 100755 --- a/packages/sysutils/udev/build +++ b/packages/sysutils/udev/build @@ -43,14 +43,14 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \ --disable-gtk-doc-pdf \ --disable-debug \ --disable-logging \ - --disable-rule_generator \ + --enable-rule_generator \ --enable-hwdb \ --disable-udev_acl \ --enable-gudev \ --disable-introspection \ --disable-keymap \ --disable-floppy \ - --disable-edd \ + --enable-edd \ --without-selinux \ --without-systemdsystemunitdir \ --with-firmware-path="/storage/.config/firmware:/usr/lib/firmware" \ diff --git a/packages/sysutils/udev/install b/packages/sysutils/udev/install index 340da9e3dc..8fe7921a0b 100755 --- a/packages/sysutils/udev/install +++ b/packages/sysutils/udev/install @@ -42,10 +42,15 @@ mkdir -p $INSTALL/usr/lib rm -rf $INSTALL/usr/lib/libgudev*.*T mkdir -p $INSTALL/usr/lib/udev - for i in accelerometer ata_id cdrom_id collect firmware mtd_probe scsi_id usb-db v4l_id; do + for i in accelerometer ata_id cdrom_id collect edd_id firmware mtd_probe scsi_id usb-db v4l_id; do cp $PKG_BUILD/extras/$i/$i $INSTALL/usr/lib/udev done cp $PKG_BUILD/extras/usb-db/pci-db $INSTALL/usr/lib/udev + cp $PKG_BUILD/extras/rule_generator/rule_generator.functions $INSTALL/usr/lib/udev + cp $PKG_BUILD/extras/rule_generator/write_cd_rules $INSTALL/usr/lib/udev + cp $PKG_BUILD/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 mkdir -p $INSTALL/usr/lib/udev/rules.d cp $PKG_BUILD/extras/firmware/50-firmware.rules $INSTALL/usr/lib/udev/rules.d @@ -58,7 +63,11 @@ mkdir -p $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/accelerometer/61-accelerometer.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/edd_id/61-persistent-storage-edd.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/extras/rule_generator/75-cd-aliases-generator.rules $INSTALL/usr/lib/udev/rules.d + cp $PKG_BUILD/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/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 diff --git a/packages/sysutils/udev/patches/udev-175-002-rules_generator_path.patch b/packages/sysutils/udev/patches/udev-175-002-rules_generator_path.patch new file mode 100644 index 0000000000..427b87f1bf --- /dev/null +++ b/packages/sysutils/udev/patches/udev-175-002-rules_generator_path.patch @@ -0,0 +1,46 @@ +diff -Naur udev-175/extras/rule_generator/rule_generator.functions udev-175.patch/extras/rule_generator/rule_generator.functions +--- udev-175/extras/rule_generator/rule_generator.functions 2011-03-23 02:15:12.000000000 +0100 ++++ udev-175.patch/extras/rule_generator/rule_generator.functions 2011-12-04 17:11:56.380258048 +0100 +@@ -15,10 +15,10 @@ + # You should have received a copy of the GNU General Public License + # along with this program. If not, see . + +-PATH='/sbin:/bin' ++PATH='/usr/sbin:/usr/bin:/sbin:/bin' + # + +-PATH='/sbin:/bin' ++PATH='/usr/sbin:/usr/bin:/sbin:/bin' + + # Read a single line from file $1 in the $DEVPATH directory. + # The function must not return an error even if the file does not exist. +diff -Naur udev-175/extras/rule_generator/write_cd_rules udev-175.patch/extras/rule_generator/write_cd_rules +--- udev-175/extras/rule_generator/write_cd_rules 2010-06-25 11:37:36.000000000 +0200 ++++ udev-175.patch/extras/rule_generator/write_cd_rules 2011-12-04 17:11:04.704237462 +0100 +@@ -27,9 +27,9 @@ + fi + fi + +-RULES_FILE="/etc/udev/rules.d/70-persistent-cd.rules" ++RULES_FILE="/run/udev/rules.d/70-persistent-cd.rules" + +-. /lib/udev/rule_generator.functions ++. /usr/lib/udev/rule_generator.functions + + find_next_available() { + raw_find_next_available "$(find_all_rules 'SYMLINK\+=' "$1")" +diff -Naur udev-175/extras/rule_generator/write_net_rules udev-175.patch/extras/rule_generator/write_net_rules +--- udev-175/extras/rule_generator/write_net_rules 2010-08-11 10:30:57.000000000 +0200 ++++ udev-175.patch/extras/rule_generator/write_net_rules 2011-12-04 17:11:22.696592805 +0100 +@@ -38,9 +38,9 @@ + fi + fi + +-RULES_FILE='/etc/udev/rules.d/70-persistent-net.rules' ++RULES_FILE='/run/udev/rules.d/70-persistent-net.rules' + +-. /lib/udev/rule_generator.functions ++. /usr/lib/udev/rule_generator.functions + + interface_name_taken() { + local value="$(find_all_rules 'NAME=' $INTERFACE)"