From c921e73d358b96ea00e8d696fc1b791a53d50867 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= Date: Tue, 9 Jul 2019 23:09:46 +0200 Subject: [PATCH] Ensure rng-tools does not find it's way into images MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It blocks shutdown for ages. [1] helps to see [ 232.089805] systemd-shutdown[1]: Sending SIGTERM to remaining processes... [ 232.128654] systemd-journald[188]: Received SIGTERM from PID 1 (systemd-shutdow). [ 322.127531] systemd-shutdown[1]: Sending SIGKILL to remaining processes... [ 322.166520] systemd-shutdown[1]: Sending SIGKILL to PID 178 (rngd). [1] https://freedesktop.org/wiki/Software/systemd/Debugging/#index2h1 Signed-off-by: Andreas Müller --- appends/oe-core/openssh_%.bbappend | 2 ++ conf/distro/mortsgna.conf | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 appends/oe-core/openssh_%.bbappend diff --git a/appends/oe-core/openssh_%.bbappend b/appends/oe-core/openssh_%.bbappend new file mode 100644 index 0000000..845414e --- /dev/null +++ b/appends/oe-core/openssh_%.bbappend @@ -0,0 +1,2 @@ +RRECOMMENDS_${PN}-sshd_remove_class-target = "rng-tools" + diff --git a/conf/distro/mortsgna.conf b/conf/distro/mortsgna.conf index c6ccd42..c8808c2 100644 --- a/conf/distro/mortsgna.conf +++ b/conf/distro/mortsgna.conf @@ -114,8 +114,10 @@ ENABLE_BINARY_LOCALE_GENERATION_ep9312 = "0" ENABLE_BINARY_LOCALE_GENERATION_armeb = "0" # blacklist policy -PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough" +PNBLACKLIST[pn-fso-apm] = "regular apmd is good enough" +# warrior specific - on master there might come times they do the right thing... +PNBLACKLIST[rng-tools] = "blocks shutdown and no issues found for openssl" ############################################################################### # Quality & security hardening