Accepting request 994896 from home:qzhao:branches:Base:System
- Update to version 22.02.122+64.0b0e93c: plugins: splash: two-step: Secure boot check and a warning image; libply: ply-utils: Add ply_is_secure_boot_enabled () helper; * This work can be used to check the secure boot configuration and put a red warning image on the screen if the secure boot is disabled. Also, this check can be utterly disabled through the kernel parameter for testing. If the parameter "secure_boot.warn_if_disabled=false" appears in the kernel parameter, the secure boot check will be disabled. - Rebase plymouth-watermark-config.patch; OBS-URL: https://build.opensuse.org/request/show/994896 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=342
This commit is contained in:
Cliff Zhao
Git OBS Bridge
parent
5d50297411
commit
2a0c497b7a
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4783a82b3fd41fe4a65ea67252bcbdced094b64c6d1615fbaf235cbeab959c42
|
||||
size 1010248
|
||||
3
plymouth-22.02.122+64.0b0e93c.tar.xz
Normal file
3
plymouth-22.02.122+64.0b0e93c.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b6711172f7b7ee057527e251f3d44680271e040a0b2f6b646386b6b13fce68c4
|
||||
size 6956908
|
||||
@ -1,47 +1,41 @@
|
||||
Index: b/src/plugins/splash/two-step/plugin.c
|
||||
Index: plymouth-22.02.122+64.0b0e93c_new/src/plugins/splash/two-step/plugin.c
|
||||
===================================================================
|
||||
--- a/src/plugins/splash/two-step/plugin.c
|
||||
+++ b/src/plugins/splash/two-step/plugin.c
|
||||
@@ -1055,7 +1055,6 @@ create_plugin (ply_key_file_t *key_file)
|
||||
plugin = calloc (1, sizeof(ply_boot_splash_plugin_t));
|
||||
|
||||
image_dir = ply_key_file_get_value (key_file, "two-step", "ImageDir");
|
||||
-
|
||||
ply_trace ("Using '%s' as working directory", image_dir);
|
||||
|
||||
asprintf (&image_path, "%s/lock.png", image_dir);
|
||||
@@ -1078,9 +1077,23 @@ create_plugin (ply_key_file_t *key_file)
|
||||
diff -Nura plymouth-22.02.122+64.0b0e93c/src/plugins/splash/two-step/plugin.c plymouth-22.02.122+64.0b0e93c_new/src/plugins/splash/two-step/plugin.c
|
||||
--- plymouth-22.02.122+64.0b0e93c/src/plugins/splash/two-step/plugin.c 2022-08-13 20:58:13.000000000 +0800
|
||||
+++ plymouth-22.02.122+64.0b0e93c_new/src/plugins/splash/two-step/plugin.c 2022-08-13 22:48:06.625172362 +0800
|
||||
@@ -1095,9 +1095,23 @@
|
||||
plugin->background_tile_image = ply_image_new (image_path);
|
||||
free (image_path);
|
||||
|
||||
- asprintf (&image_path, "%s/watermark.png", image_dir);
|
||||
- plugin->watermark_image = ply_image_new (image_path);
|
||||
- free (image_path);
|
||||
+ char *release_watermark_path, *theme_watermark_path;
|
||||
+ char *release_watermark_path, *theme_watermark_path;
|
||||
+ release_watermark_path = ply_key_file_get_value (key_file, "two-step", "WatermarkPath");
|
||||
+ asprintf (&theme_watermark_path, "%s/watermark.png", image_dir);
|
||||
+ if (release_watermark_path != NULL && access(release_watermark_path, R_OK) == 0 )
|
||||
+ {
|
||||
+ ply_trace ("openSUSE's Watermark path: '%s'", release_watermark_path);
|
||||
+ plugin->watermark_image = ply_image_new (release_watermark_path);
|
||||
+ free (release_watermark_path);
|
||||
+ asprintf (&theme_watermark_path, "%s/watermark.png", image_dir);
|
||||
+ if (release_watermark_path != NULL && access(release_watermark_path, R_OK) == 0 )
|
||||
+ {
|
||||
+ ply_trace ("openSUSE's Watermark path: '%s'", release_watermark_path);
|
||||
+ plugin->watermark_image = ply_image_new (release_watermark_path);
|
||||
+ free (release_watermark_path);
|
||||
+ }
|
||||
+ else if( access(theme_watermark_path, R_OK) == 0)
|
||||
+ {
|
||||
+ ply_trace ("Theme's Watermark path: '%s'", theme_watermark_path);
|
||||
+ plugin->watermark_image = ply_image_new (theme_watermark_path);
|
||||
+ free (theme_watermark_path);
|
||||
+ else if( access(theme_watermark_path, R_OK) == 0)
|
||||
+ {
|
||||
+ ply_trace ("Theme's Watermark path: '%s'", theme_watermark_path);
|
||||
+ plugin->watermark_image = ply_image_new (theme_watermark_path);
|
||||
+ free (theme_watermark_path);
|
||||
+ }
|
||||
+ else
|
||||
+ plugin->watermark_image = NULL;
|
||||
+ else
|
||||
+ plugin->watermark_image = NULL;
|
||||
|
||||
plugin->animation_dir = image_dir;
|
||||
|
||||
Index: b/themes/bgrt/bgrt.plymouth.desktop
|
||||
if (!ply_kernel_command_line_has_argument ("secure_boot.warn_if_disabled=false") &&
|
||||
!ply_is_secure_boot_enabled ()) {
|
||||
Index: plymouth-22.02.122+64.0b0e93c_new/themes/bgrt/bgrt.plymouth.desktop
|
||||
===================================================================
|
||||
--- a/themes/bgrt/bgrt.plymouth.desktop
|
||||
+++ b/themes/bgrt/bgrt.plymouth.desktop
|
||||
@@ -7,6 +7,7 @@ ModuleName=two-step
|
||||
diff -Nura plymouth-22.02.122+64.0b0e93c/themes/bgrt/bgrt.plymouth.desktop plymouth-22.02.122+64.0b0e93c_new/themes/bgrt/bgrt.plymouth.desktop
|
||||
--- plymouth-22.02.122+64.0b0e93c/themes/bgrt/bgrt.plymouth.desktop 2022-04-15 16:39:24.000000000 +0800
|
||||
+++ plymouth-22.02.122+64.0b0e93c_new/themes/bgrt/bgrt.plymouth.desktop 2022-08-13 22:45:46.132327415 +0800
|
||||
@@ -7,6 +7,7 @@
|
||||
Font=Cantarell 12
|
||||
TitleFont=Cantarell Light 30
|
||||
ImageDir=@PLYMOUTH_THEME_PATH@/spinner
|
||||
@ -49,11 +43,12 @@ Index: b/themes/bgrt/bgrt.plymouth.desktop
|
||||
DialogHorizontalAlignment=.5
|
||||
DialogVerticalAlignment=.382
|
||||
TitleHorizontalAlignment=.5
|
||||
Index: b/scripts/plymouth-populate-initrd.in
|
||||
Index: plymouth-22.02.122+64.0b0e93c_new/scripts/plymouth-populate-initrd.in
|
||||
===================================================================
|
||||
--- a/scripts/plymouth-populate-initrd.in
|
||||
+++ b/scripts/plymouth-populate-initrd.in
|
||||
@@ -491,6 +491,7 @@ fi
|
||||
diff -Nura plymouth-22.02.122+64.0b0e93c/scripts/plymouth-populate-initrd.in plymouth-22.02.122+64.0b0e93c_new/scripts/plymouth-populate-initrd.in
|
||||
--- plymouth-22.02.122+64.0b0e93c/scripts/plymouth-populate-initrd.in 2022-08-13 22:33:38.499980381 +0800
|
||||
+++ plymouth-22.02.122+64.0b0e93c_new/scripts/plymouth-populate-initrd.in 2022-08-13 22:44:01.052695444 +0800
|
||||
@@ -491,6 +491,7 @@
|
||||
|
||||
PLYMOUTH_MODULE_NAME=$(grep "ModuleName *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ModuleName *= *//')
|
||||
PLYMOUTH_IMAGE_DIR=$(grep "ImageDir *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_THEME_DIR}/${PLYMOUTH_THEME_NAME}.plymouth | sed 's/ImageDir *= *//')
|
||||
@ -61,7 +56,7 @@ Index: b/scripts/plymouth-populate-initrd.in
|
||||
|
||||
PLYMOUTH_Font_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^Font *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^Font *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'} | sort -u | head -n 1)
|
||||
PLYMOUTH_TitleFont_PATH=$(fc-list |grep $(fc-match "$(echo $(grep "^TitleFont *= *" ${PLYMOUTH_SYSROOT}${PLYMOUTH_DATADIR}/plymouth/themes/`plymouth-set-default-theme`/`plymouth-set-default-theme`.plymouth | sed -e 's/^TitleFont *= *//'| awk 'NF{NF--};1'))" |awk -F : {'print $1'}) |awk -F : {'print $1'} | sort -u | head -n 1)
|
||||
@@ -516,6 +517,12 @@ if [ "${PLYMOUTH_IMAGE_DIR}" != "${PLYMO
|
||||
@@ -516,6 +517,12 @@
|
||||
inst_recur "${PLYMOUTH_IMAGE_DIR}"
|
||||
fi
|
||||
|
||||
|
||||
@ -1,3 +1,16 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 12 13:50:33 UTC 2022 - Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
- Update to version 22.02.122+64.0b0e93c:
|
||||
plugins: splash: two-step: Secure boot check and a warning image;
|
||||
libply: ply-utils: Add ply_is_secure_boot_enabled () helper;
|
||||
* This work can be used to check the secure boot configuration and put a red
|
||||
warning image on the screen if the secure boot is disabled. Also, this
|
||||
check can be utterly disabled through the kernel parameter for testing.
|
||||
If the parameter "secure_boot.warn_if_disabled=false" appears in the
|
||||
kernel parameter, the secure boot check will be disabled.
|
||||
- Rebase plymouth-watermark-config.patch;
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Aug 4 01:50:22 UTC 2022 - Cliff Zhao <qzhao@suse.com>
|
||||
|
||||
|
||||
@ -23,7 +23,7 @@
|
||||
%global soversion 5
|
||||
|
||||
Name: plymouth
|
||||
Version: 22.02.122+60.52b0494
|
||||
Version: 22.02.122+64.0b0e93c
|
||||
Release: 0
|
||||
Summary: Graphical Boot Animation and Logger
|
||||
License: GPL-2.0-or-later
|
||||
|
||||
Loading…
Reference in New Issue
Block a user