.fmf/version

@@ -0,0 +1 @@
+1

.gitignore

@@ -1 +1,19 @@
-SOURCES/lsvpd-1.7.15.tar.gz
+lsvpd-1.6.8.tar.gz
+/lsvpd-1.6.10.tar.gz
+/lsvpd-1.6.11.tar.gz
+/lsvpd-1.6.12.tar.gz
+/lsvpd-1.7.1.tar.gz
+/lsvpd-1.7.2.tar.gz
+/lsvpd-1.7.3.tar.gz
+/lsvpd-1.7.4.tar.gz
+/lsvpd-1.7.5.tar.gz
+/lsvpd-1.7.6.tar.gz
+/lsvpd-1.7.7.tar.gz
+/lsvpd-1.7.8.tar.gz
+/lsvpd-1.7.9.tar.gz
+/lsvpd-1.7.10.tar.gz
+/lsvpd-1.7.11.tar.gz
+/lsvpd-1.7.12.tar.gz
+/lsvpd-1.7.13.tar.gz
+/lsvpd-1.7.14.tar.gz
+/lsvpd-1.7.15.tar.gz

gating.yaml

@@ -0,0 +1,6 @@
+--- !Policy
+product_versions:
+  - rhel-*
+decision_context: osci_compose_gate
+rules:
+  - !PassingTestCaseRule {test_case_name: osci.brew-build.tier0.functional}

lsvpd-1.2.15-subvendor_device-not-matching.patch

@@ -0,0 +1,102 @@
+commit 67945a23ac7c680359c81df4eb20769d996615e5
+Author: Sathvika Vasireddy <sv@linux.ibm.com>
+Date:   Mon May 12 14:23:28 2025 +0530
+
+    lsvpd: Enhance tools to print device information in tuple format
+    
+    Update device information display to use tuple format showing vendor ID,
+    device ID, subsystem vendor ID, and subsystem device ID. Change output
+    from ethernet (10141015) to ethernet (15b3,1015), (1014,061f)
+    for improved readability and more complete device identification.
+    
+    Currently, for a PCI device,
+    
+    ./lscfg -vl 0033:01:00.0
+      0033:01:00.0 uverbs12 mlx5_12 enP51p1s0f0 ptp24 ethernet U78D2.001.RCH0060-P1-C3-T1
+                   ethernet (10141015)
+    
+    With the fix,
+    
+    ./lscfg -vl 0033:01:00.0
+      0033:01:00.0 uverbs12 mlx5_12 enP51p1s0f0 ptp24 ethernet U78D2.001.RCH0060-P1-C3-T1
+                   ethernet (15b3,1015), (1014,061f)
+    
+    Tested-by: Krishan Saraswat <krishang@linux.vnet.ibm.com>
+    Signed-off-by: Sathvika Vasireddy <sv@linux.ibm.com>
+
+diff --git a/src/internal/sys_interface/sysfstreecollector.cpp b/src/internal/sys_interface/sysfstreecollector.cpp
+index 03eb7da..07bcf68 100644
+--- a/src/internal/sys_interface/sysfstreecollector.cpp
++++ b/src/internal/sys_interface/sysfstreecollector.cpp
+@@ -1490,7 +1490,6 @@ ERROR:
+ 						fillMe->mManufacturer.setValue( val,
+ 							50, __FILE__, __LINE__ );
+ 
+-					os << hex << setw( 4 ) << setfill( '0' ) << manID;
+ 				}
+ 			}
+ 			else
+@@ -1500,7 +1499,6 @@ ERROR:
+ 					fillMe->mManufacturer.setValue( val, 50,
+ 							__FILE__, __LINE__ );
+ 
+-				os << hex << setw( 4 ) << setfill( '0' ) << subMan;
+ 			}
+ 
+ 			// Fill Device Model
+@@ -1509,7 +1507,6 @@ ERROR:
+ 			{
+ 				if( manID != UNKNOWN_ID )
+ 				{
+-					os << hex << setw( 4 ) << setfill( '0' )<< devID;
+ 					val = mPciTable->getName( manID, devID );
+ 					if( val != "" )
+ 						fillMe->mModel.setValue( val, 80,
+@@ -1518,7 +1515,6 @@ ERROR:
+ 			}
+ 			else
+ 			{
+-				os << hex << setw( 4 ) << setfill( '0' )<< subID;
+ 				val = mPciTable->getName( manID, devID, subID );
+ 				if( val != "" )
+ 					fillMe->mModel.setValue( val, 80, __FILE__, __LINE__ );
+@@ -1527,7 +1523,12 @@ ERROR:
+ 					fillMe->mDescription.setValue( val, 80, __FILE__, __LINE__ );
+ 			}
+ 
+-			if( os.str( ) != "ffffffff" )
++			os << "(" << hex << setw(4) << setfill('0') << manID << ","
++				<< hex << setw(4) << setfill('0') << devID << "), ("
++				<< hex << setw(4) << setfill('0') << subMan << ","
++				<< hex << setw(4) << setfill('0') << subID << ")";
++
++			if( os.str( ) != "(ffff,ffff), (ffff,ffff)" )
+ 				fillMe->mCDField.setValue( os.str( ), 100, __FILE__, __LINE__ );
+ 		}
+ 
+diff --git a/src/output/lscfg.cpp b/src/output/lscfg.cpp
+index 8c9eec7..bad23a8 100644
+--- a/src/output/lscfg.cpp
++++ b/src/output/lscfg.cpp
+@@ -337,7 +337,7 @@ void printVPD( Component* root )
+ 
+ 			if( val != "" )
+ 			{
+-				os << " (" << val << ")";
++				os << " " << val;
+ 			}
+ 
+ 			if(	val.length( ) + root->getDescription( ).length( ) <= 35 )
+diff --git a/src/output/lsvpd.cpp b/src/output/lsvpd.cpp
+index e77ffe0..70d4a9e 100644
+--- a/src/output/lsvpd.cpp
++++ b/src/output/lsvpd.cpp
+@@ -169,7 +169,7 @@ void printVPD( Component* root )
+ 				string val = string( root->getCD( ) );
+ 
+ 				if ( val != "" )
+-					cout << " (" << val << ")";
++					cout << " " << val;
+ 
+ 				cout << endl;
+ 			}

