From: Martin Schiller <redacted>
Date: Wed, 18 Feb 2026 06:49:01 +0000 (+0100)
Subject: pciutils: use ALTERNATIVES
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=31b6d1c8c3cd95f3591888e1da61bd5881afba46;p=openwrt-packages.git

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 2646c65da..41e20a00c 100644
--- 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