update lorax version to 34.1

This commit is contained in:
yangl777 2022-11-18 08:34:08 +00:00
parent 7e77f77699
commit d597b06316
4 changed files with 15 additions and 59 deletions

View File

@ -1,47 +0,0 @@
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

View File

@ -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

View File

@ -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 <yanglu72@h-partners.com> - 34.1-1
- Type:requirement
- ID:NA
- SUG:NA
- DESC:update lorax version to 34.1
* Mon Mar 28 2022 Wenlong Zhang <zhangwenlong@loongson.cn> - 33.6-8
- ID:NA
- SUG:NA