From patchwork Sat Mar 11 22:41:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 20822 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 EA7B1C74A44 for ; Sat, 11 Mar 2023 22:42:08 +0000 (UTC) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.52]) by mx.groups.io with SMTP id smtpd.web11.55879.1678574518565887263 for ; Sat, 11 Mar 2023 14:41:58 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=GE0aFGW6; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.52, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f52.google.com with SMTP id l7-20020a05600c4f0700b003e79fa98ce1so5613775wmq.2 for ; Sat, 11 Mar 2023 14:41:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1678574517; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=0tgsF6ffO0kvkz2Prq4bEyyOZCTO3/YZVLBOLkOoe3M=; b=GE0aFGW6p2+HmcyQUTufym3SjY+gdsXTh/C21VR9x/kDv3GaLbCXz46qhsEqYAxIc0 LXJjtZKafFYXprW66SjdH4LT3oy0CHI70/cfDg6+8wz1uvdQOG6Dx7RYPpzO0uj2YKmM QvzcJlT95rTitSv/+39mPLezlgC4cfV7e28pI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678574517; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=0tgsF6ffO0kvkz2Prq4bEyyOZCTO3/YZVLBOLkOoe3M=; b=tot02SKzlM3sGL3Dr4nTC6biZm2i/8bO5N26HyLmd/cucocVj5MtGzDHG1KVl+qczJ vDgYJUW9bNRnVh5WALPNbjo5hRSudHjBMK8BbuTsrVHX0vZNnN/72M1wqPwiqxkiL/AX azv02S5rqzhNvXNf4x91QQDIgODE+VbbBHqkpG0llJqM1IwmUzmkYO7D9c6TzWuIm6t4 SSzLupSjzEEfI25pxX+xpG99ggSCjditp8phZDxDWj3h1sxXBU61Rd6tWJ9TcAZxug+i jsUVaGTIWKoD2qvJBwfqt/UHtEVRN6iFBFD3n7k4Mh2UpyRCHf14GGv+FBLsDKogbQ0d /LoQ== X-Gm-Message-State: AO0yUKWhjFRF7VIa+6DytW3HA0r2Hu3dr+Cy5+v9c5hEJ1RU4VrVlql2 A+asTxy+hqODIY6H2q5Eo4DIX5NTVSFjVsRgSZI= X-Google-Smtp-Source: AK7set99UdGUOLx8xGkjhJ0d5QjYk6SpO8i5/G2GC3IYcNH4ukAMIoea58Ord0/nhQ9r6iag/7nBLQ== X-Received: by 2002:a05:600c:4f07:b0:3dc:3b29:7a4 with SMTP id l7-20020a05600c4f0700b003dc3b2907a4mr5100396wmq.0.1678574516649; Sat, 11 Mar 2023 14:41:56 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:9dd5:bdbf:ef9d:c118]) by smtp.gmail.com with ESMTPSA id z9-20020a05600c114900b003dc5b59ed7asm3933164wmz.11.2023.03.11.14.41.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 14:41:56 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/8] gettext: Add missing bash ptest dependency Date: Sat, 11 Mar 2023 22:41:48 +0000 Message-Id: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 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 ; Sat, 11 Mar 2023 22:42:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178367 Add a dependency on bash to fix execution in minimal images. Signed-off-by: Richard Purdie --- meta/recipes-core/gettext/gettext_0.21.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/gettext/gettext_0.21.1.bb b/meta/recipes-core/gettext/gettext_0.21.1.bb index ec80a89e490..b80ea9276ef 100644 --- a/meta/recipes-core/gettext/gettext_0.21.1.bb +++ b/meta/recipes-core/gettext/gettext_0.21.1.bb @@ -182,7 +182,7 @@ do_install_ptest() { fi } -RDEPENDS:${PN}-ptest += "make xz" +RDEPENDS:${PN}-ptest += "make xz bash" RDEPENDS:${PN}-ptest:append:libc-glibc = "\ glibc-gconv-big5 \ glibc-charmap-big5 \ From patchwork Sat Mar 11 22:41:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 20821 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 E94C5C6FD1F for ; Sat, 11 Mar 2023 22:42:08 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web11.55880.1678574518845948704 for ; Sat, 11 Mar 2023 14:41:59 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=XM6orsQy; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.53, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f53.google.com with SMTP id k37so5647961wms.0 for ; Sat, 11 Mar 2023 14:41:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1678574517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=2369VZMDrvBnBL6t9IGaDf+P9eG6i34JBpMP1RcGehw=; b=XM6orsQy3FcQ4O+gETb9wSxvuay4oEN3+ZB/zmNdKpi4meY3wEP5RST1O3mB+j2nuz QXVWYTKgw9Ok5cCkgtso/5BWWzFWWCGiSwmzEmMSbzZaQ2iQg1HwzPMpSFCYjzn926o/ dEMmpIT6E6qOYiZoZJbykFxm6jilAx/VKfpxU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678574517; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=2369VZMDrvBnBL6t9IGaDf+P9eG6i34JBpMP1RcGehw=; b=IGxmiGqxNmKAEbjjxC03UFxiraU3T70jpRlI6cYWBNzLFZqC2ylvC964jnbSOpTYxM zNcnhRrZrxoZYu69BySpQ/1gNGQkJH/AXCusIjD3SoGs/exNyG2ZGUs2zXgQzGauTo5t KEE7kFf5RNwOBG1r2XjiMNUtNOThqEdPE4TCtW4VJ6k5wpxZm9c+csr0QonEIqnim4JZ uPcaZ6B1iZv/f2BSkGt26pFgC/pFg+qqaFqZWUOvV6e2U6PHAZFIbRr2RDq/HegaBu7X 0xPQon5qpI78AfKlPs1wFYu2lukgxf1xB7XP1MgXPFB6oxjnublg3cXgtM/3VK6ICpIs 325w== X-Gm-Message-State: AO0yUKU4hwmghF7jyZJKeG26HFVBJmUMiJKxXdWWuqAOSySGXqbF9LL2 8C3QVcF6+4+SNea8pLqCOXWsdkuj/yL0BpdLFgg= X-Google-Smtp-Source: AK7set9P0fP+a7ZqxxNppUCBG1IszjQENoYR9WSQeoOjft34B+hrY0uAg9CGf0n52E744RXS1Udq0Q== X-Received: by 2002:a05:600c:1d84:b0:3eb:2de8:b72a with SMTP id p4-20020a05600c1d8400b003eb2de8b72amr6674407wms.7.1678574517148; Sat, 11 Mar 2023 14:41:57 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:9dd5:bdbf:ef9d:c118]) by smtp.gmail.com with ESMTPSA id z9-20020a05600c114900b003dc5b59ed7asm3933164wmz.11.2023.03.11.14.41.56 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 14:41:56 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/8] glibc-tests: Add missing bash ptest dependency Date: Sat, 11 Mar 2023 22:41:49 +0000 Message-Id: <20230311224155.3442306-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> References: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> 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 ; Sat, 11 Mar 2023 22:42:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178368 The script has a bashism and needs bash to execute correctly. Mark it as such and add the missing bash dependency so it executes in minimal images. Signed-off-by: Richard Purdie --- meta/recipes-core/glibc/glibc-tests_2.37.bb | 2 +- meta/recipes-core/glibc/glibc/run-ptest | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-tests_2.37.bb b/meta/recipes-core/glibc/glibc-tests_2.37.bb index bb6ef061623..9352a058fbe 100644 --- a/meta/recipes-core/glibc/glibc-tests_2.37.bb +++ b/meta/recipes-core/glibc/glibc-tests_2.37.bb @@ -27,7 +27,7 @@ python __anonymous() { # Remove any leftovers from original glibc recipe RPROVIDES:${PN} = "${PN}" RRECOMMENDS:${PN} = "" -RDEPENDS:${PN} = " glibc sed" +RDEPENDS:${PN} = " glibc sed bash" RDEPENDS:${PN}-ptest = "${PN}" DEPENDS += "sed" diff --git a/meta/recipes-core/glibc/glibc/run-ptest b/meta/recipes-core/glibc/glibc/run-ptest index f637986105e..c394b498660 100755 --- a/meta/recipes-core/glibc/glibc/run-ptest +++ b/meta/recipes-core/glibc/glibc/run-ptest @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # ptest script for glibc - to run time related tests to # facilitate Y2038 validation # Run with 'ptest-runner glibc-tests' From patchwork Sat Mar 11 22:41:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 20825 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 EB6A9C74A5B for ; Sat, 11 Mar 2023 22:42:08 +0000 (UTC) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) by mx.groups.io with SMTP id smtpd.web10.55941.1678574519710474310 for ; Sat, 11 Mar 2023 14:42:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=FCZB8RTY; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.53, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f53.google.com with SMTP id j19-20020a05600c1c1300b003e9b564fae9so8487639wms.2 for ; Sat, 11 Mar 2023 14:41:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1678574518; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=TMFQDI8hi7wxCu7s3HCiQHxs9Tx9fbrcEMlmRvrljAY=; b=FCZB8RTYxMdZLN1jywCexvpK504AhXxdD4AUqB5EQlr5194D7WbbmZ5Ib49rGj18Ux IbFfH3qis8s/nhAB3wMA9INnI7lQBd/oi+GVidgB3XA9voHq7GPnFapDv/wvlMiyDUAE 2AGdNUp/qmFmIx3QifTLYpHc/qvV5IdXXfMPg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678574518; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=TMFQDI8hi7wxCu7s3HCiQHxs9Tx9fbrcEMlmRvrljAY=; b=vHZsFWrhKgss7+E6kxtiV+CKnFY6qYAwHi02YCsQV0m2Ys4516ZQrobIKau11h16LA f+QqNtHgSwTgBBsg2zSLwr+U37Iqv9y63g8jhjifsfGlbdIvl682E28OUqis2oaaAGVg nDRjibBduKufLVDCOBxCFiblz95UHvHHh85ofp/Tu3MoJSwZfP6BskEf0rq6KbGuzsPu jHY2rMukA+vpCe06LRIW7sM8Tk4/Am3aW/XGBlv3PiBuDdSqhA/BChLx4QHbV31LaMmY 745zYJQ019NtG7V7dmMSJAg5+CgyG7EkVqHqtAUZ2RInEUoNj+HJvOjIKhgynY3NHcjm 0C0g== X-Gm-Message-State: AO0yUKV9LWFHOZSYYXwKe0F3K8zfdd58w3FWgQCRJt21ApyJzqQnfzN5 alHZsVNg5Rn002zobuv4Njg/ogduO+NDPBVb3kE= X-Google-Smtp-Source: AK7set+aC7jKOHAXJB41o3NVJkbNE1w4L7JfL7SpA2KnLj84HgfnqQuvE+xOpt5261rGsmDJ5b+qfQ== X-Received: by 2002:a05:600c:3ca7:b0:3da:2ba4:b97 with SMTP id bg39-20020a05600c3ca700b003da2ba40b97mr5181532wmb.19.1678574517789; Sat, 11 Mar 2023 14:41:57 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:9dd5:bdbf:ef9d:c118]) by smtp.gmail.com with ESMTPSA id z9-20020a05600c114900b003dc5b59ed7asm3933164wmz.11.2023.03.11.14.41.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 14:41:57 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/8] opkg: Add missing python module ptest dependencies Date: Sat, 11 Mar 2023 22:41:50 +0000 Message-Id: <20230311224155.3442306-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> References: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> 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 ; Sat, 11 Mar 2023 22:42:08 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178369 Add dependencies on missing python modules to fix execution in minimal images. Signed-off-by: Richard Purdie --- meta/recipes-devtools/opkg/opkg_0.6.1.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/opkg/opkg_0.6.1.bb b/meta/recipes-devtools/opkg/opkg_0.6.1.bb index c3f4a7dd575..4c25fe963a3 100644 --- a/meta/recipes-devtools/opkg/opkg_0.6.1.bb +++ b/meta/recipes-devtools/opkg/opkg_0.6.1.bb @@ -65,7 +65,7 @@ do_install_ptest () { RDEPENDS:${PN} = "${VIRTUAL-RUNTIME_update-alternatives} opkg-arch-config libarchive" RDEPENDS:${PN}:class-native = "" RDEPENDS:${PN}:class-nativesdk = "" -RDEPENDS:${PN}-ptest += "make binutils python3-core python3-compression bash" +RDEPENDS:${PN}-ptest += "make binutils python3-core python3-compression bash python3-crypt python3-io" RREPLACES:${PN} = "opkg-nogpg opkg-collateral" RCONFLICTS:${PN} = "opkg-collateral" RPROVIDES:${PN} = "opkg-collateral" From patchwork Sat Mar 11 22:41:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 20823 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 04519C61DA4 for ; Sat, 11 Mar 2023 22:42:09 +0000 (UTC) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) by mx.groups.io with SMTP id smtpd.web10.55945.1678574520266846384 for ; Sat, 11 Mar 2023 14:42:00 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=aS4c7C1G; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.45, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f45.google.com with SMTP id j3so5630309wms.2 for ; Sat, 11 Mar 2023 14:42:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1678574518; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=EtPldRtReupVv2Lpq23wF+tQDxiMdBhaxLJswll+Fk4=; b=aS4c7C1GlDIv0hivtVwSkZW91BpUTce1Au5lcCxVuMPsHbksCbir/XLNBAEEdpGBzv MQ+AN0CHK5GPbjKPlyn4TG3IjjLGYFzKxJP5O5+Ut9r/MtZX8EEaPN/Ftj0zToM9WD2g f+P3H7F5p202voWUcPxFCe4e/q6wSx+1+1Uhc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678574518; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=EtPldRtReupVv2Lpq23wF+tQDxiMdBhaxLJswll+Fk4=; b=ZIcSkkskvrXOQD4UbDTMf4GqE5mDiEvXu7JOE6D8CVe/sjgHN0/0t0XHTN8E4jYolE eZ9DtoMKQQkoIpz1KVdn80LxFBjS5gJVVgih+jGEI5AF/UhPgH8Wg/DZzRfeXLy7ysgv ecxnS6bk/ht492QDrfW4AmyZ9PnLTo5NBhXMOXQYvSJc7QqsS4wtCoZK68mbwg23dbJn FahkyBdMsQIHcrd+Maxyt5aIt4J1MXTe376upnc531Tq6x8MyLojwPRVEL3Ev0655lvz dtBIDYoyg/xONgkKYj4USWFaHTrbr8kWlBoyHYK7BisVGF0Ix9hUYcWJzU5IYzYH1xhs Nw3Q== X-Gm-Message-State: AO0yUKWVVmLVet4TdEWSpFRify1VySYBI2MU0pbgxs1ZHX+aM2nYNkeL lugtslQ5MAD87dzdCnleqH0xhUhhmL80j6Xnnt0= X-Google-Smtp-Source: AK7set9963CFi0hdrYP8LZAoPnk7LUnLEAnK+za0Xdc6P3qAdcnq/HmsIqk8Iq2sFXGt3CbqS3V2ig== X-Received: by 2002:a05:600c:4752:b0:3ea:e834:d0d1 with SMTP id w18-20020a05600c475200b003eae834d0d1mr6429000wmo.36.1678574518498; Sat, 11 Mar 2023 14:41:58 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:9dd5:bdbf:ef9d:c118]) by smtp.gmail.com with ESMTPSA id z9-20020a05600c114900b003dc5b59ed7asm3933164wmz.11.2023.03.11.14.41.57 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 14:41:58 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/8] libxml-perl: Add missing perl module ptest dependencies Date: Sat, 11 Mar 2023 22:41:51 +0000 Message-Id: <20230311224155.3442306-4-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> References: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> 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 ; Sat, 11 Mar 2023 22:42:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178370 Add dependencies on missing perl modules to fix execution in minimal images. Signed-off-by: Richard Purdie --- meta/recipes-devtools/perl/libxml-perl_0.08.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/perl/libxml-perl_0.08.bb b/meta/recipes-devtools/perl/libxml-perl_0.08.bb index 323853cc2f3..1b03e63a824 100644 --- a/meta/recipes-devtools/perl/libxml-perl_0.08.bb +++ b/meta/recipes-devtools/perl/libxml-perl_0.08.bb @@ -27,4 +27,4 @@ do_compile() { } RDEPENDS:${PN} += "perl-module-carp perl-module-overload perl-module-universal perl-module-io-handle" -RDEPENDS:${PN}-ptest += "libxml-parser-perl perl-module-file-glob" +RDEPENDS:${PN}-ptest += "libxml-parser-perl perl-module-file-glob perl-module-cwd perl-module-constant" From patchwork Sat Mar 11 22:41:52 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 20826 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 06829C7618A for ; Sat, 11 Mar 2023 22:42:09 +0000 (UTC) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by mx.groups.io with SMTP id smtpd.web11.55881.1678574521231312174 for ; Sat, 11 Mar 2023 14:42:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=YciVB7Dq; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.51, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f51.google.com with SMTP id l1so8139943wry.12 for ; Sat, 11 Mar 2023 14:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1678574519; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=bQGmrXXC/NzifmXRaeR2fu4zU5cX1vPor61syMfkuvk=; b=YciVB7DqKOPigoZ5ZXrOdfzd+cnHlaIuSHOTK/lwesflVHhjWchTyYCpdOCOW69nxd 1JxkVI4MokG4vM1cGN9bhrTQjijVExRJSvORAOAeOtRLIuMaef8m0S6EAcOhNGHxp3dZ CDUdYNwnE15G9cUIDkeU3yjVUd9btDhfIXIZU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678574519; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=bQGmrXXC/NzifmXRaeR2fu4zU5cX1vPor61syMfkuvk=; b=Fy+EmWMuQ/LUjVVYrxpNripQNq3fUgw69ficJID+QcHBituzIImzleRsRlw7QtGdZT WYTB1nYomQGoWVo8DxqBbfPxBzT2qVCegg1LICg1MqiRtNj8e7dU6V2uqCa0UtWEkz3y Qo7xSz8CNnxb8JA0u68W7H24CjnitzVKLsB/77K+/mnXzjQPx0HP0Zhh8S39FCtwkP5d aMx9ZBJM/1vFjfvd+28ftBKYaafaejWkBwCKV7MXSqkeKWNrmdArIEo9FEewhRCw2EHv s1CRJTOKuw7REb7GHIT8RieEEQziiz6ctImK+l+gf4w46O5zidKdqNxojEXlEvB8+g83 0xmQ== X-Gm-Message-State: AO0yUKVa1vnyExJUwSvHCU1BMqdnHlE2YbutE5IkM9KuqHkABNP4LJOk 9AYBprPFJwZWgGhrb2VO5A/foZdP0U7NFY0cRpA= X-Google-Smtp-Source: AK7set+C5iw0l1LkPn0pe18f1NId5zr3jOqvx4HKdvAqU0/PO3vxpJURdwiZVxnLlOV/n653gDh32w== X-Received: by 2002:adf:e5cf:0:b0:2c7:e60:abe8 with SMTP id a15-20020adfe5cf000000b002c70e60abe8mr4725324wrn.9.1678574519210; Sat, 11 Mar 2023 14:41:59 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:9dd5:bdbf:ef9d:c118]) by smtp.gmail.com with ESMTPSA id z9-20020a05600c114900b003dc5b59ed7asm3933164wmz.11.2023.03.11.14.41.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 14:41:58 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 5/8] gstreamer1.0: Add missing gconv ptest dependency Date: Sat, 11 Mar 2023 22:41:52 +0000 Message-Id: <20230311224155.3442306-5-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> References: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> 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 ; Sat, 11 Mar 2023 22:42:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178371 Add dependencies on missing gconv module to fix execution in minimal images. Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.bb b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.bb index 2f80b9ee3ed..11002e667d5 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer1.0_1.22.0.bb @@ -67,6 +67,8 @@ FILES:${PN}-dev += "${libdir}/gstreamer-1.0/*.a ${libdir}/gstreamer-1.0/include" FILES:${PN}-bash-completion += "${datadir}/bash-completion/completions/ ${datadir}/bash-completion/helpers/gst*" FILES:${PN}-dbg += "${datadir}/gdb ${datadir}/gstreamer-1.0/gdb" +RDEPENDS:${PN}-ptest:append:libc-glibc = " glibc-gconv-iso8859-5" + CVE_PRODUCT = "gstreamer" PTEST_BUILD_HOST_FILES = "" From patchwork Sat Mar 11 22:41:53 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 20824 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 04AD4C7618B for ; Sat, 11 Mar 2023 22:42:09 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web10.55949.1678574521421922019 for ; Sat, 11 Mar 2023 14:42:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=PcplMDsR; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.41, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f41.google.com with SMTP id x22so156916wmj.3 for ; Sat, 11 Mar 2023 14:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1678574520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=inCrZO2EMSO6kQueuAtFYYzBngDDrUh2ncp2rBESlLY=; b=PcplMDsRjJnp/ICsDvut8edy4RhBLeDUAPoCtvT3hEzGRPId/ZuO5dcMeQp06saZSs WGAWxL0XwQrjUPJeSZFlMBmxFWOkvICzEzhqQE/VxY+5kv7eXYvq4Ot/6y9utidYYly/ JmzZfNwqIpsGQU97KRPv9U+YFcOE0q3SACdLg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678574520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=inCrZO2EMSO6kQueuAtFYYzBngDDrUh2ncp2rBESlLY=; b=4+U3p93KojF0H0u28ej32iLTGaCaa2TerXO98yQsktV94TGTIXJB+gisoQMA+BIMxI 3L9K2R3K+bYg9BLFptJJpG/vLmk4q+ZoM31s9iKfI9BUlmrXC86HDnYMiRj0Kox0SEe8 vyLSKo9eGhD4zU8Trvn4MkTZk7bohhgfZjSlbUYBamJivT7Sugti6KdJB1NE8hzlHjHf GATOlSFW0kGunHHyVj0P5rkM6lFYGJliWD7sgBFSSgEllmNHLzqVLn6kGadpIxXec6AK wo9McXe/FoXd1udItC+5T1pYcS158eoep0zV9LOqEycHrQx9z98XF99hsY4ZcGR+qdjk JRrQ== X-Gm-Message-State: AO0yUKUL47BzeFnbFDqyCXrDF8Rx6qj3n4Yeo5gwmdwd+mQDvO5yQ4ib 8YQqVPU1gMD17COpJ2VWeLMLjM0agK0HUiFMrGM= X-Google-Smtp-Source: AK7set/Fygdw+ORZ7FWaqyw5Ond6EruK0aQnR32gherrntj2eo8e8Jn8NO+CYE6/3ZGhpDDo9QjkQw== X-Received: by 2002:a05:600c:3846:b0:3ea:f883:4ce with SMTP id s6-20020a05600c384600b003eaf88304cemr6396562wmr.20.1678574519829; Sat, 11 Mar 2023 14:41:59 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:9dd5:bdbf:ef9d:c118]) by smtp.gmail.com with ESMTPSA id z9-20020a05600c114900b003dc5b59ed7asm3933164wmz.11.2023.03.11.14.41.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 14:41:59 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 6/8] gnutls: Add missing python ptest dependency Date: Sat, 11 Mar 2023 22:41:53 +0000 Message-Id: <20230311224155.3442306-6-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> References: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> 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 ; Sat, 11 Mar 2023 22:42:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178372 Add dependency on python3 to fix execution in minimal images. Signed-off-by: Richard Purdie --- meta/recipes-support/gnutls/gnutls_3.8.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/gnutls/gnutls_3.8.0.bb b/meta/recipes-support/gnutls/gnutls_3.8.0.bb index 835ab122d84..7ddd2420bd5 100644 --- a/meta/recipes-support/gnutls/gnutls_3.8.0.bb +++ b/meta/recipes-support/gnutls/gnutls_3.8.0.bb @@ -80,6 +80,8 @@ FILES:${PN}-openssl = "${libdir}/libgnutls-openssl.so.*" FILES:${PN}-xx = "${libdir}/libgnutlsxx.so.*" FILES:${PN}-fips = "${bindir}/fipshmac" +RDEPENDS:${PN}-ptest += "python3" + BBCLASSEXTEND = "native nativesdk" pkg_postinst_ontarget:${PN}-fips () { From patchwork Sat Mar 11 22:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 20828 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 1E10AC76195 for ; Sat, 11 Mar 2023 22:42:09 +0000 (UTC) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) by mx.groups.io with SMTP id smtpd.web10.55951.1678574522030343246 for ; Sat, 11 Mar 2023 14:42:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=fbQIi71Q; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.44, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f44.google.com with SMTP id l7-20020a05600c1d0700b003eb5e6d906bso5580875wms.5 for ; Sat, 11 Mar 2023 14:42:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1678574520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=70cldgrl/0BrrQunPOXVGXkQVvOsQ8bUiXNfs3gIk2A=; b=fbQIi71QXtCtBmE+nClV5xl+THHymxMHKKjlIT55WyZqIJuJsVOIxkCsH0JOwcE0fV n8RxT5a2wS/iJSZK+5HNdOFyzv6IIgBVSmWwa+F3bvIXgjCq60nStjvgwnz4EUqzSAeg q1Vbnxu/fMUtoRaZYuYHiIyOvMqFDcx+oWIw0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678574520; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=70cldgrl/0BrrQunPOXVGXkQVvOsQ8bUiXNfs3gIk2A=; b=hu9R1k3NtGFx0fkG+ehVIZVxdZrpGvnK1c4nELgCfRuaz/2PMyzGQNSaJCbIJgRhQA iOOIL2pgPJFWlT/qF3q2yA8U1cLUVkM+hMBI0DIkLEgqRNOiXCCvjSSUWdd9bq64nWC+ AkNo6ovMqo1uVWaEO6ThghX8punt0DjKuujbUtyK7VNAB2DTXWyBF5xw7vgFM+Ki9BqJ 55m8rkYFAzzs/1PzWtSiQToFT1uO8uD4LwVYle/CtgeJMmk+772VhRkcmiQjzBJec/ij b042PZRZK4Gd1QZqqMOmLczsOKyVsjmMg4PspGetjjbA/STBf31UGJ+P3iDPQ4YStZFw XHsQ== X-Gm-Message-State: AO0yUKWIbGBqyOeRqL7UtggvjQjpmfJNzgwgjbOkXcgfdjyWOcu/T694 VC7iWtbkQA7hNSweQkC3kjy7Gm7OwQW5LW3eqTA= X-Google-Smtp-Source: AK7set9uxnkEfh7x2lXvlU0fksb4WCWW+yJyxX9sHHpINEiC02wfxLajOb3qosjytVWr+CdTghl0BA== X-Received: by 2002:a05:600c:458e:b0:3eb:37ce:4c3d with SMTP id r14-20020a05600c458e00b003eb37ce4c3dmr6540377wmo.38.1678574520342; Sat, 11 Mar 2023 14:42:00 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:9dd5:bdbf:ef9d:c118]) by smtp.gmail.com with ESMTPSA id z9-20020a05600c114900b003dc5b59ed7asm3933164wmz.11.2023.03.11.14.41.59 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 14:42:00 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 7/8] core-image-ptest: Switch to BBCLASSEXTEND parallel execution Date: Sat, 11 Mar 2023 22:41:54 +0000 Message-Id: <20230311224155.3442306-7-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> References: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> 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 ; Sat, 11 Mar 2023 22:42:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178373 Replace the two images where tests are run serially with an image per ptest in the form core-image-ptest-XXX using class extensions. The original two images are then replaced with dependencies on these images. This allows parallel execution of the tests. The downside to this approach is the parsing time of an image generating this number of class extensions is slow but making it easier to execute and collect test data should outweigh that. Signed-off-by: Richard Purdie --- .../images/core-image-ptest-all.bb | 29 ++++++-------- .../images/core-image-ptest-fast.bb | 24 ++---------- meta/recipes-core/images/core-image-ptest.bb | 39 +++++++++++++++++++ 3 files changed, 53 insertions(+), 39 deletions(-) create mode 100644 meta/recipes-core/images/core-image-ptest.bb diff --git a/meta/recipes-core/images/core-image-ptest-all.bb b/meta/recipes-core/images/core-image-ptest-all.bb index 1472451675e..1a3e979d7e3 100644 --- a/meta/recipes-core/images/core-image-ptest-all.bb +++ b/meta/recipes-core/images/core-image-ptest-all.bb @@ -1,25 +1,18 @@ -inherit features_check +DESCRIPTION = "Recipe to trigger execution of all ptest images." +HOMEPAGE = "https://www.yoctoproject.org/" + +LICENSE = "MIT" + +inherit features_check nopackages REQUIRED_DISTRO_FEATURES = "ptest" -require core-image-minimal.bb require conf/distro/include/ptest-packagelists.inc -DESCRIPTION += "Also includes ptest packages." -HOMEPAGE = "https://www.yoctoproject.org/" - # Include the full set of ptests -IMAGE_INSTALL += "${PTESTS_FAST} ${PTESTS_SLOW}" - -# This image is sufficiently large (~1.8GB) that we need to be careful that it fits in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1100MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1124288" +PTESTS = "${PTESTS_FAST} ${PTESTS_SLOW}" -# ptests need more memory than standard to avoid the OOM killer -# also lttng-tools needs /tmp that has at least 2G -QB_MEM = "-m 4096" +addtask do_testimage +do_testimage[noexec] = "1" +do_testimage[depends] = "${@' '.join(['core-image-ptest-'+x.replace('-ptest', '')+':do_testimage' for x in d.getVar('PTESTS').split()])}" -# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places -PTEST_EXPECT_FAILURE = "1" +do_build[depends] = "${@' '.join(['core-image-ptest-'+x.replace('-ptest', '')+':do_build' for x in d.getVar('PTESTS').split()])}" diff --git a/meta/recipes-core/images/core-image-ptest-fast.bb b/meta/recipes-core/images/core-image-ptest-fast.bb index 40df274c4c1..e768afb302b 100644 --- a/meta/recipes-core/images/core-image-ptest-fast.bb +++ b/meta/recipes-core/images/core-image-ptest-fast.bb @@ -1,24 +1,6 @@ -inherit features_check -REQUIRED_DISTRO_FEATURES = "ptest" +require core-image-ptest-all.bb -require core-image-minimal.bb -require conf/distro/include/ptest-packagelists.inc +DESCRIPTION = "Recipe to trigger execution of all fast ptest images." -# Include only fast (< 30 sec) ptests -IMAGE_INSTALL += "${PTESTS_FAST}" +PTESTS = "${PTESTS_FAST}" -DESCRIPTION += "Also includes ptest packages with fast execution times to allow for more automated QA." -HOMEPAGE = "https://www.yoctoproject.org/" - -# This image is sufficiently large (~1.8GB) that it can't actually fit in a live -# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the -# box) and explicitly add just 1500MB. -# strace-ptest in particular needs more than 500MB -IMAGE_OVERHEAD_FACTOR = "1.0" -IMAGE_ROOTFS_EXTRA_SPACE = "1524288" - -# ptests need more memory than standard to avoid the OOM killer -QB_MEM = "-m 1024" - -# Sadly at the moment the fast set of ptests is not robust enough and sporadically fails in a couple of places -PTEST_EXPECT_FAILURE = "1" diff --git a/meta/recipes-core/images/core-image-ptest.bb b/meta/recipes-core/images/core-image-ptest.bb new file mode 100644 index 00000000000..0c67943b057 --- /dev/null +++ b/meta/recipes-core/images/core-image-ptest.bb @@ -0,0 +1,39 @@ +inherit features_check +REQUIRED_DISTRO_FEATURES = "ptest" + +require core-image-minimal.bb +require conf/distro/include/ptest-packagelists.inc + +DESCRIPTION += "Also including the ${MCNAME} ptest package." +HOMEPAGE = "https://www.yoctoproject.org/" + +PTESTS = "${PTESTS_SLOW} ${PTESTS_FAST}" + +IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" + +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x.replace('-ptest', '') for x in d.getVar('PTESTS').split()])}" + +# The image can sufficiently large (~1.8GB) that we need to be careful that it fits in a live +# image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the +# box) and explicitly add up to 1500MB. +# strace-ptest in particular needs more than 500MB +IMAGE_OVERHEAD_FACTOR = "1.0" +IMAGE_ROOTFS_EXTRA_SPACE = "324288" +IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-strace = "1024288" +IMAGE_ROOTFS_EXTRA_SPACE:virtclass-mcextend-lttng-tools = "1524288" + +# ptests need more memory than standard to avoid the OOM killer +QB_MEM = "-m 1024" +QB_MEM:virtclass-mcextend-lttng-tools = "-m 4096" +QB_MEM:virtclass-mcextend-python3-cryptography = "-m 4096" + +TEST_SUITES = "ping ssh parselogs ptest" + +# Sadly at the moment the full set of ptests is not robust enough and sporadically fails in random places +PTEST_EXPECT_FAILURE = "1" + +python () { + if not d.getVar("MCNAME"): + raise bb.parse.SkipRecipe("No class extension set") +} + From patchwork Sat Mar 11 22:41:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 20827 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 1D804C7618E for ; Sat, 11 Mar 2023 22:42:09 +0000 (UTC) Received: from mail-wm1-f41.google.com (mail-wm1-f41.google.com [209.85.128.41]) by mx.groups.io with SMTP id smtpd.web11.55887.1678574522739811392 for ; Sat, 11 Mar 2023 14:42:03 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=EtaT9sSh; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.41, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f41.google.com with SMTP id t25-20020a1c7719000000b003eb052cc5ccso8476753wmi.4 for ; Sat, 11 Mar 2023 14:42:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1678574521; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=vXbVupZpOuutc0zm/GN7XSLVTTYeQda/cV1fjk9B4c0=; b=EtaT9sShz0Gxg7GocMPLYLerin0nBf0YOlXuUKuQ8xF3OeKJ7xqI8e4nx+2yY1GuR2 LN88LECsQf5bUUAHdCxurDzHlB+nZlU08/Q74ANITc8by3bV5FRQERc+g1i6FvtlKvS+ fNCYeX+kYfVHFv9XuAyOWLDfotqe3YTB4v2Ms= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678574521; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=vXbVupZpOuutc0zm/GN7XSLVTTYeQda/cV1fjk9B4c0=; b=1VyfVvGcjbiw3VU744XAHYLaPUJbyfmYEaeXLQpGfRbISRTv7S22z1J0vkE2tQgcwF EL234j00Neh9RX4uzlQUQuCxOUIQgEq+aIBV887qlGbJkeJwAIWgfb1s0wYcNpVAKxhA B7xmIriBm2O23XRS28DwCzgpZmcPPzanUSzMNiLLXkvjGmj+gh+IWGOCc7eBp0bp5WJ8 iJIDDFewmSlMe/h8kQ/MfHsyEituru04Js2iyexKkP1ZcYywjTmoT6RBI6963gqe2ecB ZnrhFTgUULTiwknwcD9yHCZbkZcg3MEs8B4e7+pvIKfKa5OcjgLb8RdXhd2EF0Gt4uOL 91YQ== X-Gm-Message-State: AO0yUKWj2cVl6WM5nDojqJBW3lG3jdkgDxOJoGYTFmJZcTZ/IsCRjTz+ UMKYQ+HF6D+KKK3HzJ7mrrXJ++xaXvxkJOBbfFQ= X-Google-Smtp-Source: AK7set8Jc18y9cD4i/Lk2Qz5J+29kbyzuZvpCOGjKwEFcWO/V/xC/VuMWnmK3uiEU8wX68rxdVXoYg== X-Received: by 2002:a05:600c:34c1:b0:3eb:383c:1876 with SMTP id d1-20020a05600c34c100b003eb383c1876mr6597927wmq.6.1678574520935; Sat, 11 Mar 2023 14:42:00 -0800 (PST) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:9dd5:bdbf:ef9d:c118]) by smtp.gmail.com with ESMTPSA id z9-20020a05600c114900b003dc5b59ed7asm3933164wmz.11.2023.03.11.14.42.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Mar 2023 14:42:00 -0800 (PST) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 8/8] ptest-packagelists: Simplify ptest list/code Date: Sat, 11 Mar 2023 22:41:55 +0000 Message-Id: <20230311224155.3442306-8-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> References: <20230311224155.3442306-1-richard.purdie@linuxfoundation.org> 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 ; Sat, 11 Mar 2023 22:42:09 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/178374 All the usage sites remove the -ptest suffix. Simply the original list instead and clean up the code. Signed-off-by: Richard Purdie --- meta/classes-recipe/ptest.bbclass | 2 +- .../distro/include/ptest-packagelists.inc | 250 +++++++++--------- .../images/core-image-ptest-all.bb | 4 +- meta/recipes-core/images/core-image-ptest.bb | 2 +- 4 files changed, 129 insertions(+), 129 deletions(-) diff --git a/meta/classes-recipe/ptest.bbclass b/meta/classes-recipe/ptest.bbclass index 0383206a6dd..a1c3c3f1a65 100644 --- a/meta/classes-recipe/ptest.bbclass +++ b/meta/classes-recipe/ptest.bbclass @@ -138,5 +138,5 @@ def package_qa_check_missing_ptest(pn, d, messages): return enabled_ptests = " ".join([d.getVar('PTESTS_FAST'), d.getVar('PTESTS_SLOW'), d.getVar('PTESTS_PROBLEMS')]).split() - if (pn + "-ptest").replace(d.getVar('MLPREFIX'), '') not in enabled_ptests: + if pn.replace(d.getVar('MLPREFIX'), '') not in enabled_ptests: oe.qa.handle_error("missing-ptest", "supports ptests but is not included in oe-core's ptest-packagelists.inc", d) diff --git a/meta/conf/distro/include/ptest-packagelists.inc b/meta/conf/distro/include/ptest-packagelists.inc index 0681b4b7a23..d60ebb38fc8 100644 --- a/meta/conf/distro/include/ptest-packagelists.inc +++ b/meta/conf/distro/include/ptest-packagelists.inc @@ -4,137 +4,137 @@ # ptests which take less than ~30s each # PTESTS_FAST = "\ - acl-ptest \ - apr-util-ptest \ - attr-ptest \ - babeltrace-ptest \ - babeltrace2-ptest \ - bc-ptest \ - bluez5-ptest \ - busybox-ptest \ - cpio-ptest \ - diffstat-ptest \ - diffutils-ptest \ - ethtool-ptest \ - expat-ptest \ - findutils-ptest \ - flex-ptest \ - gawk-ptest \ - gdbm-ptest \ - gdk-pixbuf-ptest \ - glib-networking-ptest \ - gzip-ptest \ - json-c-ptest \ - json-glib-ptest \ - libconvert-asn1-perl-ptest \ - liberror-perl-ptest \ - libgpg-error-ptest\ - libnl-ptest \ - libpcre-ptest \ - libssh2-ptest \ - libtimedate-perl-ptest \ - libtest-fatal-perl-ptest \ - libtest-needs-perl-ptest \ - libtest-warnings-perl-ptest \ - libtry-tiny-perl-ptest \ - liburi-perl-ptest \ - libusb1-ptest \ - libxml-namespacesupport-perl-ptest \ - libxml-perl-ptest \ - libxml-parser-perl-ptest \ - libxml-sax-perl-ptest \ - libxml-sax-base-perl-ptest \ - libxml-simple-perl-ptest \ - libxml2-ptest \ - lua-ptest \ - lzo-ptest \ - m4-ptest \ - nettle-ptest \ - opkg-ptest \ - pango-ptest \ - popt-ptest \ - python3-atomicwrites-ptest \ - python3-bcrypt-ptest \ - python3-hypothesis-ptest \ - python3-jinja2-ptest \ - python3-jsonpointer-ptest \ - python3-markupsafe-ptest \ - python3-more-itertools-ptest \ - python3-pluggy-ptest \ - python3-pyasn1-ptest \ - python3-pytz-ptest \ - python3-wcwidth-ptest \ - python3-webcolors-ptest \ - qemu-ptest \ - quilt-ptest \ - sed-ptest \ - slang-ptest \ - wayland-ptest \ - zlib-ptest \ + acl \ + apr-util \ + attr \ + babeltrace \ + babeltrace2 \ + bc \ + bluez5 \ + busybox \ + cpio \ + diffstat \ + diffutils \ + ethtool \ + expat \ + findutils \ + flex \ + gawk \ + gdbm \ + gdk-pixbuf \ + glib-networking \ + gzip \ + json-c \ + json-glib \ + libconvert-asn1-perl \ + liberror-perl \ + libgpg-error\ + libnl \ + libpcre \ + libssh2 \ + libtimedate-perl \ + libtest-fatal-perl \ + libtest-needs-perl \ + libtest-warnings-perl \ + libtry-tiny-perl \ + liburi-perl \ + libusb1 \ + libxml-namespacesupport-perl \ + libxml-perl \ + libxml-parser-perl \ + libxml-sax-perl \ + libxml-sax-base-perl \ + libxml-simple-perl \ + libxml2 \ + lua \ + lzo \ + m4 \ + nettle \ + opkg \ + pango \ + popt \ + python3-atomicwrites \ + python3-bcrypt \ + python3-hypothesis \ + python3-jinja2 \ + python3-jsonpointer \ + python3-markupsafe \ + python3-more-itertools \ + python3-pluggy \ + python3-pyasn1 \ + python3-pytz \ + python3-wcwidth \ + python3-webcolors \ + qemu \ + quilt \ + sed \ + slang \ + wayland \ + zlib \ " -PTESTS_FAST:append:libc-glibc = " glibc-tests-ptest" -PTESTS_PROBLEMS:remove:libc-glibc = "glibc-tests-ptest" -PTESTS_FAST:remove:mips64 = "qemu-ptest" -PTESTS_PROBLEMS:append:mips64 = " qemu-ptest" -PTESTS_FAST:remove:riscv32 = "qemu-ptest" -PTESTS_PROBLEMS:append:riscv32 = " qemu-ptest" +PTESTS_FAST:append:libc-glibc = " glibc-tests" +PTESTS_PROBLEMS:remove:libc-glibc = "glibc-tests" +PTESTS_FAST:remove:mips64 = "qemu" +PTESTS_PROBLEMS:append:mips64 = " qemu" +PTESTS_FAST:remove:riscv32 = "qemu" +PTESTS_PROBLEMS:append:riscv32 = " qemu" PTESTS_SLOW = "\ - apr-ptest \ - bzip2-ptest \ - coreutils-ptest \ - curl-ptest \ - dbus-ptest \ - e2fsprogs-ptest \ - elfutils-ptest \ - gettext-ptest \ - glib-2.0-ptest \ - gnutls-ptest \ - gstreamer1.0-ptest \ - libevent-ptest \ - libgcrypt-ptest \ - libmodule-build-perl-ptest \ - lttng-tools-ptest \ - openssh-ptest \ - openssl-ptest \ - parted-ptest \ - perl-ptest \ - python3-cryptography-ptest \ - python3-ptest \ - strace-ptest \ - tcl-ptest \ - util-linux-ptest \ - valgrind-ptest \ + apr \ + bzip2 \ + coreutils \ + curl \ + dbus \ + e2fsprogs \ + elfutils \ + gettext \ + glib-2.0 \ + gnutls \ + gstreamer1.0 \ + libevent \ + libgcrypt \ + libmodule-build-perl \ + lttng-tools \ + openssh \ + openssl \ + parted \ + perl \ + python3-cryptography \ + python3 \ + strace \ + tcl \ + util-linux \ + valgrind \ " -PTESTS_SLOW:remove:riscv64 = "valgrind-ptest" -PTESTS_PROBLEMS:append:riscv64 = " valgrind-ptest" -PTESTS_SLOW:append:libc-musl = " libc-test-ptest" -PTESTS_SLOW:remove:x86 = "valgrind-ptest" -PTESTS_PROBLEMS:append:x86 = " valgrind-ptest" +PTESTS_SLOW:remove:riscv64 = "valgrind" +PTESTS_PROBLEMS:append:riscv64 = " valgrind" +PTESTS_SLOW:append:libc-musl = " libc-test" +PTESTS_SLOW:remove:x86 = "valgrind" +PTESTS_PROBLEMS:append:x86 = " valgrind" -# ruby-ptest \ # Timeout -# lz4-ptest \ # Needs a rewrite -# rt-tests-ptest \ # Needs to be checked whether it runs at all -# bash-ptest \ # Test outcomes are non-deterministic by design -# ifupdown-ptest \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py -# mdadm-ptest \ # Tests rely on non-deterministic sleep() amounts -# libinput-ptest \ # Tests need an unloaded system to be reliable -# libpam-ptest \ # Needs pam DISTRO_FEATURE -# numactl-ptest \ # qemu not (yet) configured for numa; all tests are skipped -# libseccomp-ptest \ # tests failed: 38; add to slow tests once addressed -# python3-numpy-ptest \ # requires even more RAM and (possibly) disk space; multiple failures +# ruby \ # Timeout +# lz4 \ # Needs a rewrite +# rt-tests \ # Needs to be checked whether it runs at all +# bash \ # Test outcomes are non-deterministic by design +# ifupdown \ # Tested separately in lib/oeqa/selftest/cases/imagefeatures.py +# mdadm \ # Tests rely on non-deterministic sleep() amounts +# libinput \ # Tests need an unloaded system to be reliable +# libpam \ # Needs pam DISTRO_FEATURE +# numactl \ # qemu not (yet) configured for numa; all tests are skipped +# libseccomp \ # tests failed: 38; add to slow tests once addressed +# python3-numpy \ # requires even more RAM and (possibly) disk space; multiple failures PTESTS_PROBLEMS = "\ - ruby-ptest \ - lz4-ptest \ - rt-tests-ptest \ - bash-ptest \ - ifupdown-ptest \ - mdadm-ptest \ - libinput-ptest \ - libpam-ptest \ - libseccomp-ptest \ - numactl-ptest \ - python3-numpy-ptest \ + ruby \ + lz4 \ + rt-tests \ + bash \ + ifupdown \ + mdadm \ + libinput \ + libpam \ + libseccomp \ + numactl \ + python3-numpy \ " diff --git a/meta/recipes-core/images/core-image-ptest-all.bb b/meta/recipes-core/images/core-image-ptest-all.bb index 1a3e979d7e3..a912fa7ef66 100644 --- a/meta/recipes-core/images/core-image-ptest-all.bb +++ b/meta/recipes-core/images/core-image-ptest-all.bb @@ -13,6 +13,6 @@ PTESTS = "${PTESTS_FAST} ${PTESTS_SLOW}" addtask do_testimage do_testimage[noexec] = "1" -do_testimage[depends] = "${@' '.join(['core-image-ptest-'+x.replace('-ptest', '')+':do_testimage' for x in d.getVar('PTESTS').split()])}" +do_testimage[depends] = "${@' '.join(['core-image-ptest-'+x+':do_testimage' for x in d.getVar('PTESTS').split()])}" -do_build[depends] = "${@' '.join(['core-image-ptest-'+x.replace('-ptest', '')+':do_build' for x in d.getVar('PTESTS').split()])}" +do_build[depends] = "${@' '.join(['core-image-ptest-'+x+':do_build' for x in d.getVar('PTESTS').split()])}" diff --git a/meta/recipes-core/images/core-image-ptest.bb b/meta/recipes-core/images/core-image-ptest.bb index 0c67943b057..90c26641ba3 100644 --- a/meta/recipes-core/images/core-image-ptest.bb +++ b/meta/recipes-core/images/core-image-ptest.bb @@ -11,7 +11,7 @@ PTESTS = "${PTESTS_SLOW} ${PTESTS_FAST}" IMAGE_INSTALL:append = " ${MCNAME}-ptest openssh" -BBCLASSEXTEND = "${@' '.join(['mcextend:'+x.replace('-ptest', '') for x in d.getVar('PTESTS').split()])}" +BBCLASSEXTEND = "${@' '.join(['mcextend:'+x for x in d.getVar('PTESTS').split()])}" # The image can sufficiently large (~1.8GB) that we need to be careful that it fits in a live # image (which has a 4GB limit), so nullify the overhead factor (1.3x out of the