From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1142639-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 56C67138350
for <garchives@archives.gentoo.org>; Tue, 4 Feb 2020 18:50:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 9A7F2E07F9;
Tue, 4 Feb 2020 18:50:21 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 76BEDE07F9
for <gentoo-commits@lists.gentoo.org>; Tue, 4 Feb 2020 18:50:21 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id F3F8234E74E
for <gentoo-commits@lists.gentoo.org>; Tue, 4 Feb 2020 18:50:11 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 7EF628F
for <gentoo-commits@lists.gentoo.org>; Tue, 4 Feb 2020 18:50:10 +0000 (UTC)
From: "Mike Gilbert" <floppym@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" <floppym@gentoo.org>
Message-ID: <1580842160.6e2c3f1ce2e2c67cac9adce89306cf7e73767f65.floppym@gentoo>
Subject: [gentoo-commits] proj/hwids:hwids-20200204 commit in: /
X-VCS-Repository: proj/hwids
X-VCS-Files: Makefile
X-VCS-Directories: /
X-VCS-Committer: floppym
X-VCS-Committer-Name: Mike Gilbert
X-VCS-Revision: 6e2c3f1ce2e2c67cac9adce89306cf7e73767f65
X-VCS-Branch: hwids-20200204
Date: Tue, 4 Feb 2020 18:50:10 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: b92d8154-776d-4c2c-8b76-ce448dadff6d
X-Archives-Hash: b8ac390c7801f0360ace910e98f280a7
Message-ID: <20200204185010._90lmYzLR5qLPR1C5tBcC0Po8cleAcwqS3CYd8QoKoQ@z>
commit: 6e2c3f1ce2e2c67cac9adce89306cf7e73767f65
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 4 18:49:10 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Tue Feb 4 18:49:20 2020 +0000
URL: https://gitweb.gentoo.org/proj/hwids.git/commit/?id=6e2c3f1c
Revert "Allow parallel fetch"
This reverts commit efda4d31b061a57ec5add4e30b161317641d3937.
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Makefile | 44 ++++++++++----------------------------------
1 file changed, 10 insertions(+), 34 deletions(-)
diff --git a/Makefile b/Makefile
index 1ca98c8..9edfd50 100644
--- a/Makefile
+++ b/Makefile
@@ -36,47 +36,23 @@ UDEV_FILES = 20-acpi-vendor.hwdb 20-bluetooth-vendor-product.hwdb
UDEV_FILES += 20-net-ifname.hwdb 60-evdev.hwdb 60-keyboard.hwdb 60-sensor.hwdb
UDEV_FILES += 70-joystick.hwdb 70-mouse.hwdb 70-pointingstick.hwdb 70-touchpad.hwdb
-UDEV_PATHS = $(addprefix udev/,$(UDEV_FILES))
-
all: $(ALL_TARGETS-yes)
.PHONY: all install install-base install-hwdb fetch tag udev-hwdb compress
-.PHONY: pci.ids usb.ids oui.txt ma-medium.txt ma-small.txt iab.txt sdio.ids ids_parser.py
-.PHONY: $(UDEV_PATHS)
install: $(INSTALL_TARGETS-yes)
-curl-get = $(Q)curl -s -L -z $@ -o $@ -R $1
-
-pci.ids:
- $(call curl-get,http://pci-ids.ucw.cz/v2.2/pci.ids)
-
-usb.ids:
- $(call curl-get,http://www.linux-usb.org/usb.ids)
-
# OUI/IAB: https://regauth.standards.ieee.org/standards-ra-web/pub/view.html#registries
-oui.txt:
- $(call curl-get,http://standards-oui.ieee.org/oui/oui.txt)
-
-ma-medium.txt:
- $(call curl-get,http://standards-oui.ieee.org/oui28/mam.txt)
-
-ma-small.txt:
- $(call curl-get,http://standards-oui.ieee.org/oui36/oui36.txt)
-
-iab.txt:
- $(call curl-get,http://standards-oui.ieee.org/iab/iab.txt)
-
-sdio.ids:
- $(call curl-get,$(SYSTEMD_SOURCE)/sdio.ids)
-
-ids_parser.py:
- $(call curl-get,$(SYSTEMD_SOURCE)/ids_parser.py)
-
-$(UDEV_PATHS):
- $(call curl-get,$(SYSTEMD_SOURCE)/$(notdir $@))
-
-fetch: pci.ids usb.ids oui.txt ma-medium.txt ma-small.txt iab.txt sdio.ids ids_parser.py $(UDEV_PATHS)
+fetch:
+ $(Q)curl -z pci.ids -o pci.ids -R http://pci-ids.ucw.cz/v2.2/pci.ids
+ $(Q)curl -z usb.ids -o usb.ids -R http://www.linux-usb.org/usb.ids
+ $(Q)curl -z oui.txt -o oui.txt -R http://standards-oui.ieee.org/oui/oui.txt
+ $(Q)curl -z ma-medium.txt -o ma-medium.txt -R http://standards-oui.ieee.org/oui28/mam.txt
+ $(Q)curl -z ma-small.txt -o ma-small.txt -R http://standards-oui.ieee.org/oui36/oui36.txt
+ $(Q)curl -z iab.txt -o iab.txt -R http://standards-oui.ieee.org/iab/iab.txt
+ $(Q)curl -L -z sdio.ids -o sdio.ids -R $(SYSTEMD_SOURCE)/sdio.ids
+ $(Q)curl -L -z ids_parser.py -o ids_parser.py -R $(SYSTEMD_SOURCE)/ids_parser.py
+ $(Q)for f in $(UDEV_FILES); do curl -L -z udev/$$f -o udev/$$f -R $(SYSTEMD_SOURCE)/$$f; done
$(Q)$(STATUS)
PV ?= $(shell ( awk '$$2 == "Date:" { print $$3; nextfile }' pci.ids usb.ids; git log --format=format:%ci -1 -- oui.txt $(addprefix udev/,$(UDEV_FILES)) ids_parser.py | cut -d ' ' -f1; ) | sort | tail -n 1 | tr -d -)