pool/s390-tools
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1084723 from Base:System

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1084723
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/s390-tools?expand=0&rev=61
This commit is contained in:
Dominique Leuenberger 2023-05-04 15:11:07 +00:00 committed by Git OBS Bridge
commit 8b289ba900
4 changed files with 51 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
s390-tools-sles15sp5-01-ziomon-ziorep_config-fix-missing-SG-major-minor-for-.patch Normal file
View File

@ -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});

14
s390-tools-sles15sp5-02-ziomon-ziorep_config-fix-for-SCSI-devices-of-type-di.patch Normal file
View File

@ -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});

11
s390-tools.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Thu May 4 08:32:36 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@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
------------------------------------------------------------------- -------------------------------------------------------------------
Tue May 2 11:40:12 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com> Tue May 2 11:40:12 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
@ -17,6 +25,7 @@ Thu Mar 23 12:45:57 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
for live installation media (jsc#PED-2975) for live installation media (jsc#PED-2975)
* Added a Source dracut-zdev-live-20230321.tar * 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 <nikolay.gueorguiev@suse.com> Mon Mar 13 15:33:43 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
@ -34,7 +43,7 @@ Wed Mar 8 09:38:46 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Feb 21 13:49:29 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com> Tue Feb 21 13:49:29 UTC 2023 - Nikolay Gueorguiev <nikolay.gueorguiev@suse.com>
- 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-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-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 * s390-tools-sles15sp5-03-zipl-boot-use-no-warn-rwx-segments-linker-flag.patch

12
s390-tools.spec
View File

@ -104,10 +104,7 @@ Source39: vmlogrdr.service.suse
%endif %endif
Source40: xpram.service Source40: xpram.service
Source41: pkey.conf Source41: pkey.conf
###
### Source42: dracut-zdev-live-20230321.tar
###
### Obsolete scripts and man pages to be removed once changes in other tools are made ### 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. ### That's been delayed to at least SLES12 SP1, but I'm leaving the comments here.
Source86: read_values.c Source86: read_values.c
@ -171,6 +168,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 Patch927: s390-tools-sles15sp5-lszcrypt-use-separate-index-for-inner-sub-device-loo.patch
# #
Patch928: s390-tools-ALP-zdev-live.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 Patch999: s390-tools-sles15sp5-fix-chown-commands-syntax.patch
@ -399,11 +400,6 @@ cp %{SOURCE18} zpxe.rexx
cp %{SOURCE2} zipl.conf.sample cp %{SOURCE2} zipl.conf.sample
cp %{SOURCE23} README.SUSE 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} cd %{buildroot}
install -D -m755 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/scripts/hsnc install -D -m755 %{SOURCE3} %{buildroot}%{_prefix}/lib/systemd/scripts/hsnc
install -D -m644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.hsnc install -D -m644 %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.hsnc