summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
Diffstat (limited to 'package')
-rw-r--r--package/mosquitto/Makefile22
-rw-r--r--package/mosquitto/files/mosquitto.init2
-rw-r--r--package/mosquitto/files/mosquitto.postinst2
3 files changed, 11 insertions, 15 deletions
diff --git a/package/mosquitto/Makefile b/package/mosquitto/Makefile
index 206099b15..ba0e86787 100644
--- a/package/mosquitto/Makefile
+++ b/package/mosquitto/Makefile
@@ -7,38 +7,34 @@ PKG_NAME:= mosquitto
PKG_VERSION:= 1.3.5
PKG_RELEASE:= 1
PKG_HASH:= 16eb3dbef183827665feee9288362c7352cd016ba04ca0402a0ccf857d1c2ab2
-PKG_DESCR:= MQTT Broker
+PKG_DESCR:= mqtt broker
PKG_SECTION:= net/misc
-PKG_DEPENDS:= c-ares
-PKG_BUILDDEP:= cmake-host c-ares
+PKG_DEPENDS:= c-ares libopenssl librt libpthreads
+PKG_BUILDDEP:= cmake-host c-ares openssl
PKG_URL:= http://mosquitto.org
PKG_SITES:= http://mosquitto.org/files/source/
-# if downloaded package is not ending with .tar.xz use following
DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz
include $(ADK_TOPDIR)/mk/package.mk
-$(eval $(call PKG_template,MOSQUITTO,mosquitto,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
+$(eval $(call PKG_template,MOSQUITTO,mosquitto,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-CONFIG_STYLE:= manual
-
-do-configure:
- (cd ${WRKBUILD} && PATH='${HOST_PATH}' \
- cmake -DCMAKE_SYSTEM_NAME=Linux .)
+CONFIG_STYLE:= cmake
+CMAKE_FLAGS+= -DINC_MEMTRACK=OFF
mosquitto-install:
$(INSTALL_DIR) $(IDIR_MOSQUITTO)/usr/bin
$(INSTALL_DIR) $(IDIR_MOSQUITTO)/usr/sbin
$(INSTALL_DIR) $(IDIR_MOSQUITTO)/usr/lib
$(INSTALL_DIR) $(IDIR_MOSQUITTO)/etc/mosquitto
- $(INSTALL_BIN) $(WRKINST)/usr/local/bin/mosquitto* \
+ $(INSTALL_BIN) $(WRKINST)/usr/bin/mosquitto* \
$(IDIR_MOSQUITTO)/usr/bin
- $(INSTALL_BIN) $(WRKINST)/usr/local/sbin/mosquitto* \
+ $(INSTALL_BIN) $(WRKINST)/usr/sbin/mosquitto* \
$(IDIR_MOSQUITTO)/usr/sbin
$(INSTALL_DATA) $(WRKINST)/etc/mosquitto/* \
$(IDIR_MOSQUITTO)/etc/mosquitto
- $(CP) $(WRKINST)/usr/local/lib/*.so* \
+ $(CP) $(WRKINST)/usr/lib/*.so* \
$(IDIR_MOSQUITTO)/usr/lib
diff --git a/package/mosquitto/files/mosquitto.init b/package/mosquitto/files/mosquitto.init
index 7b9c7a827..05e61731f 100644
--- a/package/mosquitto/files/mosquitto.init
+++ b/package/mosquitto/files/mosquitto.init
@@ -12,7 +12,7 @@ autostart)
;;
start)
[ -d /var/lib/mosquitto ] || mkdir -p /var/lib/mosquitto
- /usr/sbin/mosquitto $mosquitto_flags
+ /usr/sbin/mosquitto -d $mosquitto_flags
;;
stop)
kill $(pgrep -f /usr/sbin/mosquitto)
diff --git a/package/mosquitto/files/mosquitto.postinst b/package/mosquitto/files/mosquitto.postinst
index 5c39e9bde..a40e7f44c 100644
--- a/package/mosquitto/files/mosquitto.postinst
+++ b/package/mosquitto/files/mosquitto.postinst
@@ -1,7 +1,7 @@
#!/bin/sh
. $IPKG_INSTROOT/etc/functions.sh
add_rcconf mosquitto NO
-add_rcconf mosquitto_flags ''
+add_rcconf mosquitto_flags " "
gid=$(get_next_gid)
add_group mosquitto $gid
add_user mosquitto $(get_next_uid) $gid /etc/mosquitto