forked from rpms/plymouth
- Update to snapshot to get new plymouth-populate-initrd features
- Make removing rhgb use details plugin instead of exiting
This commit is contained in:
Ray Strode
parent
e76500a78e
commit
7967b4f23b
@ -1,47 +0,0 @@
|
||||
commit d8086a93a37e1e76c7b544a13faef13683c79b62
|
||||
Author: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed Jul 9 21:31:20 2008 -0400
|
||||
|
||||
Compute libdir using yet a different heuristic
|
||||
|
||||
The previous one falls over for ia64
|
||||
|
||||
diff --git a/scripts/plymouth-populate-initrd.in b/scripts/plymouth-populate-initrd.in
|
||||
index 033ca06..e4ccded 100755
|
||||
--- a/scripts/plymouth-populate-initrd.in
|
||||
+++ b/scripts/plymouth-populate-initrd.in
|
||||
@@ -7,7 +7,7 @@ set -e
|
||||
[ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
|
||||
[ -z "$DATADIR" ] && DATADIR="/usr/share"
|
||||
[ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
|
||||
-[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib"
|
||||
+[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
|
||||
[ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
|
||||
[ -z "$BINDIR" ] && BINDIR="/usr/bin"
|
||||
[ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
|
||||
diff --git a/scripts/plymouth-set-default-plugin b/scripts/plymouth-set-default-plugin
|
||||
index a2ac8fd..3edee7a 100755
|
||||
--- a/scripts/plymouth-set-default-plugin
|
||||
+++ b/scripts/plymouth-set-default-plugin
|
||||
@@ -4,7 +4,7 @@ set -e
|
||||
|
||||
[ -z "$LIBEXECDIR" ] && LIBEXECDIR="/usr/libexec"
|
||||
[ -z "$DATADIR" ] && DATADIR="/usr/share"
|
||||
-[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib"
|
||||
+[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
|
||||
[ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
|
||||
[ -z "$BINDIR" ] && BINDIR="/usr/bin"
|
||||
|
||||
diff --git a/scripts/plymouth-update-initrd.in b/scripts/plymouth-update-initrd.in
|
||||
index 2d37bcf..b8bc8f8 100755
|
||||
--- a/scripts/plymouth-update-initrd.in
|
||||
+++ b/scripts/plymouth-update-initrd.in
|
||||
@@ -8,7 +8,7 @@ set -e
|
||||
[ -z "$DATADIR" ] && DATADIR="/usr/share"
|
||||
[ -z "$INITRD" ] && INITRD="/boot/initrd-$(/sbin/grubby --default-kernel | sed 's/.*vmlinuz-//g').img"
|
||||
[ -z "$SYSTEMMAP" ] && SYSTEM_MAP="/boot/System.map-$(/bin/uname -r)"
|
||||
-[ -z "$LIB" ] && $(eu-readelf -h /usr/bin/plymouth | grep Class | grep -q ELF64) && LIB="lib64" || LIB="lib"
|
||||
+[ -z "$LIB" ] && $(echo nash-showelfinterp /usr/bin/plymouth | /sbin/nash --forcequiet | grep -q lib64) && LIB="lib64" || LIB="lib"
|
||||
[ -z "$LIBDIR" ] && LIBDIR="/usr/$LIB"
|
||||
[ -z "$BINDIR" ] && BINDIR="/usr/bin"
|
||||
[ -z "$GRUB_MENU_TITLE" ] && GRUB_MENU_TITLE="Graphical Bootup"
|
||||
@ -1,11 +0,0 @@
|
||||
diff -up plymouth-0.5.0/scripts/plymouth-populate-initrd.in.fix-ppc plymouth-0.5.0/scripts/plymouth-populate-initrd.in
|
||||
--- plymouth-0.5.0/scripts/plymouth-populate-initrd.in.fix-ppc 2008-07-08 13:51:02.000000000 -0400
|
||||
+++ plymouth-0.5.0/scripts/plymouth-populate-initrd.in 2008-07-08 13:51:19.000000000 -0400
|
||||
@@ -89,6 +89,7 @@ EOF
|
||||
for bin in $BINS ; do
|
||||
DEPS=$(get_dso_deps $bin)
|
||||
for dep in $DEPS; do
|
||||
+ mkdir -p ${INITRDDIR}$(dirname $dep)
|
||||
install -D -m755 $dep ${INITRDDIR}$(dirname $dep)
|
||||
done
|
||||
done
|
||||
@ -1,7 +1,7 @@
|
||||
Summary: Plymouth Graphical Boot Animation and Logger
|
||||
Name: plymouth
|
||||
Version: 0.5.0
|
||||
Release: 6%{?dist}
|
||||
Release: 8.2008.07.31%{?dist}
|
||||
License: GPLv2+
|
||||
Group: System Environment/Base
|
||||
Source0: http://freedesktop.org/software/plymouth/releases/%{name}-%{version}.tar.bz2
|
||||
@ -70,10 +70,6 @@ spins in the shape of an infinity sign.
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch0 -p1 -b .fix-ppc
|
||||
%patch1 -p1 -b .restore-color-palette
|
||||
%patch2 -p1 -b .find-right-libdir
|
||||
|
||||
%build
|
||||
%configure --enable-tracing --disable-tests --without-boot-entry \
|
||||
--without-default-plugin \
|
||||
@ -178,7 +174,11 @@ fi
|
||||
%{_libdir}/plymouth/spinfinity.so
|
||||
|
||||
%changelog
|
||||
* Thu Jul 31 2008 Peter Jones <pjones@redhat.com>
|
||||
* Thu Jul 31 2008 Ray Strode <rstrode@redhat.com> - 0.5.0-8.2008.07.31
|
||||
- Update to snapshot to get new plymouth-populate-initrd features
|
||||
- Make removing rhgb use details plugin instead of exiting
|
||||
|
||||
* Thu Jul 31 2008 Peter Jones <pjones@redhat.com> - 0.5.0-7
|
||||
- Make it a mkinitrd requires instead of a nash requires (that will
|
||||
still pull in nash, but we need mkinitrd for newer plymouth-populate-initrd)
|
||||
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
commit d10b3eb6da0521dc1bb0a2a1d62f619a2460d73c
|
||||
Author: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed Jul 9 17:36:44 2008 -0400
|
||||
|
||||
Add debugging feature to restore text palette
|
||||
|
||||
diff --git a/src/libplybootsplash/ply-window.c b/src/libplybootsplash/ply-window.c
|
||||
index 90f9cc6..d718203 100644
|
||||
--- a/src/libplybootsplash/ply-window.c
|
||||
+++ b/src/libplybootsplash/ply-window.c
|
||||
@@ -45,6 +45,7 @@
|
||||
#include "ply-logger.h"
|
||||
#include "ply-utils.h"
|
||||
|
||||
+#define KEY_CTRL_P ('\100' ^'P')
|
||||
#define KEY_CTRL_T ('\100' ^'T')
|
||||
#define KEY_CTRL_U ('\100' ^'U')
|
||||
#define KEY_CTRL_W ('\100' ^'W')
|
||||
@@ -143,6 +144,40 @@ ply_window_new (int vt_number)
|
||||
return window;
|
||||
}
|
||||
|
||||
+static bool
|
||||
+ply_window_look_up_color_palette (ply_window_t *window)
|
||||
+{
|
||||
+ if (ioctl (window->tty_fd, GIO_CMAP, window->color_palette) < 0)
|
||||
+ return false;
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+static bool
|
||||
+ply_window_change_color_palette (ply_window_t *window)
|
||||
+{
|
||||
+ if (ioctl (window->tty_fd, PIO_CMAP, window->color_palette) < 0)
|
||||
+ return false;
|
||||
+
|
||||
+ return true;
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+ply_window_save_color_palette (ply_window_t *window)
|
||||
+{
|
||||
+ memcpy (window->original_color_palette, window->color_palette,
|
||||
+ TEXT_PALETTE_SIZE);
|
||||
+}
|
||||
+
|
||||
+static void
|
||||
+ply_window_restore_color_palette (ply_window_t *window)
|
||||
+{
|
||||
+ memcpy (window->color_palette, window->original_color_palette,
|
||||
+ TEXT_PALETTE_SIZE);
|
||||
+
|
||||
+ ply_window_change_color_palette (window);
|
||||
+}
|
||||
+
|
||||
static void
|
||||
process_backspace (ply_window_t *window)
|
||||
{
|
||||
@@ -188,6 +223,12 @@ process_keyboard_input (ply_window_t *window,
|
||||
{
|
||||
switch (key)
|
||||
{
|
||||
+
|
||||
+ case KEY_CTRL_P:
|
||||
+ ply_trace ("restore text palette to original value!");
|
||||
+ ply_window_restore_color_palette (window);
|
||||
+ return;
|
||||
+
|
||||
case KEY_CTRL_T:
|
||||
ply_trace ("toggle text mode!");
|
||||
window->should_force_text_mode = !window->should_force_text_mode;
|
||||
@@ -362,40 +403,6 @@ ply_window_look_up_geometry (ply_window_t *window)
|
||||
return true;
|
||||
}
|
||||
|
||||
-static bool
|
||||
-ply_window_look_up_color_palette (ply_window_t *window)
|
||||
-{
|
||||
- if (ioctl (window->tty_fd, GIO_CMAP, window->color_palette) < 0)
|
||||
- return false;
|
||||
-
|
||||
- return true;
|
||||
-}
|
||||
-
|
||||
-static bool
|
||||
-ply_window_change_color_palette (ply_window_t *window)
|
||||
-{
|
||||
- if (ioctl (window->tty_fd, PIO_CMAP, window->color_palette) < 0)
|
||||
- return false;
|
||||
-
|
||||
- return true;
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-ply_window_save_color_palette (ply_window_t *window)
|
||||
-{
|
||||
- memcpy (window->original_color_palette, window->color_palette,
|
||||
- TEXT_PALETTE_SIZE);
|
||||
-}
|
||||
-
|
||||
-static void
|
||||
-ply_window_restore_color_palette (ply_window_t *window)
|
||||
-{
|
||||
- memcpy (window->color_palette, window->original_color_palette,
|
||||
- TEXT_PALETTE_SIZE);
|
||||
-
|
||||
- ply_window_change_color_palette (window);
|
||||
-}
|
||||
-
|
||||
bool
|
||||
ply_window_open (ply_window_t *window)
|
||||
{
|
||||
Loading…
Reference in New Issue
Block a user