diff options
Diffstat (limited to 'source/a/eudev')
-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/config/modprobe.d/edac.conf | 29 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/hw_random.conf | 7 | ||||
-rw-r--r-- | source/a/eudev/config/modprobe.d/watchdog.conf | 10 | ||||
-rwxr-xr-x | source/a/eudev/config/rc.d/rc.udev.new | 4 | ||||
-rwxr-xr-x | source/a/eudev/eudev.SlackBuild | 27 | ||||
-rw-r--r-- | source/a/eudev/eudev.ignore_bind_unbind_events.diff | 17 | ||||
-rw-r--r-- | source/a/eudev/slack-desc | 12 |
9 files changed, 83 insertions, 129 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 deleted file mode 100644 index e09f82e0d..000000000 --- a/source/a/eudev/0001-Remove-obsolete-udev_root-references.patch +++ /dev/null @@ -1,68 +0,0 @@ -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 deleted file mode 100644 index 55e2bccfc..000000000 --- a/source/a/eudev/0002-src-udev-udevd.c-add-eudev-startup-message-for-kmsg.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/eudev/config/modprobe.d/edac.conf b/source/a/eudev/config/modprobe.d/edac.conf new file mode 100644 index 000000000..aa09960da --- /dev/null +++ b/source/a/eudev/config/modprobe.d/edac.conf @@ -0,0 +1,29 @@ +############################################################################## +# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that +############################################################################## + +# Blacklist all EDAC (Error Detection And Correction) modules, as some hardware +# implementations are buggy and will cause the kernel to hang or crash. +# Feel free to copy this file to /etc/modprobe.d/ and comment out any modules +# that you'd like to try. If it's unstable you'll likely know very quickly. + +blacklist amd64_edac_mod +blacklist amd76x_edac +blacklist e752x_edac +blacklist e7xxx_edac +blacklist i3000_edac +blacklist i3200_edac +blacklist i5000_edac +blacklist i5100_edac +blacklist i5400_edac +blacklist i7300_edac +blacklist i7core_edac +blacklist i82860_edac +blacklist i82875p_edac +blacklist i82975x_edac +blacklist ie31200_edac +blacklist pnd2_edac +blacklist r82600_edac +blacklist sb_edac +blacklist skx_edac +blacklist x38_edac diff --git a/source/a/eudev/config/modprobe.d/hw_random.conf b/source/a/eudev/config/modprobe.d/hw_random.conf deleted file mode 100644 index b912e0125..000000000 --- a/source/a/eudev/config/modprobe.d/hw_random.conf +++ /dev/null @@ -1,7 +0,0 @@ -############################################################################## -# Do not edit this file; instead, copy it to /etc/modprobe.d/ and edit that -############################################################################## - -# This module has also been known to cause crashes with some hardware. -blacklist hw_random - diff --git a/source/a/eudev/config/modprobe.d/watchdog.conf b/source/a/eudev/config/modprobe.d/watchdog.conf index 22a5c829d..e69fc0084 100644 --- a/source/a/eudev/config/modprobe.d/watchdog.conf +++ b/source/a/eudev/config/modprobe.d/watchdog.conf @@ -3,7 +3,7 @@ ############################################################################## # Blacklist all watchdog modules. Many motherboards hang with them, and -# if you really need a watchdog, you probably know how to load the module +# if you really need a watchdog, you probably know how to load the module. blacklist acquirewdt blacklist advantechwdt blacklist alim1535_wdt @@ -11,6 +11,8 @@ blacklist alim7101_wdt blacklist bcm7038_wdt blacklist cadence_wdt blacklist cpu5wdt +blacklist da9062_wdt +blacklist da9063_wdt blacklist dw_wdt blacklist eurotechwdt blacklist f71808e_wdt @@ -26,9 +28,12 @@ blacklist it8712f_wdt blacklist it87_wdt blacklist machzwd blacklist max63xx_wdt +blacklist mei_wdt blacklist mena21_wdt blacklist menf21bmc_wdt blacklist mixcomwd +blacklist ni903x_wdt +blacklist nic7018_wdt blacklist nv_tco blacklist pc87413_wdt blacklist pcwd @@ -54,6 +59,7 @@ blacklist w83697hf_wdt blacklist w83877f_wdt blacklist w83977f_wdt blacklist wafer5823wdt +blacklist wdat_wdt blacklist wdt blacklist wdt_pci - +blacklist ziirave_wdt diff --git a/source/a/eudev/config/rc.d/rc.udev.new b/source/a/eudev/config/rc.d/rc.udev.new index aaa1eb155..1b4e3fe9f 100755 --- a/source/a/eudev/config/rc.d/rc.udev.new +++ b/source/a/eudev/config/rc.d/rc.udev.new @@ -70,7 +70,7 @@ case "$1" in check_mounted /dev/pts devpts && umount -l /dev/pts # Mount tmpfs on /dev: - mount -n -t devtmpfs devtmpfs /dev + mount -n -t devtmpfs -o size=8M devtmpfs /dev fi else # Mount tmpfs on /dev: @@ -84,7 +84,7 @@ case "$1" in # 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 + mount -n -o mode=0755 -t tmpfs -o size=8M tmpfs /dev fi fi diff --git a/source/a/eudev/eudev.SlackBuild b/source/a/eudev/eudev.SlackBuild index c82107f45..28a38e305 100755 --- a/source/a/eudev/eudev.SlackBuild +++ b/source/a/eudev/eudev.SlackBuild @@ -1,6 +1,6 @@ -#!/bin/sh +#!/bin/bash -# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2015 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2006, 2008, 2009, 2010, 2011, 2012, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -20,8 +20,11 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +cd $(dirname $0) ; CWD=$(pwd) + +PKGNAM=eudev VERSION=${VERSION:-$(echo eudev-*.tar.* | cut -d - -f 2 | rev | cut -f 3- -d . | rev)} -BUILD=${BUILD:-8} +BUILD=${BUILD:-3} NUMJOBS=${NUMJOBS:-" -j7 "} @@ -35,13 +38,20 @@ if [ -z "$ARCH" ]; then esac fi +# If the variable PRINT_PACKAGE_NAME is set, then this script will report what +# the name of the created package would be, and then exit. This information +# could be useful to other scripts. +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz" + exit 0 +fi + if [ "$ARCH" = "x86_64" ]; then LIBDIRSUFFIX="64" else LIBDIRSUFFIX="" fi -CWD=$(pwd) TMP=${TMP:-/tmp} PKG=$TMP/package-eudev @@ -61,8 +71,10 @@ find . \ # 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 -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 +# Ignore bind/unbind events. This was causing various (mostly rare) bugs, but +# was also breaking MTP support in KDE. +# See: https://bugs.kde.org/show_bug.cgi?id=387454 +zcat $CWD/eudev.ignore_bind_unbind_events.diff.gz | patch -p1 --verbose || exit 1 ./configure \ --prefix=/usr \ @@ -88,6 +100,9 @@ zcat $CWD/0002-src-udev-udevd.c-add-eudev-startup-message-for-kmsg.patch.gz | pa make $NUMJOBS || make || exit 1 make install DESTDIR=$PKG || exit 1 +# Don't ship .la files: +rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la + find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/source/a/eudev/eudev.ignore_bind_unbind_events.diff b/source/a/eudev/eudev.ignore_bind_unbind_events.diff new file mode 100644 index 000000000..71e975b33 --- /dev/null +++ b/source/a/eudev/eudev.ignore_bind_unbind_events.diff @@ -0,0 +1,17 @@ +diff --git a/src/udev/udev-event.c b/src/udev/udev-event.c +index d0befba29..790498c97 100644 +--- a/src/udev/udev-event.c ++++ b/src/udev/udev-event.c +@@ -855,6 +855,11 @@ void udev_event_execute_rules(struct udev_event *event, + if (udev_device_get_subsystem(dev) == NULL) + return; + ++ if (streq(udev_device_get_action(dev), "bind") || streq(udev_device_get_action(dev), "unbind")) { ++ // Ignore bind/unbind events ++ return; ++ } ++ + if (streq(udev_device_get_action(dev), "remove")) { + udev_device_read_db(dev); + udev_device_tag_index(dev, NULL, false); + diff --git a/source/a/eudev/slack-desc b/source/a/eudev/slack-desc index c709d6e08..bcfe14a4b 100644 --- a/source/a/eudev/slack-desc +++ b/source/a/eudev/slack-desc @@ -1,20 +1,20 @@ # HOW TO EDIT THIS FILE: -# The "handy ruler" below makes it easier to edit a package description. Line +# 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 +# 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: 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: Homepage: https://wiki.gentoo.org/wiki/Project:Eudev eudev: eudev: |