mailarchive of the ptxdist mailing list
 help / color / mirror / Atom feed
From: Thorsten Scherer <t.scherer@eckelmann.de>
To: <ptxdist@pengutronix.de>
Cc: Thorsten Scherer <t.scherer@eckelmann.de>, mkl@pengutronix.de
Subject: [ptxdist] [PATCH] tpm2-tss: Fix conflict with SYSTEMD_UDEV_CUST_RULES
Date: Mon, 27 Jun 2022 14:06:29 +0200	[thread overview]
Message-ID: <20220627120629.32925-1-t.scherer@eckelmann.de> (raw)

The target root.tgz fails with:

 * check_data_file_clashes: Package systemd wants to install file
   <BSP-PATH>/platform-<XYZ>/build-target/image-root-tgz/usr/lib/udev/rules.d/70-tpm-udev.rules
        But that file is already provided by package  * tpm2-tss

Add a check to avoid conflicts.

Signed-off-by: Thorsten Scherer <t.scherer@eckelmann.de>
---
 rules/tpm2-tss.in   | 12 ++++++++++++
 rules/tpm2-tss.make |  2 ++
 2 files changed, 14 insertions(+)

diff --git a/rules/tpm2-tss.in b/rules/tpm2-tss.in
index 75d32188c..8eeb4b5c7 100644
--- a/rules/tpm2-tss.in
+++ b/rules/tpm2-tss.in
@@ -22,3 +22,15 @@ config TPM2_TSS
 	  This package contains the TSS and TCTI libraries that client
 	  applications will link against when they require accessing
 	  the TPM.
+
+if TPM2_TSS
+
+comment "tpm2-tss install udev rules conflicts SYSTEMD_UDEV_CUST_RULES"
+	depends on SYSTEMD_UDEV_CUST_RULES
+
+config TPM2_TSS_INSTALL_UDEV_RULES
+	bool
+	prompt "tpm2-tss install udev rules"
+	depends on !SYSTEMD_UDEV_CUST_RULES
+
+endif
diff --git a/rules/tpm2-tss.make b/rules/tpm2-tss.make
index 7e0b4ff52..8c948a57a 100644
--- a/rules/tpm2-tss.make
+++ b/rules/tpm2-tss.make
@@ -92,8 +92,10 @@ $(STATEDIR)/tpm2-tss.targetinstall:
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-tctildr)
 	@$(call install_lib, tpm2-tss, 0, 0, 0644, libtss2-rc)
 
+ifdef TPM2_TSS_INSTALL_UDEV_RULES
 	@$(call install_alternative, tpm2-tss, 0, 0, 0644, \
 		/usr/lib/udev/rules.d/70-tpm-udev.rules)
+endif
 
 	@$(call install_finish, tpm2-tss)
 
-- 
2.30.2




             reply	other threads:[~2022-06-27 12:07 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-06-27 12:06 Thorsten Scherer [this message]
2022-07-01  5:38 ` Michael Olbrich

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=20220627120629.32925-1-t.scherer@eckelmann.de \
    --to=t.scherer@eckelmann.de \
    --cc=mkl@pengutronix.de \
    --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