modified 45drives-tools dependency back to 2.0.7 until 45drives-tools…

… 2.0.8 is pushed to stable

45drives-motherboard/public/helper_scripts/pci

@@ -90,7 +90,7 @@ def storcli():
 def lspci_hba():
 	try:
 		lspci_hba_result = subprocess.Popen(
-			["lspci","-d","1000:*","-vv"],stdout=subprocess.PIPE,universal_newlines=True).stdout.read()
+			["lspci", "-d", "1000:*","-vv", "-i", "/opt/45drives/tools/pci.ids"],stdout=subprocess.PIPE,universal_newlines=True).stdout.read()
 	except:
 		return False
 	hba_cards = []
@@ -199,7 +199,8 @@ def lsblk(device):
 
 def main():
 	pci_slots = dmidecode()
-	hba_cards = lspci_hba()
+	#hba_cards = lspci_hba() for when 45drives-tools 2.0.8 is on stable
+	hba_cards = storcli()
 	network_cards = network()
 	sata_cards = sata()
 

45drives-system/public/scripts/pci

@@ -55,7 +55,7 @@ def dmidecode():
 def lspci_hba():
 	try:
 		lspci_hba_result = subprocess.Popen(
-			["lspci","-d","1000:*","-vv"],stdout=subprocess.PIPE,universal_newlines=True).stdout.read()
+			["lspci", "-d", "1000:*","-vv", "-i", "/opt/45drives/tools/pci.ids"],stdout=subprocess.PIPE,universal_newlines=True).stdout.read()
 	except:
 		return False
 	hba_cards = []
@@ -200,7 +200,8 @@ def get_hba_server_info():
 
 def main():
 	pci_slots = dmidecode()
-	hba_cards = lspci_hba()
+	#hba_cards = lspci_hba() for when 45drives-tools 2.0.8 is on stable
+	hba_cards = storcli()
 	network_cards = network()
 	sata_cards = sata()
 

CHANGELOG.md

@@ -1,4 +1,3 @@
-## cockpit-45drives-hardware 2.1.2-2
+## cockpit-45drives-hardware 2.1.2-3
 
-* added support for 9600 series HBA cards
-* updated 45drives-tools dependency to 2.0.8 minimum
+* modified 45drives-tools dependency

manifest.json

@@ -4,7 +4,7 @@
     "title": "cockpit-45drives-hardware",
     "prerelease": false,
     "version": "2.1.2",
-    "buildVersion": "2",
+    "buildVersion": "3",
     "author": "Mark Hooper <[email protected]>",
     "url": "https://github.com/45Drives/cockpit-hardware",
     "category": "utils",
@@ -30,7 +30,7 @@
             "dmidecode",
             "ipmitool",
             "lshw",
-            "45drives-tools (>= 2.0.8)"
+            "45drives-tools (>= 2.0.7)"
         ],
         "el": [
             "cockpit",
@@ -40,7 +40,7 @@
             "dmidecode",
             "ipmitool",
             "lshw",
-            "45drives-tools >= 2.0.8"
+            "45drives-tools >= 2.0.7"
         ]
     },
     "releases": [
@@ -58,7 +58,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "2.1.2",
-        "buildVersion": "2",
+        "buildVersion": "3",
         "ignore": [],
         "date": null,
         "packager": "Mark Hooper <[email protected]>",

packaging/el8/main.spec

@@ -42,6 +42,8 @@ make DESTDIR=%{buildroot} install
 /usr/lib/udev/rules.d/68-cockpit-45drives-disks.rules
 
 %changelog
+* Thu Jun 30 2022 Mark Hooper <[email protected]> 2.1.2-3
+- modified 45drives-tools dependency
 * Mon Jun 27 2022 Mark Hooper <[email protected]> 2.1.2-2
 - added support for 9600 series HBA cards
 - updated 45drives-tools dependency to 2.0.8 minimum

packaging/focal/changelog

@@ -1,3 +1,9 @@
+cockpit-45drives-hardware (2.1.2-3focal) focal; urgency=medium
+
+  * modified 45drives-tools dependency
+
+ -- Mark Hooper <[email protected]>  Thu, 30 Jun 2022 06:23:37 -0300
+
 cockpit-45drives-hardware (2.1.2-2focal) focal; urgency=medium
 
   * added support for 9600 series HBA cards