From 8b7cdfada0b061e0927243736ea63359a1e5854d917ec78c587fa70fa6ae942c Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 27 Jul 2012 13:08:57 +0000 Subject: [PATCH 1/3] Accepting request 129091 from home:tittiatcoke:branches:Base:System the openSUSE theme has now moved to the correct openSUSE-branding package. OBS-URL: https://build.opensuse.org/request/show/129091 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=70 --- branding-suse.tar.xz | 3 -- opensuse-logo.png | 3 -- plymouth.changes | 5 ++++ plymouth.spec | 69 ++------------------------------------------ suse-initrd-support | 3 +- 5 files changed, 9 insertions(+), 74 deletions(-) delete mode 100644 branding-suse.tar.xz delete mode 100644 opensuse-logo.png diff --git a/branding-suse.tar.xz b/branding-suse.tar.xz deleted file mode 100644 index 4fa6e15..0000000 --- a/branding-suse.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:96f6ec0461fdd9eae2a3845e97a07aa35a354e63eb9dd5cc10391360fec0de67 -size 1417396 diff --git a/opensuse-logo.png b/opensuse-logo.png deleted file mode 100644 index dedfc4a..0000000 --- a/opensuse-logo.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9c24719f10b9cee80df29c6c36a809bd818dde764349a8b3922361cb00099e39 -size 70317 diff --git a/plymouth.changes b/plymouth.changes index c96af23..8e6684b 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Jul 26 13:33:28 UTC 2012 - tittiatcoke@gmail.com + +- Move the openSUSE branding to its rightful place + ------------------------------------------------------------------- Fri Jul 20 08:57:25 UTC 2012 - fcrozat@suse.com diff --git a/plymouth.spec b/plymouth.spec index 2521584..0c15999 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -31,8 +31,6 @@ Group: System/Base Url: http://freedesktop.org/software/plymouth/releases Source0: %{name}-%{version}.tar.bz2 Source1: boot-duration -Source2: opensuse-logo.png -Source3: branding-suse.tar.xz # PATCH-OPENSUSE -- Support the openSUSE initrd Patch1: suse-initrd-support # PATCH-OPENSUSE -- Add line numbers to tracing output @@ -237,34 +235,6 @@ Plymouth. It features an extensible, scriptable boot splash language that simplifies the process of designing custom boot splash themes. -%package branding-upstream -Summary: Plymouth default theme -Group: System/Base -Requires: plymouth-theme-solar = %{version} -Requires(pre): %{name} -Supplements: packageand(plymouth:branding-upstream) -Provides: %{name}-branding = %{version} -Conflicts: otherproviders(plymouth-branding) -BuildArch: noarch - -%description branding-upstream -This metapackage tracks the Plymouth default theme from upstream. - -%package branding-openSUSE -Summary: Plymouth openSUSE theme -Group: System/Base -Requires: plymouth-plugin-label = %{version} -Requires: plymouth-plugin-script = %{version} -Requires(post): %{name}-scripts -Supplements: packageand(plymouth:branding-openSUSE) -Provides: %{name}-branding = %{version} -Conflicts: otherproviders(plymouth-branding) -BuildArch: noarch - -%description branding-openSUSE -This metapackage tracks the Plymouth openSUSE branding. - - %package theme-fade-in Summary: Plymouth "Fade-In" theme Group: System/Base @@ -347,7 +317,6 @@ autoreconf -fiv %configure --disable-static \ --enable-systemd-integration \ --enable-tracing --disable-tests \ - --with-logo=%{_datadir}/plymouth/logo.png \ --with-background-start-color-stop=0x1A3D1F \ --with-background-end-color-stop=0x4EA65C \ --with-background-color=0x3391cd \ @@ -384,19 +353,12 @@ mkdir -p %{buildroot}%{_localstatedir}/lib/plymouth mkdir -p %{buildroot}%{_localstatedir}/run/plymouth cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_datadir}/plymouth/default-boot-duration cp $RPM_SOURCE_DIR/boot-duration %{buildroot}%{_localstatedir}/lib/plymouth -cp %{SOURCE2} %{buildroot}%{_datadir}/plymouth/logo.png cp %{buildroot}/%{_datadir}/plymouth/plymouthd.defaults %{buildroot}/%{_sysconfdir}/plymouth/plymouth.conf mkdir -p %{buildroot}/lib/mkinitrd/scripts install -t %{buildroot}/lib/mkinitrd/scripts \ scripts/{setup,boot}-plymouth*.sh -# Unpack the openSUSE branding. This branding is temporarily in this package -# until the official one is created/accepted in the main branding package -pushd %{buildroot}%{_datadir}/plymouth/themes/ -tar -Jxf %{SOURCE3} -popd - %clean rm -rf %{buildroot} @@ -482,22 +444,6 @@ if [ $1 -eq 0 ]; then fi fi -%post branding-openSUSE -if [ $1 -eq 1 -a ! -e /.buildenv ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "text" ]; then - %{_sbindir}/plymouth-set-default-theme -R openSUSE - fi -fi - -%postun branding-openSUSE -if [ $1 -eq 0 ]; then - export LIB=%{_libdir} - if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "openSUSE" ]; then - %{_sbindir}/plymouth-set-default-theme -R --reset - fi -fi - %files %defattr(-, root, root) %doc AUTHORS NEWS README @@ -509,7 +455,8 @@ fi %dir %{_libdir}/plymouth %dir %{_libdir}/plymouth/renderers %dir %{_sysconfdir}/plymouth -%{_sysconfdir}/plymouth/plymouth.conf +%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf +%config(noreplace) %{_sysconfdir}/plymouth/plymouth.conf %{plymouthdaemon_execdir}/plymouthd %{plymouthclient_execdir}/plymouth /bin/plymouth @@ -521,6 +468,7 @@ fi %{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/text/text.plymouth %{_datadir}/plymouth/plymouthd.defaults +%{_datadir}/plymouth/bizcom.png %ghost %{_localstatedir}/run/plymouth %{_localstatedir}/spool/plymouth %{_mandir}/man?/* @@ -632,15 +580,4 @@ fi %{_datadir}/plymouth/themes/script/script.script %{_datadir}/plymouth/themes/script/script.plymouth -%files branding-upstream -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf -%{_datadir}/plymouth/logo.png - -%files branding-openSUSE -%defattr(-, root, root) -%config(noreplace) %{_sysconfdir}/plymouth/plymouthd.conf -%{_datadir}/plymouth/logo.png -%{_datadir}/plymouth/themes/openSUSE/ - %changelog diff --git a/suse-initrd-support b/suse-initrd-support index e162953..8c2098f 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -57,7 +57,7 @@ Index: plymouth-0.8.4/scripts/setup-plymouth.sh.in =================================================================== --- /dev/null +++ plymouth-0.8.4/scripts/setup-plymouth.sh.in -@@ -0,0 +1,61 @@ +@@ -0,0 +1,60 @@ +#!/bin/bash +# +#%stage: setup @@ -82,7 +82,6 @@ Index: plymouth-0.8.4/scripts/setup-plymouth.sh.in + /usr/share/plymouth/themes/details/details.plymouth \ + /usr/share/plymouth/plymouthd.defaults \ + /usr/share/plymouth/themes/${THEME}/* \ -+ /usr/share/plymouth/logo.png \ + /etc/plymouth/plymouthd.conf \ + /usr/share/fonts/uni/unifont.pcf.gz \ + /etc/fonts/fonts.conf \ From ce7e7919099bb5fd5ddeb2b03b207e637c313e98a55925c2f82d4538786f2161 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Sun, 29 Jul 2012 18:08:06 +0000 Subject: [PATCH 2/3] - fix build for ARM OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=71 --- plymouth.changes | 5 +++++ plymouth.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/plymouth.changes b/plymouth.changes index 8e6684b..de1b05f 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Sun Jul 29 18:07:39 UTC 2012 - dmueller@suse.com + +- fix build for ARM + ------------------------------------------------------------------- Thu Jul 26 13:33:28 UTC 2012 - tittiatcoke@gmail.com diff --git a/plymouth.spec b/plymouth.spec index 0c15999..ef24477 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -53,7 +53,7 @@ BuildRequires: libtool BuildRequires: update-desktop-files BuildRequires: xz BuildRequires: pkgconfig(libdrm) -%ifnarch ppc ppc64 +%ifarch %ix86 x86_64 BuildRequires: pkgconfig(libdrm_intel) %endif BuildRequires: pkgconfig(libdrm_nouveau) From 15ac6b59a5e8cff83ec25130f921058e9ede80ed5c4fe64cb25a8309516294a3 Mon Sep 17 00:00:00 2001 From: Raymond Wooninck Date: Mon, 30 Jul 2012 08:32:08 +0000 Subject: [PATCH 3/3] 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 --- 0001-Some-greenish-openSUSE-colors.patch | 33 +++++++++++++++++++ ...progress-bar-strip-quotes-if-present.patch | 29 ++++++++++++++++ plymouth.changes | 7 ++++ plymouth.spec | 10 +++--- suse-initrd-support | 2 +- 5 files changed, 76 insertions(+), 5 deletions(-) create mode 100644 0001-Some-greenish-openSUSE-colors.patch create mode 100644 0001-ply-text-progress-bar-strip-quotes-if-present.patch diff --git a/0001-Some-greenish-openSUSE-colors.patch b/0001-Some-greenish-openSUSE-colors.patch new file mode 100644 index 0000000..2bc25e9 --- /dev/null +++ b/0001-Some-greenish-openSUSE-colors.patch @@ -0,0 +1,33 @@ +From 9e69959ad2d7624936832421dfb0cd1fee47fefc Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +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 + diff --git a/0001-ply-text-progress-bar-strip-quotes-if-present.patch b/0001-ply-text-progress-bar-strip-quotes-if-present.patch new file mode 100644 index 0000000..4fd160a --- /dev/null +++ b/0001-ply-text-progress-bar-strip-quotes-if-present.patch @@ -0,0 +1,29 @@ +From fe7008c13b38898d78ff4ecf897fea127982fd9b Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +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 + diff --git a/plymouth.changes b/plymouth.changes index de1b05f..92cddf1 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -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 diff --git a/plymouth.spec b/plymouth.spec index ef24477..10ce19e 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -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 diff --git a/suse-initrd-support b/suse-initrd-support index 8c2098f..dcff8bf 100644 --- a/suse-initrd-support +++ b/suse-initrd-support @@ -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 "