[ptxdist] [PATCH 6/7] lshw: Version bump. B.02.14 -> B.02.19.2 + accomodation for hwdata package.

[Christian Melki <christian.melki@t2data.com>]

Make lshw depend on hwdata-pci and hwdata-usb files.

Remove installation of .ids files, provided by hwdata.
Afaik, oui and manuf databases are not used.

Signed-off-by: Christian Melki <christian.melki@t2data.com>
---
 rules/lshw.in   | 3 +++
 rules/lshw.make | 6 +-----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/rules/lshw.in b/rules/lshw.in
index 6911380f6..c8632f7b4 100644
--- a/rules/lshw.in
+++ b/rules/lshw.in
@@ -7,6 +7,9 @@ menuconfig LSHW
 	select GCCLIBS_CXX
 	select GCCLIBS_GCC_S
 	select GTK if LSHW_GUI
+	select HWDATA		if !SYSTEMD_HWDB
+	select HWDATA_USB	if !SYSTEMD_HWDB
+	select HWDATA_PCI	if !SYSTEMD_HWDB
 	help
 	  lshw (Hardware Lister) is a small tool to provide detailed information
 	  on the hardware configuration of the machine. It can report exact
diff --git a/rules/lshw.make b/rules/lshw.make
index 28dbb6cb7..dadea9f78 100644
--- a/rules/lshw.make
+++ b/rules/lshw.make
@@ -14,7 +14,7 @@ PACKAGES-$(PTXCONF_LSHW) += lshw
 #
 # Paths and names
 #
-LSHW_VERSION	:= B.02.14
+LSHW_VERSION	:= B.02.19.2
 LSHW_MD5	:= 8bed55768c5cb2ceff062b882a687e9b
 LSHW		:= lshw-$(LSHW_VERSION)
 LSHW_SUFFIX	:= tar.gz
@@ -60,10 +60,6 @@ $(STATEDIR)/lshw.targetinstall:
 	@$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/lshw)
 
 	@$(call install_copy, lshw, 0, 0, 0755, /usr/share/lshw)
-	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/pci.ids)
-	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/usb.ids)
-	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/oui.txt)
-	@$(call install_copy, lshw, 0, 0, 0644, -, /usr/share/lshw/manuf.txt)
 
 ifdef PTXCONF_LSHW_GUI
 	@$(call install_copy, lshw, 0, 0, 0755, -, /usr/sbin/gtk-lshw)
-- 
2.30.2


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de
To unsubscribe, send a mail with subject "unsubscribe" to ptxdist-request@pengutronix.de