From 4c35fd1a800d8621d5050b7d0b041b756bed2a39 Mon Sep 17 00:00:00 2001 From: Karl Palsson Date: Mon, 18 Jan 2016 17:40:52 +0000 Subject: [PATCH] mosquitto: properly separate the passwd utility Building both variants improperly tried to include the passwd utility for the non-ssl variant, as the variable was set for the ssl variant. Use properly separated install tasks to install additional files, rather than hacking around inside the single target. Signed-off-by: Karl Palsson --- net/mosquitto/Makefile | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/net/mosquitto/Makefile b/net/mosquitto/Makefile index 495ad1433..ec588d184 100644 --- a/net/mosquitto/Makefile +++ b/net/mosquitto/Makefile @@ -145,12 +145,9 @@ endef Package/$(PKG_NAME)-nossl/conffiles = $(Package/$(PKG_NAME)/conffiles) -define Package/$(PKG_NAME)/install +define Package/mosquitto/install/default $(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto $(1)/usr/sbin/mosquitto -ifeq ($(CONFIG_MOSQUITTO_PASSWD),y) - $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto_passwd $(1)/usr/sbin -endif $(INSTALL_DIR) $(1)/etc/mosquitto $(INSTALL_CONF) $(PKG_BUILD_DIR)/mosquitto.conf $(1)/etc/mosquitto/mosquitto.conf $(INSTALL_DIR) $(1)/etc/init.d @@ -158,8 +155,18 @@ endif $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) ./files/mosquitto.uci.convert $(1)/usr/bin endef -Package/$(PKG_NAME)-nossl/install = $(Package/$(PKG_NAME)/install) +define Package/mosquitto-nossl/install + $(call Package/mosquitto/install/default,$(1)) +endef + +define Package/mosquitto/install + $(call Package/mosquitto/install/default,$(1)) +ifeq ($(CONFIG_MOSQUITTO_PASSWD),y) + $(INSTALL_DIR) $(1)/usr/bin + $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/mosquitto_passwd $(1)/usr/bin +endif +endef define Package/mosquitto-client/install $(INSTALL_DIR) $(1)/usr/bin