From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 12 Oct 2023 17:21:15 +0200 Received: from metis.whiteo.stw.pengutronix.de ([2a0a:edc0:2:b01:1d::104]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1qqxUy-005uNv-1n for lore@lore.pengutronix.de; Thu, 12 Oct 2023 17:21:15 +0200 Received: from localhost ([127.0.0.1] helo=metis.whiteo.stw.pengutronix.de) by metis.whiteo.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1qqxUw-00036O-Qa; Thu, 12 Oct 2023 17:21:14 +0200 Received: from mail.ela-soft.com ([213.23.49.162]) by metis.whiteo.stw.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qqxUY-00036F-Lp for ptxdist@pengutronix.de; Thu, 12 Oct 2023 17:20:53 +0200 Received: from tupai.ela-bln.local (tupai.ela-bln.local [10.0.1.140]) by mail.ela-soft.com (mailsystem) with ESMTP id 8657012CEB; Thu, 12 Oct 2023 17:20:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ela-soft.com; s=2021; t=1697124049; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=nR/WWY2d4Dog+AwEq+yLrJNmzEXhW7MSYANKQzAw5AY=; b=MB/GkzEqFAil7mrbHUKhQgn01d8kNz7WzdoSTXh9ojM7bzSoWo477NxofX9Zjr759r16Re y0o2PI0bBV4BYyBcZ+RVjnA7ZUZXlNi/za5mQg8Nwm0g4r6JcGWkLWVCxuz82wKw2ef9eY RCe1GGkkoX2e49vnoap+25MoxAObCRJFDGY9V4Bmuj9Q0U8zjkZ4omRYZ85xYzdlutvdAb jzoTjjj3oPEJg2JfxcppxSgEBcEWrIYQV+zqi3avQHhMNK5lFuZwCMjaDKCy1a4yuyMlDc r8QTqQpWGHiz6yspw2pEIJFH6qGmnyYuC1qCsoHlOL23jq7mlSKurD38Vr1XbQ== Received: by tupai.ela-bln.local (Postfix, from userid 1000) id 7BFC73400CB; Thu, 12 Oct 2023 17:20:49 +0200 (CEST) From: Andreas Helmcke To: ptxdist@pengutronix.de Date: Thu, 12 Oct 2023 17:20:39 +0200 Message-Id: <20231012152039.85251-1-ahelmcke@ela-soft.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.whiteo.stw.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-102.2 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] rauc: install service startscripts only when needed X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Cc: Andreas Helmcke Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.whiteo.stw.pengutronix.de); SAEximRunCond expanded to false rauc service is only needed with D-bus, so do not install startup scripts if PTXCONF_RAUC_SERVICE is unset Signed-off-by: Andreas Helmcke --- rules/rauc.make | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/rules/rauc.make b/rules/rauc.make index 0f71f12ed..f2bbcbe05 100644 --- a/rules/rauc.make +++ b/rules/rauc.make @@ -85,19 +85,20 @@ ifdef PTXCONF_RAUC_SERVICE /usr/share/dbus-1/system-services/de.pengutronix.rauc.service) @$(call install_copy, rauc, 0, 0, 0644, -, \ /usr/share/dbus-1/system.d/de.pengutronix.rauc.conf) -endif -ifdef PTXCONF_INITMETHOD_SYSTEMD - @$(call install_alternative, rauc, 0, 0, 0644, \ - /usr/lib/systemd/system/rauc.service) - - @$(call install_alternative, rauc, 0, 0, 0644, \ - /usr/lib/systemd/system/rauc-mark-good.service) - @$(call install_link, rauc, ../rauc-mark-good.service, \ - /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service) -else - @$(call install_copy, rauc, 0, 0, 0755, -, \ - /usr/libexec/rauc-service.sh) + ifdef PTXCONF_INITMETHOD_SYSTEMD + @$(call install_alternative, rauc, 0, 0, 0644, \ + /usr/lib/systemd/system/rauc.service) + + @$(call install_alternative, rauc, 0, 0, 0644, \ + /usr/lib/systemd/system/rauc-mark-good.service) + @$(call install_link, rauc, ../rauc-mark-good.service, \ + /usr/lib/systemd/system/multi-user.target.wants/rauc-mark-good.service) + else + @$(call install_copy, rauc, 0, 0, 0755, -, \ + /usr/libexec/rauc-service.sh) + endif + endif @$(call install_finish, rauc) -- 2.39.2