diff --git a/system/boot/plymouth/actions.py b/system/boot/plymouth/actions.py
index c595b92350..ebec4a3ae1 100644
--- a/system/boot/plymouth/actions.py
+++ b/system/boot/plymouth/actions.py
@@ -7,7 +7,6 @@
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
-from pisi.actionsapi import mesontools
from pisi.actionsapi import shelltools
LOGO_FILE = "/usr/share/pixmaps/plymouth-pisilinux.png"
@@ -16,43 +15,35 @@ 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")
+ 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")
- # autotools.autoreconf("-fis")
+ autotools.autoreconf("-fis")
# The end-start colors seems to be used by the two-step plugin
# Disable nouveau drm renderer as it causes hangs when starting X server
- mesontools.configure("-Dtracing=true \
- -Dlogo=%s \
- --bindir=/bin \
- --sbindir=/sbin \
- -Drelease-file=/etc/pisilinux-release \
- -Dbackground-color=0x000000 \
- -Dbackground-end-color-stop=0x000000 \
- -Dbackground-start-color-stop=0x000000 \
- -Dboot-tty=/dev/tty7 \
- -Dshutdown-tty=/dev/tty1 \
- -Dsystemd-integration=false \
- " % LOGO_FILE)
-
- # --with-system-root-install \
- # --with-log-viewer \
- # --disable-libdrm_nouveau \
- # --disable-tests \
- # --disable-static \
- # --enable-gdm-transition \
- # --without-rhgb-compat-link
+ autotools.configure("--enable-tracing \
+ --with-logo=%s \
+ --with-release-file=/etc/pisilinux-release \
+ --with-background-color=0x000000 \
+ --with-background-end-color-stop=0x000000 \
+ --with-background-start-color-stop=0x000000 \
+ --with-system-root-install \
+ --with-boot-tty=/dev/tty7 \
+ --with-shutdown-tty=/dev/tty1 \
+ --with-log-viewer \
+ --disable-libdrm_nouveau \
+ --disable-systemd-integration \
+ --disable-tests \
+ --disable-static \
+ --enable-gdm-transition \
+ --without-rhgb-compat-link" % LOGO_FILE)
def build():
- mesontools.build()
- # autotools.make()
-
+ autotools.make()
def install():
- pisitools.insinto("/usr/share/pixmaps", "plymouth-pisilinux.png")
- mesontools.install()
- # autotools.rawInstall("DESTDIR='%s'" % get.installDIR())
+ autotools.rawInstall("DESTDIR='%s'" % get.installDIR())
# Copy necessary files for Charge theme
pisitools.dodir("%s/charge" % THEMEPATH)
@@ -65,4 +56,4 @@ def install():
# Generate initramfs filelist
#shelltools.system("./generate-flist %s" % get.installDIR())
- pisitools.dodoc("COPYING", "README*", "AUTHORS")
+ pisitools.dodoc("TODO", "COPYING", "README", "ChangeLog")
diff --git a/system/boot/plymouth/files/pisilinux/initramfs.files b/system/boot/plymouth/files/pisilinux/initramfs.files
index c8f7407c0d..22c92fad0b 100644
--- a/system/boot/plymouth/files/pisilinux/initramfs.files
+++ b/system/boot/plymouth/files/pisilinux/initramfs.files
@@ -5,13 +5,11 @@
/lib/libc.so.6
/lib/libdl.so.2
/lib/libm.so.6
-/usr/lib/libply-splash-core.so.5
-/usr/lib/libply.so.5
+/lib/libply-splash-core.so.5
+/lib/libply.so.5
/lib/libpthread.so.0
/lib/librt.so.1
/lib/libz.so.1
-/usr/lib/libevdev.so.2
-/usr/lib/libxkbcommon.so.0
/lib/libudev.so.1
/lib/libudev.so.1.6.3
/sbin/plymouthd
diff --git a/system/boot/plymouth/pspec.xml b/system/boot/plymouth/pspec.xml
index fe5609b7b3..a4735f466c 100644
--- a/system/boot/plymouth/pspec.xml
+++ b/system/boot/plymouth/pspec.xml
@@ -13,15 +13,12 @@
library
Graphical Boot Animation and Logger
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.
- https://freedesktop.org/software/plymouth/releases/plymouth-24.004.60.tar.xz
- https://sourceforge.net/projects/pisilinux/files/source/plymouth-theme-pisilinux-0.4.tar.xz
+ http://freedesktop.org/software/plymouth/releases/plymouth-22.02.122.tar.xz
+ https://sourceforge.net/projects/pisilinux/files/source/plymouth-theme-pisilinux-0.4.tar.xz
pisilinux/generate-flist.py
- pisilinux/images/white-head.png
- meson
- xkeyboard-config
docbook-xsl
kernel-headers
libdrm-devel
@@ -35,7 +32,6 @@
gtk3-devel
eudev-devel
libxslt-devel
- libevdev-devel
@@ -51,11 +47,7 @@
mageia/1002-main-allow-the-device-timeout-to-be-overridden-on-th.patch
- pisilinux/pisilinux-meson.patch
- fedora/0001-Revert-src-Hide-console-text-when-splash-is-requeste.patch
- fedora/0001-ply-boot-splash-Set-unbuffered-input-when-creating-a.patch
- fedora/0001-ply-device-manager-Revert-Fall-back-to-text-plugin-i.patch
- fedora/plymouth-24.004.60-immediately-probe-simpledrm.patch
+ pisilinux/pisilinux.patch
@@ -64,7 +56,7 @@
eudev
libdrm
- plymouth-core-libs
+ plymouth-core-libs
plymouth-theme-pisilinux
@@ -110,14 +102,9 @@
plymouth-core-libs
Plymouth core libraries
plymouth-core-libs contains the libply and libply-splash-core libraries used by Plymouth.
-
- eudev
- libevdev
- libxkbcommon
-
- /usr/lib/libply-splash-core.so*
- /usr/lib/libply.so*
+ /lib/libply-splash-core.so*
+ /lib/libply.so*
@@ -128,7 +115,6 @@
zlib
libpng
- plymouth-core-libs
/usr/lib/libply-splash-graphics.so*
@@ -139,11 +125,6 @@
plymouth-devel
Development headers and files for plymouth
- eudev-devel
- libpng-devel
- libevdev-devel
- xkeyboard-config
- libxkbcommon-devel
plymouth
@@ -157,14 +138,12 @@
An X11 renderer for debugging purposes
cairo
- gtk3
- glib2
+ gtk2
atk
cairo
pango
gdk-pixbuf
fontconfig
- plymouth-core-libs
/usr/lib/plymouth/renderers/x11*
@@ -194,13 +173,10 @@
pango
glib2
harfbuzz
- freetype
plymouth-graphics-libs
- plymouth-core-libs
- /usr/lib/plymouth/label-pango.so
- /usr/lib/plymouth/label-freetype.so
+ /usr/lib/plymouth/label.so
@@ -210,7 +186,7 @@
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.
plymouth-graphics-libs
- plymouth-core-libs
+
/usr/lib/plymouth/fade-throbber.so
@@ -273,7 +249,7 @@
plymouth-plugin-label
plymouth-graphics-libs
- plymouth-core-libs
+
/usr/lib/plymouth/space-flares.so
@@ -297,9 +273,9 @@
Plymouth Two-Step plugin
plymouth-plugin-two-step 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.
-
+ plymouth-plugin-label
plymouth-graphics-libs
- plymouth-core-libs
+
/usr/lib/plymouth/two-step.so
@@ -324,7 +300,7 @@
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.
plymouth-graphics-libs
- plymouth-core-libs
+
/usr/lib/plymouth/script.so
@@ -356,6 +332,13 @@
+
+ 2024-07-20
+ 22.02.122
+ Revert.
+ Mustafa Cinasal
+ muscnsl@gmail.com
+
2024-07-07
24.004.60