From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.thorsis.com ([92.198.35.195]) by metis.ext.pengutronix.de with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1hw3y9-0008TM-TS for ptxdist@pengutronix.de; Fri, 09 Aug 2019 14:26:06 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id 35B6DF62 for ; Fri, 9 Aug 2019 14:26:37 +0200 (CEST) Received: from mail.thorsis.com ([127.0.0.1]) by localhost (mail.thorsis.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RSUyFByKEEdQ for ; Fri, 9 Aug 2019 14:26:33 +0200 (CEST) Received: from adahl by ada.ifak-system.com with local (Exim 4.89) (envelope-from ) id 1hw3y2-0004yI-4y for ptxdist@pengutronix.de; Fri, 09 Aug 2019 14:25:58 +0200 From: Alexander Dahl Date: Fri, 9 Aug 2019 14:25:56 +0200 Message-Id: <20190809122558.19065-3-ada@thorsis.com> In-Reply-To: <20190809122558.19065-1-ada@thorsis.com> References: <20190809122558.19065-1-ada@thorsis.com> Subject: [ptxdist] [PATCH v2 2/4] mosquitto: Install default config file List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ptxdist-bounces@pengutronix.de Sender: "ptxdist" To: ptxdist@pengutronix.de The broker service should run with a config file, but we can't use the example installed with the default install stage with 'install_alternative' in targetinstall stage (wrong place), so we install it a second time to a place better suitable. Signed-off-by: Alexander Dahl --- rules/mosquitto.make | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/rules/mosquitto.make b/rules/mosquitto.make index 6d3002a82..63cd2dca5 100644 --- a/rules/mosquitto.make +++ b/rules/mosquitto.make @@ -54,6 +54,16 @@ MOSQUITTO_INSTALL_OPT := \ $(MOSQUITTO_MAKE_OPT) \ install +# ---------------------------------------------------------------------------- +# Install +# ---------------------------------------------------------------------------- +$(STATEDIR)/mosquitto.install: + @$(call targetinfo) + @$(call world/install, MOSQUITTO) + @install -v -D -m644 $(MOSQUITTO_DIR)/mosquitto.conf \ + $(MOSQUITTO_PKGDIR)/etc/mosquitto/mosquitto.conf + @$(call touch) + # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -77,6 +87,8 @@ endif ifdef PTXCONF_MOSQUITTO_BROKER @$(call install_copy, mosquitto, 0, 0, 0755, -, /usr/sbin/mosquitto) + @$(call install_alternative, mosquitto, 0, 0, 0644, \ + /etc/mosquitto/mosquitto.conf) endif @$(call install_finish, mosquitto) -- 2.20.1 _______________________________________________ ptxdist mailing list ptxdist@pengutronix.de