From 455f0b4b341f83ad31b0f607c8886c6f41fe02e2 Mon Sep 17 00:00:00 2001 From: Victor Martinez Date: Fri, 19 Oct 2012 13:53:46 +0000 Subject: [PATCH] udev: updated to 182 and aligned with upstream --- udev/.footprint | 35 ++++++++++++++----------------- udev/.md5sum | 7 +++---- udev/Pkgfile | 38 +++++++++++++++------------------- udev/start_udev | 15 +++++--------- udev/udev-disable_extras.patch | 32 ---------------------------- 5 files changed, 40 insertions(+), 87 deletions(-) delete mode 100644 udev/udev-disable_extras.patch diff --git a/udev/.footprint b/udev/.footprint index 402d325..19c1cac 100644 --- a/udev/.footprint +++ b/udev/.footprint @@ -4,60 +4,55 @@ drwxr-xr-x root/root etc/udev/rules.d/ -rw-r--r-- root/root etc/udev/udev.conf drwxr-xr-x root/root lib/ drwxr-xr-x root/root lib/firmware/ -lrwxrwxrwx root/root lib/libudev.so.0 -> libudev.so.0.11.1 --rwxr-xr-x root/root lib/libudev.so.0.11.1 +lrwxrwxrwx root/root lib/libudev.so.0 -> libudev.so.0.13.1 +-rwxr-xr-x root/root lib/libudev.so.0.13.1 drwxr-xr-x root/root lib/udev/ +-rwxr-xr-x root/root lib/udev/accelerometer -rwxr-xr-x root/root lib/udev/ata_id -rwxr-xr-x root/root lib/udev/cdrom_id -rwxr-xr-x root/root lib/udev/collect --rwxr-xr-x root/root lib/udev/create_floppy_devices drwxr-xr-x root/root lib/udev/devices/ -crw------- root/root lib/udev/devices/console (5, 1) -crw------- root/root lib/udev/devices/kmsg (1, 11) -crw-rw-rw- root/root lib/udev/devices/null (1, 3) drwxr-xr-x root/root lib/udev/devices/pts/ drwxr-xr-x root/root lib/udev/devices/shm/ -crw-rw-rw- root/root lib/udev/devices/zero (1, 5) --rwxr-xr-x root/root lib/udev/edd_id --rwxr-xr-x root/root lib/udev/firmware --rwxr-xr-x root/root lib/udev/input_id --rwxr-xr-x root/root lib/udev/path_id +-rwxr-xr-x root/root lib/udev/mtd_probe -rw-r--r-- root/root lib/udev/rule_generator.functions drwxr-xr-x root/root lib/udev/rules.d/ --rw-r--r-- root/root lib/udev/rules.d/42-qemu-usb.rules --rw-r--r-- root/root lib/udev/rules.d/50-firmware.rules +-rw-r--r-- root/root lib/udev/rules.d/42-usb-hid-pm.rules -rw-r--r-- root/root lib/udev/rules.d/50-udev-default.rules -rw-r--r-- root/root lib/udev/rules.d/60-cdrom_id.rules --rw-r--r-- root/root lib/udev/rules.d/60-floppy.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-alsa.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-input.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-serial.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-storage-tape.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-storage.rules -rw-r--r-- root/root lib/udev/rules.d/60-persistent-v4l.rules --rw-r--r-- root/root lib/udev/rules.d/61-persistent-storage-edd.rules +-rw-r--r-- root/root lib/udev/rules.d/61-accelerometer.rules -rw-r--r-- root/root lib/udev/rules.d/75-cd-aliases-generator.rules +-rw-r--r-- root/root lib/udev/rules.d/75-net-description.rules -rw-r--r-- root/root lib/udev/rules.d/75-persistent-net-generator.rules +-rw-r--r-- root/root lib/udev/rules.d/75-probe_mtd.rules +-rw-r--r-- root/root lib/udev/rules.d/75-tty-description.rules +-rw-r--r-- root/root lib/udev/rules.d/78-sound-card.rules -rw-r--r-- root/root lib/udev/rules.d/80-drivers.rules +-rw-r--r-- root/root lib/udev/rules.d/81-crux.rules -rw-r--r-- root/root lib/udev/rules.d/95-udev-late.rules -rwxr-xr-x root/root lib/udev/scsi_id --rwxr-xr-x root/root lib/udev/usb_id +-rwxr-xr-x root/root lib/udev/udevd -rwxr-xr-x root/root lib/udev/v4l_id -rwxr-xr-x root/root lib/udev/write_cd_rules -rwxr-xr-x root/root lib/udev/write_net_rules +drwxr-xr-x root/root run/ drwxr-xr-x root/root sbin/ -rwxr-xr-x root/root sbin/start_udev -rwxr-xr-x root/root sbin/udevadm --rwxr-xr-x root/root sbin/udevd +lrwxrwxrwx root/root sbin/udevd -> ../lib/udev/udevd drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/bin/ -lrwxrwxrwx root/root usr/bin/udevinfo -> /sbin/udevadm drwxr-xr-x root/root usr/include/ -rw-r--r-- root/root usr/include/libudev.h drwxr-xr-x root/root usr/lib/ -rw-r--r-- root/root usr/lib/libudev.a -rwxr-xr-x root/root usr/lib/libudev.la -lrwxrwxrwx root/root usr/lib/libudev.so -> ../../lib/libudev.so.0.11.1 +lrwxrwxrwx root/root usr/lib/libudev.so -> ../../lib/libudev.so.0.13.1 drwxr-xr-x root/root usr/lib/pkgconfig/ -rw-r--r-- root/root usr/lib/pkgconfig/libudev.pc drwxr-xr-x root/root usr/man/ diff --git a/udev/.md5sum b/udev/.md5sum index e8e6290..23c8b58 100644 --- a/udev/.md5sum +++ b/udev/.md5sum @@ -1,4 +1,3 @@ -167288ed62db73b0b93b20506a08d064 start_udev -6f57b8245d0b01fe1b1eca035f555a67 udev-167-glibc216.patch -4b37e1222f06c14c24147de346aa0bad udev-167.tar.bz2 -53554c9688df0f5e87e38a86e4314c61 udev-disable_extras.patch +ee21e150df6c804eef03a6cb2fc1cceb 81-crux.rules +585b2d60139c1a3a03fea06c5c16f2a8 start_udev +023877e6cc0d907994b8c648beab542b udev-182.tar.xz diff --git a/udev/Pkgfile b/udev/Pkgfile index 458bf8d..3e8d0d4 100644 --- a/udev/Pkgfile +++ b/udev/Pkgfile @@ -4,48 +4,44 @@ # Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu name=udev -version=167 +version=182 release=1 -source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.bz2 \ - $name-disable_extras.patch start_udev udev-167-glibc216.patch) +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$name-$version.tar.xz \ + 81-crux.rules start_udev) build() { cd udev-$version - patch -p1 -i $SRC/$name-disable_extras.patch - patch -p1 -i $SRC/$name-$version-glibc216.patch - autoreconf ./configure --build=$CHOST \ --host=$CTARGET \ --prefix=/usr \ - --sbindir=/sbin \ + --sbindir=/sbin --bindir=/sbin \ --sysconfdir=/etc \ --with-rootlibdir=/lib \ - --libexecdir=/lib/udev \ + --with-rootprefix= \ + --libexecdir=/lib \ --mandir=/usr/man \ - --disable-extras \ --disable-introspection \ - --enable-static + --disable-gudev \ + --disable-udev_acl \ + --disable-keymap \ + --enable-static \ + --enable-rule_generator \ + --with-pci-ids-path=$CLFS/usr/share make make install DESTDIR=$PKG mkdir -p $PKG/lib/{firmware,udev/devices/{pts,shm}} - mkdir -p $PKG/lib + mkdir -p $PKG/{lib,sbin,run} - # Populate nodes - mknod -m 600 $PKG/lib/udev/devices/console c 5 1 - mknod -m 600 $PKG/lib/udev/devices/kmsg c 1 11 - mknod -m 666 $PKG/lib/udev/devices/null c 1 3 - mknod -m 666 $PKG/lib/udev/devices/zero c 1 5 + # Symlink to udevd + ln -s ../lib/udev/udevd $PKG/sbin/udevd # Add CRUX items install -m 0755 $SRC/start_udev $PKG/sbin - - # Keep udevinfo for legacy support - mkdir -p $PKG/usr/bin - ln -s /sbin/udevadm $PKG/usr/bin/udevinfo + install -m 0644 $SRC/81-crux.rules $PKG/lib/udev/rules.d # Remove junk - rm -rf $PKG/usr/share/{gtk-,}doc + rm -r $PKG/usr/share/{gtk-,}doc } diff --git a/udev/start_udev b/udev/start_udev index 3319a4d..d8f4b26 100644 --- a/udev/start_udev +++ b/udev/start_udev @@ -1,6 +1,6 @@ #!/bin/sh -# - if /dev is not mounted - mount as a devtmpfs (CONFIG_DEVTMPFS=y) or tmpfs +# - if /dev is not mounted - mount as a devtmpfs (CONFIG_DEVTMPFS=y) # - if /dev is mounted (e.g. due to handover from initramfs or # CONFIG_DEVTMPFS_MOUNT=y), remount with specific options # - some video drivers require exec access in /dev, thus it's set here @@ -10,14 +10,12 @@ UDEVOPTS="exec,nosuid,noatime,mode=0755,nr_blocks=2048,nr_inodes=16384" if /bin/mountpoint -q /dev ; then /bin/mount -n -o remount,${UDEVOPTS} dev /dev else - if /bin/sed -n '/devtmpfs/q1' /proc/filesystems ; then - UDEVFS=tmpfs - else - UDEVFS=devtmpfs - fi - /bin/mount -n -t $UDEVFS -o ${UDEVOPTS} dev /dev + /bin/mount -n -t devtmpfs -o ${UDEVOPTS} dev /dev fi +# mount /run directory +/bin/mount -n -t tmpfs -o mode=0755,nosuid,nodev,exec tmpfs /run + # make sure hotplugger is not set echo > /proc/sys/kernel/hotplug @@ -32,6 +30,3 @@ test -z "$(/bin/pidof -s udevd)" && /sbin/udevd --daemon /sbin/udevadm trigger --type=devices --action=add /sbin/udevadm settle -# retry any failures -/sbin/udevadm trigger --type=failed --action=add -/sbin/udevadm settle diff --git a/udev/udev-disable_extras.patch b/udev/udev-disable_extras.patch deleted file mode 100644 index dff195a..0000000 --- a/udev/udev-disable_extras.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 9bb54267a1483e8f3b2de352c7be433f625e5606 -Author: Martin Pitt -Date: Thu Mar 31 19:23:19 2011 +0200 - - Revert "Do not build extras with --disable-extras" - - This reverts commit 905818f5961446ac32d1b2d165185fffddc4915a. - - We do want to build some extras, just not the ones with extra dependencies. - Thanks to Juergen Daubert for pointing this out. - -diff --git a/Makefile.am b/Makefile.am -index df70bf7..2c20f46 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -225,7 +225,6 @@ dist_udevrules_DATA += \ - extras/rule_generator/75-cd-aliases-generator.rules \ - extras/rule_generator/75-persistent-net-generator.rules - --if ENABLE_EXTRAS - # ------------------------------------------------------------------------------ - # firmware - firmware loading - # ------------------------------------------------------------------------------ -@@ -314,8 +313,6 @@ extras_v4l_id_v4l_id_LDADD = libudev/libudev-private.la - libexec_PROGRAMS += extras/v4l_id/v4l_id - dist_udevrules_DATA += extras/v4l_id/60-persistent-v4l.rules - --endif # ENABLE_EXTRAS -- - # ------------------------------------------------------------------------------ - # qemu -- qemu/kvm guest tweaks - # ------------------------------------------------------------------------------ -- 2.26.2