From f2bbab93f3fe5c660a37ab0380673d3a2efa7e75d299fca75ab7cb10c927a1c8 Mon Sep 17 00:00:00 2001 From: Stephan Kulow Date: Fri, 17 Feb 2012 13:55:24 +0000 Subject: [PATCH] Accepting request 105684 from home:tittiatcoke Plymouth package for Factory (resolved incorrect dependency) OBS-URL: https://build.opensuse.org/request/show/105684 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=1 --- .gitattributes | 23 ++ .gitignore | 1 + boot-duration | 0 opensuse-logo.png | 3 + plymouth-0.8.3_git201110131555.tar.bz2 | 3 + plymouth-fix-window-size | 36 ++ plymouth-trace-lines | 26 ++ plymouth.changes | 54 +++ plymouth.spec | 491 +++++++++++++++++++++++++ suse-initrd-support | 82 +++++ 10 files changed, 719 insertions(+) create mode 100644 .gitattributes create mode 100644 .gitignore create mode 100644 boot-duration create mode 100644 opensuse-logo.png create mode 100644 plymouth-0.8.3_git201110131555.tar.bz2 create mode 100644 plymouth-fix-window-size create mode 100644 plymouth-trace-lines create mode 100644 plymouth.changes create mode 100644 plymouth.spec create mode 100644 suse-initrd-support diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..9b03811 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,23 @@ +## Default LFS +*.7z filter=lfs diff=lfs merge=lfs -text +*.bsp filter=lfs diff=lfs merge=lfs -text +*.bz2 filter=lfs diff=lfs merge=lfs -text +*.gem filter=lfs diff=lfs merge=lfs -text +*.gz filter=lfs diff=lfs merge=lfs -text +*.jar filter=lfs diff=lfs merge=lfs -text +*.lz filter=lfs diff=lfs merge=lfs -text +*.lzma filter=lfs diff=lfs merge=lfs -text +*.obscpio filter=lfs diff=lfs merge=lfs -text +*.oxt filter=lfs diff=lfs merge=lfs -text +*.pdf filter=lfs diff=lfs merge=lfs -text +*.png filter=lfs diff=lfs merge=lfs -text +*.rpm filter=lfs diff=lfs merge=lfs -text +*.tbz filter=lfs diff=lfs merge=lfs -text +*.tbz2 filter=lfs diff=lfs merge=lfs -text +*.tgz filter=lfs diff=lfs merge=lfs -text +*.ttf filter=lfs diff=lfs merge=lfs -text +*.txz filter=lfs diff=lfs merge=lfs -text +*.whl filter=lfs diff=lfs merge=lfs -text +*.xz filter=lfs diff=lfs merge=lfs -text +*.zip filter=lfs diff=lfs merge=lfs -text +*.zst filter=lfs diff=lfs merge=lfs -text diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..57affb6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.osc diff --git a/boot-duration b/boot-duration new file mode 100644 index 0000000..473a0f4 diff --git a/opensuse-logo.png b/opensuse-logo.png new file mode 100644 index 0000000..dedfc4a --- /dev/null +++ b/opensuse-logo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9c24719f10b9cee80df29c6c36a809bd818dde764349a8b3922361cb00099e39 +size 70317 diff --git a/plymouth-0.8.3_git201110131555.tar.bz2 b/plymouth-0.8.3_git201110131555.tar.bz2 new file mode 100644 index 0000000..0cd2bf2 --- /dev/null +++ b/plymouth-0.8.3_git201110131555.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9ed5bfb0f8b4b4ca8b7df0da5311c2a22f8054ebf6b6264b447c75ad712ffd41 +size 816336 diff --git a/plymouth-fix-window-size b/plymouth-fix-window-size new file mode 100644 index 0000000..636b25a --- /dev/null +++ b/plymouth-fix-window-size @@ -0,0 +1,36 @@ +From: Jeff Mahoney +Subject: plymouth/script: Fix window size with multiple heads + + Plymouth "zooms" in on smaller displays when multiple displays are used, + but the script splash plugin defines the window size as the smallest + of the displays. When using a sprite as a background image, the wrong + size is used which leaves large chunks of the screen unused. + + This patch uses the largest display as the window size, which allows + it to be appopriately cropped on smaller displays. + +Signed-off-by: Jeff Mahoney +--- + src/plugins/splash/script/script-lib-sprite.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/src/plugins/splash/script/script-lib-sprite.c ++++ b/src/plugins/splash/script/script-lib-sprite.c +@@ -233,7 +233,7 @@ static script_return_t sprite_window_get + if (width == 0) + width = ply_pixel_display_get_width (display->pixel_display); + else +- width = MIN (width, ply_pixel_display_get_width (display->pixel_display)); ++ width = MAX (width, ply_pixel_display_get_width (display->pixel_display)); + } + return script_return_obj (script_obj_new_number (width)); + } +@@ -273,7 +273,7 @@ static script_return_t sprite_window_get + if (height == 0) + height = ply_pixel_display_get_height (display->pixel_display); + else +- height = MIN (height, ply_pixel_display_get_height (display->pixel_display)); ++ height = MAX (height, ply_pixel_display_get_height (display->pixel_display)); + } + return script_return_obj (script_obj_new_number (height)); + } diff --git a/plymouth-trace-lines b/plymouth-trace-lines new file mode 100644 index 0000000..eb975ba --- /dev/null +++ b/plymouth-trace-lines @@ -0,0 +1,26 @@ +From: Jeff Mahoney +Subject: plymouth: Add line numbers to tracing output + + The plymouth tracing output lists the function but there are many + cases in which the same message is issued from multiple places in the same + function, which makes debugging more difficult. This patch adds the line + number to the output to uniquely identify each site. + +Signed-off-by: Jeff Mahoney +--- + src/libply/ply-logger.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/src/libply/ply-logger.h ++++ b/src/libply/ply-logger.h +@@ -91,8 +91,8 @@ do + ply_logger_flush (logger); \ + errno = _old_errno; \ + ply_logger_inject (logger, \ +- "[%s] %45.45s:" format "\r\n", \ +- __FILE__, __func__, ##args); \ ++ "[%s:%d] %45.45s:" format "\r\n", \ ++ __FILE__, __LINE__, __func__, ##args); \ + ply_logger_flush (logger); \ + errno = _old_errno; \ + } \ diff --git a/plymouth.changes b/plymouth.changes new file mode 100644 index 0000000..503021f --- /dev/null +++ b/plymouth.changes @@ -0,0 +1,54 @@ +------------------------------------------------------------------- +Fri Feb 17 09:25:11 UTC 2012 - tittiatcoke@gmail.com + +- Finalize the Plymouth integration on openSUSE. + * Current default theme is Solar with the openSUSE Geecko + * Plymouth bootsplash will run on tty7 during boot. + * Install all files in /usr + +------------------------------------------------------------------- +Tue Dec 27 16:19:56 UTC 2011 - crrodriguez@opensuse.org + +- Update to current git + +------------------------------------------------------------------- +Wed Mar 23 02:25:44 CET 2011 - jeffm@suse.de + +- Update to git snapshot from 12 Mar 2011. + - Mostly minor fixes. + +------------------------------------------------------------------- +Sat Feb 5 23:49:30 CET 2011 - jeffm@suse.de + +- Updated to latest snapshot. + - boot-server: improve debug output + - pixel-buffer: Fix overflow in blend_two_pixel_values + - boot-server: fix debug output when message is from init + +- Fixed an issue with the script plugin's Window attributes returning + the size of the smallest display when multiple displays are used. + +------------------------------------------------------------------- +Wed Dec 29 16:56:30 CET 2010 - jeffm@suse.de + +- Fixed location of text.so and details.so in plymouth-scripts + +------------------------------------------------------------------- +Wed Dec 22 10:20:54 UTC 2010 - seife+obs@b1-systems.com + +- fix the build failure: + - own additional directories +- fix rpmlint failures: + - fix up package groups - those are just guessed sometimes + - rename plymouth-graphics-libs to libply-splash-graphics2 + (this one was fatal) + - do not own /var/run/plymouth - probably still needs fixing + (this was almost fatal) + - do not include build date in binary, use mtime of source + patchfile instead + +------------------------------------------------------------------- +Wed Dec 8 22:44:13 CET 2010 - jeffm@suse.de + +- Initial packaging. + diff --git a/plymouth.spec b/plymouth.spec new file mode 100644 index 0000000..08c10e9 --- /dev/null +++ b/plymouth.spec @@ -0,0 +1,491 @@ +# +# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# + +%define plymouthdaemon_execdir %{_sbindir} +%define plymouthclient_execdir %{_bindir} +%define plymouth_libdir %{_libdir} +%define plymouth_initrd_file /boot/initrd-plymouth.img + +%define tarversion 0.8.3 +%define patchversion 201110131555 + +Name: plymouth +Version: %{tarversion}_git%{patchversion} +Release: 1 +License: GPL-2.0+ +Summary: Graphical Boot Animation and Logger +Group: System/Base +Source0: %{name}-%{version}.tar.bz2 +Source1: boot-duration +Source2: opensuse-logo.png +# PATCH-OPENSUSE -- Support the openSUSE initrd +Patch1: suse-initrd-support +# PATCH-OPENSUSE -- Add line numbers to tracing output +Patch2: plymouth-trace-lines +# PATCH-OPENSUSE -- Handle correctly multiple displays with different sizes +Patch3: plymouth-fix-window-size + +Url: http://freedesktop.org/software/plymouth/releases + +Requires(post): plymouth-scripts + +BuildRequires: automake +BuildRequires: kernel-headers +BuildRequires: libtool +BuildRequires: update-desktop-files +BuildRequires: pkgconfig(libdrm) +BuildRequires: pkgconfig(libdrm_intel) +BuildRequires: pkgconfig(libdrm_nouveau) +BuildRequires: pkgconfig(libdrm_radeon) +Requires: suspend >= 0.80.20100129.1 +Requires: systemd-plymouth +Requires: %{name}-branding = %{version} +Obsoletes: bootsplash + +%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 core-libs +Summary: Plymouth core libraries +Group: Development/Libraries/C and C++ + +%description core-libs +This package contains the libply and libply-splash-core libraries +used by Plymouth. + +%package -n libply-splash-graphics2 +Summary: Plymouth graphics libraries +Group: Development/Libraries/C and C++ +BuildRequires: libpng-devel +Requires: %{name}-core-libs + +%description -n libply-splash-graphics2 +This package contains the libply-splash-graphics library +used by graphical Plymouth splashes. + +%package devel +Summary: Libraries and headers for writing Plymouth splash plugins +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} +Requires: pkgconfig + +%description devel +This package contains the libply and libplybootsplash libraries +and headers needed to develop 3rd party splash plugins for Plymouth. + +%package utils +Summary: Plymouth related utilities +Group: System/Base +BuildRequires: pkgconfig(gtk+-2.0) +Requires: %{name} = %{version} + +%description utils +This package contains utilities that integrate with Plymouth +including a boot log viewing application. + +%package scripts +Summary: Plymouth related scripts +Group: System/Base +Requires: coreutils +Requires: cpio +Requires: findutils +Requires: gzip +Requires: mkinitrd +BuildArch: noarch + +%description scripts +This package contains scripts that help integrate Plymouth with +the system. + +%package plugin-label +Summary: Plymouth label plugin +Group: System/Base +BuildRequires: pkgconfig(cairo) +BuildRequires: pkgconfig(pango) >= 1.21.0 +Requires: %{name}-core-libs = %{version} + +%description plugin-label +This package contains the label control plugin for +Plymouth. It provides the ability to render text on +graphical boot splashes using pango and cairo. + +%package plugin-fade-throbber +Summary: Plymouth "Fade-Throbber" plugin +Group: System/Base +Requires: %{name}-core-libs = %{version} + +%description plugin-fade-throbber +This package contains the "Fade-In" boot splash plugin for +Plymouth. It features a centered image that fades in and out +while other images pulsate around during system boot up. + +%package plugin-throbgress +Summary: Plymouth "Throbgress" plugin +Group: System/Base +Requires: %{name}-core-libs = %{version} +Requires: %{name}-plugin-label = %{version} + +%description plugin-throbgress +This package contains the "throbgress" boot splash plugin for +Plymouth. It features a centered logo and animated spinner that +spins repeatedly while a progress bar advances at the bottom of +the screen. + +%package plugin-space-flares +Summary: Plymouth "space-flares" plugin +Group: System/Base +Requires: %{name}-core-libs = %{version} +Requires: %{name}-plugin-label = %{version} + +%description plugin-space-flares +This package contains the "space-flares" boot splash plugin for +Plymouth. It features a corner image with animated flares. + +%package plugin-two-step +Summary: Plymouth "two-step" plugin +Group: System/Base +Requires: %{name}-core-libs = %{version} +Requires: plymouth-plugin-label + +%description plugin-two-step +This package contains the "two-step" boot splash plugin for +Plymouth. It features a two phased boot process that starts with +a progressing animation synced to boot time and finishes with a +short, fast one-shot animation. + +%package plugin-script +Summary: Plymouth "script" plugin +Group: System/Base +Requires: %{name}-core-libs = %{version} + +%description plugin-script +This package contains the "script" boot splash plugin for +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 +Provides: %{name}-branding = %{version} +Supplements: packageand(plymouth:branding-upstream) +Requires: plymouth-theme-solar = %{version} +Conflicts: otherproviders(plymouth-branding) +BuildArch: noarch + +%description branding-upstream +This metapackage tracks the Plymouth default theme from upstream. + +%package theme-fade-in +Summary: Plymouth "Fade-In" theme +Group: System/Base +Requires: %{name}-plugin-fade-throbber = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-fade-in +This package contains the "Fade-In" boot splash theme for +Plymouth. It features a centered logo that fades in and out +while stars twinkle around the logo during system boot up. + +%package theme-spinfinity +Summary: Plymouth "Spinfinity" theme +Group: System/Base +Requires: %{name}-plugin-throbgress = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-spinfinity +This package contains the "Spinfinity" boot splash theme for +Plymouth. It features a centered logo and animated spinner that +spins in the shape of an infinity sign. + +%package theme-spinner +Summary: Plymouth "Spinner" theme +Group: System/Base +Requires: %{name}-plugin-two-step = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-spinner +This package contains the "spinner" boot splash theme for +Plymouth. + +%package theme-solar +Summary: Plymouth "Solar" theme +Group: System/Base +Requires: %{name}-plugin-space-flares = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-solar +This package contains the "Solar" boot splash theme for +Plymouth. It features a blue flamed sun with animated solar flares. + +%package theme-script +Summary: Plymouth "Script" plugin +Group: System/Base +Requires: %{name}-plugin-script = %{version} +Requires(post): %{name}-scripts +BuildArch: noarch + +%description theme-script +This package contains the "script" boot splash theme for +Plymouth. It it is a simple example theme the uses the "script" +plugin. + +%prep +%setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 + +# replace builddate with patch0date +sed -i "s/__DATE__/\"$(stat -c %y %{_sourcedir}/%{name}.changes)\"/" src/main.c + +# Change the default theme +sed -i -e 's/fade-in/solar/g' src/plymouthd.defaults + +%build +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 \ + --disable-gdm-transition \ + --without-system-root-install \ + --with-log-viewer \ + --without-rhgb-compat-link \ + --with-boot-tty=/dev/tty7 \ + --with-shutdown-tty=/dev/tty1 \ + --without-gdm-autostart-file + +make %{?_smp_mflags} + +%install + +%make_install +rm -f %{buildroot}/%{_bindir}/rhgb-client +rm -f %{buildroot}%{_prefix}/lib/plymouth/plymouth-*-initrd + +# Glow isn't quite ready for primetime +rm -rf %{buildroot}%{_datadir}/plymouth/glow/ +rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/ +rm -f %{buildroot}%{_libdir}/plymouth/glow.so + +find %{buildroot} -name '*.a' -exec rm -f {} \; +find %{buildroot} -name '*.la' -exec rm -f {} \; + +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 + +mkdir -p %{buildroot}/lib/mkinitrd/scripts +install -t %{buildroot}/lib/mkinitrd/scripts \ + scripts/{setup,boot}-plymouth*.sh + +%clean +rm -rf %{buildroot} + +%post +[ -f %{_localstatedir}/lib/plymouth/boot-duration ] || cp -f %{_datadir}/plymouth/default-boot-duration %{_localstatedir}/lib/plymouth/boot-duration + +%postun +if [ $1 -eq 0 ]; then + rm -f %{_libdir}/plymouth/default.so + rm -f /boot/initrd-plymouth.img +fi + +%post scripts -p /sbin/mkinitrd_setup +%postun scripts -p /sbin/mkinitrd_setup + +%post core-libs -p /sbin/ldconfig +%postun core-libs -p /sbin/ldconfig + +%post -n libply-splash-graphics2 -p /sbin/ldconfig +%postun -n libply-splash-graphics2 -p /sbin/ldconfig + +%post theme-spinfinity +export LIB=%{_lib} +%{_sbindir}/plymouth-set-default-theme spinfinity +if [ -x /sbin/mkinitrd ]; then + /sbin/mkinitrd +fi + +%postun theme-spinfinity +export LIB=%{_lib} +if [ $1 -eq 0 ]; then + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "spinfinity" ]; then + %{_sbindir}/plymouth-set-default-theme --reset + /sbin/mkinitrd + fi +fi + +%post theme-fade-in +export LIB=%{_lib} +%{_sbindir}/plymouth-set-default-theme fade-in +if [ -x /sbin/mkinitrd ]; then + /sbin/mkinitrd +fi + +%postun theme-fade-in +export LIB=%{_lib} +if [ $1 -eq 0 ]; then + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "fade-in" ]; then + %{_sbindir}/plymouth-set-default-theme --reset + /sbin/mkinitrd + fi +fi + +%post theme-solar +export LIB=%{_lib} +%{_sbindir}/plymouth-set-default-theme solar +if [ -x /sbin/mkinitrd ]; then + /sbin/mkinitrd +fi + +%postun theme-solar +export lib=%{_lib} +if [ $1 -eq 0 ]; then + if [ "$(%{_sbindir}/plymouth-set-default-theme)" == "solar" ]; then + %{_sbindir}/plymouth-set-default-theme --reset + /sbin/mkinitrd + fi +fi + +%files +%defattr(-, root, root) +%doc AUTHORS NEWS README +%dir %{_datadir}/plymouth +%dir %{_datadir}/plymouth/themes +%dir %{_datadir}/plymouth/themes/details +%dir %{_datadir}/plymouth/themes/text +%dir %{_libexecdir}/plymouth +%dir %{_localstatedir}/lib/plymouth +%dir %{_libdir}/plymouth/renderers +%dir %{_sysconfdir}/plymouth +%{plymouthdaemon_execdir}/plymouthd +%{plymouthclient_execdir}/plymouth +%{_libdir}/plymouth/details.so +%{_libdir}/plymouth/text.so +%{_libdir}/plymouth/renderers/drm* +%{_libdir}/plymouth/renderers/frame-buffer* +%{_datadir}/plymouth/default-boot-duration +%{_datadir}/plymouth/themes/details/details.plymouth +%{_datadir}/plymouth/themes/text/text.plymouth +%{_datadir}/plymouth/plymouthd.defaults +%ghost %{_localstatedir}/run/plymouth +%{_localstatedir}/spool/plymouth +%{_mandir}/man?/* +%ghost %{_localstatedir}/lib/plymouth/boot-duration + +%files devel +%defattr(-, root, root) +%{plymouth_libdir}/libply.so +%{plymouth_libdir}/libply-splash-core.so +%{_libdir}/libply-boot-client.so +%{_libdir}/libply-splash-graphics.so +%{_libdir}/pkgconfig/ply-splash-core.pc +%{_libdir}/pkgconfig/ply-splash-graphics.pc +%{_libdir}/pkgconfig/ply-boot-client.pc +%{_libdir}/plymouth/renderers/x11* +%{_includedir}/plymouth-1 + +%files core-libs +%defattr(-, root, root) +%{plymouth_libdir}/libply.so.* +%{plymouth_libdir}/libply-splash-core.so.* +%{_libdir}/libply-boot-client.so.* +%dir %{_libdir}/plymouth + +%files -n libply-splash-graphics2 +%defattr(-, root, root) +%{_libdir}/libply-splash-graphics.so.* + +%files scripts +%defattr(-, root, root) +%{_sbindir}/plymouth-set-default-theme +/lib/mkinitrd/scripts/boot-plymouth.sh +/lib/mkinitrd/scripts/boot-plymouth.chroot.sh +/lib/mkinitrd/scripts/setup-plymouth.sh + +%files utils +%defattr(-, root, root) +%{_bindir}/plymouth-log-viewer + +%files plugin-label +%defattr(-, root, root) +%{_libdir}/plymouth/label.so + +%files plugin-fade-throbber +%defattr(-, root, root) +%{_libdir}/plymouth/fade-throbber.so + +%files theme-fade-in +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/fade-in +%{_datadir}/plymouth/themes/fade-in/bullet.png +%{_datadir}/plymouth/themes/fade-in/entry.png +%{_datadir}/plymouth/themes/fade-in/lock.png +%{_datadir}/plymouth/themes/fade-in/star.png +%{_datadir}/plymouth/themes/fade-in/fade-in.plymouth + +%files plugin-throbgress +%defattr(-, root, root) +%{_libdir}/plymouth/throbgress.so + +%files theme-spinfinity +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/spinfinity +%{_datadir}/plymouth/themes/spinfinity/box.png +%{_datadir}/plymouth/themes/spinfinity/bullet.png +%{_datadir}/plymouth/themes/spinfinity/entry.png +%{_datadir}/plymouth/themes/spinfinity/lock.png +%{_datadir}/plymouth/themes/spinfinity/throbber-[0-3][0-9].png +%{_datadir}/plymouth/themes/spinfinity/spinfinity.plymouth + +%files plugin-space-flares +%defattr(-, root, root) +%{_libdir}/plymouth/space-flares.so + +%files theme-spinner +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/spinner +%{_datadir}/plymouth/themes/spinner/*.* + +%files theme-solar +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/solar +%{_datadir}/plymouth/themes/solar/*.png +%{_datadir}/plymouth/themes/solar/solar.plymouth + +%files plugin-two-step +%defattr(-, root, root) +%{_libdir}/plymouth/two-step.so + +%files plugin-script +%defattr(-, root, root) +%{_libdir}/plymouth/script.so + +%files theme-script +%defattr(-, root, root) +%dir %{_datadir}/plymouth/themes/script/ +%{_datadir}/plymouth/themes/script/*.png +%{_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 + +%changelog diff --git a/suse-initrd-support b/suse-initrd-support new file mode 100644 index 0000000..b432ccf --- /dev/null +++ b/suse-initrd-support @@ -0,0 +1,82 @@ +--- + configure.ac | 1 + scripts/boot-plymouth.chroot.sh | 7 ++++++ + scripts/boot-plymouth.sh | 8 +++++++ + scripts/setup-plymouth.sh.in | 41 ++++++++++++++++++++++++++++++++++++++++ + 4 files changed, 57 insertions(+) + +--- plymouth-0.8.3_git201110131555.orig/configure.ac ++++ plymouth-0.8.3_git201110131555/configure.ac +@@ -440,6 +440,7 @@ AC_CONFIG_FILES([Makefile + themes/spinner/Makefile + themes/script/Makefile + images/Makefile ++ scripts/setup-plymouth.sh + scripts/plymouth-generate-initrd + scripts/plymouth-populate-initrd + scripts/plymouth-set-default-theme +--- /dev/null ++++ plymouth-0.8.3_git201110131555/scripts/boot-plymouth.chroot.sh +@@ -0,0 +1,7 @@ ++#!/bin/bash ++#%stage: setup ++#%depends: plymouth ++#%programs: /bin/plymouth /sbin/plymouthd ++#%dontshow ++ ++plymouth update-root-fs --new-root-dir=/root +--- /dev/null ++++ plymouth-0.8.3_git201110131555/scripts/boot-plymouth.sh +@@ -0,0 +1,8 @@ ++#!/bin/bash ++#%stage: boot ++#%depends: start udev kms ++#%programs: /bin/plymouth /sbin/plymouthd ++ ++/sbin/plymouthd --mode=boot --attach-to-session ++ ++plymouth show-splash +--- /dev/null ++++ plymouth-0.8.3_git201110131555/scripts/setup-plymouth.sh.in +@@ -0,0 +1,41 @@ ++#!/bin/bash ++# ++#%stage: setup ++#%depends: start ++ ++# We don't need to copy the binaries since boot-plymouth.sh does that for us ++ ++[ -z "$tmp_mnt" ] && exit 1 ++ ++THEME=$(plymouth-set-default-theme) ++ ++PLUGIN_PATH=$(plymouth --get-splash-plugin-path) ++ ++MODULE=$(grep "ModuleName *= *" @PLYMOUTH_DATADIR@/plymouth/themes/${THEME}/${THEME}.plymouth | sed 's/ModuleName *= *//') ++ ++if [ ! -f "$PLUGIN_PATH/${MODULE}.so" ]; then ++ echo "The default plymouth plugin ($MODULE) doesn't exist." > /dev/stderr ++ exit 1 ++fi ++ ++FILES="@PLYMOUTH_DATADIR@/plymouth/themes/text/text.plymouth \ ++ @PLYMOUTH_DATADIR@/plymouth/themes/details/details.plymouth \ ++ @PLYMOUTH_DATADIR@/plymouth/plymouthd.defaults \ ++ @PLYMOUTH_DATADIR@/plymouth/themes/${THEME}/* \ ++ @PLYMOUTH_DATADIR@/plymouth/opensuse-logo.png \ ++ /etc/plymouth/plymouthd.conf" ++ ++PLUGINS="${PLUGIN_PATH}/details.so \ ++ ${PLUGIN_PATH}/text.so \ ++ ${PLUGIN_PATH}/${MODULE}.so \ ++ ${PLUGIN_PATH}/renderers/drm.so \ ++ ${PLUGIN_PATH}/renderers/frame-buffer.so" ++ ++for file in $FILES; do ++ install -D $file $tmp_mnt/$file ++done ++ ++for plugin in $PLUGINS; do ++ mkdir -p $tmp_mnt/$(dirname $plugin) ++ cp_bin $plugin $tmp_mnt/$plugin ++done