From patchwork Sat Feb 11 21:23:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19376 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 8A461C61DA4 for ; Sat, 11 Feb 2023 21:24:07 +0000 (UTC) Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) by mx.groups.io with SMTP id smtpd.web11.19483.1676150640596151609 for ; Sat, 11 Feb 2023 13:24:01 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=EnIqRkQF; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id r3so281030pfh.4 for ; Sat, 11 Feb 2023 13:24:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=66Epp1WT//CDylnV1yd1XfOX/Z1jYHp03l1Hrh79QlE=; b=EnIqRkQFwVASR+BjBPYYWrcAXUcSAwhVjDCQU5xK7Wy2ajUQ7ohzOJi3hYH+0oZjlz HV/0udUwm9hJSE7EmEITFDnvpNBGnhqv1JfgFNh4FLhNxpGdmNJdViCx4sPPvl8LmlxH HXBJnGx5FN/CWnstXVdKfcLeRD220KQGhogd5fYDkC04iHhcI7gf+hPoL2XxzMTDeIh1 gihmXh3rDiNSUcPpYuGYckRR/TAE1i+brH4EBAxu5NYkx6BS9/mwo+FXHirOcfkAcwc9 xdViWdigd6+7BN5skCOUsTeSrshTAN3tOcfdmTgYTaxSRx86D2m4DBOjt7MWkam3O6km wG+w== 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 :subject:date:message-id:reply-to; bh=66Epp1WT//CDylnV1yd1XfOX/Z1jYHp03l1Hrh79QlE=; b=f/xNQZ+TgWIDIpWz7K2eEENzbH1iULgJMNkYwnt8bZ8br7zlknrfqCBtVlpBF6xUDC QovkZ7UoCuhrB0z8oYeamXzwiz+38heiK25A2CS5QdYe9UiwUmPM7gTbsfTeSXYI1cuk rQWwF9q8yh/t/rJLq277b7a1R2MLfsgD7rOqKo7pGJgJqtGQEw3fEIik3RXZDlfi8Ec5 5S7dw85A0149ZuOEPmMSXFzSsEBCVN1HYmV1QTAiyj601vGGkFr4OZlE+Wva0Ogi2MQr wTxrNOhL4wf2kxGvEDlVgLjVR6AfCx+a/wtmcbSGtVPyY8kMBtXWMtgoXaTkd7JKtvWI s8pQ== X-Gm-Message-State: AO0yUKXrrmXN3l31w+bZsEXi9m/xz4ys5ATG3IF2qVuek8vgNVwWAt8s R9TIh/jm+TbG7ofoB9STSHUoa28nhpTDd1w9fq8= X-Google-Smtp-Source: AK7set8WuoJB9JBwxGw9rwDgF+0pguq+kWLXa3kLPVkQ/WtM33xF7wJO4zqhfKw0hhu01VyDRnWAhw== X-Received: by 2002:aa7:95b7:0:b0:593:adeb:39c0 with SMTP id a23-20020aa795b7000000b00593adeb39c0mr18152767pfk.30.1676150639493; Sat, 11 Feb 2023 13:23:59 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.23.58 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:23:59 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 01/28] git: ignore CVE-2022-41953 Date: Sat, 11 Feb 2023 11:23:24 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177011 From: Ross Burton This is specific to Git-for-Windows. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit c8849af809e0213d43e18e5d01067eeeb61b330d) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git_2.37.4.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/git/git_2.37.4.bb b/meta/recipes-devtools/git/git_2.37.4.bb index 2205a50d16..8342b38313 100644 --- a/meta/recipes-devtools/git/git_2.37.4.bb +++ b/meta/recipes-devtools/git/git_2.37.4.bb @@ -31,6 +31,8 @@ CVE_PRODUCT = "git-scm:git" # in mirrored git repos. Most OE users wouldn't build the docs and # we don't see this as a major issue for our general users/usecases. CVE_CHECK_IGNORE += "CVE-2022-24975" +# This is specific to Git-for-Windows +CVE_CHECK_IGNORE += "CVE-2022-41953" PACKAGECONFIG ??= "expat curl" PACKAGECONFIG[cvsserver] = "" From patchwork Sat Feb 11 21:23:25 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19375 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 882FFC636CC for ; Sat, 11 Feb 2023 21:24:07 +0000 (UTC) Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) by mx.groups.io with SMTP id smtpd.web11.19486.1676150642154878587 for ; Sat, 11 Feb 2023 13:24:02 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=qJRQaVEY; spf=softfail (domain: sakoman.com, ip: 209.85.216.44, mailfrom: steve@sakoman.com) Received: by mail-pj1-f44.google.com with SMTP id w20-20020a17090a8a1400b00233d7314c1cso913826pjn.5 for ; Sat, 11 Feb 2023 13:24:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=0gT9ig93FTXsBE6vJBa3Um+vAWRm/k86mGffauQYAWQ=; b=qJRQaVEYQ6abmoP2qt3O1Sfk2jVlfSrwPyG+lDFFFL009rXIJpd1Pj24MROMKiSqHj c96UPtGps83ZvUt2nAFbQK0IvDr8Cl+GcptnT74QNeGVag3RXtJ22IneInN7jGGfWc5H jEIV+hWzmEALpDd9zCbokt2S+kg9VQGqS5SOaR8mX0j5Vn/RbDpobnYC5HdIKXtDWMQY 3Pma0NvsWXr/VpoiifjGwYC13owK6GatmaiF/pNlGtPR52tjn6DFxovUAuv0lC1MWqDu S1EP/D1s875frG6T51qSYWHZxTGz/2W7XDWS39E3+p5hqPGHw+YVjUHuC4kBp5V9+ZLZ hw9Q== 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 :subject:date:message-id:reply-to; bh=0gT9ig93FTXsBE6vJBa3Um+vAWRm/k86mGffauQYAWQ=; b=ybSydY0oeQUp1cQ9G8iI11Kfh/fqtk6JFabjz3N9m7GE3V91TYp2OnswFJsqUak2O4 wkHQlgAJ4WfFiUZi/qtz9QTf5JqvBtIh7xyYwflpHfuSkRSvmO/KueWR0Ad8SmPi83jp ukJYUL7Dz3R3Spa8FpFUnrYMiVU6+SYcOgyFvW18tfTUQVSjqhjgdc5fGoZq0SSKmyn/ ZgLQExjJ3JRluuYVo682kBFi6LKIMft5kGWrRhHl9AGzJBkc6Ek5MOOxFZrgXlKnD05K 8Vz3f1V2ItoGmHgASkgIlZkT5rkNZpkgb8AHV55ZicJxcSdPPsfxzu6bRRjp4O79x0fP gF2Q== X-Gm-Message-State: AO0yUKXD5oXqOpqODMCf/vq5RWRFzBghV8bsHpX2UPpVnie4CEmF0GxT GMCha7S9lWXIXpWujUyXjymwsN9saeuJWFBgkHA= X-Google-Smtp-Source: AK7set+iMjagFiPPZ6VxTiBo7mr8LwEQNBOiFCdOrVPGVxFPTPAq5Auc/eSZOYd0saZj8TdqTLaZxQ== X-Received: by 2002:a05:6a20:8e0f:b0:be:c7a3:2b91 with SMTP id y15-20020a056a208e0f00b000bec7a32b91mr24882851pzj.0.1676150641238; Sat, 11 Feb 2023 13:24:01 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:00 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 02/28] git: upgrade to 2.37.5 Date: Sat, 11 Feb 2023 11:23:25 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177012 From: Chee Yang Lee upgrade include fix for CVE-2022-23521 and CVE-2022-41903 Signed-off-by: Chee Yang Lee Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/{git_2.37.4.bb => git_2.37.5.bb} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) rename meta/recipes-devtools/git/{git_2.37.4.bb => git_2.37.5.bb} (98%) diff --git a/meta/recipes-devtools/git/git_2.37.4.bb b/meta/recipes-devtools/git/git_2.37.5.bb similarity index 98% rename from meta/recipes-devtools/git/git_2.37.4.bb rename to meta/recipes-devtools/git/git_2.37.5.bb index 8342b38313..ea53cc41e4 100644 --- a/meta/recipes-devtools/git/git_2.37.4.bb +++ b/meta/recipes-devtools/git/git_2.37.5.bb @@ -167,4 +167,4 @@ EXTRA_OECONF += "ac_cv_snprintf_returns_bogus=no \ " EXTRA_OEMAKE += "NO_GETTEXT=1" -SRC_URI[tarball.sha256sum] = "a638c9bf9e45e8d48592076266adaa9b7aa272a99ee2aee2e166a649a9ba8a03" +SRC_URI[tarball.sha256sum] = "5c11f90652afee6c77ef7ddfc672facd4bc6f2596d9627df2f1780664b058b9a" From patchwork Sat Feb 11 21:23:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19377 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 9E691C64EC4 for ; Sat, 11 Feb 2023 21:24:07 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.19561.1676150644242898900 for ; Sat, 11 Feb 2023 13:24:04 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rDJJK+C9; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id ea13so5671643pfb.13 for ; Sat, 11 Feb 2023 13:24:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=gACT8Kqq78INsNEdr5CStBfAmzgT0wPt94Z1IJ+AQ48=; b=rDJJK+C9UuKeBfb1q0SYeYVk4IksKsR4cu+axBop8BpcjXLNECDbOVsBSkdJZ05E0o qxaHXZve5GLGs3vdPT6RaI8miQVB/aOcS53+nDieLXC06qQLE/t6ilE2ULRl68cDvyHb tHI/A9KYyyn0+FvEpPRuedBbMU1T7VXuz2LMwn5GH+iaBreIv7QMvrYU50YXqz0Twgza eamUzzaB/mz6F9T+/YohM0hzBwm2xoISQd3W4WkIEVWAHJ7LrmyaChLPjIRmbqVzRiXD bJyyh7SLb6OsQNDJS+qqctbo4okGYXRKQMlIxzAhIZtak9lpY2Hu0EmhmKMe02XmjV3q OTNQ== 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 :subject:date:message-id:reply-to; bh=gACT8Kqq78INsNEdr5CStBfAmzgT0wPt94Z1IJ+AQ48=; b=24fQ7DetfkbHMbfKBzsRTvXGkaU0Iu1Klc3Rc4S5/TCwHx/nCyl0x6FtCybLNLzZUa EOgK+WvEJKFG5G9cyN6hI+NfEiLIX3FXuQ0M99a83Mq6ylgHGD29s0VWKqN8ck8IvvyW nR4DjPC0+N4pVKjmUXMTavDOUQRLenil013g7q4TwFMt41pPl5BTu4J7cTKoZJqc1tK8 C3691ORA+g2+iF3H0sOldjDCbULP3jroK37F1m7JEmBF2fWz8Ww1VfmSI0AstYC4ShkC 8OLQun0WVCqjgxP3HU7XEGwBiEnvHoLicAN6P/sX43KQ5/Q99y+hP5TC0cWlF8+88hnj vSGw== X-Gm-Message-State: AO0yUKXouWdndvuJRFZYFDUpi7oIyUhYOqbU/xVm7JQtS5cLyuB3mgBw JlHCevnlEA+FRT70QVj5mhZI2lmu72FRumC80Og= X-Google-Smtp-Source: AK7set96Qm0XQ9eFV0j6xIhhC8SP4g3zUufZvOw0XFPBwSn87hgJ4Tc8bvfCgK+wRxWVe/xOx9advg== X-Received: by 2002:a62:3807:0:b0:5a8:a9dd:b5aa with SMTP id f7-20020a623807000000b005a8a9ddb5aamr991615pfa.22.1676150643073; Sat, 11 Feb 2023 13:24:03 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:02 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 03/28] linux-yocto/5.15: update to v5.15.89 Date: Sat, 11 Feb 2023 11:23:26 -1000 Message-Id: <204f75167fd46928dd2e185572c082b64f5fa31d.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177013 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 3bcc86eb3ed9 Linux 5.15.89 37c18ef49ec3 pinctrl: amd: Add dynamic debugging for active GPIOs a5841b81adfa Revert "usb: ulpi: defer ulpi_register on ulpi_read_id timeout" 7ec9a45fc4ee block: handle bio_split_to_limits() NULL return ba86db02d408 io_uring/io-wq: only free worker if it was allocated for creation bb135bcc9499 io_uring/io-wq: free worker if task_work creation is canceled 63c2fa09b856 scsi: mpt3sas: Remove scsi_dma_map() error messages e2ea55564229 efi: fix NULL-deref in init error path 94b6cf84db42 arm64: cmpxchg_double*: hazard against entire exchange variable 3891fa4982b9 arm64: atomics: remove LL/SC trampolines 61e86339af2a arm64: atomics: format whitespace consistently ed4629d1e968 io_uring: lock overflowing for IOPOLL fbf501514182 KVM: x86: Do not return host topology information from KVM_GET_SUPPORTED_CPUID ee16841134be Documentation: KVM: add API issues section b8f3b3cffb4a mm: Always release pages to the buddy allocator in memblock_free_late(). d2dc110deabe platform/surface: aggregator: Add missing call to ssam_request_sync_free() cfd5978411ed igc: Fix PPS delta between two synchronized end-points 0bf52601ced1 perf build: Properly guard libbpf includes 205f35eee7be net/mlx5e: Don't support encap rules with gbp option 0526fc9330fe net/mlx5: Fix ptp max frequency adjustment range 9e2c38827cdc net/sched: act_mpls: Fix warning during failed attribute validation e3bb44beafde tools/nolibc: fix the O_* fcntl/open macro definitions for riscv 1e6ec75bb3b5 tools/nolibc: restore mips branch ordering in the _start block bd0431a66c39 tools/nolibc: Remove .global _start from the entry point code a77c54f5b50c tools/nolibc/arch: mark the _start symbol as weak da51e086d154 tools/nolibc/arch: split arch-specific code into individual files 8591e788bea3 tools/nolibc/types: split syscall-specific definitions into their own files 4fceecdeaa8a tools/nolibc/std: move the standard type definitions to std.h 1792136f228e tools/nolibc: use pselect6 on RISCV 487386a49e01 tools/nolibc: x86-64: Use `mov $60,%eax` instead of `mov $60,%rax` 27af4f2260cd tools/nolibc: x86: Remove `r8`, `r9` and `r10` from the clobber list a60b24192b1f af_unix: selftest: Fix the size of the parameter to connect() 39ae73e58111 nfc: pn533: Wait for out_urb's completion in pn533_usb_send_frame() f6003784b1f6 hvc/xen: lock console list traversal 79c58b74244d octeontx2-af: Fix LMAC config in cgx_lmac_rx_tx_enable 303d06288122 tipc: fix unexpected link reset due to discovery messages e79d0f97cc6e ALSA: usb-audio: Relax hw constraints for implicit fb sync c9557906bd3b ALSA: usb-audio: Make sure to stop endpoints before closing EPs 83e758105bc8 ASoC: wm8904: fix wrong outputs volume after power reactivation 7c26d218729b scsi: ufs: core: WLUN suspend SSU/enter hibern8 fail recovery 513fdf0b8e20 scsi: ufs: Stop using the clock scaling lock in the error handler 13259b60b71b scsi: mpi3mr: Refer CONFIG_SCSI_MPI3MR in Makefile 470f6a9175f1 regulator: da9211: Use irq handler when ready 24107ad469df x86/resctrl: Fix task CLOSID/RMID update race cd3da505fb35 EDAC/device: Fix period calculation in edac_device_reset_delay_period() ab0d02c53a60 x86/boot: Avoid using Intel mnemonics in AT&T syntax asm a90d339f1f66 powerpc/imc-pmu: Fix use of mutex in IRQs disabled section 511cf17b2447 netfilter: ipset: Fix overflow before widen in the bitmap_ip_create() function. b22faa21b623 sched/core: Fix use-after-free bug in dup_user_cpus_ptr() d766ccadbe85 iommu/mediatek-v1: Fix an error handling path in mtk_iommu_v1_probe() c929a230c844 iommu/iova: Fix alloc iova overflows issue 4b51aa263ae4 usb: ulpi: defer ulpi_register on ulpi_read_id timeout 9a8bf443f6a2 bus: mhi: host: Fix race between channel preparation and M0 event 456e3794e08a ipv6: raw: Deduct extension header length in rawv6_push_pending_frames 4c93422a54cd ixgbe: fix pci device refcount leak e97da5d97a97 platform/x86: sony-laptop: Don't turn off 0x153 keyboard backlight during probe f3b1e04daf86 dt-bindings: msm/dsi: Don't require vcca-supply on 14nm PHY 52a5f596c6cc dt-bindings: msm/dsi: Don't require vdds-supply on 10nm PHY 984ad875db80 drm/msm/dp: do not complete dp_aux_cmd_fifo_tx() if irq is not for aux transfer 92ae83665e9e platform/x86: ideapad-laptop: Add Legion 5 15ARH05 DMI id to set_fn_lock_led_list[] e38b5f81dfa8 dt-bindings: msm: dsi-phy-28nm: Add missing qcom, dsi-phy-regulator-ldo-mode bb32ab40cb7f dt-bindings: msm: dsi-controller-main: Fix description of core clock 3fb8d10beef9 dt-bindings: msm: dsi-controller-main: Fix power-domain constraint dc5b651cad66 drm/msm/adreno: Make adreno quirks not overwrite each other 757d665ee1fe dt-bindings: msm: dsi-controller-main: Fix operating-points-v2 constraint c90cf47d309a platform/x86: dell-privacy: Fix SW_CAMERA_LENS_COVER reporting 25b5f693bc2d platform/surface: aggregator: Ignore command messages not intended for us ee7b8ce2cc28 platform/x86: dell-privacy: Only register SW_CAMERA_LENS_COVER if present e0072068adaf cifs: Fix uninitialized memory read for smb311 posix symlink create f3495b5e9e68 net/mlx5e: Set action fwd flag when parsing tc action goto 1a8431cc202a drm/i915/gt: Reset twice 011ecdbcd520 drm/virtio: Fix GEM handle creation UAF 798dfeeae33d s390/percpu: add READ_ONCE() to arch_this_cpu_to_op_simple() a400593eb373 s390/cpum_sf: add READ_ONCE() semantics to compare and swap loops d4fa65960a9d ASoC: qcom: lpass-cpu: Fix fallback SD line index handling 8400b91c11db s390/kexec: fix ipl report address for kdump c07e0babd1df perf auxtrace: Fix address filter duplicate symbol selection e81d82da619a net: stmmac: add aux timestamps fifo clearance wait 44167b74a8a3 docs: Fix the docs build with Sphinx 6.0 24176bf2a145 efi: tpm: Avoid READ_ONCE() for accessing the event log 01b966b14c6e selftests: kvm: Fix a compile error in selftests/kvm/rseq_test.c c773ebe11c39 KVM: arm64: nvhe: Fix build with profile optimization c1d6a72fc810 KVM: arm64: Fix S1PTW handling on RO memslots e04e6cd8830f ALSA: hda/realtek: Enable mute/micmute LEDs on HP Spectre x360 13-aw0xxx b983c9a9714e ALSA: hda/realtek - Turn on power early 9ab3696881ca ALSA: control-led: use strscpy in set_led_id() a8acfe2c6fb9 netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits 90bb4f8f399f Linux 5.15.88 cbd3e6d5e516 ALSA: hda - Enable headset mic on another Dell laptop with ALC3254 b98dee474642 ALSA: hda/hdmi: Add a HP device 0x8715 to force connect list 26350c21bc5e ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF dadd0dcaa67d net/ulp: prevent ULP without clone op from entering the LISTEN status 04941c1d5bb5 net: sched: disallow noqueue for qdisc classes 068b51219362 serial: fixup backport of "serial: Deassert Transmit Enable on probe in driver-specific way" 46aa1557581f selftests/vm/pkeys: Add a regression test for setting PKRU through ptrace 3c1940c54922 x86/fpu: Emulate XRSTOR's behavior if the xfeatures PKRU bit is not set 3f1c81426a9f x86/fpu: Allow PKRU to be (once again) written by ptrace. b29773d6b0bb x86/fpu: Add a pkru argument to copy_uabi_to_xstate() 9813c5fc22bc x86/fpu: Add a pkru argument to copy_uabi_from_kernel_to_xstate(). fea26e83a196 x86/fpu: Take task_struct* in copy_sigframe_from_user_to_xstate() d4d152017e1d parisc: Align parisc MADV_XXX constants with all other architectures Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 6398ae4f5c5d07500ffdf0ae1bc0ecf80b63dbca) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index d4f5b1cb20..fe945f970b 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "62705725902924fafa34c7bcb4c18f2e3b7d473c" -SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5" +SRCREV_machine ?= "24b6f990294dadd1dad56030bb4f044f1cc550bc" +SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.87" +LINUX_VERSION ?= "5.15.89" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index a0af388e73..e3c5a3db22 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.87" +LINUX_VERSION ?= "5.15.89" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "6d10c8fe87e2037c751157ca8677588fa6e0f214" -SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5" +SRCREV_machine ?= "a615c596debf26252bbba9d03ac9eb30ed4d2819" +SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index a3895dde78..1154b0aa57 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "7463f1ff9674e97fa6bed05983d4828a219994d9" -SRCREV_machine:qemuarm64 ?= "09ebb2096efb9e23a1e2c47bf1926dbae0e3f051" -SRCREV_machine:qemumips ?= "a7058de4f88d9a7a3b3253a31bba703eaf6f78ea" -SRCREV_machine:qemuppc ?= "e43b0b8b142f689bc2e2297a5ca221fb0f802eb5" -SRCREV_machine:qemuriscv64 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemuriscv32 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemux86 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemux86-64 ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_machine:qemumips64 ?= "75a87ddede429ee1070118f54d38183ee4c81b59" -SRCREV_machine ?= "9768cdc48a9d6cdd9ce0aedc0037d45cfb3f1665" -SRCREV_meta ?= "ed03f6685c020866c2f32c4b14c4f343792146d5" +SRCREV_machine:qemuarm ?= "d624f7bdbfcfc826f4482e860698d4b7eb9bdbbe" +SRCREV_machine:qemuarm64 ?= "2c4a0624a2de2f262d8c86729e5fa15fc1e57fcc" +SRCREV_machine:qemumips ?= "99b36760d2ae2c97b9a300f2a9baf70f4d6aee8d" +SRCREV_machine:qemuppc ?= "7e2d97348966a55d5c4fcfd5bff9b2959becf2c8" +SRCREV_machine:qemuriscv64 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_machine:qemuriscv32 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_machine:qemux86 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_machine:qemux86-64 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_machine:qemumips64 ?= "574cd19f6aa1dc13e1b32d6197516f9859666d99" +SRCREV_machine ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" +SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "d57287729e229188e7d07ef0117fe927664e08cb" +SRCREV_machine:class-devupstream ?= "3bcc86eb3ed952c22ceecce8932dde72ea01f8cc" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.87" +LINUX_VERSION ?= "5.15.89" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Sat Feb 11 21:23:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19373 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 A0B86C64ED6 for ; Sat, 11 Feb 2023 21:24:07 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.19562.1676150646351225590 for ; Sat, 11 Feb 2023 13:24:06 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2a06DpBr; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id ct17so123768pfb.12 for ; Sat, 11 Feb 2023 13:24:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=0JMSy1ROvI83z3EkALuhXXIFsZ58dgYvYtU0zXQceiw=; b=2a06DpBrxPKepXKVGYMBlypPUJnwXMKPGzGBgG58PEICpQlqc/a1EUYKiXKE5kWOZQ lA2NiedapIBs4MLATA21y1dz6o7CYrWWgUKhqppjD3AY8qgK19CpfODvoPwZZgip7GVY znZ4spi0nm9L9y7QGICqs8qcQbUUoP9rzDqKDd3JQKPxyp9JP/TJDUxbdrDDrcqPpXtk eg6GgRNJSM8g3sYBNFfig0GVV9Y9s/xIurnwKPNpspJpqh1lfWVm3glJTatju/1kAeyB pgaL1qMNlj+W7HMA23evotth05P5bh+esJLLGIr/SGrAKRrx7ivdB86p3rFig+Ose8A/ E1Hw== 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 :subject:date:message-id:reply-to; bh=0JMSy1ROvI83z3EkALuhXXIFsZ58dgYvYtU0zXQceiw=; b=CcX+XnF0ouA8yx2fiDkFqkECFRPjq704sPlCCF+DqXubv7L8+BXqdBKUWAt0ecwH9T VOBkoL8QOzJuCM0qnI0kmuVOlTegLwF39nsbTcw6I4tQSa9XHzpBQTBAa+S+NmiHh7WW /OEQpjm+VRqNb8TbB/Rlib18JGK2ppnzIS7aQ7qT6wjIpXJgWCyMg5cbD/R52iDxk4AI VIfjG0Rfxg/2jhsJ3y6q5u5R/gBKUIL4IGmPf5YwCkjBud8Lh0rcKsyUvuaA3tUHiaJX Il6xZLeA+l9f5ol8TUR8Lb5Oz5gWns2khMc8mQOyTHTVdoh7s91GlGiVXYHbCgBNfTwT fZeQ== X-Gm-Message-State: AO0yUKXWt688Ys5DT8eViU5/S5nTyJA7pkuSUOa0ZPAx5ch2PqCAn51P duKjfRfXxNQleKrr8bNJdOJ7jJprjmPkMuyhybs= X-Google-Smtp-Source: AK7set/U1S4Yl2HXMeZQDltKwboCFDUEU82ERws5bJlJL9QylkEWNtIdmpDvXuDpqVgDQEsMuZVcbA== X-Received: by 2002:aa7:95b7:0:b0:593:adeb:39c0 with SMTP id a23-20020aa795b7000000b00593adeb39c0mr18152961pfk.30.1676150645048; Sat, 11 Feb 2023 13:24:05 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:04 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 04/28] linux-yocto/5.15: update to v5.15.91 Date: Sat, 11 Feb 2023 11:23:27 -1000 Message-Id: <03be035016d95fb7d3c7cbe535e187971a6b8d1e.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:07 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177014 From: Bruce Ashfield Updating to the latest korg -stable release that comprises the following commits: 9cf4111cdf94 Linux 5.15.91 14cc13e433e1 perf/x86/amd: fix potential integer overflow on shift of a int 033636b32258 netfilter: conntrack: unify established states for SCTP paths 0b08201158f1 x86/i8259: Mark legacy PIC interrupts with IRQ_LEVEL b57740036792 block: fix and cleanup bio_check_ro 1d152437e46f kbuild: Allow kernel installation packaging to override pkg-config a1964688582d cpufreq: governor: Use kobject release() method to free dbs_data 7c513ced0dec cpufreq: Move to_gov_attr_set() to cpufreq.h cf7a08622d2b Revert "Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode" 53c5d61198c1 tools: gpio: fix -c option of gpio-event-mon a7d1a303ff0f treewide: fix up files incorrectly marked executable 046fe53907c5 net: mdio-mux-meson-g12a: force internal PHY off on mux switch 86bdccde7842 net/tg3: resolve deadlock in tg3_reset_task() during EEH 4364bf79d829 thermal: intel: int340x: Add locking to int340x_thermal_get_trip_type() e69c3a0d9d3d net: mctp: mark socks as dead on unhash, prevent re-add 954cc215cd7a net: ravb: Fix possible hang if RIS2_QFF1 happen 0f7218bf0a00 net: ravb: Fix lack of register setting after system resumed for Gen3 3db4ca2938eb ravb: Rename "no_ptp_cfg_active" and "ptp_cfg_active" variables 621f296f11cf gpio: mxc: Unlock on error path in mxc_flip_edge() 071a8392869f nvme: fix passthrough csi check 614471b7f7cd riscv/kprobe: Fix instruction simulation of JALR 3391bd42351b sctp: fail if no bound addresses can be used for a given scope b0784860e145 net/sched: sch_taprio: do not schedule in taprio_reset() d2d3ab1b1de3 netrom: Fix use-after-free of a listening socket. 9df5ab02c65e netfilter: conntrack: fix vtag checks for ABORT/SHUTDOWN_COMPLETE ca3cf947760d ipv4: prevent potential spectre v1 gadget in fib_metrics_match() d50e7348b44f ipv4: prevent potential spectre v1 gadget in ip_metrics_convert() ead06e3449f2 netlink: annotate data races around sk_state c4eb423c6b9b netlink: annotate data races around dst_portid and dst_group fac9b69a9370 netlink: annotate data races around nlk->portid 8a13595600f7 netfilter: nft_set_rbtree: skip elements in transaction from garbage collection 2bf1435fa19d netfilter: nft_set_rbtree: Switch to node list walk for overlap detection e481654426b6 drm/i915/selftest: fix intel_selftest_modify_policy argument types 66689a72ba73 net: fix UaF in netns ops registration error path 41b74e95f297 netlink: prevent potential spectre v1 gadgets 2f29d780bd69 i2c: designware: use casting of u64 in clock multiplication to avoid overflow b03f7ed9af6e scsi: ufs: core: Fix devfreq deadlocks 858d7e9218e1 net: mana: Fix IRQ name - add PCI and queue number bff5243bd326 EDAC/qcom: Do not pass llcc_driv_data as edac_device_ctl_info's pvt_info 5eedf4568d34 EDAC/device: Respect any driver-supplied workqueue polling value 4b7dfd0a6811 ARM: 9280/1: mm: fix warning on phys_addr_t to void pointer assignment 7807871f28f8 ipv6: fix reachability confirmation with proxy_ndp f9a22f6fa187 thermal: intel: int340x: Protect trip temperature from concurrent updates 036093c08d83 KVM: arm64: GICv4.1: Fix race with doorbell on VPE activation/deactivation c56683c0623e KVM: x86/vmx: Do not skip segment attributes if unusable bit is set e91308e63710 ovl: fail on invalid uid/gid mapping at copy up 33a9657d67a4 ksmbd: limit pdu length size according to connection status 8d83a758ee21 ksmbd: downgrade ndr version error message to debug 87a7f38a9058 ksmbd: do not sign response to session request for guest login 4210c3555db4 ksmbd: add max connections parameter cc6742b160fa ksmbd: add smbd max io size parameter 3c8a5648a591 i2c: mv64xxx: Add atomic_xfer method to driver e619ab4fb3e9 i2c: mv64xxx: Remove shutdown method from driver 4b83bc6f87ee cifs: Fix oops due to uncleared server->smbd_conn in reconnect 89042d3d8542 ftrace/scripts: Update the instructions for ftrace-bisect.sh 592ba7116fa6 trace_events_hist: add check for return value of 'create_hist_field' b0af180514ed tracing: Make sure trace_printk() can output as soon as it can be used 91135d723388 module: Don't wait for GOING modules 85ee9919add9 KVM: SVM: fix tsc scaling cache logic f0227eca972c scsi: hpsa: Fix allocation size for scsi_host_alloc() e5af9a458a13 drm/amdgpu: complete gfxoff allow signal during suspend without delay 62b9e9f92109 Bluetooth: hci_sync: cancel cmd_timer if hci_open failed 21998acd31fb exit: Use READ_ONCE() for all oops/warn limit reads e82b1598eb2c docs: Fix path paste-o for /sys/kernel/warn_count 1c51698ad6f6 panic: Expose "warn_count" to sysfs 0691ddae56cd panic: Introduce warn_limit 7b98914a6c26 panic: Consolidate open-coded panic_on_warn checks fc636b136272 exit: Allow oops_limit to be disabled 339f8a8e5211 exit: Expose "oops_count" to sysfs f80fb0001f11 exit: Put an upper limit on how often we can oops 2857ce7f475f panic: Separate sysctl logic from CONFIG_SMP e156d4dcb036 ia64: make IA64_MCA_RECOVERY bool instead of tristate 9024f772248e csky: Fix function name in csky_alignment() and die() 2ea497d153da h8300: Fix build errors from do_exit() to make_task_dead() transition a452ca0228bb hexagon: Fix function name in die() 3b39f47474a2 objtool: Add a missing comma to avoid string concatenation 39a26d872178 exit: Add and use make_task_dead. b5c1acaa43b6 kasan: no need to unset panic_on_warn in end_report() b5c967dc6822 ubsan: no need to unset panic_on_warn in ubsan_epilogue() e4cd2100324e panic: unset panic_on_warn inside panic() 191f1f1f6a42 kernel/panic: move panic sysctls to its own file 654f6e851271 sysctl: add a new register_sysctl_init() interface 3aa991cde94b fs: reiserfs: remove useless new_opts in reiserfs_remount d830531f8fff x86: ACPI: cstate: Optimize C3 entry on AMD CPUs 1f5476223100 drm/i915: Remove unused variable 6e1012709320 Revert "selftests/bpf: check null propagation only neither reg is PTR_TO_BTF_ID" 619ee31b9641 drm/i915: Allow switching away via vga-switcheroo if uninitialized ea435ba9eb85 firmware: coreboot: Check size of table entry and use flex-array a4e70bcf2e87 lockref: stop doing cpu_relax in the cmpxchg loop b0ee61f5eeab platform/x86: asus-nb-wmi: Add alternate mapping for KEY_SCREENLOCK e8d2f7f56691 platform/x86: touchscreen_dmi: Add info for the CSL Panther Tab HD 2e0a8bacbe1d r8152: add vendor/device ID pair for Microsoft Devkit d4b717e34dac scsi: hisi_sas: Set a port invalid only if there are no devices attached when refreshing port id e15750aa28a6 KVM: s390: interrupt: use READ_ONCE() before cmpxchg() 9300c65207f3 spi: spidev: remove debug messages that access spidev->spi without locking 48ff5d381298 ASoC: fsl-asoc-card: Fix naming of AC'97 CODEC widgets 5001ffb31d63 ASoC: fsl_ssi: Rename AC'97 streams to avoid collisions with AC'97 CODEC b76120e20683 cpufreq: armada-37xx: stop using 0 as NULL pointer eda26fa8560d perf/x86/intel/uncore: Add Emerald Rapids 544f9d4e9d8a perf/x86/msr: Add Emerald Rapids b1eb964d785f s390: expicitly align _edata and _end symbols on page boundary fb45ec279b00 s390/debug: add _ASM_S390_ prefix to header guard cd488abed97e drm: Add orientation quirk for Lenovo ideapad D330-10IGL ff7ab370b855 net: usb: cdc_ether: add support for Thales Cinterion PLS62-W modem d6935084e444 ASoC: fsl_micfil: Correct the number of steps on SX controls ac07316b2d57 cpufreq: Add SM6375 to cpufreq-dt-platdev blocklist f0e6dcae1491 kcsan: test: don't put the expect array on the stack c51c0b37543a cpufreq: Add Tegra234 to cpufreq-dt-platdev blocklist 28e4e8ca9e95 scsi: iscsi: Fix multiple iSCSI session unbind events sent to userspace 14b1df2004fe tcp: fix rate_app_limited to default to 1 120b8e527e07 net: stmmac: enable all safety features by default a7d736cc3c6c thermal: core: call put_device() only after device_register() fails ed08f958e481 thermal/core: fix error code in __thermal_cooling_device_register() 108a6f91e276 thermal: Validate new state in cur_state_store() bd0ea77edf46 thermal/core: Rename 'trips' to 'num_trips' 521c6ebd4f6e thermal/core: Remove duplicate information when an error occurs 6504afa2632a net: dsa: microchip: ksz9477: port map correction in ALU table entry register 18346db1854a selftests/net: toeplitz: fix race on tpacket_v3 block close caa28c7c83e3 driver core: Fix test_async_probe_init saves device in wrong array 89c62cee5d4d w1: fix WARNING after calling w1_process() 3d0eafe413a7 w1: fix deadloop in __w1_remove_master_device() 7701a4bd45c1 device property: fix of node refcount leak in fwnode_graph_get_next_endpoint() ed0d8f731e0b ptdma: pt_core_execute_cmd() should use spinlock 29e9c67bf327 octeontx2-pf: Fix the use of GFP_KERNEL in atomic context on rt 03bff5819ad3 tcp: avoid the lookup process failing to get sk in ehash table 5bd69d2ea897 nvme-pci: fix timeout request state check 39178dfe8677 drm/amd/display: fix issues with driver unload 9a5a537e1444 phy: phy-can-transceiver: Skip warning if no "max-bitrate" 4095065b59bc dmaengine: xilinx_dma: call of_node_put() when breaking out of for_each_child_of_node() 5bd3c1c1bce1 cifs: fix potential deadlock in cache_refresh_path() 1a2a47b85cab HID: betop: check shape of output reports b2a730974373 l2tp: prevent lockdep issue in l2tp_tunnel_register() edf0e509cedd virtio-net: correctly enable callback during start_xmit d3401c7624ec net: macb: fix PTP TX timestamp failure due to packet padding 71c601965532 dmaengine: Fix double increment of client_count in dma_chan_get() 1e7919f0b156 drm/panfrost: fix GENERIC_ATOMIC64 dependency a1b3e50e2140 net: mlx5: eliminate anonymous module_init & module_exit 09e3fb6f53bc net/mlx5: E-switch, Fix setting of reserved fields on MODIFY_SCHEDULING_ELEMENT 01a6e108101f net: ipa: disable ipa interrupt during suspend 98aec50ff7f6 Bluetooth: Fix possible deadlock in rfcomm_sk_state_change 0e59f60b74cd usb: gadget: f_fs: Ensure ep0req is dequeued before free_request ae8e136bcaae usb: gadget: f_fs: Prevent race during ffs_ep0_queue_wait f25cd2b731d7 HID: revert CHERRY_MOUSE_000C quirk 39483511fd59 pinctrl: rockchip: fix mux route data for rk3568 1dae88a0b4df net: stmmac: fix invalid call to mdiobus_get_phy() 6716838bf801 HID: check empty report_list in bigben_probe() 2b4956825436 HID: check empty report_list in hid_validate_values() ad67de330d83 net: mdio: validate parameter addr in mdiobus_get_phy() 486912937933 net: usb: sr9700: Handle negative len 2827c4eb429d octeontx2-pf: Avoid use of GFP_KERNEL in atomic context 77e8ed776cdb l2tp: close all race conditions in l2tp_tunnel_register() af22d2c0b47f l2tp: convert l2tp_tunnel_list to idr 22c7d45ca3d7 l2tp: Don't sleep and disable BH under writer-side sk_callback_lock 87d9205d9a57 l2tp: Serialize access to sk_user_data with sk_callback_lock c53acbf2facf net/sched: sch_taprio: fix possible use-after-free 40516d042b65 net: stmmac: Fix queue statistics reading 620aa67f8059 pinctrl: rockchip: fix reading pull type on rk3568 ddca674af1ba pinctrl/rockchip: add error handling for pull/drive register getters 259ab8fb8c7e pinctrl/rockchip: Use temporary variable for struct device 8cbf932c5c40 wifi: rndis_wlan: Prevent buffer overflow in rndis_query_oid f792d26e5ce7 gpio: mxc: Always set GPIOs used as interrupt source to INPUT mode 8335f877efe7 gpio: mxc: Protect GPIO irqchip RMW with bgpio spinlock fb4fb3d267c9 gpio: use raw spinlock for gpio chip shadowed data 52e3eebfe670 sch_htb: Avoid grafting on htb_destroy_class_offload when destroying htb 8232e5a84d25 net: enetc: avoid deadlock in enetc_tx_onestep_tstamp() 95347e41cac6 net: wan: Add checks for NULL for utdm in undo_uhdlc_init and unmap_si_regs 7f129927feaf net: nfc: Fix use-after-free in local_cleanup() 397aaac88469 phy: rockchip-inno-usb2: Fix missing clk_disable_unprepare() in rockchip_usb2phy_power_on() 01bdcc73dbe7 bpf: Fix pointer-leak due to insufficient speculative store bypass mitigation 261e2f12b653 amd-xgbe: Delay AN timeout during KR training a8cf4af5441f amd-xgbe: TX Flow Ctrl Registers are h/w ver dependent 8e897cb67421 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60 0a27dcd53430 NFSD: fix use-after-free in nfsd4_ssc_setup_dul() 24af570c99b4 phy: ti: fix Kconfig warning and operator precedence 631fc3668539 arm64: dts: qcom: msm8992-libra: Fix the memory map dda20ffec8fb arm64: dts: qcom: msm8992-libra: Add CPU regulators 37ba5e929349 arm64: dts: qcom: msm8992: Don't use sfpb mutex bab87524f6d4 PM: AVS: qcom-cpr: Fix an error handling path in cpr_probe() b7a479c76481 affs: initialize fsdata in affs_truncate() 623d1116898e IB/hfi1: Remove user expected buffer invalidate race 47d5fc0dcd57 IB/hfi1: Immediately remove invalid memory from hardware 85caef2cfd1d IB/hfi1: Fix expected receive setup error exit issues cb193984d424 IB/hfi1: Reserve user expected TIDs 891ddfae39f1 IB/hfi1: Reject a zero-length user expected buffer 362c9489720b RDMA/core: Fix ib block iterator counter overflow e26c571c3b0d tomoyo: fix broken dependency on *.conf.default 7dfe83ecc341 firmware: arm_scmi: Harden shared memory access in fetch_notification a653dbb70cce firmware: arm_scmi: Harden shared memory access in fetch_response caffa7fed139 EDAC/highbank: Fix memory leak in highbank_mc_probe() 95de286200b2 reset: uniphier-glue: Fix possible null-ptr-deref 4773a8cf9a53 reset: uniphier-glue: Use reset_control_bulk API 7b33accc8ff9 soc: imx8m: Fix incorrect check for of_clk_get_by_name() f07427f8d9c6 arm64: dts: imx8mm-venice-gw7901: fix USB2 controller OC polarity c4cb73febe35 HID: intel_ish-hid: Add check for ishtp_dma_tx_map 25f97c9883bf ARM: imx: add missing of_node_put() 3e9d79ded9d6 arm64: dts: imx8mm-beacon: Fix ecspi2 pinmux 538135076191 ARM: dts: imx6qdl-gw560x: Remove incorrect 'uart-has-rtscts' 0e4bba1656a4 ARM: dts: imx7d-pico: Use 'clock-frequency' 108cf4c6d510 ARM: dts: imx6ul-pico-dwarf: Use 'clock-frequency' 207c9e64edba arm64: dts: imx8mp-phycore-som: Remove invalid PMIC property 7ce380fe7574 dmaengine: ti: k3-udma: Do conditional decrement of UDMA_CHAN_RT_PEER_BCNT_REG edba9b7a7037 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe() e66f6949da63 memory: atmel-sdramc: Fix missing clk_disable_unprepare in atmel_ramc_probe() eda11ab55614 memory: tegra: Remove clients SID override programming aabd5ba7e9b0 Linux 5.15.90 4b6f8263e931 io_uring/rw: remove leftover debug statement b10acfcd61b2 io_uring/rw: ensure kiocb_end_write() is always called 124fb13cc757 io_uring: fix double poll leak on repolling e944f1e37b97 io_uring: Clean up a false-positive warning from GCC 9.3.0 940e8922c1f5 mm/khugepaged: fix collapse_pte_mapped_thp() to allow anon_vma e83cc8a780e6 soc: qcom: apr: Make qcom,protection-domain optional again 982c8b1e95c0 Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()" 40a4797e08ec block: mq-deadline: Rename deadline_is_seq_writes() 3abf10b4c473 net/mlx5: fix missing mutex_unlock in mlx5_fw_fatal_reporter_err_work() 1aab00aa4192 net/ulp: use consistent error code when blocking ULP 2e4c95a404f3 io_uring/net: fix fast_iov assignment in io_setup_async_msg() 311b298a3337 io_uring: io_kiocb_update_pos() should not touch file for non -1 offset 487a086595b5 tracing: Use alignof__(struct {type b;}) instead of offsetof() 430443f8565e x86/fpu: Use _Alignof to avoid undefined behavior in TYPE_ALIGN f114717dfa74 Revert "drm/amdgpu: make display pinning more flexible (v2)" 7a993c1be595 efi: rt-wrapper: Add missing include de2af657cab9 arm64: efi: Execute runtime services from a dedicated stack 9cca110cf8bb fs/ntfs3: Fix attr_punch_hole() null pointer derenference d4d112e5c458 drm/amdgpu: drop experimental flag on aldebaran c82fa690da7c drm/amd/display: Fix COLOR_SPACE_YCBCR2020_TYPE matrix 88c33752248e drm/amd/display: Calculate output_color_space after pixel encoding adjustment 87e605b16111 drm/amd/display: Fix set scaling doesn's work 8687b8cdc3a3 drm/i915/display: Check source height is > 0 5d961791663d drm/i915: re-disable RC6p on Sandy Bridge e9a7ec188b26 mei: me: add meteor lake point M DID eb0421d90f91 gsmi: fix null-deref in gsmi_get_variable b8d99cda526b serial: atmel: fix incorrect baudrate setup b85498385afc serial: amba-pl011: fix high priority character transmission in rs486 mode 0f150134dd79 dmaengine: idxd: Let probe fail when workqueue cannot be enabled 1e8c127c2e81 dmaengine: tegra210-adma: fix global intr clear 473e2281f712 dmaengine: lgm: Move DT parsing after initialization 73337724cbd8 serial: pch_uart: Pass correct sg to dma_unmap_sg() 4307a41cbc44 dt-bindings: phy: g12a-usb3-pcie-phy: fix compatible string documentation c9d55f564a69 dt-bindings: phy: g12a-usb2-phy: fix compatible string documentation 78aa45bb7a42 usb-storage: apply IGNORE_UAS only for HIKSEMI MD202 on RTL9210 a69c8dfb85b4 usb: gadget: f_ncm: fix potential NULL ptr deref in ncm_bitrate() 1ab67e87b178 usb: gadget: g_webcam: Send color matching descriptor per frame b08167d8f07c usb: typec: altmodes/displayport: Fix pin assignment calculation 7fb1322e7a8c usb: typec: altmodes/displayport: Add pin assignment helper 59f9ee379640 usb: typec: tcpm: Fix altmode re-registration causes sysfs create fail a1c8a5c2f8aa usb: host: ehci-fsl: Fix module alias f073d10cd5a7 usb: cdns3: remove fetched trb from cache before dequeuing 73f4bde9730f USB: serial: cp210x: add SCALANCE LPE-9000 device id a2e075f40122 USB: gadgetfs: Fix race between mounting and unmounting 2da67bff29ab tty: fix possible null-ptr-defer in spk_ttyio_release cb53a3366eb2 tty: serial: qcom-geni-serial: fix slab-out-of-bounds on RX FIFO buffer f322dd2e4a1c staging: mt7621-dts: change some node hex addresses to lower case 6508788b2c3b bpf: restore the ebpf program ID for BPF_AUDIT_UNLOAD and PERF_BPF_EVENT_PROG_UNLOAD 7b122c33bd31 riscv: dts: sifive: fu740: fix size of pcie 32bit memory 701f9c3da692 thunderbolt: Use correct function to calculate maximum USB3 link rate 5b1b03a3d3e4 cifs: do not include page data when checking signature 64287cd456a2 btrfs: fix race between quota rescan and disable leading to NULL pointer deref f2e0e1615d65 btrfs: do not abort transaction on failure to write log tree when syncing log f653abe6195c mmc: sdhci-esdhc-imx: correct the tuning start tap and step setting 9881436f01ce mmc: sunxi-mmc: Fix clock refcount imbalance during unbind 33bd0db750fc ACPI: PRM: Check whether EFI runtime is available 87e1ee6058e5 comedi: adv_pci1760: Fix PWM instruction handling b5d24a8e4a61 usb: core: hub: disable autosuspend for TI TUSB8041 61a0890cb95a misc: fastrpc: Fix use-after-free race condition for maps 1b7b7bb400dd misc: fastrpc: Don't remove map on creater_process and device_release e7e41fcf909f USB: misc: iowarrior: fix up header size for USB_DEVICE_ID_CODEMERCS_IOW100 f3de34d90d90 staging: vchiq_arm: fix enum vchiq_status return types 16d09c4bc99b USB: serial: option: add Quectel EM05CN modem 34d769f0c607 USB: serial: option: add Quectel EM05CN (SG) modem 768d56ed2411 USB: serial: option: add Quectel EC200U modem 829916f069a7 USB: serial: option: add Quectel EM05-G (RS) modem eb8808f769c6 USB: serial: option: add Quectel EM05-G (CS) modem 6e0430db195e USB: serial: option: add Quectel EM05-G (GR) modem f01aefe374d3 prlimit: do_prlimit needs to have a speculation check 418e2c756d65 xhci: Detect lpm incapable xHC USB3 roothub ports from ACPI tables 10cb7d53be5f usb: acpi: add helper to check port lpm capability using acpi _DSM 1818e2a97dab xhci: Add a flag to disable USB3 lpm on a xhci root port level. 8911ff796336 xhci: Add update_hub_device override for PCI xHCI hosts c462ac871f49 xhci: Fix null pointer dereference when host dies f39c813af0b6 usb: xhci: Check endpoint is valid before dereferencing it 0f175cebc46c xhci-pci: set the dma max_seg_size 89a410dbd0f1 io_uring/rw: defer fsnotify calls to task context 05d69b372b3b io_uring: do not recalculate ppos unnecessarily ff8a070253d9 io_uring: update kiocb->ki_pos at execution time b7958caf415b io_uring: remove duplicated calls to io_kiocb_ppos 86e2d6901a37 io_uring: ensure that cached task references are always put on exit 30b90689344b io_uring: fix async accept on O_NONBLOCK sockets a79b13f24967 io_uring: allow re-poll if we made progress 3c1a3d02690f io_uring: support MSG_WAITALL for IORING_OP_SEND(MSG) 390b8816317f io_uring: add flag for disabling provided buffer recycling 9b7b0f2116d5 io_uring: ensure recv and recvmsg handle MSG_WAITALL correctly cdc68e714d0b io_uring: improve send/recv error handling ccf06b5a981c io_uring: pass in EPOLL_URING_WAKE for eventfd signaling and wakeups 77baf39227c0 eventfd: provide a eventfd_signal_mask() helper a2d8ff00a7b0 eventpoll: add EPOLL_URING_WAKE poll wakeup flag a9aa4aa7a5b2 io_uring: don't gate task_work run on TIF_NOTIFY_SIGNAL bd9a23a4bb8a hugetlb: unshare some PMDs when splitting VMAs 393d9e3ed10c drm/amd: Delay removal of the firmware framebuffer 865e244e06c7 drm/amdgpu: disable runtime pm on several sienna cichlid cards(v2) 560373fb1e9a ALSA: hda/realtek: fix mute/micmute LEDs don't work for a HP platform 26264260a80b ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook 1026756321bd efi: fix userspace infinite retry read efivars after EFI runtime services page fault 45627a1a6450 nilfs2: fix general protection fault in nilfs_btree_insert() 350d66d9e730 zonefs: Detect append writes at invalid locations 5054d001ffaf Add exception protection processing for vd in axi_chan_handle_err function a12fd43bd175 wifi: mac80211: sdata can be NULL during AMPDU start f96a6c009ed9 wifi: brcmfmac: fix regression for Broadcom PCIe wifi devices 908d1742b6e6 Bluetooth: hci_qca: Fix driver shutdown on closed serdev 7530fbc05ff5 fbdev: omapfb: avoid stack overflow warning e1df7f0b27c2 perf/x86/rapl: Treat Tigerlake like Icelake 2c129e868992 f2fs: let's avoid panic if extent_tree is not created 58bac7440251 x86/asm: Fix an assembler warning with current binutils fdb4a70bb768 btrfs: always report error in run_one_delayed_ref() f641067ea2af RDMA/srp: Move large values to a new enum for gcc13 793f8ac21874 r8169: move rtl_wol_enable_rx() and rtl_prepare_power_down() dc072762f900 net/ethtool/ioctl: return -EOPNOTSUPP if we have no phy stats 308d24d87599 vduse: Validate vq_num in vduse_validate_config() 8e1eb926a093 virtio_pci: modify ENOENT to EINVAL 64a6f3689d0d tools/virtio: initialize spinlocks in vring_test.c 95fc28a8e921 selftests/bpf: check null propagation only neither reg is PTR_TO_BTF_ID d4a9d2944f2e pNFS/filelayout: Fix coalescing test for single DS 6a3319af6b36 btrfs: fix trace event name typo for FLUSH_DELAYED_REFS Signed-off-by: Bruce Ashfield Signed-off-by: Richard Purdie (cherry picked from commit 60c0f2100303bce62711c05efe9c8b775a804045) Signed-off-by: Steve Sakoman --- .../linux/linux-yocto-rt_5.15.bb | 6 ++--- .../linux/linux-yocto-tiny_5.15.bb | 6 ++--- meta/recipes-kernel/linux/linux-yocto_5.15.bb | 26 +++++++++---------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb index fe945f970b..8d299ca059 100644 --- a/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-rt_5.15.bb @@ -11,13 +11,13 @@ python () { raise bb.parse.SkipRecipe("Set PREFERRED_PROVIDER_virtual/kernel to linux-yocto-rt to enable it") } -SRCREV_machine ?= "24b6f990294dadd1dad56030bb4f044f1cc550bc" -SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" +SRCREV_machine ?= "0567deb52d2f2c3cd3046f56ca3fb97a151cf6ec" +SRCREV_meta ?= "8df0d345ef202197eef82942933161213d4d1846" SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;branch=${KBRANCH};name=machine \ git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" -LINUX_VERSION ?= "5.15.89" +LINUX_VERSION ?= "5.15.91" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" diff --git a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb index e3c5a3db22..400ef75cc2 100644 --- a/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto-tiny_5.15.bb @@ -5,7 +5,7 @@ KCONFIG_MODE = "--allnoconfig" require recipes-kernel/linux/linux-yocto.inc -LINUX_VERSION ?= "5.15.89" +LINUX_VERSION ?= "5.15.91" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" @@ -14,8 +14,8 @@ DEPENDS += "openssl-native util-linux-native" KMETA = "kernel-meta" KCONF_BSP_AUDIT_LEVEL = "2" -SRCREV_machine ?= "a615c596debf26252bbba9d03ac9eb30ed4d2819" -SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" +SRCREV_machine ?= "01c387906b52214892aaea0664b3b4ead35fe484" +SRCREV_meta ?= "8df0d345ef202197eef82942933161213d4d1846" PV = "${LINUX_VERSION}+git${SRCPV}" diff --git a/meta/recipes-kernel/linux/linux-yocto_5.15.bb b/meta/recipes-kernel/linux/linux-yocto_5.15.bb index 1154b0aa57..60c088b9fe 100644 --- a/meta/recipes-kernel/linux/linux-yocto_5.15.bb +++ b/meta/recipes-kernel/linux/linux-yocto_5.15.bb @@ -13,24 +13,24 @@ KBRANCH:qemux86 ?= "v5.15/standard/base" KBRANCH:qemux86-64 ?= "v5.15/standard/base" KBRANCH:qemumips64 ?= "v5.15/standard/mti-malta64" -SRCREV_machine:qemuarm ?= "d624f7bdbfcfc826f4482e860698d4b7eb9bdbbe" -SRCREV_machine:qemuarm64 ?= "2c4a0624a2de2f262d8c86729e5fa15fc1e57fcc" -SRCREV_machine:qemumips ?= "99b36760d2ae2c97b9a300f2a9baf70f4d6aee8d" -SRCREV_machine:qemuppc ?= "7e2d97348966a55d5c4fcfd5bff9b2959becf2c8" -SRCREV_machine:qemuriscv64 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_machine:qemuriscv32 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_machine:qemux86 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_machine:qemux86-64 ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_machine:qemumips64 ?= "574cd19f6aa1dc13e1b32d6197516f9859666d99" -SRCREV_machine ?= "d925567cd9aafb12f3d4e2d5ff7880795002257e" -SRCREV_meta ?= "78c4410c172946903e35ba8cebf1cf90fad09b5a" +SRCREV_machine:qemuarm ?= "9c525056e4d5c3852fff6058bd7f6a648a3b645e" +SRCREV_machine:qemuarm64 ?= "30e3bff02675a3d10bd04c51f52f4a6b17b94d01" +SRCREV_machine:qemumips ?= "0dda96ab67034ee0f1db18c04fed33d2a4e2fec1" +SRCREV_machine:qemuppc ?= "43c8d401cf8092c19e47935c5667dacf754885d4" +SRCREV_machine:qemuriscv64 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemuriscv32 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemux86 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemux86-64 ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_machine:qemumips64 ?= "26e3543c62c04852896adc70584b1eaa59f15fad" +SRCREV_machine ?= "531238ba91af58291b5f306c237e6bc1b8b6633a" +SRCREV_meta ?= "8df0d345ef202197eef82942933161213d4d1846" # set your preferred provider of linux-yocto to 'linux-yocto-upstream', and you'll # get the /base branch, which is pure upstream -stable, and the same # meta SRCREV as the linux-yocto-standard builds. Select your version using the # normal PREFERRED_VERSION settings. BBCLASSEXTEND = "devupstream:target" -SRCREV_machine:class-devupstream ?= "3bcc86eb3ed952c22ceecce8932dde72ea01f8cc" +SRCREV_machine:class-devupstream ?= "9cf4111cdf9420fa99792ae16c8de23242bb2e0b" PN:class-devupstream = "linux-yocto-upstream" KBRANCH:class-devupstream = "v5.15/base" @@ -38,7 +38,7 @@ SRC_URI = "git://git.yoctoproject.org/linux-yocto.git;name=machine;branch=${KBRA git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-5.15;destsuffix=${KMETA}" LIC_FILES_CHKSUM = "file://COPYING;md5=6bc538ed5bd9a7fc9398086aedcd7e46" -LINUX_VERSION ?= "5.15.89" +LINUX_VERSION ?= "5.15.91" DEPENDS += "${@bb.utils.contains('ARCH', 'x86', 'elfutils-native', '', d)}" DEPENDS += "openssl-native util-linux-native" From patchwork Sat Feb 11 21:23:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19381 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 59F79C64EC4 for ; Sat, 11 Feb 2023 21:24:17 +0000 (UTC) Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by mx.groups.io with SMTP id smtpd.web10.19563.1676150647659800674 for ; Sat, 11 Feb 2023 13:24:07 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=VQrI6P/f; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id v3so5931955pgh.4 for ; Sat, 11 Feb 2023 13:24:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=/zG32wt9CJndQoejFb159T89ZcgDfVfcLA060/WuwBA=; b=VQrI6P/ft2iFmm413ZMeajwbyChjLu3kAEvzZi2woa4pdd46Mt9ULw5opE9GFHl0y6 UyncVFVaPkEr/kxyxZ91zgrHrBwhamkTKJ2vDPaDrcnXDTGgT3+UrrWKvoViX0kK3f3f ZNLNHubfuGw33fhqZXxo+Gi56sypQ8Rau9des/WwmbgJdJmBT6HqEtK9bHEhE1Zq3zCO k7Kb2nlxtmipbAKDvJ3av4RUaUByoRpNbSOZODk7ms3DoGaDepJtv+1tA6sQ5zmEhQhr m/gvN8Ho0CSZ6YmxtBRq/GSUzsPD4YwqP8Lwvu1fO3wpkorkYnVuCXnYjAdql8SXbrEN 4IfA== 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 :subject:date:message-id:reply-to; bh=/zG32wt9CJndQoejFb159T89ZcgDfVfcLA060/WuwBA=; b=SWnpZ2g4X1WbxlHk5IL5KKURODz4ie/8QBk5Y16OEutc8aBwULkq+JqQLkVEVRzHqY nrAFAIt03cgYtejJUcneyDHVQbrH8DXoF5BHVnCdhGObZCRdOPnx9R1Se1cmKU1uC6/g qAqRYlLeQVBJP747NfwMC7F3BTgppcVGv0Pe3sY5TsxeajZrSD5AtnicjZwJW5VeZ5f0 0vNkOW0SHnFvgiXdK48I3UC7e4GZ+3xW1JaNYLQHRe95MggPJKIf2nHexGfCEQVrvyVn bDeLaq9+pgAH9E/wK4aTKIaR8nn9CYIiFpaKhX/hHaA4WAOJ+9tj7qYZUCqqz5eL/Wvx db+A== X-Gm-Message-State: AO0yUKXXlDXIsAkQZtu3T3gEPjVGKoMxUwOVFjAjktqTNDuOtEFz4cPf h4XNxg1cun0ppONlZPQ+fTvybPdnb2PkK4BW96w= X-Google-Smtp-Source: AK7set+9h7iYaxoLPu1FtLpvsSq71sP18HE/WU3Hhd5X8WCjT+eeUrdYdA95NgW9RsIt05LB3n9m/A== X-Received: by 2002:aa7:9f48:0:b0:5a8:5fa0:3ce with SMTP id h8-20020aa79f48000000b005a85fa003cemr8312999pfr.22.1676150646734; Sat, 11 Feb 2023 13:24:06 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:06 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 05/28] kernel/linux-kernel-base: Fix kernel build artefact determinism issues Date: Sat, 11 Feb 2023 11:23:28 -1000 Message-Id: <0fe1eaf485c2470a4578e19278cc60cf1406fe77.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177015 From: Richard Purdie With the 6.1 kernel we've seen reproducibility/determinism issues where the kernel seems to rebuild headers referencing the hostname or local user. kernel-devsrc building after the kernel seemed to trigger it in some cases. Moving the definitions to the bbclass used by all the kernel recipe code including kernel-devsrc seems to be the best way to ensure this doesn't happen. Signed-off-by: Richard Purdie (cherry picked from commit 60681baa97daf4f3856453c34d6be08b6771a81b) Signed-off-by: Steve Sakoman --- meta/classes-recipe/kernel.bbclass | 3 --- meta/classes-recipe/linux-kernel-base.bbclass | 4 ++++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/classes-recipe/kernel.bbclass b/meta/classes-recipe/kernel.bbclass index 553e17bb4e..274d748d99 100644 --- a/meta/classes-recipe/kernel.bbclass +++ b/meta/classes-recipe/kernel.bbclass @@ -210,9 +210,6 @@ PACKAGES_DYNAMIC += "^${KERNEL_PACKAGE_NAME}-firmware-.*" export OS = "${TARGET_OS}" export CROSS_COMPILE = "${TARGET_PREFIX}" -export KBUILD_BUILD_VERSION = "1" -export KBUILD_BUILD_USER ?= "oe-user" -export KBUILD_BUILD_HOST ?= "oe-host" KERNEL_RELEASE ?= "${KERNEL_VERSION}" diff --git a/meta/classes-recipe/linux-kernel-base.bbclass b/meta/classes-recipe/linux-kernel-base.bbclass index cb2212c948..65cc48f304 100644 --- a/meta/classes-recipe/linux-kernel-base.bbclass +++ b/meta/classes-recipe/linux-kernel-base.bbclass @@ -43,5 +43,9 @@ def linux_module_packages(s, d): suffix = "" return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) +export KBUILD_BUILD_VERSION = "1" +export KBUILD_BUILD_USER ?= "oe-user" +export KBUILD_BUILD_HOST ?= "oe-host" + # that's all From patchwork Sat Feb 11 21:23:29 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19379 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 4CD83C61DA4 for ; Sat, 11 Feb 2023 21:24:17 +0000 (UTC) Received: from mail-pf1-f180.google.com (mail-pf1-f180.google.com [209.85.210.180]) by mx.groups.io with SMTP id smtpd.web11.19489.1676150649404678466 for ; Sat, 11 Feb 2023 13:24:09 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=6wc9xF5s; spf=softfail (domain: sakoman.com, ip: 209.85.210.180, mailfrom: steve@sakoman.com) Received: by mail-pf1-f180.google.com with SMTP id s20so5708916pfe.2 for ; Sat, 11 Feb 2023 13:24:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=n9RpWFPm6niaEz1M7ryBhmRVOapAtFqfzHswvuTGGG8=; b=6wc9xF5sAXARU9iQldIY8UBNx/SbDekA3PNzvnj8HHrjpZ4i2KQKeqCEJovU2VIA5X 0Aq3QIerwYeP335L4PZLi4x4nFEinrpp6MEUkEFQmqsnMuGEIK1vmalwebaqWOwzkTRV HIXI1BYeZZFQIA872Vrp34jk7LgZ7sfRMwCpKX8i3PJY502Nd989xSR7SMEMz5yIgWec OTCCZjlO9IDhtY+lx90B+rKX6Kzjpb3w3aGmbcJRcGKZmWb4GSlPW2dDTX4Oq6p+ySIv mk7iFVxWDfWwIZhzraVYPMONk2a9lyPLIIoUCI6zBgySUn22GT2XZleUFYkjbNICFDTC sfZg== 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 :subject:date:message-id:reply-to; bh=n9RpWFPm6niaEz1M7ryBhmRVOapAtFqfzHswvuTGGG8=; b=h5rCJB/0atVwBnf71OhCX/QLDmPUP1VQITPZshvjdsUdzZ1flSZkeWumWTrxtOKAms d88SPiP4U2A7yhsUBam+LK/1IfSI6AQnTAwQkT/aWfmZF37TRTN5OwJY9SNUZ9J1Q3Yq yf0oT0BoNpi7Uqso0LjVjNquqRgcLphVg5DN6H3MLOdy9PBBfTIUTHOJua/oczCMTVOh I2g9KGE0fMyAuFJiAKp6O88nD1hjAbtPlCYwa8lNT94RqSOpvoVWieXn4gRI+cRr1hfj yzVVTHwArM0aMwRimsTYDEeiVdofRNrRmFkCGWDfhNlWxHqvLHn2riEJJFqdE4o5v2Cn 6rhg== X-Gm-Message-State: AO0yUKV9KwFEffrXGs81ywVw4hJG/yJu+uVQmmLOc5azNt0Qj28eEu/s tBOY8FI5Wl1bRtQ5dcL7TFFA8UHvGQryQ3smwQs= X-Google-Smtp-Source: AK7set/mC17Qtxy+SiiAS404nVMqo3gPSzEO/RDhFoMoh+gzc3qfp6oJZtzb22YY3JQVoSzhPSeuCg== X-Received: by 2002:a62:79d6:0:b0:5a8:ab3d:3fe with SMTP id u205-20020a6279d6000000b005a8ab3d03femr476149pfc.16.1676150648394; Sat, 11 Feb 2023 13:24:08 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:08 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 06/28] python3-pytest: depend on python3-tomli instead of python3-toml Date: Sat, 11 Feb 2023 11:23:29 -1000 Message-Id: <04e31f0035ad29afc3cdcf9730cd76cd725b8a20.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177016 From: Arnout Vandecappelle Since version 7.0.0 [1], pytest switched from the toml package to the tomli package for parsing pyproject.toml configuration files [2]. This change is not immediately noticable during tests, because the toml/tomli module is only important if a pyproject.toml is actually present in a project. [1] https://docs.pytest.org/en/latest/changelog.html#pytest-7-0-0rc1-2021-12-06 [2] https://github.com/pytest-dev/pytest/issues/8789 Signed-off-by: Arnout Vandecappelle Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3-pytest_7.1.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python3-pytest_7.1.3.bb b/meta/recipes-devtools/python/python3-pytest_7.1.3.bb index 373f7f35fa..9710242655 100644 --- a/meta/recipes-devtools/python/python3-pytest_7.1.3.bb +++ b/meta/recipes-devtools/python/python3-pytest_7.1.3.bb @@ -26,7 +26,7 @@ RDEPENDS:${PN}:class-target += " \ ${PYTHON_PN}-py \ ${PYTHON_PN}-setuptools \ ${PYTHON_PN}-six \ - ${PYTHON_PN}-toml \ + ${PYTHON_PN}-tomli \ ${PYTHON_PN}-wcwidth \ " From patchwork Sat Feb 11 21:23:30 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19378 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 59F13C636CC for ; Sat, 11 Feb 2023 21:24:17 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.19562.1676150646351225590 for ; Sat, 11 Feb 2023 13:24:10 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=VMqT+Bov; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id ct17so123821pfb.12 for ; Sat, 11 Feb 2023 13:24:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=dYfV9bFOXvQ7eP12LRUAzWAe96WmBBnqCl0OrAWEeGw=; b=VMqT+BovcxZ8BjC6NrCilhUaayLRrk6rL9AqZL8a8Z3qFFFubprHH+3RMOmW+i8bIy UGM+Zb9S/igYdq/6A56MHKQj9L8rTLKHQCEbalDgSCwFp/hbMcEnACj1jt/MUEy2ituK YB1XAgTviF3FPBV6pkxI9bc/iPASiZLlXIRXYaTUNlzqDDauPrwTk48UDdI0a1ZzAitg GNelYPI1iUu2hUUgOnI3HzVOEkWWnNi9cTXfh6YqbTlK5PE4Xr88dIi8FyKFIDV28SBN akKn8WCKHsphxo88BcPuOQRy0mxXcySm2Gl7pop+Y7+UBTuaod0vAd6kIenklesrYY1H b7qg== 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 :subject:date:message-id:reply-to; bh=dYfV9bFOXvQ7eP12LRUAzWAe96WmBBnqCl0OrAWEeGw=; b=eliZCxbEANPV6Mf1jt1OnVJi54nnwhaTN7d9PeyuXxWDxTkLb0J0MseIKIW/ciYDQj 099VyHStno+nlx0VLgBdgGSAxTkucSNRaN85mzSCjlG3MN0XWa3kXfe5Qs3Kg9azsnbh +xg0TuoflHXbZPHmHZ25hbg1SMK/PN7IsuWQg/AREwYajoUazIHlS4r/LIyvedGbX+Xn OAYs1mMaj0TviITSLUViWn630em8+9qLCv3/iK+zB4YsUJQ6Q+PDS7HjpGfRA6d3PYjm yK2637M9KDk93ahSjqsVhvPoO6XoWC7PCrJHo+MvUNcw18gh5ZS7DrBp1Q4cehLsk/L0 RjXA== X-Gm-Message-State: AO0yUKVufAEVTBGVZ53nkEP683KL5inhlKpP8RZlzt/plWpjkxNs/uWu 8FRqWUr3m5OykPJkmph2d5EdjE0n9ppb6+9/kSo= X-Google-Smtp-Source: AK7set9UkTDUBtBRejifrzy8UEdraRuWTnX9A7F4NH8HEtcTg8XiH8WGxaHq9J+Iq+xWJkuJIQYHNQ== X-Received: by 2002:a62:642:0:b0:5a8:515a:eb9f with SMTP id 63-20020a620642000000b005a8515aeb9fmr8884674pfg.2.1676150650074; Sat, 11 Feb 2023 13:24:10 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:09 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 07/28] vulkan-samples: branch rename master -> main Date: Sat, 11 Feb 2023 11:23:30 -1000 Message-Id: <4037cb9cad74394eddf7a676060a9311282d2a89.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177017 From: Alexander Kanavin Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit 74bf535ca5cbcfb38c18775ece863d53dd216008) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index d0b3458e1b..d5d285cd83 100644 --- a/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -5,7 +5,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=48aa35cefb768436223a6e7f18dc2a2a" -SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=master;protocol=https;lfs=0 \ +SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git;branch=main;protocol=https;lfs=0 \ file://0001-CMakeLists.txt-do-not-hardcode-lib-as-installation-t.patch \ file://debugfix.patch \ file://0001-Qualify-move-as-std-move.patch;patchdir=third_party/spirv-cross \ From patchwork Sat Feb 11 21:23:31 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19380 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 6A737C64ED6 for ; Sat, 11 Feb 2023 21:24:17 +0000 (UTC) Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by mx.groups.io with SMTP id smtpd.web10.19565.1676150652604908565 for ; Sat, 11 Feb 2023 13:24:12 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=I76YKwyb; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id a8-20020a17090a6d8800b002336b48f653so7470570pjk.3 for ; Sat, 11 Feb 2023 13:24:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=9HhoXqTm7NGsxvfx09idKWjJvv/BZS5wYSkFr02DAQA=; b=I76YKwyb2EQJ99KSnKSRfiuMl46vUO2/7yAqvA2+2hzTpavAWsdFnIfnnKe+clQ10A eCF25L83v6tMLrl/2ry5mWjeO9gp7sRUWm/7B6NF2hTM99lf5MYGzPnUG/Y7+VIK0olH hsYChyiD5/RFxyB1nP/fAxHAL924o62AWAalZLUswvb7FyZ6Cn/XAClgugTeDIVWtFKj ELwY0KM7FrwYdbhnMySZYFlrEntWhsLCJJJI7iuatpjhjyUEulMZ9R6Bp+6E5in9I2LT 0bBjFZ5kqE1rV4jimt7fS5Qd2vuJ6rK0Mb1GVjvYbZJpVdthJMm4YHSAQJ5WmcvJhcFJ GBig== 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 :subject:date:message-id:reply-to; bh=9HhoXqTm7NGsxvfx09idKWjJvv/BZS5wYSkFr02DAQA=; b=ze3n2laD4jdmF3o3Y0fGzQ36THNnPmGN4GwCAx2GXGu2KLKlL77hIcvHUh+Nog8mha F+TNwFrt3iS+2nHPyxtbgEFsPTq3Wox7F0cgnXc0I5fGx8FxTuVTX4Zyd09l9O0iZ22X lLqKJgrl5tXsLJWOm6Iw3Cm7PsIlBTrJXOSGafwWEFnRjX9h3zywj4xh0TKjQ7g6A111 C+JfnNT7vi5gMEPwDFcNfoRm47VerJlVxcinssqjwtmNaV5WOB1b33ZXWAACIkH9r6HV Z+sCPRlaMbTbkN9YXw5ctXohQyiAKII3cS9p48UEhgMPo/cSvV47mV8orREbYj0e0bnS ODDw== X-Gm-Message-State: AO0yUKUukRzO6wdAmKj+YIYeUhwVYoO4REfVJcXyZ3txLDeydvNOXKXQ aX6wg1aHCsg3e3gv0QzFCLHvqbJ4YtvOlNxiuYg= X-Google-Smtp-Source: AK7set/jGzllCzPVXiBNIvK9gZuNbeyvAWjgfn8O7GxL4ST0cIDjpVUAb8mYNqrkWBnwgvI19oon9w== X-Received: by 2002:a05:6a21:6d81:b0:af:c871:c723 with SMTP id wl1-20020a056a216d8100b000afc871c723mr24341537pzb.33.1676150651735; Sat, 11 Feb 2023 13:24:11 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:11 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 08/28] buildtools-tarball: set pkg-config search path Date: Sat, 11 Feb 2023 11:23:31 -1000 Message-Id: <407e859edabb4e3527740a96a0dc8e0383c77f99.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177018 From: Ross Burton The buildtools-tarball includes a native sysroot with .pc files, and in the case of buildtools-extended-tarball a pkg-config binary too. If we're using the host pkg-config then it doesn't know to search in the native sysroot. If we're using our pkg-config then it searches in the build-time prefix and not the actual SDK installation location. Neither of these are correct, so set PKG_CONFIG_LIBDIR to search: - The native sysroot - The host pkg-config's default search path, if present - Falling back to /usr/lib/pkgconfig, if not In an ideal world this would be handled by the generic toolchain script, but that is slightly more involved. [ YOCTO #15007 ] Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 8f768a3f4c7ff477e994d60800e5a1b83891615a) Signed-off-by: Steve Sakoman --- meta/recipes-core/meta/buildtools-tarball.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-core/meta/buildtools-tarball.bb b/meta/recipes-core/meta/buildtools-tarball.bb index de399173ba..34f7773398 100644 --- a/meta/recipes-core/meta/buildtools-tarball.bb +++ b/meta/recipes-core/meta/buildtools-tarball.bb @@ -75,6 +75,9 @@ create_sdk_files:append () { echo 'export REQUESTS_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script echo 'export CURL_CA_BUNDLE="${SDKPATHNATIVE}${sysconfdir}/ssl/certs/ca-certificates.crt"' >>$script fi + echo 'HOST_PKG_PATH=$(command -p pkg-config --variable=pc_path pkg-config 2>/dev/null)' >>$script + echo 'export PKG_CONFIG_LIBDIR=${SDKPATHNATIVE}/${libdir}/pkgconfig:${SDKPATHNATIVE}/${datadir}/pkgconfig:${HOST_PKG_PATH:-/usr/lib/pkgconfig:/usr/share/pkgconfig}' >>$script + echo 'unset HOST_PKG_PATH' toolchain_create_sdk_version ${SDK_OUTPUT}/${SDKPATH}/version-${SDK_SYS} From patchwork Sat Feb 11 21:23:32 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19382 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 6A7EEC64ED8 for ; Sat, 11 Feb 2023 21:24:17 +0000 (UTC) Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) by mx.groups.io with SMTP id smtpd.web10.19556.1676150638762634710 for ; Sat, 11 Feb 2023 13:24:14 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=UnS9KrDK; spf=softfail (domain: sakoman.com, ip: 209.85.214.170, mailfrom: steve@sakoman.com) Received: by mail-pl1-f170.google.com with SMTP id m2so10040097plg.4 for ; Sat, 11 Feb 2023 13:24:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=+kuWBVb8mGIYQFD4E1yZ0Gj93iNSavK8dCn0p5d1ut4=; b=UnS9KrDKU3jJM15UG9wJM5QBocBKw8Ervu7Yo9k0rynw+E3llSK5AtWlCsTc6v10yy jLxjJzV2TSi27BLefch6SrvixR/87BFwODKLzUoq7d/M2wrbrghxyJRWz8hObkPraQwu mnKZvRYXQY1DKd0gkKX89I5DzCNcXkhu3HfEEDm5Z+ChmdVgtSxFG8eZBVGvPVRrhje9 TDWVo5t7MaUmqwAucW9lafW8fc6ds2HxRJXZthx4fMP28v4mgPi/xQWFtdQwUZgfEVln Fu/7Yk+FygodhZVo2lai1S/SUJiKxll9FHk9jufkwNSWeOdBcsx5+4fTzSRhr6vcCXmC uKNA== 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 :subject:date:message-id:reply-to; bh=+kuWBVb8mGIYQFD4E1yZ0Gj93iNSavK8dCn0p5d1ut4=; b=wA0Goavr60W39QnonKcJgOoKg+7xybD3cDJRCtxwPxuZPxfbb9PjBxc40QmKRKODte gdICh7hfp1nqB6UsgyUCtlDfsRk/D4ezJjVlPVk/lUK+rMmrYVDlrelSfg/iz+tqSu4X djYtnHzlEvZjvAa/vA+fPCRqUSXXeg0zqFhfIlIJ+s5weMuW6WoWMrU0JtPe3XFXyE5P j/nmTZesgioH0l0v4C57DybjtwfbufkoFjWDcTLxOiPBQqk4GTOnnwDmlonIbSYKteiA xUfKB6EHv0c6cwmZPWyMm87HSyWz/kcpTfUaGiTqMe+lRgwfzk06RdfGp6wjKqDbuiWn l1aQ== X-Gm-Message-State: AO0yUKVgjElvbCztuk4GIN60/M7giSMydbECYqMx8tzyOu6WO1TfVlPU e8c8C9UEt80eqeeOVR9rsysiloCAMkrhUUYCRl4= X-Google-Smtp-Source: AK7set/IiBxaelBAGtdTwx3SCwvV79I9xbHVZUXQhrLkYd7ACsikVtX2fyoU956/TmLSp4FrGJm+DQ== X-Received: by 2002:a05:6a20:8416:b0:bc:93c7:969f with SMTP id c22-20020a056a20841600b000bc93c7969fmr27020795pzd.10.1676150653718; Sat, 11 Feb 2023 13:24:13 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:13 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 09/28] classes/fs-uuid: Fix command output decoding issue Date: Sat, 11 Feb 2023 11:23:32 -1000 Message-Id: <2bde03a1a58be6636d36229a75450e08492e7a89.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177019 From: Pawel Zalewski The default return value from subprocess.check_output is an encoded byte. The applied fix will decode the value to a string. Signed-off-by: Pawel Zalewski Signed-off-by: Alexandre Belloni (cherry picked from commit 046769fa952a511865c416b80d10af6287147fb7) Signed-off-by: Steve Sakoman --- meta/classes-recipe/fs-uuid.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/fs-uuid.bbclass b/meta/classes-recipe/fs-uuid.bbclass index a9e7eb8c67..e215f06c80 100644 --- a/meta/classes-recipe/fs-uuid.bbclass +++ b/meta/classes-recipe/fs-uuid.bbclass @@ -10,7 +10,7 @@ def get_rootfs_uuid(d): import subprocess rootfs = d.getVar('ROOTFS') - output = subprocess.check_output(['tune2fs', '-l', rootfs]) + output = subprocess.check_output(['tune2fs', '-l', rootfs], text=True) for line in output.split('\n'): if line.startswith('Filesystem UUID:'): uuid = line.split()[-1] From patchwork Sat Feb 11 21:23:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19383 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 5B41DC64EC7 for ; Sat, 11 Feb 2023 21:24:17 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.19492.1676150656465304453 for ; Sat, 11 Feb 2023 13:24:16 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=SGxZ4DgN; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id b1so5707659pft.1 for ; Sat, 11 Feb 2023 13:24:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=TEsQcvNnC/ykBn4ljbVbM9oPMmAx6aeIIsKpLC9dxrE=; b=SGxZ4DgNkw3h+K8+QMQZWVCj5OQXvhaHO9jR1kYwxXdG3lGubW+AjaFlSXOiooTwXQ 5QHf88xBnqoVL4TizDofeI33u4vxBdU37qERYhtzQTxFxDiwg5h86uRIWyVtGlNGjR4t 7cbVgrsWp3WqBszLZGEk5qCd3WysDKpK0FuT5NCgBTkkoYXz4hoM5LArJLZ2EExpQH4L SrAUJmIynJYIPJVFzp63uqoea6UWEro48CWt2JcHzQ93ghXYtWFm3yX2MOmpypFjdoA8 MxL0v2LMo7SiU/DGvcK8AzX5wLocQshcGb8vVc5QEoK2vS9OFpDSRv4cvwlmCR4wiVAq xIDQ== 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 :subject:date:message-id:reply-to; bh=TEsQcvNnC/ykBn4ljbVbM9oPMmAx6aeIIsKpLC9dxrE=; b=G/Td2L19iaRRcIEJ2P4cpkG2efeWe3/FM1AdkU6t3rW+bjGDwXMmPnG+8IyHSOjaH1 csGW1bX4blUzRbT5/7RlyXSfzGVAv4fXGU4scREzJZlgJUwQ/Ghc+orMNBg7SyPOzWV0 VpfAhGpbrFX4EvttwmzHH1or4bep6ljJDKS6X6PNcpc4tTjj/ivCg51VecLHAjMPXkS7 rbl6hR4c+77RZvn36c5xurjhOPF7KEQSjq2O0JAPqv1w2tIMxHZuV6Up2qdHvSqaF/4O RIu/gemKSxl9VDgdvnwVJ0D2MVKFDigaAMm69PiPO5eYQUN0gRjI3r4Kn49co1rZE3hT PEzg== X-Gm-Message-State: AO0yUKXIoX8LTwcIO6LvdPBmGAfCDPTqEUIeQx+Rmcw04F06odact+Ww C3AeIs5KV8+uG7+bBFw7DHcGu31qbmWS2mSk/VY= X-Google-Smtp-Source: AK7set8ZdTkUz5T55rzbMqpixK5jPrlMuJUgYSav1+DRL9Zhzr8du9zjF0PafjCgndell3G9x2iwMw== X-Received: by 2002:a62:3082:0:b0:5a8:65e4:aba9 with SMTP id w124-20020a623082000000b005a865e4aba9mr6499752pfw.18.1676150655309; Sat, 11 Feb 2023 13:24:15 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:14 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 10/28] gdk-pixbuf: do not use tools from gdk-pixbuf-native when building tests Date: Sat, 11 Feb 2023 11:23:33 -1000 Message-Id: <467a826b9b55f81c74476f57fa0d423701510af5.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177020 From: Alexander Kanavin The patch that allows to do so has not been accepted upstream, and wasn't correctly working as it was running a native executable (gdk-pixbuf-query-loaders) with target .so plugins. On the other hand, out of 20+ (currently 23) tests only three require running binaries at build time to produce special test-specific input data: cve-2015-4491 pixbuf-pixdata pixbuf-resource So let's simply omit these from the build: this can be done with a far less invasive patch which has a chance of being accepted upstream. gdk-pixbuf-print-mime-types is no longer installed (the replaced patch was doing that). Signed-off-by: Alexander Kanavin Signed-off-by: Alexandre Belloni (cherry picked from commit 0d926508e75095eb446699b612729d0243eacc91) Signed-off-by: Steve Sakoman --- .../0001-Add-use_prebuilt_tools-option.patch | 173 ------------------ ...w-a-subset-of-tests-in-cross-compile.patch | 66 +++++++ .../gdk-pixbuf/gdk-pixbuf_2.42.10.bb | 17 +- 3 files changed, 68 insertions(+), 188 deletions(-) delete mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch create mode 100644 meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch deleted file mode 100644 index 02cc9a2a70..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-Add-use_prebuilt_tools-option.patch +++ /dev/null @@ -1,173 +0,0 @@ -From f81b60ebcbbfd9548c8aa1e388662c429068d1e3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sat, 8 May 2021 21:58:54 +0200 -Subject: [PATCH] Add use_prebuilt_tools option - -This allows using the gdk-pixbuf tools from the host to -build and install tests in a cross-compile scenarion. - -Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/119] -Signed-off-by: Alexander Kanavin - ---- - gdk-pixbuf/meson.build | 11 +++++++++-- - meson.build | 6 +++--- - meson_options.txt | 4 ++++ - tests/meson.build | 16 ++++++++-------- - thumbnailer/meson.build | 24 ++++++++++++++++++------ - 5 files changed, 42 insertions(+), 19 deletions(-) - -diff --git a/gdk-pixbuf/meson.build b/gdk-pixbuf/meson.build -index 54ff9dd..2e321cf 100644 ---- a/gdk-pixbuf/meson.build -+++ b/gdk-pixbuf/meson.build -@@ -342,13 +342,20 @@ foreach bin: gdkpixbuf_bin - include_directories: [ root_inc, gdk_pixbuf_inc ], - c_args: common_cflags + gdk_pixbuf_cflags, - install: true) -- meson.override_find_program(bin_name, bin) -+ if not get_option('use_prebuilt_tools') -+ meson.override_find_program(bin_name, bin) -+ endif - - # Used in tests - set_variable(bin_name.underscorify(), bin) - endforeach - --if not meson.is_cross_build() -+if get_option('use_prebuilt_tools') -+ gdk_pixbuf_query_loaders = find_program('gdk-pixbuf-query-loaders', required: true) -+ gdk_pixbuf_pixdata = find_program('gdk-pixbuf-pixdata', required: true) -+endif -+ -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - # The 'loaders.cache' used for testing, so we don't accidentally - # load the installed cache; we always build it by default - loaders_cache = custom_target('loaders.cache', -diff --git a/meson.build b/meson.build -index 813bd43..a93e6f7 100644 ---- a/meson.build -+++ b/meson.build -@@ -369,18 +369,18 @@ subdir('gdk-pixbuf') - # i18n - subdir('po') - --if not meson.is_cross_build() -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - if get_option('tests') - subdir('tests') - endif -- subdir('thumbnailer') - endif -+subdir('thumbnailer') - - # Documentation - build_docs = get_option('gtk_doc') or get_option('docs') - subdir('docs') - --if not meson.is_cross_build() -+if not meson.is_cross_build() or get_option('use_prebuilt_tools') - meson.add_install_script('build-aux/post-install.py', - gdk_pixbuf_bindir, - gdk_pixbuf_libdir, -diff --git a/meson_options.txt b/meson_options.txt -index d198d99..1c899e9 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -53,4 +53,8 @@ option('gio_sniffing', - description: 'Perform file type detection using GIO (Unused on MacOS and Windows)', - type: 'boolean', - value: true) -+option('use_prebuilt_tools', -+ description: 'Use prebuilt gdk-pixbuf tools from the host for cross-compilation', -+ type: 'boolean', -+ value: false) - -diff --git a/tests/meson.build b/tests/meson.build -index 28c2525..d97c02d 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -5,6 +5,12 @@ - # $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with - # this problem: See https://github.com/mesonbuild/meson/issues/8266. - if enabled_loaders.contains('png') and host_system != 'windows' -+ -+ resources_deps = [loaders_cache,] -+ if not get_option('use_prebuilt_tools') -+ resources_deps += [gdk_pixbuf_pixdata,] -+ endif -+ - # Resources; we cannot use gnome.compile_resources() here, because we need to - # override the environment in order to use the utilities we just built instead - # of the system ones -@@ -21,10 +27,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: resources_deps, - ) - - resources_h = custom_target('resources.h', -@@ -40,10 +43,7 @@ if enabled_loaders.contains('png') and host_system != 'windows' - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: resources_deps, - ) - no_resources = false - else -diff --git a/thumbnailer/meson.build b/thumbnailer/meson.build -index b6a206d..9336c21 100644 ---- a/thumbnailer/meson.build -+++ b/thumbnailer/meson.build -@@ -6,13 +6,29 @@ bin = executable('gdk-pixbuf-thumbnailer', - ], - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ], - install: true) --meson.override_find_program('gdk-pixbuf-thumbnailer', bin) -+if not get_option('use_prebuilt_tools') -+ meson.override_find_program('gdk-pixbuf-thumbnailer', bin) -+endif - - gdk_pixbuf_print_mime_types = executable('gdk-pixbuf-print-mime-types', - 'gdk-pixbuf-print-mime-types.c', -+ install: true, - c_args: common_cflags, - dependencies: gdk_pixbuf_deps + [ gdkpixbuf_dep ]) - -+if get_option('use_prebuilt_tools') -+ gdk_pixbuf_print_mime_types = find_program('gdk-pixbuf-print-mime-types', required: true) -+endif -+ -+thumbnailer_deps = [loaders_cache,] -+ -+if not get_option('use_prebuilt_tools') -+ thumbnailer_deps += [ -+ gdk_pixbuf_print_mime_types, -+ gdk_pixbuf_pixdata, -+ ] -+endif -+ - custom_target('thumbnailer', - input: 'gdk-pixbuf-thumbnailer.thumbnailer.in', - output: 'gdk-pixbuf-thumbnailer.thumbnailer', -@@ -25,10 +41,6 @@ custom_target('thumbnailer', - '@INPUT@', - '@OUTPUT@', - ], -- depends: [ -- gdk_pixbuf_print_mime_types, -- gdk_pixbuf_pixdata, -- loaders_cache, -- ], -+ depends: thumbnailer_deps, - install: true, - install_dir: join_paths(gdk_pixbuf_datadir, 'thumbnailers')) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch new file mode 100644 index 0000000000..7250fa3f62 --- /dev/null +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch @@ -0,0 +1,66 @@ +From 9d3b374e75692da3d1d05344a1693c85a3098f47 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +Date: Thu, 26 Jan 2023 20:29:46 +0100 +Subject: [PATCH] meson.build: allow (a subset of) tests in cross compile + settings + +There is no need to completely disable tests: most of them +do not require running target executables at build time, +and so can be built and installed. + +This requires inserting a couple of specific guards around +items that do require running target executables. + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/gdk-pixbuf/-/merge_requests/150] +Signed-off-by: Alexander Kanavin +--- + meson.build | 6 +++--- + tests/meson.build | 10 ++++++---- + 2 files changed, 9 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 8a16c8f..7c8b20f 100644 +--- a/meson.build ++++ b/meson.build +@@ -369,10 +369,10 @@ subdir('gdk-pixbuf') + # i18n + subdir('po') + ++if get_option('tests') ++ subdir('tests') ++endif + if not meson.is_cross_build() +- if get_option('tests') +- subdir('tests') +- endif + subdir('thumbnailer') + endif + +diff --git a/tests/meson.build b/tests/meson.build +index 28c2525..c45e765 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -4,7 +4,7 @@ + # gdk-pixbuf-pixdata from build directory because it needs all DLL locations in + # $PATH. Ideally we should use gnome.compile_resources() and let Meson deal with + # this problem: See https://github.com/mesonbuild/meson/issues/8266. +-if enabled_loaders.contains('png') and host_system != 'windows' ++if enabled_loaders.contains('png') and host_system != 'windows' and not meson.is_cross_build() + # Resources; we cannot use gnome.compile_resources() here, because we need to + # override the environment in order to use the utilities we just built instead + # of the system ones +@@ -166,9 +166,11 @@ endif + test_deps = gdk_pixbuf_deps + [ gdkpixbuf_dep, ] + test_args = [ '-k' ] + test_env = environment() +-test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) +-test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) +-test_env.set('GDK_PIXBUF_MODULE_FILE', loaders_cache.full_path()) ++if not meson.is_cross_build() ++ test_env.set('G_TEST_SRCDIR', meson.current_source_dir()) ++ test_env.set('G_TEST_BUILDDIR', meson.current_build_dir()) ++ test_env.set('GDK_PIXBUF_MODULE_FILE', loaders_cache.full_path()) ++endif + + foreach test_name, test_data: installed_tests + test_sources = [ test_name + '.c', 'test-common.c' ] diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb index aa44515fbb..cca89a9059 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.42.10.bb @@ -12,15 +12,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ SECTION = "libs" -DEPENDS = "glib-2.0 gdk-pixbuf-native shared-mime-info" -DEPENDS:remove:class-native = "gdk-pixbuf-native" +DEPENDS = "glib-2.0 shared-mime-info" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://run-ptest \ file://fatal-loader.patch \ - file://0001-Add-use_prebuilt_tools-option.patch \ + file://0001-meson.build-allow-a-subset-of-tests-in-cross-compile.patch \ " SRC_URI[sha256sum] = "ee9b6c75d13ba096907a2e3c6b27b61bcd17f5c7ebeab5a5b439d2f2e39fe44b" @@ -46,14 +45,6 @@ PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false" EXTRA_OEMESON = "-Dman=false" -EXTRA_OEMESON:append:class-target = " \ - -Duse_prebuilt_tools=true \ -" - -EXTRA_OEMESON:append:class-nativesdk = " \ - -Duse_prebuilt_tools=true \ -" - PACKAGES =+ "${PN}-xlib" # For GIO image type sniffing @@ -115,10 +106,6 @@ do_install:append:class-native() { XDG_DATA_DIRS=${STAGING_DATADIR} \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${bindir}/gdk-pixbuf-print-mime-types \ - XDG_DATA_DIRS=${STAGING_DATADIR} \ - GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache - create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ XDG_DATA_DIRS=${STAGING_DATADIR} \ GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ From patchwork Sat Feb 11 21:23:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19384 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 4C357C636CC for ; Sat, 11 Feb 2023 21:24:27 +0000 (UTC) Received: from mail-pf1-f170.google.com (mail-pf1-f170.google.com [209.85.210.170]) by mx.groups.io with SMTP id smtpd.web11.19492.1676150656465304453 for ; Sat, 11 Feb 2023 13:24:17 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rNFJvLaI; spf=softfail (domain: sakoman.com, ip: 209.85.210.170, mailfrom: steve@sakoman.com) Received: by mail-pf1-f170.google.com with SMTP id b1so5707682pft.1 for ; Sat, 11 Feb 2023 13:24:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=Pyy9cucqW8r5ghweobZyXwDdNrTlFBxEWTUZqUiqmmg=; b=rNFJvLaIfXM7F8msQxtOWjaL/G+AZTXIQKzXMqDm5KkseobY1mgA/gs/cNzJKsOTmY uXiHByrndKbHGl54dHFa/1jTTnD598R3hBS2nVVqvzTchkX6G3bBs+SqFsF3zJVGzSag 0RElyUpS7G5azciQWiDLn9YFuaZHUJgjmgFJ7lkv3tgdjb/cyD6v0ucQyo432RsOZ0t/ vSuN+q+UWZPhcx88gvRc+TmpdSlO0/zxd66yQ6gcYWJrJrvtWyg2ISKqH7OHC3mC54Ik U2NzmE5KhIYY/VSFIwPKv0CXwAtVYy5m0RVrCqNJD+QiYLGDWEMerLG0p/DpsXaw/S65 kddA== 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 :subject:date:message-id:reply-to; bh=Pyy9cucqW8r5ghweobZyXwDdNrTlFBxEWTUZqUiqmmg=; b=L3LBukPeYcAT4LI5XyJw+Pid3V05Q1pyGG/8uYRl7uN+ZWX5WJhTCs6RJm6GuO784b ZuKkjwvHBUzQizRyQrtPea74ukRt/ONr2yFQS/Zn5DuXSQ7ClKfkncqmZlUIbeBRnkFd XGnkC0rx6IHFAhtavuz0Qf42NnkSEzoNspz5f0H0tb3P7h1GTZoZ1YeIyqo0boKWs80V PP7O3/E595k4AhFj6pu3hk/QNQTxvPRLI/4vKLqs47S98i4mFN+qmpOVXsOnkQWdgTvP V/9kGyQtgKz0lZgU/Eml3BMhhtMk9jPdQnI1fvMFRGD1Nf7JxmOElY2wUvTLPJsweV98 i9AA== X-Gm-Message-State: AO0yUKU/AFCMs5iELl+wzpTwgaI4iLwgJIv22FoEzlBCYm953KR9QZt3 ScfRp6LpFZRCqD9jle544mLlBJ6MPR2v5vooB4c= X-Google-Smtp-Source: AK7set98eLzHujInfurvhQ7avqpIlgPscvlWoPr9L+AeQoFsCXeDoK9VYKAKEfOmY/hurasF9CB6aQ== X-Received: by 2002:aa7:9833:0:b0:5a8:4dea:7020 with SMTP id q19-20020aa79833000000b005a84dea7020mr9777238pfl.27.1676150656986; Sat, 11 Feb 2023 13:24:16 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:16 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 11/28] make-mod-scripts: Ensure kernel build output is deterministic Date: Sat, 11 Feb 2023 11:23:34 -1000 Message-Id: <8153db20ebf3e3d03b754868caec4eb6968b4420.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177021 From: Richard Purdie The definitions in linux-kernel-base are needed to ensure the generated headers are consistent. This was a small step that was missing from the previous changes to linux-kernel-base as both kernel-devsrc and make-mod-scripts need this information defined consistently. Signed-off-by: Richard Purdie (cherry picked from commit 0d79d4883f924cef0d0ba361506ad75d441b9721) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb index 9afd6714f0..38282e58f1 100644 --- a/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb +++ b/meta/recipes-kernel/make-mod-scripts/make-mod-scripts_1.0.bb @@ -3,7 +3,7 @@ HOMEPAGE = "https://www.yoctoproject.org/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/GPL-2.0-only;md5=801f80980d171dd6425610833a22dbe6" -inherit kernel-arch +inherit kernel-arch linux-kernel-base inherit pkgconfig PACKAGE_ARCH = "${MACHINE_ARCH}" From patchwork Sat Feb 11 21:23:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19388 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 52B3FC64EC4 for ; Sat, 11 Feb 2023 21:24:27 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.19495.1676150659841718988 for ; Sat, 11 Feb 2023 13:24:19 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=hH/nRAzb; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id x31so5924576pgl.6 for ; Sat, 11 Feb 2023 13:24:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=P9/HHPvkbGVqR5X+GtlU2oeFll4Ks0rnW7/p61e8XUA=; b=hH/nRAzb0XvC7HMICM1lmHPeRlIZeS8GBwsv3kY5957f1JCUJmhnaugfuZZNKFun2g MMYOsQfVGRcrmGMvIjaklq1A+U0LQlZCKWYWi2/guEbSeqW6VTxMKQlZSIMGBvu/57oC nhu+HjxT8q8Y17xashJFAW+jxlFeOT1erkeB7AkLZbbS52IrJMo+KkmvlleE8qS88mcy W+nWsGoiqDA5fS3nSg4+pgUqa3Y883jBRV3ggeHLF5XmYZyLR4Aqgl6Caq+B5oaSjvhl 34EQIkICnJ7RFj7UneK3FcDYXYyFYlKb2qHxIyNX+2tWswbglLrIXOFIL1311uRwSu95 F/dw== 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 :subject:date:message-id:reply-to; bh=P9/HHPvkbGVqR5X+GtlU2oeFll4Ks0rnW7/p61e8XUA=; b=ahdDLl7Gy9LWzSUZv5sawUc9FM4njye5f2CDHjvPoX42ycqFOnfVt6Tlco/ONFxIkV VkQEZ62QoLO6+k5LL1UwhXB0SRGQWLZG5pQrwGlDdfP8a7R9CFqz/234wGVeICgIvP+3 FHjCX9QNSaFjdd0VBRLdVyLJT4gntsLUvtL6q8h5iFaxJkvQcie1HSFgL0Id3vysj3pc SCtrSb3ZwB3T34sLvxHLAMVg2UVHX7/+IS1loeEqheLDCxE129SCKs92NkvbzJOk+sUG kMG/ERBRr56UuXOTPAgNpCU/19TVMT1y2ZnenUN6oeyZOwReg3Ps9+mXZDWpKGUL9Ufh fwIg== X-Gm-Message-State: AO0yUKU+mENwyOOnxKNF+9BkhiovmBfoaDG9SVJ3RrB2aUY7ev1g6bh7 CDDwdHPR3DZkp9IbvPnUNt9LU8WK2+aJaP2lUFA= X-Google-Smtp-Source: AK7set+2Ze+zIeJt5J9uTiWUjRVti1U+NcDwB1IDuU9sVPUHNYTf0LWGIS2FhAQi1Gq5Rxuwcrbjkw== X-Received: by 2002:a62:15d8:0:b0:590:7708:2be3 with SMTP id 207-20020a6215d8000000b0059077082be3mr15722985pfv.33.1676150658690; Sat, 11 Feb 2023 13:24:18 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.17 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:18 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 12/28] scons: Pass MAXLINELENGTH to scons invocation Date: Sat, 11 Feb 2023 11:23:35 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177022 From: Khem Raj This helps in overcoming a problem when using scons with ccache enabled. When commands get longer, then it resorts to using response files to do the operations e.g. @/tmp/tmp96j6icra.lnk when this response file is inboked by compiler it works ok, however, this does not when ccache is used to invoke the complilation. We see errors e.g. ccache @/tmp/tmppsyij_0v.lnk ccache: error: execute_noreturn of @/tmp/tmppsyij_0v.lnk failed: No such file or directory Using MAXLINELENGTH setting ensures that we can use ARG_MAX to extend the length of commandline and hence avoid using response files. This issue is also reported in mongodb [1] [1] https://jira.mongodb.org/browse/SERVER-38389 Signed-off-by: Khem Raj Signed-off-by: Alexandre Belloni (cherry picked from commit 29558f6218f4676b459f2c78f82d245339d51c8c) Signed-off-by: Steve Sakoman --- meta/classes-recipe/scons.bbclass | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/meta/classes-recipe/scons.bbclass b/meta/classes-recipe/scons.bbclass index 5f0d4a910b..d510c12b9b 100644 --- a/meta/classes-recipe/scons.bbclass +++ b/meta/classes-recipe/scons.bbclass @@ -9,11 +9,12 @@ inherit python3native DEPENDS += "python3-scons-native" EXTRA_OESCONS ?= "" - +# This value below is derived from $(getconf ARG_MAX) +SCONS_MAXLINELENGTH ?= "2097152" do_configure() { if [ -n "${CONFIGURESTAMPFILE}" -a "${S}" = "${B}" ]; then if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} --clean PREFIX=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} prefix=${prefix} ${EXTRA_OESCONS} fi mkdir -p `dirname ${CONFIGURESTAMPFILE}` @@ -22,13 +23,17 @@ do_configure() { } scons_do_compile() { - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} ${EXTRA_OESCONS} || \ die "scons build execution failed." } scons_do_install() { - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} ${EXTRA_OESCONS} install || \ die "scons install execution failed." } +do_configure[vardepsexclude] = "SCONS_MAXLINELENGTH" +do_compile[vardepsexclude] = "SCONS_MAXLINELENGTH" +do_install[vardepsexclude] = "SCONS_MAXLINELENGTH" + EXPORT_FUNCTIONS do_compile do_install From patchwork Sat Feb 11 21:23:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19386 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 5C86AC61DA4 for ; Sat, 11 Feb 2023 21:24:27 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web10.19570.1676150661664574974 for ; Sat, 11 Feb 2023 13:24:21 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=tqGhVPkw; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id c29so1816353pgm.5 for ; Sat, 11 Feb 2023 13:24:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=LViFbnyBpBwyOb1jyBHc3U6NYykOvtARp1EuUQsTbPM=; b=tqGhVPkwhMAgK8NePov/FlkF+WC1szOyFJclZxpgkisRydhhPmxxP0c1sDVh+fYPNG t7Jam9iksjmKOlRGgJB0B2KKJKaX52YmnRr/nz7rCNBN3cwaETMSrp+u1e17YLfPeF+n xqA2gGTz4VyGCe9dJQVPP0Kc01FYWV07MHBIajnQvhUJeVLeFycvszv3Qo8HOBPK8spw 6ym5JPBu+eVDLRjYkFi4dxqBwVdTEkxKCB+4A2bL1ITrlGvyiXQdTNj3Q/+5Adh2BH6O bY2+BlRzFUT1hok1seq1keBESNj1FSSHcaoCq+RZ26KfBdowkb9cwpjMa7xolHknP8Ci qYEA== 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 :subject:date:message-id:reply-to; bh=LViFbnyBpBwyOb1jyBHc3U6NYykOvtARp1EuUQsTbPM=; b=Ip65NqLWylczRVPWX/ODGmvBTxAFqZ1LPCkSXL4gWgtq+vRW9gigDdVKvcTGld1W1E LSxKaS1jJVvum4Yrcf06AGmeZX1Wu4kTVUVY+vb30zcpgw5Pj5HckRfCIDWC/4WaSrhw 2zvJBdOIyfTzR+jHD/wXcfmt8J4cFXeWoWTPlH1wBlg52mUkaMwOXquDDg5ZDvuVb1bm KcF3qYurUl8jfAAjmIG9fYUV3RbsF9FhOw0NCyLTkbABHt7VASZc4mqiEvd3YQG9dD5F ppjGtMypZuhJdfYSPIa3HbyMPNJK9aZnhLWGrIgsCN1cNY77uENM8mjn2wvTFQyVcAdU bZnw== X-Gm-Message-State: AO0yUKXgFD5hvDM8hvak5vkp6eizPAWOMtg0VzQNCl/7xT9nea1oLHhb /o2MSGl0DggfBRsxxGxy3JTB5B59Xa/JsEM6348= X-Google-Smtp-Source: AK7set8AAsG5XDCiee2+RUCI3MES+F2lLLyzQ2D4n2+on74+EgBXxxYgwgd/EPbcrIA1+OSEIBdKTg== X-Received: by 2002:aa7:9599:0:b0:5a7:a075:febc with SMTP id z25-20020aa79599000000b005a7a075febcmr14633626pfj.17.1676150660684; Sat, 11 Feb 2023 13:24:20 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.19 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:20 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 13/28] scons.bbclass: Make MAXLINELENGTH overridable Date: Sat, 11 Feb 2023 11:23:36 -1000 Message-Id: <625ed0898518bcd699cb16f6e1cc0813eca0c48f.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177023 From: Khem Raj older scons do not support MAXLINELENGTH and some packages still may be using older scons, these recipes can clear SCONS_MAXLINELENGTH in them and get going. Set SCONS_MAXLINELENGTH = "" in such recipes. Signed-off-by: Khem Raj Cc: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 34de57d12c0a752f66c962d29e5335c1035db066) Signed-off-by: Steve Sakoman --- meta/classes-recipe/scons.bbclass | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/meta/classes-recipe/scons.bbclass b/meta/classes-recipe/scons.bbclass index d510c12b9b..d20a78dc6e 100644 --- a/meta/classes-recipe/scons.bbclass +++ b/meta/classes-recipe/scons.bbclass @@ -10,11 +10,12 @@ DEPENDS += "python3-scons-native" EXTRA_OESCONS ?= "" # This value below is derived from $(getconf ARG_MAX) -SCONS_MAXLINELENGTH ?= "2097152" +SCONS_MAXLINELENGTH ?= "MAXLINELENGTH=2097152" +EXTRA_OESCONS:append = " ${SCONS_MAXLINELENGTH}" do_configure() { if [ -n "${CONFIGURESTAMPFILE}" -a "${S}" = "${B}" ]; then if [ -e "${CONFIGURESTAMPFILE}" -a "`cat ${CONFIGURESTAMPFILE}`" != "${BB_TASKHASH}" -a "${CLEANBROKEN}" != "1" ]; then - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} --clean PREFIX=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} prefix=${prefix} ${EXTRA_OESCONS} + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} --clean PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} fi mkdir -p `dirname ${CONFIGURESTAMPFILE}` @@ -23,12 +24,12 @@ do_configure() { } scons_do_compile() { - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} ${EXTRA_OESCONS} || \ + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} ${PARALLEL_MAKE} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} || \ die "scons build execution failed." } scons_do_install() { - ${STAGING_BINDIR_NATIVE}/scons --directory=${S} install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} MAXLINELENGTH=${SCONS_MAXLINELENGTH} ${EXTRA_OESCONS} install || \ + ${STAGING_BINDIR_NATIVE}/scons --directory=${S} install_root=${D}${prefix} PREFIX=${prefix} prefix=${prefix} ${EXTRA_OESCONS} install || \ die "scons install execution failed." } From patchwork Sat Feb 11 21:23:37 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19389 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 61D92C64ED8 for ; Sat, 11 Feb 2023 21:24:27 +0000 (UTC) Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by mx.groups.io with SMTP id smtpd.web10.19571.1676150663516051117 for ; Sat, 11 Feb 2023 13:24:23 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7tc5DDnJ; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id j184so786812pfg.10 for ; Sat, 11 Feb 2023 13:24:23 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=7vYNPgNjPeUM14XF6FtMSxGvF8i2KVAtWTBdz2BrNBs=; b=7tc5DDnJri3w597zeyiqvX1lEnHXkg72qVkH6QXwv78MHAyBghIqYDmDANfnI8K+z8 j7UpdLMreH1Y1fEoga+vRuoJnEBBxdlHMQ+JlSB+/U2XwDgdU/o3LeoV3O68fdVR4zpW 1ie83V68yw37PCpjsLEVN2n/16kPoHf8uM5vxGIFlXrnoq9NCoV1HdKfdIKE41L3Mngl XrStEhE7a5sOdZt96eAUltus4zt4cYpiTV6tVZ+41fkG9ZGyunyebm9Ik2BAFbSJKtXS f9FvCuNWFTm39HueGp8RLpI+zwZzs6RB2t97ee5JtTsfiFYshLIQl0ntAOm4PQ7f+rrj n9FA== 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 :subject:date:message-id:reply-to; bh=7vYNPgNjPeUM14XF6FtMSxGvF8i2KVAtWTBdz2BrNBs=; b=bs1dQCzoIqZkYB3vibwlNu7OkwqICHb693X91f7UDolgM75aM/JQ6jBmk1bDmxnVvE 99/zWLyx31t1toc4uylS0+VZiiduRJaaeMSIWBXMbtTm4f7SaAANqvkjgvciEyHT2NK5 jg/3eiEsPkSNgfpkkpa1yyQgFHlVpT1uU6QMWtBGczdlwobnUH0dpK3eS0fsYtXWqwbR WTF1FcdYN5SOjIsD0jRShzq3CICObjgAwC6wVq5gDerGhJDWmRmwYVFuSrbi/Hdt6/Es EAzMtiZn7fHHUbkFp4vf1spdHUhHPrpz12FPscPPIDEKGYw5OdAWwf2XfUGm1V2su6Nc APmA== X-Gm-Message-State: AO0yUKXU6l/DA1K3zt8Cre3pB+BHiKC0CepB7XlSUXc2gkZn+RBJBRnK 00dAUdLzcMjl5ZvAx4GdSeqaKK6+fqT7iU+jHaQ= X-Google-Smtp-Source: AK7set9HKcF7x6lg9+rzcFCXnG0b12awDbgMmDGqlzjYAY3ad4VAGtt9moqE0UOApstFvjlnnNDlHg== X-Received: by 2002:a62:485:0:b0:5a8:52d5:3bc6 with SMTP id 127-20020a620485000000b005a852d53bc6mr8029637pfe.26.1676150662511; Sat, 11 Feb 2023 13:24:22 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:22 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 14/28] oeqa/qemurunner: do not use Popen.poll() when terminating runqemu with a signal Date: Sat, 11 Feb 2023 11:23:37 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177024 From: Alexander Kanavin This does not actually guarantee that the child runqemu process has completely exited: poll() may return prematurely while the SIGTERM handler in runqemu is still running. This thwarts the rest of the processing, and may terminate the handler before it completes. Use Popen.communicate() instead: this is what python documentation recommends as well: https://docs.python.org/3/library/subprocess.html#subprocess.Popen.communicate Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie (cherry picked from commit cd3e55606c427287f37585c5d7cde936471e52f4) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/qemurunner.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/lib/oeqa/utils/qemurunner.py b/meta/lib/oeqa/utils/qemurunner.py index 6a85f57e49..c68974f25c 100644 --- a/meta/lib/oeqa/utils/qemurunner.py +++ b/meta/lib/oeqa/utils/qemurunner.py @@ -538,10 +538,13 @@ class QemuRunner: except OSError as e: if e.errno != errno.ESRCH: raise - endtime = time.time() + self.runqemutime - while self.runqemu.poll() is None and time.time() < endtime: - time.sleep(1) - if self.runqemu.poll() is None: + try: + outs, errs = self.runqemu.communicate(timeout = self.runqemutime) + if outs: + self.logger.info("Output from runqemu:\n%s", outs.decode("utf-8")) + if errs: + self.logger.info("Stderr from runqemu:\n%s", errs.decode("utf-8")) + except TimeoutExpired: self.logger.debug("Sending SIGKILL to runqemu") os.killpg(os.getpgid(self.runqemu.pid), signal.SIGKILL) if not self.runqemu.stdout.closed: From patchwork Sat Feb 11 21:23:38 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19387 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 6092EC64EC7 for ; Sat, 11 Feb 2023 21:24:27 +0000 (UTC) Received: from mail-pg1-f181.google.com (mail-pg1-f181.google.com [209.85.215.181]) by mx.groups.io with SMTP id smtpd.web11.19498.1676150665250524354 for ; Sat, 11 Feb 2023 13:24:25 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Bs5s64v6; spf=softfail (domain: sakoman.com, ip: 209.85.215.181, mailfrom: steve@sakoman.com) Received: by mail-pg1-f181.google.com with SMTP id e1so1104704pgg.9 for ; Sat, 11 Feb 2023 13:24:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=UV7N3NZ6ITdFRvDzmXkzwLWyuj1XW76o5WhYJBdJCX0=; b=Bs5s64v6yi04SQg9RPlBmHewb+yYrWIDxGeQlArJk6SiW69rUlM+CSKCfpfZX1XlXv pzdIorQj86zAwnhqfnSL5abbID+jU5bScsFNVKku2Byvc3DvlXUu2WCqrRBM19HfSht2 nPyfd2084/RAwFeskvZKw/btoCeHJJ57YhkQuJg/fGLRbKerhXi6fT6sw2udz4j8Q7Fc XrCgnUwpSCkPLn8VZZoivtYZ6iIRCWVaXqHt498PT/rhUkyvU+bwPSeivWrBB003XV4q AzC6hCZwbmNDll5snGRfs4rZAquJVz3EsvjEQQUETu6vbuLwDq1CdILpoowkzxgKS+Bx X0og== 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 :subject:date:message-id:reply-to; bh=UV7N3NZ6ITdFRvDzmXkzwLWyuj1XW76o5WhYJBdJCX0=; b=i3yaCW/DbVlK49hfQvomgeX0JGBcNkYRW/Fdir+pr1BhVyQ7qXJdQdJ+3QwjWQYJEd AV2HEVzIH2QI0P8awvUFtosNuLIi33Ryt+NNkh2+fl/0aXCbwAhrEzzIanKk/BWk4YUY pvQJ/M2lB/FU0LB7cO0zFWadfGuA/oNYVQOOoFVtNKR1WBld9ru1zfLXqy1ex1rw3teU 57jIf3qm3DnH3/dxDVlpHZEsEOjaKO86GXktGcn9NMW9oKiq/lpfPPC5BzG0zlCUc4bS RcnVBrJkmY24w83prvb2D+xFc9Lo4h7/OlqZlcglIHMRr3IFEJP8Gdqa0ywjUe64aYBv wBag== X-Gm-Message-State: AO0yUKUpHMtFOQonXlidcS3sINfT55MFqrH51Cavy15dwsBNAZ6WZlz+ k2P0QpOBWBhZx50q37lXlRWs6oGd+JAbESLUb9o= X-Google-Smtp-Source: AK7set9bHEGGptU560kroHdVWsW0V1ap6YPBsIm17ssmlGmc/bZ4paQZD8dYBi+hasRi59VpvHnRvw== X-Received: by 2002:a62:bd08:0:b0:5a8:ac15:534d with SMTP id a8-20020a62bd08000000b005a8ac15534dmr94481pff.13.1676150664312; Sat, 11 Feb 2023 13:24:24 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:23 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 15/28] sdkext/cases/devtool: pass a logger to HTTPService Date: Sat, 11 Feb 2023 11:23:38 -1000 Message-Id: <66b2875e080e9166d176cbe358906523f619ab5e.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177025 From: Ross Burton Pass our logger to the HTTPService instance so we can see the requests and any errors. Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 3485df2ff61143aac03d92300b7bac4e5d6b2427) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/sdkext/cases/devtool.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/sdkext/cases/devtool.py b/meta/lib/oeqa/sdkext/cases/devtool.py index a5c6a76e02..5ffb732556 100644 --- a/meta/lib/oeqa/sdkext/cases/devtool.py +++ b/meta/lib/oeqa/sdkext/cases/devtool.py @@ -112,7 +112,7 @@ class SdkUpdateTest(OESDKExtTestCase): cmd = 'oe-publish-sdk %s %s' % (tcname_new, self.publish_dir) subprocess.check_output(cmd, shell=True) - self.http_service = HTTPService(self.publish_dir) + self.http_service = HTTPService(self.publish_dir, logger=self.logger) self.http_service.start() self.http_url = "http://127.0.0.1:%d" % self.http_service.port From patchwork Sat Feb 11 21:23:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19385 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 52AE3C636D7 for ; Sat, 11 Feb 2023 21:24:27 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.19573.1676150667005374941 for ; Sat, 11 Feb 2023 13:24:27 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=mSVBaOxH; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id r17so5686806pff.9 for ; Sat, 11 Feb 2023 13:24:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=o/baCti/MBoVDRiJxsVy8ITg0iiQ7MUsd23iajgMLqc=; b=mSVBaOxH87F49Chg7nq3bfLL2/OBFUIGHn217CWUoPksztT9lPQOxhNOBnaq8vOFyr zG1Gfm68bNn1juFosAjZgNmclVfqMbHRqbvZydcKcZUC6Zm4cmzed2CeyWhgejvxsYd4 2VZV7BBx74mxwvXMlNDQoRyQDiP9styzFB6kuZ8ENKTzNWGEUZ9/AajM5zx/6JVciRZ0 lGDeiE9nGJHqj1MAMaHhRhQCnQBTzCKpvAf1oQfcnWKI3fT9V0FYIuNl7WfYPUgSev9i 2+ybTxdSnIKxkAOVenLYlrcrDwyl/MKJKeqFmT+0uYlNOhwGgY1mPrUpjcLQr3dfscIk lTfg== 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 :subject:date:message-id:reply-to; bh=o/baCti/MBoVDRiJxsVy8ITg0iiQ7MUsd23iajgMLqc=; b=6OlySfpAFcAlWbwcfuZvt2KaEUTt4hqLTgBEaCRRlrHlIRh+wmQMlWDdIGSHV2YREG 9kqsA+8qqrqHNklmn1DnwHZXWg9d0Jdg++1cSOaa08KGbN0npyGU9EUPYEfzsV6X4a6L 0+zhYA1EjQA3NuQXWD/sGFp1C+ah0rj1TNu8QkLaA1/K0HLIASUCtyqGOPgOHVSQ+h6U x4PT/GQETeom9WkxVEoYQcIWsoELjMjxjWCyk7zk7iwvFLjTwgqap7vV1lI/ohTQlMuV 8XeYF5twb3mxhl54CjsuKWNmMVZ90OVVdeq4qOhbpkTTAzvreFb6zKeuDZRI0/dsg4Gh DIDQ== X-Gm-Message-State: AO0yUKUnNDlklFyoXqGk7zvI9pYgibPmb+uVhJp6dgfInwKkYHDHJstC cwoZRU1EB6niUJ9M73FhJYwO4kNNC0055jnIMG8= X-Google-Smtp-Source: AK7set8ciYhBDSAVuha1oEmV67Xr2Qap/TlSXJA0NZXfNHkehIpMuT2jLj0rvIMINZ+x1Aij217evg== X-Received: by 2002:a62:4eca:0:b0:580:ffa0:bfcf with SMTP id c193-20020a624eca000000b00580ffa0bfcfmr19315242pfb.6.1676150666137; Sat, 11 Feb 2023 13:24:26 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:25 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 16/28] httpserver: add error handler that write to the logger Date: Sat, 11 Feb 2023 11:23:39 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177026 From: Ross Burton Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit a4bcca3123685f410fc99e5cc23f2b8f39fd0a63) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/utils/httpserver.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/meta/lib/oeqa/utils/httpserver.py b/meta/lib/oeqa/utils/httpserver.py index 8ce1dd42f4..5860b0a383 100644 --- a/meta/lib/oeqa/utils/httpserver.py +++ b/meta/lib/oeqa/utils/httpserver.py @@ -40,6 +40,12 @@ class HTTPService(object): self.port = self.server.server_port self.process = multiprocessing.Process(target=self.server.server_start, args=[self.root_dir, self.logger]) + def handle_error(self, request, client_address): + import traceback + exception = traceback.format_exc() + self.logger.warn("Exception when handling %s: %s" % (request, exception)) + self.server.handle_error = handle_error + # The signal handler from testimage.bbclass can cause deadlocks here # if the HTTPServer is terminated before it can restore the standard #signal behaviour From patchwork Sat Feb 11 21:23:40 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19390 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 4CE92C636CC for ; Sat, 11 Feb 2023 21:24:37 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.19561.1676150644242898900 for ; Sat, 11 Feb 2023 13:24:28 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=jDXEdI0q; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id ea13so5671981pfb.13 for ; Sat, 11 Feb 2023 13:24:28 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=4GyPw2oodFlseOPT8cUHXs9WiDw320sKLTLRfR5icls=; b=jDXEdI0qxo/HruQkKQMvBQoyC/rTIu8R3Fmrq3UHjDyfEIg50hmRr75oLAf2pve4MJ 7/n92PhmDaAVfpFsRlKglG/6lDgd20JwAN2pp6OnbQzhdcZyU7rNnzP6Z6vmnR6LMNev rOWcSQ6FPbFHzvd1YhRkSo59Y2C3osJBxEP1JJa9XYu05uhuf+riAozQFhdFtPQu1YA8 WvA7qIxpABX//PZkhoMwt6GE7IiF5k+SpuGwid6h2fKgli1SY1z6tAKE2plxlxcyRyLi Kt2AD1ywvY4XeGP3/CVN64LmjJQQPPW2J2xYM17t1Ax0LthpjBrN4N8LMlG/UbhRSjcy EeiA== 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 :subject:date:message-id:reply-to; bh=4GyPw2oodFlseOPT8cUHXs9WiDw320sKLTLRfR5icls=; b=UjBZti1IY7p8Y/NmsaQ3IGuqp+ToJnnRX5QS3HiK74oiaytR8pomXfnMi/fkC8JPdT mwM+jFkGuRoOiQNmgzZDPbHg6fn8jF2H6JaZjW2mGj9eUNdOx3fbqzBAloimQZkzmKcp M36XuIV0IpDJP7ua8rKrekvDigw5zU14bENXTlLu65EaOIcYru2UHZeph20Wu+YuQZhq 9t13DVfpWAKslM7uBk9yTtFd6dhwJJbYe8lkQAwo4nPWbYSWlcPswo1g//jOAzFApYYH d5/EbTG2iqcpilnE/F/mUtPJ1awf8aRXF5euC0feoYRwZzFBMKc2Mt4aCYmwnArYfJC3 KDJQ== X-Gm-Message-State: AO0yUKUnGBK9lYZTEQUHTkBaU4Q+ce6KHoRaNpuch9bp/SAoPc93rbUn LH5Pw/jEVMVw2MXxW5ajKhce67nneZzfpsSc7Hw= X-Google-Smtp-Source: AK7set9DsNVAinRJJ6azp0YAzqlefES3pt75D805lOsZKOh5QiNtpomBOUOlmSGaHVrseNTcIP0UYA== X-Received: by 2002:a62:3247:0:b0:5a8:5e6d:28d7 with SMTP id y68-20020a623247000000b005a85e6d28d7mr7654889pfy.0.1676150667755; Sat, 11 Feb 2023 13:24:27 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:27 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 17/28] glslang: branch rename master -> main Date: Sat, 11 Feb 2023 11:23:40 -1000 Message-Id: <4daadcc7c8daf687b29a0958a7aaacdae45ae3cf.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177027 From: Mingli Yu Branch name is changed from master to main. Signed-off-by: Mingli Yu Signed-off-by: Richard Purdie (cherry picked from commit 65ee4c1067ee5d73c198eed8ed2f1c9a60d5df96) Signed-off-by: Steve Sakoman --- meta/recipes-graphics/glslang/glslang_1.3.216.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb index 69d9a0a84e..5b3b85b4ff 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.216.0.bb @@ -9,7 +9,7 @@ LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exc LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" SRCREV = "adbf0d3106b26daa237b10b9bf72b1af7c31092d" -SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=master \ +SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ file://0001-generate-glslang-pkg-config.patch" PE = "1" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P\d+(\.\d+)+)" From patchwork Sat Feb 11 21:23:41 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19391 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 589A1C64EC7 for ; Sat, 11 Feb 2023 21:24:37 +0000 (UTC) Received: from mail-pf1-f172.google.com (mail-pf1-f172.google.com [209.85.210.172]) by mx.groups.io with SMTP id smtpd.web10.19562.1676150646351225590 for ; Sat, 11 Feb 2023 13:24:30 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ihj3j1dd; spf=softfail (domain: sakoman.com, ip: 209.85.210.172, mailfrom: steve@sakoman.com) Received: by mail-pf1-f172.google.com with SMTP id ct17so124067pfb.12 for ; Sat, 11 Feb 2023 13:24:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=ZjBjg2h2yYwMW+5yeXAjYRHsuyhBfeziN01QsaDXYuA=; b=ihj3j1dd/C+K21/WdiQxVYVbyPi02jwiZ6hYYpQsKvl/ObPZCYEjF9AA+afo9h7y4s GiYcQUGr4Rot3BmrIdxTQiSnVwHJmROXNXU++qf2EzimHS7wvmjnVAyf0FbfTxFd4HJV 003rjZC/tDgRT77RTqYp2QdFLSN9tZb/qh66959HSb/nb//jP6C1JHMmDM0NISXFhnGc XB07a4l8fAXAhDRg3mcfCagdZDsySWXGpHQ/P/GEfnHjXcqLKbtT7YIB8W9bUp7YUWVI EnnbSpW3mI1MT4jWKSzYaIuXbxvHM35Zpr1/0yiVSqNet7JiUbB6I84s2sBu0hy0O3Ec 6dBA== 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 :subject:date:message-id:reply-to; bh=ZjBjg2h2yYwMW+5yeXAjYRHsuyhBfeziN01QsaDXYuA=; b=DpwigddVkWKXiNTyPaLthYZbT2eQwrmCbG3lHXK3Gwd+skR2rullk6+oFAO7MRQ9QS RbaLyHT7G5bU3PIcaWZyK5+hZkPoK4Y7ULu8cDLIBaWFf8HJurDyC2VluDY0EIgaF2Yu VzJI6VCkXchRngkzmfhp+2TJ9grn+zmWqu112KohvPvEcUr7Q2cTlxMY1IJ2BW/f4Gnh nYme6MZPj0qmS9k75rEm5kVObJ8A8lju2FRkQAvpp9V4N50wkBDjK3f5mYDjcKpY3U+X PK+KR9PtiddQOkYDopo8y32/PDctMhh3eGxeQXxGP3GvpZ+N8rMvIaTKxVhlI0D2s2xK s8/Q== X-Gm-Message-State: AO0yUKXazSzRa6PYkYTXSff0JBbgCPabQ3YLYRN1rQDkAxbCgjvPc2RY LTnllQ6dCCFZMq39MS6tgnDPdVI+wDkF6ONxKdo= X-Google-Smtp-Source: AK7set+Ptbv9au0Ls7G3+PzGkFmt5+ZAZ+Iw3LLbdU12pRutX4em8FCXvdlx6Ev9eIgFaZRukT8mFA== X-Received: by 2002:aa7:9988:0:b0:5a8:4bf8:1752 with SMTP id k8-20020aa79988000000b005a84bf81752mr10425483pfh.32.1676150669418; Sat, 11 Feb 2023 13:24:29 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:29 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 18/28] meta: remove True option to getVar and getVarFlag calls (again) Date: Sat, 11 Feb 2023 11:23:41 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177028 From: Martin Jansa * True is default since 2016 and most layers were already updated not to pass this parameter where not necessary, e.g. oe-core was updated couple times, first in: https://git.openembedded.org/openembedded-core/commit/?id=7c552996597faaee2fbee185b250c0ee30ea3b5f Updated with the same regexp as later oe-core update: https://git.openembedded.org/openembedded-core/commit/?id=9f551d588693328e4d99d33be94f26684eafcaba with small modification to replace not only d.getVar, but also data.getVar as in e.g.: e.data.getVar('ERR_REPORT_USERNAME', True) and for getVarFlag: sed -e 's|\(d\.getVarFlag \?\)( \?\([^,()]*, \?[^,()]*\), \?True)|\1(\2)|g' \ -i $(git grep -E 'getVarFlag ?\( ?([^,()]*), ?([^,()]*), ?True\)' \ | cut -d':' -f1 \ | sort -u) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie (cherry picked from commit 26c74fd10614582e177437608908eb43688ab510) Signed-off-by: Steve Sakoman --- meta/classes-recipe/image.bbclass | 2 +- meta/classes-recipe/license_image.bbclass | 2 +- .../classes-recipe/rust-target-config.bbclass | 2 +- meta/lib/oe/package_manager/deb/__init__.py | 8 +++---- meta/recipes-devtools/go/go_1.19.4.bb | 4 ++-- meta/recipes-devtools/rust/rust.inc | 22 +++++++++---------- scripts/contrib/image-manifest | 2 +- scripts/lib/devtool/menuconfig.py | 2 +- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/meta/classes-recipe/image.bbclass b/meta/classes-recipe/image.bbclass index d4bf02784a..e5e5274924 100644 --- a/meta/classes-recipe/image.bbclass +++ b/meta/classes-recipe/image.bbclass @@ -445,7 +445,7 @@ python () { localdata.delVar('DATE') localdata.delVar('TMPDIR') localdata.delVar('IMAGE_VERSION_SUFFIX') - vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude', True) or '').split() + vardepsexclude = (d.getVarFlag('IMAGE_CMD:' + realt, 'vardepsexclude') or '').split() for dep in vardepsexclude: localdata.delVar(dep) diff --git a/meta/classes-recipe/license_image.bbclass b/meta/classes-recipe/license_image.bbclass index b60d6e44f4..8560c27e93 100644 --- a/meta/classes-recipe/license_image.bbclass +++ b/meta/classes-recipe/license_image.bbclass @@ -235,7 +235,7 @@ def get_deployed_dependencies(d): deploy = {} # Get all the dependencies for the current task (rootfs). taskdata = d.getVar("BB_TASKDEPDATA", False) - pn = d.getVar("PN", True) + pn = d.getVar("PN") depends = list(set([dep[0] for dep in list(taskdata.values()) if not dep[0].endswith("-native") and not dep[0] == pn])) diff --git a/meta/classes-recipe/rust-target-config.bbclass b/meta/classes-recipe/rust-target-config.bbclass index 9158b1918e..876fe8fd9b 100644 --- a/meta/classes-recipe/rust-target-config.bbclass +++ b/meta/classes-recipe/rust-target-config.bbclass @@ -114,7 +114,7 @@ def llvm_features_from_target_fpu(d): # TARGET_FPU can be hard or soft. +soft-float tell llvm to use soft float # ABI. There is no option for hard. - fpu = d.getVar('TARGET_FPU', True) + fpu = d.getVar('TARGET_FPU') return ["+soft-float"] if fpu == "soft" else [] def llvm_features(d): diff --git a/meta/lib/oe/package_manager/deb/__init__.py b/meta/lib/oe/package_manager/deb/__init__.py index c672454072..0c23c884c1 100644 --- a/meta/lib/oe/package_manager/deb/__init__.py +++ b/meta/lib/oe/package_manager/deb/__init__.py @@ -82,15 +82,15 @@ class DpkgIndexer(Indexer): return oe.utils.multiprocess_launch(create_index, index_cmds, self.d) - if self.d.getVar('PACKAGE_FEED_SIGN', True) == '1': - signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND', True)) + if self.d.getVar('PACKAGE_FEED_SIGN') == '1': + signer = get_signer(self.d, self.d.getVar('PACKAGE_FEED_GPG_BACKEND')) else: signer = None if signer: for f in index_sign_files: signer.detach_sign(f, - self.d.getVar('PACKAGE_FEED_GPG_NAME', True), - self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE', True), + self.d.getVar('PACKAGE_FEED_GPG_NAME'), + self.d.getVar('PACKAGE_FEED_GPG_PASSPHRASE_FILE'), output_suffix="gpg", use_sha256=True) diff --git a/meta/recipes-devtools/go/go_1.19.4.bb b/meta/recipes-devtools/go/go_1.19.4.bb index 98977673ee..587ee55944 100644 --- a/meta/recipes-devtools/go/go_1.19.4.bb +++ b/meta/recipes-devtools/go/go_1.19.4.bb @@ -12,7 +12,7 @@ export CXX_FOR_TARGET = "g++" # mips/rv64 doesn't support -buildmode=pie, so skip the QA checking for mips/riscv32 and its # variants. python() { - if 'mips' in d.getVar('TARGET_ARCH',True) or 'riscv32' in d.getVar('TARGET_ARCH',True): - d.appendVar('INSANE_SKIP:%s' % d.getVar('PN',True), " textrel") + if 'mips' in d.getVar('TARGET_ARCH') or 'riscv32' in d.getVar('TARGET_ARCH'): + d.appendVar('INSANE_SKIP:%s' % d.getVar('PN'), " textrel") } diff --git a/meta/recipes-devtools/rust/rust.inc b/meta/recipes-devtools/rust/rust.inc index 956301023a..7d87e8e1b2 100644 --- a/meta/recipes-devtools/rust/rust.inc +++ b/meta/recipes-devtools/rust/rust.inc @@ -72,7 +72,7 @@ python do_configure() { config = configparser.RawConfigParser() # [target.ARCH-poky-linux] - host_section = "target.{}".format(d.getVar('RUST_HOST_SYS', True)) + host_section = "target.{}".format(d.getVar('RUST_HOST_SYS')) config.add_section(host_section) llvm_config_target = d.expand("${RUST_ALTERNATE_EXE_PATH}") @@ -87,7 +87,7 @@ python do_configure() { # If we don't do this rust-native will compile it's own llvm for BUILD. # [target.${BUILD_ARCH}-unknown-linux-gnu] - build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS', True)) + build_section = "target.{}".format(d.getVar('RUST_BUILD_SYS')) if build_section != host_section: config.add_section(build_section) @@ -97,7 +97,7 @@ python do_configure() { config.set(build_section, "cc", e(d.expand("${RUST_BUILD_CC}"))) config.set(build_section, "linker", e(d.expand("${RUST_BUILD_CCLD}"))) - target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS', True)) + target_section = "target.{}".format(d.getVar('RUST_TARGET_SYS')) if target_section != host_section and target_section != build_section: config.add_section(target_section) @@ -143,26 +143,26 @@ python do_configure() { config.set("build", "vendor", e(True)) if not "targets" in locals(): - targets = [d.getVar("RUST_TARGET_SYS", True)] + targets = [d.getVar("RUST_TARGET_SYS")] config.set("build", "target", e(targets)) if not "hosts" in locals(): - hosts = [d.getVar("RUST_HOST_SYS", True)] + hosts = [d.getVar("RUST_HOST_SYS")] config.set("build", "host", e(hosts)) # We can't use BUILD_SYS since that is something the rust snapshot knows # nothing about when trying to build some stage0 tools (like fabricate) - config.set("build", "build", e(d.getVar("RUST_BUILD_SYS", True))) + config.set("build", "build", e(d.getVar("RUST_BUILD_SYS"))) # [install] config.add_section("install") # ./x.py install doesn't have any notion of "destdir" # but we can prepend ${D} to all the directories instead - config.set("install", "prefix", e(d.getVar("D", True) + d.getVar("prefix", True))) - config.set("install", "bindir", e(d.getVar("D", True) + d.getVar("bindir", True))) - config.set("install", "libdir", e(d.getVar("D", True) + d.getVar("libdir", True))) - config.set("install", "datadir", e(d.getVar("D", True) + d.getVar("datadir", True))) - config.set("install", "mandir", e(d.getVar("D", True) + d.getVar("mandir", True))) + config.set("install", "prefix", e(d.getVar("D") + d.getVar("prefix"))) + config.set("install", "bindir", e(d.getVar("D") + d.getVar("bindir"))) + config.set("install", "libdir", e(d.getVar("D") + d.getVar("libdir"))) + config.set("install", "datadir", e(d.getVar("D") + d.getVar("datadir"))) + config.set("install", "mandir", e(d.getVar("D") + d.getVar("mandir"))) with open("config.toml", "w") as f: f.write('changelog-seen = 2\n\n') diff --git a/scripts/contrib/image-manifest b/scripts/contrib/image-manifest index 3c07a73a4e..4d65a99258 100755 --- a/scripts/contrib/image-manifest +++ b/scripts/contrib/image-manifest @@ -392,7 +392,7 @@ def export_manifest_info(args): for key in rd.getVarFlags('PACKAGECONFIG').keys(): if key == 'doc': continue - rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key, True) + rvalues[pn]['packageconfig_opts'][key] = rd.getVarFlag('PACKAGECONFIG', key) if config['patches'] == 'yes': patches = oe.recipeutils.get_recipe_patches(rd) diff --git a/scripts/lib/devtool/menuconfig.py b/scripts/lib/devtool/menuconfig.py index d87a01e7a9..18daef30c3 100644 --- a/scripts/lib/devtool/menuconfig.py +++ b/scripts/lib/devtool/menuconfig.py @@ -45,7 +45,7 @@ def menuconfig(args, config, basepath, workspace): return 1 check_workspace_recipe(workspace, args.component) - pn = rd.getVar('PN', True) + pn = rd.getVar('PN') if not rd.getVarFlag('do_menuconfig','task'): raise DevtoolError("This recipe does not support menuconfig option") From patchwork Sat Feb 11 21:23:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19393 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 58972C61DA4 for ; Sat, 11 Feb 2023 21:24:37 +0000 (UTC) Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) by mx.groups.io with SMTP id smtpd.web10.19577.1676150672043703265 for ; Sat, 11 Feb 2023 13:24:32 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=v47KsNft; spf=softfail (domain: sakoman.com, ip: 209.85.216.54, mailfrom: steve@sakoman.com) Received: by mail-pj1-f54.google.com with SMTP id v6-20020a17090ad58600b00229eec90a7fso11108063pju.0 for ; Sat, 11 Feb 2023 13:24:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=FCGjYlfdcFM2+KIV8Bvgx4MeBFfEz42Ovq+MpEtxLIw=; b=v47KsNftPWaREsFRQWW4sP4+omEi8RSDPhXJ8NlucyiQZKHTS96bfKh8TBrHsZ11+R 36L5NXB2NmpWDzYQMjZ8Gl5gNs1FjttL6nC2EDLvUc18nH6bh8qaOvZuO09JHnnQSdzH kv/qvRxi0YNXHe93jUWNrBzS4/yIx1OKnrN1KXg6cdXaYj6j0kRGm21QlpAq54CW8wi6 WZ8hsaSb/1LFF6SyCFIzHMdCtysOmyvrYKUFIc5j9IMGXA9xYemuC28Qdv8AW4TF7v/0 vsQ6QkasqrrMU6X7DDMCIeCf95hKSo2767MhVJ5SZ5bq+syYdJ7IT1neGINGmxHrCdm8 wQyA== 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 :subject:date:message-id:reply-to; bh=FCGjYlfdcFM2+KIV8Bvgx4MeBFfEz42Ovq+MpEtxLIw=; b=5en+KJKmVpzJQNysF1id01QRpUvObozib2hM/bG0FbH2JmigJBWqK7VGl9nkW9HJ++ PO84r9tZjh/WOcW4IUQgc4ctkDiSikfOT5xX6xicM8ntsrR6OwOnNrdCKP+rG9t6QSVm cYvH4+4iL58oBVrRUEBGm1hpEJBBqLrUE8j5AJEBhIs3qP86e/3OiFXJd9bKpOonJ30J Owbbn8+9RENqoBau7PkLoXlFLkkKfD/5ZBAweogUeqW8i4wrC3ff5c/yfrtugDSffDtF Te+YpCkdxM+N7vyo8w3sdp3+P+i2CFrIFpbpQAKuGzb/bCPAjVJssqkHF3CP1ryhL2LD 2ukQ== X-Gm-Message-State: AO0yUKUzqSlDi3gpmw5xhOOMC7sBimSGe0xygwyisbUKOSpCy5/QGCOk M1zIq8vZJ+BIkAIV1pIwBsslZy7evF5ndk5ZyXM= X-Google-Smtp-Source: AK7set+BYIdtBXAx6pj9rPj+Pu9+4EY65tOFYgdd/3f9WkGpjR7SRPhvmztAN+v+d1eas4Yd9y+w3Q== X-Received: by 2002:a05:6a20:4403:b0:b8:9f05:5216 with SMTP id ce3-20020a056a20440300b000b89f055216mr27612627pzb.57.1676150671035; Sat, 11 Feb 2023 13:24:31 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.30 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:30 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 19/28] apt: fix do_package_qa failure Date: Sat, 11 Feb 2023 11:23:42 -1000 Message-Id: <92f001f231a905e0a5c035c9de0e1ca502ba5a8c.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177029 From: Changqing Li bitbake nativesdk-apt failed with error: ERROR: nativesdk-apt-2.4.5-r0 do_package_qa: QA Issue: nativesdk-apt installs files in /usr/local/oe-sdk-hardcoded-buildpath/sysroots/x86_64-pokysdk-linux/var/volatile, but it is expected to be empty [empty-dirs] an empty dir apt is installed under /var/log/, fix the failure by removing the empty dir apt as what we have done for target. apt will create it when it does not exist. Signed-off-by: Changqing Li Signed-off-by: Richard Purdie (cherry picked from commit 5b035a59d7915da784f1e6678ee130f30d7ceb8a) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/apt/apt_2.4.5.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-devtools/apt/apt_2.4.5.bb b/meta/recipes-devtools/apt/apt_2.4.5.bb index 4b9f804039..ccdbd3d652 100644 --- a/meta/recipes-devtools/apt/apt_2.4.5.bb +++ b/meta/recipes-devtools/apt/apt_2.4.5.bb @@ -126,6 +126,7 @@ do_install:append:class-native() { do_install:append:class-nativesdk() { customize_apt_conf_sample + rm -rf ${D}${localstatedir}/log } do_install:append:class-target() { From patchwork Sat Feb 11 21:23:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19394 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 61664C64EC4 for ; Sat, 11 Feb 2023 21:24:37 +0000 (UTC) Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) by mx.groups.io with SMTP id smtpd.web10.19578.1676150673676544518 for ; Sat, 11 Feb 2023 13:24:33 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=1VeirDLV; spf=softfail (domain: sakoman.com, ip: 209.85.215.173, mailfrom: steve@sakoman.com) Received: by mail-pg1-f173.google.com with SMTP id 78so5914611pgb.8 for ; Sat, 11 Feb 2023 13:24:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=NGHfctV/Bdyv6rnC0wDqtqPLuPVM9staiSFEH1XzJC4=; b=1VeirDLVNygNvY1i4AJzfSBWjCaPyWCnVnkwfYSoifkmNX4qJzZjV8yYn0fQ7qQE2c A6gVixi7x6QNcbtMYy8WYg6d3aY0TaY8WFAZv6Eua+jPPM13X7k3xlPZ4EjIUi0v2rRA t7esZ7e0REVqC6qPQfS7QRsQRLSNbDIVUn0OLX6BN8LwdGfZH9NL2SuT1+nDZ2yt4Bs9 HBagTLVQc/k1ITFBS5LnWXYQCXddc8QeDHU1bAsdhrBgvZYyP56QvRcjZRuk8P0Vgudb IGUBUq4r6eAAJnc7uZFfBWntdYLjDIE9qw0Chza303tYAtY0uDafzcV8/V5upQhI3iZn MTmw== 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 :subject:date:message-id:reply-to; bh=NGHfctV/Bdyv6rnC0wDqtqPLuPVM9staiSFEH1XzJC4=; b=SnfgYSstpO5M2AYea+nzkIGvRQmTzJCGEQOpaccCCAN85oz+CdGoWgi5EMEbAeJzSA nIDQYWuqcCK4Q8OYqFIBuJ9587cr+7vcWXR3mdXE2JdxQsGZZeKUMT7s6GSYUP/4gRl9 6KJVIn/2Qfs5r/eE6ggNGVV38w+FPCqcp5JFMuVc/vn3s+aQb0hcE9MlvwYqKDjEXbiJ 2x4XVcGkuUOSJEMiVUq034MytczB1RdbuZAhVrweck3OR6V7RP3Jwx6+jZM0qxy13Zkl b/WBQNEDBkhRclbnyVdsMikAuaH0JqiEY+jWNYqV60HismjBF+A0mX3PYZ2W5BtfVca5 zD6Q== X-Gm-Message-State: AO0yUKX9yNKio9r9dU1pnHNkhuS+il28Wp4c5W/1DHpS9Y0EyJg6ypdG 3tQlnucupXrYNfnBKM4f1bMWEd6iS9kwy7iTfhk= X-Google-Smtp-Source: AK7set/NBxOqyY7jspCuApahv9kEk0/lzUyusuS/IurYg0AVJDaBBlHXque562kcvJSv1NSC+ptOQQ== X-Received: by 2002:aa7:954b:0:b0:590:6a57:9904 with SMTP id w11-20020aa7954b000000b005906a579904mr17928469pfq.14.1676150672624; Sat, 11 Feb 2023 13:24:32 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:32 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 20/28] oeqa/selftest/locales: Add selftest for locale generation/presence Date: Sat, 11 Feb 2023 11:23:43 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177030 From: Louis Rannou [YOCTO #9070] Add a new selftest to validate locale generation. This selftest builds a complete target with GLIBC_GENERATE_LOCALES, IMAGE_LINGUAS, ENABLE_BINARY_LOCALE_GENERATION set. Signed-off-by: Louis Rannou Signed-off-by: Richard Purdie (cherry picked from commit 53258fd810bea6475af9f908f7b712a13a02b628) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/locales.py | 45 +++++++++++++++++++++++++ 1 file changed, 45 insertions(+) create mode 100644 meta/lib/oeqa/selftest/cases/locales.py diff --git a/meta/lib/oeqa/selftest/cases/locales.py b/meta/lib/oeqa/selftest/cases/locales.py new file mode 100644 index 0000000000..433991abf9 --- /dev/null +++ b/meta/lib/oeqa/selftest/cases/locales.py @@ -0,0 +1,45 @@ +# +# SPDX-License-Identifier: MIT +# + +from oeqa.selftest.case import OESelftestTestCase +from oeqa.core.decorator import OETestTag +from oeqa.utils.commands import bitbake, runqemu + +class LocalesTest(OESelftestTestCase): + + @OETestTag("runqemu") + def test_locales_on(self): + """ + Summary: Test the locales are generated + Expected: 1. Check the locale exist in the locale-archive + 2. Check the locale exist for the glibc + 3. Check the locale can be generated + Product: oe-core + Author: Louis Rannou + AutomatedBy: Louis Rannou + """ + + 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('IMAGE_LINGUAS:append = " en-us fr-fr"') + features.append('ENABLE_BINARY_LOCALE_GENERATION = "1"') + self.write_config("\n".join(features)) + + # Build a core-image-minimal + bitbake('core-image-minimal') + + with runqemu("core-image-minimal", ssh=False, runqemuparams='nographic') as qemu: + cmd = "locale -a" + status, output = qemu.run_serial(cmd) + # output must includes fr_FR or fr_FR.UTF-8 + self.assertEqual(status, 1, msg='locale test command failed: output: %s' % output) + self.assertIn("fr_FR", output, msg='locale -a test failed: output: %s' % output) + + cmd = "localedef --list-archive -v" + status, output = qemu.run_serial(cmd) + # output must includes fr_FR.utf8 + self.assertEqual(status, 1, msg='localedef test command failed: output: %s' % output) + self.assertIn("fr_FR.utf8", output, msg='localedef test failed: output: %s' % output) From patchwork Sat Feb 11 21:23:44 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19395 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 682C5C64ED6 for ; Sat, 11 Feb 2023 21:24:37 +0000 (UTC) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mx.groups.io with SMTP id smtpd.web11.19495.1676150659841718988 for ; Sat, 11 Feb 2023 13:24:35 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=RJp01Pcu; spf=softfail (domain: sakoman.com, ip: 209.85.215.172, mailfrom: steve@sakoman.com) Received: by mail-pg1-f172.google.com with SMTP id x31so5924780pgl.6 for ; Sat, 11 Feb 2023 13:24:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=A+KwquLrLYw+qWBpYpeMvSymNEq2vlNL4g7oWddzl4E=; b=RJp01Pcubd99yizS/IoqkIdJsay29iIlPaqms8C1Lzb70hi17lWGs1woOOW94I/gOJ SZja5bcnswgpOFPOvRSw9oB9U5vmXvQ4EfylxumUL2dhn7fULd7DxQ2AgzHGEb7HfNsg JdgvUTtosRdRIgJiZmBfLK6otxACH13ngW8ZIG8prRXewLMJeiDWXk49dg8HSsqhwam/ IRKp53FDblD6F1x8QS1RbIUcHGgjzQciWnf/czsqPuDmyfreq/i6jxbuIPpF6B/wPx22 OT6fhsm/yCMZLMS0g5D2sSc8U2F8QeIKpfB0aijhDXg4WlcfvDd93HVOhJeL4AI9JEvu sfeA== 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 :subject:date:message-id:reply-to; bh=A+KwquLrLYw+qWBpYpeMvSymNEq2vlNL4g7oWddzl4E=; b=rIUJo2Gp86Qv4KogT4DeELzzbqqb5PTtePvLsozrmTjxF8X0ZDrTdCaGDV0YzfezK8 qiVEH6/Ti6h9n2+cVHTOKvnhXjSeEoT/pWiMF4aJ+qaaGvxTfyE3w5yAkbr5sNWhBDl8 Ud5toaPkHgab6oFMcqNsdctkQyjjL/zZS4qU55tXdWHwX5G0g1MEXstvPtiFt2R47jZp eyvSyP/2tJZRZjvOmM+ZHgSWBBd2c/UlSWW9ms8w0zShMkkPeHO2jyMs4i6hiUFXmTzi oYCZJlWiQY3SAUe1wlUHMYFn0Z6EKNmRyysFMunwFXIToddGpM5ywUcvHrUUHL18xxkl 75FA== X-Gm-Message-State: AO0yUKXu/1kGYxe4eavQ5xeMNnPAR7LahMHgWCNCqmHRNlLkI/svCoi5 PAroshta/qPgbxfM9Tj2dd1aGRCaU991IQLT3vE= X-Google-Smtp-Source: AK7set/Vgja0MZ6gznpaZkNpiYJserFeaR1xr7upIn17lZlTpSPaDbGtALJveviwNS5xvpmyCMlMnQ== X-Received: by 2002:a62:5881:0:b0:5a8:abd7:a9e8 with SMTP id m123-20020a625881000000b005a8abd7a9e8mr159560pfb.27.1676150674266; Sat, 11 Feb 2023 13:24:34 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.33 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:33 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 21/28] sstate.bbclass: Fetch non-existing local .sig files if needed Date: Sat, 11 Feb 2023 11:23:44 -1000 Message-Id: <51c7e5c9f292278f5bdf35bdbd251c50482d55dc.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177031 From: Tobias Hagelborn For the case of a global shared state cache and a local sstate cache with a mix of signed and un-signed entries, there is a case where a .sig is missing locally, but may exist in the global sstate cache. For this case, do not just fail sstate fetch, but rather backfill the .sig file from the global sstate cache. If this case is detected, re-run the fetch operation to get the global .sig file (if it exists). Signed-off-by: Tobias Hagelborn Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit d5ea1a5396bf9fd4303cae46bc0e042be8de8d67) Signed-off-by: Steve Sakoman --- meta/classes-global/sstate.bbclass | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/classes-global/sstate.bbclass b/meta/classes-global/sstate.bbclass index 21959ff13b..2dd880bbab 100644 --- a/meta/classes-global/sstate.bbclass +++ b/meta/classes-global/sstate.bbclass @@ -365,8 +365,9 @@ def sstate_installpkg(ss, d): d.setVar("SSTATE_CURRTASK", ss['task']) sstatefetch = d.getVar('SSTATE_PKGNAME') sstatepkg = d.getVar('SSTATE_PKG') + verify_sig = bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG"), False) - if not os.path.exists(sstatepkg): + if not os.path.exists(sstatepkg) or (verify_sig and not os.path.exists(sstatepkg + '.sig')): pstaging_fetch(sstatefetch, d) if not os.path.isfile(sstatepkg): @@ -377,7 +378,7 @@ def sstate_installpkg(ss, d): d.setVar('SSTATE_INSTDIR', sstateinst) - if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG"), False): + if verify_sig: if not os.path.isfile(sstatepkg + '.sig'): bb.warn("No signature file for sstate package %s, skipping acceleration..." % sstatepkg) return False From patchwork Sat Feb 11 21:23:45 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19392 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 52880C636D7 for ; Sat, 11 Feb 2023 21:24:37 +0000 (UTC) Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.169]) by mx.groups.io with SMTP id smtpd.web11.19505.1676150676880207867 for ; Sat, 11 Feb 2023 13:24:36 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xftxMiyy; spf=softfail (domain: sakoman.com, ip: 209.85.214.169, mailfrom: steve@sakoman.com) Received: by mail-pl1-f169.google.com with SMTP id b5so10041083plz.5 for ; Sat, 11 Feb 2023 13:24:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=Wpbth4vT+/U6N3nIc/ggwPLwOoAu2R28pixeDov9mlM=; b=xftxMiyyexIadY7t1TovZnPZrsyXaAjXgbmGpQJr+7AG9QpwxAfnMGsqJi/hq12yaR wytnBd3s9xIVV+wUD58FpmdGBL/YfYyROglIiORPK6edMQnANxalg4mgUN/gBYYT60Sh ZRoJvX8F94ouNKcZiEpAfBNHBJ5MOsLPfsJMj0EBdHLNp6nOMo5OyUg+6Wnll+N+7s7K PAquRL/h4QTDrIWNVIXw5sLXXnez0OYZM5+kbvfgeSJwhTXrlLpxZ31Yp/gAzttDbRM4 8x2tEEgDOshc2l7e3BJUzwlKqGvUHl/Z9L7Xd9ZjXU1iohztBHlVXdthrFmWelehsRRm W8ug== 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 :subject:date:message-id:reply-to; bh=Wpbth4vT+/U6N3nIc/ggwPLwOoAu2R28pixeDov9mlM=; b=pTI1BtBuuQ1Ra659AeAr6h/wnnzxNSP51LTAno6rhIad9hdkrv4nQ+8MBRalt+iLPa NONrNwuUBq/iTNkhZj0t3e5ndlkHj02MtW+rg5gpFIUCsRIkTxZVuLKO6zr7Goil5OA3 qBGxag0PQqFSCJPyycPQutIUMV2mvCv7lSH7NjwckmrDFUEZeMbtHEYIdPbJyMglNOVT 5aGjIy6PUA2KFlmipodYENOzrpF0hm8rhbiQ09oy5dATtWcYlSWTO780u491+dfEkKut r6KBXoc7WKTxGzUHPJlymDOmdXsEOT9tPRENB+w3Yasl7nDoS+VO1GFdchUkpZkVPVLW YY5Q== X-Gm-Message-State: AO0yUKXZ7B7t1yyEIbg78BN/Ik72/l6at9SKD+8VgLQ0UVzo2LXcYijr ICB7E8iAVUPcb7OeTobEvtW3WNH8MazNIUtHqKE= X-Google-Smtp-Source: AK7set88VsFNlYur8HMT5p1JMML1MylqfBY5emkuQynYUFSy3Cf9HoYoRK9D/1aMf5uYoQa5c4nm3g== X-Received: by 2002:a05:6a20:8428:b0:be:8d91:cb92 with SMTP id c40-20020a056a20842800b000be8d91cb92mr28060552pzd.24.1676150675976; Sat, 11 Feb 2023 13:24:35 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:35 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 22/28] testimage: Fix error message to reflect new syntax Date: Sat, 11 Feb 2023 11:23:45 -1000 Message-Id: <7b37e52d95cea7759e7302afce99165b127b4abb.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177032 From: Alejandro Hernandez Samaniego Signed-off-by: Alejandro Enedino Hernandez Samaniego Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit ec73d19d78e8f30ff9b817490c23bcdf8ea47c86) Signed-off-by: Steve Sakoman --- meta/classes-recipe/testimage.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes-recipe/testimage.bbclass b/meta/classes-recipe/testimage.bbclass index 5cc408b0c4..df22bb2344 100644 --- a/meta/classes-recipe/testimage.bbclass +++ b/meta/classes-recipe/testimage.bbclass @@ -236,7 +236,7 @@ def testimage_main(d): with open(tdname, "r") as f: td = json.load(f) except FileNotFoundError as err: - bb.fatal('File %s not found (%s).\nHave you built the image with INHERIT += "testimage" in the conf/local.conf?' % (tdname, err)) + bb.fatal('File %s not found (%s).\nHave you built the image with IMAGE_CLASSES += "testimage" in the conf/local.conf?' % (tdname, err)) # Some variables need to be updates (mostly paths) with the # ones of the current environment because some tests require them. From patchwork Sat Feb 11 21:23:46 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19397 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 52CC6C64EC4 for ; Sat, 11 Feb 2023 21:24:47 +0000 (UTC) Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169]) by mx.groups.io with SMTP id smtpd.web10.19582.1676150678598042114 for ; Sat, 11 Feb 2023 13:24:38 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=iXjHS4I5; spf=softfail (domain: sakoman.com, ip: 209.85.215.169, mailfrom: steve@sakoman.com) Received: by mail-pg1-f169.google.com with SMTP id 7so5940357pga.1 for ; Sat, 11 Feb 2023 13:24:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=ALxWNtOlKGigu8qYqfWNxs1CYFjbbV4Zc4ZBYjXFvqo=; b=iXjHS4I5nqxHZun21XwtTuBny5Ytoaw3JATtjp6OYDXs8IQ21ymAoP1Tzqgknx+Vjz rgNqX/ooZIzPqzv+Qh+fl9UZu6LbfGZ54MYRr5SmAA8y2BpEOx72O7Uh+u+6y4AYZfbj KviOekZDv8F1GcihIg4I+6FqgDFxMiJc8suhX/+fr5SAwXwLcobJJYNhy3eney+xcTTz X9fgTi4Txa12gDo/cOat6RGpp/2j+1GIcaTPPOL9eoe7jk5UX0vLBQvUtDI2UUMlp+7L GPD8XF48XjdLkRrM3vwk4zmtX/rri8DGycLXsgE2/PgaPQ+icA98Wm7wTNW8L7w46cVS znBg== 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 :subject:date:message-id:reply-to; bh=ALxWNtOlKGigu8qYqfWNxs1CYFjbbV4Zc4ZBYjXFvqo=; b=NaDZU6fWpK1Ui00d66wMLttH8dao7FcYupaRbeZ1bD+XPWg5y/06q0haxT1C3yGdYf rugJ9QHTu2Y3KTRzdyfzSoboMa5lLCFIU481mJhWtQxxnk39vz+81BPyfD48hqImbf/B 4xvvXYSqiLIupRrCYzx/RQFmR/Tcyx7CokV7olNnqrRyioewy3UTTX35ULV1XezD1tch 0+ZkwSrsfov/eufY58o9DRKz7q8mE1jU3o/Z6WGJPjeTWqdySD4KGafBIsmQV1KKwmi9 1XhAOk/1tnYSJMpdMIqzJTv/5l4ThxsEFIvzMaHstvpdDZ/5dbuC1+F0NYdK4uWDM/sD XyHw== X-Gm-Message-State: AO0yUKXsuN3Sh7JDqniV/KVJcDyKj0rUrLS2TAtThPb9PLoXS2pNBetN F+s9qeAC0X+HC3nn8R//YSOYJAHKqBpV+P0CX+8= X-Google-Smtp-Source: AK7set/fgyubzyty+nce/XAuJ8ZUZFpzTOLgYD2IlXgon4ovCyuolh0EV/yYN5DXAnT+dYNRuWdK1g== X-Received: by 2002:a62:6457:0:b0:591:3d20:3827 with SMTP id y84-20020a626457000000b005913d203827mr16493569pfb.21.1676150677658; Sat, 11 Feb 2023 13:24:37 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:37 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 23/28] perf: Enable debug/source packaging Date: Sat, 11 Feb 2023 11:23:46 -1000 Message-Id: X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177033 From: Richard Purdie This was disabled in 2014[1] due to an error message which as far as I can tell, no longer occurs. Having debug information and source files present will make debugging reproducibility issues much easier so remove this line as it appears no longer needed. Fix up a few files which have buildpaths in them to avoid QA warnings and reproducubility issues. [1] OE-Core revision c1b5a262c0201faf2c6bf545d6acb32dfe383ba3 Signed-off-by: Richard Purdie (cherry picked from commit 95983108121c8b96f5659d110498bf2afc6189d9) Signed-off-by: Steve Sakoman --- meta/recipes-kernel/perf/perf.bb | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index c1b0bd22d8..4088c67662 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -356,6 +356,16 @@ FILES:${PN}-python = " \ " FILES:${PN}-perl = "${libexecdir}/perf-core/scripts/perl" - -INHIBIT_PACKAGE_DEBUG_SPLIT="1" DEBUG_OPTIMIZATION:append = " -Wno-error=maybe-uninitialized" + +PACKAGESPLITFUNCS =+ "perf_fix_sources" + +perf_fix_sources () { + for f in util/parse-events-flex.h util/parse-events-flex.c util/pmu-flex.c \ + util/expr-flex.h util/expr-flex.c; do + f=${PKGD}/usr/src/debug/${PN}/${EXTENDPE}${PV}-${PR}/$f + if [ -e $f ]; then + sed -i -e 's#${S}/##g' $f + fi + done +} From patchwork Sat Feb 11 21:23:47 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19399 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 52C95C636CC for ; Sat, 11 Feb 2023 21:24:47 +0000 (UTC) Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) by mx.groups.io with SMTP id smtpd.web10.19584.1676150680131795539 for ; Sat, 11 Feb 2023 13:24:40 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=WGM9ta9t; spf=softfail (domain: sakoman.com, ip: 209.85.214.182, mailfrom: steve@sakoman.com) Received: by mail-pl1-f182.google.com with SMTP id be8so10031892plb.7 for ; Sat, 11 Feb 2023 13:24:40 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=RzwyH/O+uT7KMI2OIEzlQBxnj1siBUCN+7Kaos9Co3I=; b=WGM9ta9tfaYneGk1cYEPGZiQkFtM8BeTbbSqayftvKP7JUrrrJjnbA1Yo8IuZboSCl FG9NAVrs2Gb2bf7upi51ZAB+YWtpW7a+fC/Oy6ZsBYiaMGQsxb8ADYvxZy6Dg82RhbnI jgeyFFmYrHV6NiT3EOG2gb06xqgYb/OyHkiNERkG/8oHCouQuAzvoF1aj/Vw7tWdjJtG BRId9x9gCW6K2p+kjxDy41rdFECpDCVnubPS9k2BiX6ylk9m0RYy/ZFwAzznKQJfQv3P FPftqCFvv0ZL3YLadApAYym2Le2+8P/gXWAAbQzWxeio7T5ups5mg864nVqhIC38sAkn OgKw== 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 :subject:date:message-id:reply-to; bh=RzwyH/O+uT7KMI2OIEzlQBxnj1siBUCN+7Kaos9Co3I=; b=zObY3z81/YAt0/e61rRC6XxNDl9g4GtQzzDVE4EOpe1BuLEFr7GMbN/r8KLoyS8wMx 7ZWj/DeOoZhgT8hnjoRA+jv4uYDZ4kH/nPzP4zOhzbvHYyPKLJD45/wSLbyADRKE//m1 UvKfKG66FjVxcAVE04fwEOl21Clf3o15nYnwss24N9GS6rry2K8QTQbGKm/E+NZPDm23 G78NqpqXYusq85lCjd4rWQ6203p7pZ2rQpbrMa6IedD+Z8cEXfsWluGCqf+qOawCP5JP RjSVZ7KgGrIsc34EzZg7C61v0VjjgC3PihumKG/umTdZOquOY/DyA0PISFI03eTCS2qU JpHw== X-Gm-Message-State: AO0yUKXxt4tRQGC4X7fqQMg+eBpIt/PyaDZ9veuySXeCK0VLWSAMEhBW M2xAEm9IfWxyX29XQCjGpK5zJ84HKX8f68o1ezM= X-Google-Smtp-Source: AK7set+eVkZfc4ZlVSLx5BTwj9CEk3NOTjZuZD3C0XmIdr3JNZgm8/2PN++3cQoRYoN4x9StGDkX+g== X-Received: by 2002:a05:6a20:6929:b0:be:b878:6d77 with SMTP id q41-20020a056a20692900b000beb8786d77mr20504008pzj.1.1676150679281; Sat, 11 Feb 2023 13:24:39 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.38 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:38 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 24/28] libc-locale: Fix on target locale generation Date: Sat, 11 Feb 2023 11:23:47 -1000 Message-Id: <99b3e9101dc931e8d68158e7cf268dd7c6fee84c.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177034 From: Richard Purdie If on target locale generation is used, it fails at first boot showing errors about a missing directory. Ensure the directory exists. Signed-off-by: Richard Purdie (cherry picked from commit f2844c9f1bbb729562063d96a3d1cc9d44dafa0a) Signed-off-by: Steve Sakoman --- meta/classes-recipe/libc-package.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes-recipe/libc-package.bbclass b/meta/classes-recipe/libc-package.bbclass index de3d4223a8..8a99f73ae7 100644 --- a/meta/classes-recipe/libc-package.bbclass +++ b/meta/classes-recipe/libc-package.bbclass @@ -51,6 +51,7 @@ PACKAGE_NO_GCONV ?= "0" OVERRIDES:append = ":${TARGET_ARCH}-${TARGET_OS}" locale_base_postinst_ontarget() { +mkdir ${libdir}/locale localedef --inputfile=${datadir}/i18n/locales/%s --charmap=%s %s } From patchwork Sat Feb 11 21:23:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19401 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 5CAA2C636D7 for ; Sat, 11 Feb 2023 21:24:47 +0000 (UTC) Received: from mail-pf1-f174.google.com (mail-pf1-f174.google.com [209.85.210.174]) by mx.groups.io with SMTP id smtpd.web10.19561.1676150644242898900 for ; Sat, 11 Feb 2023 13:24:41 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=rtP7DN1T; spf=softfail (domain: sakoman.com, ip: 209.85.210.174, mailfrom: steve@sakoman.com) Received: by mail-pf1-f174.google.com with SMTP id ea13so5672147pfb.13 for ; Sat, 11 Feb 2023 13:24:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=btP92xenkDRuvgEowNazQQPtJVsTKO0kg95Cg5wNWLI=; b=rtP7DN1TdRKXpv5+NlI2wNEr007TMh+dxMLIfh0Bnhz6+YXDAu/BViaKJcaawE/+dZ NREiSE6ZtKxrCXITb9a8wrZvb01CVfxrkz2kZEF3NHqry5DMNSRfhMokjAjJ5q2QEuLo xQGs+VNvYOgUB4hthMmVyyXAVsKFSHd0aioMf0D8RWdzRiNiZIhWI/jaYLf3lsAAPWjg AvvJFV1WCRkr8ExCTPrSqy+WuqU4GXypotfAZGVBGDwWfOI3DRcuF9ttTgzzGFuQjPja 03a9h2tr3VQH/qDVUX9FZw//1X+WokC4djO/wvpcAxyyHhIH9yPUdsygTTiy6MOsfrep FsHQ== 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 :subject:date:message-id:reply-to; bh=btP92xenkDRuvgEowNazQQPtJVsTKO0kg95Cg5wNWLI=; b=3eX08zCGqqQN8jIsX4ga0IDOZavjvzIuix3n/RN/QfaRuqPnrJOBjTTLU+DPuc8jTf 0Vs5q2+bmyO/DRhupDFg/LOOna1VOmNx/YJL47eaieEd8AeNjdOhR9QzPL7Bk6s5F+J2 ZdSuBAvvIM/vZhOyvopq/oYZWmC/Xd8yalYlgaX/ixuS+FYkJ20SCiq/NwiFxSR9er48 uIrVC0BhwKrhhUHf+LHV4u9Ur22KpRlQB2rLrxx0IAxgFnJEBpXqb8+nl0a54zhNJNa6 c2jN01HuaxzhRoS7Y7CAM8vtpj0MnQatI4lW++ZRO9L9avoEeLp1XRxC3g1uqbKyLSnf yA5Q== X-Gm-Message-State: AO0yUKU0DraQg45SWC8FTSBiw87JRWKgZX4z48dIQwiZqi65lyUvEa+G Bu2iNSJPqGvgeuxfHf0yWMLf0WN6snd1cUOKSko= X-Google-Smtp-Source: AK7set8OuEP8iS35DG4b7G0wW8wfdb06g0f4PzBFCukueE9I49CN9S+TopgZ93fcgs+NFkxXbypq+w== X-Received: by 2002:aa7:942e:0:b0:59b:3ee7:690a with SMTP id y14-20020aa7942e000000b0059b3ee7690amr14130046pfo.13.1676150680943; Sat, 11 Feb 2023 13:24:40 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:40 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 25/28] bootchart2: Fix usrmerge support Date: Sat, 11 Feb 2023 11:23:48 -1000 Message-Id: <5e1dbd44d1aaaeaa9bca7d99ad21499cc57e21d3.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177035 From: Harald Seiler bootchart2 introduced a variable EARLY_PREFIX for supporting systems with usrmerge [1]. Right now, the recipe here is sidestepping this feature and trying to replicate it by overwriting other variables and even patching the sources. This wasn't enough, however, as there are still problems: For example, some setup code in the bootchart-collector fails because it expects EARLY_PREFIX to be used [2]. Cleanup the recipe to set EARLY_PREFIX and remove the other workarounds. [1]: https://github.com/xrmx/bootchart/commit/56a638ace1d172163b6d636c89892446b8add4b6 [2]: https://github.com/xrmx/bootchart/blob/3d2136d0335718fbe1a8e2370ccbc30123a6e593/collector/collector.c#L670-L672 Fixes: 4157600d3122 ("bootchart2: switch to add patch from change source in do_install") Signed-off-by: Harald Seiler Signed-off-by: Richard Purdie (cherry picked from commit 7031bc65b10040877392ed774a0cdddef85c12e0) Signed-off-by: Steve Sakoman --- .../0001-bootchart2-support-usrmerge.patch | 37 ------------------- .../bootchart2/bootchart2_0.14.9.bb | 11 ++---- 2 files changed, 4 insertions(+), 44 deletions(-) delete mode 100644 meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch diff --git a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch b/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch deleted file mode 100644 index 88597cf3a9..0000000000 --- a/meta/recipes-devtools/bootchart2/bootchart2/0001-bootchart2-support-usrmerge.patch +++ /dev/null @@ -1,37 +0,0 @@ -From b6d1a1ff2de363b1b76c8c70f77ae56a4e4d4b56 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 5 Sep 2019 18:37:31 +0800 -Subject: [PATCH] bootchart2: support usrmerge - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Changqing Li ---- - Makefile | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/Makefile b/Makefile -index 1cc2974..f988904 100644 ---- a/Makefile -+++ b/Makefile -@@ -36,7 +36,7 @@ endif - PY_SITEDIR ?= $(PY_LIBDIR)/site-packages - LIBC_A_PATH = /usr$(LIBDIR) - # Always lib, even on systems that otherwise use lib64 --SYSTEMD_UNIT_DIR = $(EARLY_PREFIX)/lib/systemd/system -+SYSTEMD_UNIT_DIR ?= $(EARLY_PREFIX)/lib/systemd/system - COLLECTOR = \ - collector/collector.o \ - collector/output.o \ -@@ -99,7 +99,7 @@ install-chroot: - install -d $(DESTDIR)$(PKGLIBDIR)/tmpfs - - install-collector: all install-chroot -- install -m 755 -D bootchartd $(DESTDIR)$(EARLY_PREFIX)/sbin/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) -+ install -m 755 -D bootchartd $(DESTDIR)${BASE_SBINDIR}/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX) - install -m 644 -D bootchartd.conf $(DESTDIR)/etc/$(PROGRAM_PREFIX)bootchartd$(PROGRAM_SUFFIX).conf - install -m 755 -D bootchart-collector $(DESTDIR)$(PKGLIBDIR)/$(PROGRAM_PREFIX)bootchart$(PROGRAM_SUFFIX)-collector - --- -2.7.4 - diff --git a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb index b4d5b7cd9b..297dbfb578 100644 --- a/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb +++ b/meta/recipes-devtools/bootchart2/bootchart2_0.14.9.bb @@ -93,7 +93,6 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+\.\d+(\.\d+)*)" SRC_URI = "git://github.com/xrmx/bootchart.git;branch=master;protocol=https \ file://bootchartd_stop.sh \ file://0001-collector-Allocate-space-on-heap-for-chunks.patch \ - file://0001-bootchart2-support-usrmerge.patch \ file://0001-bootchartd.in-make-sure-only-one-bootchartd-process.patch \ file://0001-Do-not-include-linux-fs.h.patch \ " @@ -120,12 +119,11 @@ UPDATERCPN = "bootchartd-stop-initscript" INITSCRIPT_NAME = "bootchartd_stop.sh" INITSCRIPT_PARAMS = "start 99 2 3 4 5 ." -EXTRA_OEMAKE = 'BASE_SBINDIR="${base_sbindir}"' - do_compile:prepend () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" - export LIBDIR="${base_libdir}" + export LIBDIR="/${baselib}" + export EARLY_PREFIX="${root_prefix}" } do_install () { @@ -133,9 +131,8 @@ do_install () { export PY_LIBDIR="${libdir}/${PYTHON_DIR}" export BINDIR="${bindir}" export DESTDIR="${D}" - export LIBDIR="${base_libdir}" - export PKGLIBDIR="${base_libdir}/bootchart" - export SYSTEMD_UNIT_DIR="${systemd_system_unitdir}" + export LIBDIR="/${baselib}" + export EARLY_PREFIX="${root_prefix}" oe_runmake install NO_PYTHON_COMPILE=1 install -d ${D}${sysconfdir}/init.d From patchwork Sat Feb 11 21:23:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19398 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 5FE2FC64EC7 for ; Sat, 11 Feb 2023 21:24:47 +0000 (UTC) Received: from mail-pg1-f174.google.com (mail-pg1-f174.google.com [209.85.215.174]) by mx.groups.io with SMTP id smtpd.web11.19511.1676150683607870020 for ; Sat, 11 Feb 2023 13:24:43 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=KE8Osa0K; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id a23so5906656pga.13 for ; Sat, 11 Feb 2023 13:24:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=cvZ9JYTquZNBdcndhod1/lw4reSFnDYFeYJd7NWzXto=; b=KE8Osa0KSpJxAlW5n46qLGxTS+RpreIA5zOYPezrlIJ5E0zj55zbhdzkgMLQVtU3/E pp1MnxovYWndcXT21eF6gERnWDyvbmZi+OuBI6IfVS5fHeCU0kU5xjedd7FHB0xBr9m2 E8b1NNN1vLxQi9XAFcqMjhhskO45D+cBBhenBHqlnstPIfGqQD/POFTJ+kOOHzQ8D7nx GDemgxZMpc3YLM5DbzIcyxEx4OLd3DgUkO7sHr38dbq26UPH864XyyJhfgO2ppsTDcNu dHS0RaStGRMvbqfh/NVtsIR0VR1ucKNVKi9kRPsmb2itjnJoPt/j86xPbgBFYBjMusCZ haVg== 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 :subject:date:message-id:reply-to; bh=cvZ9JYTquZNBdcndhod1/lw4reSFnDYFeYJd7NWzXto=; b=hPWTk41U1XJeDQRnqH88SiIslAEpEKOH52gHNuL26uz/duE5SRo0ZRl/WOdhoIYJ1E aqHdfvPm4Y2q1CmhYQcGCsSOu2br8yTkGkxvvuYSAiNzKzv+6PL8yYjni4GrV5nXHVL6 hwsFSUdyUgpOZGR6DII0h3faaYpLbqYt0sbpcyNOsIYvurfTI1aqlklG3QtBtq8OFF+c NFuKnnzsFtaRgOZXgSqsxgUg1UtNrveW95NvhQMdgLDbvzWViwiqNiV5PZoM8gK2dp/X Lsn/HkIEwl3SWv7AaiaViVRzuwHHfa/vEdSeRIsp0qJ26u+Vs9zmwoa56EmZ8Z1RfrU0 +bBg== X-Gm-Message-State: AO0yUKXSw88b14yzd07sqHQXYmT6sRDCK9/m7k3lG4O3wcp60fBr9thL TsgVagsKHDTN5O5bJ6kEBXqusrBM0eyin26yPOo= X-Google-Smtp-Source: AK7set/Pzb7i9EHCobvtfQtKC4+xeP0ue6xK1D5o8itPrAmK+UrIx/DPsdjPXNvUWKJsAdqQK/ICuQ== X-Received: by 2002:a62:1e86:0:b0:593:b13a:c4f5 with SMTP id e128-20020a621e86000000b00593b13ac4f5mr16708726pfe.29.1676150682639; Sat, 11 Feb 2023 13:24:42 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:42 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 26/28] recipe_sanity: fix old override syntax Date: Sat, 11 Feb 2023 11:23:49 -1000 Message-Id: <6779319cfae0ea75cba3419f0aedf94838ccf80f.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177036 From: Ulrich Ölmann Signed-off-by: Ulrich Ölmann Signed-off-by: Richard Purdie (cherry picked from commit 18eeea6fcd8ade49390a978134f51646da2f7764) Signed-off-by: Steve Sakoman --- meta/classes/recipe_sanity.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/recipe_sanity.bbclass b/meta/classes/recipe_sanity.bbclass index 1c2e24c6a1..a5cc4315fb 100644 --- a/meta/classes/recipe_sanity.bbclass +++ b/meta/classes/recipe_sanity.bbclass @@ -16,7 +16,7 @@ def bad_runtime_vars(cfgdata, d): for var in d.getVar("__recipe_sanity_badruntimevars").split(): val = d.getVar(var, False) if val and val != cfgdata.get(var): - __note("%s should be %s_${PN}" % (var, var), d) + __note("%s should be %s:${PN}" % (var, var), d) __recipe_sanity_reqvars = "DESCRIPTION" __recipe_sanity_reqdiffvars = "" From patchwork Sat Feb 11 21:23:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19400 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 60E66C64ED8 for ; Sat, 11 Feb 2023 21:24:47 +0000 (UTC) Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by mx.groups.io with SMTP id smtpd.web10.19585.1676150685185723119 for ; Sat, 11 Feb 2023 13:24:45 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=wUam7hHl; spf=softfail (domain: sakoman.com, ip: 209.85.215.182, mailfrom: steve@sakoman.com) Received: by mail-pg1-f182.google.com with SMTP id v3so5932444pgh.4 for ; Sat, 11 Feb 2023 13:24:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=0zhPEcWzaBr1vaDKyD4nckw/0IF3Itph7FHH8BdScQQ=; b=wUam7hHl8rW3f4Y/hQeIYjRMSB36nsTcgDpxR5kCycndmqJrTTkuXZ190jdf9R2KEN kdZ6GcvoHcHh2EmDoILw9wUw1Tzy+GifpQgT2UgykE8rwOugWYTcGEU/snQmKPDliEKU HaNmchmaL18eNW+yTrKkfOCjKDXm+8DoH2qNOR8FEpIF5GBxzIR44ravRjganMlM8Dop iNGietPX0uJ9kSEYUmRStCW7b/cNjV8NZNkmshqRpScPtAZyk7TVb6388JkMV3S4EJRX rAZylujgHS5e081l9T+2wgqPN+cD5/KMoM6mzggI2rNSuAPsoSSqz8DrUp1FggsowSvZ M6Qw== 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 :subject:date:message-id:reply-to; bh=0zhPEcWzaBr1vaDKyD4nckw/0IF3Itph7FHH8BdScQQ=; b=dobTIgLBFzRI6GAjxbbNtH4klmV7t1zMNpa6Hahve/WkBcwgiHPsqXubVCV3XGU7OL F/yOWXWXajK/D/oy8VH9HosZwi1pc2e5NMl3xYvHRqCdTgM4dw0FdPL0IizlNS5kOG92 8lhsZApw4mb/BS4ZWIgy0iJ8uAbGkoUrNX193VkCTdjWHS8o5P/znz9PItcP3Rh5Wi8V r5J1hEB6ATLgKSpMWx0P3Sx2V3j41r8kwW4hz7CjWn5uZSpqQGQBcvWW4rohY3hULL4h yFDD/Hgj1XChpsYqDrvQc6nlcUNA7Y9C/dATD0FCBPhYLDJeoL2J7siDiS4VBNL9IcOM LPRw== X-Gm-Message-State: AO0yUKXCOiPvduSWtubR3Qp6bB80tf5jPfZXHdTbA6v+7j2ertSYvV1r 291Yeu1jf0YSykJuMu5GPtuWm2L0V0JzDNrbxAI= X-Google-Smtp-Source: AK7set9L4PPbK721suGex6lPHpbUVu9AhPmiw2UQu6mEWlGVkY7msPn9epgShpXWZpZcvDhnUGqQzA== X-Received: by 2002:a62:6585:0:b0:5a7:e4c3:abd9 with SMTP id z127-20020a626585000000b005a7e4c3abd9mr12962142pfb.8.1676150684226; Sat, 11 Feb 2023 13:24:44 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.43 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:43 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 27/28] lsof: fix old override syntax Date: Sat, 11 Feb 2023 11:23:50 -1000 Message-Id: <6712dfadb37fd22c683824995449efa844531460.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177037 From: Ulrich Ölmann Signed-off-by: Ulrich Ölmann Signed-off-by: Richard Purdie (cherry picked from commit 052f767f85eddab9b6e5d78268d2732f4a65d446) Signed-off-by: Steve Sakoman --- meta/recipes-extended/lsof/lsof_4.95.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/lsof/lsof_4.95.0.bb b/meta/recipes-extended/lsof/lsof_4.95.0.bb index 80128369ec..f59fe009bb 100644 --- a/meta/recipes-extended/lsof/lsof_4.95.0.bb +++ b/meta/recipes-extended/lsof/lsof_4.95.0.bb @@ -22,7 +22,7 @@ S = "${WORKDIR}/git" inherit update-alternatives -ALTERNATIVE_${PN} = "lsof" +ALTERNATIVE:${PN} = "lsof" ALTERNATIVE_LINK_NAME[lsof] = "${sbindir}/lsof" # Make our priority higher than busybox ALTERNATIVE_PRIORITY = "100" From patchwork Sat Feb 11 21:23:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 19396 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 4DC27C61DA4 for ; Sat, 11 Feb 2023 21:24:47 +0000 (UTC) Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by mx.groups.io with SMTP id smtpd.web11.19514.1676150687007490492 for ; Sat, 11 Feb 2023 13:24:47 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=7zf5cAoQ; spf=softfail (domain: sakoman.com, ip: 209.85.216.48, mailfrom: steve@sakoman.com) Received: by mail-pj1-f48.google.com with SMTP id r9-20020a17090a2e8900b00233ba727724so2861547pjd.1 for ; Sat, 11 Feb 2023 13:24:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; 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=epAO2EG8Q+yCBh9i+dO5JtNWsxsXr+yoTlOwZxxSwdY=; b=7zf5cAoQPbITt8tJJgJ5FnePr9odPaw8K3oiC0+yiE9lA9jKvntkVFhiv5XQJ25DKF ZN5P1+RIhJx0u5IvhE9guYOCOe2eWazvCNTUBF3U6zFAO/+GXXK74C5if1v0oYshrdlO 2zu7mAjY9IV4uY3hN3rnHp3P9dHineILoHbc5b8TbSbJgxVz7egV6BUF1s3AUSVaCDEj eHH4VhFx8EdSsbLVOWP6IXS3ciLyhqjj1Nt0/0pw7gpGo57cMCxs+KkMem2HaD9AL6Bt hwJSnWHYKTknX8Z+mRayviuKFnJjxH6hsO8s0t6xaHVtZBL+INBEoHNu1FsB8v1MjOc3 tIVA== 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 :subject:date:message-id:reply-to; bh=epAO2EG8Q+yCBh9i+dO5JtNWsxsXr+yoTlOwZxxSwdY=; b=CIAbH8kSKd+CFBXoh2hV52FmwH5qysZKE/+MBFZLAbI33Rolle/ULOqlXUWcc5djB8 RqkP2PBi925g03795QoWOhMfswq4rYLJ4yMPRzZelx1uVHjpDEPMsfq74ZVUTCc7cl3i 2RbjlfXWNjS0vBNwNJAk/aLNfWJ2ffSAsw7KP5vpfpBGw/5vw33Gh7XTeoLr1X+z65Iz asAuf6D6J+Ze+GlxI8l7RpStPtj+p3FCuV4BZNKn/SYmrMmxA50GqnzoY9tMkvhwCgsl xy3UK/3lK1zb0/xKb5z9OR9LornO9uPjVBQitUjSpftZgOSdIabUw759YR3APziF0PTe vJGw== X-Gm-Message-State: AO0yUKWobc64AviXze6yEvGd49mrdC3qHqqIFEIrWmVjLX+Y27n+fLVB y489n9VTqPwTSmjkBsPpRw7+V9RZEOf6/pOhaMY= X-Google-Smtp-Source: AK7set9/bOaFfwRrF9a1QgnC8Yq3LaIAshySEA3tnkHP45pqyvhq89PL5Xul/ZlaE4tE0jJCObkg+w== X-Received: by 2002:a05:6a21:3392:b0:bf:5d4e:1328 with SMTP id yy18-20020a056a21339200b000bf5d4e1328mr12768965pzb.25.1676150685933; Sat, 11 Feb 2023 13:24:45 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-4-112.hawaiiantel.net. [72.253.4.112]) by smtp.gmail.com with ESMTPSA id v23-20020aa78097000000b0059393d46228sm5398595pff.144.2023.02.11.13.24.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 11 Feb 2023 13:24:45 -0800 (PST) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][langdale 28/28] oeqa context.py: fix --target-ip comment to include ssh port number Date: Sat, 11 Feb 2023 11:23:51 -1000 Message-Id: <62b894d75fb3361ed4d5473ae69188bce390980a.1676150527.git.steve@sakoman.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: 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 Feb 2023 21:24:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/177038 From: Mikko Rapeli Providing ssh port number is supported too with "--target-ip 192.168.0.10:22". Signed-off-by: Mikko Rapeli Signed-off-by: Richard Purdie (cherry picked from commit 637919b9df0abc06da5b2f9b389cf25376bd6b7c) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/runtime/context.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/lib/oeqa/runtime/context.py b/meta/lib/oeqa/runtime/context.py index 8092dd0bae..0c5d1869ab 100644 --- a/meta/lib/oeqa/runtime/context.py +++ b/meta/lib/oeqa/runtime/context.py @@ -67,11 +67,11 @@ class OERuntimeTestContextExecutor(OETestContextExecutor): % self.default_target_type) runtime_group.add_argument('--target-ip', action='store', default=self.default_target_ip, - help="IP address of device under test, default: %s" \ + help="IP address and optionally ssh port (default 22) of device under test, for example '192.168.0.7:22'. Default: %s" \ % self.default_target_ip) runtime_group.add_argument('--server-ip', action='store', default=self.default_target_ip, - help="IP address of device under test, default: %s" \ + help="IP address of the test host from test target machine, default: %s" \ % self.default_server_ip) runtime_group.add_argument('--host-dumper-dir', action='store',