From 588290beab48e3fb011e7184b75d15edde8c8f03 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 18 Sep 2005 11:48:28 +0000 Subject: udev: recipe and patches for udev-070 --- packages/udev/udev-070/.mtn2git_empty | 0 packages/udev/udev-070/fix-alignment.patch | 24 ++++ packages/udev/udev-070/flags.patch | 70 +++++++++++ packages/udev/udev-070/init | 196 +++++++++++++++++++++++++++++ packages/udev/udev-070/links.conf | 21 ++++ packages/udev/udev-070/noasmlinkage.patch | 38 ++++++ packages/udev/udev-070/tty-symlinks.patch | 13 ++ packages/udev/udev-070/udev.rules | 93 ++++++++++++++ packages/udev/udev_070.bb | 27 ++++ 9 files changed, 482 insertions(+) create mode 100644 packages/udev/udev-070/.mtn2git_empty create mode 100644 packages/udev/udev-070/fix-alignment.patch create mode 100644 packages/udev/udev-070/flags.patch create mode 100644 packages/udev/udev-070/init create mode 100644 packages/udev/udev-070/links.conf create mode 100644 packages/udev/udev-070/noasmlinkage.patch create mode 100644 packages/udev/udev-070/tty-symlinks.patch create mode 100644 packages/udev/udev-070/udev.rules create mode 100644 packages/udev/udev_070.bb diff --git a/packages/udev/udev-070/.mtn2git_empty b/packages/udev/udev-070/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/udev/udev-070/fix-alignment.patch b/packages/udev/udev-070/fix-alignment.patch new file mode 100644 index 0000000000..8c7b8b5ac5 --- /dev/null +++ b/packages/udev/udev-070/fix-alignment.patch @@ -0,0 +1,24 @@ +diff --git a/udev_rules_parse.c b/udev_rules_parse.c +--- a/udev_rules_parse.c ++++ b/udev_rules_parse.c +@@ -241,6 +241,7 @@ static int add_to_rules(struct udev_rule + int valid; + char *linepos; + char *attr; ++ size_t padding; + int retval; + + /* get all the keys */ +@@ -506,6 +507,11 @@ static int add_to_rules(struct udev_rule + + /* grow buffer and add rule */ + rule_size = sizeof(struct udev_rule) + rule->bufsize; ++ padding = (sizeof(size_t) - rule_size % sizeof(size_t)) % sizeof(size_t); ++ dbg("add %zi padding bytes", padding); ++ rule_size += padding; ++ rule->bufsize += padding; ++ + rules->buf = realloc(rules->buf, rules->bufsize + rule_size); + if (!rules->buf) { + err("realloc failed"); + diff --git a/packages/udev/udev-070/flags.patch b/packages/udev/udev-070/flags.patch new file mode 100644 index 0000000000..bd04041f78 --- /dev/null +++ b/packages/udev/udev-070/flags.patch @@ -0,0 +1,70 @@ +--- udev-070/Makefile~flags 2005-09-15 01:19:07 +0200 ++++ udev-070/Makefile 2005-09-16 11:44:37 +0200 +@@ -160,36 +160,36 @@ + # check if compiler option is supported + cc-supports = ${shell if $(CC) ${1} -S -o /dev/null -xc /dev/null > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi;} + +-CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ ++override CFLAGS += -Wall -fno-builtin -Wchar-subscripts -Wpointer-arith \ + -Wstrict-prototypes -Wsign-compare +-CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) +-CFLAGS += -pipe +-CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 ++override CFLAGS += $(call cc-supports, -Wdeclaration-after-statement, ) ++override CFLAGS += -pipe ++override CFLAGS += -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 + + # use '-Os' optimization if available, else use -O2 + OPTFLAGS := $(call cc-supports, -Os, -O2) + + # include our local copy of libsysfs +-CFLAGS += -I$(PWD)/libsysfs/sysfs \ ++override CFLAGS += -I$(PWD)/libsysfs/sysfs \ + -I$(PWD)/libsysfs + + ifeq ($(strip $(USE_LOG)),true) +- CFLAGS += -DUSE_LOG ++ override CFLAGS += -DUSE_LOG + endif + + # if DEBUG is enabled, then we do not strip or optimize + ifeq ($(strip $(DEBUG)),true) +- CFLAGS += -O1 -g -DDEBUG ++ override CFLAGS += -O1 -g -DDEBUG + LDFLAGS += -Wl + STRIPCMD = /bin/true -Since_we_are_debugging + else +- CFLAGS += $(OPTFLAGS) -fomit-frame-pointer ++ override CFLAGS += $(OPTFLAGS) -fomit-frame-pointer + LDFLAGS += -s -Wl + STRIPCMD = $(STRIP) -s --remove-section=.note --remove-section=.comment + endif + + ifeq ($(strip $(USE_GCOV)),true) +- CFLAGS += -fprofile-arcs -ftest-coverage ++ override CFLAGS += -fprofile-arcs -ftest-coverage + LDFLAGS = -fprofile-arcs + endif + +@@ -200,18 +200,18 @@ + CC = $(KLCC) + LD = $(KLCC) + else +- CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations ++ override CFLAGS += -Wshadow -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations + LDFLAGS += -Wl,-warn-common + endif + + ifeq ($(strip $(USE_SELINUX)),true) + UDEV_OBJS += udev_selinux.o + LIB_OBJS += -lselinux +- CFLAGS += -DUSE_SELINUX ++ override CFLAGS += -DUSE_SELINUX + endif + + ifeq ($(strip $(USE_STATIC)),true) +- CFLAGS += -DUSE_STATIC ++ override CFLAGS += -DUSE_STATIC + LDFLAGS += -static + endif + diff --git a/packages/udev/udev-070/init b/packages/udev/udev-070/init new file mode 100644 index 0000000000..d9fd45a600 --- /dev/null +++ b/packages/udev/udev-070/init @@ -0,0 +1,196 @@ +#!/bin/sh -e + +UDEVSTART=/sbin/udevstart + +# defaults +tmpfs_size="10M" +udev_root="/dev" + +[ -x $UDEVSTART ] || exit 0 + +. /etc/udev/udev.conf + +############################################################################## + +# we need to unmount /dev/pts/ and remount it later over the tmpfs +unmount_devpts() { + if mountpoint -q /dev/pts/; then + umount -l /dev/pts/ + fi + + if mountpoint -q /dev/shm/; then + umount -l /dev/shm/ + fi +} + +# mount a tmpfs over /dev, if somebody did not already do it +mount_tmpfs() { + if grep -E -q "^[^[:space:]]+ /dev tmpfs" /proc/mounts; then + return 0 + fi + + # /dev/.static/dev/ is used by MAKEDEV to access the real /dev/ directory. + # /etc/udev/ is recycled as a temporary mount point because it's the only + # directory which is guaranteed to be available. + mount -n -o bind /dev /etc/udev + + if ! mount -n -o size=$tmpfs_size,mode=0755 -t tmpfs tmpfs /dev; then + umount /etc/udev + echo "udev requires tmpfs support, not started." + exit 1 + fi + + # using ln to test if /dev works, because touch is in /usr/bin/ + if ln -s test /dev/test-file; then + rm /dev/test-file + else + echo "udev requires tmpfs support, not started." + umount /etc/udev + umount /dev + exit 1 + fi + + mkdir -p /dev/.static/dev + chmod 700 /dev/.static/ + mount -n -o move /etc/udev /dev/.static/dev +} + +# I hate this hack. -- Md +make_extra_nodes() { + [ -e /etc/udev/links.conf ] || return 0 + grep '^[^#]' /etc/udev/links.conf | \ + while read type name arg1; do + [ "$type" -a "$name" -a ! -e "/dev/$name" -a ! -L "/dev/$name" ] ||continue + case "$type" in + L) ln -s $arg1 /dev/$name ;; + D) mkdir -p /dev/$name ;; + M) mknod --mode=600 /dev/$name $arg1 ;; + *) echo "links.conf: unparseable line ($type $name $arg1)" ;; + esac + done +} + +# this function is duplicated in preinst, postinst and d-i +supported_kernel() { + case "$(uname -r)" in + 2.[012345].*|2.6.[0-9]|2.6.[0-9][!0-9]*) return 1 ;; + 2.6.1[01]|2.6.1[01][!0-9]*) return 1 ;; + esac + return 0 +} + +# shell version of /usr/bin/tty +my_tty() { + [ -x /bin/readlink ] || return 0 + [ -e /proc/self/fd/0 ] || return 0 + readlink --silent /proc/self/fd/0 || true +} + +warn_if_interactive() { + if [ "$RUNLEVEL" = "S" -a "$PREVLEVEL" = "N" ]; then + return 0 + fi + + TTY=$(my_tty) + if [ -z "$TTY" -o "$TTY" = "/dev/console" ]; then + return 0 + fi + + printf "\n\n\nIt has been detected that the command\n\n\t$0 $*\n\n" + printf "has been run from an interactive shell.\n" + printf "It will probably not do what you expect, so this script will wait\n" + printf "60 seconds before continuing. Press ^C to stop it.\n" + printf "RUNNING THIS COMMAND IS HIGHLY DISCOURAGED!\n\n\n\n" + sleep 60 +} + +############################################################################## + +if ! supported_kernel; then + echo "udev requires a kernel >= 2.6.12, not started." + exit 1 +fi + +if [ ! -e /proc/filesystems ]; then + echo "udev requires a mounted procfs, not started." + exit 1 +fi + +if ! grep -q '[[:space:]]tmpfs$' /proc/filesystems; then + echo "udev requires tmpfs support, not started." + exit 1 +fi + +if [ ! -d /sys/class/ ]; then + echo "udev requires a mounted sysfs, not started." + exit 1 +fi + +if [ ! -e /proc/sys/kernel/hotplug ]; then + echo "udev requires hotplug support, not started." + exit 1 +fi + +############################################################################## + +# When modifying this script, do not forget that between the time that +# the new /dev has been mounted and udevstart has been run there will be +# no /dev/null. This also means that you cannot use the "&" shell command. + +case "$1" in + start) + if [ -e "$udev_root/.udevdb" ]; then + if mountpoint -q /dev/; then + TMPFS_MOUNTED=1 + else + echo ".udevdb already exists on the old $udev_root!" + fi + fi + warn_if_interactive + + #echo /sbin/udevsend > /proc/sys/kernel/hotplug + echo "" > /proc/sys/kernel/hotplug + udevsend + if [ "$UDEV_DISABLED" = "yes" ]; then + echo "udev disabled on the kernel command line, not started." + exit 0 + fi + + if [ ! "$TMPFS_MOUNTED" ]; then + unmount_devpts + mount_tmpfs + [ -d /proc/1 ] || mount -n /proc + # if this directory is not present /dev will not be updated by udev + mkdir /dev/.udevdb/ + echo "Creating initial device nodes..." + udevstart + fi + make_extra_nodes + ;; + stop) + warn_if_interactive + start-stop-daemon --stop --exec /sbin/udevd --quiet + unmount_devpts + if [ -d /dev/.static/dev/ ]; then + umount -l /dev/.static/dev/ || true + fi + echo "Unmounting /dev..." + # unmounting with -l should never fail + if ! umount -l /dev; then + exit 1 + fi + ;; + restart|force-reload) + start-stop-daemon --stop --exec /sbin/udevd --quiet + log_begin_msg "Recreating device nodes..." + udevstart + make_extra_nodes + log_end_msg 0 + ;; + *) + echo "Usage: /etc/init.d/udev {start|stop|restart|force-reload}" + exit 1 + ;; +esac + +exit 0 diff --git a/packages/udev/udev-070/links.conf b/packages/udev/udev-070/links.conf new file mode 100644 index 0000000000..8fff922db6 --- /dev/null +++ b/packages/udev/udev-070/links.conf @@ -0,0 +1,21 @@ +# This file does not exist. Please do not ask the debian maintainer about it. +# You may use it to do strange and wonderful things, at your risk. + +L fd /proc/self/fd +L stdin /proc/self/fd/0 +L stdout /proc/self/fd/1 +L stderr /proc/self/fd/2 +L core /proc/kcore +L sndstat /proc/asound/oss/sndstat +L MAKEDEV /sbin/MAKEDEV + +D pts +D shm + +# Hic sunt leones. +M ppp c 108 0 +D loop +M loop/0 b 7 0 +D net +M net/tun c 10 200 + diff --git a/packages/udev/udev-070/noasmlinkage.patch b/packages/udev/udev-070/noasmlinkage.patch new file mode 100644 index 0000000000..0d8e854c0e --- /dev/null +++ b/packages/udev/udev-070/noasmlinkage.patch @@ -0,0 +1,38 @@ + +# +# Patch managed by http://www.holgerschurig.de/patcher.html +# + +--- udev-062/udev.c~noasmlinkage.patch ++++ udev-062/udev.c +@@ -54,7 +54,7 @@ + } + #endif + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: +--- udev-062/udevd.c~noasmlinkage.patch ++++ udev-062/udevd.c +@@ -639,7 +639,7 @@ + return msg; + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + int rc; + +--- udev-062/udevstart.c~noasmlinkage.patch ++++ udev-062/udevstart.c +@@ -323,7 +323,7 @@ + exec_list(&device_list); + } + +-static void asmlinkage sig_handler(int signum) ++static void sig_handler(int signum) + { + switch (signum) { + case SIGALRM: diff --git a/packages/udev/udev-070/tty-symlinks.patch b/packages/udev/udev-070/tty-symlinks.patch new file mode 100644 index 0000000000..28bdf92af8 --- /dev/null +++ b/packages/udev/udev-070/tty-symlinks.patch @@ -0,0 +1,13 @@ +--- udev-068/etc/udev/udev-devfs.rules.orig 2005-08-22 20:22:18.000000000 +0200 ++++ udev-068/etc/udev/udev-devfs.rules 2005-08-22 20:22:44.000000000 +0200 +@@ -14,8 +14,8 @@ + KERNEL="fd[0-9]*", NAME="floppy/%n" + + # tty devices +-KERNEL="tty[0-9]*", NAME="vc/%n" +-KERNEL="ttyS[0-9]*", NAME="tts/%n" ++KERNEL="tty[0-9]*", NAME="vc/%n", SYMLINK="%k" ++KERNEL="ttyS[0-9]*", NAME="tts/%n", SYMLINK="%k" + KERNEL="ttyUSB[0-9]*", NAME="tts/USB%n" + + # vc devices diff --git a/packages/udev/udev-070/udev.rules b/packages/udev/udev-070/udev.rules new file mode 100644 index 0000000000..f81e250966 --- /dev/null +++ b/packages/udev/udev-070/udev.rules @@ -0,0 +1,93 @@ +# There are a number of modifiers that are allowed to be used in some +# of the different fields. They provide the following subsitutions: +# +# %n the "kernel number" of the device. +# For example, 'sda3' has a "kernel number" of '3' +# %e the smallest number for that name which does not matches an existing node +# %k the kernel name for the device +# %M the kernel major number for the device +# %m the kernel minor number for the device +# %b the bus id for the device +# %c the string returned by the PROGRAM +# %s{filename} the content of a sysfs attribute +# %% the '%' char itself +# + +# SCSI devices +BUS=="scsi", KERNEL=="sr[0-9]*", NAME="scd%n", SYMLINK+="sr%n" + +# USB devices +BUS=="usb", KERNEL=="auer[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="cpad[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="dabusb*", NAME="usb/%k" +BUS=="usb", KERNEL=="hiddev*", NAME="usb/%k" +BUS=="usb", KERNEL=="legousbtower*", NAME="usb/%k" +BUS=="usb", KERNEL=="lp[0-9]*", NAME="usb/%k" +BUS=="usb", KERNEL=="ttyUSB*", SYSFS{product}=="Palm Handheld*", \ + SYMLINK+="pilot" + +# usbfs-like devices +SUBSYSTEM=="usb_device", \ + PROGRAM="/bin/sh -c 'X=%k X=$${X#usbdev} B=$${X%%%%.*} D=$${X#*.}; echo bus/usb/$$B/$$D'", SYMLINK+="%c" + +# serial devices +KERNEL=="capi", NAME="capi20", SYMLINK+="isdn/capi20" +KERNEL=="capi[0-9]*", NAME="capi/%n" + +# video devices +KERNEL=="card[0-9]*", NAME="dri/%k" + +# misc devices +KERNEL=="hw_random", NAME="hwrng" +KERNEL=="tun", NAME="net/%k" + +KERNEL=="cdemu[0-9]*", NAME="cdemu/%n" +KERNEL=="pktcdvd[0-9]*", NAME="pktcdvd/%n" +KERNEL=="pktcdvd", NAME="pktcdvd/control" + +KERNEL=="cpu[0-9]*", NAME="cpu/%n/cpuid" +KERNEL=="msr[0-9]*", NAME="cpu/%n/msr" +KERNEL=="microcode", NAME="cpu/microcode" + +KERNEL=="umad*", NAME="infiniband/%k" +KERNEL=="issm*", NAME="infiniband/%k" +KERNEL=="uverbs*", NAME="infiniband/%k" +KERNEL=="ucm", NAME="infiniband/%k" + +# ALSA devices +KERNEL=="controlC[0-9]*", NAME="snd/%k" +KERNEL=="hwC[D0-9]*", NAME="snd/%k" +KERNEL=="pcmC[D0-9cp]*", NAME="snd/%k" +KERNEL=="midiC[D0-9]*", NAME="snd/%k" +KERNEL=="timer", NAME="snd/%k" +KERNEL=="seq", NAME="snd/%k" + +# ieee1394 devices +KERNEL=="dv1394*", NAME="dv1394/%n" +KERNEL=="video1394*", NAME="video1394/%n" + +# input devices +KERNEL=="mice", NAME="input/%k" +KERNEL=="mouse[0-9]*", NAME="input/%k" +KERNEL=="event[0-9]*", NAME="input/%k" +KERNEL=="js[0-9]*", NAME="input/%k" +KERNEL=="ts[0-9]*", NAME="input/%k" +KERNEL=="uinput", NAME="input/%k" + +# Zaptel +KERNEL=="zapctl", NAME="zap/ctl" +KERNEL=="zaptimer", NAME="zap/timer" +KERNEL=="zapchannel", NAME="zap/channel" +KERNEL=="zappseudo", NAME="zap/pseudo" +KERNEL=="zap[0-9]*", NAME="zap/%n" + +# AOE character devices +SUBSYSTEM=="aoe", KERNEL=="discover", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="err", NAME="etherd/%k" +SUBSYSTEM=="aoe", KERNEL=="interfaces", NAME="etherd/%k" + +# device mapper creates its own device nodes, so ignore these +KERNEL=="dm-[0-9]*", OPTIONS+="ignore_device" +KERNEL=="device-mapper", NAME="mapper/control" + +KERNEL="rfcomm[0-9]*", NAME="%k", GROUP="users", MODE="0660" diff --git a/packages/udev/udev_070.bb b/packages/udev/udev_070.bb new file mode 100644 index 0000000000..3fd3c3f522 --- /dev/null +++ b/packages/udev/udev_070.bb @@ -0,0 +1,27 @@ +SRC_URI = "http://kernel.org/pub/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \ + file://tmpfs.patch;patch=1 \ + file://noasmlinkage.patch;patch=1 \ + file://flags.patch;patch=1 \ + file://tty-symlinks.patch;patch=1 \ + file://udev.rules \ + file://links.conf \ + file://init" + +UDEV_DEVFS_RULES = "0" + +include udev.inc + +PR = "r0" + +UDEV_EXTRAS = "extras/scsi_id/ extras/volume_id/ extras/run_directory/" + +do_install_append() { + install -m 0644 ${WORKDIR}/udev.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${WORKDIR}/links.conf ${D}${sysconfdir}/udev/links.conf +} + +#FIXME UDEV MIGRATION PLAN: +#FIXME a) udevd is now a netlink daemon and needs to be started by the init script (ours is way too old) +#FIXME b) sbin/hotplug should no longer be called by the kernel, i.e. echo "" >/proc/sys/kernel/hotplug +#FIXME done c) until d) happens, udev will emulate hotplugd behaviour (see do_install_append() +#FIXME d) eventually hotplug should no longer be used at all, all agents shall be converted to udev rules -- cgit v1.2.3