Balló György pushed to branch main at Arch Linux / Packaging / Packages /
plymouth
Commits:
89b67961 by Balló György at 2024-02-14T03:48:54+01:00
upgpkg: 24.004.60-6 - Copy configured theme into shutdown initramfs
When the 'plymouth.prefer-fbcon' parameter is specified and the user
switches back to the splash screen by Esc key, Plymouth reloads the theme from
the filesystem, which fails if it's missing from the initramfs.
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- plymouth-shutdown.initcpio_install
Changes:
=====================================
.SRCINFO
=====================================
@@ -1,7 +1,7 @@
pkgbase = plymouth
pkgdesc = Graphical boot splash screen
pkgver = 24.004.60
- pkgrel = 5
+ pkgrel = 6
url = https://www.freedesktop.org/wiki/Software/Plymouth/
install = plymouth.install
arch = x86_64
@@ -41,7 +41,7 @@ pkgbase = plymouth
sha256sums =
a261cf07ec57d7cb230b589e7f85a3080125b89248b1fb6191bc38aefc24076e
sha256sums =
de852646e615e06d4125eb2e646d0528d1e349bd9e9877c08c5d32c43d288b6f
sha256sums =
ecd979b70a613b6aea05443da735e95a8c7341fbc9f099da807bd82394f5d3cf
- sha256sums =
47be172735989dff66353a663ac58987719b9d8031398669dbcadf465afe7d24
+ sha256sums =
d75b67c7c28698c1e27864a63f3f405897aea053c346c2478ee97d0caec241d5
sha256sums =
04af86a0ec83fc92d7339e1a7fcc0d55b86b95797a1a5f1a3b8d850996a3926c
pkgname = plymouth
=====================================
PKGBUILD
=====================================
@@ -6,7 +6,7 @@
pkgname=plymouth
pkgver=24.004.60
-pkgrel=5
+pkgrel=6
pkgdesc='Graphical boot splash screen'
arch=('x86_64')
url='https://www.freedesktop.org/wiki/Software/Plymouth/'
@@ -32,7 +32,7 @@
sha256sums=('f3f7841358c98f5e7b06a9eedbdd5e6882fd9f38bbd14a767fb083e3b55b1c34'
'a261cf07ec57d7cb230b589e7f85a3080125b89248b1fb6191bc38aefc24076e'
'de852646e615e06d4125eb2e646d0528d1e349bd9e9877c08c5d32c43d288b6f'
'ecd979b70a613b6aea05443da735e95a8c7341fbc9f099da807bd82394f5d3cf'
- '47be172735989dff66353a663ac58987719b9d8031398669dbcadf465afe7d24'
+ 'd75b67c7c28698c1e27864a63f3f405897aea053c346c2478ee97d0caec241d5'
'04af86a0ec83fc92d7339e1a7fcc0d55b86b95797a1a5f1a3b8d850996a3926c')
prepare() {
=====================================
plymouth-shutdown.initcpio_install
=====================================
@@ -4,6 +4,7 @@ build() {
# get default theme settings
local PLYMOUTH_THEME_NAME=$(plymouth-set-default-theme)
local PLYMOUTH_THEME_DIR="/usr/share/plymouth/themes/$PLYMOUTH_THEME_NAME"
+ local PLYMOUTH_IMAGE_DIR=$(sed -n "s/^ *ImageDir *= *//p"
"$PLYMOUTH_THEME_DIR/$PLYMOUTH_THEME_NAME.plymouth")
local PLYMOUTH_FONT_NAME=$(sed -n "s/^ *Font *= *//p"
"$PLYMOUTH_THEME_DIR/$PLYMOUTH_THEME_NAME.plymouth" | sed -e 's/ [0-9]\+ *$//'
-e 's/ \(Regular\|Bold\|Italic\|Bold Italic\|Oblique\|Bold
Oblique\|Thin\|Light\|Extra Bold\) *$/:style=\1/')
local PLYMOUTH_FONT_PATH=$(fc-match -f %{file} "$PLYMOUTH_FONT_NAME")
local PLYMOUTH_TITLE_FONT_NAME=$(sed -n "s/^ *TitleFont *= *//p"
"$PLYMOUTH_THEME_DIR/$PLYMOUTH_THEME_NAME.plymouth" | sed -e 's/ [0-9]\+ *$//'
-e 's/ \(Regular\|Bold\|Italic\|Bold Italic\|Oblique\|Bold
Oblique\|Thin\|Light\|Extra Bold\) *$/:style=\1/')
@@ -35,6 +36,16 @@ build() {
add_file "$PLYMOUTH_MONOSPACE_FONT_PATH"
add_file "$PLYMOUTH_MONOSPACE_BOLD_FONT_PATH"
fi
+
+ # copy configured theme
+ if [ -d "$PLYMOUTH_THEME_DIR" ]; then
+ add_full_dir "$PLYMOUTH_THEME_DIR"
+ fi
+
+ # copy images for the configured theme
+ if [ "$PLYMOUTH_IMAGE_DIR" != "$PLYMOUTH_THEME_DIR" -a -d
"$PLYMOUTH_IMAGE_DIR" ]; then
+ add_full_dir "$PLYMOUTH_IMAGE_DIR"
+ fi
}
help() {
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/plymouth/-/commit/89b67961d0ebfa4a50e92a6d1230a7a93f93d64c
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/plymouth/-/commit/89b67961d0ebfa4a50e92a6d1230a7a93f93d64c
You're receiving this email because of your account on gitlab.archlinux.org.
