From patchwork Thu Aug 11 14:28:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 11289 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 16F52C25B07 for ; Thu, 11 Aug 2022 14:28:20 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web11.7113.1660228096150811344 for ; Thu, 11 Aug 2022 07:28:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=AQcUMy8v; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.49, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f49.google.com with SMTP id z16so21487426wrh.12 for ; Thu, 11 Aug 2022 07:28:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:from:to:cc; bh=H5kvOH1fYbFNIGIc9bq5HeE28B8Z3VVm/KwdSA/PMyk=; b=AQcUMy8vV+3iZjIhdAFuUmd6cSgyHvi82J7J0x3xruJEuZ6knlTn7M/uAv+LDrqRgz 6M0xOjNB0n8oe693lCu565FEZDncTRUTfVf+QMlV45Uu2B5I9kli6RZzzE4r1Z/QYbDu JjinEqZIH6t74jA+DyYPXw/RcjGH/TmWesylw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from:x-gm-message-state:from:to:cc; bh=H5kvOH1fYbFNIGIc9bq5HeE28B8Z3VVm/KwdSA/PMyk=; b=OSZFv9GqHEKMfFYtI9p22NMSDksl/dLsoSXtJPLFh/XTEePqLatxt0fJSSWMvmHDys AnEO66yWsfwaJ7g5RwEOTyrleRXfXsCMv15+2+oYOggGKwjF8JkLmsmjFWrmbKLoYoCq vQKaMxtOyg4P5ioCzgIcdfPchPIbzl33SUOBQnPuRflB3ZYL95dqY6WnudICmqmnx8O2 KhL/9h7jUAj/2mPG+HMfxSCokCqCuqFHh7tLDLCKK3wAquOUZABpusHeE7SuYNA2WAO6 +FLhY3o67pjFETX8IhSTt8n5CyNXV+DGqLxDySnmjdMbTQWfK3ZpInOVJG2BHASoNYkF n3VA== X-Gm-Message-State: ACgBeo2uZ9Bo0RzezCOxjYne/XHXH82awTl0TeC40IVkoLywvKoFF75T L7kVZTfPj+rNTOG8M0aLO0a8hAmvwquT5w== X-Google-Smtp-Source: AA6agR4EmRAx+ae1WYTf/avAOX5f98d6aqWNO9+LMS7qjAN5JZjMyPrj4mSSIwvmdC6gTgsq4eY6qw== X-Received: by 2002:a05:6000:1a89:b0:222:c186:ca8a with SMTP id f9-20020a0560001a8900b00222c186ca8amr14504257wry.333.1660228093942; Thu, 11 Aug 2022 07:28:13 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:95c7:ec9:dfa1:7b7]) by smtp.gmail.com with ESMTPSA id 17-20020a05600c26d100b003a2f2bb72d5sm7367178wmv.45.2022.08.11.07.28.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 07:28:13 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/3] meta-skeleton/hello-mod: Switch to SPDX-License-Identifier Date: Thu, 11 Aug 2022 15:28:10 +0100 Message-Id: <20220811142812.651737-1-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.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 ; Thu, 11 Aug 2022 14:28:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169244 Signed-off-by: Richard Purdie --- .../recipes-kernel/hello-mod/files/hello.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c b/meta-skeleton/recipes-kernel/hello-mod/files/hello.c index 6b73a795240..4f73455d200 100644 --- a/meta-skeleton/recipes-kernel/hello-mod/files/hello.c +++ b/meta-skeleton/recipes-kernel/hello-mod/files/hello.c @@ -2,18 +2,7 @@ * * Copyright (C) 2011 Intel Corporation. All rights reserved. * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See - * the GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0-only * *****************************************************************************/ From patchwork Thu Aug 11 14:28:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 11288 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 03976C3F6B0 for ; Thu, 11 Aug 2022 14:28:20 +0000 (UTC) Received: from mail-wr1-f47.google.com (mail-wr1-f47.google.com [209.85.221.47]) by mx.groups.io with SMTP id smtpd.web10.7091.1660228097286714215 for ; Thu, 11 Aug 2022 07:28:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=OE8Gbbf2; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.47, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f47.google.com with SMTP id j7so21583327wrh.3 for ; Thu, 11 Aug 2022 07:28:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=8Y7hfn4xSsvnkkUrH6FeviVoaxtDRJl8r1oyMqlxfW8=; b=OE8Gbbf2riJaP4pChpDfICXC5snvmUaIW/HRRT/bQFT/IBCv4HRjHyPOvBbKh2jMsY CCEiuLqRZY28cLaO5sp5ylQi4we9I+agwXn66sjfmOkAXHADa/iJJU93HYufrGyxXCW4 htUfgptTHfhCnGNLe1/CWdNf7R1PoQqwSCon4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=8Y7hfn4xSsvnkkUrH6FeviVoaxtDRJl8r1oyMqlxfW8=; b=GXYjXqrntx5O4s7wrZkgfjzAghyR9K2USRSyb0933iF0z95Oc9WLlANggoNGIxwKuv g463M8gydJrp52gPx8mRU57j9BN9XDm6mPJap+h3u6hvpKxkPW0/jQubBzSd8+yKSJ8m TneJ9zYlnWDhwduA2KmpGd71yFZHm459ZiibKzASbMrQPbYcbkPY6wSQY6ZS2GFl9wUD 7wNfMUYnA+SMpSLfDFHfxwUKBSpL5N30xGfcLu54Ay9sCt4majeRNxNZblyEkSSJA6GJ M3HuwJOYzjzLWkkBytVJMPAJsMg4pB3p53X/QDi6T+o64LYhsmWpaAIQXuav0tbshq/U ws+Q== X-Gm-Message-State: ACgBeo3kTVv5G3yFNoAew0fWMyAvFs/7jozmtbKKOWdBgS27wgigYIYR /n1OGGPS0xDh3O02x6Rho0Rd0lXqgAHSgA== X-Google-Smtp-Source: AA6agR7sn4q3YDwFWbyGYumD8yUDUJ9FKSBdP+lkARpg5kdM7E4Dxnx//Z1utXX55ENsLcpxZzrO0g== X-Received: by 2002:a05:6000:c3:b0:21e:e081:4cc4 with SMTP id q3-20020a05600000c300b0021ee0814cc4mr19707185wrx.93.1660228095354; Thu, 11 Aug 2022 07:28:15 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:95c7:ec9:dfa1:7b7]) by smtp.gmail.com with ESMTPSA id 17-20020a05600c26d100b003a2f2bb72d5sm7367178wmv.45.2022.08.11.07.28.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 07:28:14 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/3] perf: Fix reproducibility issues with 5.19 onwards Date: Thu, 11 Aug 2022 15:28:11 +0100 Message-Id: <20220811142812.651737-2-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220811142812.651737-1-richard.purdie@linuxfoundation.org> References: <20220811142812.651737-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 ; Thu, 11 Aug 2022 14:28:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169245 In 5.19 onwards the build process changed and encoded full build paths into the output. Adapt the code to look more like our setuptools class calls. This seems to work ok with older kernels too. Signed-off-by: Richard Purdie --- meta/recipes-kernel/perf/perf.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 95e7eae9fee..95b4362958b 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -203,7 +203,7 @@ do_configure:prepend () { if [ -e "${S}/tools/perf/Makefile.perf" ]; then sed -i -e 's,\ .config-detected, $(OUTPUT)/config-detected,g' \ ${S}/tools/perf/Makefile.perf - sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(DESTDIR)\$(PYTHON_SITEPACKAGES_DIR)',g" \ + sed -i -e "s,prefix='\$(DESTDIR_SQ)/usr'$,prefix='\$(DESTDIR_SQ)/usr' --install-lib='\$(PYTHON_SITEPACKAGES_DIR)' --root='\$(DESTDIR)',g" \ ${S}/tools/perf/Makefile.perf # backport https://github.com/torvalds/linux/commit/e4ffd066ff440a57097e9140fa9e16ceef905de8 sed -i -e 's,\($(Q)$(SHELL) .$(arch_errno_tbl).\) $(CC) $(arch_errno_hdr_dir),\1 $(firstword $(CC)) $(arch_errno_hdr_dir),g' \ From patchwork Thu Aug 11 14:28:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Purdie X-Patchwork-Id: 11287 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 0253AC19F2A for ; Thu, 11 Aug 2022 14:28:20 +0000 (UTC) Received: from mail-wr1-f49.google.com (mail-wr1-f49.google.com [209.85.221.49]) by mx.groups.io with SMTP id smtpd.web12.7034.1660228098918025459 for ; Thu, 11 Aug 2022 07:28:19 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@linuxfoundation.org header.s=google header.b=FWxf5xsM; spf=pass (domain: linuxfoundation.org, ip: 209.85.221.49, mailfrom: richard.purdie@linuxfoundation.org) Received: by mail-wr1-f49.google.com with SMTP id l22so21551452wrz.7 for ; Thu, 11 Aug 2022 07:28:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=google; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc; bh=q6/wle1TK5bjvtPBBJ+rqNW6rWHWMofXvp6VhjD5UsQ=; b=FWxf5xsM/H7ih9GFgzgKTt6Quz8R1Bg2Qexc/TtYbzBPGvx3V2de1FwInb3fx03pdq pwqCsw6qbgz/8OLgN+w/ZIBe0Zv4Bde9FrrwDabij1A2O7+Jef4MfmZp3F2RWulXrSsQ 6UUrQXwBHD/U9UY3vOBAvgl29EKacsDQC9YPA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc; bh=q6/wle1TK5bjvtPBBJ+rqNW6rWHWMofXvp6VhjD5UsQ=; b=2Dfm73Byqa/Xybx55zgb2Io+PrnOnKqNG/rotby+YVZTfCI043M4KRvRr/f0szmCx8 88Ck655FzLzaPHa/sypYZoxVJ5a5njfIkZwup3BSdW0BkMklWIuKz76SMbp36eYmOy5y qbk67kpY8+6+d5902EgigAFdJbC8iqMHYvmsvs/S/h7omhyH8RqC7HLkyVg27KMnaiv9 fzgESSLd6NwQ/QoSdLmm5l4zM7QfEZ2/pcpvK0Vah3vQPyzajyoZsP/tzAyMrs8CQgYx Woo6qWFieMBXJfs/GIgA9+/GqOE6WpoIuMrR1kREEK0shU7SWI7E/By3acWKDlm6J1zt JzaQ== X-Gm-Message-State: ACgBeo1A/JcJEQz4kKYrE0BLlldRfNeaOvJatxIIFPaEgoTRl+5gjsK2 6Fx99HVHcGYRkj+XyIxqrNgWZUIEJb45XQ== X-Google-Smtp-Source: AA6agR4d5Ujfu5DDL9j3OsAdiEtkeEwVaymCvNEbotwvz3MGUvL8DDVekSBy0vMXrXhszhyw67fpCg== X-Received: by 2002:a5d:5a10:0:b0:221:7c17:abee with SMTP id bq16-20020a5d5a10000000b002217c17abeemr16857467wrb.698.1660228096652; Thu, 11 Aug 2022 07:28:16 -0700 (PDT) Received: from max.int.rpsys.net ([2001:8b0:aba:5f3c:95c7:ec9:dfa1:7b7]) by smtp.gmail.com with ESMTPSA id 17-20020a05600c26d100b003a2f2bb72d5sm7367178wmv.45.2022.08.11.07.28.15 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Aug 2022 07:28:15 -0700 (PDT) From: Richard Purdie To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/3] selftest/runtime_test: Use IMAGE_CLASSES for testimage Date: Thu, 11 Aug 2022 15:28:12 +0100 Message-Id: <20220811142812.651737-3-richard.purdie@linuxfoundation.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220811142812.651737-1-richard.purdie@linuxfoundation.org> References: <20220811142812.651737-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 ; Thu, 11 Aug 2022 14:28:20 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/169246 testimage should be included via IMAGE_CLASSES, not globally with INHERIT. Signed-off-by: Richard Purdie --- meta/lib/oeqa/selftest/cases/runtime_test.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/lib/oeqa/selftest/cases/runtime_test.py b/meta/lib/oeqa/selftest/cases/runtime_test.py index 7c3faefeaea..89c363dee44 100644 --- a/meta/lib/oeqa/selftest/cases/runtime_test.py +++ b/meta/lib/oeqa/selftest/cases/runtime_test.py @@ -121,7 +121,7 @@ class TestImage(OESelftestTestCase): if get_bb_var('DISTRO') == 'poky-tiny': self.skipTest('core-image-full-cmdline not buildable for poky-tiny') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' features += 'IMAGE_INSTALL:append = " libssl"\n' features += 'TEST_SUITES = "ping ssh selftest"\n' self.write_config(features) @@ -139,7 +139,7 @@ class TestImage(OESelftestTestCase): if get_bb_var('DISTRO') == 'poky-tiny': self.skipTest('core-image-full-cmdline not buildable for poky-tiny') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' features += 'TEST_SUITES = "ping ssh dnf_runtime dnf.DnfBasicTest.test_dnf_help"\n' # We don't yet know what the server ip and port will be - they will be patched # in at the start of the on-image test @@ -174,7 +174,7 @@ class TestImage(OESelftestTestCase): if get_bb_var('DISTRO') == 'poky-tiny': self.skipTest('core-image-full-cmdline not buildable for poky-tiny') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' features += 'TEST_SUITES = "ping ssh apt.AptRepoTest.test_apt_install_from_repo"\n' # We don't yet know what the server ip and port will be - they will be patched # in at the start of the on-image test @@ -224,7 +224,7 @@ class TestImage(OESelftestTestCase): qemu_packageconfig = get_bb_var('PACKAGECONFIG', 'qemu-system-native') qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' if 'gtk+' not in qemu_packageconfig: features += 'PACKAGECONFIG:append:pn-qemu-system-native = " gtk+"\n' if 'sdl' not in qemu_packageconfig: @@ -269,7 +269,7 @@ class TestImage(OESelftestTestCase): except subprocess.CalledProcessError as e: self.fail("Could not determine the path to dri drivers on the host via pkg-config.\nPlease install Mesa development files (particularly, dri.pc) on the host machine.") qemu_distrofeatures = get_bb_var('DISTRO_FEATURES', 'qemu-system-native') - features = 'INHERIT += "testimage"\n' + features = 'IMAGE_CLASSES += "testimage"\n' if 'opengl' not in qemu_distrofeatures: features += 'DISTRO_FEATURES:append = " opengl"\n' features += 'TEST_SUITES = "ping ssh virgl"\n'