aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Carlos Santos <casantos@datacom.ind.br>2018-01-28 02:43:58 -0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@bootlin.com>2018-03-26 23:10:35 +0200
commit29bccabdebff7b43189b0eed2090dc4858e1afca (patch)
tree6497bb6299fd6f689321e9024840ab3677558d61
parent7cbfcb322c42caa8b3c3651df8a0b7696f04a99c (diff)
downloadbuildroot-29bccabdebff7b43189b0eed2090dc4858e1afca.tar.gz
buildroot-29bccabdebff7b43189b0eed2090dc4858e1afca.tar.bz2
lshw: use data files provided by hwdata
lshw is seldomly released, so its data files become easily outdated. Instead, this commit makes use of the data files provided by hwdata. This is easily possible because lshw looks for the files in several directories, including /usr/share/hwdata, where the hwdata collection is installed. We remove the entire /usr/share/lshw directory, where the not very up-to-date data files where installed. Four files were installed there: pci.ids, usb.ids (which are now provided by hwdata), manuf.txt and oui.txt (which are not used at run time). Signed-off-by: Carlos Santos <casantos@datacom.ind.br> [Thomas: - rework commit log - replace patch by a simple removal of the /usr/share/lshw directory - add "runtime" comment in Config.in for the BR2_PACKAGE_LSHW dependency] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
-rw-r--r--package/lshw/Config.in3
-rw-r--r--package/lshw/lshw.mk1
2 files changed, 4 insertions, 0 deletions
diff --git a/package/lshw/Config.in b/package/lshw/Config.in
index 3caac66c72..5e0e47b6e2 100644
--- a/package/lshw/Config.in
+++ b/package/lshw/Config.in
@@ -2,6 +2,9 @@ config BR2_PACKAGE_LSHW
bool "lshw"
depends on BR2_INSTALL_LIBSTDCPP
depends on BR2_USE_WCHAR
+ select BR2_PACKAGE_HWDATA # runtime
+ select BR2_PACKAGE_HWDATA_PCI_IDS
+ select BR2_PACKAGE_HWDATA_USB_IDS
help
lshw (Hardware Lister) is a small tool to provide
detailed information on the hardware configuration of the
diff --git a/package/lshw/lshw.mk b/package/lshw/lshw.mk
index 9b52b09167..4195c073e2 100644
--- a/package/lshw/lshw.mk
+++ b/package/lshw/lshw.mk
@@ -23,6 +23,7 @@ endef
define LSHW_INSTALL_TARGET_CMDS
$(LSHW_MAKE_ENV) $(MAKE) -C $(@D)/src DESTDIR=$(TARGET_DIR) \
$(LSHW_MAKE_OPTS) install
+ $(RM) -rf $(TARGET_DIR)/usr/share/lshw
endef
$(eval $(generic-package))