diff --git a/0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch b/0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch new file mode 100644 index 0000000..c1326c5 --- /dev/null +++ b/0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch @@ -0,0 +1,25 @@ +From ef7b6c0190fefaacf6d8f8e1a6dda4ba8b98091b Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +Date: Wed, 29 Oct 2014 17:58:43 +0100 +Subject: [PATCH] sd-bus: properly handle removals of non-existing matches + +--- + src/libsystemd/sd-bus/bus-match.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/libsystemd/sd-bus/bus-match.c src/libsystemd/sd-bus/bus-match.c +index 18afe0f..5658c61 100644 +--- src/libsystemd/sd-bus/bus-match.c ++++ src/libsystemd/sd-bus/bus-match.c +@@ -537,7 +537,7 @@ static int bus_match_find_compare_value( + else if (BUS_MATCH_CAN_HASH(t)) + n = hashmap_get(c->compare.children, value_str); + else { +- for (n = c->child; !value_node_same(n, t, value_u8, value_str); n = n->next) ++ for (n = c->child; n && !value_node_same(n, t, value_u8, value_str); n = n->next) + ; + } + +-- +1.7.9.2 + diff --git a/0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch b/0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch new file mode 100644 index 0000000..e29c01d --- /dev/null +++ b/0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch @@ -0,0 +1,41 @@ +From aba248ee6b1eb10baf3d89eca2ad7569459af6ab Mon Sep 17 00:00:00 2001 +From: Hans de Goede +Date: Thu, 30 Oct 2014 10:15:54 +0100 +Subject: [PATCH] keymap: Ignore brightness keys on Dell Inspiron 1520 to + avoid double events + +On the Dell Inspiron 1520 both the atkbd and acpi-video input devices report +an event for pressing the brightness up / down key-combos, resulting in user +space seeing double events and increasing / decreasing the brightness 2 steps +for each keypress. + +This hwdb snippet suppresses the atkbd events, making the Inspiron 1520 work +like most modern laptops which emit brightness up / down events through +acpi-video only. + +Reported by Pavel Malyshev + +https://bugzilla.redhat.com/show_bug.cgi?id=1141525 +--- + hwdb/60-keyboard.hwdb | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb +index 06caba9..d2ca965 100644 +--- hwdb/60-keyboard.hwdb ++++ hwdb/60-keyboard.hwdb +@@ -230,6 +230,11 @@ keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron*1110:pvr* + keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron*1210:pvr* + KEYBOARD_KEY_84=wlan + ++# Dell Inspiron 1520 ++keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnInspiron*1520:pvr* ++ KEYBOARD_KEY_85=unknown # Brightness Down, also emitted by acpi-video, ignore ++ KEYBOARD_KEY_86=unknown # Brightness Up, also emitted by acpi-video, ignore ++ + # Latitude XT2 + keyboard:dmi:bvn*:bvr*:bd*:svnDell*:pnLatitude*XT2:pvr* + KEYBOARD_KEY_9b=up # tablet rocker up +-- +1.7.9.2 + diff --git a/1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch b/1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch new file mode 100644 index 0000000..3a3ad55 --- /dev/null +++ b/1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch @@ -0,0 +1,58 @@ +Based on cc821d02a37c8c76aaf15bae2d33fee1bdc4b2e0 Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Tue, 28 Oct 2014 16:50:24 +0100 +Subject: [PATCH] udev: path_id - set supported_parent for well-known SCSI + setups + +--- + src/udev/udev-builtin-path_id.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- src/udev/udev-builtin-path_id.c ++++ src/udev/udev-builtin-path_id.c 2014-11-03 14:12:48.129956655 +0000 +@@ -379,7 +379,7 @@ out: + return hostdev; + } + +-static struct udev_device *handle_scsi(struct udev_device *parent, char **path) ++static struct udev_device *handle_scsi(struct udev_device *parent, char **path, bool *supported_parent) + { + const char *devtype; + const char *name; +@@ -394,6 +394,7 @@ static struct udev_device *handle_scsi(s + if (id != NULL) { + parent = skip_subsystem(parent, "scsi"); + path_prepend(path, "ieee1394-0x%s", id); ++ *supported_parent = true; + goto out; + } + +@@ -402,16 +403,19 @@ static struct udev_device *handle_scsi(s + + if (strstr(name, "/rport-") != NULL) { + parent = handle_scsi_fibre_channel(parent, path); ++ *supported_parent = true; + goto out; + } + + if (strstr(name, "/end_device-") != NULL) { + parent = handle_scsi_sas(parent, path); ++ *supported_parent = true; + goto out; + } + + if (strstr(name, "/session") != NULL) { + parent = handle_scsi_iscsi(parent, path); ++ *supported_parent = true; + goto out; + } + +@@ -545,7 +549,7 @@ static int builtin_path_id(struct udev_d + } else if (streq(subsys, "scsi_tape")) { + handle_scsi_tape(parent, &path); + } else if (streq(subsys, "scsi")) { +- parent = handle_scsi(parent, &path); ++ parent = handle_scsi(parent, &path, &supported_parent); + supported_transport = true; + } else if (streq(subsys, "cciss")) { + parent = handle_cciss(parent, &path); diff --git a/1091-udev-path_id-update-comments.patch b/1091-udev-path_id-update-comments.patch new file mode 100644 index 0000000..a695f0d --- /dev/null +++ b/1091-udev-path_id-update-comments.patch @@ -0,0 +1,42 @@ +From a42cdff19f2d34f12ceca0f40707421a8aaa2c2f Mon Sep 17 00:00:00 2001 +From: Kay Sievers +Date: Thu, 30 Oct 2014 01:18:34 +0100 +Subject: [PATCH] udev: path_id - update comments + +--- + src/udev/udev-builtin-path_id.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git src/udev/udev-builtin-path_id.c src/udev/udev-builtin-path_id.c +index 0d247f6..df996cb 100644 +--- src/udev/udev-builtin-path_id.c ++++ src/udev/udev-builtin-path_id.c +@@ -548,9 +548,9 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool + } + + /* +- * Do return devices with have an unknown type of parent device, they +- * might produce conflicting IDs below multiple independent parent +- * devices. ++ * Do not return devices with an unknown parent device type. They ++ * might produce conflicting IDs if the parent does not provide a ++ * unique and predictable name. + */ + if (!supported_parent) { + free(path); +@@ -558,9 +558,9 @@ static int builtin_path_id(struct udev_device *dev, int argc, char *argv[], bool + } + + /* +- * Do not return a have-only a single-parent block devices, some +- * have entire hidden buses behind it, and not create predictable +- * IDs that way. ++ * Do not return block devices without a well-known transport. Some ++ * devices do not expose their buses and do not provide a unique ++ * and predictable name that way. + */ + if (streq(udev_device_get_subsystem(dev), "block") && !supported_transport) { + free(path); +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index 1b48b77..971b869 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Nov 3 14:23:02 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch + 0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch + +------------------------------------------------------------------- +Mon Nov 3 14:17:48 UTC 2014 - werner@suse.de + +- Add upstream patches + 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch + 1091-udev-path_id-update-comments.patch + which will be applied if patch + 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch + is applied a this may fix the trouble with iSCSI (bnc#898233) + ------------------------------------------------------------------- Thu Oct 30 10:45:01 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 291c2fd..fb98581 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -26,6 +26,7 @@ %bcond_without compat_libs %bcond_with networkd %bcond_with python +%bcond_with parentpathid %ifarch %{ix86} x86_64 aarch64 %define has_efi 1 %else @@ -1000,6 +1001,10 @@ Patch485: 0010-shutdown-do-final-unmounting-only-if-not-running-ins.patch Patch486: 0011-selinux-make-sure-we-do-not-try-to-print-missing-fie.patch # PATCH-FIX-UPSTREAM added at 2014/10/28 Patch487: 0012-manager-do-not-print-anything-while-passwords-are-be.patch +# PATCH-FIX-UPSTREAM added at 2014/10/31 +Patch488: 0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch +# PATCH-FIX-UPSTREAM added at 2014/10/31 +Patch489: 0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch # UDEV PATCHES # ============ @@ -1132,7 +1137,7 @@ Patch1061: 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch # PATCH-FIX-SUSE 1062-rules-set-default-permissions-for-GenWQE-devices.patch (bnc#890977) Patch1062: 1062-rules-set-default-permissions-for-GenWQE-devices.patch # PATCH-FIX-UPSTREAM 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch -#Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch +Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch # PATCH-FIX-UPSTREAM 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch Patch1064: 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch # PATCH-FIX-UPSTREAM 1065-udev-bump-event-timeout-to-60-seconds.patch @@ -1185,6 +1190,10 @@ Patch1087: 1087-infinit-timeout-for-kmod-loaded-modules.patch Patch1088: 1088-drop-renaming-of-virtual-interfaces-in-guest.patch # PATCH-FIX-UPSTREAM 1089-fix-cgroup-device-controller.patch Patch1089: 1089-fix-cgroup-device-controller.patch +# PATCH-FIX-UPSTREAM 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch +Patch1090: 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch +# PATCH-FIX-UPSTREAM 1091-udev-path_id-update-comments.patch +Patch1091: 1091-udev-path_id-update-comments.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1832,6 +1841,8 @@ cp %{SOURCE7} m4/ %patch485 -p0 %patch486 -p0 %patch487 -p0 +%patch488 -p0 +%patch489 -p0 # udev patches %patch1001 -p1 @@ -1917,6 +1928,9 @@ cp %{SOURCE7} m4/ %patch1060 -p1 %patch1061 -p0 %patch1062 -p1 +%if %{with parentpathid} +%patch1063 -p0 +%endif %patch1064 -p0 %patch1065 -p0 %patch1066 -p1 @@ -1951,6 +1965,10 @@ cp %{SOURCE7} m4/ %patch1087 -p0 %patch1088 -p1 %patch1089 -p1 +%if %{with parentpathid} +%patch1090 -p0 +%patch1091 -p0 +%endif # remove patch backups find -name '*.orig' -exec rm -f '{}' \+ diff --git a/systemd.changes b/systemd.changes index 1b48b77..971b869 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Mon Nov 3 14:23:02 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch + 0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch + +------------------------------------------------------------------- +Mon Nov 3 14:17:48 UTC 2014 - werner@suse.de + +- Add upstream patches + 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch + 1091-udev-path_id-update-comments.patch + which will be applied if patch + 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch + is applied a this may fix the trouble with iSCSI (bnc#898233) + ------------------------------------------------------------------- Thu Oct 30 10:45:01 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 1f60d3c..b48e002 100644 --- a/systemd.spec +++ b/systemd.spec @@ -24,6 +24,7 @@ %bcond_without compat_libs %bcond_with networkd %bcond_with python +%bcond_with parentpathid %ifarch %{ix86} x86_64 aarch64 %define has_efi 1 %else @@ -995,6 +996,10 @@ Patch485: 0010-shutdown-do-final-unmounting-only-if-not-running-ins.patch Patch486: 0011-selinux-make-sure-we-do-not-try-to-print-missing-fie.patch # PATCH-FIX-UPSTREAM added at 2014/10/28 Patch487: 0012-manager-do-not-print-anything-while-passwords-are-be.patch +# PATCH-FIX-UPSTREAM added at 2014/10/31 +Patch488: 0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch +# PATCH-FIX-UPSTREAM added at 2014/10/31 +Patch489: 0002-keymap-Ignore-brightness-keys-on-Dell-Inspiron-1520-.patch # UDEV PATCHES # ============ @@ -1127,7 +1132,7 @@ Patch1061: 1061-rules-allow-systemd-to-manage-loop-device-partitions.patch # PATCH-FIX-SUSE 1062-rules-set-default-permissions-for-GenWQE-devices.patch (bnc#890977) Patch1062: 1062-rules-set-default-permissions-for-GenWQE-devices.patch # PATCH-FIX-UPSTREAM 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch -#Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch +Patch1063: 1063-udev-path_id-suppress-ID_PATH-for-devices-with-an-un.patch # PATCH-FIX-UPSTREAM 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch Patch1064: 1064-udev-hwdb-do-not-look-at-usb_device-parents.patch # PATCH-FIX-UPSTREAM 1065-udev-bump-event-timeout-to-60-seconds.patch @@ -1180,6 +1185,10 @@ Patch1087: 1087-infinit-timeout-for-kmod-loaded-modules.patch Patch1088: 1088-drop-renaming-of-virtual-interfaces-in-guest.patch # PATCH-FIX-UPSTREAM 1089-fix-cgroup-device-controller.patch Patch1089: 1089-fix-cgroup-device-controller.patch +# PATCH-FIX-UPSTREAM 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch +Patch1090: 1090-udev-path_id-set-supported_parent-for-well-known-SCS.patch +# PATCH-FIX-UPSTREAM 1091-udev-path_id-update-comments.patch +Patch1091: 1091-udev-path_id-update-comments.patch %description Systemd is a system and service manager, compatible with SysV and LSB @@ -1827,6 +1836,8 @@ cp %{SOURCE7} m4/ %patch485 -p0 %patch486 -p0 %patch487 -p0 +%patch488 -p0 +%patch489 -p0 # udev patches %patch1001 -p1 @@ -1912,6 +1923,9 @@ cp %{SOURCE7} m4/ %patch1060 -p1 %patch1061 -p0 %patch1062 -p1 +%if %{with parentpathid} +%patch1063 -p0 +%endif %patch1064 -p0 %patch1065 -p0 %patch1066 -p1 @@ -1946,6 +1960,10 @@ cp %{SOURCE7} m4/ %patch1087 -p0 %patch1088 -p1 %patch1089 -p1 +%if %{with parentpathid} +%patch1090 -p0 +%patch1091 -p0 +%endif # remove patch backups find -name '*.orig' -exec rm -f '{}' \+