From patchwork Wed Oct 4 06:57:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Zhukov X-Patchwork-Id: 31680 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 1175EE7C4D0 for ; Wed, 4 Oct 2023 15:07:44 +0000 (UTC) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mx.groups.io with SMTP id smtpd.web10.12763.1696402818074236888 for ; Wed, 04 Oct 2023 00:00:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@zhukoff.net header.s=fm2 header.b=e6+qF5N3; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=fbKdbJOi; spf=pass (domain: zhukoff.net, ip: 66.111.4.26, mailfrom: pavel@zhukoff.net) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 67E0D5C02EE; Wed, 4 Oct 2023 03:00:17 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 04 Oct 2023 03:00:17 -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=1696402817; x=1696489217; bh=cxRK5n7n0a 56TrQsgNAUqqPthvZSWjr3lPjVnyzOoGo=; b=e6+qF5N35Rt1QvMakiQ6xkg5gU z9+21rTVEv/P8dIzeE2ao4Nr+ZaDWbrOrDv8x0LgJY8yP2h3XCw3rK/ifi3hPx32 SsoUEVWVu6W0whtf7pxj6+nZ49uyPPceT02DaVhL1ZvjNtAiBpZQT1W52M8hZ1NN TXvXcMC90DgIxyae/cR9I64F3803Z60lCcWg6qiWINqZFRsP6thTsUlSluG/3L+T XJHRaBaZV2lgtDUgIIsHoGvSUtI5DUQURsq7z0Cv29lOk+W0Tvapr259LFAo0qBp VVBIKFlfvjeL1h1We4kZP8MjIkB0io4YoazfPUOlEabA16yAebzxje/tQeVQ== 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=1696402817; x=1696489217; bh=cxRK5n7n0a56T rQsgNAUqqPthvZSWjr3lPjVnyzOoGo=; b=fbKdbJOizW9mCp/XnAf7FOTrkgLeT T1X9SRIqnc3IepWe0D5y+PVnY9BGs1Vo0QlIIgZYXLUiS9pAm432ltRRQlEEqrUt rv9wfbfNvfHM2YN1pyghYTHVzOHS6h7+isDe9R9RiO7d0ium2nj+TXk8Xi3+WVir 209i0151jk/KxNIVs380vCw8i66tuv7DlyX3q16h+kJgp15whIiPAIFLpZCBHt0U OxQBV6zZpqUm1zWaOWO3UOG2ZKvQLdf6Bs4+lRePn2pHP1dn24aLGcm3b8KfrddV y9zOEhC/uP6hH9aW+tCfpgcCCuuaU/E+BEJDJ+GrUi59977NDrrPGRT1g== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgedugddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpefrrghvvghlucgk hhhukhhovhcuudcuoehprghvvghlseiihhhukhhofhhfrdhnvghtqeenucggtffrrghtth gvrhhnpeevffefudetkeduffettddugeefteeigfehfefhgfdufffgledtieegudejfedv gfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehprg hvvghlseiihhhukhhofhhfrdhnvght X-ME-Proxy: Feedback-ID: ib94946c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 4 Oct 2023 03:00:16 -0400 (EDT) From: "Pavel Zhukov" To: openembedded-devel@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 08:57:26 +0200 Message-ID: <20231004065728.4283-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 15:07:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105332 From: Pavel Zhukov 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 06:57:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Zhukov X-Patchwork-Id: 31681 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 0F6D5E7C4CE for ; Wed, 4 Oct 2023 15:07:44 +0000 (UTC) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mx.groups.io with SMTP id smtpd.web10.12764.1696402819087921601 for ; Wed, 04 Oct 2023 00:00:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@zhukoff.net header.s=fm2 header.b=diIMfrJl; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=bNm8u+hK; spf=pass (domain: zhukoff.net, ip: 66.111.4.26, mailfrom: pavel@zhukoff.net) Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id 709715C02E7; Wed, 4 Oct 2023 03:00:18 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute2.internal (MEProxy); Wed, 04 Oct 2023 03:00:18 -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=1696402818; x= 1696489218; bh=VVf8fyqFT9yb67GVdhlCa40zv+AMJmpADi215/zdd2Y=; b=d iIMfrJlR6N2I+a+XqS6DiAz3PziBhCugd5GTOAKJ6mJvSB4A71xE9HXA2dB6d9Is zl+FdM2jfb+Uuqh93BLv5tq/vrj6YrcA7s1o4X4nXI4hF3KyfsGZwsXZtkw3g+EU 9rAFM/suiv7rnvEqzGi4cxZu90M7YN4Sj5ASg2hIP4+zASBwaz9CckRj+MBSu6M9 +VWVFCTp4B0kSbCEEHQTUvIOiJ/VCpTog8MQXfjFJUrGG5q+3MU5XSWo+qqd+2fv iiytrEzxPtuAbkCsLqabvuUIrZHCQWOZ9OgMJ8W5Gdq8SSwz6wP9NSrE7hD6Btb8 oSBKIqlmxIeX1ULzE1CCA== 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=1696402818; x= 1696489218; bh=VVf8fyqFT9yb67GVdhlCa40zv+AMJmpADi215/zdd2Y=; b=b Nm8u+hK5sEa5qGtjRKIgddfFnPVoiPBluoY/ejuglfxa35RU4ETa/Mlcyr5WmFJi c093P/tZjTfOWZXzFB9GAJpQ7/oI1if31MW3Uab2O5btbYW7pQ+aI5wkfRG9uXTF 7InGcVGljPk5cqvdd2VglJYj/cCL8h692ouo+ujkhVqjqgi4H+3OhateeMlMxJK/ rUlU33s6gZ9Q4VsPA0EIJRmb1J5hSVTlKlUsTgElMim57ShPsSNsAzfLQGwEXnQX X+Gmy11yBJeDw098tbtsYMDbzkjQxFE6zGc51OKoJlpLILDHliPgNTzex2iMSIYa XdkXeqhRUL1cJ214izbsA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgedugddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrrghvvghl ucgkhhhukhhovhcuudcuoehprghvvghlseiihhhukhhofhhfrdhnvghtqeenucggtffrrg htthgvrhhnpeeikeelheegvdekveetvedvieeltedujefgjeduhfeiuddtgfffteefgfeg keetfeenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpe hprghvvghlseiihhhukhhofhhfrdhnvght X-ME-Proxy: Feedback-ID: ib94946c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 4 Oct 2023 03:00:17 -0400 (EDT) From: "Pavel Zhukov" To: openembedded-devel@lists.openembedded.org Cc: Pavel Zhukov Subject: [PATCH 2/3] package_deb: Revert versioned providers workaround Date: Wed, 4 Oct 2023 08:57:27 +0200 Message-ID: <20231004065728.4283-2-pavel@zhukoff.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004065728.4283-1-pavel@zhukoff.net> References: <20231004065728.4283-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 15:07:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105333 From: Pavel Zhukov 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 06:57:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavel Zhukov X-Patchwork-Id: 31683 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 1D472E7C4D5 for ; Wed, 4 Oct 2023 15:07:44 +0000 (UTC) Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by mx.groups.io with SMTP id smtpd.web11.12846.1696402822160878317 for ; Wed, 04 Oct 2023 00:00:22 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@zhukoff.net header.s=fm2 header.b=1iB0slMc; dkim=pass header.i=@messagingengine.com header.s=fm2 header.b=Fblcrxi6; spf=pass (domain: zhukoff.net, ip: 66.111.4.26, mailfrom: pavel@zhukoff.net) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id 79C205C02EB; Wed, 4 Oct 2023 03:00:19 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute6.internal (MEProxy); Wed, 04 Oct 2023 03:00:19 -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=1696402819; x= 1696489219; bh=GiMmnji/vplkR5O4dVMYzULkqv0Hr5BL0TsyHWjMamc=; b=1 iB0slMcVAIUeQGpiz6/451sDmj4yAoFpQRozZCnculZqHI1KARwIUt+MQe+fscsh LzTrrOA7U/p5/hyvpsDG0WTKpNjwIFkO3b6cKIEQbFLJ703QONIDOQnKRXrXnv3c b3qB0EBv234R+S2HZPVyYBRaN9+5uOfIhxJXdTPQhxUzBXXnFgZNI41hYA4Myk1d Q6SSPrncI7psbNpZB6tTzj5MZQ60eO2ofS/prciPUGuT9xmI8MtOyrdVLMlZR3jc H44c1xu/SoyXflmA1baydZlyEZRrYfB8uSFymblOcZd9erUFmLwprRGC1vC6l2bl Bl5V+NYyBkcQ/DUrtFPTA== 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=1696402819; x= 1696489219; bh=GiMmnji/vplkR5O4dVMYzULkqv0Hr5BL0TsyHWjMamc=; b=F blcrxi6BHDXgfuTwOJ7G9MyKRuMSTE1H1Afzu2vWaPvjKHv8c4q35qwACO1BhfKi 27M6g2/fTui4t4QAL9G+UlUx7rmY1Hwvtua5P705czTUK+JoLFN/ZvFl6SAJWBq/ 7F+sLiwuPdXHiNyvi7Hy/g6w84Hn5bYbwvIQqwYzp8OKPJ53RLgxWQO4RoejzOwK fnm95K9ApzzqhVvrd6ftatQmRrvF4gFM4vjajR8kQHKz1hoL7bbyxBY5w6VK7fGD P7GCgpayIGMyOkayohZT5h/NCbJ+uYt/AnP7VxosVsyzCC0oBkTEijdaJ5ckoKM8 yuyHKVg6Efjtq7SyKW0eA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrgedugddutdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffojghfggfgsedtkeertdertddtnecuhfhrohhmpefrrghvvghl ucgkhhhukhhovhcuudcuoehprghvvghlseiihhhukhhofhhfrdhnvghtqeenucggtffrrg htthgvrhhnpeduhfetvefgieeitedvudegjefhudekfeeikedvffdvueelieehudekhfff heeivdenucffohhmrghinhepshgvlhhfthgvshhtrdgtrghsvgdplhhoghhgvghrrdhinh hfohenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehp rghvvghlseiihhhukhhofhhfrdhnvght X-ME-Proxy: Feedback-ID: ib94946c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Wed, 4 Oct 2023 03:00:18 -0400 (EDT) From: "Pavel Zhukov" To: openembedded-devel@lists.openembedded.org Cc: Pavel Zhukov Subject: [PATCH 3/3] selftest: Add tests for populate_sdk task Date: Wed, 4 Oct 2023 08:57:28 +0200 Message-ID: <20231004065728.4283-3-pavel@zhukoff.net> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20231004065728.4283-1-pavel@zhukoff.net> References: <20231004065728.4283-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 15:07:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-devel/message/105334 From: Pavel Zhukov 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")