From patchwork Tue May 21 10:36:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 43894 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 F3252C41513 for ; Tue, 21 May 2024 10:36:43 +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.16576.1716287794870228833 for ; Tue, 21 May 2024 03:36:35 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=emNtBDx4; 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 5b1f17b1804b1-420180b5838so21756715e9.2 for ; Tue, 21 May 2024 03:36:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1716287793; x=1716892593; 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=7okfzB76WjxIbLyXSkNOfdv3154Qhlyiow5JH0VGi6I=; b=emNtBDx4pIfz5WJujYFAbwvhTXyf59bQ2j2bbUqXIsCjsd9aJfNrEzebFGTGvbW2OY VDizldodYyIa0ud9UdJ8UeZFz5sqHo9hX083AW0xmLT2zdLIixOZ5W6ov8jD9oAms/AX 31t9ZEL9i/8TVRKyY/OxzbF8SCKEiu65ZHfMk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716287793; x=1716892593; 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=7okfzB76WjxIbLyXSkNOfdv3154Qhlyiow5JH0VGi6I=; b=oWofymjL8jazTXAS4xrZ5hDNZITE0XOY4RhGmpGkGHkqVhCyupEnGxI1O9i8x833q6 zCPtabxLqIdbHXij0DK3dXkdNFCoMxf7bM1kh+hWKas7nkghHpqgo11K4Jxrh3Uyovpu 6s0fG6rNDhJl7E4wF1+xSEKb8DY+nn6T2P0EVLfEuGuD5O4jVrjJTuYVQSy3qtM06Uvg ElwbgGbt+fiWYJ+eqjKJN7FbOoY7uUMU8zqRYaUbBCY/EO8dbk15qv2//QjdvdWQ0bD1 3uZH/JLIprCwoDHZlGCXcHxtFXQQYG/hjVkSLRJehKvlhCYJCcDkefltXMNLuRWmpo9x 3PQA== X-Gm-Message-State: AOJu0YzfXdXSo6JmjrPGOCwG4e2ldVg20Hb+VwPbqF1XimR2dX6opi4i FYPX/4WtjjcVkmnOzrbvuJZ6pU0ILZVI+M2ZVBD9ZC7OgfDmowalEGev5bVS06Z4/i+YaZW9Wlz JvUc= X-Google-Smtp-Source: AGHT+IGMOGyKd4KPRYRpwJtvyn7Sdk204GGn8AOm2oH3265Z8T91G5gf/NxgkwGekh9m6fWyzJ9Zag== X-Received: by 2002:a05:600c:4f50:b0:420:34a0:bb51 with SMTP id 5b1f17b1804b1-42034a0bbbemr118310175e9.18.1716287792641; Tue, 21 May 2024 03:36:32 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:1738:232d:aeeb:3bb7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f88111033sm495465355e9.34.2024.05.21.03.36.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 03:36:32 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] linux-yocto: Avoid QA check Date: Tue, 21 May 2024 11:36:29 +0100 Message-Id: <20240521103631.1122991-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.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 ; Tue, 21 May 2024 10:36:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199613 The kernel has special handling of ${S} and it is therefore expected to be empty at do_unpack time. For now, ignore this QA check until the kernel unpack process can be more standardised. Signed-off-by: Richard Purdie --- meta/classes-recipe/kernel-yocto.bbclass | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta/classes-recipe/kernel-yocto.bbclass b/meta/classes-recipe/kernel-yocto.bbclass index e8ff7311c32..f741a342d40 100644 --- a/meta/classes-recipe/kernel-yocto.bbclass +++ b/meta/classes-recipe/kernel-yocto.bbclass @@ -440,6 +440,11 @@ do_kernel_metadata[depends] = "kern-tools-native:do_populate_sysroot" do_kernel_metadata[file-checksums] = " ${@get_dirs_with_fragments(d)}" do_validate_branches[depends] = "kern-tools-native:do_populate_sysroot" +# ${S} doesn't exist for us at unpack +do_qa_unpack() { + return +} + do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}binutils:do_populate_sysroot" do_kernel_configme[depends] += "virtual/${TARGET_PREFIX}gcc:do_populate_sysroot" do_kernel_configme[depends] += "bc-native:do_populate_sysroot bison-native:do_populate_sysroot" From patchwork Tue May 21 10:36:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 43896 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 0C318C25B7A for ; Tue, 21 May 2024 10:36:44 +0000 (UTC) Received: from mail-lj1-f182.google.com (mail-lj1-f182.google.com [209.85.208.182]) by mx.groups.io with SMTP id smtpd.web10.16577.1716287796022681321 for ; Tue, 21 May 2024 03:36:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=T/YuiEOJ; spf=pass (domain: linuxfoundation.org, ip: 209.85.208.182, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-lj1-f182.google.com with SMTP id 38308e7fff4ca-2e6792ea67fso61004591fa.1 for ; Tue, 21 May 2024 03:36:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1716287794; x=1716892594; 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=YbB36eSATZ5ScAzMcA5xsS63+wvpCCFHxx6h8y6FpqM=; b=T/YuiEOJJTMj0Vw7ij5J9zatnTD4ofa090nAxfXrC60os4HCH3qRfdMeLTkMuCnzRr 6qpv3k0OjjkD41TlF3E5FLj2zyjnNtJSf0ZrqkVpB88XRl+W38AKpMhBHOBZg12zONY4 btPTpBaMMg6uFT5XAdypiJjL+P4ryewZnr2o4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716287794; x=1716892594; 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=YbB36eSATZ5ScAzMcA5xsS63+wvpCCFHxx6h8y6FpqM=; b=sE/bqp84jEiWtfl7Uie9UwGJRFyQtPA0Wbh9K0OE8JLXCANP+5MkVgw2+ybNXyKPcs urxCNqxVpZqx62dpxpnosPsjSLFHHMTmjAsmvmcJhpfugB9lC/16l8dqErvD4H6AoFsa TFcajNzJchiHImfTHFp2vSCTYZ7GZekNIfIQZFnXELi7Fy8GdIfTkWXNQKnSrSeaj9kh 7EXI5fzXSzZJ1pLtU/gFFJkV+0Ge3MREPif6gtEHAizrbRJ78cV7oqqUYBw+kbcbFexT XxG5yHlypm8finDJPXq95wvj3Ory6RBa/m6amvr+iFG/Upt9dewkb9CN2KaLr33rd5y4 fV2g== X-Gm-Message-State: AOJu0Yx+beWhaHYyN74q0KElURZrGMs/MULs3Y97NvlFnD2pRFs8uuzO oEYV9pBUy30Flu1LRdAXs14z95ayl8RM1hE5W1rx/m8UajbFuAa01kT5FzU0tVbLp+e9syrhSxe cYuA= X-Google-Smtp-Source: AGHT+IHXyEvscD08E7KjMp3GKx7NAUl1RrMHs9SN5Sk1fpqxmN2NW9gxTGPXiG2z70h0Y+3z1T8c4Q== X-Received: by 2002:a05:651c:543:b0:2e0:9646:8512 with SMTP id 38308e7fff4ca-2e52016b443mr227154301fa.31.1716287793712; Tue, 21 May 2024 03:36:33 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:1738:232d:aeeb:3bb7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f88111033sm495465355e9.34.2024.05.21.03.36.32 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 03:36:32 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] go: Drop fork of unpack code, mandate GO_SRCURI_DESTSUFFIX Date: Tue, 21 May 2024 11:36:30 +0100 Message-Id: <20240521103631.1122991-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240521103631.1122991-1-richard.purdie@linuxfoundation.org> References: <20240521103631.1122991-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 ; Tue, 21 May 2024 10:36:44 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199614 The go class has its own fork of the base unpack code. At the time I was told this was fine, it now isn't as that code is changing. Rather than have a fork, put the path magic into a variable and then go recipes can just set SRC_URI appropriately, e.g.: git://go.googlesource.com/example;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX} This avoids having special case hacks in the class and makes everything a little more obvious. Signed-off-by: Richard Purdie --- meta/classes-recipe/go.bbclass | 16 ++-------------- .../go-examples/go-helloworld_0.1.bb | 2 +- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/meta/classes-recipe/go.bbclass b/meta/classes-recipe/go.bbclass index d32509aa6d1..9146dd611e0 100644 --- a/meta/classes-recipe/go.bbclass +++ b/meta/classes-recipe/go.bbclass @@ -80,19 +80,7 @@ export GOPROXY ??= "https://proxy.golang.org,direct" export GOTMPDIR ?= "${WORKDIR}/build-tmp" GOTMPDIR[vardepvalue] = "" -python go_do_unpack() { - src_uri = (d.getVar('SRC_URI') or "").split() - if len(src_uri) == 0: - return - - fetcher = bb.fetch2.Fetch(src_uri, d) - for url in fetcher.urls: - if fetcher.ud[url].type == 'git': - if fetcher.ud[url].parm.get('destsuffix') is None: - s_dirname = os.path.basename(d.getVar('S')) - fetcher.ud[url].parm['destsuffix'] = os.path.join(s_dirname, 'src', d.getVar('GO_IMPORT')) + '/' - fetcher.unpack(d.getVar('WORKDIR')) -} +GO_SRCURI_DESTSUFFIX = "${@os.path.join(os.path.basename(d.getVar('S')), 'src', d.getVar('GO_IMPORT')) + '/'}" go_list_packages() { ${GO} list -f '{{.ImportPath}}' ${GOBUILDFLAGS} ${GO_INSTALL} | \ @@ -151,7 +139,7 @@ go_stage_testdata() { cd "$oldwd" } -EXPORT_FUNCTIONS do_unpack do_configure do_compile do_install +EXPORT_FUNCTIONS do_configure do_compile do_install FILES:${PN}-dev = "${libdir}/go/src" FILES:${PN}-staticdev = "${libdir}/go/pkg" diff --git a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb index 74f3520eaef..575ee81b50a 100644 --- a/meta/recipes-extended/go-examples/go-helloworld_0.1.bb +++ b/meta/recipes-extended/go-examples/go-helloworld_0.1.bb @@ -5,7 +5,7 @@ HOMEPAGE = "https://golang.org/" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" -SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https" +SRC_URI = "git://go.googlesource.com/example;branch=master;protocol=https;destsuffix=${GO_SRCURI_DESTSUFFIX}" SRCREV = "32022caedd6a177a7717aa8680cbe179e1045935" UPSTREAM_CHECK_COMMITS = "1" From patchwork Tue May 21 10:36:31 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 43895 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 F0C76C25B74 for ; Tue, 21 May 2024 10:36:43 +0000 (UTC) Received: from mail-lj1-f180.google.com (mail-lj1-f180.google.com [209.85.208.180]) by mx.groups.io with SMTP id smtpd.web10.16578.1716287797382835560 for ; Tue, 21 May 2024 03:36:37 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=HyDU/Nub; spf=pass (domain: linuxfoundation.org, ip: 209.85.208.180, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-lj1-f180.google.com with SMTP id 38308e7fff4ca-2e72224c395so22812351fa.3 for ; Tue, 21 May 2024 03:36:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; t=1716287795; x=1716892595; 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=duO5aaCzEOlUbBkuhWyM0GWERFwzquWZv3pBc3s5Pws=; b=HyDU/NubpEmIoLX0IMYdNzOkYTfdjZl7QeSsT2qfdOHhAtk71RSjfGB685IU3s2MRx Xs3ZNYM1myibxAg6g050UaQPS1UsL6kQ7a/OeW3CG97dZai76n6Jl932oyF57yVhKHxL FSv+NqQ3Opg+TjzfKJtrn1NGHonBPpkTWeBJc= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1716287795; x=1716892595; 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=duO5aaCzEOlUbBkuhWyM0GWERFwzquWZv3pBc3s5Pws=; b=Jv0NDKhyQ9jgdeJ2Kc2AhBF22Ngpmcwq1MCYJ9u1RtikjEY7CKpy7Pd7juo4/kU2+l om53Rmr5/BIGsPisUUzZjp48BJplX791STpu6Xer5whx7yVe2Bkp0PgG4RQZG1nsQBYK zj95tFOkCvMB8wAgnPKlnvyGVLbF7Y9i1V7FRbkErVZhS6q6Mao3bE7Ec6SbLigCN2vK kQKNFlUZ0l0YdUikOaJqzsJ4PN2kFGbHw8Ikb7qIjDT8awCONsPhhVuSpYF2xSEr8uCz v+M5b7fJhnKBt3kBrmLhfumlisk5xOPwmmcl2qow16Iq6OphJ1XAgHW2iKCWIEvFvhG/ HxkQ== X-Gm-Message-State: AOJu0YzpUhqTtxfvqLkl4/eJEX/OM04Hh3gI1TVEVKy+lt+Ty3gSmbxR QwjrFKzrv6mOvr6sTZ0vwon8l9A4JKky3aZHr5TRLgEoTUsq2Y40mYoDj+J7DmxsTexfwqURhUT WfcQ= X-Google-Smtp-Source: AGHT+IGOTrfHnPjF1OWjVjp83C+KnGvd3zOgAnJnKrpiw8S6Chggss65f1zDSq+X6j9EfQVp4JXiCA== X-Received: by 2002:a2e:7306:0:b0:2d8:b2e:7bf3 with SMTP id 38308e7fff4ca-2e51f263691mr193910171fa.0.1716287794924; Tue, 21 May 2024 03:36:34 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:1738:232d:aeeb:3bb7]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-41f88111033sm495465355e9.34.2024.05.21.03.36.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 21 May 2024 03:36:34 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] oeqa/sdk/assimp: Upgrade and fix for gcc 14 Date: Tue, 21 May 2024 11:36:31 +0100 Message-Id: <20240521103631.1122991-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20240521103631.1122991-1-richard.purdie@linuxfoundation.org> References: <20240521103631.1122991-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 ; Tue, 21 May 2024 10:36:43 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/199615 To enable this test to work with gcc 14, pass the option to make warnings non-fatal. Also upgrade to version 5.4.1 from 5.3.1. Signed-off-by: Richard Purdie --- meta/lib/oeqa/sdk/cases/cmake.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/sdk/cases/cmake.py b/meta/lib/oeqa/sdk/cases/cmake.py index 4886435ddf1..db7d826a38a 100644 --- a/meta/lib/oeqa/sdk/cases/cmake.py +++ b/meta/lib/oeqa/sdk/cases/cmake.py @@ -25,10 +25,10 @@ class CMakeTest(OESDKTestCase): def test_assimp(self): with tempfile.TemporaryDirectory(prefix="assimp", dir=self.tc.sdk_dir) as testdir: - tarball = self.fetch(testdir, self.td["DL_DIR"], "https://github.com/assimp/assimp/archive/v5.3.1.tar.gz") + tarball = self.fetch(testdir, self.td["DL_DIR"], "https://github.com/assimp/assimp/archive/v5.4.1.tar.gz") dirs = {} - dirs["source"] = os.path.join(testdir, "assimp-5.3.1") + dirs["source"] = os.path.join(testdir, "assimp-5.4.1") dirs["build"] = os.path.join(testdir, "build") dirs["install"] = os.path.join(testdir, "install") @@ -39,7 +39,7 @@ class CMakeTest(OESDKTestCase): self._run("sed -i '/# ifdef _FILE_OFFSET_BITS/I,+2 d' {source}/contrib/zlib/gzguts.h".format(**dirs)) os.makedirs(dirs["build"]) - self._run("cd {build} && cmake -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DASSIMP_BUILD_ZLIB=ON {source}".format(**dirs)) + self._run("cd {build} && cmake -DASSIMP_WARNINGS_AS_ERRORS=OFF -DCMAKE_VERBOSE_MAKEFILE:BOOL=ON -DASSIMP_BUILD_ZLIB=ON {source}".format(**dirs)) self._run("cmake --build {build} -- -j".format(**dirs)) self._run("cmake --build {build} --target install -- DESTDIR={install}".format(**dirs)) - self.check_elf(os.path.join(dirs["install"], "usr", "local", "lib", "libassimp.so.5.3.0")) + self.check_elf(os.path.join(dirs["install"], "usr", "local", "lib", "libassimp.so.5.4.1"))