Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package s390-tools for openSUSE:Factory
checked in at 2023-05-04 17:11:07
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/s390-tools (Old)
and /work/SRC/openSUSE:Factory/.s390-tools.new.1533 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "s390-tools"
Thu May 4 17:11:07 2023 rev:61 rq:1084723 version:2.25.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/s390-tools/s390-tools.changes 2023-05-02
16:24:21.835709496 +0200
+++ /work/SRC/openSUSE:Factory/.s390-tools.new.1533/s390-tools.changes
2023-05-04 17:11:26.328668576 +0200
@@ -1,0 +2,8 @@
+Thu May 4 08:32:36 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorgu...@suse.com>
+
+- Applied patches for ziomon: fix for SCSI devices of type disk without block
dev
+ (bsc#1211008)
+ *
s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
+ *
s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
+
+-------------------------------------------------------------------
@@ -19,0 +28 @@
+- Amended read_value.c
@@ -37 +46 @@
-- Apllied the following patches (bsc#1208527, bsc#1206173)
+- Applied the following patches (bsc#1208527, bsc#1206173)
New:
----
s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ s390-tools.spec ++++++
--- /var/tmp/diff_new_pack.R00aoZ/_old 2023-05-04 17:11:27.724676750 +0200
+++ /var/tmp/diff_new_pack.R00aoZ/_new 2023-05-04 17:11:27.728676774 +0200
@@ -104,10 +104,7 @@
%endif
Source40: xpram.service
Source41: pkey.conf
-###
-### Source42: dracut-zdev-live-20230321.tar
-###
### Obsolete scripts and man pages to be removed once changes in other tools
are made
### That's been delayed to at least SLES12 SP1, but I'm leaving the comments
here.
Source86: read_values.c
@@ -171,6 +168,10 @@
Patch927:
s390-tools-sles15sp5-lszcrypt-use-separate-index-for-inner-sub-device-loo.patch
#
Patch928: s390-tools-ALP-zdev-live.patch
+# Bug 1211008
+Patch929:
s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
+Patch930:
s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
+
#
Patch999: s390-tools-sles15sp5-fix-chown-commands-syntax.patch
@@ -399,11 +400,6 @@
cp %{SOURCE2} zipl.conf.sample
cp %{SOURCE23} README.SUSE
-### Adding SUSE scripts
-### install -d -m 755 %{buildroot}%{_prefix}/lib/dracut/modules.d
-### cp -a 96zdev-live %{buildroot}%{_prefix}/lib/dracut/modules.d
-###
-
cd %{buildroot}
install -D -m755 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/scripts/hsnc
install -D -m644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.hsnc
++++++
s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch
++++++
---
ziomon/ziorep_config | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/ziomon/ziorep_config
+++ b/ziomon/ziorep_config
@@ -123,11 +123,11 @@ sub get_device_data
} else {
$devices{$hctl}{dev} = glob_last("block\:sd*");
}
+ $devices{$hctl}{sg_mm} = get_line("generic", "dev");
$c_src = $devices{$hctl}{dev};
$devices{$hctl}{dev} =~ s/.*(sd[a-z0-9]+)\Z/$1/
unless(!$devices{$hctl}{dev});
$devices{$hctl}{mm} = get_line("dev");
- $devices{$hctl}{sg_mm} = get_line("generic", "dev");
$devices{$hctl}{mp_dev} = glob_last("holders", "dm*");
$devices{$hctl}{mp_dev} =~ s/.*\/(.+)\Z/$1/
unless
(!$devices{$hctl}{mp_dev});
++++++
s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch
++++++
---
ziomon/ziorep_config | 1 +
1 file changed, 1 insertion(+)
--- a/ziomon/ziorep_config
+++ b/ziomon/ziorep_config
@@ -124,6 +124,7 @@ sub get_device_data
$devices{$hctl}{dev} = glob_last("block\:sd*");
}
$devices{$hctl}{sg_mm} = get_line("generic", "dev");
+ next if !defined $devices{$hctl}{dev};
$c_src = $devices{$hctl}{dev};
$devices{$hctl}{dev} =~ s/.*(sd[a-z0-9]+)\Z/$1/
unless(!$devices{$hctl}{dev});