lsvpd.spec

@@ -1,12 +1,16 @@
 Name:		lsvpd
 Version:	1.7.15
-Release: 1%{?dist}
+Release:	7%{?dist}
 Summary:	VPD/hardware inventory utilities for Linux
 
-License: GPLv2+
+License:	GPL-2.0-or-later
 URL:    https://github.com/power-ras/%{name}/releases
 Source: https://github.com/power-ras/%{name}/archive/v%{version}/%{name}-%{version}.tar.gz
 
+# upstream patches
+# lsvpd: Enhance tools to print device information in tuple format
+Patch10: lsvpd-1.2.15-subvendor_device-not-matching.patch
+
 BuildRequires: gcc-c++
 BuildRequires: libvpd-devel >= 2.2.9
 BuildRequires: sg3_utils-devel
@@ -68,38 +72,118 @@ exit 0
 %dir %{_sysconfdir}/lsvpd
 
 %changelog
-* Fri Dec 08 2023 Than Ngo <than@redhat.com> - 1.7.15-1
-- Resolves: RHEL-11453, update to 1.7.15
+* Tue Aug 05 2025 Than Ngo <than@redhat.com> - 1.7.15-7
+- Resolves: RHEL-104383, subvendor_device output is not matching
 
-* Wed Mar 22 2023 Than Ngo <than@redhat.com> - 1.7.14-3
-- Resolves: #2177981, lsvpd is not reporting the correct I/O microcode
+
+* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 1.7.15-6
+- Bump release for October 2024 mass rebuild:
+  Resolves: RHEL-64018
+
+* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 1.7.15-5
+- Bump release for June 2024 mass rebuild
+
+* Fri Feb 09 2024 Dan Horák <dan@danny.cz> - 1.7.15-4
+- rebuilt for sg3_utils 1.48
+
+* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.15-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.15-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
+
+* Mon Oct 02 2023 Than Ngo <than@redhat.com> - 1.7.15-1
+- update to 1.7.15
+- drop -std=c++14 build flag
+
+* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.14-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
+
+* Thu Mar 23 2023 Than Ngo <than@redhat.com> - 1.7.14-6
+- lsvpd is not reporting the correct I/O microcode
   for HBA, PCIe, SAS adapters, HDD, etc
 
-* Sun Feb 05 2023 Than Ngo <than@redhat.com> - 1.7.14-2
-- Resolves: #2164976, add NVME f1h log page VPD information
+* Thu Feb 16 2023 Than Ngo <than@redhat.com> - 1.7.14-5
+- migrated to SPDX license
 
-* Fri May 13 2022 Than Ngo <than@redhat.com> - 1.7.14-1
-- Resolves: #2051316, rebase to 1.7.14
+* Sun Feb 05 2023 Than Ngo <than@redhat.com> - 1.7.14-4
+- added updatream patches to fix nvme vpd data
 
