From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Mon, 27 Jun 2022 14:07:56 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) 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 1o5nWy-00GMV9-IB for lore@lore.pengutronix.de; Mon, 27 Jun 2022 14:07:56 +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 1o5nX1-0005Oa-BQ; Mon, 27 Jun 2022 14:07:55 +0200 Received: from mx-relay63-hz1.antispameurope.com ([94.100.132.232]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1o5nWI-0005O6-CM for ptxdist@pengutronix.de; Mon, 27 Jun 2022 14:07:10 +0200 Received: from smtp.eckelmann.de ([217.19.183.80]) by mx-relay63-hz1.antispameurope.com; Mon, 27 Jun 2022 14:07:09 +0200 Received: from EX-SRV2.eckelmann.group (2a00:1f08:4007:e030:172:18:30:61) by EX-SRV2.eckelmann.group (2a00:1f08:4007:e030:172:18:30:61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9; Mon, 27 Jun 2022 14:06:58 +0200 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (2a00:1f08:4007:e035:172:18:35:1a) by smtp.eckelmann.de (2a00:1f08:4007:e035:172:18:35:5) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2507.9 via Frontend Transport; Mon, 27 Jun 2022 14:06:58 +0200 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=kfs8J9Dc9JXfpzMgWmjQqFGz02LRXuDZT/uDlyM4k+ER4+mxtzJ+LYdtsEuimL+RwCRmcWiFK+Xi7gjA7DFnTDD9kh/6XylX7ylKQ2LZeSJhEKeYGPaNK+vH2tNjPAHsB8JkI3AnZC+/oZStdrk0BR6zmcu/E5sNfNsj8uYw3StXXINh2rqCVGsAwGBHC+4ZmsBAUjhw+IqRYsb8LbDqMbqwzC4lXS7iCIfcT6WaGp+On6Npdy8w7Z7Z7K1iz6rY6GhJRRao7Zq3wr7alUhXmzinhHE/YV0sYQyNtfpJaY+nx7+Fv4yRKWYcARma0aAnT4hajr7ZkTe2x8SCOOi/DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=DL5oc56aIu0dH5eVwBjHM80AW1Ie1i4vI1dy2O8n7zI=; b=IyrkR9u8FGPK35x0Lxaf7zmtWDO6mbtjEzHOJKqZE/9tPbgCjFDgTiXN6skYTIlR1BlavwrJFFHpvEDH1/ys8uZMB0eV0mrVvIaMFsjzNfvzklxQTPYgY+7zZH4+v2ydhrqnyp4HL5+6wh/JTP9jBICruk6/Udi+lXjSZcIoIHKtTtHRFqRlmKGOzMYsM6gpfL5EbNr/dY4e+tXwMLNqFLBGEdu/I2FamqsgF9Hm/cblUCXGV1jGxtvCMYphnX8fQu6EP6QofTwuAA6XhupRh/wwdORNyG9VHN2rJ9u3foqJpx6tnjWhkohlZyfIlfMeKPgNIbD2+Y2PwN/Ccmc9uw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=eckelmann.de; dmarc=pass action=none header.from=eckelmann.de; dkim=pass header.d=eckelmann.de; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eckelmannde.onmicrosoft.com; s=selector1-eckelmannde-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=DL5oc56aIu0dH5eVwBjHM80AW1Ie1i4vI1dy2O8n7zI=; b=M21fbA1GgBi9ODnTAMzRms0lQD0sO5mnHsZnKc9y8nBG4q3UtXxOS15qourpT9YPYUHlWNurf7fN1osvLkwXkrL5cUCkMjFKwPbXvep2wjtoPtxWxaHWu387OjUJhs1fLvOkyZ4gu73pG4aglr5mU/zHDhgJm3+GMpANiWaSboc= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=eckelmann.de; Received: from AM9P189MB1700.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:2fc::15) by DU2P189MB1781.EURP189.PROD.OUTLOOK.COM (2603:10a6:10:2d0::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5373.17; Mon, 27 Jun 2022 12:06:43 +0000 Received: from AM9P189MB1700.EURP189.PROD.OUTLOOK.COM ([fe80::f860:60e9:ac77:71ee]) by AM9P189MB1700.EURP189.PROD.OUTLOOK.COM ([fe80::f860:60e9:ac77:71ee%5]) with mapi id 15.20.5373.018; Mon, 27 Jun 2022 12:06:43 +0000 From: Thorsten Scherer To: Date: Mon, 27 Jun 2022 14:06:29 +0200 Message-Id: <20220627120629.32925-1-t.scherer@eckelmann.de> X-Mailer: git-send-email 2.30.2 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-ClientProxiedBy: AS8PR04CA0024.eurprd04.prod.outlook.com (2603:10a6:20b:310::29) To AM9P189MB1700.EURP189.PROD.OUTLOOK.COM (2603:10a6:20b:2fc::15) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 44c1fbfe-4c53-4e35-7f36-08da58357fe5 X-MS-TrafficTypeDiagnostic: DU2P189MB1781:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mLZ1y8lMP0RtMXXqWJ+kXsIrN8fDksgEkZFMnHEHMPVF8QUo7iA1JWehjNrvcEAKbhVuhLLxxt/tzJ/oN8xr2wbzQdFxshev+IqdFtyGOaakH7zwPGQF03O6vt80i9oee18qw1ZyW2iN39KAvd13CpqMmZg+VhMx8rHBv6FMDXz3ubqKfB0nSOWS3n+WytLQ4oZ5hgWvN1BAinbv4MJPu3bvFhxdUUVm29PprxW5xK21o88McTPHs+8NyUq+v/Zzoj6PfA1edlzKDOhKmSthDBjFoj5GB4Ql6uSNQN026ZjA6gnhXOjMKzzJLGwdvNaKb+88wt2uJ1y2mIhN8gjHyUvYbxlExWzRoaSk0iJgmIwZUrrBx3nIj9OasQPUcPyeRNnOnVeqiSbwXKyFF0fcsPa/e7rQkTbEgsmQUJppjiLlE0ven8mY2DziTf2xogzDanjulCzj4F+qhPErUF+QINJ3ckgayuLv/lfrEzoqwXZBm/0G2eTIgQ2evE81dVtgdA9ITYhooUv20K4u4FM9yQ9OaTdX74THUt6G7CKNNlOfQwgdFKTwP5cAyWNLSfqCv6ll7xZFuW7PyG8tq5kA/keuduXmbJOtiA2DiEIjeu+1fRVVlKTO8NFZuwJtn4IryfzMtqgx5ckrBkCuJPjy5l5jx3zx1hRbeq6Nz4RwQS2d9+eeODc0cK/CCDnVaBjVJGZ8Pd1kT5DOh6lqtSuw71sW9+oXezSkFoI7zaWuYOUUZICpVi8WWJcQjsnUrqlqjZo8QfXOWsXIT3pvuGISzPCRzRuLRhuMJTNQENSPQns= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM9P189MB1700.EURP189.PROD.OUTLOOK.COM; PTR:; CAT:NONE; SFS:(13230016)(4636009)(39840400004)(346002)(366004)(396003)(136003)(376002)(2616005)(66946007)(8936002)(8676002)(1076003)(4326008)(66556008)(36756003)(107886003)(6916009)(86362001)(450100002)(316002)(26005)(6506007)(6666004)(41300700001)(38100700002)(38350700002)(6512007)(66476007)(52116002)(6486002)(478600001)(83380400001)(186003)(2906002)(5660300002); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?/dxNUibiIvDT/VIgaZTyndmihQSXmCHn7YvXVR1y46HYKNYENrGjLolAnEgZ?= =?us-ascii?Q?fzNnez6nDSVPbbQxAJ5+/STvSzJ8EUrNkB5C1uG/dKyyqq6/pJI6ZlJ3djet?= =?us-ascii?Q?VonbZsuq56UkDczYkq5nFYpQFza6rpBkuJfvlVLKEDZHx44lZDm4RtIgBQAy?= =?us-ascii?Q?ZmGxAj2fz6c+9LSybNoB9nK8Vy89aLJ49+kNGos3WC0POjvfAp61nOk7PYGd?= =?us-ascii?Q?+3sGURN9Bz8NYZlNRrkLDS9BrvUCdm2dFNcxEg50e5ztOQk/NO4ycKNPPTd8?= =?us-ascii?Q?+aUnPrHp1AaI1UltvPMsLbOe2Kjd73KtYZisklpOo5aV77T9zH4Fj8parPtz?= =?us-ascii?Q?6/CJ2Z3dbjJSR+jIyG/Xkl7GVSqdfChGm9nx17IteUbiqnUDDdOQ6QaZZDZ5?= =?us-ascii?Q?HWkteL30tr5W7PO3cBC06YHHtipeprOusMfhVieUwxbbsHW4iSAOfbuyZmWg?= =?us-ascii?Q?eLWXXCIwTeY7ll76x8teepiQbh9X+Z9tGt/cEpiagpOWfp+L7jZ0CsfJTbgK?= =?us-ascii?Q?KpCcixtWR3FIOLVwTRdF7ytEqxUzlBEUj1Nf73/DaHo3O+GdejnjG7e1cZNr?= =?us-ascii?Q?Y72glk/JrQHE/n7rR11XKM+4VS7C5BrVUb3LKWovpAk8yEw65ASFIgsbrPhQ?= =?us-ascii?Q?zrI1gVigdiRY0GxM80tRE92XiVDaK6ph9VE90c4xkbtQq+g2z62sv12+EL++?= =?us-ascii?Q?PJTN0VNJ57sV19odvcz5eZaip1qh4XnfluC5RhRKyhkLX2yCejakEGL8vsN8?= =?us-ascii?Q?gebDtlL/QjWbca9Jcffw1UjUyDOOAnOxfW1hJC0Z0DgA9yt0Yr1k/I1vZyHG?= =?us-ascii?Q?Ywu91YcgMGaOy02TpYi4Z8tdOosmSOgHv7cetmSGmsYdl47aGIyTLp7CmfdV?= =?us-ascii?Q?UIMYF/eJ8tiLxxhWHsgjujAP9IWutJG4XdjGG1IA5VbOSLrhwpq/ZM2+PHVN?= =?us-ascii?Q?GBOwdUh4o5l0eAJcMRq6Rfp8ShFPDxAui9i/upajevhlZTJ82/JaoEDYyzGT?= =?us-ascii?Q?Iz0L5MtBOnqlW4tGATg62Nu0UIa+0lzYcSjayexWR88tnXinxHPBmKn0Bgqq?= =?us-ascii?Q?iSNIsktrvIimoAPezFpeDwsJgMJcqP6WB+PTDxQMKZSnd6NnN4S6zxOb2n4n?= =?us-ascii?Q?tDxP+A7pdW1gexbp0TKNJGmQe84yBKzXjIXItWG+Af7yE+asV0EYejizry3q?= =?us-ascii?Q?qF9Mi0VMzjZoSZdIYdArDUAUQKQf4he+6AhX8/If/8+mae9HIXLD9lFDTaF0?= =?us-ascii?Q?z7yFLliuDj4flAvRjeD8GXDxiefgeVSoDvNpIiyt9rmdDY6bkGx4yUR6oVo2?= =?us-ascii?Q?alsP6Ttzr2x/5mwdRp3VGPsRTIismu7zGVJ53m7Lf1Qiq5SazQKCawJYpoEj?= =?us-ascii?Q?LFqyoWZijEk30aDrZZqpggoYN1pGT+/BdZokABgRZU7JEblnX/2R03flBhyW?= =?us-ascii?Q?pM9K70uGBNbVoXRsuO84cGtqdKfojH4pzzvEf4wjmdtafISHzMV3EmO0bAKj?= =?us-ascii?Q?EnxIo1tqoET5kKc45dYen5tGwsH+lE5n0THfJkAITmstLQNmckD9WLYZdfj0?= =?us-ascii?Q?EnRtAMGJf+n0YxHXUVE4KPya7pboJR8Upyhm5R5RD6l82l9A8qLZv+zCYTOS?= =?us-ascii?Q?CA=3D=3D?= X-MS-Exchange-CrossTenant-Network-Message-Id: 44c1fbfe-4c53-4e35-7f36-08da58357fe5 X-MS-Exchange-CrossTenant-AuthSource: AM9P189MB1700.EURP189.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Jun 2022 12:06:42.9697 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 62e24f58-823c-4d73-8ff2-db0a5f20156c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: dL6a5vL9uMRlrK07R+UDEAaszVhxj2+S/vYt9iDbtecvvV+uFpbb/EDr0hDXzHeOw2jt5NaE7K4AKN4ytqcPTQ== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DU2P189MB1781 X-cloud-security-sender: t.scherer@eckelmann.de X-cloud-security-recipient: ptxdist@pengutronix.de X-cloud-security-Virusscan: CLEAN X-cloud-security-disclaimer: This E-Mail was scanned by E-Mailservice on mx-relay63-hz1.antispameurope.com with C5F131307CCA X-cloud-security-connect: smtp.eckelmann.de[217.19.183.80], TLS=1, IP=217.19.183.80 X-cloud-security-Digest: 30ef1a0ee1d1a4b6ad1f1b88018850e9 X-cloud-security: scantime:2.122 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=eckelmann.de; h=from:to :cc:subject:date:message-id:content-transfer-encoding :content-type:mime-version; s=hse1; bh=FWwPinPMDduuoHPYZqDKnBJPX hHbjJgXBJIe1Hh2RJ8=; b=BPWF54DbAxf/0Jpvqk7krktu5l4utwdCs9btBjLSY 4vqEc5qpuYa9yKKjzJ3tJ9lTGeG/cMGv5N8Enw5s/X7bZbTtk9M7UBA4Ds5X7MAe Ajnqi886D310XRP2ou+DAVIlMHR4T0kzaJBrp1KUUO2iXP+VS3q/jUKa67/EGXkW R2Tp5X30FsBAt7kj1wcw5drlQAbwa2QN+OzBJcghnea1OAm4/9AgeSLNpwhSUOmV BWtmbUDQEVcZJoRwF0KBX4LuF03Q5KdXGFrZ3qvOMuYs7lABEJkUNEN2IB+3AKN1 HpRUsx8WBAGKt3Up/lZIsukdARz70C+iFopzC5LxdCDBQ== X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on metis.ext.pengutronix.de X-Spam-Level: X-Spam-Status: No, score=-103.1 required=4.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,USER_IN_WELCOMELIST,USER_IN_WHITELIST autolearn=ham autolearn_force=no version=3.4.2 Subject: [ptxdist] [PATCH] tpm2-tss: Fix conflict with SYSTEMD_UDEV_CUST_RULES 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: Thorsten Scherer , mkl@pengutronix.de 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.ext.pengutronix.de); SAEximRunCond expanded to false The target root.tgz fails with: * check_data_file_clashes: Package systemd wants to install file /platform-/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 --- 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