diff options
Diffstat (limited to '')
-rw-r--r-- | source/a/eudev/0001-Remove-obsolete-udev_root-references.patch | 68 | ||||
-rw-r--r-- | source/a/eudev/0002-src-udev-udevd.c-add-eudev-startup-message-for-kmsg.patch | 38 | ||||
-rw-r--r-- | source/a/eudev/60-cdrom_id.rules.diff (renamed from source/a/udev/60-cdrom_id.rules.diff) | 12 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/8139cp.conf (renamed from source/a/udev/config/modprobe.d/8139cp.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/README (renamed from source/a/udev/config/modprobe.d/README) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/bcm43xx.conf (renamed from source/a/udev/config/modprobe.d/bcm43xx.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/eepro100.conf (renamed from source/a/udev/config/modprobe.d/eepro100.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/eth1394.conf (renamed from source/a/udev/config/modprobe.d/eth1394.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/evbug.conf (renamed from source/a/udev/config/modprobe.d/evbug.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/framebuffers.conf (renamed from source/a/udev/config/modprobe.d/framebuffers.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/hostap.conf (renamed from source/a/udev/config/modprobe.d/hostap.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/hw_random.conf (renamed from source/a/udev/config/modprobe.d/hw_random.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/isapnp.conf (renamed from source/a/udev/config/modprobe.d/isapnp.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/isdn.conf (renamed from source/a/udev/config/modprobe.d/isdn.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/oss.conf (renamed from source/a/udev/config/modprobe.d/oss.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/pcspkr.conf (renamed from source/a/udev/config/modprobe.d/pcspkr.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/psmouse.conf (renamed from source/a/udev/config/modprobe.d/psmouse.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/scsi-sata-controllers.conf (renamed from source/a/udev/config/modprobe.d/scsi-sata-controllers.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/sound-modems.conf (renamed from source/a/udev/config/modprobe.d/sound-modems.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/tulip.conf (renamed from source/a/udev/config/modprobe.d/tulip.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/usb-controller.conf (renamed from source/a/udev/config/modprobe.d/usb-controller.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/via-ircc.conf (renamed from source/a/udev/config/modprobe.d/via-ircc.conf) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/watchdog.conf (renamed from source/a/udev/config/modprobe.d/watchdog.conf) | 16 | ||||
-rwxr-xr-x[-rw-r--r--] | source/a/eudev/config/rc.d/rc.udev.new (renamed from source/a/udev/config/rc.d/rc.udev.new) | 117 | ||||
-rw-r--r-- | source/a/eudev/config/rules.d/40-slackware.rules (renamed from source/a/udev/config/rules.d/40-slackware.rules) | 3 | ||||
-rw-r--r-- | source/a/eudev/config/rules.d/65-permissions.rules (renamed from source/a/udev/config/rules.d/65-permissions.rules) | 0 | ||||
-rw-r--r-- | source/a/eudev/config/udev.conf | 8 | ||||
-rw-r--r-- | source/a/eudev/doinst.sh (renamed from source/a/udev/doinst.sh) | 0 | ||||
-rwxr-xr-x | source/a/eudev/eudev.SlackBuild (renamed from source/a/udev/udev.SlackBuild) | 76 | ||||
-rw-r--r-- | source/a/eudev/slack-desc | 20 |
30 files changed, 258 insertions, 100 deletions
diff --git a/source/a/eudev/0001-Remove-obsolete-udev_root-references.patch b/source/a/eudev/0001-Remove-obsolete-udev_root-references.patch new file mode 100644 index 000000000..e09f82e0d --- /dev/null +++ b/source/a/eudev/0001-Remove-obsolete-udev_root-references.patch @@ -0,0 +1,68 @@ +From 26b8f53163c0efd9c638f9798bb8e36be2a3d719 Mon Sep 17 00:00:00 2001 +From: Robby Workman <rworkman@slackware.com> +Date: Sun, 15 Nov 2015 15:07:37 -0600 +Subject: [PATCH] Remove obsolete udev_root references + +This was removed in 6ada823a9a0979ea145fd70add1007c21caa45c0 +--- + man/udev.7 | 5 ----- + man/udev.xml | 7 ------- + test/udev-test.pl | 8 -------- + 3 files changed, 20 deletions(-) + +diff --git a/man/udev.7 b/man/udev.7 +index b54683d..293f404 100644 +--- a/man/udev.7 ++++ b/man/udev.7 +@@ -515,11 +515,6 @@ The current name of the device\&. If not changed by a rule, it is the name of th + A space\-separated list of the current symlinks\&. The value is only set during a remove event or if an earlier rule assigned a value\&. + .RE + .PP +-\fB$root\fR, \fB%r\fR +-.RS 4 +-The udev_root value\&. +-.RE +-.PP + \fB$sys\fR, \fB%S\fR + .RS 4 + The sysfs mount point\&. +diff --git a/man/udev.xml b/man/udev.xml +index fd7df34..d1ade24 100644 +--- a/man/udev.xml ++++ b/man/udev.xml +@@ -703,13 +703,6 @@ + </varlistentry> + + <varlistentry> +- <term><option>$root</option>, <option>%r</option></term> +- <listitem> +- <para>The udev_root value.</para> +- </listitem> +- </varlistentry> +- +- <varlistentry> + <term><option>$sys</option>, <option>%S</option></term> + <listitem> + <para>The sysfs mount point.</para> +diff --git a/test/udev-test.pl b/test/udev-test.pl +index 14f11df..9a425bb 100755 +--- a/test/udev-test.pl ++++ b/test/udev-test.pl +@@ -889,14 +889,6 @@ SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="%P-part-1" + EOF + }, + { +- desc => "udev_root substitution", +- devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", +- exp_name => "start-/dev-end", +- rules => <<EOF +-SUBSYSTEMS=="scsi", KERNEL=="sda1", SYMLINK+="start-%r-end" +-EOF +- }, +- { + desc => "last_rule option", + devpath => "/devices/pci0000:00/0000:00:1f.2/host0/target0:0:0/0:0:0:0/block/sda/sda1", + exp_name => "last", +-- +2.6.3 + diff --git a/source/a/eudev/0002-src-udev-udevd.c-add-eudev-startup-message-for-kmsg.patch b/source/a/eudev/0002-src-udev-udevd.c-add-eudev-startup-message-for-kmsg.patch new file mode 100644 index 000000000..55e2bccfc --- /dev/null +++ b/source/a/eudev/0002-src-udev-udevd.c-add-eudev-startup-message-for-kmsg.patch @@ -0,0 +1,38 @@ +From 71ff5b6886946dacca8ae685ac85cdc174cfdece Mon Sep 17 00:00:00 2001 +From: Richard Narron <richard@aaazen.com> +Date: Sun, 22 Nov 2015 02:27:58 -0500 +Subject: [PATCH 2/2] src/udev/udevd.c: add eudev startup message for kmsg + +Signed-off-by: Anthony G. Basile <blueness@gentoo.org> +--- + src/udev/udevd.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index b1de97a..b3fbc27 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -1125,6 +1125,7 @@ static int parse_argv(int argc, char *argv[]) { + int main(int argc, char *argv[]) { + struct udev *udev; + sigset_t mask; ++ FILE *f; + int fd_ctrl = -1; + int fd_netlink = -1; + int fd_worker = -1; +@@ -1277,6 +1278,12 @@ int main(int argc, char *argv[]) { + + udev_list_node_init(&event_list); + ++ f = fopen("/dev/kmsg", "w"); ++ if (f != NULL) { ++ fprintf(f, "<30>udevd[%u]: starting eudev-" VERSION "\n", getpid()); ++ fclose(f); ++ } ++ + if (!arg_debug) { + int fd; + +-- +2.6.3 + diff --git a/source/a/udev/60-cdrom_id.rules.diff b/source/a/eudev/60-cdrom_id.rules.diff index 6ac5e2275..c785dcca7 100644 --- a/source/a/udev/60-cdrom_id.rules.diff +++ b/source/a/eudev/60-cdrom_id.rules.diff @@ -1,8 +1,9 @@ ---- ./src/cdrom_id/60-cdrom_id.rules.orig 2012-01-30 12:02:56.526251552 -0600 -+++ ./src/cdrom_id/60-cdrom_id.rules 2013-01-17 21:11:20.821006629 -0600 -@@ -15,6 +15,24 @@ - # enable the receiving of media eject button events - IMPORT{program}="cdrom_id --lock-media $devnode" +diff -rNaud eudev-3.1.old/rules/60-cdrom_id.rules eudev-3.1/rules/60-cdrom_id.rules +--- eudev-3.1.old/rules/60-cdrom_id.rules 2015-03-19 22:57:28.000000000 +0100 ++++ eudev-3.1/rules/60-cdrom_id.rules 2015-10-24 12:36:13.350966101 +0200 +@@ -20,6 +20,25 @@ + # stale mounts after ejecting + ENV{DISK_MEDIA_CHANGE}=="?*", ENV{ID_CDROM_MEDIA}!="?*", ENV{SYSTEMD_READY}="0" -KERNEL=="sr0", SYMLINK+="cdrom", OPTIONS+="link_priority=-100" +# create default links to the first detected device @@ -24,5 +25,6 @@ +KERNEL=="sr[0-9]*", ENV{ID_CDROM_DVD_R}=="1", SYMLINK+="dvdr%n", OPTIONS+="link_priority=-100" +KERNEL=="sr[0-9]*", ENV{ID_CDROM_DVD_R}=="1", SYMLINK+="dvdwriter%n", OPTIONS+="link_priority=-100" +KERNEL=="sr[0-9]*", ENV{ID_CDROM_DVD_RW}=="1", SYMLINK+="dvdrw%n", OPTIONS+="link_priority=-100" ++ LABEL="cdrom_end" diff --git a/source/a/udev/config/modprobe.d/8139cp.conf b/source/a/eudev/config/modprobe.d/8139cp.conf index 65f0af0d1..65f0af0d1 100644 --- a/source/a/udev/config/modprobe.d/8139cp.conf +++ b/source/a/eudev/config/modprobe.d/8139cp.conf diff --git a/source/a/udev/config/modprobe.d/README b/source/a/eudev/config/modprobe.d/README index 43355e826..43355e826 100644 --- a/source/a/udev/config/modprobe.d/README +++ b/source/a/eudev/config/modprobe.d/README diff --git a/source/a/udev/config/modprobe.d/bcm43xx.conf b/source/a/eudev/config/modprobe.d/bcm43xx.conf index 55b3c2abc..55b3c2abc 100644 --- a/source/a/udev/config/modprobe.d/bcm43xx.conf +++ b/source/a/eudev/config/modprobe.d/bcm43xx.conf diff --git a/source/a/udev/config/modprobe.d/eepro100.conf b/source/a/eudev/config/modprobe.d/eepro100.conf index a7ca4aaea..a7ca4aaea 100644 --- a/source/a/udev/config/modprobe.d/eepro100.conf +++ b/source/a/eudev/config/modprobe.d/eepro100.conf diff --git a/source/a/udev/config/modprobe.d/eth1394.conf b/source/a/eudev/config/modprobe.d/eth1394.conf index a2f475afd..a2f475afd 100644 --- a/source/a/udev/config/modprobe.d/eth1394.conf +++ b/source/a/eudev/config/modprobe.d/eth1394.conf diff --git a/source/a/udev/config/modprobe.d/evbug.conf b/source/a/eudev/config/modprobe.d/evbug.conf index 0af0a83c6..0af0a83c6 100644 --- a/source/a/udev/config/modprobe.d/evbug.conf +++ b/source/a/eudev/config/modprobe.d/evbug.conf diff --git a/source/a/udev/config/modprobe.d/framebuffers.conf b/source/a/eudev/config/modprobe.d/framebuffers.conf index 770ce420a..770ce420a 100644 --- a/source/a/udev/config/modprobe.d/framebuffers.conf +++ b/source/a/eudev/config/modprobe.d/framebuffers.conf diff --git a/source/a/udev/config/modprobe.d/hostap.conf b/source/a/eudev/config/modprobe.d/hostap.conf index 4254d3daa..4254d3daa 100644 --- a/source/a/udev/config/modprobe.d/hostap.conf +++ b/source/a/eudev/config/modprobe.d/hostap.conf diff --git a/source/a/udev/config/modprobe.d/hw_random.conf b/source/a/eudev/config/modprobe.d/hw_random.conf index b912e0125..b912e0125 100644 --- a/source/a/udev/config/modprobe.d/hw_random.conf +++ b/source/a/eudev/config/modprobe.d/hw_random.conf diff --git a/source/a/udev/config/modprobe.d/isapnp.conf b/source/a/eudev/config/modprobe.d/isapnp.conf index a89ad6bb7..a89ad6bb7 100644 --- a/source/a/udev/config/modprobe.d/isapnp.conf +++ b/source/a/eudev/config/modprobe.d/isapnp.conf diff --git a/source/a/udev/config/modprobe.d/isdn.conf b/source/a/eudev/config/modprobe.d/isdn.conf index 7f7367536..7f7367536 100644 --- a/source/a/udev/config/modprobe.d/isdn.conf +++ b/source/a/eudev/config/modprobe.d/isdn.conf diff --git a/source/a/udev/config/modprobe.d/oss.conf b/source/a/eudev/config/modprobe.d/oss.conf index 52ed2f59c..52ed2f59c 100644 --- a/source/a/udev/config/modprobe.d/oss.conf +++ b/source/a/eudev/config/modprobe.d/oss.conf diff --git a/source/a/udev/config/modprobe.d/pcspkr.conf b/source/a/eudev/config/modprobe.d/pcspkr.conf index 66de6b749..66de6b749 100644 --- a/source/a/udev/config/modprobe.d/pcspkr.conf +++ b/source/a/eudev/config/modprobe.d/pcspkr.conf diff --git a/source/a/udev/config/modprobe.d/psmouse.conf b/source/a/eudev/config/modprobe.d/psmouse.conf index cc414141e..cc414141e 100644 --- a/source/a/udev/config/modprobe.d/psmouse.conf +++ b/source/a/eudev/config/modprobe.d/psmouse.conf diff --git a/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf b/source/a/eudev/config/modprobe.d/scsi-sata-controllers.conf index 61470416d..61470416d 100644 --- a/source/a/udev/config/modprobe.d/scsi-sata-controllers.conf +++ b/source/a/eudev/config/modprobe.d/scsi-sata-controllers.conf diff --git a/source/a/udev/config/modprobe.d/sound-modems.conf b/source/a/eudev/config/modprobe.d/sound-modems.conf index f458346de..f458346de 100644 --- a/source/a/udev/config/modprobe.d/sound-modems.conf +++ b/source/a/eudev/config/modprobe.d/sound-modems.conf diff --git a/source/a/udev/config/modprobe.d/tulip.conf b/source/a/eudev/config/modprobe.d/tulip.conf index 64b6a5ca5..64b6a5ca5 100644 --- a/source/a/udev/config/modprobe.d/tulip.conf +++ b/source/a/eudev/config/modprobe.d/tulip.conf diff --git a/source/a/udev/config/modprobe.d/usb-controller.conf b/source/a/eudev/config/modprobe.d/usb-controller.conf index f5e4e5025..f5e4e5025 100644 --- a/source/a/udev/config/modprobe.d/usb-controller.conf +++ b/source/a/eudev/config/modprobe.d/usb-controller.conf diff --git a/source/a/udev/config/modprobe.d/via-ircc.conf b/source/a/eudev/config/modprobe.d/via-ircc.conf index 3dfa57315..3dfa57315 100644 --- a/source/a/udev/config/modprobe.d/via-ircc.conf +++ b/source/a/eudev/config/modprobe.d/via-ircc.conf diff --git a/source/a/udev/config/modprobe.d/watchdog.conf b/source/a/eudev/config/modprobe.d/watchdog.conf index 66d1f837d..22a5c829d 100644 --- a/source/a/udev/config/modprobe.d/watchdog.conf +++ b/source/a/eudev/config/modprobe.d/watchdog.conf @@ -8,8 +8,12 @@ blacklist acquirewdt blacklist advantechwdt blacklist alim1535_wdt blacklist alim7101_wdt +blacklist bcm7038_wdt +blacklist cadence_wdt blacklist cpu5wdt +blacklist dw_wdt blacklist eurotechwdt +blacklist f71808e_wdt blacklist hpwdt blacklist i6300esb blacklist i8xx_tco @@ -17,22 +21,34 @@ blacklist iTCO_vendor_support blacklist iTCO_wdt blacklist ib700wdt blacklist ibmasr +blacklist ie6xx_wdt blacklist it8712f_wdt +blacklist it87_wdt blacklist machzwd +blacklist max63xx_wdt +blacklist mena21_wdt +blacklist menf21bmc_wdt blacklist mixcomwd +blacklist nv_tco blacklist pc87413_wdt blacklist pcwd blacklist pcwd_pci blacklist pcwd_usb +blacklist retu_wdt +blacklist rn5t618_wdt blacklist sbc60xxwdt blacklist sbc7240_wdt blacklist sbc8360 blacklist sbc_epx_c3 +blacklist sbc_fitpc2_wdt blacklist sc1200wdt blacklist sc520_wdt +blacklist sch311x_wdt blacklist scx200_wdt blacklist smsc37b787_wdt blacklist softdog +blacklist sp5100_tco +blacklist via_wdt blacklist w83627hf_wdt blacklist w83697hf_wdt blacklist w83877f_wdt diff --git a/source/a/udev/config/rc.d/rc.udev.new b/source/a/eudev/config/rc.d/rc.udev.new index f000e938e..aaa1eb155 100644..100755 --- a/source/a/udev/config/rc.d/rc.udev.new +++ b/source/a/eudev/config/rc.d/rc.udev.new @@ -5,57 +5,47 @@ PATH="/sbin:/bin" -. /etc/udev/udev.conf - -# remove trailing slash from udev_root -UDEV_ROOT=$(echo "${udev_root}" |sed 's/\/*$//') - check_mounted() { grep -E -q "^[^[:space:]]+ $1 $2" /proc/mounts return $? } mount_devpts() { - if ! check_mounted $UDEV_ROOT/pts devpts ; then - mkdir $UDEV_ROOT/pts 2> /dev/null - mount -n -o mode=0620,gid=5 -t devpts devpts $UDEV_ROOT/pts + if ! check_mounted /dev/pts devpts ; then + mkdir /dev/pts 2> /dev/null + mount -n -o mode=0620,gid=5 -t devpts devpts /dev/pts + fi +} + +mount_devshm() { + if ! check_mounted /dev/shm tmpfs ; then + mkdir /dev/shm 2> /dev/null + mount /dev/shm fi } case "$1" in start) - # Sanity check #1, udev requires that the kernel support devtmpfs: - if ! grep -wq devtmpfs /proc/filesystems ; then - echo "Sorry, but you need devtmpfs support in the kernel to use udev." - echo "Both of these options are needed: CONFIG_DEVTMPFS=y CONFIG_DEVTMPFS_MOUNT=y" - echo - echo "FATAL: Refusing to run /etc/rc.d/rc.udev." - sleep 10 - exit 1 - fi - - # Sanity check #2, udev requires that the kernel support tmpfs: + # Sanity check #1, udev requires that the kernel support tmpfs: if ! grep -wq tmpfs /proc/filesystems ; then echo "Sorry, but you need tmpfs support in the kernel to use udev." echo echo "FATAL: Refusing to run /etc/rc.d/rc.udev." - sleep 10 exit 1 fi - # Sanity check #3, make sure that a 2.6.x kernel is new enough: + # Sanity check #2, make sure that a 2.6.x kernel is new enough: if [ "$(uname -r | cut -f 1,2 -d .)" = "2.6" ]; then if [ "$(uname -r | cut -f 3 -d . | sed 's/[^[:digit:]].*//')" -lt "32" ]; then echo "Sorry, but you need a 2.6.32+ kernel to use this udev." echo "Your kernel version is only $(uname -r)." echo echo "FATAL: Refusing to run /etc/rc.d/rc.udev." - sleep 10 exit 1 fi fi - # Sanity check #4, make sure the udev package was not removed. If udevd + # Sanity check #3, make sure the udev package was not removed. If udevd # is not there, this will also shut off this script to prevent further # problems: if [ ! -x /sbin/udevd ]; then @@ -63,7 +53,6 @@ case "$1" in echo "No udevd daemon found." echo "Turning off udev: chmod 644 /etc/rc.d/rc.udev" echo "FATAL: Refusing to run /etc/rc.d/rc.udev." - sleep 10 exit 1 fi @@ -73,36 +62,54 @@ case "$1" in fi if grep -qw devtmpfs /proc/filesystems ; then - if ! check_mounted $UDEV_ROOT devtmpfs ; then - # umount shm if needed - check_mounted $UDEV_ROOT/shm tmpfs && umount -l $UDEV_ROOT/shm + if ! check_mounted /dev devtmpfs ; then + # umount shm if needed + check_mounted /dev/shm tmpfs && umount -l /dev/shm - # Umount pts if needed, we will remount it later: - check_mounted $UDEV_ROOT/pts devpts && umount -l $UDEV_ROOT/pts + # Umount pts if needed, we will remount it later: + check_mounted /dev/pts devpts && umount -l /dev/pts - # Mount tmpfs on $UDEV_ROOT: - mount -n -t devtmpfs devtmpfs $UDEV_ROOT - fi + # Mount tmpfs on /dev: + mount -n -t devtmpfs devtmpfs /dev + fi else - # Mount tmpfs on $UDEV_ROOT: - if ! check_mounted $UDEV_ROOT tmpfs ; then - # umount shm if needed - check_mounted $UDEV_ROOT/shm tmpfs && umount -l $UDEV_ROOT/shm + # Mount tmpfs on /dev: + if ! check_mounted /dev tmpfs ; then + # umount shm if needed + check_mounted /dev/shm tmpfs && umount -l /dev/shm - # Umount pts if needed, we will remount it later: - check_mounted $UDEV_ROOT/pts devpts && umount -l $UDEV_ROOT/pts - - # Mount tmpfs on $UDEV_ROOT: - # the -n is because we don't want $UDEV_ROOT umounted when - # someone (rc.[06]) calls umount -a - mount -n -o mode=0755 -t tmpfs tmpfs $UDEV_ROOT + # Umount pts if needed, we will remount it later: + check_mounted /dev/pts devpts && umount -l /dev/pts - fi - fi + # Mount tmpfs on /dev: + # the -n is because we don't want /dev umounted when + # someone (rc.[06]) calls umount -a + mount -n -o mode=0755 -t tmpfs tmpfs /dev + fi + fi + # Mount devpts mount_devpts + mount_devshm if ! /sbin/pidof udevd 1>/dev/null 2>/dev/null; then # start udevd + echo "Creating static nodes in /dev." + kmod static-nodes -f tmpfiles --output /run/static-nodes + grep "^d\ " /run/static-nodes | while read line ; do + mkdir -p -m $(echo $line | cut -f 3 -d ' ') $(echo $line | cut -f 2 -d ' ') + done + grep -v "^d\ " /run/static-nodes | while read line ; do + mknod -m $(echo $line | cut -f 3 -d ' ') \ + $(echo $line | cut -f 2 -d ' ') \ + $(echo $line | cut -b1 ) \ + $(echo $line | cut -f 7 -d ' ' | cut -f 1 -d :) \ + $(echo $line | cut -f 7 -d ' ' | cut -f 2 -d :) 2> /dev/null + done + rm -f /run/static-nodes + # Add any system defined additional device nodes: + cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2> /dev/null + # Add any locally defined additional device nodes: + cp --preserve=all --recursive --update /etc/udev/devices/* /dev 2> /dev/null echo "Starting udevd: /sbin/udevd --daemon" /sbin/udevd --daemon # Since udev is just now being started we want to use add events: @@ -111,12 +118,12 @@ case "$1" in /sbin/udevadm trigger --type=subsystems --action=add /sbin/udevadm trigger --type=devices --action=add else # trigger changes for already running udevd - # If the persistent rules files do not exist, trigger an add event: - if [ ! -r /etc/udev/rules.d/70-persistent-net.rules -o ! -r /etc/udev/rules.d/70-persistent-cd.rules ]; then + # If the persistent network rules file does not exist, trigger an add event: + if [ ! -r /etc/udev/rules.d/70-persistent-net.rules ]; then # Test that we can actually write to the directory first: if touch /etc/udev/rules.d/testfile 2> /dev/null ; then rm -f /etc/udev/rules.d/testfile - # This should add persistent net/cd rules: + # This should add persistent net rules: echo "Triggering udev to write persistent rules to /etc/udev/rules.d/" /sbin/udevadm trigger --type=devices --action=add sleep 3 @@ -126,9 +133,14 @@ case "$1" in # rules at every boot. # To force another attempt, delete the file(s). touch /etc/udev/rules.d/70-persistent-net.rules - touch /etc/udev/rules.d/70-persistent-cd.rules fi fi + # Update the hardware database index (/etc/udev/hwdb.bin), if possible: + if touch /etc/udev/testfile 2> /dev/null ; then + rm -f /etc/udev/testfile + echo "Updating hardware database index: /sbin/udevadm hwdb --update" + /sbin/udevadm hwdb --update + fi # Since udevd is running, most of the time we only need change events: echo "Triggering udev events: /sbin/udevadm trigger --action=change" /sbin/udevadm trigger --type=subsystems --action=change @@ -158,13 +170,12 @@ case "$1" in reload) echo "Reloading udev rules" udevadm control --reload - cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT ;; force-reload) - echo "Updating all available device nodes in $UDEV_ROOT" + echo "Updating all available device nodes in /dev" udevadm control --reload - rm -rf $UDEV_ROOT/.udev $UDEV_ROOT/disk - cp --preserve=all --recursive --update /lib/udev/devices/* $UDEV_ROOT + rm -rf /dev/.udev /dev/disk + cp --preserve=all --recursive --update /lib/udev/devices/* /dev 2> /dev/null ;; *) diff --git a/source/a/udev/config/rules.d/40-slackware.rules b/source/a/eudev/config/rules.d/40-slackware.rules index 9e8c63428..3240b29ef 100644 --- a/source/a/udev/config/rules.d/40-slackware.rules +++ b/source/a/eudev/config/rules.d/40-slackware.rules @@ -20,3 +20,6 @@ KERNEL=="rfkill", GROUP:="netdev", MODE:="0664" # Mount fusectl filesystem KERNEL=="fuse", ACTION=="add", RUN+="/bin/mount -t fusectl fusectl /sys/fs/fuse/connections" +# Set default perms for /dev/ppp: +KERNEL=="ppp", MODE="0660", GROUP="dialout", OPTIONS+="static_node=ppp" + diff --git a/source/a/udev/config/rules.d/65-permissions.rules b/source/a/eudev/config/rules.d/65-permissions.rules index 6f82b0f36..6f82b0f36 100644 --- a/source/a/udev/config/rules.d/65-permissions.rules +++ b/source/a/eudev/config/rules.d/65-permissions.rules diff --git a/source/a/eudev/config/udev.conf b/source/a/eudev/config/udev.conf new file mode 100644 index 000000000..e507e116d --- /dev/null +++ b/source/a/eudev/config/udev.conf @@ -0,0 +1,8 @@ +# /etc/udev/udev.conf + +# This file can be used to override some of udev's default values +# See udev(7) for details + +# udev_log - The initial syslog(3) priority: "err", "info", "debug" +udev_log="err" + diff --git a/source/a/udev/doinst.sh b/source/a/eudev/doinst.sh index 2912e5c86..2912e5c86 100644 --- a/source/a/udev/doinst.sh +++ b/source/a/eudev/doinst.sh diff --git a/source/a/udev/udev.SlackBuild b/source/a/eudev/eudev.SlackBuild index d39da2629..c82107f45 100755 --- a/source/a/udev/udev.SlackBuild +++ b/source/a/eudev/eudev.SlackBuild @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,15 +20,15 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -VERSION=${VERSION:-$(echo udev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-7} +VERSION=${VERSION:-$(echo eudev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} +BUILD=${BUILD:-8} NUMJOBS=${NUMJOBS:-" -j7 "} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then case "$( uname -m )" in - i?86) export ARCH=i486 ;; + i?86) export ARCH=i586 ;; arm*) export ARCH=arm ;; # Unless $ARCH is already set, use uname -m for all other archs: *) export ARCH=$( uname -m ) ;; @@ -43,14 +43,14 @@ fi CWD=$(pwd) TMP=${TMP:-/tmp} -PKG=$TMP/package-udev +PKG=$TMP/package-eudev rm -rf $PKG mkdir -p $TMP $PKG/lib/udev cd $TMP -rm -rf udev-$VERSION -tar xvf $CWD/udev-$VERSION.tar.xz || exit 1 -cd udev-$VERSION || exit 1 +rm -rf eudev-$VERSION +tar xvf $CWD/eudev-$VERSION.tar.xz || exit 1 +cd eudev-$VERSION || exit 1 chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ @@ -58,42 +58,31 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \; -# Fix ata_id (remove with udev-186+) -zcat $CWD/udev-ata_id-fixup-all-8-not-only-6-bytes-of-the-fw_rev.patch.gz | patch -p1 || exit 1 - -# Fix 42-usb-hid-pm.rules (remove with udev-187+) -zcat $CWD/fix-42-usb-hid-pm.rules.diff.gz | patch -p1 --verbose || exit 1 - -# Fixup the rule generator for our use -zcat $CWD/rule_generator.diff.gz | patch -p1 --verbose || exit 1 - -# Patch 60-cdrom_id.rules to create a full set of symlinks. -# This is needed for a hotplugged optical device since the generated -# rules will not be used until the second time the device is plugged. +# Patch 60-cdrom_id.rules to create a full set of symlinks: zcat $CWD/60-cdrom_id.rules.diff.gz | patch -p1 --verbose || exit 1 -# static libudev is needed for lvm2 -# --enable-udev_acl was removed (will be part of future CK release) -# --enable-floppy support was also disabled by default in 173 -# --enable-rule_generator was disabled by default in 175 +zcat $CWD/0001-Remove-obsolete-udev_root-references.patch.gz | patch -p1 --verbose || exit 1 +zcat $CWD/0002-src-udev-udevd.c-add-eudev-startup-message-for-kmsg.patch.gz | patch -p1 --verbose || exit 1 -LDFLAGS="$LDFLAGS -lrt" \ ./configure \ --prefix=/usr \ --with-rootprefix=/ \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --with-rootlibdir=/lib${LIBDIRSUFFIX} \ - --with-firmware-path=/lib/firmware/updates:/lib/firmware \ + --with-rootrundir=/run \ + --with-rootlibexecdir=/lib/udev \ --sysconfdir=/etc \ --bindir=/sbin \ --sbindir=/sbin \ --libexecdir=/lib \ --enable-introspection \ + --enable-hwdb \ + --enable-manpages \ --mandir=/usr/man \ - --docdir=/usr/doc/udev-$VERSION \ - --enable-floppy \ - --enable-static \ + --docdir=/usr/doc/eudev-$VERSION \ + --disable-static \ --enable-rule_generator \ + --enable-split-usr \ --build=$ARCH-slackware-linux || exit 1 make $NUMJOBS || make || exit 1 @@ -105,9 +94,9 @@ find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ # scsi_id is needed by multipath ( cd $PKG/sbin ; ln -s ../lib/udev/scsi_id scsi_id ) -# Put udevd back in /sbin -mv $PKG/lib/udev/udevd $PKG/sbin -ln -s /sbin/udevd $PKG/lib/udev/udevd +# Move system installed hwdb files under /lib: +mkdir -p $PKG/lib/udev/hwdb.d +mv $PKG/etc/udev/hwdb.d/* $PKG/lib/udev/hwdb.d mkdir -p \ $PKG/run \ @@ -116,13 +105,13 @@ mkdir -p \ $PKG/etc/udev/rules.d \ $PKG/lib/firmware -# Yes, these will clobber existing config files. +# Yes, this will clobber existing config files. cp -a $CWD/config/udev.conf $PKG/etc/udev/udev.conf -# Copy Slackware custom rules +# Copy Slackware custom rules: cp -a $CWD/config/rules.d/* $PKG/lib/udev/rules.d/ -# Now the init script and module-init-tools stuff +# Now the init script and kmod stuff: cp -a $CWD/config/rc.d/rc.udev.new $PKG/etc/rc.d/rc.udev.new cp -a $CWD/config/modprobe.d/*.conf $PKG/lib/modprobe.d/ cp -a $CWD/config/modprobe.d/README $PKG/etc/modprobe.d/ @@ -133,18 +122,21 @@ find $PKG/etc -type d -exec chmod 755 {} \; chmod 0755 $PKG/etc/rc.d/rc.udev.new # Add extra device nodes to the package that udev doesn't make: -tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG +mkdir -p $PKG/lib/udev/devices +if [ -r $CWD/udev-fixed-devices.tar.gz ]; then + tar xvf $CWD/udev-fixed-devices.tar.gz -C $PKG +fi + +# Support locally added additional devices found in this directory: +mkdir -p $PKG/etc/udev/devices chown -R root:root $PKG/lib/udev chmod 0755 $PKG/lib/udev/* -mkdir -p $PKG/usr/doc/udev-$VERSION +mkdir -p $PKG/usr/doc/eudev-$VERSION cp -a \ COPYING* README* TODO \ - $PKG/usr/doc/udev-$VERSION - -# Don't package the API docs: -rm -rf $PKG/usr/share/gtk-doc ; rmdir $PKG/usr/share 2>/dev/null + $PKG/usr/doc/eudev-$VERSION # Compress and fix manpage symlinks: if [ -d $PKG/usr/man ]; then @@ -166,4 +158,4 @@ zcat $CWD/doinst.sh.gz > $PKG/install/doinst.sh cat $CWD/slack-desc > $PKG/install/slack-desc cd $PKG -/sbin/makepkg -l y -c y $TMP/udev-$VERSION-$ARCH-$BUILD.txz +/sbin/makepkg -l y -c y $TMP/eudev-$VERSION-$ARCH-$BUILD.txz diff --git a/source/a/eudev/slack-desc b/source/a/eudev/slack-desc new file mode 100644 index 000000000..c709d6e08 --- /dev/null +++ b/source/a/eudev/slack-desc @@ -0,0 +1,20 @@ +# HOW TO EDIT THIS FILE: +# The "handy ruler" below makes it easier to edit a package description. Line +# up the first '|' above the ':' following the base package name, and the '|' on +# the right side marks the last column you can put a character in. You must make +# exactly 11 lines for the formatting to be correct. It's also customary to +# leave one space after the ':'. + + |-----handy-ruler-------------------------------------------------------| +eudev: eudev (dynamic device directory system) +eudev: +eudev: eudev provides a dynamic device directory containing only the files +eudev: for the devices which are actually present. It creates or removes +eudev: device node files usually located in the /dev directory. eudev is a +eudev: fork of git://anongit.freedesktop.org/systemd/systemd with the aim of +eudev: isolating udev from any particular flavor of system initialization. +eudev: +eudev: Homepage: https://wiki.gentoo.org/wiki/Project:Eudev +eudev: +eudev: + |