From patchwork Wed Oct 4 16:13:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Zhukov X-Patchwork-Id: 31687 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5FDF0E7C4E4 for ; Wed, 4 Oct 2023 16:16:05 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mx.groups.io with SMTP id smtpd.web11.22814.1696436160699050497 for ; Wed, 04 Oct 2023 09:16:00 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@zhukoff.net header.s=fm2 header.b=S0mOkgZt; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=R5IcVRrt; spf=pass (domain: zhukoff.net, ip: 66.111.4.25, mailfrom: pavel@zhukoff.net) Received: from compute4.internal (compute4.nyi.internal [10.202.2.44]) by mailout.nyi.internal (Postfix) with ESMTP id 07B655C01C5; Wed, 4 Oct 2023 12:16:00 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute4.internal (MEProxy); Wed, 04 Oct 2023 12:16:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zhukoff.net; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=fm2; t=1696436160; x=1696522560; bh=wx8ZADRF4T bf9qObxTi0xZ70Ln+XDr12Dqj5UzeMIRg=; b=S0mOkgZtOB4MGCWh/GV2M/D1hI yFC8fq63VijAHgwsLem8gp2mNT/2GmWVUCxrJ0IuUTXaKeP6lSn1CX/TGPSS0QCr LJR7NZa8jc1LWbphjLfrvN2z4vWzQR3qz/Zt3qy+FRXtstTxU3SoDr3JHqqDlB/u ybs5yXZZ2EgmWpGbT95UtyNYedNHkGo2I8hbQwnHTy+GhtjChFj/S9s5lbB/esjH pIqSfIQxxo5LzdJSC/4u8MUVmzitN6IpXfkeOKwFuvYUFMiFi+3/qBYcfYGh7iKk IjM3Lq+VWH8VeXIHY3KaqwrQmB83Zc5bCNz5mBESR24NGHhphlyLmBEAqCNg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm2; t=1696436160; x=1696522560; bh=wx8ZADRF4Tbf9 qObxTi0xZ70Ln+XDr12Dqj5UzeMIRg=; b=R5IcVRrtKB7gykrdZ+mz3XNOvuYGg PAg9h8jhiRCos+ffchYxLNnKwF344md3id2xCygfHQkT7fyBqhNlqoWzbVmyQDyq Bnuo0kh1P/2ChlLHv8PzswYzZ+ANeoCp6ZpACqbh/SDs6lul0h9+7C4Ndd0HLVue RxLlQDu/PpQQItMTRZpeUWnjVbdas7J5WHhhLxlQHrXsRIkPRRrNXgTWz0gFD796 4P8D4E3P02Niq6q9lDcnzxs9oQxTQ22oXjsCz0RSnaU3nsr4iSDGgynshB4Cu058 ONztmQknDER1XuXejt8E5LAevrDVZvAsf0WgCUkeCx/mjHYdbq2TUaZ5g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgedvgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgggfestdekredtre dttdenucfhrhhomheprfgrvhgvlhcukghhuhhkohhvuceophgrvhgvlhesiihhuhhkohhf fhdrnhgvtheqnecuggftrfgrthhtvghrnhepveefjeekjedugeeltdekjefhtedtfeejue ffheeikedvudfgtdffffelvddvfefhnecuvehluhhsthgvrhfuihiivgeptdenucfrrghr rghmpehmrghilhhfrhhomhepphgrvhgvlhesiihhuhhkohhffhdrnhgvth X-ME-Proxy: Feedback-ID: ib94946c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 4 Oct 2023 12:15:58 -0400 (EDT) From: Pavel Zhukov To: openembedded-core@lists.openembedded.org Cc: Pavel Zhukov Subject: [PATCH 1/3] dummy-sdk-package.inc: Filter packages which are marked for installation Date: Wed, 4 Oct 2023 18:13:16 +0200 Message-ID: <20231004161318.576312-1-pavel@zhukoff.net> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 04 Oct 2023 16:16:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188690 if packages is provided by dummysdk and in the same time marked for installation with IMAGE_INSTALL it causes conflict in apt because virtual providers are not taken into account if package is asked to be installed explicitly. Filter such packages from provides/conflicts to workaround this problem. This workaround brakes RPM usecase because of file conlicts with DUMMYPROVIDES, use DUMMYPROVIDES_PACKAGES_MULTILIB instead (which doesn't include file based conflicts). While this is needed for the case of package_deb only adding it for all package managers to not complicate the code. Fixes: [Yocto #13338] [Yocto #14066] Fixes: The following information may help to resolve the situation: The following packages have unmet dependencies: target-sdk-provides-dummy : Conflicts: bash E: Unable to correct problems, you have held broken packages. Signed-off-by: Pavel Zhukov --- meta/recipes-core/meta/dummy-sdk-package.inc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc b/meta/recipes-core/meta/dummy-sdk-package.inc index bd26e39ad3..6ccafbf8bc 100644 --- a/meta/recipes-core/meta/dummy-sdk-package.inc +++ b/meta/recipes-core/meta/dummy-sdk-package.inc @@ -19,13 +19,14 @@ PR[vardeps] += "DUMMYPROVIDES" PR[vardeps] += "DUMMYPROVIDES_PACKAGES" DUMMYPROVIDES_PACKAGES ??= "" -DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split()])}" +DUMMYPROVIDES_PACKAGES_FILTERED = "${@' '.join([pkg for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split() if d.getVar('IMAGE_INSTALL') is not None and pkg not in d.getVar('IMAGE_INSTALL').split()])}" +DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES_FILTERED').split()])}" DUMMYPROVIDES += "${DUMMYPROVIDES_PACKAGES_MULTILIB}" python populate_packages:prepend() { p = d.getVar("PN") d.appendVar("RPROVIDES:%s" % p, "${DUMMYPROVIDES}") - d.appendVar("RCONFLICTS:%s" % p, "${DUMMYPROVIDES}") + d.appendVar("RCONFLICTS:%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") d.appendVar("RREPLACES:%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") } From patchwork Wed Oct 4 16:13:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Zhukov X-Patchwork-Id: 31689 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5B547E7C4E2 for ; Wed, 4 Oct 2023 16:16:05 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mx.groups.io with SMTP id smtpd.web10.23120.1696436161706656297 for ; Wed, 04 Oct 2023 09:16:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@zhukoff.net header.s=fm2 header.b=wDX3/0cB; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=R/fhc8NJ; spf=pass (domain: zhukoff.net, ip: 66.111.4.25, mailfrom: pavel@zhukoff.net) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 0E0F15C01C5; Wed, 4 Oct 2023 12:16:01 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Wed, 04 Oct 2023 12:16:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zhukoff.net; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1696436161; x= 1696522561; bh=9AYXcYqBeLMOtgl/fT+ihK3f3IPd53rnYrqP/fPS8cU=; b=w DX3/0cBNHrFey8ZVQy1Ez4n0zLPv1mHpBfZcV1J50HI+T5sbKJEAWTmtlBMjcUzo nOkONdDlwxwXwixF3AlFUlHAt8phFGGmqEIo4e7uuz7XgsU2rbR9VZqkrIlU6po/ oBQuJpJ7Mn05wk07iuFWeoGS8MuU5tbu4OK9J8o+eFITI9xfGhWGH/i93TXBHUv8 AbZJRSFWh5TF+wcrMpiCqbpoMjtfqu8X0zsokgQ5OvVQ0T2Iy2w4fXvekmx3YGqf KaDCaTsEXlL2db+qVV7xD8euU5u4LQTsjb6B67rGhYP+Zyv8biIROlMYRzc5gvtv F7kdSYJAqSUFKzQUPLucQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1696436161; x= 1696522561; bh=9AYXcYqBeLMOtgl/fT+ihK3f3IPd53rnYrqP/fPS8cU=; b=R /fhc8NJoHmnBYET4Xb+2blwHrN1ai2XGaAAnYukFeSxkNxuejWkBjzOFtproS3v0 YnZUn6oqVfu5HwTEfi3TrXDXYx1a05ziQjuinShOnEjBbHv6aNyjGAd5BVriNusW 1S/Q5tRcwcOuVQmm0QtYM38Zj8v+4HGbVtTdIJeS6bEB4iA0B46b4gC6Z/BS3ZiR YS5SaB3QZJhNSPuxSPoHScjBtHa8CHtjVtlzl/cSz4zeWCCRC9shj/jBSTmLh70Q YoS+WROnIum+OgyazLA+uLZifFtpflEPU2Hx9hzU0iSihPxK+JO6T3f2JehlGxv7 T9XZixKFRxhByqff+A+Pg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgedvgdeljecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomheprfgrvhgvlhcukghhuhhkohhvuceophgrvhgvlhesiihhuhhk ohhffhdrnhgvtheqnecuggftrfgrthhtvghrnhepgeeivedvieeikeehkeefiefgtdeuje ffueeguddtuedtteffvdfgteeltdelkeevnecuvehluhhsthgvrhfuihiivgeptdenucfr rghrrghmpehmrghilhhfrhhomhepphgrvhgvlhesiihhuhhkohhffhdrnhgvth X-ME-Proxy: Feedback-ID: ib94946c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 4 Oct 2023 12:16:00 -0400 (EDT) From: Pavel Zhukov To: openembedded-core@lists.openembedded.org Cc: Pavel Zhukov Subject: [PATCH 2/3] package_deb: Revert versioned providers workaround Date: Wed, 4 Oct 2023 18:13:17 +0200 Message-ID: <20231004161318.576312-2-pavel@zhukoff.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004161318.576312-1-pavel@zhukoff.net> References: <20231004161318.576312-1-pavel@zhukoff.net> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 04 Oct 2023 16:16:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188691 dpkg and apt seem to handle versioned provides correctly now [1] so this workaround is not needed anymore. This fixes [Yocto #14995] for package_deb. [1] Signed-off-by: Pavel Zhukov --- meta/classes-global/package_deb.bbclass | 9 +-------- meta/recipes-core/meta/dummy-sdk-package.inc | 9 ++++++--- 2 files changed, 7 insertions(+), 11 deletions(-) diff --git a/meta/classes-global/package_deb.bbclass b/meta/classes-global/package_deb.bbclass index 5aba3837bd..d7bbfae3fb 100644 --- a/meta/classes-global/package_deb.bbclass +++ b/meta/classes-global/package_deb.bbclass @@ -184,8 +184,6 @@ def deb_write_pkg(pkg, d): # '<' = less or equal # '>' = greater or equal # adjust these to the '<<' and '>>' equivalents - # Also, "=" specifiers only work if they have the PR in, so 1.2.3 != 1.2.3-r0 - # so to avoid issues, map this to ">= 1.2.3 << 1.2.3.0" for dep in list(var.keys()): if '(' in dep or '/' in dep: newdep = re.sub(r'[(:)/]', '__', dep) @@ -200,10 +198,6 @@ def deb_write_pkg(pkg, d): var[dep][i] = var[dep][i].replace("< ", "<< ") elif (v or "").startswith("> "): var[dep][i] = var[dep][i].replace("> ", ">> ") - elif (v or "").startswith("= ") and "-r" not in v: - ver = var[dep][i].replace("= ", "") - var[dep][i] = var[dep][i].replace("= ", ">= ") - var[dep].append("<< " + ver + ".0") rdepends = bb.utils.explode_dep_versions2(localdata.getVar("RDEPENDS") or "") debian_cmp_remap(rdepends) @@ -220,8 +214,7 @@ def deb_write_pkg(pkg, d): del rrecommends[dep] rsuggests = bb.utils.explode_dep_versions2(localdata.getVar("RSUGGESTS") or "") debian_cmp_remap(rsuggests) - # Deliberately drop version information here, not wanted/supported by deb - rprovides = dict.fromkeys(bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES") or ""), []) + rprovides = bb.utils.explode_dep_versions2(localdata.getVar("RPROVIDES") or "") # Remove file paths if any from rprovides, debian does not support custom providers for key in list(rprovides.keys()): if key.startswith('/'): diff --git a/meta/recipes-core/meta/dummy-sdk-package.inc b/meta/recipes-core/meta/dummy-sdk-package.inc index 6ccafbf8bc..8a07a431ab 100644 --- a/meta/recipes-core/meta/dummy-sdk-package.inc +++ b/meta/recipes-core/meta/dummy-sdk-package.inc @@ -18,15 +18,18 @@ ALLOW_EMPTY:${PN} = "1" PR[vardeps] += "DUMMYPROVIDES" PR[vardeps] += "DUMMYPROVIDES_PACKAGES" +DUMMYMAXVER ?= "999.9-r9" DUMMYPROVIDES_PACKAGES ??= "" DUMMYPROVIDES_PACKAGES_FILTERED = "${@' '.join([pkg for pkg in d.getVar('DUMMYPROVIDES_PACKAGES').split() if d.getVar('IMAGE_INSTALL') is not None and pkg not in d.getVar('IMAGE_INSTALL').split()])}" DUMMYPROVIDES_PACKAGES_MULTILIB = "${@' '.join([multilib_pkg_extend(d, pkg) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES_FILTERED').split()])}" +DUMMYPROVIDES_MAXVER := "${@' '.join(['{} (= {})'.format(pkg, d.getVar('DUMMYMAXVER')) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES_MULTILIB').split()]) + d.getVar('DUMMYPROVIDES')}" +DUMMYCONFLICTS := "${@' '.join(['{} (< {})'.format(pkg, d.getVar('DUMMYMAXVER')) for pkg in d.getVar('DUMMYPROVIDES_PACKAGES_MULTILIB').split()])}" DUMMYPROVIDES += "${DUMMYPROVIDES_PACKAGES_MULTILIB}" python populate_packages:prepend() { p = d.getVar("PN") - d.appendVar("RPROVIDES:%s" % p, "${DUMMYPROVIDES}") - d.appendVar("RCONFLICTS:%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") - d.appendVar("RREPLACES:%s" % p, "${DUMMYPROVIDES_PACKAGES_MULTILIB}") + d.appendVar("RPROVIDES:%s" % p, "${DUMMYPROVIDES_MAXVER}") + d.appendVar("RCONFLICTS:%s" % p, "${DUMMYCONFLICTS}") + d.appendVar("RREPLACES:%s" % p, "${DUMMYCONFLICTS}") } From patchwork Wed Oct 4 16:13:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Zhukov X-Patchwork-Id: 31688 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5D791E7C4E3 for ; Wed, 4 Oct 2023 16:16:05 +0000 (UTC) Received: from out1-smtp.messagingengine.com (out1-smtp.messagingengine.com [66.111.4.25]) by mx.groups.io with SMTP id smtpd.web10.23122.1696436162833423717 for ; Wed, 04 Oct 2023 09:16:02 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@zhukoff.net header.s=fm2 header.b=aNBq9bUT; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=nkVoPUGf; spf=pass (domain: zhukoff.net, ip: 66.111.4.25, mailfrom: pavel@zhukoff.net) Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.nyi.internal (Postfix) with ESMTP id 2DBD95C01C5; Wed, 4 Oct 2023 12:16:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute3.internal (MEProxy); Wed, 04 Oct 2023 12:16:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=zhukoff.net; h= cc:cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=fm2; t=1696436162; x= 1696522562; bh=U5h2qX5fS5zk+HoQyUJ+Ks9HKqplbPZBa+79YH2Wh+Q=; b=a NBq9bUTLfkBNes7HbO+YZNW12Dm2y09m7VhPwUXu1lFZ2nlzTcU6fYVvXw92/Z+X H9bW/DGybFJ9oefd5PLCMzSLhmMUdB2J74N+JQzMOfrUqgLBN6W+VTgQJ+dRbgJ5 79/geEPsYbR6UNVkghqcTmf7urfDWJE0Ev6cg+Gs4ZCtKc8zKPhvQ6HXiLsblt5e ecHFzYNx3UQBZBU8ZtvdCjWfUxyjmDTjzk2kLZYMTN8rQEc8VNhShWM6PI3E5qfS pVaXPwAWKzpVsOAzISdBWP02d3uHZo+eES01P5AzfdmQkHTIHgywopqGgzeOsREt eYaKTC2aHwcgNyFh3BI+w== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; t=1696436162; x= 1696522562; bh=U5h2qX5fS5zk+HoQyUJ+Ks9HKqplbPZBa+79YH2Wh+Q=; b=n kVoPUGfbagOUM/yHTo6xqDdt3MUlFtthOdr++EvKk9WNOYs+yAQK9zLSjVRvWmSB DIwRUg3TiBTDygmCs/v1txOszclghQlR/NpbNHqvUsrEw2odOeDopsJZbFUVi22P mjOAEaVQQFgxwfkwJLa2BX1xqWHDZ9dMqdNx+ws+XJcYvMc9k6KjhVlfLYMzY/9l P2vT8s+FLlGg9VsArPLDZSNIg20lC4xf829UdPalxb90RgcygwyQX0T0Q9Wf6Dj/ h5lzpNnnW9C/Ogpc6shpHuOmGRukhwpU0CMNyLabNdsEDI/8cTG47gOvUiguPaPH WfDujgIAGUVePK5QrwjVQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgedvgdeliecutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvvefufffkofgjfhgggfestdekre dtredttdenucfhrhhomheprfgrvhgvlhcukghhuhhkohhvuceophgrvhgvlhesiihhuhhk ohhffhdrnhgvtheqnecuggftrfgrthhtvghrnhepteeigfejueekfeetjeefueeggfeihe egueehveeiieekgfegffevgefgjeeuudetnecuffhomhgrihhnpehsvghlfhhtvghsthdr tggrshgvpdhlohhgghgvrhdrihhnfhhonecuvehluhhsthgvrhfuihiivgeptdenucfrrg hrrghmpehmrghilhhfrhhomhepphgrvhgvlhesiihhuhhkohhffhdrnhgvth X-ME-Proxy: Feedback-ID: ib94946c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 4 Oct 2023 12:16:01 -0400 (EDT) From: Pavel Zhukov To: openembedded-core@lists.openembedded.org Cc: Pavel Zhukov Subject: [PATCH 3/3] selftest: Add tests for populate_sdk task Date: Wed, 4 Oct 2023 18:13:18 +0200 Message-ID: <20231004161318.576312-3-pavel@zhukoff.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004161318.576312-1-pavel@zhukoff.net> References: <20231004161318.576312-1-pavel@zhukoff.net> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Wed, 04 Oct 2023 16:16:05 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/188692 Two tests to cover both installing package with IMAGE_INSTALL as well as installing versioned dependencies of the package (using perl (>= 5.XX). Related: [Yocto #13338] [Yocto #14995] [Yocto #14066] Signed-off-by: Pavel Zhukov --- .../testsdk-perldepends.bb | 16 ++++ meta/lib/oeqa/selftest/cases/sdk.py | 79 +++++++++++++++++++ 2 files changed, 95 insertions(+) create mode 100644 meta-selftest/recipes-test/testsdk-perldepends/testsdk-perldepends.bb create mode 100644 meta/lib/oeqa/selftest/cases/sdk.py diff --git a/meta-selftest/recipes-test/testsdk-perldepends/testsdk-perldepends.bb b/meta-selftest/recipes-test/testsdk-perldepends/testsdk-perldepends.bb new file mode 100644 index 0000000000..428e1f52e2 --- /dev/null +++ b/meta-selftest/recipes-test/testsdk-perldepends/testsdk-perldepends.bb @@ -0,0 +1,16 @@ +SUMMARY = "Test recipe for sdk populate test case" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +INHIBIT_DEFAULT_DEPS = "1" + +RDEPENDS:${PN}="perl (>= 5.12)" + +do_install(){ + mkdir -p ${D}/var/lib/ + touch ${D}/var/lib/testname + echo "${PN}" > ${D}/var/lib/testname +} + + + diff --git a/meta/lib/oeqa/selftest/cases/sdk.py b/meta/lib/oeqa/selftest/cases/sdk.py new file mode 100644 index 0000000000..35734d8a7a --- /dev/null +++ b/meta/lib/oeqa/selftest/cases/sdk.py @@ -0,0 +1,79 @@ +# +# Copyright OpenEmbedded Contributors +# +# SPDX-License-Identifier: MIT +# + +import os + +from oeqa.selftest.case import OESelftestTestCase +from oeqa.utils.commands import get_bb_var, bitbake + +class PopulateSDK(OESelftestTestCase): + '''Tests for populate SDK task(s)''' + + @classmethod + def setUpClass(self): + + super(PopulateSDK, self).setUpClass() + self.buildtarget = 'core-image-minimal' + self.classname = 'PopulateSDK' + + def sdk_build(self): + """ + Test if package added via IMAGE_INSTALL + conflicts with dummy SDK providers + """ + SDKTASK = '-c populate_sdk' + bbargs = "{} {}".format(SDKTASK, self.buildtarget) + self.logger.info("{}: doing bitbake {} ".format(self.classname, bbargs)) + return bitbake(bbargs).status + + def set_config(self, image_install, package_classes): + config = 'IMAGE_INSTALL:append = " {}"\n'.format(image_install) + config += 'PACKAGE_CLASSES = " package_{}"\n'.format(package_classes) + return config + + def do_test_build(self, image_install, package_manager): + self.write_config(self.set_config(image_install, package_manager)) + res = self.sdk_build() + self.assertEqual(0, res, "Failed to populate SDK with {} in IMAGE_INSTALL and {} package manager"\ + .format(image_install, package_manager)) + + def test_image_install_ipk(self): + """ + Regression test for [Yocto #13338] + """ + self.do_test_build("bash", "ipk") + + def test_image_install_rpm(self): + """ + Regression test for [Yocto #13338] + """ + self.do_test_build("bash", "rpm") + + def test_image_install_deb(self): + """ + Regression test for [Yocto #13338] + """ + self.do_test_build("bash", "deb") + + + def test_image_install_confictdeps_ipk(self): + """ + Regression test for [Yocto #14995] + """ + self.skipTest("Disabled until [Yocto #14995] is fixed") + self.do_test_build("testsdk-perldepends", "ipk") + + def test_image_install_confictdeps_rpm(self): + """ + Regression test for [Yocto #14995] + """ + self.do_test_build("testsdk-perldepends", "rpm") + + def test_image_install_confictdeps_deb(self): + """ + Regression test for [Yocto #14995] + """ + self.do_test_build("testsdk-perldepends", "deb")