Accepting request 129223 from home:jengelh:branches:Base:System
- Ship /etc/os-release in the initrd so that the pretty name is displayed in text-splash mode - Give the text-splash some SUSE-typical green coloring OBS-URL: https://build.opensuse.org/request/show/129223 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=72
This commit is contained in:
Raymond Wooninck
Git OBS Bridge
parent
ce7e791909
commit
15ac6b59a5
33
0001-Some-greenish-openSUSE-colors.patch
Normal file
33
0001-Some-greenish-openSUSE-colors.patch
Normal file
@ -0,0 +1,33 @@
|
||||
From 9e69959ad2d7624936832421dfb0cd1fee47fefc Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Sun, 29 Jul 2012 20:38:50 +0200
|
||||
Subject: [PATCH] Some greenish openSUSE colors
|
||||
|
||||
---
|
||||
src/plugins/splash/text/plugin.c | 6 +++---
|
||||
1 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/plugins/splash/text/plugin.c b/src/plugins/splash/text/plugin.c
|
||||
index 50059be..d9235c5 100644
|
||||
--- a/src/plugins/splash/text/plugin.c
|
||||
+++ b/src/plugins/splash/text/plugin.c
|
||||
@@ -180,13 +180,13 @@ view_start_animation (view_t *view)
|
||||
0x000000);
|
||||
ply_terminal_set_color_hex_value (terminal,
|
||||
PLY_TERMINAL_COLOR_WHITE,
|
||||
- 0xffffff);
|
||||
+ 0x40ff00);
|
||||
ply_terminal_set_color_hex_value (terminal,
|
||||
PLY_TERMINAL_COLOR_BLUE,
|
||||
- 0x0073B3);
|
||||
+ 0x20a000);
|
||||
ply_terminal_set_color_hex_value (terminal,
|
||||
PLY_TERMINAL_COLOR_BROWN,
|
||||
- 0x00457E);
|
||||
+ 0x106000);
|
||||
|
||||
ply_text_display_set_background_color (view->display,
|
||||
PLY_TERMINAL_COLOR_BLACK);
|
||||
--
|
||||
1.7.7
|
||||
|
||||
29
0001-ply-text-progress-bar-strip-quotes-if-present.patch
Normal file
29
0001-ply-text-progress-bar-strip-quotes-if-present.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From fe7008c13b38898d78ff4ecf897fea127982fd9b Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
Date: Sun, 29 Jul 2012 20:25:21 +0200
|
||||
Subject: [PATCH] ply-text-progress-bar: strip quotes if present
|
||||
|
||||
The syntax for sysconfig-style files allows for quotes.
|
||||
---
|
||||
src/libply-splash-core/ply-text-progress-bar.c | 5 +++++
|
||||
1 files changed, 5 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/src/libply-splash-core/ply-text-progress-bar.c b/src/libply-splash-core/ply-text-progress-bar.c
|
||||
index 0f4d74e..0b29690 100644
|
||||
--- a/src/libply-splash-core/ply-text-progress-bar.c
|
||||
+++ b/src/libply-splash-core/ply-text-progress-bar.c
|
||||
@@ -137,6 +137,11 @@ get_os_string (void)
|
||||
if (pos2 != NULL)
|
||||
*pos2 = '\0';
|
||||
|
||||
+ if ((*pos == '\"' && pos2[-1] == '\"') ||
|
||||
+ (*pos == '\'' && pos2[-1] == '\'')) {
|
||||
+ ++pos;
|
||||
+ *--pos2 = '\0';
|
||||
+ }
|
||||
asprintf (&os_string, " %s", pos);
|
||||
}
|
||||
goto out;
|
||||
--
|
||||
1.7.7
|
||||
|
||||
@ -1,3 +1,10 @@
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 29 18:44:18 UTC 2012 - jengelh@inai.de
|
||||
|
||||
- Ship /etc/os-release in the initrd so that the pretty name is
|
||||
displayed in text-splash mode
|
||||
- Give the text-splash some SUSE-typical green coloring
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Jul 29 18:07:39 UTC 2012 - dmueller@suse.com
|
||||
|
||||
|
||||
@ -47,6 +47,9 @@ Patch6: plymouth-systemd-target.patch
|
||||
Patch7: plymouth-udevadm-path.patch
|
||||
# PATCH-OPENSUSE -- Remove tag not understood by systemd v44
|
||||
Patch8: systemd-no-warning.patch
|
||||
# PATCH-FIX-UPSTREAM -- Recognize quotes often used in sysconfig-style files
|
||||
Patch9: 0001-ply-text-progress-bar-strip-quotes-if-present.patch
|
||||
Patch10: 0001-Some-greenish-openSUSE-colors.patch
|
||||
BuildRequires: automake
|
||||
BuildRequires: kernel-headers
|
||||
BuildRequires: libtool
|
||||
@ -305,6 +308,7 @@ plugin.
|
||||
%patch6 -p1
|
||||
%patch7 -p1
|
||||
%patch8 -p1
|
||||
%patch -P 9 -P 10 -p1
|
||||
|
||||
# replace builddate with patch0date
|
||||
sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c
|
||||
@ -326,7 +330,8 @@ autoreconf -fiv
|
||||
--without-rhgb-compat-link \
|
||||
--with-boot-tty=/dev/tty7 \
|
||||
--with-shutdown-tty=/dev/tty1 \
|
||||
--without-gdm-autostart-file
|
||||
--without-gdm-autostart-file \
|
||||
--with-release-file=/etc/os-release
|
||||
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -359,9 +364,6 @@ mkdir -p %{buildroot}/lib/mkinitrd/scripts
|
||||
install -t %{buildroot}/lib/mkinitrd/scripts \
|
||||
scripts/{setup,boot}-plymouth*.sh
|
||||
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
%post
|
||||
if [ ! -e /.buildenv ]; then
|
||||
[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration
|
||||
|
||||
@ -83,7 +83,7 @@ Index: plymouth-0.8.4/scripts/setup-plymouth.sh.in
|
||||
+ /usr/share/plymouth/plymouthd.defaults \
|
||||
+ /usr/share/plymouth/themes/${THEME}/* \
|
||||
+ /etc/plymouth/plymouthd.conf \
|
||||
+ /usr/share/fonts/uni/unifont.pcf.gz \
|
||||
+ /usr/share/fonts/uni/unifont.pcf.gz /etc/os-release \
|
||||
+ /etc/fonts/fonts.conf \
|
||||
+ /etc/fonts/conf.d/69-unifont.conf \
|
||||
+ /etc/fonts/conf.avail/69-unifont.conf "
|
||||
|
||||
Loading…
Reference in New Issue
Block a user