From a46b85ba2fb0eca7ffb532433a0d9af4b41f488b Mon Sep 17 00:00:00 2001 From: Jose V Beneyto Date: Tue, 5 Jun 2012 19:24:25 +0200 Subject: [PATCH] Revert "udev: removed not needed overlay" This reverts commit 2880346b015cefc0bfc1bf02d3367714c4ade89b. --- udev/.footprint | 72 ++++++++++++++++++++++++++++++++++ udev/.md5sum | 3 ++ udev/Pkgfile | 49 +++++++++++++++++++++++ udev/README | 10 +++++ udev/start_udev | 37 +++++++++++++++++ udev/udev-disable_extras.patch | 32 +++++++++++++++ 6 files changed, 203 insertions(+) create mode 100644 udev/.footprint create mode 100644 udev/.md5sum create mode 100644 udev/Pkgfile create mode 100644 udev/README create mode 100644 udev/start_udev create mode 100644 udev/udev-disable_extras.patch diff --git a/udev/.footprint b/udev/.footprint new file mode 100644 index 0000000..402d325 --- /dev/null +++ b/udev/.footprint @@ -0,0 +1,72 @@ +drwxr-xr-x root/root etc/ +drwxr-xr-x root/root etc/udev/ +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 +drwxr-xr-x root/root lib/udev/ +-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 +-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/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/75-cd-aliases-generator.rules +-rw-r--r-- root/root lib/udev/rules.d/75-persistent-net-generator.rules +-rw-r--r-- root/root lib/udev/rules.d/80-drivers.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/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 sbin/ +-rwxr-xr-x root/root sbin/start_udev +-rwxr-xr-x root/root sbin/udevadm +-rwxr-xr-x root/root sbin/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 +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/ +drwxr-xr-x root/root usr/man/man7/ +-rw-r--r-- root/root usr/man/man7/udev.7.gz +drwxr-xr-x root/root usr/man/man8/ +-rw-r--r-- root/root usr/man/man8/scsi_id.8.gz +-rw-r--r-- root/root usr/man/man8/udevadm.8.gz +-rw-r--r-- root/root usr/man/man8/udevd.8.gz +drwxr-xr-x root/root usr/share/ +drwxr-xr-x root/root usr/share/pkgconfig/ +-rw-r--r-- root/root usr/share/pkgconfig/udev.pc diff --git a/udev/.md5sum b/udev/.md5sum new file mode 100644 index 0000000..f698572 --- /dev/null +++ b/udev/.md5sum @@ -0,0 +1,3 @@ +167288ed62db73b0b93b20506a08d064 start_udev +4b37e1222f06c14c24147de346aa0bad udev-167.tar.bz2 +53554c9688df0f5e87e38a86e4314c61 udev-disable_extras.patch diff --git a/udev/Pkgfile b/udev/Pkgfile new file mode 100644 index 0000000..280c2d6 --- /dev/null +++ b/udev/Pkgfile @@ -0,0 +1,49 @@ +# Description: Userspace device management daemon +# URL: http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html +# Maintainer: CRUX System Team, core-ports at crux dot nu +# Arch Maintainer: CRUX-ARM System Team, devel at crux-arm dot nu + +name=udev +version=167 +release=1 +source=(http://crux-arm.nu/files/distfiles/$name-$version.tar.bz2 \ + $name-disable_extras.patch start_udev) + +build() { + + cd udev-$version + + patch -p1 -i $SRC/$name-disable_extras.patch + + ./configure --prefix=/usr \ + --sbindir=/sbin \ + --sysconfdir=/etc \ + --with-rootlibdir=/lib \ + --libexecdir=/lib/udev \ + --mandir=/usr/man \ + --disable-extras \ + --disable-introspection \ + --enable-static + + make + make install DESTDIR=$PKG + + mkdir -p $PKG/lib/{firmware,udev/devices/{pts,shm}} + mkdir -p $PKG/{lib,sbin} + + # 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 + + # 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 + + # Remove junk + rm -rf $PKG/usr/share/{gtk-,}doc +} diff --git a/udev/README b/udev/README new file mode 100644 index 0000000..422a574 --- /dev/null +++ b/udev/README @@ -0,0 +1,10 @@ + +README for udev + + + Udev requires certain versions of the linux kernel to work. + If you're in troubles with the current udev port in the core + collection, consideer the fact of downgrade it. + + Please read http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary + to get more information. diff --git a/udev/start_udev b/udev/start_udev new file mode 100644 index 0000000..3319a4d --- /dev/null +++ b/udev/start_udev @@ -0,0 +1,37 @@ +#!/bin/sh + +# - if /dev is not mounted - mount as a devtmpfs (CONFIG_DEVTMPFS=y) or tmpfs +# - 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 +# - for completness, we add few sanity limits (2k non-empty files, 16k inodes) + +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 +fi + +# make sure hotplugger is not set +echo > /proc/sys/kernel/hotplug + +# since v155, udevd automatically copies /lib/udev/devices +# and creates /proc/{kcore,self/fd/{0,1,2}} symlinks + +# launch udev daemon, make sure it's not running first +test -z "$(/bin/pidof -s udevd)" && /sbin/udevd --daemon + +# coldplug devices and wait for the queue to be processed +/sbin/udevadm trigger --type=subsystems --action=add +/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 new file mode 100644 index 0000000..dff195a --- /dev/null +++ b/udev/udev-disable_extras.patch @@ -0,0 +1,32 @@ +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