From patchwork Sun Nov 10 13:06:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 8216 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) client-signature RSA-PSS (4096 bits)) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4XmXxp4YSPz3x1l for ; Sun, 10 Nov 2024 13:06:38 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4XmXxl6vJLzsm; Sun, 10 Nov 2024 13:06:35 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4XmXxl4RLdz344c; Sun, 10 Nov 2024 13:06:35 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R11" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4XmXxj3lFWz2xSL for ; Sun, 10 Nov 2024 13:06:33 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4XmXxh0Kj9zn8; Sun, 10 Nov 2024 13:06:31 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1731243992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2bAdIfA8T/N7gPzJt4C0dBRFGySs8x/1N9lvX/nvoMc=; b=TA3jj7y5oUY5CKn6Lx2s7yU/YW4g6NP+ez4o9rHuEcq0bRCuVnG0ssoTPJ/6BXTY0/oXx0 ln/usbzmaeT77FAA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1731243992; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=2bAdIfA8T/N7gPzJt4C0dBRFGySs8x/1N9lvX/nvoMc=; b=cxdkQryxzoYQwsoiHtDPpkW0eEGQ7hr5B6210f7ZFwoASvWFeLvyVbAP4TNgyOL7OAwQs2 +HdMev/NlYKnBW4RQeKmSYLfgjsouRdqESqY5PVSNFcDbotM2iJa4A24YU6re/GRCOOiGR T1TzVEbtp01yeT88eOYcw0F8vOnaC7/L63hEj+6kp8tEhdg55dS1X5rpSegxMVWgtkOMLd GXtSZUpVxGA4R3oa34C5jCTzoyPMD65crMB2tTmZqLomO+6kh1UfIjDje4NwBLH0howhf8 swlcgOqbgUHx7ty/500FU1sEXonghl2Lh/B5sCNpWLcMNFlIK/OyDZBy7wN0Lg== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] hwdata: Update from individual file downloads to using a tarball source version 0.389 Date: Sun, 10 Nov 2024 14:06:19 +0100 Message-ID: <20241110130619.2608696-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: TEACHZYPJA3GB6UELZIYOEMSYNEOH5SS X-Message-ID-Hash: TEACHZYPJA3GB6UELZIYOEMSYNEOH5SS X-MailFrom: adolf.belka@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: - This patch uses https://github.com/vcrhonek/hwdata/ to obtain the pci.ids & usb.ids files. Arch Linux uses this source and they have been providing the updates for around 8 years. - Updated lfs to use the new source tarball - Updated rootfile to only install the pci.ids & usb.ids files - This will make it easier to identify when there have been updates of the .ids files as there will be a new source tarball created. Signed-off-by: Adolf Belka Reviewed-by: Michael Tremer --- config/rootfiles/common/hwdata | 6 +++++ lfs/hwdata | 42 ++++++++++++++++++++++++++-------- 2 files changed, 38 insertions(+), 10 deletions(-) diff --git a/config/rootfiles/common/hwdata b/config/rootfiles/common/hwdata index db268e887..1bca4a725 100644 --- a/config/rootfiles/common/hwdata +++ b/config/rootfiles/common/hwdata @@ -1,3 +1,9 @@ +#usr/lib/modprobe.d +#usr/lib/modprobe.d/dist-blacklist.conf #usr/share/hwdata +#usr/share/hwdata/iab.txt +#usr/share/hwdata/oui.txt usr/share/hwdata/pci.ids +#usr/share/hwdata/pnp.ids usr/share/hwdata/usb.ids +#usr/share/pkgconfig/hwdata.pc diff --git a/lfs/hwdata b/lfs/hwdata index 0ac9f1855..decf9b582 100644 --- a/lfs/hwdata +++ b/lfs/hwdata @@ -24,27 +24,46 @@ include Config -VER = ipfire +VER = 0.389 -THISAPP = hwdata +THISAPP = hwdata-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) -# https://pci-ids.ucw.cz/v2.2/pci.ids -# http://www.linux-usb.org/usb.ids +# https://github.com/vcrhonek/hwdata/releases?page=1 ############################################################################### # Top-level Rules ############################################################################### -objects = +objects = $(DL_FILE) + +$(DL_FILE) = $(DL_FROM)/$(DL_FILE) + +$(DL_FILE)_BLAKE2 = 967c107836e2cb6129d6432d116bae1ef57c8bf9212f5b052085029dc4dc7134b89237291ebec192d5031de6ff98338a253a1cdeed0a43a85c5ff37dd3d15b5c install : $(TARGET) -check : +check : $(patsubst %,$(DIR_CHK)/%,$(objects)) + +download :$(patsubst %,$(DIR_DL)/%,$(objects)) + +b2 : $(subst %,%_BLAKE2,$(objects)) + +############################################################################### +# Downloading, checking, b2sum +############################################################################### + +$(patsubst %,$(DIR_CHK)/%,$(objects)) : + @$(CHECK) -download : +$(patsubst %,$(DIR_DL)/%,$(objects)) : + @$(LOAD) -b2 : +$(subst %,%_BLAKE2,$(objects)) : + @$(B2SUM) ############################################################################### # Installation Details @@ -52,6 +71,9 @@ b2 : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - -mkdir -p -m 755 /usr/share/hwdata - install -m 644 $(DIR_SRC)/src/hwdata/*.ids /usr/share/hwdata + @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE) + $(UPDATE_AUTOMAKE) + cd $(DIR_APP) && ./configure \ + --prefix=/usr + cd $(DIR_APP) && make install @$(POSTBUILD)