DistroKit Mailinglist
 help / color / mirror / Atom feed
From: Alexander Dahl <ada@thorsis.com>
To: distrokit@pengutronix.de
Subject: [DistroKit] [PATCH] datapartition: Let systemd install custom udev rule
Date: Fri, 25 Jun 2021 13:15:46 +0200	[thread overview]
Message-ID: <20210625111546.18971-1-ada@thorsis.com> (raw)

If DistroKit is used as a base layer and any upper layer enables
PTXCONF_SYSTEMD_UDEV_CUST_RULES, package installation might fail because
both packages, 'systemd' and 'datapartition' try to targetinstall
'usr/lib/udev/rules.d/91-mkfs-ext4.rules', like this:

    Collected errors:
     * check_data_file_clashes: Package datapartition wants to install file /home/adahl/Work/bsp/xxx/base/platform-v7a/build-target/image-root-tgz/usr/lib/udev/rules.d/91-mkfs-ext4.rules
            But that file is already provided by package  * systemd
     * opkg_solver_install: Cannot install package datapartition.
    make: *** [/usr/local/lib/ptxdist-2021.02.0/rules/image-root-tgz.make:30: /home/adahl/Work/bsp/xxx/base/platform-v7a/images/root.tgz] Error 255

Signed-off-by: Alexander Dahl <ada@thorsis.com>
---
 configs/ptxconfig        | 2 +-
 rules/datapartition.make | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/configs/ptxconfig b/configs/ptxconfig
index c97e321..a4fa7e9 100644
--- a/configs/ptxconfig
+++ b/configs/ptxconfig
@@ -1437,7 +1437,7 @@ PTXCONF_SYSTEMD_ZSTD=y
 #
 PTXCONF_SYSTEMD_UDEV_DRIVERS_RULES=y
 # PTXCONF_SYSTEMD_UDEV_HWDB is not set
-# PTXCONF_SYSTEMD_UDEV_CUST_RULES is not set
+PTXCONF_SYSTEMD_UDEV_CUST_RULES=y
 # end of install options               
 
 #
diff --git a/rules/datapartition.make b/rules/datapartition.make
index b79bcf0..7f3c992 100644
--- a/rules/datapartition.make
+++ b/rules/datapartition.make
@@ -28,8 +28,6 @@ $(STATEDIR)/datapartition.targetinstall:
 
 	@$(call install_alternative, datapartition, 0, 0, 0644, \
 		/usr/lib/systemd/system/systemd-autoformat@.service)
-	@$(call install_alternative, datapartition, 0, 0, 0644, \
-		/usr/lib/udev/rules.d/91-mkfs-ext4.rules)
 
 	@$(call install_finish,datapartition)
 

base-commit: 085bb9b4273c8fd91105d9e149776f144f5fdd65
-- 
2.30.2


_______________________________________________
DistroKit mailing list
DistroKit@pengutronix.de


             reply	other threads:[~2021-06-25 11:16 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-06-25 11:15 Alexander Dahl [this message]
2021-06-25 11:22 ` Michael Olbrich
2021-06-25 11:29   ` Alexander Dahl
2021-06-25 12:03     ` Alexander Dahl

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=20210625111546.18971-1-ada@thorsis.com \
    --to=ada@thorsis.com \
    --cc=distrokit@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