From ceb65a62bcc4f1a508aec020cb3b803bab198750 Mon Sep 17 00:00:00 2001 From: Philip Prindeville Date: Tue, 19 Sep 2017 13:23:22 -0600 Subject: [PATCH] pciutils: fetch pci.ids file deterministically Instead of using update-pciids from a postinst script, just download the pci.ids file from its repo the same way that usbutils grabs usb.ids. Remove the compression since we're going onto a squashfs filesystem (most likely) anyway. Signed-off-by: Philip Prindeville --- utils/pciutils/Makefile | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/utils/pciutils/Makefile b/utils/pciutils/Makefile index 1d82213fb..c0b0c4e7c 100644 --- a/utils/pciutils/Makefile +++ b/utils/pciutils/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=pciutils PKG_VERSION:=3.5.2 -PKG_RELEASE:=2 +PKG_RELEASE:=3 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=@KERNEL/software/utils/pciutils @@ -37,11 +37,20 @@ define Package/pciutils/description of PCI devices endef -define Package/pciutils/postinst -#!/bin/sh -[ -z "$${IPKG_INSTROOT}" ] || \ -(cd $${PKG_ROOT}/usr/share; $${PKG_ROOT}/usr/sbin/update-pciids; rm pci.ids.gz.old) -exit 0 +PCI_IDS_REV:=91cfa8a0c994634ba9a4a8639aa2ac6dff8453b9 +PCI_IDS_FILE:=pci.ids.$(PCI_IDS_REV) +define Download/pci_ids + FILE:=$(PCI_IDS_FILE) + URL_FILE:=pci.ids + URL:=@GITHUB/pciutils/pciids/$(PCI_IDS_REV) + HASH:=798528092d1c58eeac99c6505033ec4ce8fe3e19d7e0c41b06790d58753a89b6 +endef +$(eval $(call Download,pci_ids)) + +define Build/Prepare + $(call Build/Prepare/Default) + $(RM) $(PKG_BUILD_DIR)/pci.ids + $(CP) $(DL_DIR)/$(PCI_IDS_FILE) $(PKG_BUILD_DIR)/pci.ids endef MAKE_FLAGS += \