summarylogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.SRCINFO58
-rw-r--r--PKGBUILD132
-rw-r--r--arch-logo.pngbin46233 -> 17066 bytes
-rw-r--r--gdm-plymouth.service16
-rw-r--r--lightdm.service15
-rw-r--r--ply-utils.c.patch28
-rw-r--r--plymouth-deactivate.service1
-rw-r--r--plymouth-quit.service.in.patch9
-rw-r--r--plymouth-start.path10
-rw-r--r--plymouth-start.service18
-rw-r--r--plymouth-update-initrd.patch6
-rw-r--r--plymouth.encrypt_hook8
-rw-r--r--plymouth.encrypt_install5
-rw-r--r--plymouth.initcpio_install50
-rw-r--r--plymouthd.conf.patch10
-rw-r--r--runstatedir.patch46
-rw-r--r--sd-plymouth.initcpio_install33
-rw-r--r--sddm-plymouth.service2
-rw-r--r--slim-plymouth.service14
-rw-r--r--sysmacros.patch27
20 files changed, 247 insertions, 241 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 04fa6964c57e..59bd75bb00e3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,57 +1,49 @@
pkgbase = plymouth
pkgdesc = A graphical boot splash screen with kernel mode-setting support
- pkgver = 0.9.4
- pkgrel = 3
- url = http://www.freedesktop.org/wiki/Software/Plymouth/
+ pkgver = 22.02.122
+ pkgrel = 4
+ url = https://www.freedesktop.org/wiki/Software/Plymouth/
+ arch = i686
arch = x86_64
license = GPL
makedepends = docbook-xsl
depends = libdrm
depends = pango
depends = systemd
- optdepends = ttf-dejavu: For true type font support
+ optdepends = cantarell-fonts: For text output, e.g. during decryption
optdepends = xf86-video-fbdev: Support special graphic cards on early startup
- provides = plymouth
- conflicts = plymouth-git
- conflicts = plymouth-legacy
- conflicts = plymouth-nosystemd
- options = !libtool
- options = !emptydirs
backup = etc/plymouth/plymouthd.conf
- source = http://www.freedesktop.org/software/plymouth/releases/plymouth-0.9.4.tar.xz
+ source = https://gitlab.freedesktop.org/plymouth/plymouth/-/archive/22.02.122/plymouth-22.02.122.tar.gz
source = arch-logo.png
source = plymouth.encrypt_hook
source = plymouth.encrypt_install
- source = gdm-plymouth.service
source = lxdm-plymouth.service
source = lightdm-plymouth.service
- source = slim-plymouth.service
source = sddm-plymouth.service
source = plymouth-deactivate.service
- source = plymouth-start.service
- source = plymouth-start.path
source = plymouth.initcpio_hook
source = plymouth.initcpio_install
source = sd-plymouth.initcpio_install
source = plymouth-quit.service.in.patch
source = plymouth-update-initrd.patch
- md5sums = 4efa5551d230165981b105e7c6a50aa7
- md5sums = 65fa2763d5c9bb9f80973ea5e6e3db3e
- md5sums = d67132b297ccfb1a877a2efd78076963
- md5sums = 02861a13840dee3a5f2224b598274220
- md5sums = ae6e97bb1104bb12cbca6738e3fb872d
- md5sums = 1430ae2ec501d600f8f6771454dc9bbe
- md5sums = 870ea3e63c6989e2badf79d1fbafa914
- md5sums = a3cfc30df846b2d7057a29e7fbe8733a
- md5sums = b95f6979dc2f373045b2ab88a36d6771
- md5sums = 006847d16b852c7a50ee2f241fd9647e
- md5sums = 606cd558141551a1ce0d80150a045d83
- md5sums = 672ad913e2383483bcb4599a0a6bee48
- md5sums = 32f04fdbd1eb94ade30d1e63fdcdd9b5
- md5sums = c17e915b19a469198a37dd7376a846c7
- md5sums = af3c3eadc80e240416d11b2d5983dfb5
- md5sums = 165a39dbedcc6e123c8ca05d5b4b2e25
- md5sums = 0357775c16b5f90f1af485e6a4c80a9e
+ source = plymouthd.conf.patch
+ source = ply-utils.c.patch
+ source = runstatedir.patch
+ sha256sums = 8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6
+ sha256sums = de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7
+ sha256sums = 748e0cfa0e10ab781bc202fceeed46e765ed788784f1b85945187b0f29eafad7
+ sha256sums = 373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a
+ sha256sums = 06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d
+ sha256sums = 86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71
+ sha256sums = c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba
+ sha256sums = 3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb
+ sha256sums = 2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769
+ sha256sums = 9eab84d8748591798e89c9bd301de313e3f6884ccff9f5219102006146acd8f4
+ sha256sums = 50086877511c0890a2778359e969c1a390abec43b4401cbfad988465f09762bb
+ sha256sums = dec28b86ddea93704f8479d33e08f81cd7ff4ccaad57e9053c23bd046db2278a
+ sha256sums = 74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a
+ sha256sums = 71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2
+ sha256sums = 1bd7693d1e135fe9e22a03f7635309e2ae616e952665d9774eb5ca4d82718e1b
+ sha256sums = 7c0224737119f949b8d5ca24c438f253b5734e3391a47e8f5f1dda28b8c4ab92
pkgname = plymouth
-
diff --git a/PKGBUILD b/PKGBUILD
index cc547877cd54..af256060282d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,72 @@
-#
-# Maintainer: Sebastian Lau <lauseb644@gmail.com>
+# Maintainer: Taijian <taijian@posteo.de>
+# Contributor: Sebastian Lau <lauseb644@gmail.com>
# Contributor Damian01w <damian01w@gmail.com>
# Contributor: Padfoot <padfoot@exemail.com.au>
#
pkgname=plymouth
-pkgver=0.9.4
-pkgrel=3
+pkgver=22.02.122
+pkgrel=4
pkgdesc="A graphical boot splash screen with kernel mode-setting support"
-url="http://www.freedesktop.org/wiki/Software/Plymouth/"
-arch=('x86_64')
+url="https://www.freedesktop.org/wiki/Software/Plymouth/"
+arch=('i686' 'x86_64')
license=('GPL')
+
depends=('libdrm' 'pango' 'systemd')
makedepends=('docbook-xsl')
-optdepends=('ttf-dejavu: For true type font support'
- 'xf86-video-fbdev: Support special graphic cards on early startup')
-provides=('plymouth')
-conflicts=('plymouth-git' 'plymouth-legacy' 'plymouth-nosystemd')
+optdepends=('cantarell-fonts: For text output, e.g. during decryption'
+ 'xf86-video-fbdev: Support special graphic cards on early startup')
backup=('etc/plymouth/plymouthd.conf')
-options=('!libtool' '!emptydirs')
+source=("https://gitlab.freedesktop.org/${pkgname}/${pkgname}/-/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
+ 'arch-logo.png'
+ 'plymouth.encrypt_hook'
+ 'plymouth.encrypt_install'
+ 'lxdm-plymouth.service'
+ 'lightdm-plymouth.service'
+ 'sddm-plymouth.service'
+ 'plymouth-deactivate.service' # needed for sddm
+ 'plymouth.initcpio_hook'
+ 'plymouth.initcpio_install'
+ 'sd-plymouth.initcpio_install'
+ 'plymouth-quit.service.in.patch'
+ 'plymouth-update-initrd.patch'
+ 'plymouthd.conf.patch'
+ 'ply-utils.c.patch'
+ 'runstatedir.patch'
+)
-source=("http://www.freedesktop.org/software/${pkgname}/releases/${pkgname}-${pkgver}.tar.xz"
- 'arch-logo.png'
- 'plymouth.encrypt_hook'
- 'plymouth.encrypt_install'
- 'gdm-plymouth.service'
- 'lxdm-plymouth.service'
- 'lightdm-plymouth.service'
- 'slim-plymouth.service'
- 'sddm-plymouth.service'
- 'plymouth-deactivate.service'
- 'plymouth-start.service'
- 'plymouth-start.path'
- 'plymouth.initcpio_hook'
- 'plymouth.initcpio_install'
- 'sd-plymouth.initcpio_install'
- 'plymouth-quit.service.in.patch'
- 'plymouth-update-initrd.patch')
-
-md5sums=('4efa5551d230165981b105e7c6a50aa7'
- '65fa2763d5c9bb9f80973ea5e6e3db3e'
- 'd67132b297ccfb1a877a2efd78076963'
- '02861a13840dee3a5f2224b598274220'
- 'ae6e97bb1104bb12cbca6738e3fb872d'
- '1430ae2ec501d600f8f6771454dc9bbe'
- '870ea3e63c6989e2badf79d1fbafa914'
- 'a3cfc30df846b2d7057a29e7fbe8733a'
- 'b95f6979dc2f373045b2ab88a36d6771'
- '006847d16b852c7a50ee2f241fd9647e'
- '606cd558141551a1ce0d80150a045d83'
- '672ad913e2383483bcb4599a0a6bee48'
- '32f04fdbd1eb94ade30d1e63fdcdd9b5'
- 'c17e915b19a469198a37dd7376a846c7'
- 'af3c3eadc80e240416d11b2d5983dfb5'
- '165a39dbedcc6e123c8ca05d5b4b2e25'
- '0357775c16b5f90f1af485e6a4c80a9e')
+sha256sums=('8921cd61a9f32f5f8903ceffb9ab0defaef8326253e1549ef85587c19b7f2ab6'
+ 'de4369ad5a5511b684305e3a882c2c56204696514ea8ccdb556dd656eca062e7'
+ '748e0cfa0e10ab781bc202fceeed46e765ed788784f1b85945187b0f29eafad7'
+ '373ec20fe4c47e693a0c45cc06dd906e35dd1d70a85546bd1d571391de11763a'
+ '06b31999cf60f49e536c7a12bc1c4f75f2671feb848bf5ccb91a963147e2680d'
+ '86d0230d9393c9d83eb7bb430e6b0fb5e3f32e78fcd30f3ecd4e6f3c30b18f71'
+ 'c39f526f7e99173bc8f012900f53257537a25e2d8c19e23df630f1fe9a7627ba'
+ '3b17ed58b59a4b60d904c60bba52bae7ad685aa8273f6ceaae08a15870c0a9eb'
+ '2a80e2cad8de428358647677afa166219589d3338c5f94838146c804a29e2769'
+ '9eab84d8748591798e89c9bd301de313e3f6884ccff9f5219102006146acd8f4'
+ '50086877511c0890a2778359e969c1a390abec43b4401cbfad988465f09762bb'
+ 'dec28b86ddea93704f8479d33e08f81cd7ff4ccaad57e9053c23bd046db2278a'
+ '74908ba59cea53c6a9ab67bb6dec1de1616f3851a0fd89bb3c157a1c54e6633a'
+ '71d34351b4313da01e1ceeb082d9776599974ce143c87e93f0a465f342a74fd2'
+ '1bd7693d1e135fe9e22a03f7635309e2ae616e952665d9774eb5ca4d82718e1b'
+ '7c0224737119f949b8d5ca24c438f253b5734e3391a47e8f5f1dda28b8c4ab92')
prepare() {
cd "$srcdir"/${pkgname}-${pkgver}
patch -p1 -i $srcdir/plymouth-update-initrd.patch
patch -p1 -i $srcdir/plymouth-quit.service.in.patch
+ patch -p1 -i $srcdir/plymouthd.conf.patch
+ # apply upstream patches
+ patch -p1 -i $srcdir/ply-utils.c.patch
+ patch -p1 -i $srcdir/runstatedir.patch
}
build() {
cd "$srcdir"/${pkgname}-${pkgver}
- LDFLAGS="$LDFLAGS -ludev" ./configure \
+ LDFLAGS="$LDFLAGS -ludev" ./autogen.sh \
--prefix=/usr \
--exec-prefix=/usr \
--sysconfdir=/etc \
@@ -79,41 +79,35 @@ build() {
--enable-tracing \
--enable-pango \
--enable-gtk=no \
- --enable-tracing \
- --disable-tests \
- --without-boot-entry \
- --without-default-plugin \
- --enable-gdm-transition \
- --with-logo=/usr/share/plymouth/arch-logo.png \
--with-release-file=/etc/os-release \
+ --with-logo=/usr/share/plymouth/arch-logo.png \
--with-background-color=0x000000 \
--with-background-start-color-stop=0x000000 \
--with-background-end-color-stop=0x4D4D4D \
--without-rhgb-compat-link \
- --without-system-root-install
+ --without-system-root-install \
+ --runstatedir=/run
make
}
package() {
- cd "$srcdir"/${pkgname}-${pkgver}
+ cd "$srcdir"/${pkgname}-${pkgver}
- make DESTDIR="$pkgdir" install
+ make DESTDIR="$pkgdir" install
- install -Dm644 "$srcdir/arch-logo.png" "$pkgdir/usr/share/plymouth/arch-logo.png"
+ install -Dm644 "$srcdir/arch-logo.png" "$pkgdir/usr/share/plymouth/arch-logo.png"
- install -Dm644 "$srcdir/plymouth.encrypt_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt"
- install -Dm644 "$srcdir/plymouth.encrypt_install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt"
- install -Dm644 "$srcdir/plymouth.initcpio_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth"
- install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth"
- install -Dm644 "$srcdir/sd-plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/sd-plymouth"
+ install -Dm644 "$srcdir/plymouth.encrypt_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth-encrypt"
+ install -Dm644 "$srcdir/plymouth.encrypt_install" "$pkgdir/usr/lib/initcpio/install/plymouth-encrypt"
+ install -Dm644 "$srcdir/plymouth.initcpio_hook" "$pkgdir/usr/lib/initcpio/hooks/plymouth"
+ install -Dm644 "$srcdir/plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/plymouth"
+ install -Dm644 "$srcdir/sd-plymouth.initcpio_install" "$pkgdir/usr/lib/initcpio/install/sd-plymouth"
- for i in {gdm,sddm,lxdm,slim,lightdm}-plymouth.service; do
- install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i"
- done
+ for i in {sddm,lxdm,lightdm}-plymouth.service; do
+ install -Dm644 "$srcdir/$i" "$pkgdir/usr/lib/systemd/system/$i"
+ done
- install -Dm644 "$srcdir/plymouth-deactivate.service" "$pkgdir/usr/lib/systemd/system/plymouth-deactivate.service"
- install -Dm644 "$srcdir/plymouth-start.service" "$pkgdir/usr/lib/systemd/system/plymouth-start.service"
- install -Dm644 "$srcdir/plymouth-start.path" "$pkgdir/usr/lib/systemd/system/plymouth-start.path"
- install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
+ install -Dm644 "$srcdir/plymouth-deactivate.service" "$pkgdir/usr/lib/systemd/system/plymouth-deactivate.service"
+ install -Dm644 "$pkgdir/usr/share/plymouth/plymouthd.defaults" "$pkgdir/etc/plymouth/plymouthd.conf"
}
diff --git a/arch-logo.png b/arch-logo.png
index 9f8446bff732..69e1c5e911e0 100644
--- a/arch-logo.png
+++ b/arch-logo.png
Binary files differ
diff --git a/gdm-plymouth.service b/gdm-plymouth.service
deleted file mode 100644
index e1bd77b4d628..000000000000
--- a/gdm-plymouth.service
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=GNOME Display Manager
-Conflicts=getty@tty1.service plymouth-quit.service
-Wants=plymouth-deactivate.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service
-
-[Service]
-ExecStart=/usr/bin/gdm
-Restart=always
-IgnoreSIGPIPE=no
-BusName=org.gnome.DisplayManager
-StandardOutput=syslog
-StandardError=inherit
-
-[Install]
-Alias=display-manager.service
diff --git a/lightdm.service b/lightdm.service
deleted file mode 100644
index b2fcd829266d..000000000000
--- a/lightdm.service
+++ /dev/null
@@ -1,15 +0,0 @@
-[Unit]
-Description=Light Display Manager
-Documentation=man:lightdm(1)
-Conflicts=getty@tty1.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service
-
-[Service]
-ExecStart=/usr/bin/lightdm
-Restart=always
-IgnoreSIGPIPE=no
-BusName=org.freedesktop.DisplayManager
-
-[Install]
-Alias=display-manager.service
-
diff --git a/ply-utils.c.patch b/ply-utils.c.patch
new file mode 100644
index 000000000000..77aeadf31ba4
--- /dev/null
+++ b/ply-utils.c.patch
@@ -0,0 +1,28 @@
+@@ -0,0 +1,30 @@
+From 5f1e43c00039a7fe1fff768b91a05a695fb4a53d Mon Sep 17 00:00:00 2001
+From: Ray Strode <rstrode@redhat.com>
+Date: Wed, 3 Aug 2022 15:23:33 -0400
+Subject: [PATCH] ply-utils: Drop linux/fs.h include
+
+It was needed long ago for a function we no longer even have.
+
+Now it's causing compile errors on Fedora 37 because it's conflicting
+with sys/mount.h.
+
+This commit drops it.
+---
+ src/libply/ply-utils.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/libply/ply-utils.c b/src/libply/ply-utils.c
+index c7b165e9..219e2e77 100644
+--- a/src/libply/ply-utils.c
++++ b/src/libply/ply-utils.c
+@@ -46,7 +46,6 @@
+ #include <sys/user.h>
+ #include <sys/wait.h>
+ #include <time.h>
+-#include <linux/fs.h>
+ #include <linux/vt.h>
+
+ #include <dlfcn.h>
diff --git a/plymouth-deactivate.service b/plymouth-deactivate.service
index 2c6f34954093..6f1d87eb4333 100644
--- a/plymouth-deactivate.service
+++ b/plymouth-deactivate.service
@@ -7,3 +7,4 @@ Before=getty@tty1.service
ExecStart=/usr/bin/plymouth deactivate
Type=oneshot
TimeoutSec=20
+RemainAfterExit=yes
diff --git a/plymouth-quit.service.in.patch b/plymouth-quit.service.in.patch
index ec3435cea42b..cc226e1c6ba1 100644
--- a/plymouth-quit.service.in.patch
+++ b/plymouth-quit.service.in.patch
@@ -1,6 +1,6 @@
-diff -aur plymouth-0.8.8.src/systemd-units/plymouth-quit.service.in plymouth-0.8.8.patch/systemd-units/plymouth-quit.service.in
---- plymouth-0.8.8.src/systemd-units/plymouth-quit.service.in 2012-09-27 02:50:53.000000000 +1000
-+++ plymouth-0.8.8.patch/systemd-units/plymouth-quit.service.in 2014-02-11 16:36:58.813194805 +1100
+diff -aur plymouth.src/systemd-units/plymouth-quit.service.in plymouth.patch/systemd-units/plymouth-quit.service.in
+--- plymouth.src/systemd-units/plymouth-quit.service.in 2014-02-20 19:38:13.329427597 +1100
++++ plymouth.patch/systemd-units/plymouth-quit.service.in 2014-02-20 19:40:52.619343839 +1100
@@ -1,8 +1,9 @@
[Unit]
Description=Terminate Plymouth Boot Screen
@@ -8,7 +8,6 @@ diff -aur plymouth-0.8.8.src/systemd-units/plymouth-quit.service.in plymouth-0.8
+Before=getty@tty1.service
[Service]
--ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
-+ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit --retain-splash
+ ExecStart=-@PLYMOUTH_CLIENT_DIR@/plymouth quit
Type=oneshot
TimeoutSec=20
diff --git a/plymouth-start.path b/plymouth-start.path
deleted file mode 100644
index 6a8c957a0958..000000000000
--- a/plymouth-start.path
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Automatically Start Plymouth Boot Screen
-
-[Path]
-PathExistsGlob=/sys/class/graphics/fb*/device/drm/
-Unit=plymouth-start.service
-
-[Install]
-WantedBy=sysinit.target
-
diff --git a/plymouth-start.service b/plymouth-start.service
deleted file mode 100644
index fb58ad729241..000000000000
--- a/plymouth-start.service
+++ /dev/null
@@ -1,18 +0,0 @@
-[Unit]
-Description=Show Plymouth Boot Screen
-DefaultDependencies=no
-Wants=systemd-ask-password-plymouth.path systemd-vconsole-setup.service
-After=systemd-vconsole-setup.service systemd-udev-trigger.service systemd-udevd.service
-Before=systemd-ask-password-plymouth.service
-ConditionKernelCommandLine=!plymouth.enable=0
-
-[Service]
-ExecStart=/usr/bin/plymouthd --mode=boot --pid-file=/run/plymouth/pid --attach-to-session
-ExecStartPost=-/usr/bin/plymouth show-splash
-Type=forking
-RuntimeDirectory=plymouth
-KillMode=none
-SendSIGKILL=no
-
-[Install]
-WantedBy=sysinit.target
diff --git a/plymouth-update-initrd.patch b/plymouth-update-initrd.patch
index 47d88a60d6db..0d0235cf750d 100644
--- a/plymouth-update-initrd.patch
+++ b/plymouth-update-initrd.patch
@@ -1,6 +1,6 @@
-diff -aur plymouth-0.9.0.src/scripts/plymouth-update-initrd plymouth-0.9.0.patch/scripts/plymouth-update-initrd
---- plymouth-0.9.0.src/scripts/plymouth-update-initrd 2014-01-16 08:14:47.000000000 +1100
-+++ plymouth-0.9.0.patch/scripts/plymouth-update-initrd 2014-05-21 19:04:16.802594001 +1000
+diff -aur plymouth.src/scripts/plymouth-update-initrd plymouth.patch/scripts/plymouth-update-initrd
+--- plymouth.src/scripts/plymouth-update-initrd 2014-02-20 19:38:13.319427393 +1100
++++ plymouth.patch/scripts/plymouth-update-initrd 2014-02-20 19:54:13.035553244 +1100
@@ -1,2 +1,4 @@
#!/bin/bash
-dracut -f
diff --git a/plymouth.encrypt_hook b/plymouth.encrypt_hook
index a623debf54a6..8acb9af138e3 100644
--- a/plymouth.encrypt_hook
+++ b/plymouth.encrypt_hook
@@ -51,9 +51,15 @@ EOF
for cryptopt in ${cryptoptions//,/ }; do
case ${cryptopt} in
- allow-discards)
+ allow-discards|discard)
cryptargs="${cryptargs} --allow-discards"
;;
+ no-read-workqueue|perf-no_read_workqueue)
+ cryptargs="${cryptargs} --perf-no_read_workqueue"
+ ;;
+ no-write-workqueue|perf-no_write_workqueue)
+ cryptargs="${cryptargs} --perf-no_write_workqueue"
+ ;;
*)
echo "Encryption option '${cryptopt}' not known, ignoring." >&2
;;
diff --git a/plymouth.encrypt_install b/plymouth.encrypt_install
index 668e32428f9a..5088e7dc1886 100644
--- a/plymouth.encrypt_install
+++ b/plymouth.encrypt_install
@@ -18,11 +18,6 @@ build() {
add_file "/usr/lib/udev/rules.d/13-dm-disk.rules"
add_file "/usr/lib/udev/rules.d/95-dm-notify.rules"
add_file "/usr/lib/initcpio/udev/11-dm-initramfs.rules" "/usr/lib/udev/rules.d/11-dm-initramfs.rules"
- add_binary "/usr/lib/plymouth/label.so"
- add_binary "/usr/lib/plymouth/text.so"
- add_file "/usr/share/fonts/TTF/DejaVuSans.ttf"
- add_file "/etc/fonts/fonts.conf"
- add_file "/etc/fonts/conf.d/60-latin.conf"
# cryptsetup calls pthread_create(), which dlopen()s libgcc_s.so.1
add_binary "/usr/lib/libgcc_s.so.1"
diff --git a/plymouth.initcpio_install b/plymouth.initcpio_install
index f437971439ea..12025e046a31 100644
--- a/plymouth.initcpio_install
+++ b/plymouth.initcpio_install
@@ -1,30 +1,45 @@
+#!/bin/bash
+# /etc/initcpio/install/plymouth — mkinitcpio hook for plymouth
+
build() {
add_dir /dev/pts
add_dir /usr/share/plymouth/themes
- add_dir /var/run/plymouth
+ add_dir /run/plymouth
- DATADIR="/usr/share"
- PLYMOUTH_LOGO_FILE="${DATADIR}/plymouth/arch-logo.png"
+ DATADIR="/usr/share/plymouth"
+ PLYMOUTH_LOGO_FILE="${DATADIR}/arch-logo.png"
PLYMOUTH_THEME_NAME="$(/usr/bin/plymouth-set-default-theme)"
- PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
+ PLYMOUTH_THEME_DIR="${DATADIR}/themes/${PLYMOUTH_THEME_NAME}"
+ PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//')
PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
+ PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
add_binary /usr/bin/plymouthd
add_binary /usr/bin/plymouth
+ add_binary /usr/lib/plymouth/plymouthd-fd-escrow
- add_file ${DATADIR}/plymouth/themes/text/text.plymouth
+ add_file ${DATADIR}/themes/text/text.plymouth
add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so
- add_file ${DATADIR}/plymouth/themes/details/details.plymouth
+ add_file ${DATADIR}/themes/details/details.plymouth
add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so
add_file "${PLYMOUTH_LOGO_FILE}"
add_file /etc/os-release
add_file /etc/plymouth/plymouthd.conf
- add_file ${DATADIR}/plymouth/plymouthd.defaults
+ add_file ${DATADIR}/plymouthd.defaults
+
+ if [ -f "/usr/share/fonts/cantarell/Cantarell-VF.otf" ]; then
+ add_binary ${PLYMOUTH_PLUGIN_PATH}/label.so
+ add_file "/etc/fonts/fonts.conf"
+ add_file "/usr/share/fonts/cantarell/Cantarell-VF.otf"
+ if [ -f "/etc/fonts/conf.d/60-latin.conf" ]; then
+ add_file "/etc/fonts/conf.d/60-latin.conf"
+ fi
+ fi
if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
- echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
- exit 1
+ echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
+ exit 1
fi
add_binary ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so
@@ -32,10 +47,14 @@ build() {
add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so
add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
- if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
- add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
+ if [ -d ${PLYMOUTH_THEME_DIR} ]; then
+ add_full_dir ${PLYMOUTH_THEME_DIR}
fi
-
+
+ if [ "${PLYMOUTH_IMAGE_DIR}" != "${PLYMOUTH_THEME_DIR}" -a -d ${PLYMOUTH_IMAGE_DIR} ]; then
+ add_full_dir ${PLYMOUTH_IMAGE_DIR}
+ fi
+
add_file /usr/lib/udev/rules.d/70-uaccess.rules
add_file /usr/lib/udev/rules.d/71-seat.rules
@@ -50,8 +69,7 @@ build() {
}
help() {
- echo "This hook includes plymouth in the initramfs image."
+ cat <<HELPEOF
+This hook includes plymouth in the initramfs image.
+HELPEOF
}
-
-# vim: set ft=sh:
-#EOF
diff --git a/plymouthd.conf.patch b/plymouthd.conf.patch
new file mode 100644
index 000000000000..da3105178530
--- /dev/null
+++ b/plymouthd.conf.patch
@@ -0,0 +1,10 @@
+--- plymouth.src/src/plymouthd.defaults
++++ plymouth.patch/src/plymouthd.defaults
+@@ -1,5 +1,4 @@
+-# Distribution defaults. Changes to this file will get overwritten during
+-# upgrades.
++# Set your plymouth configuration here.
+ [Daemon]
+ Theme=spinner
+ ShowDelay=0
+
diff --git a/runstatedir.patch b/runstatedir.patch
new file mode 100644
index 000000000000..963b6e910e07
--- /dev/null
+++ b/runstatedir.patch
@@ -0,0 +1,46 @@
+diff --git a/configure.ac b/configure.ac
+index 608ad02c8b268f1ffa6e0ba62dea7da2eaed0636..34a2f2ce68abe648f79ccbf93505f1ccf8c4d744 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -140,9 +140,7 @@ if test x$enable_systemd_integration = xyes; then
+ AC_SUBST(SYSTEMD_UNIT_DIR)
+ fi
+
+-AC_ARG_WITH([runtimedir],
+- AC_HELP_STRING([--with-runtimedir=DIR], [runtime data dir [LOCALSTATEDIR/run]]),
+- [plymouthruntimedir=${withval}/plymouth], [plymouthruntimedir=""])
++AC_ARG_WITH([runtimedir], [], [AC_MSG_ERROR([--with-runtimedir is obsolete, use --runstatedir instead])], [])
+
+ AC_ARG_WITH(system-root-install, AS_HELP_STRING([--with-system-root-install],[Install client in /bin and daemon in /sbin]),with_system_root_install=${withval},with_system_root_install=no)
+ AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = yes])
+@@ -150,16 +148,11 @@ AM_CONDITIONAL(WITH_SYSTEM_ROOT_INSTALL, [test "$with_system_root_install" = ye
+ if test x$with_system_root_install = xyes; then
+ plymouthclientdir=/bin
+ plymouthdaemondir=/sbin
+- if (test -z "${plymouthruntimedir}"); then
+- plymouthruntimedir=/run/plymouth
+- fi
+ else
+ plymouthclientdir=$bindir
+ plymouthdaemondir=$sbindir
+- if (test -z "${plymouthruntimedir}"); then
+- plymouthruntimedir=$localstatedir/run/plymouth
+- fi
+ fi
++plymouthruntimedir=$runstatedir/plymouth
+ AC_SUBST(plymouthclientdir)
+ AC_SUBST(plymouthdaemondir)
+ AC_SUBST(plymouthruntimedir)
+diff --git a/src/Makefile.am b/src/Makefile.am
+index ad3655d5944cebad36761cee44d9d79241a6d942..abd7a4ce2aafa21b73303b9cc6d3639c58706a90 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,7 +37,7 @@ escrow_PROGRAMS = plymouthd-fd-escrow
+
+ plymouthd_fd_escrow_SOURCES = plymouthd-fd-escrow.c
+
+-plymouthdrundir = $(localstatedir)/run/plymouth
++plymouthdrundir = $(plymouthruntimedir)
+ plymouthdspooldir = $(localstatedir)/spool/plymouth
+ plymouthdtimedir = $(localstatedir)/lib/plymouth
+
diff --git a/sd-plymouth.initcpio_install b/sd-plymouth.initcpio_install
index 2add5632b3cb..d22d311dd748 100644
--- a/sd-plymouth.initcpio_install
+++ b/sd-plymouth.initcpio_install
@@ -6,24 +6,36 @@ build() {
add_dir /usr/share/plymouth/themes
add_dir /run/plymouth
- DATADIR="/usr/share"
- PLYMOUTH_LOGO_FILE="${DATADIR}/plymouth/arch-logo.png"
+ DATADIR="/usr/share/plymouth"
+ PLYMOUTH_LOGO_FILE="${DATADIR}/arch-logo.png"
PLYMOUTH_THEME_NAME="$(/usr/bin/plymouth-set-default-theme)"
- PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
+ PLYMOUTH_THEME_DIR="${DATADIR}/themes/${PLYMOUTH_THEME_NAME}"
+ PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//')
PLYMOUTH_PLUGIN_PATH="$(plymouth --get-splash-plugin-path)"
+ PLYMOUTH_MODULE_NAME="$(grep "ModuleName *= *" ${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')"
add_binary /usr/bin/plymouthd
add_binary /usr/bin/plymouth
+ add_binary /usr/lib/plymouth/plymouthd-fd-escrow
- add_file ${DATADIR}/plymouth/themes/text/text.plymouth
+ add_file ${DATADIR}/themes/text/text.plymouth
add_binary ${PLYMOUTH_PLUGIN_PATH}/text.so
- add_file ${DATADIR}/plymouth/themes/details/details.plymouth
+ add_file ${DATADIR}/themes/details/details.plymouth
add_binary ${PLYMOUTH_PLUGIN_PATH}/details.so
add_file "${PLYMOUTH_LOGO_FILE}"
add_file /etc/os-release
add_file /etc/plymouth/plymouthd.conf
- add_file ${DATADIR}/plymouth/plymouthd.defaults
+ add_file ${DATADIR}/plymouthd.defaults
+
+ if [ -f "/usr/share/fonts/cantarell/Cantarell-VF.otf" ]; then
+ add_binary ${PLYMOUTH_PLUGIN_PATH}/label.so
+ add_file "/etc/fonts/fonts.conf"
+ add_file "/usr/share/fonts/cantarell/Cantarell-VF.otf"
+ if [ -f "/etc/fonts/conf.d/60-latin.conf" ]; then
+ add_file "/etc/fonts/conf.d/60-latin.conf"
+ fi
+ fi
if [ ! -f ${PLYMOUTH_PLUGIN_PATH}/${PLYMOUTH_MODULE_NAME}.so ]; then
echo "The default plymouth plugin (${PLYMOUTH_MODULE_NAME}) doesn't exist" > /dev/stderr
@@ -35,8 +47,12 @@ build() {
add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/drm.so
add_binary ${PLYMOUTH_PLUGIN_PATH}/renderers/frame-buffer.so
- if [ -d ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME} ]; then
- add_full_dir ${DATADIR}/plymouth/themes/${PLYMOUTH_THEME_NAME}
+ if [ -d ${PLYMOUTH_THEME_DIR} ]; then
+ add_full_dir ${PLYMOUTH_THEME_DIR}
+ fi
+
+ if [ "${PLYMOUTH_IMAGE_DIR}" != "${PLYMOUTH_THEME_DIR}" -a -d ${PLYMOUTH_IMAGE_DIR} ]; then
+ add_full_dir ${PLYMOUTH_IMAGE_DIR}
fi
add_udev_rule 70-uaccess.rules
@@ -53,6 +69,7 @@ build() {
plymouth-read-write.service \
plymouth-reboot.service \
plymouth-start.service \
+ plymouth-switch-root-initramfs.service \
plymouth-switch-root.service
}
diff --git a/sddm-plymouth.service b/sddm-plymouth.service
index 6217b2638239..49fcf224d5f4 100644
--- a/sddm-plymouth.service
+++ b/sddm-plymouth.service
@@ -3,7 +3,7 @@ Description=Simple Desktop Display Manager
Documentation=man:sddm(1) man:sddm.conf(5)
Conflicts=getty@tty1.service
Wants=plymouth-deactivate.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service systemd-logind.service
+After=systemd-user-sessions.service getty@tty1.service plymouth-quit.service systemd-logind.service plymouth-deactivate.service
[Service]
ExecStart=/usr/bin/sddm
diff --git a/slim-plymouth.service b/slim-plymouth.service
deleted file mode 100644
index 6ee9a6b4c837..000000000000
--- a/slim-plymouth.service
+++ /dev/null
@@ -1,14 +0,0 @@
-[Unit]
-Description=SLiM Simple Login Manager
-Conflicts=getty@tty1.service plymouth-quit.service
-Wants=plymouth-deactivate.service
-After=systemd-user-sessions.service getty@tty1.service plymouth-deactivate.service plymouth-quit.service
-
-[Service]
-ExecStart=/usr/bin/slim -nodaemon
-Restart=always
-IgnoreSIGPIPE=no
-StandardOutput=syslog
-
-[Install]
-Alias=display-manager.service
diff --git a/sysmacros.patch b/sysmacros.patch
deleted file mode 100644
index 0624037c395d..000000000000
--- a/sysmacros.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e12b5ee34c619e88509f59424068417790b69e04 Mon Sep 17 00:00:00 2001
-From: Sakaki <sakaki@deciban.com>
-Date: Fri, 18 Aug 2017 10:08:23 -0400
-Subject: terminal: add include for sysmacros.h
-
-That file is, in some cases, not included implicitly by sys/types.h.
-
-This commit explicitly includes it.
----
- src/libply-splash-core/ply-terminal.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/libply-splash-core/ply-terminal.c b/src/libply-splash-core/ply-terminal.c
-index a0954f2..f3b32fe 100644
---- a/src/libply-splash-core/ply-terminal.c
-+++ b/src/libply-splash-core/ply-terminal.c
-@@ -32,6 +32,7 @@
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/types.h>
-+#include <sys/sysmacros.h>
- #include <termios.h>
- #include <unistd.h>
- #include <wchar.h>
---
-cgit v1.1
-