mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: "Florian Bäuerle" <florian.baeuerle@allegion.com>
To: ptxdist@pengutronix.de
Subject: [ptxdist] [PATCH] rauc: make installation of system configuration optional
Date: Wed, 26 Sep 2018 16:56:00 +0200	[thread overview]
Message-ID: <20180926145600.5215-1-florian.baeuerle@allegion.com> (raw)

This allows for installation of the rauc system configuration via an
extra package, which is useful in scenarios involving image packages.

Signed-off-by: Florian Bäuerle <florian.baeuerle@allegion.com>
---
 rules/rauc.in   | 11 +++++++++++
 rules/rauc.make |  3 +++
 2 files changed, 14 insertions(+)

diff --git a/rules/rauc.in b/rules/rauc.in
index b2fea4bf6..190eb0b51 100644
--- a/rules/rauc.in
+++ b/rules/rauc.in
@@ -22,6 +22,15 @@ config RAUC_JSON
 	bool
 	prompt "JSON support"
 
+config RAUC_CONFIGURATION
+	prompt "Install RAUC configuration in /etc/rauc"
+	bool
+	default y
+	help
+	  Install a default RAUC configuration that works for most projects.
+
+if RAUC_CONFIGURATION
+
 config RAUC_COMPATIBLE
 	prompt "RAUC Compatible"
 	string
@@ -41,3 +50,5 @@ config RAUC_BUNDLE_VERSION
 	  Overwrite the bundle version if needed.
 
 endif
+
+endif
diff --git a/rules/rauc.make b/rules/rauc.make
index b45e1f705..6fd3df2ad 100644
--- a/rules/rauc.make
+++ b/rules/rauc.make
@@ -62,11 +62,14 @@ $(STATEDIR)/rauc.targetinstall:
 	@$(call install_fixup, rauc,DESCRIPTION,missing)
 
 	@$(call install_copy, rauc, 0, 0, 0755, -, /usr/bin/rauc)
+
+ifdef PTXCONFIG_RAUC_CONFIGURATION
 	@$(call install_alternative, rauc, 0, 0, 0644, /etc/rauc/system.conf)
 	@$(call install_replace, rauc, /etc/rauc/system.conf, \
 		@RAUC_BUNDLE_COMPATIBLE@, \
 		$(PTXCONF_RAUC_COMPATIBLE))
 	@$(call install_alternative, rauc, 0, 0, 0644, /etc/rauc/ca.cert.pem)
+endif
 
 	@$(call install_copy, rauc, 0, 0, 0644, -, \
 		/usr/share/dbus-1/system-services/de.pengutronix.rauc.service)
-- 
2.19.0


_______________________________________________
ptxdist mailing list
ptxdist@pengutronix.de

                 reply	other threads:[~2018-09-26 14:56 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180926145600.5215-1-florian.baeuerle@allegion.com \
    --to=florian.baeuerle@allegion.com \
    --cc=ptxdist@pengutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox