From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6989662799834120192 X-Received: by 2002:a05:6808:14d2:: with SMTP id f18mr17424957oiw.2.1627464904758; Wed, 28 Jul 2021 02:35:04 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a9d:352:: with SMTP id 76ls440742otv.0.gmail; Wed, 28 Jul 2021 02:35:04 -0700 (PDT) X-Received: by 2002:a9d:6344:: with SMTP id y4mr18719387otk.145.1627464904479; Wed, 28 Jul 2021 02:35:04 -0700 (PDT) Received: by 2002:aca:dc8a:0:b029:25a:47c7:7cd9 with SMTP id 5614622812f47-25cbb469607msb6e; Tue, 27 Jul 2021 06:54:14 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzdVmoC8rw1QHHjWpEYWd8YODJcUZu7rzlQUPTVu7gttA1L7K24FuioF/mpYc1ZyAm1OkK9 X-Received: by 2002:a05:6830:128b:: with SMTP id z11mr16038279otp.124.1627394054109; Tue, 27 Jul 2021 06:54:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1627394054; cv=pass; d=google.com; s=arc-20160816; b=q2MVMiROpAH/J+VK+9HxSDiYESfYOaUJRN9JZve5LDCDXW1RjvO/R/By5BInPm0Tpw aqm3A7cnfpNZX0yGkJeU1bwoE/3easT/2uYg7RBxIswlkHTjCc+F9oBYVPn2blgrFcVc HQZ8crfRh4wu30nVbo3NtsHKk0Tkz/rW6NMZr0007oJOuxlZV9DcF50xrLgD6Bx4HSwy awMf012hGgT20zWdT4eCajtLhL4q9Ehk6pWw/FysVLXt7wDZjnTw4vUf003ADpXoai84 E8t59fs6hC5SidjVVa9Vxx7NP5ViwbV3Q0au2O0hFUcepwPpowZq0arAvJKbetLJ2hOI 1vyw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:document_confidentiality:msip_labels:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :cc:to:from:dkim-signature; bh=ep62zUenw00jiV1u2q2dYSUcwyZyL6YFp1LSJPST9E8=; b=mnGNpc+X6mVhRzgipFHRUR0uxCVyk0yF5AZ4YSVd9/1hDaiI7h0O2HjA0BrO8RmdYD yEtan66yUXfDaalDJ+yLkfNE3HIYMLeKn3F5ALB63haX8F1jav8H6oqhskmS6whra2Ve r6UZa1XkbYq2nabn9fyN9MOWCe06s1v3/gfmy7NZmLugyuTgGlfAHNiQjXv7ZsByXEVL +Auk+9fylQ3/rD1IUvg3/PLElOJ8RkKUGKqrv6ovIQ//JRE+/oUUAIFKZdjNKCQQAvtx ntO/K+Mtt9TWm5SgDHFwy8YCRet7xU+ZFGK4GQOAoSBQNHW1PYMqUjeFUea7rcBYFmI6 p+cA== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=LSx1eacu; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of schilling.benjamin@siemens.com designates 40.107.22.52 as permitted sender) smtp.mailfrom=schilling.benjamin@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2052.outbound.protection.outlook.com. [40.107.22.52]) by gmr-mx.google.com with ESMTPS id m22si314862oie.5.2021.07.27.06.54.13 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 27 Jul 2021 06:54:14 -0700 (PDT) Received-SPF: pass (google.com: domain of schilling.benjamin@siemens.com designates 40.107.22.52 as permitted sender) client-ip=40.107.22.52; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector1-siemens-onmicrosoft-com header.b=LSx1eacu; arc=pass (i=1 spf=pass spfdomain=siemens.com dkim=pass dkdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of schilling.benjamin@siemens.com designates 40.107.22.52 as permitted sender) smtp.mailfrom=schilling.benjamin@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=hY5xzcadR4wV/EZKKrgy3qYf6Xn0TYGtbBBJi1HwEbgJ23K4kB3tEc0J4QgIdbjhpJzMSxa9HBcP9JZHVQ4IjCzAWvkU4F+xcbEgC7atz+G96kZLgjaBapCjBPzkK/JDdtZo+S987J7QnCIzuAl/a/PbMRxjSIG1yyZjqJz7F8ERpMfsECcrXMfvIM8pIYZrzYJvWQwhJ4XQ+hLxrr0tYx9f8kMbjpg7TbkIv+U18zjq674ywIM3KiEIgsQv9eQr14RaiwKxchnUbcHoxMOd/DLIjpfv0wQzUbn7GxmTQo/NtRO4+LzKJs0X+Ur9iLyaCtkYOJ8dy87EUXeyeVnsLA== 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-SenderADCheck; bh=ep62zUenw00jiV1u2q2dYSUcwyZyL6YFp1LSJPST9E8=; b=iagDoCSg7C/+K3KGl2LZwck7Tv/XpEwCKvjN3W649tissagElJYEMotunq5lwisbgInATvu1w48xaZwLGMIGF8NaWSXIQNgB0gcC9UU8wveBUeuiSxmB7veooCC1khsQP5NBPRhpZSf1qsLlZ/Os9MctJlxv+RdNA8STkFkzlhgi0jeYfMbsignMkeaU01fFZTRTjl+peGc90STDvZRHxFCcMtBaKrDfxS/DQl2nI4BiGRP0uQy98N6S6GBnhiPpBUKSeYJK/22a+p0lRM5/0NjvSuGH6u9J8b3ArKrH2j1XRR2+U9tGd/RADHYMiSUz5Gq5Xmrs5T3gGXv/q+csvA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=siemens.com; dmarc=pass action=none header.from=siemens.com; dkim=pass header.d=siemens.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=siemens.onmicrosoft.com; s=selector1-siemens-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ep62zUenw00jiV1u2q2dYSUcwyZyL6YFp1LSJPST9E8=; b=LSx1eacuG8w7tb5602ZZY5MQzZ9c886dZoZQTzoPCwxfG9S13GXA6kcM4w/hZDI675/Wdu54PjbcF4J9p1abhnc+L0MHp5R+IMvFYPXIezXg7DUnRASHcGaZZ764kWzjIPH9pSLd/WHNj4VjA4bba/i0Ng7ZZ05wZcNzQTcliTM= Received: from AM9PR10MB4824.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:413::23) by AM9PR10MB4198.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:1ce::24) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4287.28; Tue, 27 Jul 2021 13:54:12 +0000 Received: from AM9PR10MB4824.EURPRD10.PROD.OUTLOOK.COM ([fe80::983:7c60:4bef:39ac]) by AM9PR10MB4824.EURPRD10.PROD.OUTLOOK.COM ([fe80::983:7c60:4bef:39ac%9]) with mapi id 15.20.4352.031; Tue, 27 Jul 2021 13:54:12 +0000 From: "Schilling, Benjamin" To: "isar-users@googlegroups.com" CC: "henning.schild@siemens.com" Subject: [PATCH] meta: Add Debian package conflicts in debianize class Thread-Topic: [PATCH] meta: Add Debian package conflicts in debianize class Thread-Index: AdeC7nUKZ+82fr9+TyyP3iIvA+5G7A== Date: Tue, 27 Jul 2021 13:54:12 +0000 Message-ID: Accept-Language: de-DE, en-US Content-Language: de-DE X-MS-Has-Attach: X-MS-TNEF-Correlator: msip_labels: MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_Enabled=true; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_SetDate=2021-07-27T13:54:10Z; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_Method=Standard; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_Name=restricted-default; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_SiteId=38ae3bcd-9579-4fd4-adda-b42e1495d55a; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_ActionId=72bbe610-03b6-422a-8452-c8322e09bc32; MSIP_Label_a59b6cd5-d141-4a33-8bf1-0ca04484304f_ContentBits=0 document_confidentiality: Restricted authentication-results: googlegroups.com; dkim=none (message not signed) header.d=none;googlegroups.com; dmarc=none action=none header.from=siemens.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: d824f676-9dbd-48b4-e58e-08d9510603bf x-ms-traffictypediagnostic: AM9PR10MB4198: x-ld-processed: 38ae3bcd-9579-4fd4-adda-b42e1495d55a,ExtAddr x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:7219; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: wah08kL8t7BhU8SU3BIuEBQ6qflUTof7jvkP1m5ug+qyd7xe/NtDU5nzFv9CsoAH4hIyNqraBU+FEWraU7YO9/U/+NISiRSrH/0S/pfikk1Hx9H/TlaFf8biutQ/aTzu1ofIYYlYyWgF8Xhz6jgu2lWUjSoHtwuPfPkHxq1sejW/8IhxD+/ILx1v0kvziaavB5WimsMgttb1YAF0v8WVn+W3cPWoWyzYqCk1oXbDI51qoRIrsnoXCS//01jM09NyGG4RnS7VV6kexyGUbJYJfXo6jZxM+hoHv70GNurxzoCMA0wpxAu+PRSXJ52XWz8sKzAOQRv3VaG1eTk+sSV9wggVmIUQndgMu5Hz0q8KnKAYZtU7LxvdSYw8iOCw7MZKpGj2kwRp6xWWVH+z0lZXz50N322OcOMDAv2zs8x84V4najmZiXxBi7D/w2/PtQzeAzljyLd8poABL2hT+O5cXIA5l108Pu9g7ypWxwbT6aIiwyyFfjjH8fwNIFAIV6dHYFXqMxfdmipQDnudVWl0JXeyqZXYlhxjTDhQEQkakWYxzTZ05RP5sxg3Po5xYXt4XhSn4ou8YsLaxLkltFhYb4bFQg+hpgVmZm+1Te3OfLMG6yXgr+P/tmIsIZB1A1qrAL5j5S56t8MKsZOoJ523q3lmX2ScyzQQzyjIw7l2VLUNJd3dPTCNZZHqkxhEF70Cef75pdi1hBwxfsxSaAT3wg== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AM9PR10MB4824.EURPRD10.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(4636009)(136003)(346002)(376002)(366004)(39860400002)(396003)(38100700002)(4326008)(64756008)(186003)(316002)(122000001)(9686003)(478600001)(26005)(2906002)(86362001)(8936002)(55016002)(7696005)(107886003)(76116006)(8676002)(66446008)(66946007)(6916009)(6506007)(5660300002)(71200400001)(66556008)(33656002)(52536014)(66476007)(38070700004);DIR:OUT;SFP:1101; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?FqmYH197GA4ol0iBjGGfKuqBEg0GMY2am73yRrUJMNqv9zCeI8B4KS/vm4rl?= =?us-ascii?Q?WiSPApTDDDfTgKgjldooSZ+W/PptKyUa0yb1IL9EgRmqNfzG7EVKQqX/LA/3?= =?us-ascii?Q?NC3VJxS4ZxxNwc9iitBLoZWaEft3KTLzeICz+DMNFMSXciWIJQWrWOPv31GH?= =?us-ascii?Q?lbwnoQ4VhyfVfMOUD7FwZmKNfuUDIbQC+W+OFAo7+jH98GN2gHd8jbfrSjdy?= =?us-ascii?Q?g54C/3eegZBTT2EOQDybJL/eIL0tPeNwBdOkkaVqYJbZGvii0m5G1WfiRj0w?= =?us-ascii?Q?KBIj1JPLv+auC86EyCNdl4ICgrIEb18wGZvAlatH8ftylaBUpcviwvg4jeih?= =?us-ascii?Q?m9ciCgnXZAw/6JHZN8FZv1kNkKGHErWPeVXWOlRaLOvXT5wC2+9F33tWJYca?= =?us-ascii?Q?jdiUAyG48uLnykXoCETdUWQVSOGvH14SNl5rmF6pGemyN0XMc+L4YMQzLv3I?= =?us-ascii?Q?7uhw2UtcYNrefmAwOjaDQUxOyDpodhQvb0fvbPoY4wKmWJjx4piYOLza6tEU?= =?us-ascii?Q?+uz3foISI47KCUIQ4rSCcYGQwcDcNjmzqHHHRG+MTWlhoWS/NsMijaStp0tV?= =?us-ascii?Q?m1gCQbCDZgjCQEuUObVe8z2JPZUK+ni2M7hZeFxFuua0yURQ6cSuvvZo4Bf3?= =?us-ascii?Q?To9zlumQTbihBS8BqxECrp/878KcZEB/qR8BPbAcgzykxkS4ziURzAegSXAG?= =?us-ascii?Q?FGKr6toTHbvFBlFz61aLiJr0y2IDOB23L9TsVAusnJHP+PcLQ1rtjWC9Vz4h?= =?us-ascii?Q?cjS3ztAsjxsUWQtVtdY6MRFNEZTPS+MCsV/4Sz1bxLsKYuspTp52CKKU7Fhp?= =?us-ascii?Q?grW6nJ6+tWS214QCqkRh602/CLX5H9FmEVe7w3XxWzkgtE5rc8ftx3TLxt2s?= =?us-ascii?Q?4kEtjsL8GKJBbW9SDOuTWHu9tZXGDkdpNx1xCfUeILgHwixrunP2zrv6f1MJ?= =?us-ascii?Q?rwxhRTNg21ceP3VE98S2Ii1CqgAcOMabhabKsy7qKkvs3GcxfV/16KBhRg1m?= =?us-ascii?Q?4M3i1csLGcr3hIKUWpX8R8FUQ4OUdke0g1JvCwbic7/6s1e/WOE90hx0P832?= =?us-ascii?Q?5ehDzRFSvoCNHNQiq0kh8AdI7/MtMiVhWrenIF9VOSQW4NqvkkIoreWckqGC?= =?us-ascii?Q?CMHCOSy3hdtpcGg2xHsoHivwpMd3Fw/u7QT6IuA4c7VGBaIvBtpXwUvIDEfx?= =?us-ascii?Q?m6QGTrJWxEyoJrFQEkwdBnH2RdQ7mrMAVaWwEPTl7xPNQFiOlWhBwVxxa8uo?= =?us-ascii?Q?WfLwPDf9e0O335NWjhAiqHAgU51mnYleIMwxX7KlTfoNbdh1twJsrSRKa4uW?= =?us-ascii?Q?jLw18ePwyDNWcKkewuylYBN/?= Content-Type: multipart/alternative; boundary="_000_AM9PR10MB4824A6E6B0A4B2FFE88FF32688E99AM9PR10MB4824EURP_" MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: AM9PR10MB4824.EURPRD10.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: d824f676-9dbd-48b4-e58e-08d9510603bf X-MS-Exchange-CrossTenant-originalarrivaltime: 27 Jul 2021 13:54:12.2693 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 38ae3bcd-9579-4fd4-adda-b42e1495d55a X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: JOTlTEh9jkOG8uKXTNkNfND6qoLH1Jy5VNDMR8QMDYMbU8hJReBrcATxNNx1mGqIm2ma1zFYFdv+1L+UomTSXOhd9hD5THR2e/8WZM1w4cM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM9PR10MB4198 X-TUID: 1Qgv0Sz2hlNH --_000_AM9PR10MB4824A6E6B0A4B2FFE88FF32688E99AM9PR10MB4824EURP_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Before it was not possible to specify conflicting packages in recipes using the debianize class. Now the conflicting packages can be defined using the DEBIAN_CONFLICTS variable in the recipe. This is especially useful in dpkg-raw recipes that should conflict with each other. Signed-off-by: Benjamin Schilling --- meta/classes/debianize.bbclass | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclas= s index dad1cb4..4486778 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -1,5 +1,6 @@ # This software is a part of ISAR. # Copyright (C) 2017-2019 Siemens AG +# Copyright (C) 2021 Siemens Mobility GmbH # # SPDX-License-Identifier: MIT @@ -7,6 +8,7 @@ CHANGELOG_V ??=3D "${PV}" DPKG_ARCH ??=3D "any" DEBIAN_BUILD_DEPENDS ??=3D "" DEBIAN_DEPENDS ??=3D "" +DEBIAN_CONFLICTS ??=3D "" DESCRIPTION ??=3D "must not be empty" MAINTAINER ??=3D "Unknown maintainer unknown@example.com" @@ -63,6 +65,7 @@ Build-Depends: debhelper (>=3D ${compat}), ${DEBIAN_BUILD= _DEPENDS} Package: ${PN} Architecture: ${DPKG_ARCH} Depends: ${DEBIAN_DEPENDS} +Conflicts: ${DEBIAN_CONFLICTS} Description: ${DESCRIPTION} EOF } -- 2.20.1 --_000_AM9PR10MB4824A6E6B0A4B2FFE88FF32688E99AM9PR10MB4824EURP_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Before it was not possible to s= pecify conflicting packages in recipes

