From 218a82336b5649abd5fc49ed4c92247d78e8fb989160bb8d0b95318b2194e8c1 Mon Sep 17 00:00:00 2001 From: Nikolay Gueorguiev Date: Thu, 4 May 2023 09:04:23 +0000 Subject: [PATCH 1/2] Accepting request 1084572 from home:ngueorguiev:branches:Base:System - 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 OBS-URL: https://build.opensuse.org/request/show/1084572 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=171 --- ...nfig-fix-missing-SG-major-minor-for-.patch | 19 +++++++++++++++++++ ...nfig-fix-for-SCSI-devices-of-type-di.patch | 14 ++++++++++++++ s390-tools.changes | 8 ++++++++ s390-tools.spec | 4 ++++ 4 files changed, 45 insertions(+) create mode 100644 s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch create mode 100644 s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch diff --git a/s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch b/s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch new file mode 100644 index 0000000..84f5fae --- /dev/null +++ b/s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch @@ -0,0 +1,19 @@ +--- + 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}); diff --git a/s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch b/s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch new file mode 100644 index 0000000..c12314a --- /dev/null +++ b/s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch @@ -0,0 +1,14 @@ +--- + 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}); diff --git a/s390-tools.changes b/s390-tools.changes index 11c8288..bca2de2 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu May 4 08:32:36 UTC 2023 - Nikolay Gueorguiev + +- 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 + ------------------------------------------------------------------- Tue May 2 11:40:12 UTC 2023 - Nikolay Gueorguiev diff --git a/s390-tools.spec b/s390-tools.spec index d2e1b89..a51a157 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -171,6 +171,10 @@ Patch926: s390-tools-sles15sp5-15-zipl-Embed-loader-data-directly-into-boo 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 From 7c95b541d5224b05db6998e2e468d119fc6db93773b112f4190d35e2b5308d0e Mon Sep 17 00:00:00 2001 From: Nikolay Gueorguiev Date: Thu, 4 May 2023 13:51:14 +0000 Subject: [PATCH 2/2] Accepting request 1084721 from home:ngueorguiev:branches:Base:System Amended the .spec and .changes files OBS-URL: https://build.opensuse.org/request/show/1084721 OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=172 --- s390-tools.changes | 13 +++++++------ s390-tools.spec | 8 -------- 2 files changed, 7 insertions(+), 14 deletions(-) diff --git a/s390-tools.changes b/s390-tools.changes index bca2de2..c7403f2 100644 --- a/s390-tools.changes +++ b/s390-tools.changes @@ -1,7 +1,7 @@ ------------------------------------------------------------------- Thu May 4 08:32:36 UTC 2023 - Nikolay Gueorguiev -- Applied patches for ziomon: fix for SCSI devices of type disk without block dev +- 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 @@ -9,22 +9,23 @@ Thu May 4 08:32:36 UTC 2023 - Nikolay Gueorguiev ------------------------------------------------------------------- Tue May 2 11:40:12 UTC 2023 - Nikolay Gueorguiev -- Applies a fix, splitting of rd.zdev-parameters, in +- Applies a fix, splitting of rd.zdev-parameters, in * s390-tools-ALP-zdev-live.patch ------------------------------------------------------------------- Wed Apr 19 11:59:50 UTC 2023 - Nikolay Gueorguiev -- Tailored the .spec, added a patch +- Tailored the .spec, added a patch * s390-tools-ALP-zdev-live.patch ------------------------------------------------------------------- Thu Mar 23 12:45:57 UTC 2023 - Nikolay Gueorguiev -- Allow activation of devices at boot via kernel command line +- Allow activation of devices at boot via kernel command line for live installation media (jsc#PED-2975) * Added a Source dracut-zdev-live-20230321.tar - * Updated the .spec file for the new Source + * Updated the .spec file for the new Source +- Amended read_value.c ------------------------------------------------------------------- Mon Mar 13 15:33:43 UTC 2023 - Nikolay Gueorguiev @@ -42,7 +43,7 @@ Wed Mar 8 09:38:46 UTC 2023 - Nikolay Gueorguiev ------------------------------------------------------------------- Tue Feb 21 13:49:29 UTC 2023 - Nikolay Gueorguiev -- Apllied the following patches (bsc#1208527, bsc#1206173) +- Applied the following patches (bsc#1208527, bsc#1206173) * s390-tools-sles15sp5-01-zipl-boot-discard-.eh_frame-and-.interp-input-sectio.patch * s390-tools-sles15sp5-02-zipl-boot-declare-that-no-executable-stack-is-requir.patch * s390-tools-sles15sp5-03-zipl-boot-use-no-warn-rwx-segments-linker-flag.patch diff --git a/s390-tools.spec b/s390-tools.spec index a51a157..09517b2 100644 --- a/s390-tools.spec +++ b/s390-tools.spec @@ -104,10 +104,7 @@ Source39: vmlogrdr.service.suse %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 @@ -403,11 +400,6 @@ cp %{SOURCE18} zpxe.rexx 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