Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

mosquitto: fix provides <=> package name conflicts

Browse source 
The virtual package declared by PROVIDES must not have the same name as the
variant declaring it, otherwise buildroot will fail with errors like:

    cp: '.../pkginfo/mosquitto.provides' and '.../pkginfo/mosquitto.provides' are the same file

In order to fix the above error, rename the existing "mosquitto" and
"libmosquitto" packages into "mosquitto-ssl" and "libmosquitto-ssl"
respectively.

Also substitute use of $(PKG_NAME) with literal "mosquitto" in
Package/* defines to improve readability of the Makefile.

Signed-off-by: Jo-Philipp Wich <jo@mein.io>
This commit is contained in:
Jo-Philipp Wich 2017-01-17 22:52:04 +01:00 committed by Karl Palsson
parent 75dfd85619
commit 8dd6ca99fc
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
net/mosquitto/Config.in
View file

@ -1,13 +1,13 @@
config MOSQUITTO_LWS config MOSQUITTO_LWS
bool "libwebsockets support" bool "libwebsockets support"
depends on PACKAGE_mosquitto depends on PACKAGE_mosquitto-ssl
default y default y
help help
Includes websockets support in the broker, via libwebsockets Includes websockets support in the broker, via libwebsockets
config MOSQUITTO_PASSWD config MOSQUITTO_PASSWD
bool "Include mosquitto_passwd utility" bool "Include mosquitto_passwd utility"
depends on PACKAGE_mosquitto depends on PACKAGE_mosquitto-ssl
default y default y
help help
mosquitto_passwd is a tool for managing password files for mosquitto. mosquitto_passwd is a tool for managing password files for mosquitto.

44
net/mosquitto/Makefile
View file

@ -21,7 +21,7 @@ PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSI
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
define Package/$(PKG_NAME)/default define Package/mosquitto/default
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
TITLE:=mosquitto - an MQTT message broker TITLE:=mosquitto - an MQTT message broker
@ -31,7 +31,7 @@ define Package/$(PKG_NAME)/default
USERID:=mosquitto=200:mosquitto=200 USERID:=mosquitto=200:mosquitto=200
endef endef
define Package/$(PKG_NAME) define Package/mosquitto-ssl
$(call Package/mosquitto/default) $(call Package/mosquitto/default)
TITLE+= (with SSL support) TITLE+= (with SSL support)
DEPENDS+= +libopenssl +MOSQUITTO_LWS:libwebsockets-openssl DEPENDS+= +libopenssl +MOSQUITTO_LWS:libwebsockets-openssl
@ -39,18 +39,18 @@ define Package/$(PKG_NAME)
PROVIDES:=mosquitto PROVIDES:=mosquitto
endef endef
define Package/$(PKG_NAME)-nossl define Package/mosquitto-nossl
$(call Package/$(PKG_NAME)/default) $(call Package/mosquitto/default)
TITLE+= (without SSL support) TITLE+= (without SSL support)
VARIANT:=nossl VARIANT:=nossl
PROVIDES:=mosquitto PROVIDES:=mosquitto
endef endef
define Package/$(PKG_NAME)/config define Package/mosquitto-ssl/config
source "$(SOURCE)/Config.in" source "$(SOURCE)/Config.in"
endef endef
define Package/$(PKG_NAME)/default/description define Package/mosquitto/default/description
Mosquitto is an open source (BSD licensed) message broker that implements Mosquitto is an open source (BSD licensed) message broker that implements
the MQTT protocol version 3.1 and 3.1.1. MQTT provides a lightweight the MQTT protocol version 3.1 and 3.1.1. MQTT provides a lightweight
method of carrying out messaging using a publish/subscribe model. method of carrying out messaging using a publish/subscribe model.
@ -58,13 +58,13 @@ method of carrying out messaging using a publish/subscribe model.
This package also includes some basic support for configuring via UCI This package also includes some basic support for configuring via UCI
endef endef
define Package/$(PKG_NAME)/description define Package/mosquitto-ssl/description
$(call Package/$(PKG_NAME)/default/description) $(call Package/mosquitto/default/description)
This package is built with SSL support This package is built with SSL support
endef endef
define Package/$(PKG_NAME)-nossl/description define Package/mosquitto-nossl/description
$(call Package/$(PKG_NAME)/default/description) $(call Package/mosquitto/default/description)
This package is built WITHOUT SSL support. This package is built WITHOUT SSL support.
endef endef
@ -77,7 +77,7 @@ endef
define Package/mosquitto-client define Package/mosquitto-client
$(call Package/mosquitto-client/default) $(call Package/mosquitto-client/default)
TITLE+= (With SSL support) TITLE+= (With SSL support)
DEPENDS+=+libmosquitto DEPENDS+=+libmosquitto-ssl
VARIANT:=ssl VARIANT:=ssl
endef endef
define Package/mosquitto-client-nossl define Package/mosquitto-client-nossl
@ -110,7 +110,7 @@ define Package/libmosquitto/default
PROVIDES:=libmosquitto PROVIDES:=libmosquitto
endef endef
define Package/libmosquitto define Package/libmosquitto-ssl
$(call Package/libmosquitto/default) $(call Package/libmosquitto/default)
TITLE+= (With SSL Support) TITLE+= (With SSL Support)
DEPENDS+= +libopenssl DEPENDS+= +libopenssl
@ -131,7 +131,7 @@ Should be useable for communicating with any MQTT v3.1/3.1.1 compatible
server, such as IBM's RSMB, in addition to Mosquitto server, such as IBM's RSMB, in addition to Mosquitto
endef endef
define Package/libmosquitto/description define Package/libmosquitto-ssl/description
$(call Package/libmosquitto/default/description) $(call Package/libmosquitto/default/description)
This package is built with SSL support This package is built with SSL support
endef endef
@ -143,7 +143,7 @@ endef
define Package/libmosquittopp define Package/libmosquittopp
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
DEPENDS:=+libmosquitto +libstdcpp DEPENDS:=+libmosquitto-ssl +libstdcpp
TITLE:= mosquitto - client c++ library TITLE:= mosquitto - client c++ library
endef endef
@ -151,12 +151,12 @@ define Package/libmosquittopp/description
C++ Library wrapper for libmosquitto. C++ Library wrapper for libmosquitto.
endef endef
define Package/$(PKG_NAME)/conffiles define Package/mosquitto-ssl/conffiles
/etc/mosquitto/mosquitto.conf /etc/mosquitto/mosquitto.conf
/etc/config/mosquitto /etc/config/mosquitto
endef endef
Package/$(PKG_NAME)-nossl/conffiles = $(Package/$(PKG_NAME)/conffiles) Package/mosquitto-nossl/conffiles = $(Package/mosquitto-ssl/conffiles)
define Package/mosquitto/install/default define Package/mosquitto/install/default
$(INSTALL_DIR) $(1)/usr/sbin $(INSTALL_DIR) $(1)/usr/sbin
@ -170,7 +170,7 @@ define Package/mosquitto-nossl/install
$(call Package/mosquitto/install/default,$(1)) $(call Package/mosquitto/install/default,$(1))
endef endef
define Package/mosquitto/install define Package/mosquitto-ssl/install
$(call Package/mosquitto/install/default,$(1)) $(call Package/mosquitto/install/default,$(1))
ifeq ($(CONFIG_MOSQUITTO_PASSWD),y) ifeq ($(CONFIG_MOSQUITTO_PASSWD),y)
$(INSTALL_DIR) $(1)/usr/bin $(INSTALL_DIR) $(1)/usr/bin
@ -198,12 +198,12 @@ define Build/InstallDev
endef endef
# This installs files on the target. Compare with Build/InstallDev # This installs files on the target. Compare with Build/InstallDev
define Package/libmosquitto/install define Package/libmosquitto-ssl/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/ $(INSTALL_BIN) $(PKG_BUILD_DIR)/lib/libmosquitto.so.1 $(1)/usr/lib/
$(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so $(LN) libmosquitto.so.1 $(1)/usr/lib/libmosquitto.so
endef endef
Package/libmosquitto-nossl/install = $(Package/libmosquitto/install) Package/libmosquitto-nossl/install = $(Package/libmosquitto-ssl/install)
define Package/libmosquittopp/install define Package/libmosquittopp/install
$(INSTALL_DIR) $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
@ -219,9 +219,9 @@ else
MAKE_FLAGS += WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no") MAKE_FLAGS += WITH_WEBSOCKETS=$(if $(CONFIG_MOSQUITTO_LWS),"yes","no")
endif endif
$(eval $(call BuildPackage,$(PKG_NAME))) $(eval $(call BuildPackage,mosquitto-ssl))
$(eval $(call BuildPackage,$(PKG_NAME)-nossl)) $(eval $(call BuildPackage,mosquitto-nossl))
$(eval $(call BuildPackage,libmosquitto)) $(eval $(call BuildPackage,libmosquitto-ssl))
$(eval $(call BuildPackage,libmosquitto-nossl)) $(eval $(call BuildPackage,libmosquitto-nossl))
$(eval $(call BuildPackage,libmosquittopp)) $(eval $(call BuildPackage,libmosquittopp))
$(eval $(call BuildPackage,mosquitto-client)) $(eval $(call BuildPackage,mosquitto-client))