using the debianize class.=

Now the conflicting packages ca= n be defined using the DEBIAN_CONFLICTS

variable in the recipe. This is= especially useful in dpkg-raw recipes

that should conflict with each = other.

 

Signed-off-by: Benjamin Schilli= ng <schilling.benjamin@siemens.com>

---

meta/classes/debianize.bbclass = | 3 +++

1 file changed, 3 insertions(+)=

 

diff --git a/meta/classes/debia= nize.bbclass b/meta/classes/debianize.bbclass

index dad1cb4..4486778 100644

--- a/meta/classes/debianize.bb= class

+++ b/meta/classes/debianize.bb= class

@@ -1,5 +1,6 @@

# This software is a part of IS= AR.

# Copyright (C) 2017-2019 Sieme= ns AG

+# Copyright (C) 2021 Siemens M= obility GmbH

#

# SPDX-License-Identifier: MIT<= o:p>

@@ -7,6 +8,7 @@ CHANGELOG_V ??= =3D "${PV}"

DPKG_ARCH ??=3D "any"=

DEBIAN_BUILD_DEPENDS ??=3D &quo= t;"

DEBIAN_DEPENDS ??=3D "&quo= t;

+DEBIAN_CONFLICTS ??=3D "&= quot;

DESCRIPTION ??=3D "must no= t be empty"

MAINTAINER ??=3D "Unknown = maintainer unknown@example= .com"

@@ -63,6 +65,7 @@ Build-Depends= : debhelper (>=3D ${compat}), ${DEBIAN_BUILD_DEPENDS}<= /p>

Package: ${PN}

Architecture: ${DPKG_ARCH}=

Depends: ${DEBIAN_DEPENDS}=

+Conflicts: ${DEBIAN_CONFLICTS}=

Description: ${DESCRIPTI= ON}

EOF

}

--

2.20.1

 

--_000_AM9PR10MB4824A6E6B0A4B2FFE88FF32688E99AM9PR10MB4824EURP_--