SHA256
1
0
forked from pool/plymouth

Accepting request 868420 from Base:System

OBS-URL: https://build.opensuse.org/request/show/868420
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/plymouth?expand=0&rev=91
This commit is contained in:
Dominique Leuenberger 2021-02-07 14:13:56 +00:00 committed by Git OBS Bridge
commit 622c671de6
3 changed files with 8 additions and 16 deletions

View File

@ -1,13 +0,0 @@
diff -Nura plymouth-0.9.5+git20200921+20778f2/src/main.c plymouth-0.9.5+git20200921+20778f2_new/src/main.c
--- plymouth-0.9.5+git20200921+20778f2/src/main.c 2020-08-31 21:10:11.000000000 +0800
+++ plymouth-0.9.5+git20200921+20778f2_new/src/main.c 2020-10-29 18:21:35.007441834 +0800
@@ -2260,8 +2260,7 @@
find_system_default_splash (&state);
find_distribution_default_splash (&state);
- if (ply_kernel_command_line_has_argument ("plymouth.ignore-serial-consoles"))
- device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES;
+ device_manager_flags |= PLY_DEVICE_MANAGER_FLAGS_IGNORE_SERIAL_CONSOLES;
if (ply_kernel_command_line_has_argument ("plymouth.ignore-udev") ||
(getenv ("DISPLAY") != NULL))

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Mon Feb 1 15:18:48 UTC 2021 - Cliff Zhao <qzhao@suse.com>
- Disable plymouth-ignore-serial-console.patch:
We could not totally disable serial, because S390 and some customer
are still rely on it (bnc#1180973, bnc#1181216).
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Dec 8 03:46:39 UTC 2020 - Cliff Zhao <qzhao@suse.com> Tue Dec 8 03:46:39 UTC 2020 - Cliff Zhao <qzhao@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package plymouth # spec file for package plymouth
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LINUX GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -45,8 +45,6 @@ Patch2: plymouth-correct-runtime-dir.patch
Patch3: plymouth-manpages.patch Patch3: plymouth-manpages.patch
# PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-11637 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap. # PATCH-FIX-SLE plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch qzhao@suse.com jsc#SLE-11637 -- plymouth will use plymouthd.defaults instead of plymouth.conf to close the leap gap.
Patch4: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch Patch4: plymouth-no-longer-modify-conf-to-drop-isopensuse-macro.patch
# PATCH-FIX-OPENSUSE plymouth-ignore-serial-console.patch qzhao@opensuse.org bnc#1051692 bnc#1164123 bnc#1170906 -- Don't output in serial console for openQA need to take serial in the test, and yast-installation prgram has a feature to install system through it.
Patch5: plymouth-ignore-serial-console.patch
# PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE. # PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch qzhao@opensuse.org -- Disable the fedora logo reference which is not in openSUSE.
Patch6: plymouth-disable-fedora-logo.patch Patch6: plymouth-disable-fedora-logo.patch
# PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption. # PATCH-FIX-UPSTREAM 0001-Add-label-ft-plugin.patch boo#959986 fvogt@suse.com -- add ability to output text in initrd needed for encryption.