pool/plymouth
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 238922 from home:fcrozat:branches:Base:System

Browse Source 
- 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
This commit is contained in:
Stephan Kulow 2014-06-28 05:08:31 +00:00 committed by Git OBS Bridge
parent b250e6e261
commit 1f8478f91f
3 changed files with 36 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0001-libply-splash-core-also-monitor-for-file-removal-in-.patch Normal file
View File

@ -0,0 +1,26 @@
From 920009efa99204de172332486de5ccff6a3332d5 Mon Sep 17 00:00:00 2001
From: Frederic Crozat <fcrozat@suse.com>
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

6
plymouth.changes
View File

@ -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 Fri Jun 20 14:03:36 UTC 2014 - fcrozat@suse.com
- Add - Add

5
plymouth.spec
View File

@ -50,8 +50,10 @@ Patch20: use-mkinitrd.patch
Patch21: 0001-seats-guard-against-NULL-terminal.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 # 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 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 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: automake
BuildRequires: docbook-xsl-stylesheets BuildRequires: docbook-xsl-stylesheets
BuildRequires: kernel-headers BuildRequires: kernel-headers
@ -343,6 +345,7 @@ plugin.
%patch21 -p1 %patch21 -p1
%patch22 -p1 %patch22 -p1
%patch23 -p1 %patch23 -p1
%patch24 -p1
# replace builddate with patch0date # replace builddate with patch0date
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c