88 lines
2.4 KiB
Diff
88 lines
2.4 KiB
Diff
|
From d142f0d23d8df1cede3573c3d6cfbf16535b3475 Mon Sep 17 00:00:00 2001
|
||
|
|
From: John Kacur <jkacur@redhat.com>
|
||
|
|
Date: Wed, 20 Dec 2023 17:55:21 -0500
|
||
|
|
Subject: [PATCH 2/2] rteval: Disable use of python-dmidecode
|
||
|
|
|
||
|
|
python-dmidecode is not being maintained upstream.
|
||
|
|
For now just disable it's use in rteval since it is useful but not
|
||
|
|
essential information for running rteval
|
||
|
|
|
||
|
|
In the future look at generating this info directly using dmidecode.
|
||
|
|
|
||
|
|
Signed-off-by: John Kacur <jkacur@redhat.com>
|
||
|
|
---
|
||
|
|
README | 6 ------
|
||
|
|
doc/installing.txt | 9 ---------
|
||
|
|
rteval/sysinfo/dmi.py | 4 ++--
|
||
|
|
3 files changed, 2 insertions(+), 17 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/README b/README
|
||
|
|
index a5cf98344a46..b352d7f66ad2 100644
|
||
|
|
--- a/README
|
||
|
|
+++ b/README
|
||
|
|
@@ -19,15 +19,9 @@ Rteval requires the following packages to run:
|
||
|
|
Python >= 3.0
|
||
|
|
http://www.python.org/download/
|
||
|
|
|
||
|
|
-python-ethtool
|
||
|
|
- git://git.kernel.org/pub/scm/linux/kernel/git/acme/python-ethtool.git
|
||
|
|
-
|
||
|
|
python-lxml
|
||
|
|
http://lxml.de/
|
||
|
|
|
||
|
|
-python-dmidecode
|
||
|
|
- http://www.ohloh.net/p/python-dmidecode
|
||
|
|
-
|
||
|
|
libxml2-python
|
||
|
|
http://xmlsoft.org/
|
||
|
|
|
||
|
|
diff --git a/doc/installing.txt b/doc/installing.txt
|
||
|
|
index ff2d43cb9481..227249bbc9ed 100644
|
||
|
|
--- a/doc/installing.txt
|
||
|
|
+++ b/doc/installing.txt
|
||
|
|
@@ -1,18 +1,10 @@
|
||
|
|
The rteval utility requires some external software libraries to run
|
||
|
|
properly. These are:
|
||
|
|
|
||
|
|
-python-ethtool
|
||
|
|
- A python library to query network interfaces
|
||
|
|
- git://git.kernel.org/pub/scm/linux/kernel/git/acme/python-ethtool.git
|
||
|
|
-
|
||
|
|
python-lxml
|
||
|
|
A python library to parse XML files and XSLT stylesheets
|
||
|
|
http://lxml.de/
|
||
|
|
|
||
|
|
-python-dmidecode
|
||
|
|
- A python library used to access DMI table information
|
||
|
|
- http://www.autonomy.net.au/display/pydmi/Home
|
||
|
|
-
|
||
|
|
libxml2-python
|
||
|
|
A python library to parse XML files
|
||
|
|
http://xmlsoft.org/
|
||
|
|
@@ -22,7 +14,6 @@ rt-tests
|
||
|
|
git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git
|
||
|
|
|
||
|
|
|
||
|
|
-$ sudo yum install python-{dmidecode,ethtool)
|
||
|
|
$ git clone \
|
||
|
|
git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git
|
||
|
|
$ cd rt-tests && sudo make prefix=/usr install
|
||
|
|
diff --git a/rteval/sysinfo/dmi.py b/rteval/sysinfo/dmi.py
|
||
|
|
index e8285d263fe6..c01a0eef1435 100644
|
||
|
|
--- a/rteval/sysinfo/dmi.py
|
||
|
|
+++ b/rteval/sysinfo/dmi.py
|
||
|
|
@@ -15,8 +15,8 @@ from rteval import xmlout
|
||
|
|
from rteval import rtevalConfig
|
||
|
|
|
||
|
|
try:
|
||
|
|
- import dmidecode
|
||
|
|
- dmidecode_avail = True
|
||
|
|
+ # import dmidecode
|
||
|
|
+ dmidecode_avail = False
|
||
|
|
except ModuleNotFoundError:
|
||
|
|
dmidecode_avail = False
|
||
|
|
|
||
|
|
--
|
||
|
|
2.42.0
|
||
|
|
|