diff --git a/smc-tools-1.4.0.tar.gz b/smc-tools-1.4.0.tar.gz deleted file mode 100644 index 2cad0ec..0000000 --- a/smc-tools-1.4.0.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0a3dcc71a2d5797a26ef1cbaff7abba76264670bb9f612068200e4e526340baa -size 44160 diff --git a/smc-tools-1.5.0.tar.gz b/smc-tools-1.5.0.tar.gz new file mode 100644 index 0000000..ffa2a41 --- /dev/null +++ b/smc-tools-1.5.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7344175687fba1907cabc617e5c956778afe7125db915db51b7a4b2f61d90edf +size 50600 diff --git a/smc-tools-sles15sp3-Makefile-Install-smc_chk.8-on-s390-only.patch b/smc-tools-sles15sp3-Makefile-Install-smc_chk.8-on-s390-only.patch new file mode 100644 index 0000000..7f72779 --- /dev/null +++ b/smc-tools-sles15sp3-Makefile-Install-smc_chk.8-on-s390-only.patch @@ -0,0 +1,28 @@ +From c3d1f45abff2433afefaea9d31cd9cda0a7408d3 Mon Sep 17 00:00:00 2001 +From: Stefan Raspl +Date: Mon, 8 Feb 2021 16:43:01 +0100 +Subject: [PATCH 2/2] Makefile: Install smc_chk.8 on s390 only + +Since smc_chk depends on smc_rnics (which is s390-only), we should not +install the man-page on non-s390 platforms, too. + +Signed-off-by: Stefan Raspl +--- +diff --git a/Makefile b/Makefile +index a9068d0..427fc71 100644 +--- a/Makefile ++++ b/Makefile +@@ -161,9 +161,9 @@ ifeq ($(shell uname -m | cut -c1-4),s390) + install $(INSTALL_FLAGS_BIN) smc_rnics $(DESTDIR)$(BINDIR) + install $(INSTALL_FLAGS_MAN) smc_rnics.8 $(DESTDIR)$(MANDIR)/man8 + install $(INSTALL_FLAGS_BIN) smc_chk $(DESTDIR)$(BINDIR) ++ install $(INSTALL_FLAGS_MAN) smc_chk.8 $(DESTDIR)$(MANDIR)/man8 + endif + install $(INSTALL_FLAGS_MAN) af_smc.7 $(DESTDIR)$(MANDIR)/man7 +- install $(INSTALL_FLAGS_MAN) smc_chk.8 $(DESTDIR)$(MANDIR)/man8 + install $(INSTALL_FLAGS_MAN) smc_run.8 $(DESTDIR)$(MANDIR)/man8 + install $(INSTALL_FLAGS_MAN) smc_pnet.8 $(DESTDIR)$(MANDIR)/man8 + install $(INSTALL_FLAGS_MAN) smcss.8 $(DESTDIR)$(MANDIR)/man8 +-- +2.26.2 + diff --git a/smc-tools-sles15sp3-smc_chk-Remove-EXPERIMENTAL-flag-for-C-option.patch b/smc-tools-sles15sp3-smc_chk-Remove-EXPERIMENTAL-flag-for-C-option.patch new file mode 100644 index 0000000..9386c53 --- /dev/null +++ b/smc-tools-sles15sp3-smc_chk-Remove-EXPERIMENTAL-flag-for-C-option.patch @@ -0,0 +1,32 @@ +From d302ba9d5b891bda792d82667e11b89df0c3efc2 Mon Sep 17 00:00:00 2001 +From: Stefan Raspl +Date: Fri, 29 Jan 2021 15:49:05 +0100 +Subject: [PATCH 1/2] smc_chk: Remove 'EXPERIMENTAL' flag for '-C' option + +The 'EXPERIMENTAL' portion could be irritating to users of option '-C' - +this functionality is ready for prime time. However, the same code is +also called by one of the undocumented _experimental_ features, and +it makes sense in that context. + +Signed-off-by: Stefan Raspl +--- +diff --git a/smc_chk b/smc_chk +index ee64043..9af9c8b 100755 +--- a/smc_chk ++++ b/smc_chk +@@ -221,7 +221,11 @@ function signal_handler() { + function test_iface() { + local i; + +- echo " Live test (SMC-D and SMC-R, EXPERIMENTAL)"; ++ if [ $mode -eq $MODE_CONNECT ]; then ++ echo " Live test (SMC-D and SMC-R)"; ++ else ++ echo " Live test (SMC-D and SMC-R, EXPERIMENTAL)"; ++ fi + if [ "$1" != "" ]; then + debug "Determine IP for interface $1"; + ip="`get_netmasks $1 | head -1 | sed 's#/.*##'`"; +-- +2.26.2 + diff --git a/smc-tools.changes b/smc-tools.changes index 2aacd51..a2cb62c 100644 --- a/smc-tools.changes +++ b/smc-tools.changes @@ -1,3 +1,25 @@ +------------------------------------------------------------------- +Wed Feb 10 19:12:48 UTC 2021 - Mark Post + +- Upgrade to version 1.5.0 (bsc#1181649). + * Changes: + - `smcd`/`smcr`: Add new command `info` + - `smc_rnics`: Use '`n/a`' to indicate missing PNET ID + - `smc_chk`: New tool to perform SMC eligilibilty checks, + requires `man` and `python3` to be installed + - `man` pages: Consistency improvements + * Bug fixes: + - `smc_pnet.8`: Use correct spelling for 'PNET ID' + - `smc_rnics`: Suppress output of port attribute for offline devices +- Added smc-tools-sles15sp3-Makefile-Install-smc_chk.8-on-s390-only.patch + The smc_chk command is only built for s390/s390x systems. Don't include the + man page for it on systems where the command doesn't exist. +- Added smc-tools-sles15sp3-smc_chk-Remove-EXPERIMENTAL-flag-for-C-option.patch + The 'EXPERIMENTAL' portion could be irritating to users of option '-C' - + this functionality is ready for prime time. However, the same code is + also called by one of the undocumented _experimental_ features, and + it makes sense in that context. + ------------------------------------------------------------------- Wed Jan 27 21:52:54 UTC 2021 - Mark Post diff --git a/smc-tools.spec b/smc-tools.spec index c01a6d5..e3a21bf 100644 --- a/smc-tools.spec +++ b/smc-tools.spec @@ -17,7 +17,7 @@ Name: smc-tools -Version: 1.4.0 +Version: 1.5.0 Release: 0 Summary: Shared Memory Communication via RDMA License: EPL-1.0 @@ -25,6 +25,8 @@ Group: System/Kernel URL: https://www.ibm.com/developerworks/linux/linux390/smc-tools.html Source: %{name}-%{version}.tar.gz Source1: smc-tools-rpmlintrc +Patch1: smc-tools-sles15sp3-smc_chk-Remove-EXPERIMENTAL-flag-for-C-option.patch +Patch2: smc-tools-sles15sp3-Makefile-Install-smc_chk.8-on-s390-only.patch BuildRequires: bash-completion-devel BuildRequires: libnl3-devel @@ -87,6 +89,7 @@ rm -Rf "%{buildroot}%{_prefix}/lib64" %{_bindir}/smcd %{_bindir}/smcr %ifarch s390 s390x +%{_bindir}/smc_chk %{_bindir}/smc_rnics %endif %{_bindir}/smcss @@ -95,12 +98,15 @@ rm -Rf "%{buildroot}%{_prefix}/lib64" %{_mandir}/man8/smc_pnet.8%{?ext_man} %ifarch s390 s390x %{_mandir}/man8/smc_rnics.8%{?ext_man} +%{_mandir}/man8/smc_chk.8%{?ext_man} %endif %{_mandir}/man8/smc_run.8%{?ext_man} %{_mandir}/man8/smcd-device.8%{?ext_man} +%{_mandir}/man8/smcd-info.8%{?ext_man} %{_mandir}/man8/smcd-linkgroup.8%{?ext_man} %{_mandir}/man8/smcd.8%{?ext_man} %{_mandir}/man8/smcr-device.8%{?ext_man} +%{_mandir}/man8/smcr-info.8%{?ext_man} %{_mandir}/man8/smcr-linkgroup.8%{?ext_man} %{_mandir}/man8/smcr.8%{?ext_man} %{_mandir}/man8/smcss.8%{?ext_man}