summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2017-01-06 17:29:39 +0100
committerRobert Schwebel <r.schwebel@pengutronix.de>2017-01-06 17:29:39 +0100
commit57d5032556777aa90848e95a6369409d62a7cfe4 (patch)
tree0bb0cc7505534d242980e027aa6acde0fbba463b
parente977f927e62e7ce3d25adad0d3a3185c272d593a (diff)
downloadDistroKit-57d5032556777aa90848e95a6369409d62a7cfe4.tar.gz
DistroKit-57d5032556777aa90848e95a6369409d62a7cfe4.tar.xz
mosquitto: remove package that leaked in by accident
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
-rw-r--r--patches/mosquitto-1.4.9/0001-CMakeLists-don-t-run-ldconfig-automatically.patch52
-rw-r--r--patches/mosquitto-1.4.9/series4
-rw-r--r--rules-new/mosquitto.in40
-rw-r--r--rules-new/mosquitto.make75
4 files changed, 0 insertions, 171 deletions
diff --git a/patches/mosquitto-1.4.9/0001-CMakeLists-don-t-run-ldconfig-automatically.patch b/patches/mosquitto-1.4.9/0001-CMakeLists-don-t-run-ldconfig-automatically.patch
deleted file mode 100644
index 11de869..0000000
--- a/patches/mosquitto-1.4.9/0001-CMakeLists-don-t-run-ldconfig-automatically.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From: Robert Schwebel <r.schwebel@pengutronix.de>
-Date: Thu, 9 Jun 2016 16:04:59 +0200
-Subject: [PATCH] CMakeLists: don't run ldconfig automatically
-
-When cross building, this code starts ldconfig on the development
-machine, which is pretty useless and even wrong. Running ldconfig should
-be a manual task, so remove the automatic calls.
-
-Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
----
- lib/CMakeLists.txt | 4 ----
- lib/cpp/CMakeLists.txt | 4 ----
- src/CMakeLists.txt | 5 -----
- 3 files changed, 13 deletions(-)
-
-diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt
-index d9163991b6cc..e5f8d671de2a 100644
---- a/lib/CMakeLists.txt
-+++ b/lib/CMakeLists.txt
-@@ -72,7 +72,3 @@ set_target_properties(libmosquitto PROPERTIES
-
- install(TARGETS libmosquitto RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
- install(FILES mosquitto.h DESTINATION "${INCLUDEDIR}")
--
--if (UNIX)
-- install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
--endif (UNIX)
-diff --git a/lib/cpp/CMakeLists.txt b/lib/cpp/CMakeLists.txt
-index b80dc181fa31..9deb2b7102c2 100644
---- a/lib/cpp/CMakeLists.txt
-+++ b/lib/cpp/CMakeLists.txt
-@@ -12,7 +12,3 @@ set_target_properties(mosquittopp PROPERTIES
- )
- install(TARGETS mosquittopp RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
- install(FILES mosquittopp.h DESTINATION "${INCLUDEDIR}")
--
--if (UNIX)
-- install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
--endif (UNIX)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 0008e5551bcf..1dfa602d2e6c 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -125,8 +125,3 @@ if (${WITH_TLS} STREQUAL ON)
- target_link_libraries(mosquitto_passwd "${OPENSSL_LIBRARIES}")
- install(TARGETS mosquitto_passwd RUNTIME DESTINATION "${BINDIR}" LIBRARY DESTINATION "${LIBDIR}")
- endif (${WITH_TLS} STREQUAL ON)
--
--if (UNIX)
-- install(CODE "EXEC_PROGRAM(/sbin/ldconfig)")
--endif (UNIX)
--
diff --git a/patches/mosquitto-1.4.9/series b/patches/mosquitto-1.4.9/series
deleted file mode 100644
index 7fc0ef1..0000000
--- a/patches/mosquitto-1.4.9/series
+++ /dev/null
@@ -1,4 +0,0 @@
-# generated by git-ptx-patches
-#tag:base --start-number 1
-0001-CMakeLists-don-t-run-ldconfig-automatically.patch
-# 3161d1e7e3f71c5b78d1ce0c80d4eab2 - git-ptx-patches magic
diff --git a/rules-new/mosquitto.in b/rules-new/mosquitto.in
deleted file mode 100644
index 4727664..0000000
--- a/rules-new/mosquitto.in
+++ /dev/null
@@ -1,40 +0,0 @@
-## SECTION=networking
-
-config MOSQUITTO
- tristate
- select HOST_CMAKE
- prompt "mosquitto"
- help
- Mosquitto is a message broker for the MQTT (MQ Telemetry Transport)
- protocol. It implements a publish/subscribe mechanism for IoT applications
- and makes it possible to expose all your critical machine data to the cloud.
-
- What could possibly go wrong ...
-
-if MOSQUITTO
-
-config MOSQUITTO_SERVER
- prompt "mosquitto (server)"
- bool
- help
- Install the mosquitto broker (server)
-
-config MOSQUITTO_PASSWD
- prompt "mosquitto_passwd"
- bool
- help
- Install the mosquitto_passwd commandline tool
-
-config MOSQUITTO_PUB
- prompt "mosquitto_pub"
- bool
- help
- Install the mosquitto_pub commandline tool
-
-config MOSQUITTO_SUB
- prompt "mosquitto_sub"
- bool
- help
- Install the mosquitto_sub commandline tool
-
-endif
diff --git a/rules-new/mosquitto.make b/rules-new/mosquitto.make
deleted file mode 100644
index d76afac..0000000
--- a/rules-new/mosquitto.make
+++ /dev/null
@@ -1,75 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2016 by Robert Schwebel <r.schwebel@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-#
-# We provide this package
-#
-PACKAGES-$(PTXCONF_MOSQUITTO) += mosquitto
-
-#
-# Paths and names
-#
-MOSQUITTO_VERSION := 1.4.9
-MOSQUITTO_MD5 := 67943e2c5afebf7329628616eb2c41c5
-MOSQUITTO := mosquitto-$(MOSQUITTO_VERSION)
-MOSQUITTO_SUFFIX := tar.gz
-MOSQUITTO_URL := http://mosquitto.org/files/source/$(MOSQUITTO).$(MOSQUITTO_SUFFIX)
-MOSQUITTO_SOURCE := $(SRCDIR)/$(MOSQUITTO).$(MOSQUITTO_SUFFIX)
-MOSQUITTO_DIR := $(BUILDDIR)/$(MOSQUITTO)
-
-# This is dual licensed under the EPL-1.0 and EDL-1.0, which is a BSD-3-Clause according to
-# http://spdx-legal.spdx.narkive.com/wmb1FKZ8/new-license-request
-MOSQUITTO_LICENSE := EPL-1.0, BSD-3-Clause
-
-# ----------------------------------------------------------------------------
-# Prepare
-# ----------------------------------------------------------------------------
-
-MOSQUITTO_CONF_TOOL := cmake
-MOSQUITTO_CONF_OPT := \
- $(CROSS_CMAKE_USR) \
- -DWITH_TLS:BOOL=ON \
- -DWITH_TLS_PSK:BOOL=OFF \
- -DWITH_EC:BOOL=OFF \
- -DWITH_SOCKS:BOOL=OFF
-
-# ----------------------------------------------------------------------------
-# Target-Install
-# ----------------------------------------------------------------------------
-
-$(STATEDIR)/mosquitto.targetinstall:
- @$(call targetinfo)
-
- @$(call install_init, mosquitto)
- @$(call install_fixup, mosquitto,PRIORITY,optional)
- @$(call install_fixup, mosquitto,SECTION,base)
- @$(call install_fixup, mosquitto,AUTHOR,"Robert Schwebel <r.schwebel@pengutronix.de>")
- @$(call install_fixup, mosquitto,DESCRIPTION,missing)
-
- @$(call install_lib, mosquitto, 0, 0, 0644, libmosquitto)
- #@$(call install_lib, mosquitto, 0, 0, 0644, libmosquittopp)
-
-ifdef PTXCONF_MOSQUITTO_SERVER
- @$(call install_copy, mosquitto, 0, 0, 0755, -, /usr/sbin/mosquitto)
-endif
-ifdef PTXCONF_MOSQUITTO_PASSWD
- @$(call install_copy, mosquitto, 0, 0, 0755, -, /usr/bin/mosquitto_passwd)
-endif
-ifdef PTXCONF_MOSQUITTO_PUB
- @$(call install_copy, mosquitto, 0, 0, 0755, -, /usr/bin/mosquitto_pub)
-endif
-ifdef PTXCONF_MOSQUITTO_SUB
- @$(call install_copy, mosquitto, 0, 0, 0755, -, /usr/bin/mosquitto_sub)
-endif
- @$(call install_finish, mosquitto)
-
- @$(call touch)
-
-# vim: syntax=make