From c0ed5918d0d4ae60f6900f256a0c3577e4d155f9 Mon Sep 17 00:00:00 2001 From: zhangqiumiao Date: Fri, 23 Apr 2021 17:45:18 +0800 Subject: [PATCH] runtime-install: don't install notification-daemon (cherry picked from commit 800b3132fbc5d1985ca543cc623f929a6c940f1c) --- ...ll-don-t-install-notification-daemon.patch | 47 ++++++++++++++ lorax.spec | 61 +++++++++++++------ 2 files changed, 91 insertions(+), 17 deletions(-) create mode 100644 backport-runtime-install-don-t-install-notification-daemon.patch diff --git a/backport-runtime-install-don-t-install-notification-daemon.patch b/backport-runtime-install-don-t-install-notification-daemon.patch new file mode 100644 index 0000000..82bea77 --- /dev/null +++ b/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 +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 +Signed-off-by: Qiumiao Zhang +--- + 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 + diff --git a/lorax.spec b/lorax.spec index e070a12..d541e28 100644 --- a/lorax.spec +++ b/lorax.spec @@ -2,26 +2,29 @@ %define disable_cross 0 Name: lorax -Version: 29.16 -Release: 11 +Version: 33.6 +Release: 5 Summary: A set of tools used to create bootable images License: GPLv2+ URL: https://github.com/weldr/lorax Source0: https://github.com/weldr/lorax/archive/%{name}-%{version}-1.tar.gz -Patch9000: 0001-ignore-the-dir-that-without-kernel-version.patch -Patch9001: 0001-add-text-mode-selection-menu-in-grub-configuration.patch -Patch9002: 0001-use-tty0-other-than-ttyAMA0-in-rescue-mode.patch -Patch9003: 0001-delete-kernel-modules-pkg.patch -Patch9004: 0001-disable-isolabel-character-change.patch -Patch9005: disable-graphics-install.patch -Patch9006: disable-GeoIP.patch -Patch9007: eliminate-difference.patch -Patch9008: lorax-enable-GUI-installation.patch -Patch9009: lorax-enable-anaconda-KdumpSpoke.patch -Patch9010: lorax-delete-udisk2-iscsi.patch - -Patch6000: backport-Fix-live-iso-creation-on-aarch64.patch +Patch0: 0001-ignore-the-dir-that-without-kernel-version.patch +Patch1: 0001-add-text-mode-selection-menu-in-grub-configuration.patch +Patch2: 0001-use-tty0-other-than-ttyAMA0-in-rescue-mode.patch +Patch3: 0001-delete-kernel-modules-pkg.patch +Patch4: 0001-disable-isolabel-character-change.patch +Patch5: disable-graphics-install.patch +Patch6: disable-GeoIP.patch +Patch7: eliminate-difference.patch +Patch8: lorax-enable-GUI-installation.patch +Patch9: lorax-enable-anaconda-KdumpSpoke.patch +Patch10: lorax-delete-udisk2-iscsi.patch +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 @@ -124,6 +127,12 @@ build images, etc. from the command line. %patch6000 -p1 %endif +%patch11 -p1 +%patch12 -p1 +%patch13 -p1 +%patch14 -p1 +%patch15 -p1 + %build %make_build @@ -200,8 +209,26 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/*.1* %changelog -* Mon May 25 2020 songnannan - 29.16-11 -- rebuild for the update packages +* Fri Apr 23 2021 zhangqiumiao - 33.6-5 +- runtime-install: don't install notification-daemon + +* Mon Apr 12 2021 orange-snn - 33.6-4 +- add python3-pycdlib in requires for livecd + +* Tue Mar 30 2021 yuboyun - 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 + +* Tue Oct 13 2020 yuboyun - 33.6-2 +- add yaml file + +* Mon Aug 3 2020 zhujunhao - 33.6-1 +- update to 33.6 + +* Thu Jun 18 2020 zhujunhao - 31.9-1 +- update to 31.9 * Mon Mar 16 2020 songnannan - 29.16-10 - disbale the virt pacakge -- Gitee