From patchwork Mon Jan 22 19:17:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 864357 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zQLm62Rtsz9s7M for ; Tue, 23 Jan 2018 06:17:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 61B6788E36; Mon, 22 Jan 2018 19:17:19 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zaR0qSkdba7o; Mon, 22 Jan 2018 19:17:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 3DCF488B43; Mon, 22 Jan 2018 19:17:15 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id B05491C16D0 for ; Mon, 22 Jan 2018 19:17:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 9CBCD2FEF6 for ; Mon, 22 Jan 2018 19:17:13 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Nr9n8XnY9eEu for ; Mon, 22 Jan 2018 19:17:11 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.datacom.ind.br (mx.datacom.ind.br [177.66.5.10]) by silver.osuosl.org (Postfix) with ESMTPS id 854712FE01 for ; Mon, 22 Jan 2018 19:17:11 +0000 (UTC) Received: from mail.datacom.ind.br (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTPS id A9C9A1708754 for ; Mon, 22 Jan 2018 17:17:04 -0200 (-02) Received: from localhost (localhost [127.0.0.1]) by mail.datacom.ind.br (Postfix) with ESMTP id 9A54D1708742 for ; Mon, 22 Jan 2018 17:17:04 -0200 (-02) Received: from mail.datacom.ind.br ([127.0.0.1]) by localhost (mail.datacom.ind.br [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id N91y97bWSnWH for ; Mon, 22 Jan 2018 17:17:04 -0200 (-02) Received: from pedeld202344.datacom.net (pedeld202344.datacom.net [10.0.120.87]) by mail.datacom.ind.br (Postfix) with ESMTPSA id 81F63170872E for ; Mon, 22 Jan 2018 17:17:04 -0200 (-02) From: Carlos Santos To: buildroot@buildroot.org Date: Mon, 22 Jan 2018 17:17:00 -0200 Message-Id: <20180122191700.32434-1-casantos@datacom.ind.br> X-Mailer: git-send-email 2.14.3 Subject: [Buildroot] [PATCH] hwdata: bumb to version 0.308 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The hwdata collection is hosted at GitHub now and provides additional databases, besides pci.ids and usb.ids: - Individual Address Block (IAB) and Organizationally Unique Identifier (OUI) databases, from IEEE Registration Authority - PNP ID database (from Microsoft) Install only pci.ids and usb.ids by default, to keep compatibility with previous versions. In the future we can make other packages (pciutils, lshw) use the common files instead of installing their own copies, thus saving some storage space. Signed-off-by: Carlos Santos --- package/hwdata/Config.in | 45 ++++++++++++++++++++++++++++++++++++++++++--- package/hwdata/hwdata.hash | 7 ++++--- package/hwdata/hwdata.mk | 20 +++++++++++++------- 3 files changed, 59 insertions(+), 13 deletions(-) diff --git a/package/hwdata/Config.in b/package/hwdata/Config.in index 8424238e1b..63bb2216da 100644 --- a/package/hwdata/Config.in +++ b/package/hwdata/Config.in @@ -1,6 +1,45 @@ config BR2_PACKAGE_HWDATA bool "hwdata" help - Various hardware identification and configuration data, - such as the pci.ids database, or the XFree86/xorg Cards - database. + Various hardware identification and configuration data + + - Individual Address Block (IAB) and Organizationally Unique + Identifier (OUI) databases, from IEEE Registration Authority + - PCI ID database + - PNP ID database (from Microsoft) + - USB ID database + + https://github.com/vcrhonek/hwdata + +if BR2_PACKAGE_HWDATA + +config BR2_PACKAGE_HWDATA_ANY + bool + +config BR2_PACKAGE_HWDATA_IAB_OUI_TXT + bool "install iab.txt and oui.txt" + select BR2_PACKAGE_HWDATA_ANY + help + Install iab.txt and oui.txt + +config BR2_PACKAGE_HWDATA_PCI_IDS + bool "install pci.ids" + default y + select BR2_PACKAGE_HWDATA_ANY + help + Install pci.ids + +config BR2_PACKAGE_HWDATA_PNP_IDS + bool "install pnp.ids" + select BR2_PACKAGE_HWDATA_ANY + help + Install pnp.ids + +config BR2_PACKAGE_HWDATA_USB_IDS + bool "install usb.ids" + default y + select BR2_PACKAGE_HWDATA_ANY + help + Install usb.ids + +endif diff --git a/package/hwdata/hwdata.hash b/package/hwdata/hwdata.hash index b3c83ebb74..dba1be31e0 100644 --- a/package/hwdata/hwdata.hash +++ b/package/hwdata/hwdata.hash @@ -1,3 +1,4 @@ -# From http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/hwdata/hwdata_0.267-1.dsc -sha256 d77f2b3f3d6e278be669141ffa5dac01b64cab02f7b2c744bbabc500a45263f4 hwdata_0.267.orig.tar.gz -sha256 055d2f168de9333562a04f6a230c43dc19c4975882935d8b2f0ab17f64f57275 hwdata_0.267-1.diff.gz +# Locally calculated +sha256 986d919c20a0c7f8b669a63830f6d2f4cb5c4cddcfc944c5e2ae05c2e9e5ec9f hwdata-v0.308.tar.gz +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 COPYING +sha256 21d0406f93e884a050426ebc21931839a45d56bfcbcbfdda7686d583f36f107f LICENSE diff --git a/package/hwdata/hwdata.mk b/package/hwdata/hwdata.mk index 4ad8d42939..6ebcd0e86e 100644 --- a/package/hwdata/hwdata.mk +++ b/package/hwdata/hwdata.mk @@ -4,16 +4,22 @@ # ################################################################################ -HWDATA_VERSION = 0.267 -HWDATA_SOURCE = hwdata_$(HWDATA_VERSION).orig.tar.gz -HWDATA_PATCH = hwdata_$(HWDATA_VERSION)-1.diff.gz -HWDATA_SITE = http://snapshot.debian.org/archive/debian/20141023T043132Z/pool/main/h/hwdata -HWDATA_LICENSE = GPL-2.0+ or XFree86 1.0 license +HWDATA_VERSION = v0.308 +HWDATA_SITE = $(call github,vcrhonek,hwdata,$(HWDATA_VERSION)) +HWDATA_LICENSE = GPL-2.0+, BSD-3-Clause, XFree86 1.0 HWDATA_LICENSE_FILES = COPYING LICENSE +ifeq ($(BR2_PACKAGE_HWDATA):$(BR2_PACKAGE_HWDATA_ANY),y:) +$(error No hwdata database selected. Select at least one database) +endif + define HWDATA_INSTALL_TARGET_CMDS - $(INSTALL) -D -m 644 $(@D)/pci.ids $(TARGET_DIR)/usr/share/hwdata/pci.ids - $(INSTALL) -D -m 644 $(@D)/usb.ids $(TARGET_DIR)/usr/share/hwdata/usb.ids + $(INSTALL) -D -m 644 \ + $(if $(BR2_PACKAGE_HWDATA_IAB_OUI_TXT),$(@D)/iab.txt $(@D)/oui.txt,) \ + $(if $(BR2_PACKAGE_HWDATA_PCI_IDS),$(@D)/pci.ids,) \ + $(if $(BR2_PACKAGE_HWDATA_PNP_IDS),$(@D)/pnp.ids,) \ + $(if $(BR2_PACKAGE_HWDATA_USB_IDS),$(@D)/usb.ids,) \ + $(TARGET_DIR)/usr/share/hwdata endef $(eval $(generic-package))