From patchwork Fri Jul 12 13:10:34 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 46252 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 619D7C3DA4B for ; Fri, 12 Jul 2024 13:10:42 +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.web10.7320.1720789839921394064 for ; Fri, 12 Jul 2024 06:10:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=TqA/1Otu; 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 5b1f17b1804b1-4266fd39527so14600965e9.1 for ; Fri, 12 Jul 2024 06:10:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1720789838; x=1721394638; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc:subject:date:message-id:reply-to; bh=X69PpHmxYiGLovRoxqoRyAd9y88kslYf3LzLQV8XlhE=; b=TqA/1Otu1+SX2OYeyx8kdFVZviYtiykz/D2JvhRfdIsbodrmavv7kiFqWtQwD8mEQD lc0LjwQwgjzPxzUVfG7pYsSW02XQzU3vpcmtDAqZVBKJFwalOUcIKxW/cqixj64zZrvf 97+kvi//yst+PuUquSac9QkSjCmuVPLxAN/Wk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720789838; x=1721394638; 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=X69PpHmxYiGLovRoxqoRyAd9y88kslYf3LzLQV8XlhE=; b=PYxf0C+5m/RdBK6o+PSgAV+qC50ihTwz2lhODrcb/xOl6Hmf3gtF3yupPsKX0B2cnK ar1EfVsM36KmYfg/ebJnukvbdNN80iNGjux83Aisi6jWsx/l0i9zXUHU8XzdPAc7B+xa bH85IiwSXm0000G8Ug0Wh6TmND6WBHE8rJaRNJ5t1A1CR8w3zL6jjhiMADmJGvE9RV84 YIGIn/+o3qWLyadnDvXmyS0KCl9i50zZYwpvLkQK/O7lUxjfEHdMzOIAq+xCHuuRXHt3 9XqRYROceiBMg7nRf1dLJqthisblAkf8Z6IXIMTkazjLBIkE8a/HXEtbS4f/QTETvAXt msKQ== X-Gm-Message-State: AOJu0Yzq+X6frHqyqi7Bzyzq1LCJlkq3YkrUxjDQbtmT3OGt1dbjtwDl 66KjuuOR7SVhmhsDUFALhxOi6ikzH3VqS1+oVB06GxGqfS3rbcw/krybFr1IFMJnDMSCpri4wI9 f X-Google-Smtp-Source: AGHT+IEpbixYP2g8he3ZuMCyGV9oeD9upgyS0kcsxrIfWBqBeWnodyF4p/c+jjmYuGeoutcn/J8S3g== X-Received: by 2002:a05:600c:3209:b0:426:5471:156a with SMTP id 5b1f17b1804b1-426707caee4mr68068285e9.13.1720789837859; Fri, 12 Jul 2024 06:10:37 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:c138:9d7a:7e79:ba70]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f23999csm23630235e9.8.2024.07.12.06.10.37 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 06:10:37 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] oeqa/selftest/incompatible_lic: Ensure tests work with ERROR_QA changes Date: Fri, 12 Jul 2024 14:10:34 +0100 Message-ID: <20240712131036.1598257-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.43.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 ; Fri, 12 Jul 2024 13:10:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201824 Recent changes to ERROR_QA meant that the build was failing in ways the test wasn't expecting. Tweak the tests to ensure those failures don't impact the test. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/incompatible_lic.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/incompatible_lic.py b/meta/lib/oeqa/selftest/cases/incompatible_lic.py index f4af67a239e..4c228de6a33 100644 --- a/meta/lib/oeqa/selftest/cases/incompatible_lic.py +++ b/meta/lib/oeqa/selftest/cases/incompatible_lic.py @@ -114,7 +114,7 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0* LGPL-3.0*" def test_bash_and_license(self): self.disable_class("create-spdx") - self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " & SomeLicense"') + self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " & SomeLicense"\nERROR_QA:remove = "license-exists"') error_msg = "ERROR: core-image-minimal-1.0-r0 do_rootfs: Package bash cannot be installed into the image because it has incompatible license(s): GPL-3.0-or-later" result = bitbake('core-image-minimal', ignore_status=True) @@ -123,12 +123,12 @@ INCOMPATIBLE_LICENSE:pn-core-image-minimal = "GPL-3.0* LGPL-3.0*" def test_bash_or_license(self): self.disable_class("create-spdx") - self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " | SomeLicense"') + self.write_config(self.default_config() + '\nLICENSE:append:pn-bash = " | SomeLicense"\nERROR_QA:remove = "license-exists license-file-missing"') bitbake('core-image-minimal') def test_bash_license_exceptions(self): - self.write_config(self.default_config() + '\nINCOMPATIBLE_LICENSE_EXCEPTIONS:pn-core-image-minimal = "bash:GPL-3.0-or-later"') + self.write_config(self.default_config() + '\nINCOMPATIBLE_LICENSE_EXCEPTIONS:pn-core-image-minimal = "bash:GPL-3.0-or-later"\nERROR_QA:remove = "license-incompatible"') bitbake('core-image-minimal') From patchwork Fri Jul 12 13:10:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 46251 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 3B173C2BD09 for ; Fri, 12 Jul 2024 13:10:42 +0000 (UTC) Received: from mail-wm1-f46.google.com (mail-wm1-f46.google.com [209.85.128.46]) by mx.groups.io with SMTP id smtpd.web11.7395.1720789840362080977 for ; Fri, 12 Jul 2024 06:10:40 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=QdeSTYfH; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.46, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f46.google.com with SMTP id 5b1f17b1804b1-4266fcb311cso13554135e9.1 for ; Fri, 12 Jul 2024 06:10:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1720789838; x=1721394638; darn=lists.openembedded.org; 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=sDGeFR0R1ljTatUZYKpjQjDL2a3esV6VyHrXQbmDsZY=; b=QdeSTYfHpiCTtwXRecniAJrrj048gX2yCQiL+FHLndKO4xIYc9gkSAylYkY74dO7dy rHUUGqsO60DpR3VYIZmRxMAmv8OUNEdDz/yY7fPKv2g0Bn/Vm2F4BLgYCy5WHQ4I+Rv2 LQ35SB2Yv8eYojzvRm/PIyxwZk2WRe5G27te4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720789838; x=1721394638; 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=sDGeFR0R1ljTatUZYKpjQjDL2a3esV6VyHrXQbmDsZY=; b=gms9wanTnhvsjOAOMBu8XNjyT51cCsZfT0n/xvrNu4JMqS8ptZkALfNljtc/MqBqQz bdRwgN4tVzwhCs/r5SFsBUlS0PTyuS/Ev32rPl3tkflmWf+89Xv6SOgvb/YOCqLIkix9 v8K9DTlM0Tt+c4LqBnw1taZI1N7ByT0QJQUkiDrwuUZqnBz1GDovWy3hEBg9sR9xFzgf tE2a6GjRpa70IJHPPH8QIJ3Hs9cxvwmsSRuMlTA/9WbmL7WEGP95tluKgkvVPsGOM9hk dL5jLK7HE31K3oY4OiUQaJg/a53LqxbGzvoFx7wFgKn+3rs1Xorh5ZdeUyRGgY+bW0FU RQRA== X-Gm-Message-State: AOJu0YxXSRE/O9xPzwp2tzmzX3mQ7S7Pw4Y+KpCYmreivJSqOW8gtaY/ JVrZhpd1cXUfqLhvtyivk1lm3vuWus32QvyKVn1DgR3zHRwbQMpRtBkZs/3J93QoZi/xFqmkhaM O X-Google-Smtp-Source: AGHT+IEb7WKgXaZBf7DTsD1PZf5zHNsd1ta7/O5XyH2UyWMPvgo7q17HfNoEUkbH+JpT2vX+pcS/Fw== X-Received: by 2002:a05:600c:2d43:b0:426:5fcc:deb0 with SMTP id 5b1f17b1804b1-426707e38bemr75181375e9.24.1720789838534; Fri, 12 Jul 2024 06:10:38 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:c138:9d7a:7e79:ba70]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f23999csm23630235e9.8.2024.07.12.06.10.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 06:10:38 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] oeqa/selftest/locale: Ensure tests work with ERROR_QA changes Date: Fri, 12 Jul 2024 14:10:35 +0100 Message-ID: <20240712131036.1598257-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240712131036.1598257-1-richard.purdie@linuxfoundation.org> References: <20240712131036.1598257-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 ; Fri, 12 Jul 2024 13:10:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201823 The recent ERROR_QA changes adding build_deps exposed what were warnings in thi test as it restricts the locales, then builds recipes with locale requirements that were not met (in bash, gawk and python3). Increase the list of generated locales to ensure this patches the recipes being built and hence allowing the build to succeed. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/locales.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/locales.py b/meta/lib/oeqa/selftest/cases/locales.py index 4ca8ffb7aac..ac4888ef669 100644 --- a/meta/lib/oeqa/selftest/cases/locales.py +++ b/meta/lib/oeqa/selftest/cases/locales.py @@ -14,7 +14,7 @@ class LocalesTest(OESelftestTestCase): features = [] features.append('EXTRA_IMAGE_FEATURES = "empty-root-password allow-empty-password allow-root-login"') features.append('IMAGE_INSTALL:append = " glibc-utils localedef"') - features.append('GLIBC_GENERATE_LOCALES = "en_US.UTF-8 fr_FR.UTF-8"') + features.append('GLIBC_GENERATE_LOCALES = "en_US.UTF-8 fr_FR.UTF-8 en_US.ISO-8859-1 de_DE.UTF-8 fr_FR.ISO-8859-1 zh_HK.BIG5-HKSCS tr_TR.UTF-8"') features.append('IMAGE_LINGUAS:append = " en-us fr-fr"') if binary_enabled: features.append('ENABLE_BINARY_LOCALE_GENERATION = "1"') From patchwork Fri Jul 12 13:10:36 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 46250 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 3DC21C41513 for ; Fri, 12 Jul 2024 13:10:42 +0000 (UTC) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mx.groups.io with SMTP id smtpd.web11.7397.1720789841612004975 for ; Fri, 12 Jul 2024 06:10:41 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=MXJs6zKt; spf=pass (domain: linuxfoundation.org, ip: 209.85.128.50, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wm1-f50.google.com with SMTP id 5b1f17b1804b1-4279ca8af51so8667565e9.3 for ; Fri, 12 Jul 2024 06:10:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1720789840; x=1721394640; darn=lists.openembedded.org; 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=k4U9Y2nwJ71OqXd5d695Fkn/6fyHGJ9gAEG5hiRzmio=; b=MXJs6zKtMZhyjjvgoOPCVHRxWwu1C2Uely3xt32rETdjIIpfSgE43J0BKqc0DHAFXv Pm/HHxBvxSRYDAddGhKT2Q+qGbmkix4JGXDGoxgME2u6D++u/ZF65OrYVgETGHwgL7ZC GC9N5NVjNdcgxrUec3w5Ib/xVtoesn1uDX2WE= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1720789840; x=1721394640; 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=k4U9Y2nwJ71OqXd5d695Fkn/6fyHGJ9gAEG5hiRzmio=; b=d2jUvf+QVsh3iaOqdDBGJvyqmKQDTE5KRjQNFtz5sS/F6G2YEeYu3di8M2iC7EOJfE RMr5i3QpnvcXjNYZWMEA3z2+kL9atx24eVnD0shBOUxSurKnrolYX/qPhv+eYlsT3YDo IieH0HlLJZfkQyjRoYSc3elTTvuLV1j1DMarHFC/na8feOKxjQpaxERi/xUH8vjN3/JD uytp6oENv0wXufL7FGR01V8gSaYRYUoO4q1VnHw4PTyENjLuxN1dAyGWNWeNA77vmIfg de1iicCe77ATI57kcL14xZBzR0skMJ4SSUuhFRTj/cTPq9/zj72Cafli46LszTsur3yU XzWg== X-Gm-Message-State: AOJu0Ywkv+FIdWLwPf0FodWJpylLJ5UmXcmREzQsMtpuu0iFdyHfsCYU HGl+qDeU8Q6HKomo0YFP0nl4ZmOmJn4leE4xJsYd9SqY9E1EWRiEmXEnUGvuslou7uKiHNGCG9N n X-Google-Smtp-Source: AGHT+IHd2+5oQABAkbjfzjyDwUsGj5i5A1ApoeKbGWEIkk+tb2VsDHsaxS0EVrtXk2DlmjHhew8DjQ== X-Received: by 2002:a05:600c:4a98:b0:426:64a2:5362 with SMTP id 5b1f17b1804b1-426707cf1bdmr86823825e9.8.1720789839741; Fri, 12 Jul 2024 06:10:39 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:c138:9d7a:7e79:ba70]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-4279f23999csm23630235e9.8.2024.07.12.06.10.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 12 Jul 2024 06:10:39 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] meson: Fix native meson config Date: Fri, 12 Jul 2024 14:10:36 +0100 Message-ID: <20240712131036.1598257-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240712131036.1598257-1-richard.purdie@linuxfoundation.org> References: <20240712131036.1598257-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 ; Fri, 12 Jul 2024 13:10:42 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/201825 When the optimization flags were reduced to a single option, a different and clearly untested codepath was used where the output was unquoted. This caused errors when testing meson in the SDK. Use repr() in the single item case as per the multiple item case to correctly quote the output and fix build failures. Signed-off-by: Richard Purdie --- meta/recipes-devtools/meson/meson_1.4.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/meson/meson_1.4.0.bb b/meta/recipes-devtools/meson/meson_1.4.0.bb index 5db100ff1cd..a0c2ee633ae 100644 --- a/meta/recipes-devtools/meson/meson_1.4.0.bb +++ b/meta/recipes-devtools/meson/meson_1.4.0.bb @@ -47,7 +47,7 @@ inherit meson-routines # them. def var_list2str(var, d): items = d.getVar(var).split() - return items[0] if len(items) == 1 else ', '.join(repr(s) for s in items) + return repr(items[0]) if len(items) == 1 else ', '.join(repr(s) for s in items) def generate_native_link_template(d): val = ['-L@{OECORE_NATIVE_SYSROOT}${libdir_native}',