diff options
| -rw-r--r-- | openwrt/rhctl/Makefile | 9 | ||||
| -rw-r--r-- | openwrt/rhctl/files/udev.init | 25 | ||||
| -rw-r--r-- | openwrt/rhctl/files/udev.rules | 7 |
3 files changed, 4 insertions, 37 deletions
diff --git a/openwrt/rhctl/Makefile b/openwrt/rhctl/Makefile index 6e9cf8a..3e046d6 100644 --- a/openwrt/rhctl/Makefile +++ b/openwrt/rhctl/Makefile @@ -1,4 +1,4 @@ -# +# # Copyright (C) 2008 Christian Pointner, # <equinox@helsinki.at> # @@ -50,7 +50,7 @@ endef define Build/Compile rm -rf $(PKG_INSTALL_DIR) - mkdir -p $(PKG_INSTALL_DIR) + mkdir -p $(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) \ $(TARGET_CONFIGURE_OPTS) \ @@ -80,13 +80,12 @@ define Package/rhctl/install $(INSTALL_DIR) $(1)/usr/share/rhctl $(INSTALL_DATA) $(PKG_BUILD_DIR)/*.lua $(1)/usr/share/rhctl/ $(INSTALL_DIR) $(1)/etc/init.d - $(INSTALL_BIN) ./files/udev.init $(1)/etc/init.d/udev $(INSTALL_BIN) ./files/switchctl.init $(1)/etc/init.d/switchctl $(INSTALL_BIN) ./files/serialclient.init $(1)/etc/init.d/serialclient $(INSTALL_BIN) ./files/heartbeatclient.init $(1)/etc/init.d/heartbeatclient $(INSTALL_BIN) ./files/luaclient.init $(1)/etc/init.d/luaclient - $(INSTALL_DIR) $(1)/etc/udev/rules.d - $(INSTALL_DATA) ./files/udev.rules $(1)/etc/udev/rules.d/50-rhctl.rules + $(INSTALL_DIR) $(1)/etc/hotplug.d/usb + $(INSTALL_DATA) ./files/rhctl-usbserial.hotplug $(1)/etc/hotplug.d/usb/20-rhctl-usbserial endef $(eval $(call BuildPackage,rhctl)) diff --git a/openwrt/rhctl/files/udev.init b/openwrt/rhctl/files/udev.init deleted file mode 100644 index 76796fe..0000000 --- a/openwrt/rhctl/files/udev.init +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh /etc/rc.common -START=69 - -BIN=udevd -DAEMON=/sbin/$BIN -TRIGGER=/sbin/udevtrigger -SETTLE=/sbin/udevsettle -OPTIONS="--daemon" -DESC=$BIN - -start() { - echo -n "Starting $DESC:" - $DAEMON $OPTIONS - echo -n " triggering .. " - $TRIGGER - echo -n " wait for settle" - $SETTLE - echo " ." -} - -stop() { - echo -n "Stopping $DESC:" - killall $BIN - echo " ." -} diff --git a/openwrt/rhctl/files/udev.rules b/openwrt/rhctl/files/udev.rules deleted file mode 100644 index 1723ace..0000000 --- a/openwrt/rhctl/files/udev.rules +++ /dev/null @@ -1,7 +0,0 @@ -# rhctl usb-serial rules -# - -SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", ATTRS{serial}=="ftE2BB18", SYMLINK+="ttyMaster" -SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", ATTRS{serial}=="ftE2BI9E", SYMLINK+="ttyHeartbeat" -SUBSYSTEMS=="usb", KERNEL=="ttyUSB*", ATTRS{serial}=="ftE27L3P", SYMLINK+="ttyStandby" -SUBSYSTEMS=="usb-serial", KERNELS=="ttyUSB*", DRIVERS=="pl2303", SYMLINK+="audioswitch" |