import s390utils-2.16.0-2.el8
This commit is contained in:
CentOS Sources
Stepan Oksanichenko
parent
86ad0bb7cb
commit
de482ad091
|
|
@ -1,3 +1,3 @@
|
|||
SOURCES/cmsfs-1.1.8c.tar.gz
|
||||
SOURCES/s390-tools-2.15.1.tar.gz
|
||||
SOURCES/s390-tools-2.16.0.tar.gz
|
||||
SOURCES/src_vipa-2.1.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -1,3 +1,3 @@
|
|||
9c9a4e89bddb2b4e6e09ef6fc7c2e6f2ad6316de SOURCES/cmsfs-1.1.8c.tar.gz
|
||||
9a169518bf1074f3c087f97a32fd85c35ac216ee SOURCES/s390-tools-2.15.1.tar.gz
|
||||
faf04b6d0bca264a65107d063674b06c9b4c03bf SOURCES/s390-tools-2.16.0.tar.gz
|
||||
8ed8592a0a9370ce8422df9231ccb17f6cf49bed SOURCES/src_vipa-2.1.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -35,6 +35,14 @@ get_config_by_subchannel ()
|
|||
| LC_ALL=C sed -e "$__sed_discard_ignored_files"
|
||||
}
|
||||
|
||||
get_config_by_subchannel_nm ()
|
||||
{
|
||||
LANG=C grep -E -i -l \
|
||||
"^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){0,2}${1};([0-9]\.[0-9]\.[a-f0-9]+;){0,2}$" \
|
||||
/etc/NetworkManager/system-connections/*.nmconnection \
|
||||
| LC_ALL=C sed -e "$__sed_discard_ignored_files"
|
||||
}
|
||||
|
||||
CHANNEL=${DEVPATH##*/}
|
||||
|
||||
if [ $MODE = "dracut" ]; then
|
||||
|
|
@ -65,7 +73,14 @@ elif [ $MODE = "normal" ]; then
|
|||
if [ -n "$CONFIG_FILE" ]; then
|
||||
. $CONFIG_FILE
|
||||
else
|
||||
exit 1
|
||||
CONFIG_FILE=$(get_config_by_subchannel_nm $CHANNEL)
|
||||
if [ -n "$CONFIG_FILE" ]; then
|
||||
NETTYPE=$(sed -nr "/^\[ethernet\]/ { :l /^s390-nettype[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
|
||||
SUBCHANNELS=$(sed -nr "/^\[ethernet\]/ { :l /^s390-subchannels[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE | sed -e "s/;/,/g" -e "s/,$//")
|
||||
LAYER2=$(sed -nr "/^\[ethernet-s390-options\]/ { :l /^layer2[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
fi
|
||||
else
|
||||
echo "Unknown mode=$MODE"
|
||||
|
|
|
|||
|
|
@ -306,6 +306,14 @@ if [ $MODE_ZNET ]; then
|
|||
eval "$line"
|
||||
free_device $SUBCHANNELS
|
||||
done
|
||||
for line in $(LANG=C grep -E -i -h \
|
||||
"^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){2,3}$" \
|
||||
$( (ls /etc/NetworkManager/system-connections/*.nmconnection 2> /dev/null || echo "__no_config_file") | \
|
||||
LC_ALL=C sed -e "$__sed_discard_ignored_files") 2> /dev/null)
|
||||
do
|
||||
SUBCHANNELS="$(echo $line | sed -e "s/s390-subchannels=//" -e "s/;/,/g")"
|
||||
free_device $SUBCHANNELS
|
||||
done
|
||||
fi
|
||||
|
||||
[ -z "$ALL_DEVICES" ] && exit 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -36,7 +36,7 @@ if [ -f "$CONFIG" ]; then
|
|||
modprobe zfcp
|
||||
fi
|
||||
if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
|
||||
return
|
||||
exit 1
|
||||
fi
|
||||
sed 'y/ABCDEF/abcdef/' < $CONFIG | while read line; do
|
||||
case $line in
|
||||
|
|
@ -74,3 +74,4 @@ if [ -f "$CONFIG" ]; then
|
|||
esac
|
||||
done
|
||||
fi
|
||||
exit 0
|
||||
|
|
|
|||
|
|
@ -8,8 +8,8 @@
|
|||
|
||||
Name: s390utils
|
||||
Summary: Utilities and daemons for IBM z Systems
|
||||
Version: 2.15.1
|
||||
Release: 5%{?dist}
|
||||
Version: 2.16.0
|
||||
Release: 2%{?dist}
|
||||
Epoch: 2
|
||||
License: MIT
|
||||
ExclusiveArch: s390 s390x
|
||||
|
|
@ -43,7 +43,7 @@ Patch0: s390-tools-zipl-invert-script-options.patch
|
|||
Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
|
||||
|
||||
# backported fixes
|
||||
Patch100: s390utils-2.15.1-rhel.patch
|
||||
Patch100: s390utils-2.16.0-rhel.patch
|
||||
|
||||
Patch1000: cmsfs-1.1.8-warnings.patch
|
||||
Patch1001: cmsfs-1.1.8-kernel26.patch
|
||||
|
|
@ -259,6 +259,8 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
|
|||
%{_sbindir}/cio_ignore
|
||||
%{_sbindir}/dasdfmt
|
||||
%{_sbindir}/dasdinfo
|
||||
%{_sbindir}/fdasd
|
||||
%{_sbindir}/lszdev
|
||||
%{_sbindir}/zipl
|
||||
%dir /lib/s390-tools/
|
||||
/lib/s390-tools/{zipl,chreipl}_helper.*
|
||||
|
|
@ -276,6 +278,8 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
|
|||
%{_mandir}/man8/cio_ignore.8*
|
||||
%{_mandir}/man8/dasdfmt.8*
|
||||
%{_mandir}/man8/dasdinfo.8*
|
||||
%{_mandir}/man8/fdasd.8*
|
||||
%{_mandir}/man8/lszdev.8*
|
||||
%{_mandir}/man8/zipl.8*
|
||||
|
||||
# Additional Fedora/RHEL specific stuff
|
||||
|
|
@ -314,10 +318,10 @@ systemctl --no-reload preset device_cio_free.service >/dev/null 2>&1 || :
|
|||
License: MIT and CPL
|
||||
Summary: S390 base tools
|
||||
Requires: gawk sed coreutils
|
||||
Requires: sysfsutils
|
||||
Requires: sg3_utils
|
||||
Requires: ethtool
|
||||
Requires: tar
|
||||
Requires: file
|
||||
Requires: s390utils-core = %{epoch}:%{version}-%{release}
|
||||
%{?systemd_requires}
|
||||
BuildRequires: perl-generators
|
||||
|
|
@ -486,7 +490,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_sbindir}/dasdstat
|
||||
%{_sbindir}/dasdview
|
||||
%{_sbindir}/dbginfo.sh
|
||||
%{_sbindir}/fdasd
|
||||
%{_sbindir}/hsci
|
||||
%{_sbindir}/hyptop
|
||||
%{_sbindir}/ip_watcher.pl
|
||||
|
|
@ -494,6 +497,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_sbindir}/lscpumf
|
||||
%{_sbindir}/lscss
|
||||
%{_sbindir}/lsdasd
|
||||
%{_sbindir}/lshwc
|
||||
%{_sbindir}/lsqeth
|
||||
%{_sbindir}/lsluns
|
||||
%{_sbindir}/lsreipl
|
||||
|
|
@ -502,7 +506,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_sbindir}/lsstp
|
||||
%{_sbindir}/lstape
|
||||
%{_sbindir}/lszcrypt
|
||||
%{_sbindir}/lszdev
|
||||
%{_sbindir}/lszfcp
|
||||
%{_sbindir}/qetharp
|
||||
%{_sbindir}/qethconf
|
||||
|
|
@ -542,6 +545,7 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_mandir}/man1/dbginfo.sh.1*
|
||||
%{_mandir}/man1/dump2tar.1*
|
||||
%{_mandir}/man1/lscpumf.1*
|
||||
%{_mandir}/man1/lshwc.1*
|
||||
%{_mandir}/man1/vmconvert.1*
|
||||
%{_mandir}/man1/zfcpdbf.1*
|
||||
%{_mandir}/man1/zipl-switch-to-blscfg.1*
|
||||
|
|
@ -558,7 +562,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_mandir}/man8/dasdstat.8*
|
||||
%{_mandir}/man8/dasdview.8*
|
||||
%{_mandir}/man8/dumpconf.8*
|
||||
%{_mandir}/man8/fdasd.8*
|
||||
%{_mandir}/man8/genprotimg.8.*
|
||||
%{_mandir}/man8/hsci.8*
|
||||
%{_mandir}/man8/hyptop.8*
|
||||
|
|
@ -573,7 +576,6 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_mandir}/man8/lsstp.8*
|
||||
%{_mandir}/man8/lstape.8*
|
||||
%{_mandir}/man8/lszcrypt.8*
|
||||
%{_mandir}/man8/lszdev.8*
|
||||
%{_mandir}/man8/lszfcp.8*
|
||||
%{_mandir}/man8/qetharp.8*
|
||||
%{_mandir}/man8/qethconf.8*
|
||||
|
|
@ -917,10 +919,21 @@ User-space development files for the s390/s390x architecture.
|
|||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 12 2021 Dan Horák <dhorak@redhat.com> - 2:2.15.1-5
|
||||
- fdasd: Use increased retry count for dasd_reread_partition_table (#1933766)
|
||||
- zipl: fix reading 4k disk's geometry (#1933235)
|
||||
- Resolves: #1933235 #1933766
|
||||
* Tue Jul 20 2021 Dan Horák <dhorak@redhat.com> - 2:2.16.0-2
|
||||
- add support for NM keyfile format to ccw_init/device_cio_free (#1980708)
|
||||
- s390-tools: Add support for complete counter set extraction (#1981264)
|
||||
- Resolves: #1980708 #1981264
|
||||
|
||||
* Fri Jul 02 2021 Dan Horák <dhorak@redhat.com> - 2:2.16.0-1
|
||||
- rebased to 2.16.0 (#1919241)
|
||||
- move fdasd and lszdev to core
|
||||
- ttyrun-getty: Avoid conflicts with serial-getty@ (#1907781)
|
||||
- mk-s390image script requires file (#1973239)
|
||||
- zfcpconf: set exit code explicitly (#1977434)
|
||||
- dbginfo.sh: Collect /proc/kallsyms, issue additional commands (#1972041)
|
||||
- dasd: change default scheduler to reduce CPU consumption (#1972038)
|
||||
- zdsfs: transparent dataset conversion (#1919238)
|
||||
- Resolves: #1919241 #1907781 #1973239 #1977434 #1972041 #1972038 #1919238
|
||||
|
||||
* Mon Dec 07 2020 Dan Horák <dhorak@redhat.com> - 2:2.15.1-4
|
||||
- zkey: Fix KMS plugin configuration to store APQNs correctly. (#1901968)
|
||||
|
|
|
|||
Loading…
Reference in New Issue