From 3f75f2d17e5c8f37462207c0480fca80da0ab26cfd7d610cc594a05e13841e85 Mon Sep 17 00:00:00 2001 From: Cliff Zhao Date: Mon, 1 Feb 2021 16:26:36 +0000 Subject: [PATCH] Accepting request 868418 from home:qzhao:branches:Base:System 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). OBS-URL: https://build.opensuse.org/request/show/868418 OBS-URL: https://build.opensuse.org/package/show/Base:System/plymouth?expand=0&rev=289 --- plymouth-ignore-serial-console.patch | 13 ------------- plymouth.changes | 2 +- plymouth.spec | 2 -- 3 files changed, 1 insertion(+), 16 deletions(-) delete mode 100644 plymouth-ignore-serial-console.patch diff --git a/plymouth-ignore-serial-console.patch b/plymouth-ignore-serial-console.patch deleted file mode 100644 index 0c1dad7..0000000 --- a/plymouth-ignore-serial-console.patch +++ /dev/null @@ -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)) diff --git a/plymouth.changes b/plymouth.changes index 66d86c9..0923053 100644 --- a/plymouth.changes +++ b/plymouth.changes @@ -3,7 +3,7 @@ Mon Feb 1 15:18:48 UTC 2021 - Cliff Zhao - Disable plymouth-ignore-serial-console.patch: We could not totally disable serial, because S390 and some customer - are still rely on it (bnc#1164123, bnc#1181216). + are still rely on it (bnc#1180973, bnc#1181216). ------------------------------------------------------------------- Tue Dec 8 03:46:39 UTC 2020 - Cliff Zhao diff --git a/plymouth.spec b/plymouth.spec index dbee908..a89d66a 100644 --- a/plymouth.spec +++ b/plymouth.spec @@ -45,8 +45,6 @@ Patch2: plymouth-correct-runtime-dir.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. 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. 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.