NAME=hwdata
VERSION=$(shell awk '/Version:/ { print $$2 }' hwdata.spec)
-RELEASE=$(shell rpm -q --define 'dist %{nil}' --specfile --qf "%{release}" hwdata.spec)
+RELEASE=$(shell rpm -q --define 'dist %{nil}' --specfile --qf "%{release}\n" hwdata.spec | head -n 1)
ifeq ($(shell git rev-parse --abbrev-ref HEAD | sed -n 's/^\([^0-9-]\+\).*/\L\1/p'), rhel)
# add revision to tag name for rhel branches
- TAGNAME := $(NAME)-$(VERSION)-$(RELEASE)
+ TAGNAME := v$(VERSION)-$(RELEASE)
else
TAGNAME := $(NAME)-$(VERSION)
endif
SOURCEDIR := $(shell pwd)
ARCHIVE := $(TAGNAME).tar.bz2
+HWDBNUMINCR := 2
CVSROOT = $(shell cat CVS/Root 2>/dev/null || :)
CVSTAG = $(NAME)-r$(subst .,-,$(VERSION))
-FILES = pci.ids usb.ids oui.txt iab.txt pnp.ids
+FILES := pci.ids usb.ids oui.txt iab.txt pnp.ids sdio.ids
+HWDBGENERATED := \
+ 20-OUI.hwdb \
+ 20-pci-classes.hwdb \
+ 20-pci-vendor-model.hwdb \
+ 20-sdio-classes.hwdb \
+ 20-sdio-vendor-model.hwdb \
+ 20-usb-classes.hwdb \
+ 20-usb-vendor-model.hwdb
+HWDBUPSTREAM := \
+ 20-acpi-vendor.hwdb \
+ 20-bluetooth-vendor-product.hwdb \
+ 20-net-ifname.hwdb \
+ 60-evdev.hwdb \
+ 60-keyboard.hwdb \
+ 70-mouse.hwdb \
+ 70-pointingstick.hwdb
+HWDBFILES := $(HWDBGENERATED) $(HWDBUPSTREAM)
.PHONY: all install tag force-tag check commit create-archive archive srpm-x \
- clean clog new-pci-ids new-usb-ids new-oui new-iab new-pnp-ids
+ clean clog \
+ new-pci-ids \
+ new-usb-ids \
+ new-oui \
+ new-iab \
+ new-pnp-ids \
+ new-hwdb-files \
+ new-sdio-ds \
+ pnp.ids
include Makefile.inc
for foo in $(FILES) ; do \
install -m 644 $$foo $(DESTDIR)$(datadir)/$(NAME) ;\
done
+ mkdir -p -m 755 $(DESTDIR)$(libdir)/udev/hwdb.d/
+ perl ./ids-update.pl
+ for foo in $(HWDBFILES) ; do \
+ num=`echo $$foo | sed 's,^\(.*/\|\)\([0-9]\+\)-[^/]\+,\2,'`; \
+ destname=`printf "%02d" $$((num + $(HWDBNUMINCR)))`-`basename $$foo | sed "s/^[0-9]\+-//"`; \
+ install -m 644 $$foo $(DESTDIR)$(libdir)/udev/hwdb.d/$$destname; \
+ done
mkdir -p -m 755 $(DESTDIR)$(libdir)/modprobe.d
install -m 644 -T blacklist.conf $(DESTDIR)$(libdir)/modprobe.d/dist-blacklist.conf
commit:
- git commit -a ||:
+ git commit -vas ||:
tag:
@git tag -s -m "Tag as $(TAGNAME)" $(TAGNAME)
@echo "Tagged as $(TAGNAME)"
force-tag:
- @git tag -s -f $(TAGNAME)
+ @git tag -s -f -m "Tag as $(TAGNAME)" $(TAGNAME)
@echo "Tag forced as $(TAGNAME)"
changelog:
check:
@[ -x /sbin/lspci ] && /sbin/lspci -i pci.ids > /dev/null || { echo "FAILURE: /sbin/lspci -i pci.ids"; exit 1; } && echo "OK: /sbin/lspci -i pci.ids"
@./check-pci-ids.py || { echo "FAILURE: ./check-pci-ids.py"; exit 1; } && echo "OK: ./check-pci-ids.py"
+ @./check-usb-ids.sh
+ @for file in $(IDFILES); do \
+ text=`LANG=C file $$file`; \
+ expected="$$file: UTF-8 Unicode text"; \
+ if [[ "$$text" != "$$expected" ]]; then \
+ printf "Expected: %s\n Got instead: %s\n" "$$expected" "$$text" >&2; \
+ exit 1; \
+ fi; \
+ echo "OK: $$text"; \
+ done
@echo -n "CHECK date of pci.ids: "; grep "Date:" pci.ids | cut -d ' ' -f 5
@echo -n "CHECK date of usb.ids: "; grep "Date:" usb.ids | cut -d ' ' -f 6
@echo ""
@echo "The final archive is in $(TAGNAME).tar.bz2"
-archive: check clean commit tag create-archive
+archive: check clean commit tag
upload:
@scp $(TAGNAME).tar.bz2 fedorahosted.org:$(NAME)
@echo SRPM is: $(NAME)-$(VERSION)-$(RELEASE).src.rpm
clean:
- @rm -f $(NAME)-*.gz $(NAME)-*.src.rpm new-pnp.xlsx pnp.ids.txt
+ @rm -f $(NAME)-*.gz $(NAME)-*.src.rpm pnp.ids.xlsx \
+ *.downloaded *.utf8 *.orig
clog: hwdata.spec
@sed -n '/^%changelog/,/^$$/{/^%/d;/^$$/d;s/%%/%/g;p}' $< | tee $@
-download: new-usb-ids new-pci-ids new-oui new-iab new-pnp-ids
+download: $(FILES) new-hwdb-files
+
+usb.ids.downloaded:
+ @curl -o $@ http://www.linux-usb.org/usb.ids
+
+pci.ids.downloaded:
+ @curl -o $@ https://raw.githubusercontent.com/pciutils/pciids/master/pci.ids
-new-usb-ids:
- @curl -O http://www.linux-usb.org/usb.ids
+oui.txt.downloaded:
+ @curl -o $@ -O http://standards-oui.ieee.org/oui.txt
-new-pci-ids:
- @curl -O http://pciids.sourceforge.net/pci.ids
+iab.txt.downloaded:
+ @curl -o $@ -O http://standards-oui.ieee.org/iab/iab.txt
-new-oui:
- @curl -O http://standards.ieee.org/develop/regauth/oui/oui.txt
+pnp.ids.xlsx:
+ @curl -o $@ \
+ http://download.microsoft.com/download/7/E/7/7E7662CF-CBEA-470B-A97E-CE7CE0D98DC2/ISA_PNPID_List.xlsx
-new-iab:
- @curl -O http://standards.ieee.org/develop/regauth/iab/iab.txt
+sdio.ids.downloaded:
+ @curl -o $@ https://cgit.freedesktop.org/systemd/systemd/plain/hwdb/sdio.ids
-new-pnp-ids: pnp.ids
+usb.ids: usb.ids.utf8
+ dos2unix -n $? $@
-pnp.ids: pnp.ids.txt pnp.ids.patch
- patch -o $@ <pnp.ids.patch
+pci.ids: pci.ids.utf8
+ dos2unix -n $? $@
+
+oui.txt: oui.txt.utf8
+ dos2unix -n $? $@
-pnp.ids.txt: new-pnp.xlsx
+iab.txt: iab.txt.utf8
+ dos2unix -n $? $@
+
+sdio.ids: sdio.ids.utf8
+ dos2unix -n $? $@
+
+pnp.ids.orig: pnp.ids.xlsx
@unoconv --stdout -f csv $? | \
tr ' ' ' ' | \
sed -n \
-e 's:^\(.*\)\s*,\s*\([a-zA-Z@]\{3\}\)\s*,\s*\([0-9]\+/[0-9]\+/[0-9]\+\):\2\t\1:p' | \
sed 's/\s*$$//' | sort -u >$@
-new-pnp.xlsx:
- @curl -o $@ \
- http://download.microsoft.com/download/7/E/7/7E7662CF-CBEA-470B-A97E-CE7CE0D98DC2/ISA_PNPID_List.xlsx
+pnp.ids: pnp.ids.orig pnp.ids.patch
+ patch -o $@ <pnp.ids.patch
+
+%.utf8: %.downloaded
+ @text=`LANG=C file $?`
+ @encoding=`echo "$$text" | sed -n 's/.*\(iso-8859\S\*\|cp1[12]\d\+\).*/\1/Ip'`
+ @if [[ -n "$$encoding" ]]; then \
+ iconv -f "$$encoding" -t UTF-8 $?; \
+ else \
+ cat $?; \
+ fi | sed 's/\s\+$$//' >$@
+
+new-hwdb-files:
+ @for file in $(HWDBUPSTREAM); do \
+ echo $$file; \
+ curl -O https://cgit.freedesktop.org/systemd/systemd/plain/hwdb/$$file; \
+ done
projects / oweals / hwdata.git / blobdiff