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

plymouth revert

Browse Source
This commit is contained in:
Rmys
2024-07-20 18:27:24 +03:00
parent 85a3fe1678
commit 7e96af4e17
3 changed files with 44 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/boot/plymouth/actions.py
+22 -31
View File
@@ -7,7 +7,6 @@
from pisi.actionsapi import get from pisi.actionsapi import get
from pisi.actionsapi import autotools from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools from pisi.actionsapi import pisitools
from pisi.actionsapi import mesontools
from pisi.actionsapi import shelltools from pisi.actionsapi import shelltools
LOGO_FILE = "/usr/share/pixmaps/plymouth-pisilinux.png" LOGO_FILE = "/usr/share/pixmaps/plymouth-pisilinux.png"
@@ -16,43 +15,35 @@ THEMEPATH = "/usr/share/plymouth/themes"
def setup(): def setup():
pisitools.ldflags.add(" -ludev ") pisitools.ldflags.add(" -ludev ")
# /var/run => /run # /var/run => /run
# pisitools.dosed("configure.ac", "^(\s+plymouthruntimedir=)\$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") 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 # 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 # Disable nouveau drm renderer as it causes hangs when starting X server
mesontools.configure("-Dtracing=true \ autotools.configure("--enable-tracing \
-Dlogo=%s \ --with-logo=%s \
--bindir=/bin \ --with-release-file=/etc/pisilinux-release \
--sbindir=/sbin \ --with-background-color=0x000000 \
-Drelease-file=/etc/pisilinux-release \ --with-background-end-color-stop=0x000000 \
-Dbackground-color=0x000000 \ --with-background-start-color-stop=0x000000 \
-Dbackground-end-color-stop=0x000000 \ --with-system-root-install \
-Dbackground-start-color-stop=0x000000 \ --with-boot-tty=/dev/tty7 \
-Dboot-tty=/dev/tty7 \ --with-shutdown-tty=/dev/tty1 \
-Dshutdown-tty=/dev/tty1 \ --with-log-viewer \
-Dsystemd-integration=false \ --disable-libdrm_nouveau \
" % LOGO_FILE) --disable-systemd-integration \
--disable-tests \
# --with-system-root-install \ --disable-static \
# --with-log-viewer \ --enable-gdm-transition \
# --disable-libdrm_nouveau \ --without-rhgb-compat-link" % LOGO_FILE)
# --disable-tests \
# --disable-static \
# --enable-gdm-transition \
# --without-rhgb-compat-link
def build(): def build():
mesontools.build() autotools.make()
# autotools.make()
def install(): def install():
pisitools.insinto("/usr/share/pixmaps", "plymouth-pisilinux.png") autotools.rawInstall("DESTDIR='%s'" % get.installDIR())
mesontools.install()
# autotools.rawInstall("DESTDIR='%s'" % get.installDIR())
# Copy necessary files for Charge theme # Copy necessary files for Charge theme
pisitools.dodir("%s/charge" % THEMEPATH) pisitools.dodir("%s/charge" % THEMEPATH)
@@ -65,4 +56,4 @@ def install():
# Generate initramfs filelist # Generate initramfs filelist
#shelltools.system("./generate-flist %s" % get.installDIR()) #shelltools.system("./generate-flist %s" % get.installDIR())
pisitools.dodoc("COPYING", "README*", "AUTHORS") pisitools.dodoc("TODO", "COPYING", "README", "ChangeLog")
system/boot/plymouth/files/pisilinux/initramfs.files
+2 -4
View File
@@ -5,13 +5,11 @@
/lib/libc.so.6 /lib/libc.so.6
/lib/libdl.so.2 /lib/libdl.so.2
/lib/libm.so.6 /lib/libm.so.6
/usr/lib/libply-splash-core.so.5 /lib/libply-splash-core.so.5
/usr/lib/libply.so.5 /lib/libply.so.5
/lib/libpthread.so.0 /lib/libpthread.so.0
/lib/librt.so.1 /lib/librt.so.1
/lib/libz.so.1 /lib/libz.so.1
/usr/lib/libevdev.so.2
/usr/lib/libxkbcommon.so.0
/lib/libudev.so.1 /lib/libudev.so.1
/lib/libudev.so.1.6.3 /lib/libudev.so.1.6.3
/sbin/plymouthd /sbin/plymouthd
system/boot/plymouth/pspec.xml
+20 -37
View File
@@ -13,15 +13,12 @@
<IsA>library</IsA> <IsA>library</IsA>
<Summary>Graphical Boot Animation and Logger</Summary> <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> <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="3ea1d5b1f755122dc78b82a60c2f3d096668d92e" type="tarxz">https://freedesktop.org/software/plymouth/releases/plymouth-24.004.60.tar.xz</Archive> <Archive sha1sum="2a68a69b674b643cd50c48685669bb0523aeb68b" type="tarxz">http://freedesktop.org/software/plymouth/releases/plymouth-22.02.122.tar.xz</Archive>
<Archive sha1sum="f12d053f015708646d0871332b4b9465e7b11cef" type="tarxz" target="plymouth-24.004.60/themes">https://sourceforge.net/projects/pisilinux/files/source/plymouth-theme-pisilinux-0.4.tar.xz</Archive> <Archive sha1sum="f12d053f015708646d0871332b4b9465e7b11cef" type="tarxz" target="plymouth-22.02.122/themes">https://sourceforge.net/projects/pisilinux/files/source/plymouth-theme-pisilinux-0.4.tar.xz</Archive>
<AdditionalFiles> <AdditionalFiles>
<AdditionalFile permission="0755" target="generate-flist">pisilinux/generate-flist.py</AdditionalFile> <AdditionalFile permission="0755" target="generate-flist">pisilinux/generate-flist.py</AdditionalFile>
<AdditionalFile target="plymouth-pisilinux.png">pisilinux/images/white-head.png</AdditionalFile>
</AdditionalFiles> </AdditionalFiles>
<BuildDependencies> <BuildDependencies>
<Dependency>meson</Dependency>
<Dependency>xkeyboard-config</Dependency>
<Dependency>docbook-xsl</Dependency> <Dependency>docbook-xsl</Dependency>
<Dependency>kernel-headers</Dependency> <Dependency>kernel-headers</Dependency>
<Dependency>libdrm-devel</Dependency> <Dependency>libdrm-devel</Dependency>
@@ -35,7 +32,6 @@
<Dependency>gtk3-devel</Dependency> <Dependency>gtk3-devel</Dependency>
<Dependency>eudev-devel</Dependency> <Dependency>eudev-devel</Dependency>
<Dependency>libxslt-devel</Dependency> <Dependency>libxslt-devel</Dependency>
<Dependency>libevdev-devel</Dependency>
</BuildDependencies> </BuildDependencies>
<Patches> <Patches>
<!-- Pisi Linux patches--> <!-- Pisi Linux patches-->
@@ -51,11 +47,7 @@
<!-- <Patch level="1">fedora/fix-crash.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/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">mageia/1002-main-allow-the-device-timeout-to-be-overridden-on-th.patch</Patch>
<Patch level="1">pisilinux/pisilinux-meson.patch</Patch> <Patch level="1">pisilinux/pisilinux.patch</Patch>
<Patch level="1">fedora/0001-Revert-src-Hide-console-text-when-splash-is-requeste.patch</Patch>
<Patch level="1">fedora/0001-ply-boot-splash-Set-unbuffered-input-when-creating-a.patch</Patch>
<Patch level="1">fedora/0001-ply-device-manager-Revert-Fall-back-to-text-plugin-i.patch</Patch>
<Patch level="1">fedora/plymouth-24.004.60-immediately-probe-simpledrm.patch</Patch>
</Patches> </Patches>
</Source> </Source>
@@ -64,7 +56,7 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>eudev</Dependency> <Dependency>eudev</Dependency>
<Dependency>libdrm</Dependency> <Dependency>libdrm</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency> <Dependency>plymouth-core-libs</Dependency>
<Dependency>plymouth-theme-pisilinux</Dependency> <Dependency>plymouth-theme-pisilinux</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -110,14 +102,9 @@
<Name>plymouth-core-libs</Name> <Name>plymouth-core-libs</Name>
<Summary>Plymouth core libraries</Summary> <Summary>Plymouth core libraries</Summary>
<Description>plymouth-core-libs contains the libply and libply-splash-core libraries used by Plymouth.</Description> <Description>plymouth-core-libs contains the libply and libply-splash-core libraries used by Plymouth.</Description>
<RuntimeDependencies>
<Dependency>eudev</Dependency>
<Dependency>libevdev</Dependency>
<Dependency>libxkbcommon</Dependency>
</RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/libply-splash-core.so*</Path> <Path fileType="library">/lib/libply-splash-core.so*</Path>
<Path fileType="library">/usr/lib/libply.so*</Path> <Path fileType="library">/lib/libply.so*</Path>
</Files> </Files>
</Package> </Package>
@@ -128,7 +115,6 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>zlib</Dependency> <Dependency>zlib</Dependency>
<Dependency>libpng</Dependency> <Dependency>libpng</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/libply-splash-graphics.so*</Path> <Path fileType="library">/usr/lib/libply-splash-graphics.so*</Path>
@@ -139,11 +125,6 @@
<Name>plymouth-devel</Name> <Name>plymouth-devel</Name>
<Summary>Development headers and files for plymouth</Summary> <Summary>Development headers and files for plymouth</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>eudev-devel</Dependency>
<Dependency>libpng-devel</Dependency>
<Dependency>libevdev-devel</Dependency>
<Dependency>xkeyboard-config</Dependency>
<Dependency>libxkbcommon-devel</Dependency>
<Dependency release="current">plymouth</Dependency> <Dependency release="current">plymouth</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
@@ -157,14 +138,12 @@
<Summary>An X11 renderer for debugging purposes</Summary> <Summary>An X11 renderer for debugging purposes</Summary>
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>cairo</Dependency> <Dependency>cairo</Dependency>
<Dependency>gtk3</Dependency> <Dependency>gtk2</Dependency>
<Dependency>glib2</Dependency>
<Dependency>atk</Dependency> <Dependency>atk</Dependency>
<Dependency>cairo</Dependency> <Dependency>cairo</Dependency>
<Dependency>pango</Dependency> <Dependency>pango</Dependency>
<Dependency>gdk-pixbuf</Dependency> <Dependency>gdk-pixbuf</Dependency>
<Dependency>fontconfig</Dependency> <Dependency>fontconfig</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/renderers/x11*</Path> <Path fileType="library">/usr/lib/plymouth/renderers/x11*</Path>
@@ -194,13 +173,10 @@
<Dependency>pango</Dependency> <Dependency>pango</Dependency>
<Dependency>glib2</Dependency> <Dependency>glib2</Dependency>
<Dependency>harfbuzz</Dependency> <Dependency>harfbuzz</Dependency>
<Dependency>freetype</Dependency>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency release="current">plymouth-graphics-libs</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/label-pango.so</Path> <Path fileType="library">/usr/lib/plymouth/label.so</Path>
<Path fileType="library">/usr/lib/plymouth/label-freetype.so</Path>
</Files> </Files>
</Package> </Package>
@@ -210,7 +186,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> <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> <RuntimeDependencies>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency release="current">plymouth-graphics-libs</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency> <!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/fade-throbber.so</Path> <Path fileType="library">/usr/lib/plymouth/fade-throbber.so</Path>
@@ -273,7 +249,7 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">plymouth-plugin-label</Dependency> <Dependency release="current">plymouth-plugin-label</Dependency>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency release="current">plymouth-graphics-libs</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency> <!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/space-flares.so</Path> <Path fileType="library">/usr/lib/plymouth/space-flares.so</Path>
@@ -297,9 +273,9 @@
<Summary>Plymouth Two-Step plugin</Summary> <Summary>Plymouth Two-Step plugin</Summary>
<Description>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.</Description> <Description>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.</Description>
<RuntimeDependencies> <RuntimeDependencies>
<!-- <Dependency release="current">plymouth-plugin-label</Dependency> --> <Dependency release="current">plymouth-plugin-label</Dependency>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency release="current">plymouth-graphics-libs</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency> <!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/two-step.so</Path> <Path fileType="library">/usr/lib/plymouth/two-step.so</Path>
@@ -324,7 +300,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> <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> <RuntimeDependencies>
<Dependency release="current">plymouth-graphics-libs</Dependency> <Dependency release="current">plymouth-graphics-libs</Dependency>
<Dependency release="current">plymouth-core-libs</Dependency> <!-- <Dependency release="current">plymouth-core-libs</Dependency> -->
</RuntimeDependencies> </RuntimeDependencies>
<Files> <Files>
<Path fileType="library">/usr/lib/plymouth/script.so</Path> <Path fileType="library">/usr/lib/plymouth/script.so</Path>
@@ -356,6 +332,13 @@
</Package> </Package>
<History> <History>
<Update release="15">
<Date>2024-07-20</Date>
<Version>22.02.122</Version>
<Comment>Revert.</Comment>
<Name>Mustafa Cinasal</Name>
<Email>muscnsl@gmail.com</Email>
</Update>
<Update release="14"> <Update release="14">
<Date>2024-07-07</Date> <Date>2024-07-07</Date>
<Version>24.004.60</Version> <Version>24.004.60</Version>