diff --git a/packages/sysutils/udev/build b/packages/sysutils/udev/build index 229a8f710f..c57b16fda1 100755 --- a/packages/sysutils/udev/build +++ b/packages/sysutils/udev/build @@ -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/udev \ + --libexecdir=/usr/lib \ --localstatedir=/var \ --disable-silent-rules \ --disable-static \ @@ -60,7 +60,7 @@ LDFLAGS="$LDFLAGS -I$SYSROOT_PREFIX/usr/include/glib-2.0" \ make -$STRIP udev/udevd -$STRIP udev/udevadm +$STRIP src/udevd +$STRIP src/udevadm $MAKEINSTALL diff --git a/packages/sysutils/udev/init.d/11_udevd b/packages/sysutils/udev/init.d/11_udevd index 7ec43042e6..2ee85dd317 100644 --- a/packages/sysutils/udev/init.d/11_udevd +++ b/packages/sysutils/udev/init.d/11_udevd @@ -26,4 +26,4 @@ progress "starting udev daemon" echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug mkdir -p /dev/rules.d - udevd --daemon + /usr/lib/udev/udevd --daemon diff --git a/packages/sysutils/udev/install b/packages/sysutils/udev/install index 8fe7921a0b..f384b9dd0c 100755 --- a/packages/sysutils/udev/install +++ b/packages/sysutils/udev/install @@ -33,42 +33,41 @@ add_group tty 5 add_group video 39 mkdir -p $INSTALL/usr/bin - cp $PKG_BUILD/$1/udevadm $INSTALL/usr/bin - cp $PKG_BUILD/$1/udevd $INSTALL/usr/bin + cp $PKG_BUILD/src/udevadm $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 + cp -PR $PKG_BUILD/src/.libs/libudev.so* $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 - 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 + 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 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 + 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 mkdir -p $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/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/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/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/extras/mtd_probe/75-probe_mtd.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 @@ -76,5 +75,5 @@ mkdir -p $INSTALL/usr/lib/udev/rules.d mkdir -p $INSTALL/usr/lib/udev/devices mkdir -p $INSTALL/etc/udev - cp $PKG_BUILD/udev.conf $INSTALL/etc/udev + cp $PKG_BUILD/src/udev.conf $INSTALL/etc/udev ln -sf /dev/rules.d $INSTALL/etc/udev/rules.d diff --git a/packages/sysutils/udev/meta b/packages/sysutils/udev/meta index 538006f46c..1de0f0a955 100644 --- a/packages/sysutils/udev/meta +++ b/packages/sysutils/udev/meta @@ -19,16 +19,14 @@ ################################################################################ PKG_NAME="udev" -PKG_VERSION="175" +PKG_VERSION="177" PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://ftp.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" -#PKG_URL="http://www.eu.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2" -#PKG_URL="ftp://ftp.pgpi.com/linux/kernel/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_URL="http://people.freedesktop.org/~kay/udev/$PKG_NAME-$PKG_VERSION.tar.bz2" -PKG_DEPENDS="glib pciutils usbutils libusb-compat" -PKG_BUILD_DEPENDS="toolchain glib pciutils usbutils libusb-compat" +PKG_URL="http://www.kernel.org/pub/linux/utils/kernel/hotplug/$PKG_NAME-$PKG_VERSION.tar.xz" +PKG_DEPENDS="glib pciutils usbutils libusb-compat util-linux kmod" +PKG_BUILD_DEPENDS="toolchain glib pciutils usbutils libusb-compat util-linux kmod" PKG_PRIORITY="optional" PKG_SECTION="system" PKG_SHORTDESC="udev: A Userspace Implementation for dynamic /dev nodes" 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 deleted file mode 100644 index 427b87f1bf..0000000000 --- a/packages/sysutils/udev/patches/udev-175-002-rules_generator_path.patch +++ /dev/null @@ -1,46 +0,0 @@ -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)" diff --git a/packages/sysutils/udev/patches/udev-175-003-blkid_path-0.1.patch b/packages/sysutils/udev/patches/udev-175-003-blkid_path-0.1.patch deleted file mode 100644 index 98372ad256..0000000000 --- a/packages/sysutils/udev/patches/udev-175-003-blkid_path-0.1.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -Naur udev-173/rules/rules.d/60-persistent-storage.rules udev-173.patch/rules/rules.d/60-persistent-storage.rules ---- udev-173/rules/rules.d/60-persistent-storage.rules 2011-07-18 20:00:25.000000000 +0200 -+++ udev-173.patch/rules/rules.d/60-persistent-storage.rules 2011-11-04 20:42:24.734426182 +0100 -@@ -66,12 +66,12 @@ - ENV{DEVTYPE}=="disk", KERNEL!="sd*|sr*", ATTR{removable}=="1", GOTO="persistent_storage_end" - - # probe filesystem metadata of optical drives which have a media inserted --KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="/sbin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode" -+KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="?*", IMPORT{program}="/usr/bin/blkid -o udev -p -u noraid -O $env{ID_CDROM_MEDIA_SESSION_LAST_OFFSET} $tempnode" - # single-session CDs do not have ID_CDROM_MEDIA_SESSION_LAST_OFFSET --KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="/sbin/blkid -o udev -p -u noraid $tempnode" -+KERNEL=="sr*", ENV{DISK_EJECT_REQUEST}!="?*", ENV{ID_CDROM_MEDIA_TRACK_COUNT_DATA}=="?*", ENV{ID_CDROM_MEDIA_SESSION_LAST_OFFSET}=="", IMPORT{program}="/usr/bin/blkid -o udev -p -u noraid $tempnode" - - # probe filesystem metadata of disks --KERNEL!="sr*", IMPORT{program}="/sbin/blkid -o udev -p $tempnode" -+KERNEL!="sr*", IMPORT{program}="/usr/bin/blkid -o udev -p $tempnode" - - # watch metadata changes by tools closing the device after writing - KERNEL!="sr*", OPTIONS+="watch" diff --git a/packages/sysutils/udev/patches/udev-177-002-rules_generator_path.patch b/packages/sysutils/udev/patches/udev-177-002-rules_generator_path.patch new file mode 100644 index 0000000000..9d955cc7ba --- /dev/null +++ b/packages/sysutils/udev/patches/udev-177-002-rules_generator_path.patch @@ -0,0 +1,30 @@ +diff -Naur udev-175/extras/rule_generator/write_cd_rules udev-175.patch/extras/rule_generator/write_cd_rules +--- udev-175/src/extras/rule_generator/write_cd_rules 2010-06-25 11:37:36.000000000 +0200 ++++ udev-175.patch/src/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/src/extras/rule_generator/write_net_rules 2010-08-11 10:30:57.000000000 +0200 ++++ udev-175.patch/src/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)"