Hello community,
here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2012-03-26 12:18:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/plymouth (Old)
and /work/SRC/openSUSE:Factory/.plymouth.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth", Maintainer is ""
Changes:
--------
--- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2012-03-06 14:06:25.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.plymouth.new/plymouth.changes 2012-03-26 12:18:15.000000000 +0200
@@ -1,0 +2,12 @@
+Sun Mar 25 09:03:44 UTC 2012 - tittiatcoke@gmail.com
+
+- Update to the official release of 0.8.4
+ * Bugfix: Use /dev/fb0 instead of /dev/fb, this resolves the
+ issue of not showing the splash during shutdown
+
+-------------------------------------------------------------------
+Fri Mar 9 12:11:44 UTC 2012 - tittiatcoke@gmail.com
+
+- Add a small change in order to have plymouth activated with Grub2
+
+-------------------------------------------------------------------
Old:
----
plymouth-0.8.3_git201110131555.tar.bz2
New:
----
plymouth-0.8.4.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ plymouth.spec ++++++
--- /var/tmp/diff_new_pack.gomijB/_old 2012-03-26 12:18:16.000000000 +0200
+++ /var/tmp/diff_new_pack.gomijB/_new 2012-03-26 12:18:16.000000000 +0200
@@ -11,7 +11,7 @@
# case the license is the MIT License). An "Open Source License" is a
# license that conforms to the Open Source Definition (Version 1.9)
# published by the Open Source Initiative.
-#
+
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
@@ -21,16 +21,17 @@
%define plymouth_libdir %{_libdir}
%define plymouth_initrd_file /boot/initrd-plymouth.img
-%define tarversion 0.8.3
+%define tarversion 0.8.4
%define patchversion 201110131555
Name: plymouth
-Version: %{tarversion}_git%{patchversion}
+#Version: %{tarversion}_git%{patchversion}
+Version: 0.8.4
Release: 0
-License: GPL-2.0+
Summary: Graphical Boot Animation and Logger
-Url: http://freedesktop.org/software/plymouth/releases
+License: GPL-2.0+
Group: System/Base
+Url: http://freedesktop.org/software/plymouth/releases
Source0: %{name}-%{version}.tar.bz2
Source1: boot-duration
Source2: opensuse-logo.png
@@ -49,7 +50,7 @@
BuildRequires: pkgconfig(libdrm_nouveau)
BuildRequires: pkgconfig(libdrm_radeon)
BuildRequires: pkgconfig(libkms)
-Requires: %{name}-branding = %{version}
+Requires: %{name}-branding
Requires: suspend >= 0.80.20100129.1
Requires: systemd-plymouth
Provides: bootsplash = %{version}
@@ -159,10 +160,10 @@
%package plugin-throbgress
Summary: Plymouth "Throbgress" plugin
Group: System/Base
+Requires: %{name}-plugin-label = %{version}
Requires: libply-splash-core2 = %{version}
Requires: libply-splash-graphics2 = %{version}
Requires: libply2 = %{version}
-Requires: %{name}-plugin-label = %{version}
%description plugin-throbgress
This package contains the "throbgress" boot splash plugin for
@@ -173,10 +174,10 @@
%package plugin-space-flares
Summary: Plymouth "space-flares" plugin
Group: System/Base
+Requires: %{name}-plugin-label = %{version}
Requires: libply-splash-core2 = %{version}
Requires: libply-splash-graphics2 = %{version}
Requires: libply2 = %{version}
-Requires: %{name}-plugin-label = %{version}
%description plugin-space-flares
This package contains the "space-flares" boot splash plugin for
@@ -343,7 +344,20 @@
%post
[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
-
+if [ $1 -eq 1 ]; then
+ if [ -f %{_sysconfdir}/default/grub ]; then
+ sed -i 's|splash=silent|splash|g' %{_sysconfdir}/default/grub
+ fi
+fi
+
+%postun
+if [ $1 -eq 0 ]; then
+ rm -f %{_libdir}/plymouth/default.so
+ rm -f /boot/initrd-plymouth.img
+ if [ -f %{_sysconfdir}/default/grub ]; then
+ sed -i 's|splash|splash=silent|g' %{_sysconfdir}/default/grub
+ fi
+fi
%post scripts -p /sbin/mkinitrd_setup
%postun scripts -p /sbin/mkinitrd_setup
++++++ plymouth-0.8.3_git201110131555.tar.bz2 -> plymouth-0.8.4.tar.bz2 ++++++
++++ 66432 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/.gitignore new/plymouth-0.8.4/.gitignore
--- old/plymouth-0.8.3_git201110131555/.gitignore 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1,41 +0,0 @@
-Makefile.in
-*.o
-core.*
-.libs/*
-.deps/*
-.libs
-.deps
-*.lo
-.*.sw*
-*.orig
-*.rej
-*~
-configure
-config.h*
-*-test
-*.la
-.gitignore
-config.log
-build-tools
-config.status
-libtool
-autom4te.cache
-Makefile
-aclocal.m4
-*.tar.bz2
-*.patch
-stamp-*
-*.rpm
-plymouth
-plymouth-generate-initrd
-plymouth-populate-initrd
-plymouth-set-default-theme
-plymouth-log-viewer
-plymouth-upstart-bridge
-plymouthd
-*.pc
-tags
-*.bck
-*.string
-*.plymouth
-*.script.h
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/autogen.sh new/plymouth-0.8.4/autogen.sh
--- old/plymouth-0.8.3_git201110131555/autogen.sh 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/autogen.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-cd $(dirname $0)
-autoreconf --install --symlink
-if test -z "$NOCONFIGURE"; then
- exec ./configure $@
-fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/build-tools/compile new/plymouth-0.8.4/build-tools/compile
--- old/plymouth-0.8.3_git201110131555/build-tools/compile 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.4/build-tools/compile 2012-02-03 12:02:58.000000000 +0100
@@ -0,0 +1,310 @@
+#! /bin/sh
+# Wrapper for compilers which do not understand '-c -o'.
+
+scriptversion=2012-01-04.17; # UTC
+
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
+# Written by Tom Tromey .
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# This file is maintained in Automake, please report
+# bugs to or send patches to
+# .
+
+nl='
+'
+
+# We need space, tab and new line, in precisely that order. Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" "" $nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+ file=$1
+ case $file in
+ / | /[!/]*) # absolute file, and not a UNC file
+ if test -z "$file_conv"; then
+ # lazily determine how to convert abs files
+ case `uname -s` in
+ MINGW*)
+ file_conv=mingw
+ ;;
+ CYGWIN*)
+ file_conv=cygwin
+ ;;
+ *)
+ file_conv=wine
+ ;;
+ esac
+ fi
+ case $file_conv/,$2, in
+ *,$file_conv,*)
+ ;;
+ mingw/*)
+ file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+ ;;
+ cygwin/*)
+ file=`cygpath -m "$file" || echo "$file"`
+ ;;
+ wine/*)
+ file=`winepath -w "$file" || echo "$file"`
+ ;;
+ esac
+ ;;
+ esac
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+ # Assume a capable shell
+ lib_path=
+ shared=:
+ linker_opts=
+ for arg
+ do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ eat=1
+ case $2 in
+ *.o | *.[oO][bB][jJ])
+ func_file_conv "$2"
+ set x "$@" -Fo"$file"
+ shift
+ ;;
+ *)
+ func_file_conv "$2"
+ set x "$@" -Fe"$file"
+ shift
+ ;;
+ esac
+ ;;
+ -I*)
+ func_file_conv "${1#-I}" mingw
+ set x "$@" -I"$file"
+ shift
+ ;;
+ -l*)
+ lib=${1#-l}
+ found=no
+ save_IFS=$IFS
+ IFS=';'
+ for dir in $lib_path $LIB
+ do
+ IFS=$save_IFS
+ if $shared && test -f "$dir/$lib.dll.lib"; then
+ found=yes
+ set x "$@" "$dir/$lib.dll.lib"
+ break
+ fi
+ if test -f "$dir/$lib.lib"; then
+ found=yes
+ set x "$@" "$dir/$lib.lib"
+ break
+ fi
+ done
+ IFS=$save_IFS
+
+ test "$found" != yes && set x "$@" "$lib.lib"
+ shift
+ ;;
+ -L*)
+ func_file_conv "${1#-L}"
+ if test -z "$lib_path"; then
+ lib_path=$file
+ else
+ lib_path="$lib_path;$file"
+ fi
+ linker_opts="$linker_opts -LIBPATH:$file"
+ ;;
+ -static)
+ shared=false
+ ;;
+ -Wl,*)
+ arg=${1#-Wl,}
+ save_ifs="$IFS"; IFS=','
+ for flag in $arg; do
+ IFS="$save_ifs"
+ linker_opts="$linker_opts $flag"
+ done
+ IFS="$save_ifs"
+ ;;
+ -Xlinker)
+ eat=1
+ linker_opts="$linker_opts $2"
+ ;;
+ -*)
+ set x "$@" "$1"
+ shift
+ ;;
+ *.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+ func_file_conv "$1"
+ set x "$@" -Tp"$file"
+ shift
+ ;;
+ *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+ func_file_conv "$1" mingw
+ set x "$@" "$file"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+ done
+ if test -n "$linker_opts"; then
+ linker_opts="-link$linker_opts"
+ fi
+ exec "$@" $linker_opts
+ exit 1
+}
+
+eat=
+
+case $1 in
+ '')
+ echo "$0: No command. Try '$0 --help' for more information." 1>&2
+ exit 1;
+ ;;
+ -h | --h*)
+ cat <<\EOF
+Usage: compile [--help] [--version] PROGRAM [ARGS]
+
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
+arguments, and rename the output as expected.
+
+If you are trying to build a whole package this is not the
+right script to run: please start by reading the file 'INSTALL'.
+
+Report bugs to .
+EOF
+ exit $?
+ ;;
+ -v | --v*)
+ echo "compile $scriptversion"
+ exit $?
+ ;;
+ cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+ func_cl_wrapper "$@" # Doesn't return...
+ ;;
+esac
+
+ofile=
+cfile=
+
+for arg
+do
+ if test -n "$eat"; then
+ eat=
+ else
+ case $1 in
+ -o)
+ # configure might choose to run compile as 'compile cc -o foo foo.c'.
+ # So we strip '-o arg' only if arg is an object.
+ eat=1
+ case $2 in
+ *.o | *.obj)
+ ofile=$2
+ ;;
+ *)
+ set x "$@" -o "$2"
+ shift
+ ;;
+ esac
+ ;;
+ *.c)
+ cfile=$1
+ set x "$@" "$1"
+ shift
+ ;;
+ *)
+ set x "$@" "$1"
+ shift
+ ;;
+ esac
+ fi
+ shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+ # If no '-o' option was seen then we might have been invoked from a
+ # pattern rule where we don't need one. That is ok -- this is a
+ # normal compilation that the losing compiler can handle. If no
+ # '.c' file was seen then we are probably linking. That is also
+ # ok.
+ exec "$@"
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
+# that we are using for the .o file. Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
+while true; do
+ if mkdir "$lockdir" >/dev/null 2>&1; then
+ break
+ fi
+ sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir '$lockdir'; exit 1" 1 2 15
+
+# Run the compile.
+"$@"
+ret=$?
+
+if test -f "$cofile"; then
+ test "$cofile" = "$ofile" || mv "$cofile" "$ofile"
+elif test -f "${cofile}bj"; then
+ test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile"
+fi
+
+rmdir "$lockdir"
+exit $ret
+
+# Local Variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/build-tools/missing new/plymouth-0.8.4/build-tools/missing
--- old/plymouth-0.8.3_git201110131555/build-tools/missing 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.4/build-tools/missing 2012-02-03 12:02:58.000000000 +0100
@@ -0,0 +1,331 @@
+#! /bin/sh
+# Common stub for a few missing GNU programs while installing.
+
+scriptversion=2012-01-06.13; # UTC
+
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard , 1996.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see http://www.gnu.org/licenses/.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+if test $# -eq 0; then
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+fi
+
+run=:
+sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
+sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+ configure_ac=configure.ac
+else
+ configure_ac=configure.in
+fi
+
+msg="missing on your system"
+
+case $1 in
+--run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+ shift
+ "$@" && exit 0
+ # Exit code 63 means version mismatch. This often happens
+ # when the user try to use an ancient version of a tool on
+ # a file that requires a minimum version. In this case we
+ # we should proceed has if the program had been absent, or
+ # if --run hadn't been passed.
+ if test $? = 63; then
+ run=:
+ msg="probably too old"
+ fi
+ ;;
+
+ -h|--h|--he|--hel|--help)
+ echo "\
+$0 [OPTION]... PROGRAM [ARGUMENT]...
+
+Handle \`PROGRAM [ARGUMENT]...' for when PROGRAM is missing, or return an
+error status if there is no known handling for PROGRAM.
+
+Options:
+ -h, --help display this help and exit
+ -v, --version output version information and exit
+ --run try to run the given command, and emulate it if it fails
+
+Supported PROGRAM values:
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
+ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+ help2man touch the output file
+ lex create \`lex.yy.c', if possible, from existing .c
+ makeinfo touch the output file
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
+\`g' are ignored when checking the name.
+
+Send bug reports to ."
+ exit $?
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+ echo "missing $scriptversion (GNU Automake)"
+ exit $?
+ ;;
+
+ -*)
+ echo 1>&2 "$0: Unknown \`$1' option"
+ echo 1>&2 "Try \`$0 --help' for more information"
+ exit 1
+ ;;
+
+esac
+
+# normalize program name to check for.
+program=`echo "$1" | sed '
+ s/^gnu-//; t
+ s/^gnu//; t
+ s/^g//; t'`
+
+# Now exit if we have it, but it failed. Also exit now if we
+# don't have it and --version was passed (most likely to detect
+# the program). This is about non-GNU programs, so use $1 not
+# $program.
+case $1 in
+ lex*|yacc*)
+ # Not GNU programs, they don't have --version.
+ ;;
+
+ *)
+ if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+ # We have it, but it failed.
+ exit 1
+ elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
+ # Could not run --version or --help. This is probably someone
+ # running `$TOOL --version' or `$TOOL --help' to check whether
+ # $TOOL exists and not knowing $TOOL uses missing.
+ exit 1
+ fi
+ ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
+case $program in
+ aclocal*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acinclude.m4' or \`${configure_ac}'. You might want
+ to install the \`Automake' and \`Perl' packages. Grab them from
+ any GNU archive site."
+ touch aclocal.m4
+ ;;
+
+ autoconf*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`${configure_ac}'. You might want to install the
+ \`Autoconf' and \`GNU m4' packages. Grab them from any GNU
+ archive site."
+ touch configure
+ ;;
+
+ autoheader*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`acconfig.h' or \`${configure_ac}'. You might want
+ to install the \`Autoconf' and \`GNU m4' packages. Grab them
+ from any GNU archive site."
+ files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+ esac
+ done
+ touch $touch_files
+ ;;
+
+ automake*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
+ You might want to install the \`Automake' and \`Perl' packages.
+ Grab them from any GNU archive site."
+ find . -type f -name Makefile.am -print |
+ sed 's/\.am$/.in/' |
+ while read f; do touch "$f"; done
+ ;;
+
+ autom4te*)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, but is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them.
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo "#! /bin/sh"
+ echo "# Created by GNU Automake missing as a replacement of"
+ echo "# $ $@"
+ echo "exit 0"
+ chmod +x $file
+ exit 1
+ fi
+ ;;
+
+ bison*|yacc*)
+ echo 1>&2 "\
+WARNING: \`$1' $msg. You should only need it if
+ you modified a \`.y' file. You may need the \`Bison' package
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+ if test $# -ne 1; then
+ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+
+ lex*|flex*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.l' file. You may need the \`Flex' package
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+ if test $# -ne 1; then
+ eval LASTARG=\${$#}
+ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+
+ help2man*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a dependency of a manual page. You may need the
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+ echo ".ab help2man is required to generate this page"
+ exit $?
+ fi
+ ;;
+
+ makeinfo*)
+ echo 1>&2 "\
+WARNING: \`$1' is $msg. You should only need it if
+ you modified a \`.texi' or \`.texinfo' file, or any other file
+ indirectly affecting the aspect of the manual. The spurious
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+ # The file to touch is that specified with -o ...
+ file=`echo "$*" | sed -n "$sed_output"`
+ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+ # ... or it is the one specified with @setfilename ...
+ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+ file=`sed -n '
+ /^@setfilename/{
+ s/.* \([^ ]*\) *$/\1/
+ p
+ q
+ }' $infile`
+ # ... or it is derived from the source name (dir/f.texi becomes f.info)
+ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
+ fi
+ # If the file does not exist, the user really needs makeinfo;
+ # let's fail without touching anything.
+ test -f $file || exit 1
+ touch $file
+ ;;
+
+ *)
+ echo 1>&2 "\
+WARNING: \`$1' is needed, and is $msg.
+ You might have modified some files without having the
+ proper tools for further handling them. Check the \`README' file,
+ it often tells you about the needed prerequisites for installing
+ this package. You may also peek at any GNU archive site, in case
+ some other package would contain this missing \`$1' program."
+ exit 1
+ ;;
+esac
+
+exit 0
+
+# Local variables:
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-time-zone: "UTC"
+# time-stamp-end: "; # UTC"
+# End:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/config.h.in new/plymouth-0.8.4/config.h.in
--- old/plymouth-0.8.3_git201110131555/config.h.in 1970-01-01 01:00:00.000000000 +0100
+++ new/plymouth-0.8.4/config.h.in 2012-03-20 01:56:11.000000000 +0100
@@ -0,0 +1,139 @@
+/* config.h.in. Generated from configure.ac by autoheader. */
+
+/* TTY to use in boot mode */
+#undef BOOT_TTY
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_DLFCN_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_INTTYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_MEMORY_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_NCURSESW_TERM_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_NCURSES_TERM_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDINT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STDLIB_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRINGS_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_STRING_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_STAT_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_SYS_TYPES_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_TERM_H
+
+/* Define to 1 if you have the header file. */
+#undef HAVE_UNISTD_H
+
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
+/* Define to 1 if your C compiler doesn't accept -c and -o together. */
+#undef NO_MINUS_C_MINUS_O
+
+/* Name of package */
+#undef PACKAGE
+
+/* Define to the address where bug reports for this package should be sent. */
+#undef PACKAGE_BUGREPORT
+
+/* Define to the full name of this package. */
+#undef PACKAGE_NAME
+
+/* Define to the full name and version of this package. */
+#undef PACKAGE_STRING
+
+/* Define to the one symbol short name of this package. */
+#undef PACKAGE_TARNAME
+
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
+/* Define to the version of this package. */
+#undef PACKAGE_VERSION
+
+/* Enable smooth transition to GDM */
+#undef PLY_ENABLE_GDM_TRANSITION
+
+/* Enable support for libdrm_intel driver */
+#undef PLY_ENABLE_LIBDRM_INTEL
+
+/* Enable support for libdrm_nouveau driver */
+#undef PLY_ENABLE_LIBDRM_NOUVEAU
+
+/* Enable support for libdrm_radeon driver */
+#undef PLY_ENABLE_LIBDRM_RADEON
+
+/* Enable support for libkms abstraction over drm drivers */
+#undef PLY_ENABLE_LIBKMS
+
+/* Coordinate boot up with systemd */
+#undef PLY_ENABLE_SYSTEMD_INTEGRATION
+
+/* Build in verbose debug tracing spew */
+#undef PLY_ENABLE_TRACING
+
+/* Release file path */
+#undef RELEASE_FILE
+
+/* TTY to use in shutdown mode */
+#undef SHUTDOWN_TTY
+
+/* Define to 1 if you have the ANSI C header files. */
+#undef STDC_HEADERS
+
+/* Enable extensions on AIX 3, Interix. */
+#ifndef _ALL_SOURCE
+# undef _ALL_SOURCE
+#endif
+/* Enable GNU extensions on systems that have them. */
+#ifndef _GNU_SOURCE
+# undef _GNU_SOURCE
+#endif
+/* Enable threading extensions on Solaris. */
+#ifndef _POSIX_PTHREAD_SEMANTICS
+# undef _POSIX_PTHREAD_SEMANTICS
+#endif
+/* Enable extensions on HP NonStop. */
+#ifndef _TANDEM_SOURCE
+# undef _TANDEM_SOURCE
+#endif
+/* Enable general extensions on Solaris. */
+#ifndef __EXTENSIONS__
+# undef __EXTENSIONS__
+#endif
+
+
+/* Version number of package */
+#undef VERSION
+
+/* Define to 1 if on MINIX. */
+#undef _MINIX
+
+/* Define to 2 if the system does not provide POSIX.1 features except with
+ this defined. */
+#undef _POSIX_1_SOURCE
+
+/* Define to 1 if you need to in order for `stat' and other things to work. */
+#undef _POSIX_SOURCE
+
+/* Define to empty if `const' does not conform to ANSI C. */
+#undef const
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/scripts/plymouth-populate-initrd.in new/plymouth-0.8.4/scripts/plymouth-populate-initrd.in
--- old/plymouth-0.8.3_git201110131555/scripts/plymouth-populate-initrd.in 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/scripts/plymouth-populate-initrd.in 2012-02-23 16:04:11.000000000 +0100
@@ -18,7 +18,9 @@
PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_LIBEXECDIR}/initrd-functions"
fi
- if [ -f "${PLYMOUTH_DATADIR}/dracut/dracut-functions" ]; then
+ if [ -f "${PLYMOUTH_DATADIR}/dracut/dracut-functions.sh" ]; then
+ PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_DATADIR}/dracut/dracut-functions.sh"
+ elif [ -f "${PLYMOUTH_DATADIR}/dracut/dracut-functions" ]; then
PLYMOUTH_POPULATE_SOURCE_FUNCTIONS="${PLYMOUTH_DATADIR}/dracut/dracut-functions"
fi
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/scripts/plymouth.spec new/plymouth-0.8.4/scripts/plymouth.spec
--- old/plymouth-0.8.3_git201110131555/scripts/plymouth.spec 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/scripts/plymouth.spec 1970-01-01 01:00:00.000000000 +0100
@@ -1,160 +0,0 @@
-Summary: Plymouth Graphical Boot Animation and Logger
-Name: plymouth
-Version: 0.2.0
-Release: 0%{?dist}
-License: GPLv2+
-Group: System Environment/Base
-Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
-URL: http://freedesktop.org/software/plymouth/releases
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-%description
-Plymouth provides an attractive graphical boot animation in
-place of the text messages that normally get shown. Text
-messages are instead redirected to a log file for viewing
-after boot.
-
-%package libs
-Summary: Plymouth libraries
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description libs
-This package contains the libply and libply-splash-core libraries
-used by Plymouth.
-
-%package devel
-Summary: Libraries and headers for writing Plymouth splash plugins
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release}
-Requires: pkgconfig
-
-%description devel
-This package contains the libply and libply-splash-core libraries
-and headers needed to develop 3rd party splash plugins for Plymouth.
-
-%package plugin-fade-in
-Summary: Plymouth "Fade-In" plugin
-Group: System Environment/Base
-Requires: %name = %{version}-%{release}
-BuildRequires: libpng-devel
-Provides: plymouth-plugin
-
-%description plugin-fade-in
-This package contains the "Fade-In" boot splash plugin for
-Plymouth. It features a centered logo that fades in and out
-while stars twinkle around the logo during system boot up.
-
-%package plugin-spinfinity
-Summary: Plymouth "Spinfinity" plugin
-Group: System Environment/Base
-Requires: %name = %{version}-%{release}
-BuildRequires: libpng-devel
-Provides: plymouth-plugin
-
-%description plugin-spinfinity
-This package contains the "Spinfinity" boot splash plugin for
-Plymouth. It features a centered logo and animated spinner that
-spins in the shape of an infinity sign.
-
-%prep
-%setup -q
-
-%build
-%configure --enable-tracing --disable-tests --without-boot-entry --without-default-plugin
-
-make
-
-%install
-rm -rf $RPM_BUILD_ROOT
-
-make install DESTDIR=$RPM_BUILD_ROOT
-
-find $RPM_BUILD_ROOT -name '*.a' -exec rm -f {} \;
-find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} \;
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-%postun
-echo plymouth postun "$@"
-if [ $1 -eq 0 ]; then
- rm %{_libdir}/plymouth/default.so
-fi
-
-%post libs -p /sbin/ldconfig
-%postun libs -p /sbin/ldconfig
-
-%post plugin-spinfinity
-echo plymouth-spinfinity post "$@"
-if [ $1 -eq 1 ]; then
- %{_sbindir}/plymouth-set-default-plugin spinfinity
-fi
-
-%postun plugin-spinfinity
-echo plymouth-spinfinity postun "$@"
-if [ $1 -eq 0 ]; then
- if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "spinfinity" ]; then
- %{_sbindir}/plymouth-set-default-plugin --reset
- fi
-fi
-
-%post plugin-fade-in
-echo plymouth-fade-in post "$@"
-if [ $1 -eq 1 ]; then
- %{_sbindir}/plymouth-set-default-plugin fade-in
-fi
-
-%postun plugin-fade-in
-echo plymouth-fade-in postun "$@"
-if [ $1 -eq 0 ]; then
- if [ "$(%{_sbindir}/plymouth-set-default-plugin)" == "fade-in" ]; then
- %{_sbindir}/plymouth-set-default-plugin --reset
- fi
-fi
-
-%files
-%defattr(-, root, root)
-%doc AUTHORS NEWS README
-%dir %{_datadir}/plymouth
-%{_libexecdir}/plymouth/plymouthd
-%{_libexecdir}/plymouth/plymouth-update-initrd
-%{_libexecdir}/plymouth/plymouth-populate-initrd
-%{_sbindir}/plymouth-set-default-plugin
-%{_bindir}/plymouth
-%{_bindir}/rhgb-client
-%{_libdir}/plymouth/details.so
-%{_libdir}/plymouth/text.so
-%{_datadir}/plymouth/bizcom.png
-%{_localstatedir}/run/plymouth
-
-%files devel
-%defattr(-, root, root)
-%{_libdir}/libply.so
-%{_libdir}/libply-splash-core.so
-%{_libdir}/pkgconfig/plymouth-1.pc
-%{_includedir}/plymouth-1
-
-%files libs
-%defattr(-, root, root)
-%{_libdir}/libply.so.*
-%{_libdir}/libply-splash-core.so.*
-
-%files plugin-fade-in
-%defattr(-, root, root)
-%dir %{_datadir}/plymouth/fade-in
-%{_datadir}/plymouth/fade-in/bullet.png
-%{_datadir}/plymouth/fade-in/entry.png
-%{_datadir}/plymouth/fade-in/lock.png
-%{_datadir}/plymouth/fade-in/star.png
-%{_libdir}/plymouth/fade-in.so
-
-%files plugin-spinfinity
-%defattr(-, root, root)
-%dir %{_datadir}/plymouth/spinfinity
-%{_datadir}/plymouth/spinfinity/box.png
-%{_datadir}/plymouth/spinfinity/bullet.png
-%{_datadir}/plymouth/spinfinity/entry.png
-%{_datadir}/plymouth/spinfinity/lock.png
-%{_datadir}/plymouth/spinfinity/throbber-[0-3][0-9].png
-%{_libdir}/plymouth/spinfinity.so
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/src/client/ply-boot-client.pc.in new/plymouth-0.8.4/src/client/ply-boot-client.pc.in
--- old/plymouth-0.8.3_git201110131555/src/client/ply-boot-client.pc.in 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/src/client/ply-boot-client.pc.in 2012-03-21 15:35:37.000000000 +0100
@@ -6,5 +6,5 @@
Name: Plymouth
Description: Client Library for Boot Splash
Version: @VERSION@
-Libs: -L${libdir} -lply -lply-boot-client
+Libs: -L${libdir} -lply-boot-client -lply -ldl
Cflags: -I${includedir}/plymouth-1/ply -I${includedir}/plymouth-1/ply-boot-client
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/src/client/tests/ply-boot-client-test.am new/plymouth-0.8.4/src/client/tests/ply-boot-client-test.am
--- old/plymouth-0.8.3_git201110131555/src/client/tests/ply-boot-client-test.am 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/src/client/tests/ply-boot-client-test.am 1970-01-01 01:00:00.000000000 +0100
@@ -1,16 +0,0 @@
-TESTS += ply-boot-client-test
-
-ply_boot_client_test_CFLAGS = $(PLYMOUTH_CFLAGS) -DPLY_BOOT_CLIENT_ENABLE_TEST
-ply_boot_client_test_LDADD = $(PLYMOUTH_LIBS)
-
-ply_boot_client_test_SOURCES = \
- $(srcdir)/../ply-utils.h \
- $(srcdir)/../ply-utils.c \
- $(srcdir)/../ply-logger.h \
- $(srcdir)/../ply-logger.c \
- $(srcdir)/../ply-list.h \
- $(srcdir)/../ply-list.c \
- $(srcdir)/../ply-event-loop.h \
- $(srcdir)/../ply-event-loop.c \
- $(srcdir)/../ply-boot-client.h \
- $(srcdir)/../ply-boot-client.c
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/src/libply/Makefile.am new/plymouth-0.8.4/src/libply/Makefile.am
--- old/plymouth-0.8.3_git201110131555/src/libply/Makefile.am 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/src/libply/Makefile.am 2012-03-21 15:35:30.000000000 +0100
@@ -4,7 +4,7 @@
-DPLYMOUTH_TIME_DIRECTORY=\"$(localstatedir)/lib/plymouth/\"
if WITH_SYSTEM_ROOT_INSTALL
-librarydir = $(libdir:/usr%=%)
+librarydir = $(subst /usr/lib,/lib,$(libdir))
else
librarydir = $(libdir)
endif
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/src/libply/ply-utils.h new/plymouth-0.8.4/src/libply/ply-utils.h
--- old/plymouth-0.8.3_git201110131555/src/libply/ply-utils.h 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/src/libply/ply-utils.h 2012-03-21 15:35:05.000000000 +0100
@@ -25,6 +25,7 @@
#include
#include
#include
+#include
#ifndef MIN
#define MIN(a,b) ((a) <= (b)? (a) : (b))
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/src/main.c new/plymouth-0.8.4/src/main.c
--- old/plymouth-0.8.3_git201110131555/src/main.c 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/src/main.c 2012-03-21 15:37:03.000000000 +0100
@@ -755,6 +755,12 @@
return true;
}
+ if (command_line_has_argument (state->kernel_command_line, "splash=silent"))
+ {
+ ply_trace ("using default splash because kernel command line has option \"splash=slient\"");
+ return true;
+ }
+
ply_trace ("no default splash because kernel command line lacks \"splash\" or \"rhgb\"");
return false;
}
@@ -1797,6 +1803,12 @@
if (stream != NULL)
{
+ char *end;
+
+ stream = strdup (stream);
+ end = stream + strcspn (stream, " \n");
+ *end = '\0';
+
ply_trace ("streaming debug output to %s instead of screen", stream);
fd = open (stream, O_RDWR | O_NOCTTY | O_CREAT, 0600);
@@ -1808,6 +1820,7 @@
{
ply_logger_set_output_fd (ply_logger_get_error_default (), fd);
}
+ free (stream);
}
}
else
@@ -1859,24 +1872,77 @@
add_display_and_keyboard_for_terminal (state, terminal);
}
+static bool
+add_consoles_from_file (state_t *state,
+ ply_hashtable_t *consoles,
+ const char *path)
+{
+ int fd;
+ char contents[512] = "";
+ const char *remaining_command_line;
+ char *console;
+
+ ply_trace ("opening %s", path);
+ fd = open (path, O_RDONLY);
+
+ if (fd < 0)
+ {
+ ply_trace ("couldn't open it: %m");
+ return false;
+ }
+
+ ply_trace ("reading file");
+ if (read (fd, contents, sizeof (contents)))
+ {
+ ply_trace ("couldn't read it: %m");
+ close (fd);
+ return false;
+ }
+ close (fd);
+
+ remaining_command_line = contents;
+
+ console = NULL;
+ while (remaining_command_line != '\0')
+ {
+ char *end;
+ size_t console_length;
+ char *console_device;
+
+ state->should_force_details = true;
+
+ console = strdup (remaining_command_line);
+
+ end = strpbrk (console, " \n\t\v");
+
+ if (end != NULL)
+ *end = '\0';
+
+ console_length = strlen (console);
+
+ asprintf (&console_device, "/dev/%s", console);
+ free (console);
+ console = NULL;
+
+ ply_trace ("console %s found!", console_device);
+ ply_hashtable_insert (consoles, console_device, console_device);
+ remaining_command_line += console_length;
+ }
+
+ return true;
+}
+
static void
-check_for_consoles (state_t *state,
- const char *default_tty,
- bool should_add_displays)
+add_consoles_from_kernel_command_line (state_t *state,
+ ply_hashtable_t *consoles)
{
const char *console_string;
const char *remaining_command_line;
char *console;
- ply_hashtable_t *consoles;
-
- ply_trace ("checking for consoles%s",
- should_add_displays? " and adding displays": "");
remaining_command_line = state->kernel_command_line;
console = NULL;
- consoles = ply_hashtable_new (ply_hashtable_string_hash,
- ply_hashtable_string_compare);
while ((console_string = command_line_get_string_after_prefix (remaining_command_line,
"console=")) != NULL)
{
@@ -1897,13 +1963,6 @@
console_length = strlen (console);
- if (strcmp (console, "tty0") == 0 || strcmp (console, "/dev/tty0") == 0 ||
- strcmp (console, "tty") == 0 || strcmp (console, "/dev/tty") == 0)
- {
- free (console);
- console = strdup (default_tty);
- }
-
if (strncmp (console, "/dev/", strlen ("/dev/")) == 0)
{
console_device = console;
@@ -1917,9 +1976,46 @@
}
ply_trace ("console %s found!", console_device);
- ply_hashtable_insert (consoles, console_device, NULL);
+ ply_hashtable_insert (consoles, console_device, console_device);
remaining_command_line += console_length;
}
+}
+
+static void
+check_for_consoles (state_t *state,
+ const char *default_tty,
+ bool should_add_displays)
+{
+ char *console;
+ ply_hashtable_t *consoles;
+
+ ply_trace ("checking for consoles%s",
+ should_add_displays? " and adding displays": "");
+
+ consoles = ply_hashtable_new (ply_hashtable_string_hash,
+ ply_hashtable_string_compare);
+
+ if (!add_consoles_from_file (state,
+ consoles,
+ "/sys/class/tty/console/active"))
+ {
+ ply_trace ("falling back to kernel command line");
+ add_consoles_from_kernel_command_line (state, consoles);
+ }
+
+ console = ply_hashtable_remove (consoles, (void *) "/dev/tty0");
+ if (console != NULL)
+ {
+ free (console);
+ ply_hashtable_insert (consoles, (void *) default_tty, (char *) default_tty);
+ }
+
+ console = ply_hashtable_remove (consoles, (void *) "/dev/tty");
+ if (console != NULL)
+ {
+ free (console);
+ ply_hashtable_insert (consoles, (void *) default_tty, (void *) default_tty);
+ }
free (state->kernel_console_tty);
state->kernel_console_tty = NULL;
@@ -2255,11 +2351,6 @@
signal (SIGABRT, on_crash);
signal (SIGSEGV, on_crash);
- /* If we're shutting down we don't want to die until killed
- */
- if (state.mode == PLY_MODE_SHUTDOWN)
- signal (SIGTERM, SIG_IGN);
-
/* before do anything we need to make sure we have a working
* environment.
*/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/src/plugins/renderers/frame-buffer/plugin.c new/plymouth-0.8.4/src/plugins/renderers/frame-buffer/plugin.c
--- old/plymouth-0.8.3_git201110131555/src/plugins/renderers/frame-buffer/plugin.c 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/src/plugins/renderers/frame-buffer/plugin.c 2012-03-17 07:38:52.000000000 +0100
@@ -56,7 +56,7 @@
#include "ply-renderer-plugin.h"
#ifndef PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME
-#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb"
+#define PLY_FRAME_BUFFER_DEFAULT_FB_DEVICE_NAME "/dev/fb0"
#endif
struct _ply_renderer_head
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/src/ply-splash-core.pc.in new/plymouth-0.8.4/src/ply-splash-core.pc.in
--- old/plymouth-0.8.3_git201110131555/src/ply-splash-core.pc.in 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/src/ply-splash-core.pc.in 2012-03-21 15:35:37.000000000 +0100
@@ -10,5 +10,5 @@
Name: Plymouth
Description: Utility Library for Boot Splash Plugins
Version: @VERSION@
-Libs: -L${libdir} -lply -lply-splash-core
+Libs: -L${libdir} -lply-splash-core -lply -ldl
Cflags: -I${includedir}/plymouth-1/ply -I${includedir}/plymouth-1/ply-splash-core
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/src/ply-splash-graphics.pc.in new/plymouth-0.8.4/src/ply-splash-graphics.pc.in
--- old/plymouth-0.8.3_git201110131555/src/ply-splash-graphics.pc.in 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/src/ply-splash-graphics.pc.in 2012-03-17 07:37:31.000000000 +0100
@@ -9,5 +9,5 @@
Description: Graphics Utility Library for Boot Splash Plugins
Version: @VERSION@
Requires: ply-splash-core
-Libs: -L${libdir}
+Libs: -L${libdir} -lply-splash-graphics
Cflags: -I${includedir}/plymouth-1/ply-splash-graphics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/themes/details/.gitignore new/plymouth-0.8.4/themes/details/.gitignore
--- old/plymouth-0.8.3_git201110131555/themes/details/.gitignore 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/themes/details/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-! details.plymouth
Files old/plymouth-0.8.3_git201110131555/themes/spinner/progress-00.png and new/plymouth-0.8.4/themes/spinner/progress-00.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/plymouth-0.8.3_git201110131555/themes/text/.gitignore new/plymouth-0.8.4/themes/text/.gitignore
--- old/plymouth-0.8.3_git201110131555/themes/text/.gitignore 2011-10-13 17:55:43.000000000 +0200
+++ new/plymouth-0.8.4/themes/text/.gitignore 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-! text.plymouth
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org