plymouth-0.9.5 ver. bump
This commit is contained in:
@@ -13,6 +13,7 @@ LOGO_FILE = "/usr/share/pixmaps/plymouth-pisilinux.png"
|
||||
THEMEPATH = "/usr/share/plymouth/themes"
|
||||
|
||||
def setup():
|
||||
pisitools.ldflags.add(" -ludev ")
|
||||
# /var/run => /run
|
||||
pisitools.dosed("configure.ac", "^(\s+plymouthruntimedir=)\$localstatedir(\/run\/plymouth)", r"\1\2")
|
||||
pisitools.dosed("src/Makefile.am", "^(plymouthdrundir\s=\s)\$\(localstatedir\)(\/run\/plymouth)", r"\1\2")
|
||||
@@ -32,8 +33,15 @@ def setup():
|
||||
--with-shutdown-tty=/dev/tty1 \
|
||||
--with-log-viewer \
|
||||
--disable-libdrm_nouveau \
|
||||
--disable-systemd-integration \
|
||||
--disable-tests \
|
||||
--disable-static \
|
||||
--enable-drm \
|
||||
--enable-tracing \
|
||||
--enable-pango \
|
||||
--enable-gtk=no \
|
||||
--without-rhgb-compat-link \
|
||||
--without-system-root-install \
|
||||
--enable-gdm-transition \
|
||||
--without-rhgb-compat-link" % LOGO_FILE)
|
||||
|
||||
|
||||
@@ -0,0 +1,17 @@
|
||||
diff -Nuar a/src/plymouthd.conf b/src/plymouthd.conf
|
||||
--- a/src/plymouthd.conf 2018-09-20 20:53:38.000000000 +0300
|
||||
+++ b/src/plymouthd.conf 2021-01-25 13:26:40.867920133 +0300
|
||||
@@ -1,3 +1,4 @@
|
||||
# Administrator customizations go in this file
|
||||
#[Daemon]
|
||||
#Theme=fade-in
|
||||
+#ShowDelay=0
|
||||
diff -Nuar a/src/plymouthd.defaults b/src/plymouthd.defaults
|
||||
--- a/src/plymouthd.defaults 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/src/plymouthd.defaults 2021-01-25 13:27:26.947916809 +0300
|
||||
@@ -3,4 +3,4 @@
|
||||
[Daemon]
|
||||
Theme=spinner
|
||||
ShowDelay=0
|
||||
-DeviceTimeout=8
|
||||
+DeviceTimeout=0
|
||||
@@ -0,0 +1,28 @@
|
||||
diff -Nuar a/src/libply-splash-core/ply-boot-splash-plugin.h b/src/libply-splash-core/ply-boot-splash-plugin.h
|
||||
--- a/src/libply-splash-core/ply-boot-splash-plugin.h 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/src/libply-splash-core/ply-boot-splash-plugin.h 2021-01-25 13:40:38.576859689 +0300
|
||||
@@ -38,6 +38,8 @@
|
||||
{
|
||||
PLY_BOOT_SPLASH_MODE_BOOT_UP,
|
||||
PLY_BOOT_SPLASH_MODE_SHUTDOWN,
|
||||
+ PLY_BOOT_SPLASH_MODE_SUSPEND,
|
||||
+ PLY_BOOT_SPLASH_MODE_RESUME,
|
||||
PLY_BOOT_SPLASH_MODE_REBOOT,
|
||||
PLY_BOOT_SPLASH_MODE_UPDATES,
|
||||
PLY_BOOT_SPLASH_MODE_SYSTEM_UPGRADE,
|
||||
diff -Nuar a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c
|
||||
--- a/src/plugins/splash/script/script-lib-plymouth.c 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/src/plugins/splash/script/script-lib-plymouth.c 2021-01-25 13:43:12.694848568 +0300
|
||||
@@ -70,6 +70,12 @@
|
||||
case PLY_BOOT_SPLASH_MODE_SHUTDOWN:
|
||||
obj = script_obj_new_string ("shutdown");
|
||||
break;
|
||||
+ case PLY_BOOT_SPLASH_MODE_SUSPEND:
|
||||
+ obj = script_obj_new_string ("suspend");
|
||||
+ break;
|
||||
+ case PLY_BOOT_SPLASH_MODE_RESUME:
|
||||
+ obj = script_obj_new_string ("resume");
|
||||
+ break;
|
||||
case PLY_BOOT_SPLASH_MODE_REBOOT:
|
||||
obj = script_obj_new_string ("reboot");
|
||||
break;
|
||||
+76
@@ -0,0 +1,76 @@
|
||||
Index: plymouth-0.9.5/src/main.c
|
||||
===================================================================
|
||||
--- plymouth-0.9.5/src/main.c
|
||||
+++ plymouth-0.9.5/src/main.c 2020-10-01 21:11:15.353670757 +0200
|
||||
@@ -2263,6 +2263,11 @@
|
||||
(getenv ("DISPLAY") != NULL))
|
||||
device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV;
|
||||
|
||||
+ if (ply_kernel_command_line_has_argument ("nokmsboot") ||
|
||||
+ ply_kernel_command_line_has_argument ("nomodeset"))
|
||||
+ device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_KMS_DISABLED;
|
||||
+
|
||||
+
|
||||
if (!plymouth_should_show_default_splash (&state)) {
|
||||
/* don't bother listening for udev events or setting up a graphical renderer
|
||||
* if we're forcing details */
|
||||
Index: plymouth-0.9.5/src/libply-splash-core/ply-device-manager.c
|
||||
===================================================================
|
||||
--- plymouth-0.9.5/src/libply-splash-core/ply-device-manager.c
|
||||
+++ plymouth-0.9.5/src/libply-splash-core/ply-device-manager.c 2020-10-01 21:09:30.090117000 +0200
|
||||
@@ -219,6 +219,9 @@
|
||||
const char *id_path;
|
||||
bool has_drm_device = false;
|
||||
|
||||
+ if (manager->flags & PLY_DEVICE_MANAGER_FLAGS_KMS_DISABLED)
|
||||
+ return false;
|
||||
+
|
||||
/* We want to see if the framebuffer is associated with a DRM-capable
|
||||
* graphics card, if it is, we'll use the DRM device */
|
||||
card_matches = udev_enumerate_new (manager->udev_context);
|
||||
@@ -276,7 +279,11 @@
|
||||
|
||||
if (subsystem != NULL && strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
|
||||
ply_trace ("found DRM device %s", device_path);
|
||||
- renderer_type = PLY_RENDERER_TYPE_DRM;
|
||||
+ if (!(manager->flags & PLY_DEVICE_MANAGER_FLAGS_KMS_DISABLED))
|
||||
+ renderer_type = PLY_RENDERER_TYPE_DRM;
|
||||
+ else
|
||||
+ ply_trace ("ignoring, since kernel modesetting is disabled");
|
||||
+
|
||||
} else if (strcmp (subsystem, SUBSYSTEM_FRAME_BUFFER) == 0) {
|
||||
ply_trace ("found frame buffer device %s", device_path);
|
||||
if (!fb_device_has_drm_device (manager, device))
|
||||
@@ -433,11 +440,17 @@
|
||||
return;
|
||||
|
||||
if (strcmp (action, "add") == 0 || strcmp (action, "change") == 0) {
|
||||
+ const char *preferred_subsystem;
|
||||
const char *subsystem;
|
||||
|
||||
+ if (manager->flags & PLY_DEVICE_MANAGER_FLAGS_KMS_DISABLED)
|
||||
+ preferred_subsystem = SUBSYSTEM_FRAME_BUFFER;
|
||||
+ else
|
||||
+ preferred_subsystem = SUBSYSTEM_DRM;
|
||||
+
|
||||
subsystem = udev_device_get_subsystem (device);
|
||||
|
||||
- if (strcmp (subsystem, SUBSYSTEM_DRM) == 0) {
|
||||
+ if (strcmp (subsystem, preferred_subsystem) == 0) {
|
||||
if (manager->local_console_managed && manager->local_console_is_text)
|
||||
ply_trace ("ignoring since we're already using text splash for local console");
|
||||
else
|
||||
Index: plymouth-0.9.5/src/libply-splash-core/ply-device-manager.h
|
||||
===================================================================
|
||||
--- plymouth-0.9.5/src/libply-splash-core/ply-device-manager.h
|
||||
+++ plymouth-0.9.5/src/libply-splash-core/ply-device-manager.h 2020-10-01 21:10:10.643535253 +0200
|
||||
@@ -32,7 +32,8 @@
|
||||
PLY_DEVICE_MANAGER_FLAGS_NONE = 0,
|
||||
PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES = 1 << 0,
|
||||
PLY_DEVICE_MANAGER_FLAGS_IGNORE_UDEV = 1 << 1,
|
||||
- PLY_DEVICE_MANAGER_FLAGS_SKIP_RENDERERS = 1 << 2
|
||||
+ PLY_DEVICE_MANAGER_FLAGS_SKIP_RENDERERS = 1 << 2,
|
||||
+ PLY_DEVICE_MANAGER_FLAGS_KMS_DISABLED = 1 << 3
|
||||
} ply_device_manager_flags_t;
|
||||
|
||||
typedef struct _ply_device_manager ply_device_manager_t;
|
||||
+29
@@ -0,0 +1,29 @@
|
||||
From 3149d7e8a76ce69e57c13de9ce261c5820d19125 Mon Sep 17 00:00:00 2001
|
||||
From: Martin Whitaker <freedesktop@martin-whitaker.me.uk>
|
||||
Date: Sun, 19 Mar 2017 19:12:53 +0000
|
||||
Subject: [PATCH 2/2] main: allow the device timeout to be overridden on the
|
||||
kernel command line.
|
||||
|
||||
|
||||
diff --git a/src/main.c b/src/main.c
|
||||
index 4c4f3f8..de381e0 100644
|
||||
--- a/src/main.c
|
||||
+++ b/src/main.c
|
||||
@@ -438,6 +438,14 @@ find_override_splash (state_t *state)
|
||||
if (delay_string != NULL)
|
||||
state->splash_delay = atof (delay_string);
|
||||
}
|
||||
+ if (isnan (state->device_timeout)) {
|
||||
+ const char *delay_string;
|
||||
+
|
||||
+ delay_string = ply_kernel_command_line_get_string_after_prefix ("plymouth.device-timeout=");
|
||||
+
|
||||
+ if (delay_string != NULL)
|
||||
+ state->device_timeout = atof (delay_string);
|
||||
+ }
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
2.10.2
|
||||
|
||||
@@ -0,0 +1,39 @@
|
||||
diff -Nuar a/configure.ac b/configure.ac
|
||||
--- a/configure.ac 2020-07-08 22:14:38.000000000 +0300
|
||||
+++ b/configure.ac 2021-01-25 13:36:27.099877834 +0300
|
||||
@@ -326,6 +326,7 @@
|
||||
themes/glow/Makefile
|
||||
themes/spinner/Makefile
|
||||
themes/script/Makefile
|
||||
+ themes/pisilinux/Makefile
|
||||
themes/bgrt/Makefile
|
||||
images/Makefile
|
||||
scripts/plymouth-generate-initrd
|
||||
diff -Nuar a/src/plymouthd.conf b/src/plymouthd.conf
|
||||
--- a/src/plymouthd.conf 2018-09-20 20:53:38.000000000 +0300
|
||||
+++ b/src/plymouthd.conf 2021-01-25 13:34:28.455886395 +0300
|
||||
@@ -1,3 +1,4 @@
|
||||
# Administrator customizations go in this file
|
||||
#[Daemon]
|
||||
-#Theme=fade-in
|
||||
+#Theme=pisilinux
|
||||
+#ShowDelay=0
|
||||
diff -Nuar a/src/plymouthd.defaults b/src/plymouthd.defaults
|
||||
--- a/src/plymouthd.defaults 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/src/plymouthd.defaults 2021-01-25 13:35:19.746882694 +0300
|
||||
@@ -1,6 +1,6 @@
|
||||
# Distribution defaults. Changes to this file will get overwritten during
|
||||
# upgrades.
|
||||
[Daemon]
|
||||
-Theme=spinner
|
||||
+Theme=pisilinux
|
||||
ShowDelay=0
|
||||
-DeviceTimeout=8
|
||||
+DeviceTimeout=0
|
||||
diff -Nuar a/themes/Makefile.am b/themes/Makefile.am
|
||||
--- a/themes/Makefile.am 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/themes/Makefile.am 2021-01-25 13:33:05.814892358 +0300
|
||||
@@ -1,2 +1,2 @@
|
||||
-SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar bgrt
|
||||
+SUBDIRS = spinfinity fade-in text details solar glow script spinner pisilinux
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
@@ -0,0 +1,14 @@
|
||||
diff -Nuar a/src/libply/ply-logger.h b/src/libply/ply-logger.h
|
||||
--- a/src/libply/ply-logger.h 2017-08-09 15:48:58.000000000 +0300
|
||||
+++ b/src/libply/ply-logger.h 2018-03-07 18:31:03.323594465 +0300
|
||||
@@ -91,8 +91,8 @@
|
||||
ply_logger_flush (logger); \
|
||||
errno = _old_errno; \
|
||||
ply_logger_inject (logger, \
|
||||
- "[%s:%d] %45.45s:" format "\n", \
|
||||
- __FILE__, __LINE__, __func__, ## args); \
|
||||
+ "" format "\n", \
|
||||
+ ##args); \
|
||||
ply_logger_flush (logger); \
|
||||
errno = _old_errno; \
|
||||
} \
|
||||
@@ -7,7 +7,6 @@ import sys
|
||||
# Generate the list of files needed in initramfs for plymouth
|
||||
|
||||
exclude_list = (
|
||||
"/usr/bin/plymouth-log-viewer",
|
||||
"/usr/sbin/plymouth-set-default-theme",
|
||||
"/usr/lib/plymouth/renderers/x11.so",
|
||||
"/usr/lib/plymouth/label.so",
|
||||
|
||||
@@ -0,0 +1,74 @@
|
||||
#!/usr/bin/python
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import os
|
||||
import sys
|
||||
|
||||
# Generate the list of files needed in initramfs for plymouth
|
||||
|
||||
exclude_list = (
|
||||
"/usr/bin/plymouth-log-viewer",
|
||||
"/usr/sbin/plymouth-set-default-theme",
|
||||
"/usr/lib/plymouth/renderers/x11.so",
|
||||
"/usr/lib/plymouth/label.so",
|
||||
)
|
||||
|
||||
paths = (
|
||||
"/usr/share/plymouth",
|
||||
"/usr/share/pixmaps",
|
||||
"/etc/plymouth",
|
||||
)
|
||||
|
||||
FILE_LIST = "lib/initramfs/plymouth.list"
|
||||
|
||||
def usage():
|
||||
print "%s <directory>" % sys.argv[0]
|
||||
return 1
|
||||
|
||||
def generate_needed_binary_list():
|
||||
binaries = set()
|
||||
executables = os.popen("find -type f -executable | cut -c2-").read().strip().split()
|
||||
executables = set(executables).difference(exclude_list)
|
||||
|
||||
for exe in executables:
|
||||
if exe.endswith(".la"):
|
||||
continue
|
||||
if ".so." in exe:
|
||||
# Add the libfoo.so.X symlink instead of libfoo.so.X.y.z
|
||||
symlink = exe.rsplit(".", 2)[0]
|
||||
if os.path.exists(symlink[1:]):
|
||||
binaries.add(symlink)
|
||||
continue
|
||||
|
||||
binaries.add(exe)
|
||||
|
||||
for exe in executables:
|
||||
for line in os.popen("ldd %s" % exe[1:]):
|
||||
if "=> /" in line:
|
||||
binaries.add(line.split()[2])
|
||||
elif line.strip().startswith("/"):
|
||||
binaries.add(line.strip().split()[0])
|
||||
|
||||
return binaries
|
||||
|
||||
def get_other_file_list():
|
||||
files = ["usr/share/pixmaps/plymouth-pisilinux.png", "usr/share/themes/charge/charge.plymouth"]
|
||||
for path in paths:
|
||||
files.extend(os.popen("find %s -type f" % path[1:]).read().strip().split())
|
||||
|
||||
return ["/%s" % f for f in files]
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
try:
|
||||
directory = sys.argv[1]
|
||||
except:
|
||||
sys.exit(usage())
|
||||
|
||||
os.chdir(directory)
|
||||
files = generate_needed_binary_list()
|
||||
files = files.union(get_other_file_list())
|
||||
|
||||
if not os.path.exists(os.path.dirname(FILE_LIST)):
|
||||
os.makedirs(os.path.dirname(FILE_LIST))
|
||||
open(FILE_LIST, "w").write("\n".join(sorted(files)))
|
||||
@@ -1,26 +1,26 @@
|
||||
/bin/plymouth
|
||||
/usr/bin/plymouth
|
||||
/etc/plymouth/plymouthd.conf
|
||||
/lib/ld-linux-x86-64.so.2
|
||||
/lib/ld-linux.so.2
|
||||
/lib/libc.so.6
|
||||
/lib/libdl.so.2
|
||||
/lib/libm.so.6
|
||||
/lib/libply-splash-core.so.2
|
||||
/lib/libply.so.2
|
||||
/usr/lib/libply-splash-core.so.5
|
||||
/usr/lib/libply.so.5
|
||||
/lib/libpthread.so.0
|
||||
/lib/librt.so.1
|
||||
/lib/libz.so.1
|
||||
/lib/libudev.so.1
|
||||
/lib/libudev.so.1.6.3
|
||||
/sbin/plymouthd
|
||||
/usr/sbin/plymouthd
|
||||
/usr/lib/libdrm.so.2
|
||||
/usr/lib/libdrm_intel.so.1
|
||||
/usr/lib/libdrm_amdgpu.so.1
|
||||
/usr/lib/libdrm_nouveau.so.2
|
||||
/usr/lib/libdrm_radeon.so.1
|
||||
/usr/lib/libkms.so.1
|
||||
/usr/lib/libply-boot-client.so.2
|
||||
/usr/lib/libply-splash-graphics.so.2
|
||||
/usr/lib/libply-boot-client.so.5
|
||||
/usr/lib/libply-splash-graphics.so.5
|
||||
/usr/lib/libpng16.so.16
|
||||
/usr/lib/liblzo2.so.2
|
||||
/usr/lib/plymouth/details.so
|
||||
@@ -30,7 +30,6 @@
|
||||
/usr/lib/plymouth/script.so
|
||||
/usr/lib/plymouth/space-flares.so
|
||||
/usr/lib/plymouth/text.so
|
||||
/usr/lib/plymouth/throbgress.so
|
||||
/usr/lib/plymouth/two-step.so
|
||||
/usr/share/pixmaps/plymouth-pisilinux.png
|
||||
/usr/share/plymouth/plymouthd.defaults
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
/bin/plymouth
|
||||
/etc/plymouth/plymouthd.conf
|
||||
/lib/ld-linux-x86-64.so.2
|
||||
/lib/ld-linux.so.2
|
||||
/lib/libc.so.6
|
||||
/lib/libdl.so.2
|
||||
/lib/libm.so.6
|
||||
/lib/libply-splash-core.so.4
|
||||
/lib/libply.so.4
|
||||
/lib/libpthread.so.0
|
||||
/lib/librt.so.1
|
||||
/lib/libz.so.1
|
||||
/lib/libudev.so.1
|
||||
/lib/libudev.so.1.6.3
|
||||
/sbin/plymouthd
|
||||
/usr/lib/libdrm.so.2
|
||||
/usr/lib/libdrm_intel.so.1
|
||||
/usr/lib/libdrm_amdgpu.so.1
|
||||
/usr/lib/libdrm_nouveau.so.2
|
||||
/usr/lib/libdrm_radeon.so.1
|
||||
/usr/lib/libkms.so.1
|
||||
/usr/lib/libply-boot-client.so.4
|
||||
/usr/lib/libply-splash-graphics.so.4
|
||||
/usr/lib/libpng16.so.16
|
||||
/usr/lib/liblzo2.so.2
|
||||
/usr/lib/plymouth/details.so
|
||||
/usr/lib/plymouth/fade-throbber.so
|
||||
/usr/lib/plymouth/renderers/drm.so
|
||||
/usr/lib/plymouth/renderers/frame-buffer.so
|
||||
/usr/lib/plymouth/script.so
|
||||
/usr/lib/plymouth/space-flares.so
|
||||
/usr/lib/plymouth/text.so
|
||||
/usr/lib/plymouth/throbgress.so
|
||||
/usr/lib/plymouth/two-step.so
|
||||
/usr/share/pixmaps/plymouth-pisilinux.png
|
||||
/usr/share/plymouth/plymouthd.defaults
|
||||
/usr/share/plymouth/themes/details/details.plymouth
|
||||
/usr/share/plymouth/themes/text/text.plymouth
|
||||
@@ -0,0 +1,101 @@
|
||||
diff -Nuar a/configure.ac b/configure.ac
|
||||
--- a/configure.ac 2020-07-08 22:14:38.000000000 +0300
|
||||
+++ b/configure.ac 2021-01-25 16:39:40.751814651 +0300
|
||||
@@ -326,6 +326,7 @@
|
||||
themes/glow/Makefile
|
||||
themes/spinner/Makefile
|
||||
themes/script/Makefile
|
||||
+ themes/pisilinux/Makefile
|
||||
themes/bgrt/Makefile
|
||||
images/Makefile
|
||||
scripts/plymouth-generate-initrd
|
||||
diff -Nuar a/scripts/plymouth-set-default-theme.in b/scripts/plymouth-set-default-theme.in
|
||||
--- a/scripts/plymouth-set-default-theme.in 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/scripts/plymouth-set-default-theme.in 2021-01-25 16:17:31.757910545 +0300
|
||||
@@ -192,5 +192,5 @@
|
||||
sed -i -e '/^Theme[[:blank:]]*=.*/d' ${PLYMOUTH_CONFDIR}/plymouthd.conf
|
||||
sed -i -e "s/^\([[]Daemon[]]\)\n*/\1\nTheme=${THEME_NAME}/" ${PLYMOUTH_CONFDIR}/plymouthd.conf
|
||||
|
||||
-[ $DO_INITRD_REBUILD -ne 0 ] && (${PLYMOUTH_LIBEXECDIR}/plymouth/plymouth-update-initrd)
|
||||
+[ $DO_INITRD_REBUILD -ne 0 ] && /sbin/mkinitramfs
|
||||
exit 0
|
||||
diff -Nuar a/scripts/plymouth-update-initrd b/scripts/plymouth-update-initrd
|
||||
--- a/scripts/plymouth-update-initrd 2018-09-20 20:53:38.000000000 +0300
|
||||
+++ b/scripts/plymouth-update-initrd 2021-01-25 16:12:45.499931200 +0300
|
||||
@@ -1,2 +1,6 @@
|
||||
#!/bin/bash
|
||||
dracut -f
|
||||
+mkinitrd -f /boot/initrd-$(uname -r).img $(uname -r)
|
||||
+find /etc/mkinitcpio.d/ -name \*.preset -a \! -name example.preset | while read p; do
|
||||
+ mkinitcpio -p $p
|
||||
+done
|
||||
diff -Nuar a/src/libply/ply-logger.h b/src/libply/ply-logger.h
|
||||
--- a/src/libply/ply-logger.h 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/src/libply/ply-logger.h 2021-01-25 16:15:33.191919100 +0300
|
||||
@@ -102,8 +102,8 @@
|
||||
__FILE__, __LINE__, __func__); \
|
||||
errno = _old_errno; \
|
||||
ply_logger_inject (logger, \
|
||||
- "%-75.75s: " format "\n", \
|
||||
- buf, ## args); \
|
||||
+ "" format "\n", \
|
||||
+ ## args); \
|
||||
ply_logger_flush (logger); \
|
||||
errno = _old_errno; \
|
||||
} \
|
||||
diff -Nuar a/src/libply-splash-core/ply-boot-splash-plugin.h b/src/libply-splash-core/ply-boot-splash-plugin.h
|
||||
--- a/src/libply-splash-core/ply-boot-splash-plugin.h 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/src/libply-splash-core/ply-boot-splash-plugin.h 2021-01-25 16:41:40.361806021 +0300
|
||||
@@ -38,6 +38,8 @@
|
||||
{
|
||||
PLY_BOOT_SPLASH_MODE_BOOT_UP,
|
||||
PLY_BOOT_SPLASH_MODE_SHUTDOWN,
|
||||
+ PLY_BOOT_SPLASH_MODE_SUSPEND,
|
||||
+ PLY_BOOT_SPLASH_MODE_RESUME,
|
||||
PLY_BOOT_SPLASH_MODE_REBOOT,
|
||||
PLY_BOOT_SPLASH_MODE_UPDATES,
|
||||
PLY_BOOT_SPLASH_MODE_SYSTEM_UPGRADE,
|
||||
diff -Nuar a/src/plugins/splash/script/script-lib-plymouth.c b/src/plugins/splash/script/script-lib-plymouth.c
|
||||
--- a/src/plugins/splash/script/script-lib-plymouth.c 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/src/plugins/splash/script/script-lib-plymouth.c 2021-01-25 13:43:12.694848568 +0300
|
||||
@@ -70,6 +70,12 @@
|
||||
case PLY_BOOT_SPLASH_MODE_SHUTDOWN:
|
||||
obj = script_obj_new_string ("shutdown");
|
||||
break;
|
||||
+ case PLY_BOOT_SPLASH_MODE_SUSPEND:
|
||||
+ obj = script_obj_new_string ("suspend");
|
||||
+ break;
|
||||
+ case PLY_BOOT_SPLASH_MODE_RESUME:
|
||||
+ obj = script_obj_new_string ("resume");
|
||||
+ break;
|
||||
case PLY_BOOT_SPLASH_MODE_REBOOT:
|
||||
obj = script_obj_new_string ("reboot");
|
||||
break;
|
||||
diff -Nuar a/src/plymouthd.conf b/src/plymouthd.conf
|
||||
--- a/src/plymouthd.conf 2018-09-20 20:53:38.000000000 +0300
|
||||
+++ b/src/plymouthd.conf 2021-01-25 16:38:32.074819607 +0300
|
||||
@@ -1,3 +1,4 @@
|
||||
# Administrator customizations go in this file
|
||||
#[Daemon]
|
||||
-#Theme=fade-in
|
||||
+#Theme=pisilinux
|
||||
+#ShowDelay=0
|
||||
diff -Nuar a/src/plymouthd.defaults b/src/plymouthd.defaults
|
||||
--- a/src/plymouthd.defaults 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/src/plymouthd.defaults 2021-01-25 16:40:16.492812072 +0300
|
||||
@@ -1,6 +1,6 @@
|
||||
# Distribution defaults. Changes to this file will get overwritten during
|
||||
# upgrades.
|
||||
[Daemon]
|
||||
-Theme=spinner
|
||||
+Theme=pisilinux
|
||||
ShowDelay=0
|
||||
-DeviceTimeout=8
|
||||
+DeviceTimeout=0
|
||||
diff -Nuar a/themes/Makefile.am b/themes/Makefile.am
|
||||
--- a/themes/Makefile.am 2020-06-15 17:16:47.000000000 +0300
|
||||
+++ b/themes/Makefile.am 2021-01-25 16:37:54.949822285 +0300
|
||||
@@ -1,2 +1,2 @@
|
||||
-SUBDIRS = spinfinity fade-in text details solar glow script spinner tribar bgrt
|
||||
+SUBDIRS = spinfinity fade-in text details solar glow script spinner pisilinux
|
||||
MAINTAINERCLEANFILES = Makefile.in
|
||||
@@ -13,8 +13,8 @@
|
||||
<IsA>library</IsA>
|
||||
<Summary>Graphical Boot Animation and Logger</Summary>
|
||||
<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.</Description>
|
||||
<Archive sha1sum="292abc0517eb90d6ce6be04cc26d29738e796458" type="targz">https://github.com/ev3dev/plymouth/archive/upstream/0.8.8.tar.gz</Archive>
|
||||
<Archive sha1sum="f12d053f015708646d0871332b4b9465e7b11cef" type="tarxz" target="plymouth-upstream-0.8.8/themes">https://sourceforge.net/projects/pisilinux/files/source/plymouth-theme-pisilinux-0.4.tar.xz</Archive>
|
||||
<Archive sha1sum="26a68b02ec410b7393a83df31acb7dd1c404531a" type="tarxz">http://freedesktop.org/software/plymouth/releases/plymouth-0.9.5.tar.xz</Archive>
|
||||
<Archive sha1sum="f12d053f015708646d0871332b4b9465e7b11cef" type="tarxz" target="plymouth-0.9.5/themes">https://sourceforge.net/projects/pisilinux/files/source/plymouth-theme-pisilinux-0.4.tar.xz</Archive>
|
||||
<AdditionalFiles>
|
||||
<AdditionalFile permission="0755" target="generate-flist">pisilinux/generate-flist.py</AdditionalFile>
|
||||
</AdditionalFiles>
|
||||
@@ -28,20 +28,25 @@
|
||||
<Dependency>harfbuzz-devel</Dependency>
|
||||
<Dependency>glib2-devel</Dependency>
|
||||
<Dependency>gtk2-devel</Dependency>
|
||||
<Dependency>gtk3-devel</Dependency>
|
||||
<Dependency>eudev-devel</Dependency>
|
||||
<Dependency>libxslt-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<!-- Pisi Linux patches-->
|
||||
<!--<Patch level="1">pisilinux/fix-fbdev-path.patch</Patch>-->
|
||||
<Patch level="1">0008-show-delay.patch</Patch>
|
||||
<Patch level="1">pisilinux/plymouth-update-initrd.patch</Patch>
|
||||
<Patch level="1">pisilinux/disable-source-code-tracing.patch</Patch>
|
||||
<Patch level="1">pisilinux/adapt-theme-script.patch</Patch>
|
||||
<Patch level="1">pisilinux/add-pisilinux-theme.patch</Patch>
|
||||
<!-- <Patch level="1">01-0008-show-delay.patch</Patch> -->
|
||||
<!--Patch level="1">pisilinux/plymouth-update-initrd.patch</Patch-->
|
||||
<!-- <Patch level="1">pisilinux/01-disable-source-code-tracing.patch</Patch> -->
|
||||
<!--Patch level="1">pisilinux/adapt-theme-script.patch</Patch-->
|
||||
<!--Patch level="1">pisilinux/01-add-pisilinux-theme.patch</Patch-->
|
||||
<!--<Patch level="1">pisilinux/implement-suspend-modes.patch</Patch>-->
|
||||
<!--MaGeia patches-->
|
||||
<Patch level="1">mageia/plymouth-restore-suspend.patch</Patch>
|
||||
<Patch level="1">fedora/fix-crash.patch</Patch>
|
||||
<Patch level="1">0.9.3-glibc-sysmacros.patch</Patch>
|
||||
<!--Patch level="1">mageia/01-plymouth-restore-suspend.patch</Patch-->
|
||||
<!-- <Patch level="1">fedora/fix-crash.patch</Patch> -->
|
||||
<Patch level="1">mageia/1001-device_manager-ignore-drm-devices-when-kernel-modese.patch</Patch>
|
||||
<Patch level="1">mageia/1002-main-allow-the-device-timeout-to-be-overridden-on-th.patch</Patch>
|
||||
<Patch level="1">pisilinux/pisilinux.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
@@ -49,16 +54,18 @@
|
||||
<Name>plymouth</Name>
|
||||
<RuntimeDependencies>
|
||||
<Dependency>libdrm</Dependency>
|
||||
<Dependency>plymouth-core-libs</Dependency>
|
||||
<!-- <Dependency>plymouth-core-libs</Dependency> -->
|
||||
<Dependency>plymouth-theme-pisilinux</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="executable">/bin</Path>
|
||||
<Path fileType="executable">/sbin</Path>
|
||||
<Path fileType="executable">/usr/bin</Path>
|
||||
<Path fileType="executable">/usr/sbin</Path>
|
||||
<Path fileType="executable">/bin/plymouth</Path>
|
||||
<Path fileType="executable">/usr/libexec/plymouth</Path>
|
||||
<Path fileType="config">/etc/plymouth</Path>
|
||||
<Path fileType="config">/etc/logrotate.d/bootlog</Path>
|
||||
<Path fileType="library">/usr/lib</Path>
|
||||
<Path fileType="library">/lib</Path>
|
||||
<Path fileType="library">/usr/lib/plymouth/text.so</Path>
|
||||
@@ -74,6 +81,7 @@
|
||||
<Path fileType="data">/var/lib/plymouth</Path>
|
||||
<Path fileType="data">/run/plymouth</Path>
|
||||
<Path fileType="data">/var/spool/plymouth</Path>
|
||||
<Path fileType="locale">/usr/share/locale</Path>
|
||||
<Path fileType="config">/usr/lib/tmpfiles.d/plymouth.conf</Path>
|
||||
</Files>
|
||||
<AdditionalFiles>
|
||||
@@ -93,8 +101,8 @@
|
||||
<Summary>Plymouth core libraries</Summary>
|
||||
<Description>plymouth-core-libs contains the libply and libply-splash-core libraries used by Plymouth.</Description>
|
||||
<Files>
|
||||
<Path fileType="library">/lib/libply-splash-core.so*</Path>
|
||||
<Path fileType="library">/lib/libply.so*</Path>
|
||||
<Path fileType="library">/usr/lib/libply-splash-core.so*</Path>
|
||||
<Path fileType="library">/usr/lib/libply.so*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
@@ -103,7 +111,7 @@
|
||||
<Summary>Plymouth graphics libraries</Summary>
|
||||
<Description>plymouth-graphics-libs contains the libply-splash-graphics library used by graphics Plymouth splashes.</Description>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">plymouth-core-libs</Dependency>
|
||||
<!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
|
||||
<Dependency>libpng</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
@@ -123,11 +131,10 @@
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<!--Package>
|
||||
<Name>plymouth-renderer-x11</Name>
|
||||
<Summary>An X11 renderer for debugging purposes</Summary>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">plymouth-core-libs</Dependency>
|
||||
<Dependency>cairo</Dependency>
|
||||
<Dependency>gtk2</Dependency>
|
||||
<Dependency>atk</Dependency>
|
||||
@@ -139,9 +146,9 @@
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/plymouth/renderers/x11*</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
</Package-->
|
||||
|
||||
<Package>
|
||||
<!--Package>
|
||||
<Name>plymouth-utils</Name>
|
||||
<Summary>Plymouth related utilities</Summary>
|
||||
<Description>plymouth-utils contains utilities that integrate with Plymouth including a boot log viewing application.</Description>
|
||||
@@ -153,7 +160,7 @@
|
||||
<Path fileType="executable">/usr/bin/plymouth-log-viewer</Path>
|
||||
<Path fileType="data">/usr/share/gdm/autostart/LoginWindow/plymouth-log-viewer.desktop</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
</Package-->
|
||||
|
||||
<Package>
|
||||
<Name>plymouth-plugin-label</Name>
|
||||
@@ -162,7 +169,7 @@
|
||||
<RuntimeDependencies>
|
||||
<Dependency>cairo</Dependency>
|
||||
<Dependency>pango</Dependency>
|
||||
<Dependency release="current">plymouth-core-libs</Dependency>
|
||||
<!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
|
||||
<Dependency release="current">plymouth-graphics-libs</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
@@ -176,7 +183,7 @@
|
||||
<Description>plymouth-plugin-fade-throbber 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.</Description>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">plymouth-graphics-libs</Dependency>
|
||||
<Dependency release="current">plymouth-core-libs</Dependency>
|
||||
<!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/plymouth/fade-throbber.so</Path>
|
||||
@@ -207,26 +214,25 @@
|
||||
</Files>
|
||||
</Package>
|
||||
|
||||
<Package>
|
||||
<!--Package>
|
||||
<Name>plymouth-plugin-throbgress</Name>
|
||||
<Summary>Plymouth Throbgress plugin</Summary>
|
||||
<Description>plymouth-plugin-throbgress 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.</Description>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">plymouth-plugin-label</Dependency>
|
||||
<Dependency release="current">plymouth-graphics-libs</Dependency>
|
||||
<Dependency release="current">plymouth-core-libs</Dependency>
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/plymouth/throbgress.so</Path>
|
||||
</Files>
|
||||
</Package>
|
||||
</Package-->
|
||||
|
||||
<Package>
|
||||
<Name>plymouth-theme-spinfinity</Name>
|
||||
<Summary>Plymouth Spinfinity theme</Summary>
|
||||
<Description>plymouth-theme-spinfinity 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.</Description>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">plymouth-plugin-throbgress</Dependency>
|
||||
<!-- <Dependency release="current">plymouth-plugin-throbgress</Dependency> -->
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="data">/usr/share/plymouth/themes/spinfinity</Path>
|
||||
@@ -240,7 +246,7 @@
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">plymouth-plugin-label</Dependency>
|
||||
<Dependency release="current">plymouth-graphics-libs</Dependency>
|
||||
<Dependency release="current">plymouth-core-libs</Dependency>
|
||||
<!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/plymouth/space-flares.so</Path>
|
||||
@@ -266,7 +272,7 @@
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">plymouth-plugin-label</Dependency>
|
||||
<Dependency release="current">plymouth-graphics-libs</Dependency>
|
||||
<Dependency release="current">plymouth-core-libs</Dependency>
|
||||
<!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/plymouth/two-step.so</Path>
|
||||
@@ -291,7 +297,7 @@
|
||||
<Description>plymouth-plugin-script contains "script" boot splash plugin for Plymouth. It features an extensible, scriptable boot splash language that simplifies the process of designing custom boot splash themes.</Description>
|
||||
<RuntimeDependencies>
|
||||
<Dependency release="current">plymouth-graphics-libs</Dependency>
|
||||
<Dependency release="current">plymouth-core-libs</Dependency>
|
||||
<!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
|
||||
</RuntimeDependencies>
|
||||
<Files>
|
||||
<Path fileType="library">/usr/lib/plymouth/script.so</Path>
|
||||
@@ -323,8 +329,15 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="10">
|
||||
<Date>2021-01-25</Date>
|
||||
<Version>0.9.5</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
<Email>muscnsl@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="9">
|
||||
<Date>2020-03-03</Date>
|
||||
<Date>2020-01-25</Date>
|
||||
<Version>0.8.8</Version>
|
||||
<Comment>Rebuild New T.</Comment>
|
||||
<Name>Mustafa Cinasal</Name>
|
||||
|
||||
Reference in New Issue
Block a user