From 0caf2c3651551d99051f8ed2d09d566745ef8401 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Mon, 8 Jun 2015 12:58:40 -0500
Subject: use hwdb with udevadm, no usb.ids support anymore

---
 package/eudev/Makefile    | 27 ++++++++++++++-------------
 package/usbutils/Makefile |  6 +++---
 2 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'package')

diff --git a/package/eudev/Makefile b/package/eudev/Makefile
index 6a2e6ebf1..6f775cff6 100644
--- a/package/eudev/Makefile
+++ b/package/eudev/Makefile
@@ -4,9 +4,9 @@
 include $(ADK_TOPDIR)/rules.mk
 
 PKG_NAME:=		eudev
-PKG_VERSION:=		3.0
+PKG_VERSION:=		3.1.1
 PKG_RELEASE:=		1
-PKG_HASH:=		74db8aaf13cc392edfb821291783ecd64d815e6f81409f57e290d3017750db29
+PKG_HASH:=		d3a0c7f613d4917b89afd57498860a1c35b9c59abf9fea22a09c30eec25c32e4
 PKG_DESCR:=		device manager (udev clone)
 PKG_SECTION:=		sys/utils
 PKG_BUILDDEP:=		gperf-host glib util-linux
@@ -16,7 +16,7 @@ PKG_SITES:=		http://dev.gentoo.org/~blueness/eudev/
 PKG_LIBNAME:=		libudev
 PKG_OPTS:=		dev
 
-DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
+DISTFILES:=		$(PKG_NAME)-$(PKG_VERSION).tar.gz
 
 PKG_SUBPKGS:=		UDEV LIBUDEV
 PKGSD_UDEV:=		dynamic device management manager
@@ -25,23 +25,24 @@ PKGSD_LIBUDEV:=		dynamic device management library
 
 include $(ADK_TOPDIR)/mk/package.mk
 
-$(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
-$(eval $(call PKG_template,LIBUDEV,libudev,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION},${PKG_OPTS}))
+$(eval $(call PKG_template,UDEV,udev,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
+$(eval $(call PKG_template,LIBUDEV,libudev,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS)))
 
 CONFIGURE_ARGS+=	--disable-manpages \
 			--disable-blkid \
 			--disable-gudev \
-			--disable-gtk-doc
+			--disable-gtk-doc \
+			--enable-hwdb
 
 udev-install:
-	${INSTALL_DIR} ${IDIR_UDEV}/usr/bin ${IDIR_UDEV}/etc/udev
-	${INSTALL_DIR} ${IDIR_UDEV}/usr/lib/udev
-	${CP} ${WRKINST}/etc/udev/* ${IDIR_UDEV}/etc/udev
-	${CP} ${WRKINST}/usr/lib/udev/* ${IDIR_UDEV}/usr/lib/udev
-	${CP} ${WRKINST}/usr/bin/udevadm ${IDIR_UDEV}/usr/bin
+	$(INSTALL_DIR) $(IDIR_UDEV)/usr/bin $(IDIR_UDEV)/etc/udev
+	$(INSTALL_DIR) $(IDIR_UDEV)/usr/lib/udev
+	$(CP) $(WRKINST)/etc/udev/* $(IDIR_UDEV)/etc/udev
+	$(CP) $(WRKINST)/usr/lib/udev/* $(IDIR_UDEV)/usr/lib/udev
+	$(CP) $(WRKINST)/usr/bin/udevadm $(IDIR_UDEV)/usr/bin
 
 libudev-install:
-	${INSTALL_DIR} ${IDIR_LIBUDEV}/usr/lib
+	$(INSTALL_DIR) $(IDIR_LIBUDEV)/usr/lib
 	$(CP) $(WRKINST)/usr/lib/libudev.so* $(IDIR_LIBUDEV)/usr/lib
 
-include ${ADK_TOPDIR}/mk/pkg-bottom.mk
+include $(ADK_TOPDIR)/mk/pkg-bottom.mk
diff --git a/package/usbutils/Makefile b/package/usbutils/Makefile
index c38133d56..bc4961f95 100644
--- a/package/usbutils/Makefile
+++ b/package/usbutils/Makefile
@@ -5,12 +5,12 @@ include ${ADK_TOPDIR}/rules.mk
 
 PKG_NAME:=		usbutils
 PKG_VERSION:=		008
-PKG_RELEASE:=		1
+PKG_RELEASE:=		2
 PKG_HASH:=		44741af0bae9d402a0ef160a29b2fa700bb656ab5e0a4b3343d51249c2a44c8c
 PKG_DESCR:=		program to list usb devices
 PKG_SECTION:=		sys/hw
-PKG_DEPENDS:=		libusb libusb-compat libpthread zlib librt usbids libudev
-PKG_BUILDDEP:=		libusb libusb-compat zlib eudev
+PKG_DEPENDS:=		libusb libusb-compat libpthread librt udev
+PKG_BUILDDEP:=		libusb libusb-compat eudev
 PKG_SITES:=		http://www.kernel.org/pub/linux/utils/usb/usbutils/
 PKG_BB:=		1
 
-- 
cgit v1.2.3