Compare commits
No commits in common. "c8" and "c9" have entirely different histories.
|
@ -0,0 +1 @@
|
||||||
|
KERNEL=="nx-gzip", MODE="0666"
|
|
@ -0,0 +1,110 @@
|
||||||
|
commit 2fbd7c1ff428e534d80f60e03501d625ab594eca
|
||||||
|
Author: Wen Xiong <wenxiong@linux.ibm.com>
|
||||||
|
Date: Wed Jun 15 13:05:51 2022 -0500
|
||||||
|
|
||||||
|
ofpathname: Fix several issues in nvmf boot/install support
|
||||||
|
|
||||||
|
This patch fixes several issues in boot/install over nvme-over-fc
|
||||||
|
device support.
|
||||||
|
|
||||||
|
- change cntlid to ffff
|
||||||
|
- add devnisd from sysfs
|
||||||
|
- add subsysnqn
|
||||||
|
|
||||||
|
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
|
||||||
|
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
|
||||||
|
|
||||||
|
diff --git a/scripts/ofpathname b/scripts/ofpathname
|
||||||
|
index b1d6b09..33d7702 100755
|
||||||
|
--- a/scripts/ofpathname
|
||||||
|
+++ b/scripts/ofpathname
|
||||||
|
@@ -773,8 +773,7 @@ l2of_nvmf()
|
||||||
|
t_wwpn="${t_wwpn#0x}"
|
||||||
|
t_wwpn="${t_wwpn%,*}"
|
||||||
|
nqn=`$CAT $PWD/subsysnqn`
|
||||||
|
- cntlid_dec=`$CAT $PWD/cntlid`
|
||||||
|
- cntlid=`echo "obase=16; $cntlid_dec" |bc`
|
||||||
|
+ cntlid=`echo ffff`
|
||||||
|
if [[ -n $h_wwpn ]]; then
|
||||||
|
for f in `$FIND /sys/devices -name "port_name"`; do
|
||||||
|
sys_wwpn=`$CAT $f 2>/dev/null`
|
||||||
|
@@ -808,6 +807,9 @@ l2of_nvmf()
|
||||||
|
if [[ ${#res} = 0 ]]; then
|
||||||
|
OF_PATH=""
|
||||||
|
else
|
||||||
|
+ goto_dir $res
|
||||||
|
+ devnsid=`$CAT $PWD/nsid | tr -d '\000'`
|
||||||
|
+ devnsid=`echo "obase=16; $devnsid" |bc`
|
||||||
|
OF_PATH="$OF_PATH/namespace@$devnsid"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
@@ -818,6 +820,8 @@ l2of_nvmf()
|
||||||
|
if [[ ${#res} = 0 ]]; then
|
||||||
|
OF_PATH=""
|
||||||
|
else
|
||||||
|
+ goto_dir $res
|
||||||
|
+ devpart=`$CAT $PWD/partition | tr -d '\000'`
|
||||||
|
OF_PATH="${OF_PATH}:${devpart}"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
@@ -1826,8 +1830,7 @@ of2l_nvmf()
|
||||||
|
ctrl_name=`echo $DEVNAME | cut -d "/" -f 5`
|
||||||
|
OF_WWPN=${ctrl_name%,*}
|
||||||
|
OF_WWPN=${OF_WWPN#*@}
|
||||||
|
- of_cntlid=${ctrl_name%%:*}
|
||||||
|
- of_cntlid=${of_cntlid#*,}
|
||||||
|
+ OF_NQN=`echo $ctrl_name | cut -d "=" -f 2`
|
||||||
|
# set partition number only if ':' is present
|
||||||
|
case "${nsid_part}" in
|
||||||
|
*:*)
|
||||||
|
@@ -1835,6 +1838,7 @@ of2l_nvmf()
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
local dir
|
||||||
|
+ local found=0
|
||||||
|
|
||||||
|
for dir in `$FIND /sys/devices/virtual/nvme-fabrics -name "nvme[0-9]*"`; do
|
||||||
|
cd $dir
|
||||||
|
@@ -1844,10 +1848,9 @@ of2l_nvmf()
|
||||||
|
t_wwpn="${t_wwpn%,*}"
|
||||||
|
h_wwpn=`$CAT $PWD/address | cut -f 5 -d "-"`
|
||||||
|
h_wwpn="${h_wwpn#0x}"
|
||||||
|
- cntlid_dec=`$CAT $PWD/cntlid 2>/dev/null`
|
||||||
|
- cntlid=`echo "obase=16; $cntlid_dec" |bc`
|
||||||
|
+ nqn=`$CAT $PWD/subsysnqn`
|
||||||
|
if [[ $t_wwpn = $OF_WWPN ]] && \
|
||||||
|
- [[ $cntlid == $of_cntlid ]]; then
|
||||||
|
+ [[ $nqn == $OF_NQN ]]; then
|
||||||
|
for f in `$FIND /sys/devices -name "port_name"`; do
|
||||||
|
sys_wwpn=`$CAT $f 2>/dev/null`
|
||||||
|
sys_wwpn="${sys_wwpn#0x}"
|
||||||
|
@@ -1871,14 +1874,23 @@ of2l_nvmf()
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
+
|
||||||
|
if [[ -n $LOGICAL_DEVNAME ]] && \
|
||||||
|
[[ -n $nsid ]]; then
|
||||||
|
- res=`$FIND /sys/devices/virtual -name ${LOGICAL_DEVNAME}n${nsid}`
|
||||||
|
- if [[ ${#res} = 0 ]]; then
|
||||||
|
- LOGICAL_DEVNAME=''
|
||||||
|
- else
|
||||||
|
- LOGICAL_DEVNAME="${LOGICAL_DEVNAME}n${nsid}"
|
||||||
|
- fi
|
||||||
|
+ for dir in `$FIND /sys/block -name "${LOGICAL_DEVNAME}n[0-9]*"`; do
|
||||||
|
+ cd $dir
|
||||||
|
+
|
||||||
|
+ local devnsid=`$CAT ./nsid 2>/dev/null`
|
||||||
|
+ devnsid=`echo "obase=16; $devnsid" |bc`
|
||||||
|
+ if [[ $devnsid = $nsid ]]; then
|
||||||
|
+ found=1
|
||||||
|
+ LOGICAL_DEVNAME="${dir##*/}"
|
||||||
|
+ break
|
||||||
|
+ fi
|
||||||
|
+ done
|
||||||
|
+ if [[ $found -eq 0 ]]; then
|
||||||
|
+ LOGICAL_DEVNAME=""
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ -n $LOGICAL_DEVNAME ]] && \
|
|
@ -0,0 +1,131 @@
|
||||||
|
commit c015807d5bef0ebdeaf99883793173f2b636e740
|
||||||
|
Author: Wen Xiong <wenxiong@linux.ibm.com>
|
||||||
|
Date: Wed Jun 15 13:05:18 2022 -0500
|
||||||
|
|
||||||
|
bootlist: Add install/boot support for nvmf devices
|
||||||
|
|
||||||
|
This patch adds the boot/installation support for nvme-over-fc devices.
|
||||||
|
It can set nvmf device as boot device in both of logical device name
|
||||||
|
and open firmware device path name.
|
||||||
|
|
||||||
|
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
|
||||||
|
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
|
||||||
|
|
||||||
|
diff --git a/scripts/bootlist b/scripts/bootlist
|
||||||
|
index b5cfbd9..1929f65 100755
|
||||||
|
--- a/scripts/bootlist
|
||||||
|
+++ b/scripts/bootlist
|
||||||
|
@@ -22,6 +22,7 @@
|
||||||
|
|
||||||
|
OFPATHNAME=/usr/sbin/ofpathname
|
||||||
|
NVRAM=/usr/sbin/nvram
|
||||||
|
+FIND=/usr/bin/find
|
||||||
|
PSERIES_PLATFORM=$(dirname $0)/pseries_platform
|
||||||
|
|
||||||
|
#
|
||||||
|
@@ -288,6 +289,63 @@ dm_to_part()
|
||||||
|
done
|
||||||
|
}
|
||||||
|
|
||||||
|
+# is_nvmf_device
|
||||||
|
+# Check to see if this is a nvmf device
|
||||||
|
+#
|
||||||
|
+is_nvmf_device()
|
||||||
|
+{
|
||||||
|
+ local res
|
||||||
|
+
|
||||||
|
+ res=`$FIND /sys/devices/virtual/nvme-fabrics -name $1 2>/dev/null`
|
||||||
|
+ if [[ ${#res} = 0 ]]; then
|
||||||
|
+ echo "no"
|
||||||
|
+ else
|
||||||
|
+ echo "yes"
|
||||||
|
+ fi
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+# get_link
|
||||||
|
+# return the directory path that a link points to.
|
||||||
|
+# The only parameter is the link name.
|
||||||
|
+#
|
||||||
|
+get_link()
|
||||||
|
+{
|
||||||
|
+ local ln_name=$1;
|
||||||
|
+
|
||||||
|
+ echo `ls -l $ln_name 2>/dev/null | awk -F"->" '{print $2}'`
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+add_nvmf()
|
||||||
|
+{
|
||||||
|
+ local DEVNAME=$1
|
||||||
|
+
|
||||||
|
+ ctrl_name=$DEVNAME
|
||||||
|
+ local startctr=$ctr
|
||||||
|
+
|
||||||
|
+ local dir
|
||||||
|
+ for dir in `$FIND /sys/devices/virtual/nvme-fabrics -name "$ctrl_name"`; do
|
||||||
|
+ cd $dir
|
||||||
|
+ link=`get_link "device"`
|
||||||
|
+ cd $link
|
||||||
|
+ for slave in $PWD/*; do
|
||||||
|
+ slavedev=${slave##*/}
|
||||||
|
+ if [[ "$slavedev" == nvme[0-9]* ]] ; then
|
||||||
|
+ cd $slave
|
||||||
|
+ res=`$FIND . -name "${ctrl_name}*"`
|
||||||
|
+ if [[ ${#res} != 0 ]]; then
|
||||||
|
+ LOGICAL_NAMES[$ctr]=${slavedev}
|
||||||
|
+ ctr=$[$ctr + 1]
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
+ done
|
||||||
|
+ done
|
||||||
|
+
|
||||||
|
+ if [[ "$startctr" = "$ctr" ]] ; then
|
||||||
|
+ LOGICAL_NAMES[$ctr]=$1
|
||||||
|
+ ctr=$[$ctr + 1]
|
||||||
|
+ fi
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
add_logical()
|
||||||
|
{
|
||||||
|
local DEVNAME=$1
|
||||||
|
@@ -432,7 +490,30 @@ while [[ -n $1 ]]; do
|
||||||
|
exit -1
|
||||||
|
else
|
||||||
|
# add this element to the array
|
||||||
|
- add_logical $1
|
||||||
|
+ if [[ "$1" == *"dm-"* ]] ; then
|
||||||
|
+ add_logical $1
|
||||||
|
+ else
|
||||||
|
+ if [[ "$1" == *"nvme-of"* ]]; then
|
||||||
|
+ ctrl_name=`get_logical_device_name $1`
|
||||||
|
+ else
|
||||||
|
+ ctrl_name=$1
|
||||||
|
+ ctrl_name=${ctrl_name##*/}
|
||||||
|
+ fi
|
||||||
|
+ ctrl_name="${ctrl_name%n[0-9]*}"
|
||||||
|
+ is_nvmf=$(is_nvmf_device $ctrl_name)
|
||||||
|
+ if [[ $is_nvmf = "yes" ]]; then
|
||||||
|
+ if [[ "$1" == *"nvme-of"* ]]; then
|
||||||
|
+ master_of_path=$1
|
||||||
|
+ else
|
||||||
|
+ master_of_path=`get_of_device_name $1`
|
||||||
|
+ fi
|
||||||
|
+ namespace_base=${master_of_path##*/}
|
||||||
|
+ DEVTYPE="nvme-of"
|
||||||
|
+ add_nvmf $ctrl_name
|
||||||
|
+ else
|
||||||
|
+ add_logical $1
|
||||||
|
+ fi
|
||||||
|
+ fi
|
||||||
|
fi
|
||||||
|
|
||||||
|
shift
|
||||||
|
@@ -453,6 +534,9 @@ if [[ ${#LOGICAL_NAMES[*]} -ne 0 ]]; then
|
||||||
|
if [[ -z ${OF_DEVPATH[$ctr]} ]]; then
|
||||||
|
# See if this is an OF pathname
|
||||||
|
OF_DEVPATH[$ctr]=`get_of_device_name ${LOGICAL_NAMES[$ctr]}`
|
||||||
|
+ if [[ $DEVTYPE = "nvme-of" ]]; then
|
||||||
|
+ OF_DEVPATH[$ctr]=${OF_DEVPATH[$ctr]}/$namespace_base
|
||||||
|
+ fi
|
||||||
|
else
|
||||||
|
OF_DEVPATH[$ctr]=${LOGICAL_NAMES[$ctr]}
|
||||||
|
fi
|
|
@ -0,0 +1,40 @@
|
||||||
|
commit 04e5c9646296e1f12048723bba4cee663c3f74ed
|
||||||
|
Author: Wen Xiong <wenxiong@linux.ibm.com>
|
||||||
|
Date: Thu Dec 1 05:22:37 2022 -0600
|
||||||
|
|
||||||
|
ofpathname: Handle nsid as hex in nvmf boot/install support
|
||||||
|
|
||||||
|
Didn't handle nsid correctly in nvmf boot/install support.
|
||||||
|
Need to handle it as hexadecimal number
|
||||||
|
|
||||||
|
For example,
|
||||||
|
/pci@800000020000132/fibre-channel@0,1/nvme-of/controller@50050768101935e5,ffff
|
||||||
|
:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@26c
|
||||||
|
|
||||||
|
26c should be a hexadecimal number.
|
||||||
|
|
||||||
|
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
|
||||||
|
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
|
||||||
|
|
||||||
|
diff --git a/scripts/ofpathname b/scripts/ofpathname
|
||||||
|
index c576fb8..3abe4d1 100755
|
||||||
|
--- a/scripts/ofpathname
|
||||||
|
+++ b/scripts/ofpathname
|
||||||
|
@@ -809,7 +809,7 @@ l2of_nvmf()
|
||||||
|
else
|
||||||
|
goto_dir $res
|
||||||
|
devnsid=`$CAT $PWD/nsid | tr -d '\000'`
|
||||||
|
- devnsid=`echo "obase=16; $devnsid" |bc`
|
||||||
|
+ devnsid=$(printf "%x" $devnsid)
|
||||||
|
OF_PATH="$OF_PATH/namespace@$devnsid"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
@@ -1886,7 +1886,7 @@ of2l_nvmf()
|
||||||
|
for dev_name in `$FIND /sys/block -name "${ana_name##*/}n[0-9]*"`; do
|
||||||
|
cd $dev_name
|
||||||
|
local devnsid=`$CAT ./nsid 2>/dev/null`
|
||||||
|
- devnsid=`echo "obase=16; $devnsid" |bc`
|
||||||
|
+ devnsid=$(printf "%x" $devnsid)
|
||||||
|
if [[ $devnsid = $nsid ]]; then
|
||||||
|
found=1
|
||||||
|
NS_ID="${dev_name##*n}"
|
|
@ -0,0 +1,118 @@
|
||||||
|
commit 3847a1c25a640394c4afd2b8938ad21190bf5dbe
|
||||||
|
Author: Wen Xiong <wenxiong@linux.ibm.com>
|
||||||
|
Date: Fri Oct 28 09:20:38 2022 -0500
|
||||||
|
|
||||||
|
Support multiple dev paths for a nvmf boot device
|
||||||
|
|
||||||
|
This patch adds the support for multiple dev/of paths with a nvmf boot dev
|
||||||
|
|
||||||
|
# bootlist -m normal -o nvme1n4
|
||||||
|
nvme1n4
|
||||||
|
nvme3n4
|
||||||
|
nvme5n4
|
||||||
|
nvme6n4
|
||||||
|
# bootlist -m normal -o
|
||||||
|
nvme1n4
|
||||||
|
nvme3n4
|
||||||
|
nvme5n4
|
||||||
|
nvme6n4
|
||||||
|
# bootlist -m normal -r
|
||||||
|
/pci@800000020000017/fibre-channel@0/nvme-of/controller@50050768101935e5,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147
|
||||||
|
/pci@800000020000017/fibre-channel@0/nvme-of/controller@5005076810193675,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147
|
||||||
|
/pci@800000020000017/fibre-channel@0,1/nvme-of/controller@5005076810193675,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147
|
||||||
|
/pci@800000020000017/fibre-channel@0,1/nvme-of/controller@50050768101935e5,ffff:nqn=nqn.1986-03.com.ibm:nvme:2145.0000020420006CEA/namespace@147
|
||||||
|
|
||||||
|
Signed-off-by: Wen Xiong <wenxiong@linux.ibm.com>
|
||||||
|
Signed-off-by: Tyrel Datwyler <tyreld@linux.ibm.com>
|
||||||
|
|
||||||
|
diff --git a/scripts/bootlist b/scripts/bootlist
|
||||||
|
index 1929f65..cc8718e 100755
|
||||||
|
--- a/scripts/bootlist
|
||||||
|
+++ b/scripts/bootlist
|
||||||
|
@@ -327,16 +327,10 @@ add_nvmf()
|
||||||
|
cd $dir
|
||||||
|
link=`get_link "device"`
|
||||||
|
cd $link
|
||||||
|
- for slave in $PWD/*; do
|
||||||
|
- slavedev=${slave##*/}
|
||||||
|
- if [[ "$slavedev" == nvme[0-9]* ]] ; then
|
||||||
|
- cd $slave
|
||||||
|
- res=`$FIND . -name "${ctrl_name}*"`
|
||||||
|
- if [[ ${#res} != 0 ]]; then
|
||||||
|
- LOGICAL_NAMES[$ctr]=${slavedev}
|
||||||
|
- ctr=$[$ctr + 1]
|
||||||
|
- fi
|
||||||
|
- fi
|
||||||
|
+ for slave in `ls -d $PWD/nvme*`; do
|
||||||
|
+ slavedev=${slave##*/}
|
||||||
|
+ LOGICAL_NAMES[$ctr]=${slavedev}
|
||||||
|
+ ctr=$[$ctr + 1]
|
||||||
|
done
|
||||||
|
done
|
||||||
|
|
||||||
|
@@ -502,11 +496,17 @@ while [[ -n $1 ]]; do
|
||||||
|
ctrl_name="${ctrl_name%n[0-9]*}"
|
||||||
|
is_nvmf=$(is_nvmf_device $ctrl_name)
|
||||||
|
if [[ $is_nvmf = "yes" ]]; then
|
||||||
|
- if [[ "$1" == *"nvme-of"* ]]; then
|
||||||
|
- master_of_path=$1
|
||||||
|
- else
|
||||||
|
- master_of_path=`get_of_device_name $1`
|
||||||
|
- fi
|
||||||
|
+ if [[ "$1" == *"nvme-of"* ]]; then
|
||||||
|
+ master_of_path=$1
|
||||||
|
+ else
|
||||||
|
+ master_of_path=`get_of_device_name $1`
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
+ if [[ -z $master_of_path ]]; then
|
||||||
|
+ echo "Device $1 does not appear to be valid." >&2
|
||||||
|
+ exit 1
|
||||||
|
+ fi
|
||||||
|
+
|
||||||
|
namespace_base=${master_of_path##*/}
|
||||||
|
DEVTYPE="nvme-of"
|
||||||
|
add_nvmf $ctrl_name
|
||||||
|
diff --git a/scripts/ofpathname b/scripts/ofpathname
|
||||||
|
index 33d7702..c576fb8 100755
|
||||||
|
--- a/scripts/ofpathname
|
||||||
|
+++ b/scripts/ofpathname
|
||||||
|
@@ -1875,19 +1875,28 @@ of2l_nvmf()
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
|
+ local ana_dir
|
||||||
|
if [[ -n $LOGICAL_DEVNAME ]] && \
|
||||||
|
[[ -n $nsid ]]; then
|
||||||
|
- for dir in `$FIND /sys/block -name "${LOGICAL_DEVNAME}n[0-9]*"`; do
|
||||||
|
- cd $dir
|
||||||
|
-
|
||||||
|
- local devnsid=`$CAT ./nsid 2>/dev/null`
|
||||||
|
- devnsid=`echo "obase=16; $devnsid" |bc`
|
||||||
|
- if [[ $devnsid = $nsid ]]; then
|
||||||
|
- found=1
|
||||||
|
- LOGICAL_DEVNAME="${dir##*/}"
|
||||||
|
- break
|
||||||
|
- fi
|
||||||
|
+ for ana_dir in `$FIND /sys/devices/virtual/nvme-fabrics -name "$LOGICAL_DEVNAME"`; do
|
||||||
|
+ cd $ana_dir
|
||||||
|
+ link=`get_link "device"`
|
||||||
|
+ cd $link
|
||||||
|
+ for ana_name in `ls -d $PWD/nvme*`; do
|
||||||
|
+ for dev_name in `$FIND /sys/block -name "${ana_name##*/}n[0-9]*"`; do
|
||||||
|
+ cd $dev_name
|
||||||
|
+ local devnsid=`$CAT ./nsid 2>/dev/null`
|
||||||
|
+ devnsid=`echo "obase=16; $devnsid" |bc`
|
||||||
|
+ if [[ $devnsid = $nsid ]]; then
|
||||||
|
+ found=1
|
||||||
|
+ NS_ID="${dev_name##*n}"
|
||||||
|
+ LOGICAL_DEVNAME="${LOGICAL_DEVNAME}n${NS_ID}"
|
||||||
|
+ break
|
||||||
|
+ fi
|
||||||
|
+ done
|
||||||
|
+ done
|
||||||
|
done
|
||||||
|
+
|
||||||
|
if [[ $found -eq 0 ]]; then
|
||||||
|
LOGICAL_DEVNAME=""
|
||||||
|
fi
|
|
@ -1,35 +1,40 @@
|
||||||
Name: powerpc-utils
|
Name: powerpc-utils
|
||||||
Version: 1.3.10
|
Version: 1.3.10
|
||||||
Release: 3%{?dist}
|
Release: 5%{?dist}
|
||||||
Summary: PERL-based scripts for maintaining and servicing PowerPC systems
|
Summary: PERL-based scripts for maintaining and servicing PowerPC systems
|
||||||
|
|
||||||
Group: System Environment/Base
|
License: GPLv2
|
||||||
License: GPLv2
|
URL: https://github.com/ibm-power-utilities/powerpc-utils
|
||||||
URL: https://github.com/ibm-power-utilities/powerpc-utils
|
Source0: https://github.com/ibm-power-utilities/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
Source0: https://github.com/ibm-power-utilities/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
|
Source1: nx-gzip.udev
|
||||||
Patch0: powerpc-utils-1.3.10-manpages.patch
|
Patch0: powerpc-utils-1.3.10-manpages.patch
|
||||||
Patch1: powerpc-utils-1.3.10-distro.patch
|
Patch1: powerpc-utils-1.3.10-distro.patch
|
||||||
# bz#2121470, Fix lsslot -c mem output when using 4GB LMB size
|
# bz#2121470, Fix lsslot -c mem output when using 4GB LMB size
|
||||||
Patch3: powerpc-utils-b1b9e7-LMB_size_4GB.patch
|
Patch3: powerpc-utils-b1b9e7-LMB_size_4GB.patch
|
||||||
Patch4: powerpc-utils-e1f1de-lmb_address_in_hexadecimal.patch
|
Patch4: powerpc-utils-e1f1de-lmb_address_in_hexadecimal.patch
|
||||||
Patch5: powerpc-utils-fix_setting_primary_slave_across_reboots.patch
|
# bz#2110129, Add NVMf-FC boot support for Power - powerpc-utils
|
||||||
|
Patch5: powerpc-utils-c01580-add_NVMf-FC_boot_support_part1.patch
|
||||||
|
Patch6: powerpc-utils-2fbd7c-add_NVMf-FC_boot_support_part2.patch
|
||||||
|
Patch7: powerpc-utils-git3847a1-support_multiple_dev_paths_for_a_nvmf_boot_device.patch
|
||||||
|
Patch8: powerpc-utils-git04e5c9-handle_nsid_as_hex.patch
|
||||||
|
Patch9: powerpc-utils-fix_setting_primary_slave_across_reboots.patch
|
||||||
|
|
||||||
ExclusiveArch: ppc %{power64}
|
ExclusiveArch: ppc %{power64}
|
||||||
|
|
||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: doxygen
|
BuildRequires: doxygen
|
||||||
BuildRequires: zlib-devel
|
BuildRequires: zlib-devel
|
||||||
BuildRequires: librtas-devel >= 1.4.0
|
BuildRequires: librtas-devel >= 1.4.0
|
||||||
BuildRequires: libservicelog-devel >= 1.0.1-2
|
BuildRequires: libservicelog-devel >= 1.0.1-2
|
||||||
BuildRequires: perl-generators
|
BuildRequires: perl-generators
|
||||||
BuildRequires: systemd
|
BuildRequires: systemd
|
||||||
BuildRequires: numactl-devel
|
BuildRequires: numactl-devel
|
||||||
|
|
||||||
# rtas_dump explicit dependency
|
# rtas_dump explicit dependency
|
||||||
Requires: perl(Data::Dumper)
|
Requires: perl(Data::Dumper)
|
||||||
Requires: %{name}-core = %{version}-%{release}
|
Requires: %{name}-core = %{version}-%{release}
|
||||||
|
|
||||||
%description
|
%description
|
||||||
PERL-based scripts for maintaining and servicing PowerPC systems.
|
PERL-based scripts for maintaining and servicing PowerPC systems.
|
||||||
|
@ -42,13 +47,20 @@ Requires(preun): systemd
|
||||||
Requires(postun): systemd
|
Requires(postun): systemd
|
||||||
Requires: kmod
|
Requires: kmod
|
||||||
Requires: which
|
Requires: which
|
||||||
Requires: gawk
|
Requires: /usr/bin/awk
|
||||||
Requires: bc
|
Requires: /usr/bin/basename
|
||||||
Requires: findutils
|
Requires: /usr/bin/bc
|
||||||
Requires: grep
|
Requires: /usr/bin/cat
|
||||||
Requires: sed
|
Requires: /usr/bin/cut
|
||||||
Requires: systemd-udev
|
Requires: /usr/bin/echo
|
||||||
Requires: coreutils
|
Requires: /usr/bin/find
|
||||||
|
Requires: /bin/grep
|
||||||
|
Requires: /usr/bin/head
|
||||||
|
Requires: /usr/bin/ls
|
||||||
|
Requires: /usr/bin/sed
|
||||||
|
Requires: /usr/bin/tr
|
||||||
|
Requires: /usr/bin/udevadm
|
||||||
|
|
||||||
|
|
||||||
%description core
|
%description core
|
||||||
Core utilities for maintaining and servicing PowerPC systems.
|
Core utilities for maintaining and servicing PowerPC systems.
|
||||||
|
@ -57,7 +69,6 @@ Core utilities for maintaining and servicing PowerPC systems.
|
||||||
%prep
|
%prep
|
||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||||
./autogen.sh
|
./autogen.sh
|
||||||
|
@ -77,6 +88,9 @@ install $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils/* -t $RPM_BUILD_ROO
|
||||||
rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils
|
rm -rf $RPM_BUILD_ROOT/usr/share/doc/packages/powerpc-utils
|
||||||
rm -f $RPM_BUILD_ROOT%{_pkgdocdir}/COPYING
|
rm -f $RPM_BUILD_ROOT%{_pkgdocdir}/COPYING
|
||||||
|
|
||||||
|
# install udev rule for the nx-gzip accelerator
|
||||||
|
install -pDm 644 %{SOURCE1} %{buildroot}%{_udevrulesdir}/90-nx-gzip.rules
|
||||||
|
|
||||||
# remove init script and perl script. They are deprecated
|
# remove init script and perl script. They are deprecated
|
||||||
rm -rf $RPM_BUILD_ROOT/etc/init.d/ibmvscsis.sh $RPM_BUILD_ROOT/usr/sbin/vscsisadmin
|
rm -rf $RPM_BUILD_ROOT/etc/init.d/ibmvscsis.sh $RPM_BUILD_ROOT/usr/sbin/vscsisadmin
|
||||||
|
|
||||||
|
@ -157,6 +171,7 @@ systemctl enable hcn-init.service >/dev/null 2>&1 || :
|
||||||
%{_sbindir}/pseries_platform
|
%{_sbindir}/pseries_platform
|
||||||
%{_sbindir}/drmgr
|
%{_sbindir}/drmgr
|
||||||
%{_sbindir}/lparnumascore
|
%{_sbindir}/lparnumascore
|
||||||
|
%{_udevrulesdir}/90-nx-gzip.rules
|
||||||
%{_mandir}/man1/amsstat.1*
|
%{_mandir}/man1/amsstat.1*
|
||||||
%{_mandir}/man5/lparcfg.5*
|
%{_mandir}/man5/lparcfg.5*
|
||||||
%{_mandir}/man8/activate_firmware.8*
|
%{_mandir}/man8/activate_firmware.8*
|
||||||
|
@ -190,110 +205,129 @@ systemctl enable hcn-init.service >/dev/null 2>&1 || :
|
||||||
%{_mandir}/man8/drmgr.8*
|
%{_mandir}/man8/drmgr.8*
|
||||||
%{_mandir}/man8/lparnumascore.8*
|
%{_mandir}/man8/lparnumascore.8*
|
||||||
|
|
||||||
%changelog
|
|
||||||
* Mon Nov 28 2022 Than Ngo <than@redhat.com> - 1.3.10-3
|
|
||||||
- Resolves: #2148878, HNV bond fails to come up with sriov interface as active slave
|
|
||||||
|
|
||||||
* Fri Oct 21 2022 Than Ngo <than@redhat.com> - 1.3.10-2
|
%changelog
|
||||||
- Resolves: #2121481, Fix lsslot -c mem output when using 4GB LMB size
|
* Mon Dec 12 2022 Than Ngo <than@redhat.com> - 1.3.10-5
|
||||||
|
- Resolves: #2125152, HNV bond fails to come up with sriov interface as active slave
|
||||||
|
|
||||||
|
* Thu Dec 08 2022 Than Ngo <than@redhat.com> - 1.3.10-4
|
||||||
|
- Resolves: #2150698, handle nsid of nvmf device as hexadecimal number
|
||||||
|
- Resolves: #2150697, setup multiple device path for a nvmf boot device
|
||||||
|
|
||||||
|
* Thu Nov 03 2022 Than Ngo <than@redhat.com> - 1.3.10-3
|
||||||
|
- Resolves: #2111991, Add udev rule for the nx-gzip in to the core subpackage
|
||||||
|
- Resolves: #2121470, Fix lsslot -c mem output when using 4GB LMB size
|
||||||
|
- Resolves: #2110129, Add NVMf-FC boot support for Power
|
||||||
|
|
||||||
|
* Mon Jun 06 2022 Than Ngo <than@redhat.com> - 1.3.10-2
|
||||||
|
- Related: #2089106, install smt.state as config file
|
||||||
|
|
||||||
* Mon Jun 06 2022 Than Ngo <than@redhat.com> - 1.3.10-1
|
* Mon Jun 06 2022 Than Ngo <than@redhat.com> - 1.3.10-1
|
||||||
- Resolves: #2051330, Linux Hybrid Network Virtualization update
|
- Resolves: #1920964, P10 Power Mode Reporting
|
||||||
- Resolves: #2083469, smtstate --save command failed
|
- Resolves: #2050893, Linux Hybrid Network Virtualizatio
|
||||||
|
- Resolves: #2065169, bootloader fails to update boot order after OS install
|
||||||
|
- Resolves: #2071862, Fix NM HNV setting primary slave
|
||||||
|
- Resolves: #2089106, smtstate --save command failed
|
||||||
|
|
||||||
* Fri May 13 2022 Than Ngo <than@redhat.com> - 1.3.9-3
|
* Fri Jan 14 2022 Than Ngo <than@redhat.com> - 1.3.9-6
|
||||||
- Resolves: #2059459, add new DRC type description strings for latest PCIe slot types
|
- Resolves: #2039201, santize devspec output of a newline if one is present
|
||||||
- Resolves: #2078514, Fix NM HNV setting primary slave
|
|
||||||
- Resolves: #2083469, smtstate test failed as smtstate --save command failed
|
|
||||||
|
|
||||||
* Thu Dec 09 2021 Than Ngo <than@redhat.com> - 1.3.9-1
|
* Tue Dec 07 2021 Than Ngo <than@redhat.com> - 1.3.9-5
|
||||||
- Resolves: #2028690, rebase to 1.3.9
|
- Resolves: #2024038 - HNV interface fails to configure when added in lpar shutdown state
|
||||||
|
|
||||||
* Thu Dec 02 2021 Than Ngo <than@redhat.com> - 1.3.8-10
|
* Thu Nov 11 2021 Than Ngo <than@redhat.com> - 1.3.9-4
|
||||||
- Related: #2022225, increase release
|
- enable support vnic as backend for HNV interface
|
||||||
|
- fixed hexdump format
|
||||||
|
Resolves: #2022235
|
||||||
|
|
||||||
* Thu Nov 11 2021 Than Ngo <than@redhat.com> - 1.3.8-9
|
* Wed Oct 20 2021 Than Ngo <than@redhat.com> - 1.3.9-3
|
||||||
- Resolves: #2022225, enable support vnic as backend for HNV interfaces
|
- Resolves: #2014916, marked smt.state as %%ghost
|
||||||
|
|
||||||
* Thu Oct 07 2021 Than Ngo <than@redhat.com> - 1.3.8-8
|
* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.9-2
|
||||||
- lsdevinfo: optimize criteria filtering
|
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
|
||||||
|
Related: rhbz#1991688
|
||||||
|
|
||||||
* Fri Jul 16 2021 Than Ngo <than@redhat.com> - 1.3.8-7
|
* Mon Jul 19 2021 Than Ngo <than@redhat.com> - 1.3.9-1
|
||||||
- Related: #1938420, Fix checking HCNID array size at boot time
|
- Resolves: #1873868, rebase to 1.3.9
|
||||||
|
|
||||||
* Thu Apr 01 2021 Than Ngo <than@redhat.com> - 1.3.8-6
|
* Fri Jun 11 2021 Than Ngo <than@redhat.com> - 1.3.8-9
|
||||||
- Resolves: #1935658, New lparstat -x option to report the security flavor
|
- Resolves: #1937038, New lparstat -x option to report the security flavor
|
||||||
- Resolves: #1953818, Use od instead xxd
|
- Use od instead xxd
|
||||||
- Resolves: #1938420, rebase patch fix_boot-time_bonding_interface_cleanup_and_avoid_use_ifcfg
|
- rebase patch fix_boot-time_bonding_interface_cleanup_and_avoid_use_ifcfg
|
||||||
- Resolves: #1940358, ppc64_cpu --help does not list --version as an option
|
- ppc64_cpu --help does not list --version as an option
|
||||||
- Resolves: #1951068, take care of NUMA topology when removing memory (DLPAR)
|
- take care of NUMA topology when removing memory (DLPAR)
|
||||||
|
|
||||||
* Wed Feb 03 2021 Than Ngo <than@redhat.com> - 1.3.8-5
|
* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 1.3.8-8
|
||||||
- Resolves: #1924150, Fix boot-time bonding interface cleanup and avoid use ifcfg
|
- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
|
||||||
|
|
||||||
* Mon Dec 21 2020 Than Ngo <than@redhat.com> - 1.3.8-4
|
* Mon Feb 08 2021 Than Ngo <than@redhat.com> - 1.3.8-7
|
||||||
- Resolves: #1909526, additional patches to support Linux Hybrid Network Virtualization
|
- updated hcnmgr manpage
|
||||||
- Resolves: #1909135, move commands that dont depend on perl to core subpackage
|
|
||||||
|
|
||||||
* Tue Oct 06 2020 Than Ngo <than@redhat.com> - 1.3.8-3
|
* Mon Feb 08 2021 Than Ngo <than@redhat.com> - 1.3.8-6
|
||||||
- Resolves: #1868474, ofpathname: Use NVMe controller physical nsid
|
- Fix boot-time bonding interface cleanup and avoid use ifcfg
|
||||||
- Resolves: #1885532, sys_ident: Skip length field from search
|
|
||||||
|
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.8-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Dec 22 2020 Than Ngo <than@redhat.com> - 1.3.8-4
|
||||||
|
- additional patches to support Linux Hybrid Network Virtualization
|
||||||
|
- move commands that dont depend on perl to core subpackage
|
||||||
|
- update hcnmgr patch
|
||||||
|
- sys_ident: Skip length field from search
|
||||||
|
- ofpathname: Use NVMe controller physical nsid
|
||||||
|
|
||||||
|
* Thu Oct 01 2020 Than Ngo <than@redhat.com> - 1.3.8-3
|
||||||
|
- add hcnmgr man page
|
||||||
|
|
||||||
* Thu Oct 01 2020 Than Ngo <than@redhat.com> - 1.3.8-2
|
* Thu Oct 01 2020 Than Ngo <than@redhat.com> - 1.3.8-2
|
||||||
- Related: #1853297, add missing hcnmgr manpage and Req on which
|
- clean up systemd service
|
||||||
|
|
||||||
* Thu Oct 01 2020 Than Ngo <than@redhat.com> - 1.3.8-1
|
* Fri Sep 04 2020 Than Ngo <than@redhat.com> - 1.3.8-1
|
||||||
- Resolves: #1853297, rebase to 1.3.8
|
- update to 1.3.8
|
||||||
- Resolves: #1802181, SR-IOV - Linux Hybrid Network Virtualization
|
|
||||||
- Resolves: #1844421, Include vcpustat
|
|
||||||
|
|
||||||
* Wed Jun 24 2020 Than Ngo <than@redhat.com> - 1.3.6-11
|
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-7
|
||||||
- Resolves: #1847604, ofpathname: failed to boot
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Jun 19 2020 Than Ngo <than@redhat.com> - 1.3.6-10
|
* Thu Jul 09 2020 Than Ngo <than@redhat.com> - 1.3.7-6
|
||||||
- Resolves: #1848839, update lparstat man page with -E option
|
- Track and expose idle PURR and SPURR ticks
|
||||||
|
- ofpathname: speed up l2of_scsi()
|
||||||
|
- ofpathname: failed to boot
|
||||||
|
- update lparstat man page with -E option
|
||||||
|
- enable support for ibm,drc-info property
|
||||||
|
|
||||||
* Fri May 22 2020 Than Ngo <than@redhat.com> - 1.3.6-9
|
* Sat Mar 28 2020 Than Ngo <than@redhat.com> - 1.3.7-5
|
||||||
- Resolves: #1837751, ofpathname: speed up l2of_scsi()
|
- move drmgr in core to avoid pulling in Perl
|
||||||
|
|
||||||
* Fri May 15 2020 Than Ngo <than@redhat.com> - 1.3.6-8
|
* Mon Mar 09 2020 Than Ngo <than@redhat.com> - 1.3.7-4
|
||||||
- Related: #1783285, update the patches V4
|
- update_flash_nv: fixup null byte command substitution warning
|
||||||
|
- drmgr: Fix segfault when running 'drmgr -c pmig -h'
|
||||||
|
|
||||||
* Wed May 13 2020 Than Ngo <than@redhat.com> - 1.3.6-7
|
* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.7-3
|
||||||
- Resolves: #1783285, Track and expose idle PURR and SPURR ticks
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Mar 25 2020 Than Ngo <than@redhat.com> - 1.3.6-6
|
* Thu Dec 19 2019 Than Ngo <than@redhat.com> - 1.3.7-2
|
||||||
- Resolves: #1819566 - move drmgr in core to avoid pulling in Perl
|
- add systemd service to set default system SMT mode
|
||||||
- Resolves: #1806870 - ignored null byte in input
|
|
||||||
- Resolves: #1779197 - enable support for ibm,drc-info property
|
|
||||||
|
|
||||||
* Wed Dec 04 2019 Than Ngo <than@redhat.com> - 1.3.6-5
|
* Wed Dec 18 2019 Than Ngo <than@redhat.com> - 1.3.7-1
|
||||||
- Resolves: #1779257, Safe bootlist update
|
- update to 1.3.7
|
||||||
|
|
||||||
* Wed Jul 24 2019 Than Ngo <than@redhat.com> - 1.3.6-4
|
* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.6-3
|
||||||
- Resolves: #1719372 - wrong disk gets booted after installation
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
|
||||||
|
|
||||||
* Fri Jun 07 2019 Than Ngo <than@redhat.com> - 1.3.6-3
|
* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.6-2
|
||||||
- Resolves: #1718254, improve handling of errors from subsidiary scripts
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
|
||||||
|
|
||||||
* Wed Jun 05 2019 Than Ngo <than@redhat.com> - 1.3.6-2
|
* Wed Jan 16 2019 Than Ngo <than@redhat.com> - 1.3.6-1
|
||||||
- Resolves: #1716425, lparstat and update_flash fixes
|
- update to 1.3.6
|
||||||
|
|
||||||
* Mon Apr 01 2019 Than Ngo <than@redhat.com> - 1.3.6-1
|
* Fri Nov 30 2018 Than Ngo <than@redhat.com> - 1.3.5-4
|
||||||
- Resolves: #1666618, rebase to 1.3.6
|
- install missing pseries_platform and update_flash_nv man pages
|
||||||
|
|
||||||
* Tue Dec 04 2018 Than Ngo <than@redhat.com> - 1.3.5-5
|
* Thu Nov 29 2018 Than Ngo <than@redhat.com> - 1.3.5-3
|
||||||
- Related: #1655903, add missing man pages
|
- added pseries_platform and update_flash_nv man pages
|
||||||
|
|
||||||
* Tue Dec 04 2018 Than Ngo <than@redhat.com> - 1.3.5-4
|
* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.3.5-2
|
||||||
- Resolves: #1655903, lsslot -c mem is not displaying any information
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
|
||||||
|
|
||||||
* Tue Nov 27 2018 Than Ngo <than@redhat.com> - 1.3.5-3
|
|
||||||
- Resolves: #1653621, fix to display logical name using bootlist -o option
|
|
||||||
|
|
||||||
* Sat Nov 10 2018 Than Ngo <than@redhat.com> - 1.3.5-2
|
|
||||||
- fix metadate issue detected by rpmdiff
|
|
||||||
Related: #1608172
|
|
||||||
|
|
||||||
* Mon Jun 18 2018 Dan Horák <dan[at]danny.cz> - 1.3.5-1
|
* Mon Jun 18 2018 Dan Horák <dan[at]danny.cz> - 1.3.5-1
|
||||||
- Rebased to 1.3.5
|
- Rebased to 1.3.5
|
||||||
|
|
Loading…
Reference in New Issue