From: Geoff Levand <geoffrey.lev...@am.sony.com> The udev package no longer provides a seperate udevtrigger utility. Add a hotplug2 patch '130-update-for-udev-139.patch' that makes hotplug2-0.9 use 'udevadm trigger'.
Also, move the hotplug2 dependency on udevadm from the top level target.mk to the hotplug2 Makefile. Signed-off-by: Geoff Levand <geoffrey.lev...@am.sony.com> --- include/target.mk | 2 package/hotplug2/Makefile | 3 - package/hotplug2/patches/130-update-for-udev-139.patch | 37 +++++++++++++++++ 3 files changed, 40 insertions(+), 2 deletions(-) --- a/include/target.mk +++ b/include/target.mk @@ -18,7 +18,7 @@ DEFAULT_PACKAGES.router:=dnsmasq iptable # Additional packages for Linux 2.6 ifneq ($(KERNEL),2.4) - DEFAULT_PACKAGES += udevtrigger hotplug2 + DEFAULT_PACKAGES += hotplug2 endif # Add device specific packages --- a/package/hotplug2/Makefile +++ b/package/hotplug2/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=hotplug2 PKG_VERSION:=0.9 -PKG_RELEASE:=3 +PKG_RELEASE:=4 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=http://isteve.bofh.cz/~isteve/hotplug2 @@ -24,6 +24,7 @@ define Package/hotplug2 VERSION:=0.9+r102-$(PKG_RELEASE) TITLE:=Dynamic device management subsystem for embedded systems URL:=http://isteve.bofh.cz/~isteve/hotplug2/ + DEPENDS:=+udevadm endef define Package/hotplug2/description --- /dev/null +++ b/package/hotplug2/patches/130-update-for-udev-139.patch @@ -0,0 +1,37 @@ +The udev package no longer provides a seperate udevtrigger utility. +Patch hotplug2 to use 'udevadm trigger'. + +--- a/hotplug2.c ++++ b/hotplug2.c +@@ -504,8 +504,6 @@ end_rules: + signal(SIGCHLD, sighandler); + + if (coldplug) { +- if (coldplug_command == NULL) +- coldplug_command = UDEVTRIGGER_COMMAND; + coldplug_p = fork(); + switch (coldplug_p) { + case FORK_ERROR: +@@ -514,7 +512,10 @@ end_rules: + goto exit; + break; + case 0: +- execlp(coldplug_command, coldplug_command, NULL); ++ if (!coldplug_command) ++ execlp(UDEVTRIGGER_COMMAND, UDEVTRIGGER_COMMAND, "trigger", NULL); ++ else ++ execlp(coldplug_command, coldplug_command, NULL); + ERROR("coldplug","Coldplug exec ('%s') failed: %s.", coldplug_command, strerror(errno)); + goto exit; + break; +--- a/hotplug2.h ++++ b/hotplug2.h +@@ -54,7 +54,7 @@ + #define ACTION_REMOVE 1 + #define ACTION_UNKNOWN -1 + +-#define UDEVTRIGGER_COMMAND "/sbin/udevtrigger", "/sbin/udevtrigger" ++#define UDEVTRIGGER_COMMAND "/sbin/udevadm" + + #define FORK_CHILD 0 + #define FORK_ERROR -1 -- _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org http://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
