diff --git a/backport-runtime-install-don-t-install-notification-daemon.patch b/backport-runtime-install-don-t-install-notification-daemon.patch deleted file mode 100644 index 82bea778630293d4f3d0635729fd135fec9ea69d..0000000000000000000000000000000000000000 --- a/backport-runtime-install-don-t-install-notification-daemon.patch +++ /dev/null @@ -1,47 +0,0 @@ -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-33.6-1.tar.gz b/lorax-34.1-1.tar.gz similarity index 58% rename from lorax-33.6-1.tar.gz rename to lorax-34.1-1.tar.gz index 6a6a2804a25a28d56bba4ed92c48da355b1cdd0d..a350d2a96d90b006c72cab8d3db32e172c768e6c 100644 Binary files a/lorax-33.6-1.tar.gz and b/lorax-34.1-1.tar.gz differ diff --git a/lorax-delete-udisk2-iscsi.patch b/lorax-delete-udisk2-iscsi.patch index 0d334676a2e66b0b0395e1e8690d86f56d450acf..86ed5245eb0be056817ed5e756185bc4699ab473 100644 --- a/lorax-delete-udisk2-iscsi.patch +++ b/lorax-delete-udisk2-iscsi.patch @@ -8,18 +8,17 @@ Subject: [PATCH] delete udisk2-iscsi 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/templates.d/99-generic/runtime-install.tmpl b/share/templates.d/99-generic/runtime-install.tmpl -index 6bee5e6..9cf6b5b 100644 +index 159222b..cad3c7c 100644 --- a/share/templates.d/99-generic/runtime-install.tmpl +++ b/share/templates.d/99-generic/runtime-install.tmpl @@ -106,7 +106,7 @@ installpkg xfsdump - + ## extra storage packages # hostname is needed for iscsi to work, see RHBZ#1593917 -installpkg udisks2 udisks2-iscsi hostname +installpkg udisks2 hostname - - ## extra libblockdev plugins - installpkg libblockdev-lvm-dbus --- -1.8.3.1 - + %if basearch in ("i386", "x86_64"): + installpkg fcoe-utils + %endif +-- +2.33.0 diff --git a/lorax.spec b/lorax.spec index 004ee992cdd59914753c1ece5fb9b7bda587697f..bb4665ad931c22cdd1728952e04b7fb8f41e9dc2 100644 --- a/lorax.spec +++ b/lorax.spec @@ -2,8 +2,8 @@ %define disable_cross 0 Name: lorax -Version: 33.6 -Release: 8 +Version: 34.1 +Release: 1 Summary: A set of tools used to create bootable images License: GPLv2+ URL: https://github.com/weldr/lorax @@ -24,7 +24,6 @@ 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 Patch16: add-param-name_prefix-to-make-name-used-by-register_blueprint-unique.patch Patch100: 0001-support-loongarch-for-lorax.patch @@ -133,7 +132,6 @@ build images, etc. from the command line. %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 %patch16 -p1 %ifarch loongarch64 %patch100 -p1 @@ -219,6 +217,12 @@ getent passwd weldr >/dev/null 2>&1 || useradd -r -g weldr -d / -s /sbin/nologin %{_mandir}/man1/*.1* %changelog +* Fri Nov 18 2022 yanglu - 34.1-1 +- Type:requirement +- ID:NA +- SUG:NA +- DESC:update lorax version to 34.1 + * Mon Mar 28 2022 Wenlong Zhang - 33.6-8 - ID:NA - SUG:NA