From fd6e519638527a189830fc2744f02575ac5d69ee Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 8 Nov 2022 02:03:22 -0500 Subject: [PATCH] import powerpc-utils-1.3.10-1.el8 --- .gitignore | 2 +- .powerpc-utils.metadata | 2 +- SOURCES/powerpc-utils-1.3.10-distro.patch | 11 ++ ...ch => powerpc-utils-1.3.10-manpages.patch} | 107 ++++++++++++++++++ ...rpc-utils-1.3.5-pseries_platform-man.patch | 15 --- .../powerpc-utils-1.3.5-update_flash_nv.patch | 19 ---- SOURCES/powerpc-utils-1.3.8-hcnmgr.patch | 64 ----------- SOURCES/powerpc-utils-1.3.8-install-man.patch | 14 --- ...3.9-Fix-NM-HNV-setting-primary-slave.patch | 24 ---- ...werpc-utils-1.3.9-fix-hexdump-format.patch | 39 ------- SOURCES/powerpc-utils-1.3.9-makefile.patch | 19 ---- ...upport-vnic-as-backup-device-for-HNV.patch | 22 ---- SPECS/powerpc-utils.spec | 32 +++--- 13 files changed, 134 insertions(+), 236 deletions(-) create mode 100644 SOURCES/powerpc-utils-1.3.10-distro.patch rename SOURCES/{powerpc-utils-1.3.8-man.patch => powerpc-utils-1.3.10-manpages.patch} (65%) delete mode 100644 SOURCES/powerpc-utils-1.3.5-pseries_platform-man.patch delete mode 100644 SOURCES/powerpc-utils-1.3.5-update_flash_nv.patch delete mode 100644 SOURCES/powerpc-utils-1.3.8-hcnmgr.patch delete mode 100644 SOURCES/powerpc-utils-1.3.8-install-man.patch delete mode 100644 SOURCES/powerpc-utils-1.3.9-Fix-NM-HNV-setting-primary-slave.patch delete mode 100644 SOURCES/powerpc-utils-1.3.9-fix-hexdump-format.patch delete mode 100644 SOURCES/powerpc-utils-1.3.9-makefile.patch delete mode 100644 SOURCES/powerpc-utils-support-vnic-as-backup-device-for-HNV.patch diff --git a/.gitignore b/.gitignore index fb19af8..e18c389 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/powerpc-utils-1.3.9.tar.gz +SOURCES/powerpc-utils-1.3.10.tar.gz diff --git a/.powerpc-utils.metadata b/.powerpc-utils.metadata index 1fe2a38..afcb951 100644 --- a/.powerpc-utils.metadata +++ b/.powerpc-utils.metadata @@ -1 +1 @@ -03cfcd5c6dffe94409e501d4e603a3fd5de69739 SOURCES/powerpc-utils-1.3.9.tar.gz +4596fced545f3c751ff2665663baaed0db7ab7ce SOURCES/powerpc-utils-1.3.10.tar.gz diff --git a/SOURCES/powerpc-utils-1.3.10-distro.patch b/SOURCES/powerpc-utils-1.3.10-distro.patch new file mode 100644 index 0000000..84f8aa8 --- /dev/null +++ b/SOURCES/powerpc-utils-1.3.10-distro.patch @@ -0,0 +1,11 @@ +diff -up powerpc-utils-1.3.10/Makefile.am.me powerpc-utils-1.3.10/Makefile.am +--- powerpc-utils-1.3.10/Makefile.am.me 2022-06-03 12:35:01.335312481 +0200 ++++ powerpc-utils-1.3.10/Makefile.am 2022-06-03 14:11:58.453820076 +0200 +@@ -229,7 +229,6 @@ install-data-hook: + $(INSTALL_DATA) systemd/smtstate.service $(DESTDIR)${systemd_unit_dir}/ + $(INSTALL_DATA) systemd/hcn-init.service $(DESTDIR)${systemd_unit_dir}/ + $(INSTALL_DATA) var/lib/powerpc-utils/smt.state $(DESTDIR)/var/lib/@PACKAGE@/ +- $(INSTALL_SCRIPT) scripts/functions.suse $(DESTDIR)/usr/lib/@PACKAGE@/ + $(INSTALL_SCRIPT) scripts/smtstate $(DESTDIR)@sbindir@ + sed -i -e 's,$${exec_prefix},@prefix@,g' $(DESTDIR)${systemd_unit_dir}/smt_off.service + sed -i -e 's,$${exec_prefix},@prefix@,g' $(DESTDIR)${systemd_unit_dir}/smtstate.service diff --git a/SOURCES/powerpc-utils-1.3.8-man.patch b/SOURCES/powerpc-utils-1.3.10-manpages.patch similarity index 65% rename from SOURCES/powerpc-utils-1.3.8-man.patch rename to SOURCES/powerpc-utils-1.3.10-manpages.patch index a2279b4..29dba7e 100644 --- a/SOURCES/powerpc-utils-1.3.8-man.patch +++ b/SOURCES/powerpc-utils-1.3.10-manpages.patch @@ -1,3 +1,18 @@ +diff -up powerpc-utils-1.3.5/man/pseries_platform.8.me powerpc-utils-1.3.5/man/pseries_platform.8 +--- powerpc-utils-1.3.5/man/pseries_platform.8.me 2018-11-29 16:50:07.601034729 +0100 ++++ powerpc-utils-1.3.5/man/pseries_platform.8 2018-11-29 16:50:07.601034729 +0100 +@@ -0,0 +1,11 @@ ++.\" ++.\" Copyright (C) 2015 International Business Machines ++.\" ++.TH pseries_platform 8 "September 2015" Linux "Linux on Power Service Tools" ++.SH NAME ++pseries_platform \- identify the platform and display the name of platform ++.SH SYNOPSIS ++.B /usr/bin/pseries_platform ++ ++.SH DESCRIPTION ++The \fIpseries_platform\fR tool can identify the platform and display the name of platform. diff -up powerpc-utils-1.2.15/man/lsdevinfo.8.man powerpc-utils-1.2.15/man/lsdevinfo.8 --- powerpc-utils-1.2.15/man/lsdevinfo.8.man 2013-01-16 15:31:13.886591137 +0100 +++ powerpc-utils-1.2.15/man/lsdevinfo.8 2013-01-16 15:31:13.886591137 +0100 @@ -242,3 +257,95 @@ diff -up powerpc-utils-1.2.15/man/rtas_event_decode.8.man powerpc-utils-1.2.15/m +.BI \-w " width" +limit the output to the specified width, default width is 80 characters. The width must be > 0 and < 1024. + +diff -up powerpc-utils-1.3.8/man/hcnmgr.8.me powerpc-utils-1.3.8/man/hcnmgr.8 +--- powerpc-utils-1.3.8/man/hcnmgr.8.me 2021-02-08 13:18:50.115407652 +0100 ++++ powerpc-utils-1.3.8/man/hcnmgr.8 2021-02-08 13:18:43.734322981 +0100 +@@ -0,0 +1,47 @@ ++.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. ++.TH HCNMGR "1" "hcnmgr contains a set of commands to support migratable SR_IOV logical port." "hcnmgr" ++.SH NAME ++hcnmgr \- hcnmgr contains a set of commands to support migratable SR_IOV logical port. ++.SH SYNOPSIS ++.B hcnmgr|hcnrmhcn|hcnrmdev|hcnqrydev|hcnversion ++[options] ++.SH DESCRIPTION ++hcnmgr contains a set of commands to support migratable SR_IOV logical port. ++The new commands configure/query/remove network devices. New commands should ++be called from the HMC, rather than directly from linux LPAR ++.PP ++Usage: hcncfgdrc DRC_INDEX= [STAKE_TOKEN=NULL] [-d] ++.IP ++Configure a device to hybrid network HCN ++.PP ++Usage: hcnrmhcn HCN_ID= ++.IP ++Remove a hybrid network HCN given an HCN ID ++.PP ++Usage: hcnrmdev DRC_INDEX= HCN_ID= ++.IP ++Unconfigure device from HCN ++.PP ++Usage: hcnqrydev DRC_INDEX= HCN_ID= ++.IP ++Query a device given a DRC_INDEX or HCN ID ++.PP ++Usage: hcnversion ++.IP ++get the current version of the HCN support ++.PP ++Optional arguments. ++.TP ++\fB\-s\fR ++scan device\-tree and configure HCN ++.TP ++\fB\-V\fR ++Display version information and exit ++.TP ++\fB\-h\fR ++Display this help information and exit ++.SH AUTHOR ++.B hcnmgr ++was written by Mingming Cao . ++.PP ++This manual page was written by Than Ngo . +diff -up powerpc-utils-1.3.5/man/update_flash_nv.8.me powerpc-utils-1.3.5/man/update_flash_nv.8 +--- powerpc-utils-1.3.5/man/update_flash_nv.8.me 2018-11-29 16:49:51.344987106 +0100 ++++ powerpc-utils-1.3.5/man/update_flash_nv.8 2018-11-29 16:49:42.589961458 +0100 +@@ -0,0 +1,15 @@ ++.\" ++.\" Copyright (C) 2015 International Business Machines ++.\" ++.TH pseries_platform 8 "September 2015" Linux "Linux on Power Service Tools" ++.SH NAME ++update_flash_nv \- is a simple wrapper script (update_flash) to pass the image. ++.SH SYNOPSIS ++.B /usr/bin/update_flash_nv ++ ++.SH DESCRIPTION ++The \fIupdate_flash_nv\fR tool is simple wrapper script (update_flash) to pass the image. ++ ++.SH SEE ALSO ++update_flash(8). ++ +diff -up powerpc-utils-1.3.10/Makefile.am.me powerpc-utils-1.3.10/Makefile.am +--- powerpc-utils-1.3.10/Makefile.am.me 2022-06-03 12:35:01.335312481 +0200 ++++ powerpc-utils-1.3.10/Makefile.am 2022-06-03 12:46:42.460763120 +0200 +@@ -48,7 +48,17 @@ man_MANS = \ + man/vcpustat.8 \ + man/rtas_dbg.8 \ + man/drmgr.8 \ +- man/lparnumascore.8 ++ man/lparnumascore.8 \ ++ man/lsdevinfo.8 \ ++ man/rtas_event_decode.8 \ ++ man/ls-vdev.8 \ ++ man/lsprop.8 \ ++ man/ls-veth.8 \ ++ man/nvsetenv.8 \ ++ man/ls-vscsi.8 \ ++ man/pseries_platform.8 \ ++ man/update_flash_nv.8 \ ++ man/hcnmgr.8 + + EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) + diff --git a/SOURCES/powerpc-utils-1.3.5-pseries_platform-man.patch b/SOURCES/powerpc-utils-1.3.5-pseries_platform-man.patch deleted file mode 100644 index cd01843..0000000 --- a/SOURCES/powerpc-utils-1.3.5-pseries_platform-man.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff -up powerpc-utils-1.3.5/man/pseries_platform.8.me powerpc-utils-1.3.5/man/pseries_platform.8 ---- powerpc-utils-1.3.5/man/pseries_platform.8.me 2018-11-29 16:50:07.601034729 +0100 -+++ powerpc-utils-1.3.5/man/pseries_platform.8 2018-11-29 16:50:07.601034729 +0100 -@@ -0,0 +1,11 @@ -+.\" -+.\" Copyright (C) 2015 International Business Machines -+.\" -+.TH pseries_platform 8 "September 2015" Linux "Linux on Power Service Tools" -+.SH NAME -+pseries_platform \- identify the platform and display the name of platform -+.SH SYNOPSIS -+.B /usr/bin/pseries_platform -+ -+.SH DESCRIPTION -+The \fIpseries_platform\fR tool can identify the platform and display the name of platform. diff --git a/SOURCES/powerpc-utils-1.3.5-update_flash_nv.patch b/SOURCES/powerpc-utils-1.3.5-update_flash_nv.patch deleted file mode 100644 index 273b418..0000000 --- a/SOURCES/powerpc-utils-1.3.5-update_flash_nv.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up powerpc-utils-1.3.5/man/update_flash_nv.8.me powerpc-utils-1.3.5/man/update_flash_nv.8 ---- powerpc-utils-1.3.5/man/update_flash_nv.8.me 2018-11-29 16:49:51.344987106 +0100 -+++ powerpc-utils-1.3.5/man/update_flash_nv.8 2018-11-29 16:49:42.589961458 +0100 -@@ -0,0 +1,15 @@ -+.\" -+.\" Copyright (C) 2015 International Business Machines -+.\" -+.TH pseries_platform 8 "September 2015" Linux "Linux on Power Service Tools" -+.SH NAME -+update_flash_nv \- is a simple wrapper script (update_flash) to pass the image. -+.SH SYNOPSIS -+.B /usr/bin/update_flash_nv -+ -+.SH DESCRIPTION -+The \fIupdate_flash_nv\fR tool is simple wrapper script (update_flash) to pass the image. -+ -+.SH SEE ALSO -+update_flash(8). -+ diff --git a/SOURCES/powerpc-utils-1.3.8-hcnmgr.patch b/SOURCES/powerpc-utils-1.3.8-hcnmgr.patch deleted file mode 100644 index deffa8d..0000000 --- a/SOURCES/powerpc-utils-1.3.8-hcnmgr.patch +++ /dev/null @@ -1,64 +0,0 @@ -diff -up powerpc-utils-1.3.8/Makefile.am.me powerpc-utils-1.3.8/Makefile.am ---- powerpc-utils-1.3.8/Makefile.am.me 2020-10-01 13:33:29.444024403 +0200 -+++ powerpc-utils-1.3.8/Makefile.am 2020-10-01 13:34:08.284854506 +0200 -@@ -56,7 +56,8 @@ man_MANS = \ - man/nvsetenv.8 \ - man/ls-vscsi.8 \ - man/pseries_platform.8 \ -- man/update_flash_nv.8 -+ man/update_flash_nv.8 \ -+ man/hcnmgr.8 - - EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) - -diff -up powerpc-utils-1.3.8/man/hcnmgr.8.me powerpc-utils-1.3.8/man/hcnmgr.8 ---- powerpc-utils-1.3.8/man/hcnmgr.8.me 2021-02-08 13:18:50.115407652 +0100 -+++ powerpc-utils-1.3.8/man/hcnmgr.8 2021-02-08 13:18:43.734322981 +0100 -@@ -0,0 +1,47 @@ -+.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.47.6. -+.TH HCNMGR "1" "hcnmgr contains a set of commands to support migratable SR_IOV logical port." "hcnmgr" -+.SH NAME -+hcnmgr \- hcnmgr contains a set of commands to support migratable SR_IOV logical port. -+.SH SYNOPSIS -+.B hcnmgr|hcnrmhcn|hcnrmdev|hcnqrydev|hcnversion -+[options] -+.SH DESCRIPTION -+hcnmgr contains a set of commands to support migratable SR_IOV logical port. -+The new commands configure/query/remove network devices. New commands should -+be called from the HMC, rather than directly from linux LPAR -+.PP -+Usage: hcncfgdrc DRC_INDEX= [STAKE_TOKEN=NULL] [-d] -+.IP -+Configure a device to hybrid network HCN -+.PP -+Usage: hcnrmhcn HCN_ID= -+.IP -+Remove a hybrid network HCN given an HCN ID -+.PP -+Usage: hcnrmdev DRC_INDEX= HCN_ID= -+.IP -+Unconfigure device from HCN -+.PP -+Usage: hcnqrydev DRC_INDEX= HCN_ID= -+.IP -+Query a device given a DRC_INDEX or HCN ID -+.PP -+Usage: hcnversion -+.IP -+get the current version of the HCN support -+.PP -+Optional arguments. -+.TP -+\fB\-s\fR -+scan device\-tree and configure HCN -+.TP -+\fB\-V\fR -+Display version information and exit -+.TP -+\fB\-h\fR -+Display this help information and exit -+.SH AUTHOR -+.B hcnmgr -+was written by Mingming Cao . -+.PP -+This manual page was written by Than Ngo . diff --git a/SOURCES/powerpc-utils-1.3.8-install-man.patch b/SOURCES/powerpc-utils-1.3.8-install-man.patch deleted file mode 100644 index e7ff074..0000000 --- a/SOURCES/powerpc-utils-1.3.8-install-man.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up powerpc-utils-1.3.8/Makefile.am.me powerpc-utils-1.3.8/Makefile.am ---- powerpc-utils-1.3.8/Makefile.am.me 2020-09-04 11:37:54.042763518 +0200 -+++ powerpc-utils-1.3.8/Makefile.am 2020-09-04 11:39:06.262151924 +0200 -@@ -54,7 +54,9 @@ man_MANS = \ - man/lsprop.8 \ - man/ls-veth.8 \ - man/nvsetenv.8 \ -- man/ls-vscsi.8 -+ man/ls-vscsi.8 \ -+ man/pseries_platform.8 \ -+ man/update_flash_nv.8 - - EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) - diff --git a/SOURCES/powerpc-utils-1.3.9-Fix-NM-HNV-setting-primary-slave.patch b/SOURCES/powerpc-utils-1.3.9-Fix-NM-HNV-setting-primary-slave.patch deleted file mode 100644 index c684057..0000000 --- a/SOURCES/powerpc-utils-1.3.9-Fix-NM-HNV-setting-primary-slave.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 5c2d5e838e8a9e2e744b89fa42724118e1cccded -Author: Mingming Cao -Date: Thu Feb 24 09:02:05 2022 -0800 - - hcnmgr: Fix NM HNV setting primary slave - - Fix incorrect usage active_slave attribute instead of primary. - - Signed-off-by: Mingming Cao - Signed-off-by: Tyrel Datwyler - -diff --git a/scripts/hcnmgr b/scripts/hcnmgr -index fdb6eaa..3dc1ad2 100644 ---- a/scripts/hcnmgr -+++ b/scripts/hcnmgr -@@ -375,7 +375,7 @@ do_config_vdevice_nm() { - # if the device is primary, and link is up, force it as primary se - if [[ $MODE == "primary" ]]; then - hcnlog INFO "Change bonding primary slave to $DEVNAME" -- echo "$DEVNAME" >"$BOND_PATH"/active_slave -+ echo "$DEVNAME" >"$BOND_PATH"/primary - fi - - hcnlog DEBUG "do_config_vdevice: exit" diff --git a/SOURCES/powerpc-utils-1.3.9-fix-hexdump-format.patch b/SOURCES/powerpc-utils-1.3.9-fix-hexdump-format.patch deleted file mode 100644 index 9b7b2bb..0000000 --- a/SOURCES/powerpc-utils-1.3.9-fix-hexdump-format.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff -up powerpc-utils-1.3.9/scripts/hcnmgr.me powerpc-utils-1.3.9/scripts/hcnmgr ---- powerpc-utils-1.3.9/scripts/hcnmgr.me 2021-11-11 11:38:33.293898966 +0100 -+++ powerpc-utils-1.3.9/scripts/hcnmgr 2021-11-11 11:39:19.302587637 +0100 -@@ -168,7 +168,7 @@ search_dev() { - # Look at pci ethernet devices - for pci_dev in "$DT_PATH"/pci*; do - [ -d "$pci_dev" ] || continue -- index=$(hexdump -n 4 -e '/1 "%02x"' "$pci_dev"/ibm,my-drc-index) -+ index=$(hexdump -n 4 -ve '/1 "%02x"' "$pci_dev"/ibm,my-drc-index) - if [[ $index != "$1" ]]; then - continue - fi -@@ -189,7 +189,7 @@ search_dev() { - hcnlog DEBUG "search vnic device with drc_index $1" - for dev in "$DT_PATH"/vdevice/vnic*; do - [ -d "$dev" ] || continue -- index=$(hexdump -n 4 -e '/1 "%02x"' "$dev"/ibm,my-drc-index) -+ index=$(hexdump -n 4 -ve '/1 "%02x"' "$dev"/ibm,my-drc-index) - if [[ $index == "$1" ]]; then - hcnlog DEBUG "found matching drc_index $index in $dev" - if [ -e "$dev"/ibm,hcn-id ] && get_dev_hcn "$dev"; then -@@ -205,7 +205,7 @@ search_dev() { - hcnlog DEBUG "search ibmveth device with drc_index $1" - for dev in "$DT_PATH"/vdevice/l-lan*; do - [ -d "$dev" ] || continue -- index=$(hexdump -n 4 -e '/1 "%02x"' "$dev"/ibm,my-drc-index) -+ index=$(hexdump -n 4 -ve '/1 "%02x"' "$dev"/ibm,my-drc-index) - if [[ $index == "$1" ]]; then - hcnlog DEBUG "found matching drc_index $index in $dev" - if [ -e "$dev"/ibm,hcn-id ] && get_dev_hcn "$dev"; then -@@ -233,7 +233,7 @@ get_dev_hcn() { - local dev=$1 - - hcnlog DEBUG "get_dev_hcn: enter $1" -- HCNID=$(hexdump -n 4 -e '/1 "%02x"' "$dev"/ibm,hcn-id) -+ HCNID=$(hexdump -n 4 -ve '/1 "%02x"' "$dev"/ibm,hcn-id) - MODE=$(tr -d '\0' <"$dev"/ibm,hcn-mode) - PHYSLOC=$(tr -d '\0' <"$dev"/ibm,loc-code) - DEVPATH=$1 diff --git a/SOURCES/powerpc-utils-1.3.9-makefile.patch b/SOURCES/powerpc-utils-1.3.9-makefile.patch deleted file mode 100644 index 80b72ae..0000000 --- a/SOURCES/powerpc-utils-1.3.9-makefile.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up powerpc-utils-1.3.9/Makefile.am.me powerpc-utils-1.3.9/Makefile.am ---- powerpc-utils-1.3.9/Makefile.am.me 2021-07-19 12:30:46.169839551 +0200 -+++ powerpc-utils-1.3.9/Makefile.am 2021-07-19 12:33:10.336034675 +0200 -@@ -48,7 +48,14 @@ man_MANS = \ - man/vcpustat.8 \ - man/rtas_dbg.8 \ - man/drmgr.8 \ -- man/lparnumascore.8 -+ man/lparnumascore.8 \ -+ man/lsdevinfo.8 \ -+ man/rtas_event_decode.8 \ -+ man/ls-vdev.8 \ -+ man/lsprop.8 \ -+ man/ls-veth.8 \ -+ man/nvsetenv.8 \ -+ man/ls-vscsi.8 - - EXTRA_DIST += $(bin_SCRIPTS) $(sbin_SCRIPTS) $(man_MANS) - diff --git a/SOURCES/powerpc-utils-support-vnic-as-backup-device-for-HNV.patch b/SOURCES/powerpc-utils-support-vnic-as-backup-device-for-HNV.patch deleted file mode 100644 index f93d611..0000000 --- a/SOURCES/powerpc-utils-support-vnic-as-backup-device-for-HNV.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff -up powerpc-utils-1.3.8/scripts/hcnmgr.me powerpc-utils-1.3.8/scripts/hcnmgr ---- powerpc-utils-1.3.8/scripts/hcnmgr.me 2021-11-11 11:10:37.800910318 +0100 -+++ powerpc-utils-1.3.8/scripts/hcnmgr 2021-11-11 11:12:10.597104063 +0100 -@@ -21,7 +21,7 @@ - # support live partition migration with SR_IOV - # - --VERSION="1.0" -+VERSION="1.1" - PATH=$PATH:/bin:/usr/bin:/sbin:/usr/sbin - BOND_BASEPATH="/sys/class/net" - BONDOPTIONS="mode=1,miimon=100,fail_over_mac=2" -@@ -630,6 +630,9 @@ fi - if ! nmcli --version >/dev/null 2>&1; then - err $E_ENETUNREACH - fi -+# HNV can support VNIC or Veth as backup device. -+# In the first HNV version 1.0, the vNIC as backup support was turned off -+# HNV VERSION greater than 1.0 starts to support vNIC as the backup device - if [[ $VERSION == "1.0" ]]; then - VNIC_SPT="OFF" - fi diff --git a/SPECS/powerpc-utils.spec b/SPECS/powerpc-utils.spec index d18b5d2..22b9027 100644 --- a/SPECS/powerpc-utils.spec +++ b/SPECS/powerpc-utils.spec @@ -1,6 +1,6 @@ Name: powerpc-utils -Version: 1.3.9 -Release: 2%{?dist} +Version: 1.3.10 +Release: 1%{?dist} Summary: PERL-based scripts for maintaining and servicing PowerPC systems Group: System Environment/Base @@ -8,6 +8,8 @@ License: GPLv2 URL: https://github.com/ibm-power-utilities/powerpc-utils Source0: https://github.com/ibm-power-utilities/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz Source1: nvsetenv +Patch0: powerpc-utils-1.3.10-manpages.patch +Patch1: powerpc-utils-1.3.10-distro.patch ExclusiveArch: ppc %{power64} @@ -26,18 +28,6 @@ BuildRequires: numactl-devel Requires: perl(Data::Dumper) Requires: %{name}-core = %{version}-%{release} -Patch1: powerpc-utils-1.3.8-man.patch -Patch2: powerpc-utils-1.3.9-makefile.patch -Patch3: powerpc-utils-1.3.5-pseries_platform-man.patch -Patch4: powerpc-utils-1.3.5-update_flash_nv.patch -Patch5: powerpc-utils-1.3.8-install-man.patch -Patch7: powerpc-utils-1.3.8-hcnmgr.patch -# enable support for vnic as backup device -Patch8: powerpc-utils-support-vnic-as-backup-device-for-HNV.patch -# fixed hexdump format -Patch9: powerpc-utils-1.3.9-fix-hexdump-format.patch -Patch10: powerpc-utils-1.3.9-Fix-NM-HNV-setting-primary-slave.patch - %description PERL-based scripts for maintaining and servicing PowerPC systems. @@ -124,8 +114,8 @@ systemctl enable hcn-init.service >/dev/null 2>&1 || : %files core %license COPYING -%dir /var/lib/powerpc-utils -%ghost %config(missingok,noreplace) /var/lib/powerpc-utils/smt.state +%dir %{_localstatedir}/lib/powerpc-utils +%config(noreplace) %{_localstatedir}/lib/powerpc-utils/smt.state %{_unitdir}/smtstate.service %{_unitdir}/smt_off.service %{_unitdir}/hcn-init.service @@ -199,8 +189,14 @@ systemctl enable hcn-init.service >/dev/null 2>&1 || : %{_mandir}/man8/lparnumascore.8* %changelog -* Mon Apr 25 2022 Than Ngo - 1.3.9-2 -- Resolves: #2078537, hcnmgr: Fix NM HNV setting primary slave +* Mon Jun 06 2022 Than Ngo - 1.3.10-1 +- Resolves: #2051330, Linux Hybrid Network Virtualization update +- Resolves: #2083469, smtstate --save command failed + +* Fri May 13 2022 Than Ngo - 1.3.9-3 +- Resolves: #2059459, add new DRC type description strings for latest PCIe slot types +- Resolves: #2078514, Fix NM HNV setting primary slave +- Resolves: #2083469, smtstate test failed as smtstate --save command failed * Thu Dec 09 2021 Than Ngo - 1.3.9-1 - Resolves: #2028690, rebase to 1.3.9