From: Mike Gilbert <floppym@gentoo.org>
Date: Tue, 4 Feb 2020 18:49:10 +0000 (-0500)
Subject: Revert "Allow parallel fetch"
X-Git-Tag: hwids-20200204
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a6b1b703049961a562d4f638a261709589774a12;p=oweals%2Fhwids.git

Revert "Allow parallel fetch"

This reverts commit efda4d31b061a57ec5add4e30b161317641d3937.

Signed-off-by: Mike Gilbert <floppym@gentoo.org>
---

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 -)