X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/e9a2e58a69fcc2fb7ab7a106d44c81e2b597cc46..9d35bf3e30b5f13f1de316900ca42f9332dd84c0:/package/udev/Makefile

diff --git a/package/udev/Makefile b/package/udev/Makefile
index bde7a61e3..336e511f0 100644
--- a/package/udev/Makefile
+++ b/package/udev/Makefile
@@ -37,6 +37,11 @@ $(call Package/udev)
   TITLE:=Small utility to request kernel devices events for coldplug
 endef
 
+define Package/udev-vol-id
+$(call Package/udev)
+ TITLE:=Small utility to read volume ids
+endef
+
 define Build/Compile
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		CROSS_COMPILE="$(TARGET_CROSS)" \
@@ -44,6 +49,7 @@ define Build/Compile
 		OPTFLAGS="$(TARGET_CFLAGS)" \
 		DESTDIR="$(PKG_INSTALL_DIR)" \
 		INSTALL="install -c" \
+		EXTRAS="extras/volume_id" \
 		all install
 endef
 
@@ -52,20 +58,29 @@ define Package/udev/install
 	$(CP) $(PKG_INSTALL_DIR)/etc/udev/* $(1)/etc/udev/
 	install -d -m0775 $(1)/lib/udev
 	install -d -m0775 $(1)/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/sbin/udevsettle $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevcontrol $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevd $(1)/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevsettle $(1)/sbin/
 	install -d -m0775 $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udevinfo $(1)/usr/bin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/bin/udevtest $(1)/usr/bin/
 	install -d -m0775 $(1)/usr/sbin/
-	$(CP) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/udevmonitor $(1)/usr/sbin/
+	install -d -m0775 $(1)/etc/udev/rules.d
+	$(CP) files/20-input-grouping.rules $(1)/etc/udev/rules.d/
 endef
 
 define Package/udevtrigger/install
 	$(INSTALL_DIR) $(1)/sbin
 	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/sbin/udevtrigger $(1)/sbin/
 endef
+define Package/udev-vol-id/install
+	$(INSTALL_DIR) $(1)/sbin
+	$(INSTALL_DIR) $(1)/lib
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/libvolume_id.so* $(1)/lib/
+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/lib/udev/vol_id $(1)/sbin/
+endef
 
 $(eval $(call BuildPackage,udev))
 $(eval $(call BuildPackage,udevtrigger))
+$(eval $(call BuildPackage,udev-vol-id))