Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

plymouth-0.9.5 ver. bump

Browse Source
This commit is contained in:
Rmys
2021-02-13 15:33:35 +03:00
committed by GitHub
parent ba37fced1c
commit 0f80b86ca8
13 changed files with 472 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/boot/plymouth/files/pisilinux/01-add-pisilinux-theme.patch
+39
View File
@@ -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
system/boot/plymouth/files/pisilinux/01-disable-source-code-tracing.patch
+14
View File
@@ -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; \
} \
system/boot/plymouth/files/pisilinux/generate-flist.py
-1
View File
@@ -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",
system/boot/plymouth/files/pisilinux/generate-flist1.py
+74
View File
@@ -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)))
system/boot/plymouth/files/pisilinux/initramfs.files
+6 -7
View File
@@ -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
system/boot/plymouth/files/pisilinux/initramfs1.files
+38
View File
@@ -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
system/boot/plymouth/files/pisilinux/pisilinux.patch
+101
View File
@@ -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