runtime-install: don't install notification-daemon

backport-runtime-install-don-t-install-notification-daemon.patch

@@ -0,0 +1,47 @@
+From 2d8f1d789a51088dd2f4f2840734f70fb2275cf1 Mon Sep 17 00:00:00 2001
+From: Adam Williamson <awilliam@redhat.com>
+Date: Fri, 4 Sep 2020 15:41:29 -0700
+Subject: [PATCH] runtime-install: don't install notification-daemon
+
+libnotify dropped the requirement just a couple of months after
+this line was added, but we never took it back out again.
+
+Reference:https://github.com/weldr/lorax/commit/a87f438af10e308eb20f2eb2712abe3f820c674a
+The patch was adapted to remove the useless deletion of notification-daemon in runtime-cleanup.tmpl
+
+Signed-off-by: Adam Williamson <awilliam@redhat.com>
+Signed-off-by: Qiumiao Zhang <zhangqiumiao1@huawei.com>
+---
+ share/templates.d/99-generic/runtime-cleanup.tmpl | 2 --
+ share/templates.d/99-generic/runtime-install.tmpl | 3 ---
+ 2 files changed, 5 deletions(-)
+
+diff --git a/share/templates.d/99-generic/runtime-cleanup.tmpl b/share/templates.d/99-generic/runtime-cleanup.tmpl
+index d803ee0..f3a7ebb 100644
+--- a/share/templates.d/99-generic/runtime-cleanup.tmpl
++++ b/share/templates.d/99-generic/runtime-cleanup.tmpl
+@@ -44,8 +44,6 @@ removefrom initscripts /usr/sbin/* /usr/share/locale/* /usr/share/doc/* /usr/sha
+ removepkg pinentry
+ ## no storage device monitoring
+ removepkg device-mapper-event dmraid-events sgpio
+-## no notifications in anaconda
+-removepkg notification-daemon
+ ## logrotate isn't useful in anaconda
+ removepkg logrotate
+ remove /etc/logrotate.d
+diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl
+index 729a55a..b6cf765 100644
+--- a/share/templates.d/99-generic/runtime-install.tmpl
++++ b/share/templates.d/99-generic/runtime-install.tmpl
+@@ -182,8 +182,5 @@ installpkg wget rsync bind-utils ftp mtr vconfig
+ installpkg icfg spice-vdagent
+ installpkg gdisk hexedit sg3_utils
+ 
+-## satisfy libnotify's desktop-notification-daemon with the least crazy option
+-installpkg notification-daemon
+-
+ ## actually install all the requested packages
+ run_pkg_transaction
+-- 
+2.28.0.windows.1
+

lorax.spec

@@ -3,7 +3,7 @@
 
 Name:           lorax
 Version:        33.6
-Release:        4
+Release:        5
 Summary:        A set of tools used to create bootable images
 License:        GPLv2+
 URL:            https://github.com/weldr/lorax
@@ -24,6 +24,7 @@ Patch11:	backport-Do-not-use-loglevel-option-when-running-Anaconda.patch
 Patch12:	backport-Improve-lmc-no-virt-error-handling.patch
 Patch13:	backport-Add-POSTIN-scriptlet-error-to-the-log-monitor-list.patch
 Patch14:	backport-Remove-LD_PRELOAD-libgomp.so.1-from-lmc-no-virt.patch
+Patch15:        backport-runtime-install-don-t-install-notification-daemon.patch
 
 BuildRequires:  python3-devel python3-sphinx_rtd_theme python3-magic 
 BuildRequires:  python3-nose python3-pytest-mock python3-pocketlint python3-gevent
@@ -130,6 +131,7 @@ build images, etc. from the command line.
 %patch12 -p1
 %patch13 -p1
 %patch14 -p1
+%patch15 -p1
 
 %build
 %make_build
@@ -211,16 +213,19 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin
 %{_mandir}/man1/*.1*
 
 %changelog
+* Fri Apr 23 2021 zhangqiumiao <zhangqiumiao1@huawei.com> - 33.6-5
+- runtime-install: don't install notification-daemon
+
 * Mon Apr 12 2021 orange-snn <songnannan2@huawei.com> - 33.6-4
 - add python3-pycdlib in requires for livecd
 
-* Feb Mar 30 2021 yuboyun <yuboyun@huawei.com> - 33.6-3
+* Tue Mar 30 2021 yuboyun <yuboyun@huawei.com> - 33.6-3
 - Do not use '--loglevel' option when running Anaconda
   Improve Imc no-virt error handling
   Add POSTIN scriptlet error to the log monitor list
   Remove LD_PRELOAD libgomp.so.1 from Imc --no-virt
 
-* Feb Oct 13 2020 yuboyun <yuboyun@huawei.com> - 33.6-2
+* Tue Oct 13 2020 yuboyun <yuboyun@huawei.com> - 33.6-2
 - add yaml file
 
 * Mon Aug 3 2020 zhujunhao <zhujunhao8@huawei.com> - 33.6-1