pciutils: use ALTERNATIVES

Use the ALTERNATIVES symlink handling to avoid conflicts with busybox
lspci tool. Otherwise this package can not be installed if you also have
enabled lspci from busybox.

Signed-off-by: Martin Schiller <redacted>

diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile
index 2646c65da40e574a3e074beb6cc629208207249c..41e20a00caad68b17d94a24d41d16d73365da4fd 100644 (file)
--- a/utils/pciutils/Makefile
+++ b/utils/pciutils/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=pciutils
 PKG_VERSION:=3.14.0
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz
 PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils
@@ -28,6 +28,7 @@ define Package/pciutils
   TITLE:=Linux PCI Utilities
   URL:=http://mj.ucw.cz/pciutils.shtml
   DEPENDS:=+libkmod +libpci +pciids
+  ALTERNATIVES:=200:/usr/bin/lspci:/usr/libexec/lspci-pciutils
 endef
 
 define Package/pciutils/description
@@ -71,8 +72,8 @@ define Build/InstallDev
 endef
 
 define Package/pciutils/install
-       $(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/bin
-       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lspci $(1)/usr/bin
+       $(INSTALL_DIR) $(1)/usr/sbin $(1)/usr/libexec
+       $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/lspci $(1)/usr/libexec/lspci-pciutils
        $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/setpci $(1)/usr/sbin/
 endef