From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6735330377709125632 X-Received: by 2002:a2e:5554:: with SMTP id j81mr5665670ljb.136.1568191307687; Wed, 11 Sep 2019 01:41:47 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:3015:: with SMTP id w21ls2438343ljw.16.gmail; Wed, 11 Sep 2019 01:41:47 -0700 (PDT) X-Google-Smtp-Source: APXvYqycgxjoaa2Ndrs0K0R37z8LOGGxCA2hkczBu9KEr9pbrLaHY1NUKmTvDE0n97wu6e8zr5nO X-Received: by 2002:a2e:984e:: with SMTP id e14mr23134489ljj.167.1568191307259; Wed, 11 Sep 2019 01:41:47 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1568191307; cv=pass; d=google.com; s=arc-20160816; b=EhGvpwEDPge0sIWbn8GQz0WrwkeZJLHL2kyQsG4RScWuu/XvCPRtKIGx93mz9cXvUN s4pBfzHX88dX1OFkRm4tlXEFs5lX10JNNZaqSlUP6BLhSWa9QSedW2Q/ghE+YuAGfhCK OFnQbflNNP1v3mhHGfwqSEc0pIOj7aHOsGi7P8/Z2U4opHGpjGnxBFqKVTehA77Kt1VS YyDH6P8wybEeOin63fgJN/sH6o9tyjAkOa0SHf8j/JG/vZAHa2op9RE+RQLAVLCgD2dX KckwEgKvc6W3JPwDTHuKO1oaqrvRhFLxyzqOCR1d9uiGVC6ZVbZWCrC7mdIQx3YIBd1F m3kQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language :accept-language:message-id:date:thread-index:thread-topic:subject :cc:to:from:dkim-signature; bh=VvHafHYCCaHxGsxHkDyIX21PuNtMVtF1gpjrGRwJE7g=; b=XT7yZjoHn8hahMOC8KLo6lc2yxgeXsqa5ffh6loYjrvQRq4IVms5xZktLwBKXeOeR6 bzjeokCHjpp8QvejbcjgzWOvfqDbUNoXR+IwDH2Qjujg1FXrt0HDM61VoIUbHbmeyp1c pK8Z9o+JVMd9j7zfBRjgsowlwenEaJcNmUjjSucen+XwP8aTN4qGy3ZrpLyR02/fj7XU fUTj1nafhpAe6UzfpALwxlvSYATUf7O1hKysbAe5ISF3jHxq5pn3W36dcK92QZDmvaj3 tym6t+YNq0ZpcB9PZ2EnvHKhnouoQYOAEauhC56VQrIYp2xR1vt49h43IFUwj7jzl5UM jU5g== ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector2-siemens-onmicrosoft-com header.b=naaqJV9U; 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 konstantinos.dalamagkidis@siemens.com designates 2a01:111:f400:fe08::631 as permitted sender) smtp.mailfrom=konstantinos.dalamagkidis@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03on0631.outbound.protection.outlook.com. [2a01:111:f400:fe08::631]) by gmr-mx.google.com with ESMTPS id h6si1153686lfc.3.2019.09.11.01.41.47 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Sep 2019 01:41:47 -0700 (PDT) Received-SPF: pass (google.com: domain of konstantinos.dalamagkidis@siemens.com designates 2a01:111:f400:fe08::631 as permitted sender) client-ip=2a01:111:f400:fe08::631; Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.onmicrosoft.com header.s=selector2-siemens-onmicrosoft-com header.b=naaqJV9U; 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 konstantinos.dalamagkidis@siemens.com designates 2a01:111:f400:fe08::631 as permitted sender) smtp.mailfrom=konstantinos.dalamagkidis@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=Y+hqpTl20Dx4Bk4d5FlftbOFVDfv/tvfFbV1YZZOpB9uiPaSZbq3+SrZLgLgxi+XmOHi574zfFtUyy7SM2zuio0IWoThk6r3wIHEirYzDu3BRVj5GGjQrSZ7IS0MXvwXGT7YFYZL6wT4jELpcOnCjoj1haioXjLvpBRZ1GbW2i3Mo+wbZ0MFJ5irDEpK20bM1rn+ZzshrgbTzOIuimdESezb++M2lzjFVhxGpQn0ueWjQd4v4jTVgHEc+bXNSe7udmUij49Ivj0dR35IxuoA3PIjS+lyWwDCVNoWl6ewvUawBE6X+HtSakbdOg9lWSnfD1xCtBoHKhYOnjNcMOUv2Q== 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=VvHafHYCCaHxGsxHkDyIX21PuNtMVtF1gpjrGRwJE7g=; b=f0hNda5MnoEu2iLwBq+zn/vj4CCz99MZxeqCdWNlg91+irU9PCLLH0oEkwtVkv/jXFmujqmntm64RBQxgYdAW97eTTLadaGsyejcRRBw3y2+dwDklf8pMJPhGrly6ube+dOPI408WCdXLb3zna9XGE43Y3YRoT5+/e1yTN8Axj/q4SKN5J5cdOM4gZNs/CqA5AvJBf51RZiHXR7IjZmdvoqfZZzEEmKXuOQXJsvRx0NpUpSrt0myrxGcuspBqoXdpx1pc9gktwYN3Zt5q8X16AH+CZTcnRXagqbC87e214rlzRRsx0PWMfzhbUqYaXVZvQQ/aqRmXBe25gt0/dlxTA== 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=selector2-siemens-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=VvHafHYCCaHxGsxHkDyIX21PuNtMVtF1gpjrGRwJE7g=; b=naaqJV9U+zQUUVUCFYdAGyCOGBFTYPslPL6NbCxKsvQohiDsmSPP8Rj0P0QFEpDPnqmDnALC4xBiKHcJ6DpQ/lSdUiTCN5fcBnqWLGQGyLWPi3HWEFY2BNluNJiiFLpzPLjoDBJE9GfBRMdrLMUdWBYFjgcftWSvBf0ZFby+ohM= Received: from AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM (10.186.174.207) by AM0PR10MB2116.EURPRD10.PROD.OUTLOOK.COM (52.134.85.151) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2241.18; Wed, 11 Sep 2019 08:41:45 +0000 Received: from AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM ([fe80::c911:ce61:5c9b:268c]) by AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM ([fe80::c911:ce61:5c9b:268c%4]) with mapi id 15.20.2263.015; Wed, 11 Sep 2019 08:41:45 +0000 From: "Dalamagkidis, Konstantinos" To: "isar-users@googlegroups.com" CC: "Dalamagkidis, Konstantinos" Subject: [PATCH] Add support for supplying more types of debian package relationships Thread-Topic: [PATCH] Add support for supplying more types of debian package relationships Thread-Index: AQHVaHy+3zqIj0PvmECPrcDh+PshXg== Date: Wed, 11 Sep 2019 08:41:45 +0000 Message-ID: <20190911084136.19731-1-konstantinos.dalamagkidis@siemens.com> Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.20.1 authentication-results: spf=none (sender IP is ) smtp.mailfrom=konstantinos.dalamagkidis@siemens.com; x-originating-ip: [80.146.228.89] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0d69b47a-a6e2-4d30-be8f-08d73693e105 x-ms-office365-filtering-ht: Tenant x-microsoft-antispam: BCL:0;PCL:0;RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(4618075)(2017052603328)(7193020);SRVR:AM0PR10MB2116; x-ms-traffictypediagnostic: AM0PR10MB2116:|AM0PR10MB2116: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:1201; x-forefront-prvs: 0157DEB61B x-forefront-antispam-report: SFV:NSPM;SFS:(10009020)(4636009)(376002)(39860400002)(346002)(366004)(136003)(396003)(199004)(54534003)(189003)(102836004)(486006)(2351001)(6436002)(476003)(2616005)(66066001)(25786009)(26005)(478600001)(6506007)(14454004)(6512007)(4326008)(36756003)(86362001)(53936002)(64756008)(66446008)(66946007)(76116006)(14444005)(66556008)(6116002)(66476007)(3846002)(107886003)(71200400001)(6916009)(71190400001)(99286004)(186003)(7736002)(5660300002)(2906002)(256004)(8936002)(6486002)(2501003)(1076003)(81166006)(50226002)(81156014)(316002)(305945005)(8676002)(5640700003);DIR:OUT;SFP:1101;SCL:1;SRVR:AM0PR10MB2116;H:AM0PR10MB3652.EURPRD10.PROD.OUTLOOK.COM;FPR:;SPF:None;LANG:en;PTR:InfoNoRecords;A:1;MX:1; received-spf: None (protection.outlook.com: siemens.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: wwQc+TWImtsZw7A8NwF/G9oukN55g7cebrFFgikKMTm/npbKaUR67Ss6YAR91e31ZCtbc0i0w2Kh7oZPo5IBkVTa5vVDaJpmO+cmyCqv4/1Kw0nf7vfg1Irs6fruwjBQfn4tue55+CCtJn9FupiVhYsHb5X0rqDIWCIXOb68IUn0fMu8JGm+5iWf0+ta1dHUSuE5bLqIywaP/x4jiMVQnGvy73vzJ72shF+SgQQ7Zg2iXJOfhoPYLePHs+Jgih+ToXuoyQzOOzSZZ814WCtn8aqn4s6oC3ih3XT7J3UaR9LGgb68whUJ5jlDQuJDegLCEMLKdScMk7cEITXD1VaRCehD3N4EQq4PQrB/DqsBX5g/6H5c7dzlK4J4QPYA5VXJVoqYxk8Z9kojFWY9wqsPBBkg1hpWXM2fLMW/4gBYteg= Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-OriginatorOrg: siemens.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0d69b47a-a6e2-4d30-be8f-08d73693e105 X-MS-Exchange-CrossTenant-originalarrivaltime: 11 Sep 2019 08:41:45.8135 (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: e9mTCT+LhVli4iHSajAhZzGgDWj+DSpjE3y/ND3bV7ZISzFRgs3GTiRl/u21qnrd3dkYdw7nJMCTjZk1eOneM6GNIhEFIaRtipHtvXWmUeiEA+XftX+rqY9hV767JBEi X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR10MB2116 X-TUID: ma8Wh94n7Q/q We need to be able to specify other package relationships, such as Pre-Depends or Provides/Replaces/Conflicts. This change supports supplying DEBIAN_PREDEPENDS, DEBIAN_REPLACES, DEBIAN_CONFLICTS and DEBIAN_PROVIDES, as well as bitbake-style RDEPENDS or RDEPENDS_{PN} variables. The DEBIAN_* take priority. Signed-off-by: Konstantinos Dalamagkidis --- meta/classes/debianize.bbclass | 19 +++++++++++++++++++ meta/classes/dpkg-raw.bbclass | 1 - 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/meta/classes/debianize.bbclass b/meta/classes/debianize.bbclas= s index ad3a98e..26002c5 100644 --- a/meta/classes/debianize.bbclass +++ b/meta/classes/debianize.bbclass @@ -5,6 +5,21 @@ =20 CHANGELOG_V ?=3D "${PV}" =20 +DEBIAN_DEPENDS ??=3D "${@deb_get_relationship(d, 'RDEPENDS')}" +DEBIAN_PREDEPENDS ??=3D "${@deb_get_relationship(d, 'RPREDEPENDS')}" +DEBIAN_CONFLICTS ??=3D "${@deb_get_relationship(d, 'RCONFLICTS')}" +DEBIAN_REPLACES ??=3D "${@deb_get_relationship(d, 'RREPLACES')}" +DEBIAN_PROVIDES ??=3D "${@deb_get_relationship(d, 'RPROVIDES')}" + +def deb_get_relationship(d, relationship): + rel =3D d.getVar(relationship + '_' + d.getVar('PN', True), True) + if rel: + return rel + rel =3D d.getVar(relationship, True) + if rel: + return rel + return "" + deb_add_changelog() { timestamp=3D$(find ${S}/ -type f -not -path "${S}/debian/*" -printf "%T@\= n"|sort -n -r|head -n 1) if [ -n "${timestamp}" ]; then @@ -42,6 +57,10 @@ Build-Depends: debhelper (>=3D ${compat}) Package: ${PN} Architecture: any Depends: ${DEBIAN_DEPENDS} +Pre-Depends: ${DEBIAN_PREDEPENDS} +Replaces: ${DEBIAN_REPLACES} +Conflicts: ${DEBIAN_CONFLICTS} +Provides: ${DEBIAN_PROVIDES} Description: ${DESCRIPTION} EOF } diff --git a/meta/classes/dpkg-raw.bbclass b/meta/classes/dpkg-raw.bbclass index ea03ea4..0c484fc 100644 --- a/meta/classes/dpkg-raw.bbclass +++ b/meta/classes/dpkg-raw.bbclass @@ -5,7 +5,6 @@ =20 inherit dpkg =20 -DEBIAN_DEPENDS ?=3D "" MAINTAINER ?=3D "Unknown maintainer " =20 D =3D "${S}" --=20 2.20.1