-* Tue Sep 28 2021 Than Ngo <than@redhat.com> - 1.7.13-1
-- Resolves: #1993557, rebase to 1.7.13
-- Resolves: #2000736, incorrect location code for USB devices
+* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.14-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Mon May 17 2021 Than Ngo <than@redhat.com> - 1.7.12-1
-- Resolves: #1844428, rebase to 1.7.12
+* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.14-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
 
-* Tue Jan 26 2021 Than Ngo <than@redhat.com> - 1.7.11-2
-- Resolves: #1920497, Vendor and Device information mismatch for usb-xhci
+* Thu Apr 07 2022 Dan Horák <dan[at]danny.cz> - 1.7.14-1
+- rebase to 1.7.14
 
-* Mon Apr 06 2020 Than Ngo <than@redhat.com> - 1.7.11-1
-- Resolves: #1779204, rebase 1.7.11
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.13-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Tue Nov 05 2019 Than Ngo <than@redhat.com> - 1.7.10-1
-- Rebase to 1.7.10
+* Wed Sep 15 2021 Than Ngo <than@redhat.com> - 1.7.13-1
+- rebase to 1.7.13
+
+* Fri Sep 03 2021 Than Ngo <than@redhat.com> - 1.7.12-1
+- rebase to 1.7.12
+- add support for SCSI loc-code
+- Fix catching polymorphic type by value
+
+* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.11-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Wed Apr 28 2021 Stephen Gallagher <sgallagh@redhat.com> - 1.7.11-7
+- Rebuild to pick up sg3_utils in ELN
+
+* Tue Apr 06 2021 Tomas Bzatek <tbzatek@redhat.com> - 1.7.11-6
+- rebuilt for sg3_utils 1.46
+
+* Tue Feb 09 2021 Than Ngo <than@redhat.com> - 1.7.11-5
+- Fix, Vendor and Device information mismatch for usb-xhci
+
+* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.11-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Oct 27 2020 Jeff Law <law@redhat.com> - 1.7.11-3
+- Force C++14 as this code is not C++17 ready
+
+* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.11-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Wed Jul 08 2020 Than Ngo <than@redhat.com> - 1.7.11-1
+- update to 1.7.11
+
+* Mon Apr 20 2020 Dan Horák <dan@danny.cz> - 1.7.10-3
+- rebuilt for sg3_utils 1.45 (#1809392)
+
+* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.10-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Mon Dec 02 2019 Than Ngo <than@redhat.com> - -1
+- rebase to 1.7.10
+- update Url
+
+* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.9-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 01 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.9-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Fri Jul 20 2018 Sinny Kumari <sinnykumari@fedoraproject.org> - 1.7.9-3
+- Add gcc-c++ as BuildRequires
+
+* Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.9-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
 * Fri Jul 06 2018 Sinny Kumari<sinnykumari@fedoraproject.org> - 1.7.9-1
 - Rebase to 1.7.9
 
+* Thu Feb 08 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.8-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
+
+* Wed Dec 20 2017 Sinny Kumari <sinnykumari@fedoraproject.org> - 1.7.8-4
+- Add patches from upstream master branch to include fixes
+
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.7.8-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 

plans/tier1.fmf

@@ -0,0 +1,39 @@
+---
+
+summary: Tier1 plan for lsvpd
+
+discover:
+  how: fmf
+  url: https://pkgs.devel.redhat.com/git/tests/lsvpd
+  ref: master
+  filter: tier:1
+
+prepare:
+  - how: shell
+    script: |
+      set -euxo pipefail
+
+      ENABLE_REPO_CMD="yum-config-manager --enable"
+      if command -v dnf >/dev/null 2>&1; then
+        ENABLE_REPO_CMD="dnf config-manager --set-enabled"
+      fi
+
+      ${ENABLE_REPO_CMD} beaker-tasks || :
+  - how: shell
+    script: |
+        set -exuo pipefail
+
+        if [[ -f /etc/os-release ]]; then
+          . /etc/os-release
+          if [[ "${ID:-}" == "rhel" && "${VERSION_ID%%.*}" -ge 8 ]]; then
+            dnf config-manager --enable rhel-CRB
+          fi
+        fi
+
+execute:
+  how: tmt
+
+adjust:
+    enabled: false
+    when: distro == centos-stream or distro == fedora
+

sources

@@ -0,0 +1 @@
+SHA512 (lsvpd-1.7.15.tar.gz) = 5e70bf52fec7b7c6ede3dca2a0def9fa10ba36c4421a8b875928c7eb4036c24ad828d8381f233896aed36b8fdc014a38b05b000d883dc23d209f7bbd2b781305