From 06461bb1cafe57cf4abe816bc706fe0f39fe8fe73af641ac234055b4e1aa622d Mon Sep 17 00:00:00 2001 From: "Dr. Werner Fink" Date: Wed, 27 Aug 2014 16:02:11 +0000 Subject: [PATCH] . OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=759 --- ...t-error-message-printed-when-bus_pro.patch | 28 ++++++++++++++++++ ...emd-fsck-.service-after-local-fs-pre.patch | 29 +++++++++++++++++++ ...Adjust-for-more-Samsung-900X4-series.patch | 29 +++++++++++++++++++ systemd-mini.changes | 8 +++++ systemd-mini.spec | 9 ++++++ systemd.changes | 8 +++++ systemd.spec | 9 ++++++ 7 files changed, 120 insertions(+) create mode 100644 0001-systemctl-Correct-error-message-printed-when-bus_pro.patch create mode 100644 0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch create mode 100644 0003-keymap-Adjust-for-more-Samsung-900X4-series.patch diff --git a/0001-systemctl-Correct-error-message-printed-when-bus_pro.patch b/0001-systemctl-Correct-error-message-printed-when-bus_pro.patch new file mode 100644 index 00000000..917c8ec2 --- /dev/null +++ b/0001-systemctl-Correct-error-message-printed-when-bus_pro.patch @@ -0,0 +1,28 @@ +From 498cfc230af8f83675be2e92057956f1792969e4 Mon Sep 17 00:00:00 2001 +From: Sjoerd Simons +Date: Sat, 23 Aug 2014 21:11:44 +0200 +Subject: [PATCH] systemctl: Correct error message printed when + bus_process_wait fails + +Actually use the variable containing the return code of bus_process_wait when +printing the error message as a result of it failing. +--- + src/systemctl/systemctl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git src/systemctl/systemctl.c src/systemctl/systemctl.c +index d9b8bee..6534819 100644 +--- src/systemctl/systemctl.c ++++ src/systemctl/systemctl.c +@@ -2382,7 +2382,7 @@ static int wait_for_jobs(sd_bus *bus, Set *s) { + while (!set_isempty(s)) { + q = bus_process_wait(bus); + if (q < 0) { +- log_error("Failed to wait for response: %s", strerror(-r)); ++ log_error("Failed to wait for response: %s", strerror(-q)); + return q; + } + +-- +1.7.9.2 + diff --git a/0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch b/0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch new file mode 100644 index 00000000..6bc06d23 --- /dev/null +++ b/0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch @@ -0,0 +1,29 @@ +From 66f311206e908a5b6f21e66fad73e1e5ea3e31d6 Mon Sep 17 00:00:00 2001 +From: Ivan Shapovalov +Date: Wed, 27 Aug 2014 00:17:43 +0400 +Subject: [PATCH] units: order systemd-fsck@.service after + local-fs-pre.target. + +With this change, it becomes possible to order a unit to activate before any +modifications to the file systems. This is especially useful for supporting +resume from hibernation. +--- + units/systemd-fsck@.service.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git units/systemd-fsck@.service.in units/systemd-fsck@.service.in +index c12efa8..d2cda6a 100644 +--- units/systemd-fsck@.service.in ++++ units/systemd-fsck@.service.in +@@ -10,7 +10,7 @@ Description=File System Check on %f + Documentation=man:systemd-fsck@.service(8) + DefaultDependencies=no + BindsTo=%i.device +-After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service ++After=systemd-readahead-collect.service systemd-readahead-replay.service %i.device systemd-fsck-root.service local-fs-pre.target + Before=shutdown.target + + [Service] +-- +1.7.9.2 + diff --git a/0003-keymap-Adjust-for-more-Samsung-900X4-series.patch b/0003-keymap-Adjust-for-more-Samsung-900X4-series.patch new file mode 100644 index 00000000..c9ab5e0e --- /dev/null +++ b/0003-keymap-Adjust-for-more-Samsung-900X4-series.patch @@ -0,0 +1,29 @@ +From e512e8a255ef29d5a8eb605f8849202ea3d3e4cb Mon Sep 17 00:00:00 2001 +From: Martin Pitt +Date: Wed, 27 Aug 2014 08:41:10 +0200 +Subject: [PATCH] keymap: Adjust for more Samsung 900X4 series + +Reportedly also applies to NP900X4B, so relax the match to apply to all models +of this series. + +https://launchpad.net/bugs/902332 +--- + hwdb/60-keyboard.hwdb | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git hwdb/60-keyboard.hwdb hwdb/60-keyboard.hwdb +index ef0ebc5..0ffcb83 100644 +--- hwdb/60-keyboard.hwdb ++++ hwdb/60-keyboard.hwdb +@@ -939,7 +939,7 @@ keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*550P*:pvr* + # Series 7 / 9 + keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700Z*:pvr* + keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*700G*:pvr* +-keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900X[34][CDEFG]*:pvr* ++keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*900X[34]*:pvr* + keyboard:dmi:bvn*:bvr*:bd*:svn[sS][aA][mM][sS][uU][nN][gG]*:pn*940X3G*:pvr* + KEYBOARD_KEY_ce=!prog1 # Fn+F1 launch settings + KEYBOARD_KEY_a0=!mute # Fn+F6 mute +-- +1.7.9.2 + diff --git a/systemd-mini.changes b/systemd-mini.changes index a3cbb03a..67c5a638 100644 --- a/systemd-mini.changes +++ b/systemd-mini.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 27 16:01:17 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-systemctl-Correct-error-message-printed-when-bus_pro.patch + 0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch + 0003-keymap-Adjust-for-more-Samsung-900X4-series.patch + ------------------------------------------------------------------- Wed Aug 27 12:52:09 UTC 2014 - werner@suse.de diff --git a/systemd-mini.spec b/systemd-mini.spec index 6fc89cf0..0756d9b5 100644 --- a/systemd-mini.spec +++ b/systemd-mini.spec @@ -800,6 +800,12 @@ Patch384: 0004-hwdb-update-format-description-and-document-reloadin.patch Patch385: 0008-hwdb-update.patch # PATCH-FIX-SUSE Use RNDADDENTROPY ioctl to load random-seed and to increase entropy count as well (bnc#892096) Patch386: use-rndaddentropy-ioctl-to-load-random-seed.patch +# PATCH-FIX-UPSTREAM added at 2014/08/27 +Patch387: 0001-systemctl-Correct-error-message-printed-when-bus_pro.patch +# PATCH-FIX-UPSTREAM added at 2014/08/27 +Patch388: 0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch +# PATCH-FIX-UPSTREAM added at 2014/08/27 +Patch389: 0003-keymap-Adjust-for-more-Samsung-900X4-series.patch # UDEV PATCHES # ============ @@ -1478,6 +1484,9 @@ cp %{SOURCE7} m4/ %patch384 -p0 %patch385 -p0 %patch386 -p1 +%patch387 -p0 +%patch388 -p0 +%patch389 -p0 # udev patches %patch1001 -p1 diff --git a/systemd.changes b/systemd.changes index a3cbb03a..67c5a638 100644 --- a/systemd.changes +++ b/systemd.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Aug 27 16:01:17 UTC 2014 - werner@suse.de + +- Add upstream patches + 0001-systemctl-Correct-error-message-printed-when-bus_pro.patch + 0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch + 0003-keymap-Adjust-for-more-Samsung-900X4-series.patch + ------------------------------------------------------------------- Wed Aug 27 12:52:09 UTC 2014 - werner@suse.de diff --git a/systemd.spec b/systemd.spec index 33b8dbe9..85908fc4 100644 --- a/systemd.spec +++ b/systemd.spec @@ -795,6 +795,12 @@ Patch384: 0004-hwdb-update-format-description-and-document-reloadin.patch Patch385: 0008-hwdb-update.patch # PATCH-FIX-SUSE Use RNDADDENTROPY ioctl to load random-seed and to increase entropy count as well (bnc#892096) Patch386: use-rndaddentropy-ioctl-to-load-random-seed.patch +# PATCH-FIX-UPSTREAM added at 2014/08/27 +Patch387: 0001-systemctl-Correct-error-message-printed-when-bus_pro.patch +# PATCH-FIX-UPSTREAM added at 2014/08/27 +Patch388: 0002-units-order-systemd-fsck-.service-after-local-fs-pre.patch +# PATCH-FIX-UPSTREAM added at 2014/08/27 +Patch389: 0003-keymap-Adjust-for-more-Samsung-900X4-series.patch # UDEV PATCHES # ============ @@ -1473,6 +1479,9 @@ cp %{SOURCE7} m4/ %patch384 -p0 %patch385 -p0 %patch386 -p1 +%patch387 -p0 +%patch388 -p0 +%patch389 -p0 # udev patches %patch1001 -p1