From 1f8478f91ffe10bb2ff05c3e62ef60e2c816b746390e0bee37459edbe976a213 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Sat, 28 Jun 2014 05:08:31 +0000 Subject: [PATCH] Accepting request 238922 from home:fcrozat:branches:Base:System - Add 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch: handle new udev behaviour in seqnum removal. OBS-URL: https://build.opensuse.org/request/show/238922 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=148 --- ...re-also-monitor-for-file-removal-in-.patch | 26 +++++++++++++++++++ plymouth.changes | 6 +++++ plymouth.spec | 5 +++- 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch diff --git a/0001-libply-splash-core-also-monitor-for-file-removal-in-.patch b/0001-libply-splash-core-also-monitor-for-file-removal-in-.patch new file mode 100644 index 0000000..dc9aed3 --- /dev/null +++ b/0001-libply-splash-core-also-monitor-for-file-removal-in-.patch @@ -0,0 +1,26 @@ +From 920009efa99204de172332486de5ccff6a3332d5 Mon Sep 17 00:00:00 2001 +From: Frederic Crozat +Date: Thu, 19 Jun 2014 17:58:50 +0200 +Subject: [PATCH] libply-splash-core: also monitor for file removal in udev + directory + +--- + src/libply-splash-core/ply-device-manager.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libply-splash-core/ply-device-manager.c b/src/libply-splash-core/ply-device-manager.c +index aa4d15c..06d751c 100644 +--- a/src/libply-splash-core/ply-device-manager.c ++++ b/src/libply-splash-core/ply-device-manager.c +@@ -761,7 +761,7 @@ watch_for_coldplug_completion (ply_device_manager_t *manager) + } + + fd = inotify_init1 (IN_CLOEXEC); +- result = inotify_add_watch (fd, "/run/udev", IN_MOVED_TO); ++ result = inotify_add_watch (fd, "/run/udev", IN_MOVED_TO | IN_DELETE); + + if (result < 0) + { +-- +1.8.4.5 + diff --git a/plymouth.changes b/plymouth.changes index 73e5ef2..7847c62 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Jun 27 11:27:02 UTC 2014 - fcrozat@suse.com + +- Add + 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch: + handle new udev behaviour in seqnum removal. +------------------------------------------------------------------- Fri Jun 20 14:03:36 UTC 2014 - fcrozat@suse.com - Add diff --git a/plymouth.spec b/plymouth.spec index 8ee2621..a93cd1d 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -50,8 +50,10 @@ Patch20: use-mkinitrd.patch Patch21: 0001-seats-guard-against-NULL-terminal.patch # PATCH-FIX-UPSTREAM 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch fcrozat@suse.com -- prevent crash if pixel display is removed Patch22: 0001-splash-remove-pixel_pixel-in-sprite-lib-when-notifie.patch -# Patch-FIX-UPSTREAM 0001-splash-do-not-process-display-lists-if-it-is-empty.patch +# PATCH-FIX-UPSTREAM 0001-splash-do-not-process-display-lists-if-it-is-empty.patch fcrozat@suse.com -- do no crash when removing displays Patch23: 0001-splash-do-not-process-display-lists-if-it-is-empty.patch +# PATCH-FIX-UPSTREAM 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch fcrozat@suse.com -- handle recent udev +Patch24: 0001-libply-splash-core-also-monitor-for-file-removal-in-.patch BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: kernel-headers @@ -343,6 +345,7 @@ plugin. %patch21 -p1 %patch22 -p1 %patch23 -p1 +%patch24 -p1 # replace builddate with patch0date sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c