From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Fri, 25 Jun 2021 13:16:07 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lwjod-0003Ua-At for lore@lore.pengutronix.de; Fri, 25 Jun 2021 13:16:07 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1lwjoc-0002mh-Lr; Fri, 25 Jun 2021 13:16:06 +0200 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 1lwjoU-0002m1-PV for distrokit@pengutronix.de; Fri, 25 Jun 2021 13:16:00 +0200 Received: from localhost (localhost [127.0.0.1]) by mail.thorsis.com (Postfix) with ESMTP id 5B76875 for ; Fri, 25 Jun 2021 13:15:56 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at mail.thorsis.com 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 NLDhX76LM6Wo for ; Fri, 25 Jun 2021 13:15:51 +0200 (CEST) Received: by mail.thorsis.com (Postfix, from userid 109) id C22C030D2; Fri, 25 Jun 2021 13:15:49 +0200 (CEST) Received: from adahl by ada.ifak-system.com with local (Exim 4.92) (envelope-from ) id 1lwjoI-0004wp-Ac for distrokit@pengutronix.de; Fri, 25 Jun 2021 13:15:46 +0200 From: Alexander Dahl To: distrokit@pengutronix.de Date: Fri, 25 Jun 2021 13:15:46 +0200 Message-Id: <20210625111546.18971-1-ada@thorsis.com> X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-2.5 required=4.0 tests=AWL,BAYES_00,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.2 Subject: [DistroKit] [PATCH] datapartition: Let systemd install custom udev rule X-BeenThere: distrokit@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: DistroKit Mailinglist List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "DistroKit" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: distrokit-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false 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 --- 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