From c4e6b8f50aae5f80d07a85bf5db2c58def32c31d Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Jan 14 2009 04:25:04 +0000 Subject: build for F-10 to enable testing of dracut (not pushing to updates) --- diff --git a/plymouth-0.6.0-dont-crash-on-null-free.patch b/plymouth-0.6.0-dont-crash-on-null-free.patch deleted file mode 100644 index a204936..0000000 --- a/plymouth-0.6.0-dont-crash-on-null-free.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up plymouth-0.6.0/src/libplybootsplash/ply-image.c.dont-crash-on-null-free plymouth-0.6.0/src/libplybootsplash/ply-image.c ---- plymouth-0.6.0/src/libplybootsplash/ply-image.c.dont-crash-on-null-free 2008-11-14 22:09:39.000000000 -0500 -+++ plymouth-0.6.0/src/libplybootsplash/ply-image.c 2008-11-14 22:09:58.000000000 -0500 -@@ -115,7 +115,9 @@ ply_image_new (const char *filename) - void - ply_image_free (ply_image_t *image) - { -- assert (image != NULL); -+ if (image == NULL) -+ return; -+ - assert (image->filename != NULL); - - if (image->layout.address != NULL) diff --git a/plymouth-0.6.0-drop-nash.patch b/plymouth-0.6.0-drop-nash.patch new file mode 100644 index 0000000..5b35f52 --- /dev/null +++ b/plymouth-0.6.0-drop-nash.patch @@ -0,0 +1,52 @@ +============================================================ + Create pseudo-terminal if one isn't passed in + + This may help us drop the nash depedency for +pty handling. + +diff --git a/src/libply/ply-terminal-session.c b/src/libply/ply-terminal-session.c +--- a/src/libply/ply-terminal-session.c ++++ b/src/libply/ply-terminal-session.c +@@ -309,12 +309,24 @@ ply_terminal_session_attach (ply_terminal_session_t *session, + assert (session->loop != NULL); + assert (!session->is_running); + assert (session->done_handler == NULL); +- assert (ptmx >= 0); + + should_redirect_console = + (flags & PLY_TERMINAL_SESSION_FLAGS_REDIRECT_CONSOLE) != 0; + +- ply_terminal_set_fd(session->terminal, ptmx); ++ if (ptmx >= 0) ++ { ++ ply_trace ("ptmx passed in, using it"); ++ ply_terminal_set_fd(session->terminal, ptmx); ++ } ++ else ++ { ++ ply_trace ("ptmx not passed in, creating one"); ++ if (!ply_terminal_create_device (session->terminal)) ++ { ++ ply_trace ("could not create pseudo-terminal: %m"); ++ return false; ++ } ++ } + + if (should_redirect_console) + ply_trace ("redirecting system console to terminal device"); +diff --git a/src/main.c b/src/main.c +--- a/src/main.c ++++ b/src/main.c +@@ -838,12 +838,6 @@ main (int argc, + } + } + +- if ((attach_to_session && argc != 3) || (attach_to_session && state.ptmx == -1)) +- { +- ply_error ("%s [--attach-to-session ]", argv[0]); +- return EX_USAGE; +- } +- + if (geteuid () != 0) + { + ply_error ("plymouthd must be run as root user"); diff --git a/plymouth.spec b/plymouth.spec index d2d0f43..99b0c49 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -2,10 +2,10 @@ %define plymouthclient_execdir /bin %define plymouth_libdir /%{_lib} -Summary: Plymouth Graphical Boot Animation and Logger +Summary: Graphical Boot Animation and Logger Name: plymouth Version: 0.6.0 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: System Environment/Base Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2 @@ -20,6 +20,8 @@ Requires: initscripts >= 8.83-1 Obsoletes: plymouth-text-and-details-only < %{version}-%{release} +Patch0: plymouth-0.6.0-drop-nash.patch + %description Plymouth provides an attractive graphical boot animation in place of the text messages that normally get shown. Text @@ -149,6 +151,7 @@ Plymouth. It features a blue flamed sun with animated solar flares. %prep %setup -q +%patch0 -p1 -b .drop-nash %build %configure --enable-tracing --disable-tests --without-boot-entry \ @@ -178,7 +181,6 @@ mkdir -p $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_datadir}/plymouth/default-boot-duration cp $RPM_SOURCE_DIR/boot-duration $RPM_BUILD_ROOT%{_localstatedir}/lib/plymouth - %clean rm -rf $RPM_BUILD_ROOT @@ -312,8 +314,14 @@ fi %defattr(-, root, root) %changelog -* Thu Dec 11 2008 Ray Strode 0.6.0-1 -- Upgrade to 0.6.0 (to fix bug 475878) +* Wed Dec 17 2008 Ray Strode 0.6.0-2 +- Add patch from drop-nash branch for jeremy + +* Wed Dec 3 2008 Ray Strode 0.6.0-1 +- Update to 0.6.0 + +* Sat Nov 22 2008 Matthias Clasen 0.6.0-0.2008.11.17.3.1 +- Strip %%name from %%summary * Mon Nov 17 2008 Ray Strode 0.6.0-0.2008.11.17.3 - don't give error about missing default.so @@ -327,9 +335,6 @@ fi * Mon Nov 17 2008 Ray Strode 0.6.0-0.2008.11.17.1 - Crawl progress bar if boot is way off course (Charlie, bug 471089) -* Fri Nov 14 2008 Ray Strode 0.6.0-0.2008.11.14.3 -- Allow NULL to ply_image_free - * Fri Nov 14 2008 Ray Strode 0.6.0-0.2008.11.14.2 - Don't loop forever when tty returns NUL byte (bug 471498) @@ -369,16 +374,21 @@ fi - make boot-duration config(noreplace) * Mon Nov 10 2008 Ray Strode 0.6.0-0.2008.11.10.3 +- Don't abort if no splash when root is mounted - Actually move patches upstream -* Mon Nov 10 2008 Ray Strode 0.6.0-0.2008.11.10.2 -- Don't abort if no splash when root gets mounted - * Mon Nov 10 2008 Ray Strode 0.6.0-0.2008.11.10.1 - Fix feedback loop with plymouth:debug - Move patches upstream - Improve comet animation +* Sun Nov 9 2008 Ray Strode 0.6.0-0.2008.11.06.4 +- Fix up more-debug patch to not assert with plymouth:nolog + (bug 470569) + +* Fri Nov 7 2008 Ray Strode 0.6.0-0.2008.11.06.3 +- add some more debug spew to help debug a problem jlaska is having + * Thu Nov 6 2008 Ray Strode 0.6.0-0.2008.11.06.2 - show details plugin on --hide-splash so people can see why the splash got hidden.