From patchwork Sun Jun 19 19:30:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9336 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 D10B8C43334 for ; Sun, 19 Jun 2022 19:31:17 +0000 (UTC) Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) by mx.groups.io with SMTP id smtpd.web11.11779.1655667065395055413 for ; Sun, 19 Jun 2022 12:31:05 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=q2r9a/Y4; spf=softfail (domain: sakoman.com, ip: 209.85.214.176, mailfrom: steve@sakoman.com) Received: by mail-pl1-f176.google.com with SMTP id k7so8001179plg.7 for ; Sun, 19 Jun 2022 12:31:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+/XZik0pxh+Hbke4zcHiAvA0d2x8SEAe0OXB3jtlwx0=; b=q2r9a/Y47PWixMoHqD9XVbmIY1sqxb4DYzqHLOEwsS/SkLmK4tDrHYA247qilh4LS0 v/5iLjPeSUyMbyu1etZHcAdm6mK3rGGENmipN6K3FOxWe71lP76qombM/dbiCG3FIZLw jtGIp1Z9+AzeFm2WC0C5cZ0lss0vXb0RUjeZgVCkp0c5F9PybjY+nL8IuWYDvbXOh7Ee kGtek890ctn3byRqNazVxvHe4pjPOlBxIuGv6IvVfP0CrnxDukFnRpba7PSW/pAopKvs LOrk4c4IMCQrFjnZhUNZPgIFbKb9WiHNs2yE91i0TEAFHkc7HfRvMxzmtu5Dv49IxPpv g8Kg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+/XZik0pxh+Hbke4zcHiAvA0d2x8SEAe0OXB3jtlwx0=; b=7ruurw/uEdKrm6g49UTEJMV4b5WceAUuIhia0MMIS8n6MG0CvzhygAkkpCY1i5CaMt p0i+E9VcSTsOwltbDwlLePpFrZHxXiwCSAOpQeh1VxMb1eEJgkfO6NBfNMc1pPtMVnwr E7tXzqw2z4cDxd1l3OkM7mdeLEuHQ1cjGA7GnADifB2srLnHfJF0MyNmLN41bOv3C6GK +t7Vl8TLPhArv0TQ/yl37e9oJaZHPkvWdd/c3smn7GUYcguewWkbth6jO9IOhnZHeY0r d4NqvJrsFht11lYKEDN6kJklngYL3lh/kFMdplz0uAovrfOuITjn+jo5alTXlsfymRQ+ 1Obw== X-Gm-Message-State: AJIora/AGjoCwnyJ5zw2XH6fKzBq2jJtfhy7zxvUqBeFGPS0bsgr2zXh aNl4WjzMw9OvsJXguGG8XGqD+a2vZooWNmyi X-Google-Smtp-Source: AGRyM1vQvsRghtwl2gCghcJa6zCFVladfGkhqDTHAkvZE+N23MXBbNi243Ul0TzkwNI67NP4h01YCw== X-Received: by 2002:a17:90b:3849:b0:1e8:7f47:5dcd with SMTP id nl9-20020a17090b384900b001e87f475dcdmr33477009pjb.61.1655667064442; Sun, 19 Jun 2022 12:31:04 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.03 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:03 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 01/15] vim: Upgrade 8.2.5034 -> 8.2.5083 Date: Sun, 19 Jun 2022 09:30:36 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167047 From: Richard Purdie Includes fixes for CVE-2022-1927, CVE-2022-1942. Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1e740b5c2227c0040621ae63436d06db4873670f) Signed-off-by: Steve Sakoman --- meta/recipes-support/vim/vim.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-support/vim/vim.inc b/meta/recipes-support/vim/vim.inc index b22e8016ab..06707dbe11 100644 --- a/meta/recipes-support/vim/vim.inc +++ b/meta/recipes-support/vim/vim.inc @@ -21,8 +21,8 @@ SRC_URI = "git://github.com/vim/vim.git;branch=master;protocol=https \ file://racefix.patch \ " -PV .= ".5034" -SRCREV = "5a6ec10cc80ab02eeff644ab19b82312630ea855" +PV .= ".5083" +SRCREV = "db77c49401145d76441fbb3d22a1d7d987681c13" # Remove when 8.3 is out UPSTREAM_VERSION_UNKNOWN = "1" From patchwork Sun Jun 19 19:30:37 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9337 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 DE9E8CCA47C for ; Sun, 19 Jun 2022 19:31:17 +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.21954.1655667067667873709 for ; Sun, 19 Jun 2022 12:31:08 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=p8VVNBco; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id g186so8467911pgc.1 for ; Sun, 19 Jun 2022 12:31:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=qL0AT6VwrqBzR5m0szQyO876/kUa1i8Cqp5Xw7L4+Ig=; b=p8VVNBcoCocIfR+16aEsRN9aV6kq7KzVQcAxY7mX+e9Ue3CNJ9f8jVeN4FADeYfnXS u8tfcT93OFBDYJoDC5VRUR8r5irx90VWOu/TKbn3HmliyHb8YlXp6K1Z+sPcJSyDZXq8 IgeKHSM2RV5fEKtoLphjLTOZgBJzcJvH8gPeuaiV/wpJuJPMxnouzj7nSi8b1bUdQuKP 1MM4/wXDM5VweZ9uJmoNAPkQnR4ksdQexAE4DbuVAIHRFsz3bPffsb4SkbR15iyXiBVo Z8q/mbJ7+3tZZhOmFnQKABkWXXAR1EP/4aKsi78L2Hc0YltRUVT4amRgnSYzXQIcAoo6 Uubg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=qL0AT6VwrqBzR5m0szQyO876/kUa1i8Cqp5Xw7L4+Ig=; b=Hhe3iUAFzYwCaj4KxT6UO2wjlbXObrBo0BfrhcU50/jXLKq9KSmey76FwMhNjQsJeI qGbOgfQ+afWEnIl0t8iN01Zr02nsDwkGNx4gn04dQQvhaw5sMPvaMYBU1gOZyUUvWEUz 3zMjE0pwFHTOZDRfdpQh+l0JlPVRgeP1g+oIZh/uTadlC1fIZBKVeNv0XvZtKCJcgHdC WYL3jDR+cj0hCDdX0thGxEhaEMxgNxLrgP/izsNeYE+39BdclOC4gLCJi0pUN8RAbYKC PIkqw9cl7m7Z9a3Dd0RbI/KBQbuYq3HTOBr1C53aoijWWH9xrY6mwvt9DDcJzyawVZLG NWDw== X-Gm-Message-State: AJIora8xRvFwmuF/L5X/gmd4gQwxtmO/ZxpFdxdJ2+0KixgWfWl+0UkF OG4OXAZ+hfPzRDBYbstAK7M0aiBGege5I3Jb X-Google-Smtp-Source: AGRyM1vh4QvK8rky0nd7s0BksGrL5Y7jBDfg1NyhIEN7iAyjrUGp3HnGsgXwPJW1XD4oUZCVW0TALg== X-Received: by 2002:a62:7cc3:0:b0:525:20fc:275f with SMTP id x186-20020a627cc3000000b0052520fc275fmr2530212pfc.70.1655667066687; Sun, 19 Jun 2022 12:31:06 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:06 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 02/15] uboot-sign: Fix potential index error issues Date: Sun, 19 Jun 2022 09:30:37 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167048 From: Richard Purdie Someone reported that if some other shell function has left i or j set, the concat_dtb_helper function could fail. Add a small tweak to avoid this. [YOCTO #14815] Signed-off-by: Richard Purdie Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit d219c97bdf5d30be89795fbf9b66ddc367bef384) Signed-off-by: Steve Sakoman --- meta/classes/uboot-sign.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/uboot-sign.bbclass b/meta/classes/uboot-sign.bbclass index 4ca8118eb2..31ffe1f472 100644 --- a/meta/classes/uboot-sign.bbclass +++ b/meta/classes/uboot-sign.bbclass @@ -134,6 +134,8 @@ concat_dtb_helper() { if [ -n "${UBOOT_CONFIG}" ] then + i=0 + j=0 for config in ${UBOOT_MACHINE}; do i=$(expr $i + 1); for type in ${UBOOT_CONFIG}; do From patchwork Sun Jun 19 19:30:38 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9340 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 E1701C433EF for ; Sun, 19 Jun 2022 19:31: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.web12.22090.1655667069809646601 for ; Sun, 19 Jun 2022 12:31:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=QO0+V5QG; spf=softfail (domain: sakoman.com, ip: 209.85.216.42, mailfrom: steve@sakoman.com) Received: by mail-pj1-f42.google.com with SMTP id w19-20020a17090a8a1300b001ec79064d8dso5592880pjn.2 for ; Sun, 19 Jun 2022 12:31:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=00utckH7LeyYPh9fj4Rlgq2rpH1HI3cAY/0xoGC0wh0=; b=QO0+V5QGoTGRfSyv3SGOj0UwIy0O8/1CZ+L3FIAQrnYJOGVGOJo/tbBFnwBSWi8Kof 52oiAYFftmOU49+vGoZI274qRFw/JkiqwXt38FnHN6pZvGFsx63tXJMwaIsPOyVHJhrW dczouXEKRzHQ+mFIHqNlyyZafLrLL5UykBwDBL2gVBxIBSmjVIziD+abn5vqCz3J6dE9 1foC3yeFq77Qp16NIw8R5T/n5hsNZM/8Xxz2Ggp01lKbEaXiQusYC5HNTlNfm83FP7m2 8tDnG3XKQMeogMjXbancsrKFYnv+EDcFBeULozAe6/dkregGo1ySgniQZH1O/o0Fakbo B1tQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=00utckH7LeyYPh9fj4Rlgq2rpH1HI3cAY/0xoGC0wh0=; b=Z7SkAZ3glXEqsu/2oKmA/akXnAumcoWwcGLrlANTlNT7gzKv8NrJKDkJ3LyBHy0QNz iidQ01ReOdlO8TYi6aIJ2LJmtl9zOXnc0dqEzqX17ebmFhm76LMXZHM6a6kLfD1ktsZB xOtjmfUQYFEPHIb4+fFvV/JLLiHVuLK1Qax5qwkIrwb8AFMA/6lKA73uZ5uj5gIpdhVc jCS55AZCUA5CA98lJoIxGcuIj51t+YJe0scC46kTLiICxx+fCbbhQ9ONLH7B3NNHswTj m6s6RGdQvApTfRUsV344Sfy5/k86HrOHwPMV8w4zFn5E1m2WYeoGDuzR5wPsYPkFdW5w zOZg== X-Gm-Message-State: AJIora8hiNYzzb7akVTNUb5zIMqVasefMgW8bxtXr2Knleon2ho7Gd2Q D8uhTxGG+MOtuGwRmca/X/ZLTCS+ePVP2JFD X-Google-Smtp-Source: AGRyM1s4GCdRc3jppuffeWruLg9tat2g+56mxpOqbGo2EpneLHi7Inz5W5sfVMvO/FdnelOpYSon2g== X-Received: by 2002:a17:902:728d:b0:168:d0cf:2246 with SMTP id d13-20020a170902728d00b00168d0cf2246mr20252490pll.74.1655667068804; Sun, 19 Jun 2022 12:31:08 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.07 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:08 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 03/15] selftest/multiconfig: Test that multiconfigs in separate layers works Date: Sun, 19 Jun 2022 09:30:38 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167049 From: Richard Purdie We should test that mutliconfigs from a layer work, not just build/conf. This adds such a test. [YOCTO #13566] Signed-off-by: Richard Purdie Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 2306261fb85d5d03145989c3af9c6897111644ae) Signed-off-by: Steve Sakoman --- meta-selftest/conf/multiconfig/muslmc.conf | 2 ++ meta/lib/oeqa/selftest/cases/multiconfig.py | 13 +++++++++++++ 2 files changed, 15 insertions(+) create mode 100644 meta-selftest/conf/multiconfig/muslmc.conf diff --git a/meta-selftest/conf/multiconfig/muslmc.conf b/meta-selftest/conf/multiconfig/muslmc.conf new file mode 100644 index 0000000000..043cd1ccc3 --- /dev/null +++ b/meta-selftest/conf/multiconfig/muslmc.conf @@ -0,0 +1,2 @@ +TCLIBC = "musl" +TMPDIR = "${TOPDIR}/tmp-mc-musl" diff --git a/meta/lib/oeqa/selftest/cases/multiconfig.py b/meta/lib/oeqa/selftest/cases/multiconfig.py index baae9b456f..83cbd1345d 100644 --- a/meta/lib/oeqa/selftest/cases/multiconfig.py +++ b/meta/lib/oeqa/selftest/cases/multiconfig.py @@ -70,3 +70,16 @@ TMPDIR = "${TOPDIR}/tmp-mc-tiny" result = bitbake('mc:test:multiconfig-test-parse -c showvar') self.assertIn('MCTESTVAR=test2', result.output.splitlines()) + + def test_multiconfig_inlayer(self): + """ + Test that a multiconfig from meta-selftest works. + """ + + config = """ +BBMULTICONFIG = "muslmc" +""" + self.write_config(config) + + # Build a core-image-minimal, only dry run needed to check config is present + bitbake('mc:muslmc:bash -n') From patchwork Sun Jun 19 19:30:39 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9338 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 DEC32CCA480 for ; Sun, 19 Jun 2022 19:31:17 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.11782.1655667071878919231 for ; Sun, 19 Jun 2022 12:31:12 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=jn4BU7S4; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id y6so8020656plg.0 for ; Sun, 19 Jun 2022 12:31:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=U/V3/dtob3dAR9RCNALefxHYHjUiKXRmuuFmlPSG8qQ=; b=jn4BU7S44RCR8VYSrlotoBsEhehR/uJHQ7BIX5OxIXsJIynCcx9Hb4axDNW6Gr95Of I9IzEu4V0xkAIZPG0GJpxWcymsPNoZxArtcy0hHjMOFsmrHWFkVVNEW7aPEPA6wFIt6V 4s4Io3mpSvwqENKAufSBZv7FS/b/OhAldvoTit06EBHAwsBRUf0QSH6lLFqgetiMxbYw jGNf/CBpSyrWAPpqFwEBawPl6O/igeMTqCv1W0t8pdxaqCbGAF14oWkv9M+5EG/JihM+ lB24NmHzSCR0akv7gG6IuUFACyj+bSJ45sknbDooVrSPyNkPlMab2CRpWEvSKQFQ19dQ pqYA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=U/V3/dtob3dAR9RCNALefxHYHjUiKXRmuuFmlPSG8qQ=; b=ZJBczW8zo+TlrNk0DBV4oEZ7BU+d1xKDJFxGRKifL8wY1C2n7xM990F1H3C04n06cj +PpOYy4EsvRR2Z4jsX22WX8++lOyZNYlECOJBjnz35p/UJUdQO1Uf73c25e6ILq8d3ZH /MfxKRNm+qSCM1ITIE0kcKA2aqQnScZLfm6sDj9oPOiarMQ8FkvECHbD1qHlzXTu2/76 8cLFO6qXnXmsbtWsJGZrLz6ISTvccpzy1Wde635uexBa84gmFNfSgCPBhTLXrqZmly5c c8AADYR89eUo+rEPn+cOqNwNidY1ywsg+uSaeICfYG6+5/TpqEUEQMnyK2ajJawMe8s4 VX1A== X-Gm-Message-State: AJIora9YvxyT5hq2WsiLtJL14pRPptIXMzD/C6emMZ/7N6LZXd96HEdB Ybk8/KrhaKIxyrfHjsqKxY9V6Sjwj6xbewMc X-Google-Smtp-Source: AGRyM1vSrTzvzq/Y4CzRHH7ZDcWp+SUelrdI7RRYMp2Pggk1zGXItQnqMEzm7Hrqa+k6DS6lQSJhgA== X-Received: by 2002:a17:90b:224a:b0:1e6:7780:6c8c with SMTP id hk10-20020a17090b224a00b001e677806c8cmr22710431pjb.119.1655667070939; Sun, 19 Jun 2022 12:31:10 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:10 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 04/15] devtool: Fix _copy_file() TypeError Date: Sun, 19 Jun 2022 09:30:39 -1000 Message-Id: <5e6f4d0d3d314897b8ab2f45b3a78b0da9df99ab.1655666951.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167050 From: Xiaobing Luo when devtool finish, the _copy_file() failed. -------------------------------------------- TypeError: _copy_file() got an unexpected keyword argument 'base_outdir' -------------------------------------------- Fixes: 05f2d5d2ce00 ("devtool: finish: add dry-run option") Signed-off-by: Xiaobing Luo Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit a45d9dc089fb2719ca69b92870917f8c0925f632) Signed-off-by: Steve Sakoman --- scripts/lib/devtool/standard.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/devtool/standard.py b/scripts/lib/devtool/standard.py index 01fb5ad96f..4b50e3c63b 100644 --- a/scripts/lib/devtool/standard.py +++ b/scripts/lib/devtool/standard.py @@ -353,7 +353,7 @@ def _move_file(src, dst, dry_run_outdir=None, base_outdir=None): bb.utils.mkdirhier(dst_d) shutil.move(src, dst) -def _copy_file(src, dst, dry_run_outdir=None): +def _copy_file(src, dst, dry_run_outdir=None, base_outdir=None): """Copy a file. Creates all the directory components of destination path.""" dry_run_suffix = ' (dry-run)' if dry_run_outdir else '' logger.debug('Copying %s to %s%s' % (src, dst, dry_run_suffix)) From patchwork Sun Jun 19 19:30:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9339 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 D51C8CCA47A for ; Sun, 19 Jun 2022 19:31:17 +0000 (UTC) Received: from mail-pj1-f43.google.com (mail-pj1-f43.google.com [209.85.216.43]) by mx.groups.io with SMTP id smtpd.web11.11784.1655667073999670314 for ; Sun, 19 Jun 2022 12:31:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=X8LvTpcF; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id y13-20020a17090a154d00b001eaaa3b9b8dso8394041pja.2 for ; Sun, 19 Jun 2022 12:31:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=+0DPwyGW8Miiaxh9inw3hujhJwdEK4nhqh2I0BLaGhQ=; b=X8LvTpcFvl3tea7YQ9x9aBFKlzWH8ld9RT9F1jE2ywy74cXmUoHTPr6TMjDrpCn6gu 0zXhHvUbHDvcLxXumRFWc0EMz3Gp3EuirrYKCDXo0nd3txrK7zDJOh17vj2uiA5NmTQv nrBC0eu+4CR7i1RBrhgZG8i/OLXMim3QvyoTLdMjKl1yV/d5oy+OeUqIgZeP3rVF5Cw/ RMlrOX0hrYDWyulGWZ8xl4/kKqQlgs++duLLQvMqyEhwxR5ljpGFRFtlteYQTWI5xtvI 8HmfGS99Yw4XgT+ouDesCJviojpytrTSb+bNd7bwneqWid8/BNDxhuQHOjpkv3gUU6JN B6GA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=+0DPwyGW8Miiaxh9inw3hujhJwdEK4nhqh2I0BLaGhQ=; b=Z8ueRt48kE8gwNjQOsn/t0jpNKGJnZ4xUwp5dNBkfZHfPT25BRO57leFRgHTnjR8At LmWW62ObDKAd2d7pq0PqOOQ0OuDB8mA0uLFR7Id348c5XYj6jolCJ9RsTsvDGyXiSfXx KlLEt8EkNc82bnjN9F3AvGdekFMTzGaqXltoikEwPgHeDeAr4KzK/ZLn2sAv2AEXsfd1 IbU6JUFBLwiGyp4+S9U5z65FgkqsyysPjfEjBpT/RmbrNL8/7405XvNEIUr/eet86rQ0 7qz9mP1kX9qNSoSzxHPJkhwqD6gEW3ATVNus9RoCJEE8CRDybNK9O+0ryqoQBXuE/L49 Lw/w== X-Gm-Message-State: AJIora+LbsdMPPLhruXoMMX3w+xp8S3hF36ze4zEvbUMqUalIAKblO6g pnm9v2Wspz+K9ueceCt8bz2F5TZxQW4fYSlK X-Google-Smtp-Source: AGRyM1ubbGPVcuz0cq3cLe6WDP3DPM4aO7bvGzPCcJ4m21nQQTUKsfeFjmVhHncltdC6g6FxLfSP6A== X-Received: by 2002:a17:902:7d94:b0:168:f2b5:a989 with SMTP id a20-20020a1709027d9400b00168f2b5a989mr20746215plm.50.1655667072977; Sun, 19 Jun 2022 12:31:12 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 05/15] meson.bbclass: add cython binary to cross/native toolchain config Date: Sun, 19 Jun 2022 09:30:40 -1000 Message-Id: <3beb0f1d44b52e27adf9687d0240883bd9066db5.1655666951.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167051 From: Jack Mitchell This allows building Cython based Python modules with the native meson support which has been present since meson version 0.59. https://mesonbuild.com/Cython.html Signed-off-by: Jack Mitchell Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit b1dcb1eb69032c30f5a8faf4d7120fc6c4ecd051) Signed-off-by: Steve Sakoman --- meta/classes/meson.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 0bfe945811..19b54e0fdc 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -59,6 +59,7 @@ do_write_config() { [binaries] c = ${@meson_array('CC', d)} cpp = ${@meson_array('CXX', d)} +cython = 'cython3' ar = ${@meson_array('AR', d)} nm = ${@meson_array('NM', d)} strip = ${@meson_array('STRIP', d)} @@ -98,6 +99,7 @@ EOF [binaries] c = ${@meson_array('BUILD_CC', d)} cpp = ${@meson_array('BUILD_CXX', d)} +cython = 'cython3' ar = ${@meson_array('BUILD_AR', d)} nm = ${@meson_array('BUILD_NM', d)} strip = ${@meson_array('BUILD_STRIP', d)} From patchwork Sun Jun 19 19:30:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9335 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 D5AECC3F2D4 for ; Sun, 19 Jun 2022 19:31:17 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web12.22092.1655667076258179197 for ; Sun, 19 Jun 2022 12:31:16 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=ai6Q74N+; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id bo5so8469122pfb.4 for ; Sun, 19 Jun 2022 12:31:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=XnbfbcLRkjwx7eHchV2H313AxRrqYjvHK9z17b02mMM=; b=ai6Q74N+pNJd7ylTRc/vWU5a4rT146Lh9KjVnAkZo1dC/w2P0c0fE4DEZYG0dy9tQ3 I6yJWIggBpG1Nv9nFqlN9ocNRytnS8qHYdW+RZ419jWqQ1GaaNUxCJb14p5w3OCyPXTE fp8VwKCNXecCV8bB1Q48ONtK+o934wlODNCQYxw6ZTyAWdhJh+cF7D7AeQvR/lLY9bSw pbc9pT4vV4od5VOEnzlLq+MV7xbMCOnXcO/kfatnO/O0sRF9D6auHC2HbDIaGYE9iDcr w8M/slXa+wEpQlsYw79rL1Q266OJtYHzLb4hShjMKxpxzdCjQQ/Lxnq43bItsQmRAAi0 +vLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XnbfbcLRkjwx7eHchV2H313AxRrqYjvHK9z17b02mMM=; b=qFxgYdtVHuW6wpkAlAtoRbMOL7rq6byMxnOMOHYEpBQI3Ho4E/rJ4Dy6OIepd5HGYZ nn1sLjoHlr0FUwsGEcGzaP4LtkSUqn+Oco1G5GrLQBTEuvf8bZi8DjA7Ej1LyBldunq8 X1NLi5MdFionjR1vBGeFOqeb90y8aUs+ZkAKP0TjJGSbNHCV4mXpegPmvRu1WuhoQggU hgrtHhhUtMYLjfpB/FVg5xdaUfjvPqDkepS0h5YGM6iX8iO3bWJbEvWVzCN9n3roKMPU lHWUI2fHHA1nO2K/slgWqSfB29pFvKYrUOIGyrNox+kLPTBnGhEwWdwro4WRqPN0go0i qSCw== X-Gm-Message-State: AJIora/TIIPPwtvQCty/oG8Sr7JHVaQ1CZdWjwRQ+JvRhooX7bqghsIP anHJMFXOAMNJrjA0Gx4sLjAzhinxrBPis4/v X-Google-Smtp-Source: AGRyM1tPADdbh3bACrR7XA6Yyp6zCYfumykGspXWzI0jIGfhwBdmSaQ/N/yJKkPbCvRUC4IXJ6p/PQ== X-Received: by 2002:a63:3c0f:0:b0:40c:8a83:fc4 with SMTP id j15-20020a633c0f000000b0040c8a830fc4mr6642344pga.397.1655667075283; Sun, 19 Jun 2022 12:31:15 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.13 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:14 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 06/15] archiver: use bb.note instead of echo Date: Sun, 19 Jun 2022 09:30:41 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:17 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167052 From: Jose Quaresma Signed-off-by: Jose Quaresma Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 6420c8a6a8143f53ccad7ab2d56b2ba06db83099) Signed-off-by: Steve Sakoman --- meta/classes/archiver.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index c19c770d11..8d026067f4 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -579,7 +579,7 @@ python do_dumpdata () { SSTATETASKS += "do_deploy_archives" do_deploy_archives () { - echo "Deploying source archive files from ${ARCHIVER_TOPDIR} to ${DEPLOY_DIR_SRC}." + bbnote "Deploying source archive files from ${ARCHIVER_TOPDIR} to ${DEPLOY_DIR_SRC}." } python do_deploy_archives_setscene () { sstate_setscene(d) From patchwork Sun Jun 19 19:30:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9343 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 D4280CCA47A for ; Sun, 19 Jun 2022 19:31:27 +0000 (UTC) Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.178]) by mx.groups.io with SMTP id smtpd.web10.21958.1655667078683328496 for ; Sun, 19 Jun 2022 12:31:18 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2p/Z2RIP; spf=softfail (domain: sakoman.com, ip: 209.85.210.178, mailfrom: steve@sakoman.com) Received: by mail-pf1-f178.google.com with SMTP id s37so8450410pfg.11 for ; Sun, 19 Jun 2022 12:31:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=7oA2AhRfIoJhCbkIqQJQSS61zrcaQY4SSRduorD9V2k=; b=2p/Z2RIPQ1L0HJFaNBxgebvblisEHfJ9WO3DSfe5+WF0gtFNrr8cLqH/+APJFXauqu AaVPb7o1+FKsIHY3kBKftvmmfw9bF0Ce9lubsZQMh8nadnaTuGE0r/IFuzjwA4gWtSb1 UrARMrMPYZKfefG+bl/6sa5zX1MZwZb24obEUTfEXXlf5YphzCmwCg+N/62Ez+eZFE/O VJs2v/Bt5B1aBH9eqXl+/T3zCAlCMvJYpDW9Tmc+PYhsJ4SmOnrzkqM0LAoMIwbi2WtN ItEQ2d8PjTYqvQDtfU4fm7As3S2hN4Ulidl8S5fnFmTWKc5Z1qW6Liwh3bCX8i14QBF2 EEaw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7oA2AhRfIoJhCbkIqQJQSS61zrcaQY4SSRduorD9V2k=; b=wLI1sUCzlpGjMWZPHxTq2shTfCbA/Xe0BTeZm2lGFdfmp4uk8BGVRZRXAXMY1zHT0p DvyKX66phSrR9MIZ7/2imxnNzeZupzP6lYuH7yzQdpUVMLRQMAt12jDiL0rEkfFCkkCt 1qmmn9GqnPETh5LVIM/j2T310bc7oIv3raAl1WOkvvcbd3RnSCwVBu+OqclfxGyK7kfh s89JSpNrGbttBun346rzJdmVi3sKioyPTAv/tyP75BjjxSXAjD6gTr9Ih9C1MvUymtr2 77u9PxtEuD5kVKeHZMfXgKlCoDGIKggrULCKk+xPyJ+NuBxi7sXtv+PcrDn4L3r8bVGP /USw== X-Gm-Message-State: AJIora/fmumAcaA2YnSfxCaoUOegHDKBgbcE9PNaGBKyofiUMumeoOWp xFtHwkS9T6eiJWJI1fJ2567kwgHpJzPFAgkl X-Google-Smtp-Source: AGRyM1u5KnPOy31F8SJLKcYKiRjJJfNzHNLcF4PuvjBvCuALQof9yvs6+qROlBELDfQabgM8ABwaSw== X-Received: by 2002:a65:6a4f:0:b0:3fe:9ef:1c49 with SMTP id o15-20020a656a4f000000b003fe09ef1c49mr18412149pgu.229.1655667077645; Sun, 19 Jun 2022 12:31:17 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:16 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 07/15] xxhash: fix build with gcc 12 Date: Sun, 19 Jun 2022 09:30:42 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167053 From: Kai Kang It fails to compile xxhash when '-Og' is set in CFLAGS via such as set DEBUG_BUILD = '1' in local.conf. Check and disable inline when '-Og' exists. Signed-off-by: Kai Kang Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 3464c67cd34acbb1a6705369e34dee8af7e348ac) Signed-off-by: Steve Sakoman --- meta/recipes-support/xxhash/xxhash_0.8.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/xxhash/xxhash_0.8.1.bb b/meta/recipes-support/xxhash/xxhash_0.8.1.bb index b3b9702598..222ba7b77c 100644 --- a/meta/recipes-support/xxhash/xxhash_0.8.1.bb +++ b/meta/recipes-support/xxhash/xxhash_0.8.1.bb @@ -14,6 +14,8 @@ SRCREV = "35b0373c697b5f160d3db26b1cbb45a0d5ba788c" S = "${WORKDIR}/git" +CFLAGS += "${@bb.utils.contains('SELECTED_OPTIMIZATION', '-Og', '-DXXH_NO_INLINE_HINTS', '', d)}" + do_compile () { oe_runmake all } From patchwork Sun Jun 19 19:30:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9344 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 DC853CCA480 for ; Sun, 19 Jun 2022 19:31:27 +0000 (UTC) Received: from mail-pj1-f52.google.com (mail-pj1-f52.google.com [209.85.216.52]) by mx.groups.io with SMTP id smtpd.web08.22257.1655667081020488787 for ; Sun, 19 Jun 2022 12:31:21 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=JYyZ9xpv; spf=softfail (domain: sakoman.com, ip: 209.85.216.52, mailfrom: steve@sakoman.com) Received: by mail-pj1-f52.google.com with SMTP id g10-20020a17090a708a00b001ea8aadd42bso8424918pjk.0 for ; Sun, 19 Jun 2022 12:31:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=t4IrKe9vwuWA4YBqy4DazRP9U0ztsB/2F181wuJDHAY=; b=JYyZ9xpvJkjwHjzIDYlYUASqYZMdp5V3pXFXP/6zUv6mlNpe1380CaUXXCMQuJmICN VZ4plWR4jecoYtjVUVWrCRioN0qutPAlFg9qDNZGJL585d8lLLVAFf+QFkJppp/yB8S/ GX80f25Ne3rzPhIq0Wa7Mr4qbX+CMFUqqH782YEUJhBqVquxC8jbRf2/HjlCKU1ByKLT zFdXEW8sCy87WdqkL7z1tw4BPi0epaW2iScaPHM7oCpzdtipILUbwijG1sqjapj4my7N 84SPaBz30tBDM7ioGAmydBnTb0Xbzogs7L3CxUGHr/Z9fYWTlcDNpdcdnMljYKlnyKDO pB/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=t4IrKe9vwuWA4YBqy4DazRP9U0ztsB/2F181wuJDHAY=; b=fItLUUSN7ahHEdtD67d+dRqb9uL0sGmBwYALm9aoCJrHTemMeA9IFYtlY1eUG187i8 lKGepXKpzseznlDPWYqDFTE+x/Ux9SNda4rC7UgGs7ylDSK79UElAzsPikJzTQFUm7rX 7QjiCnrIAGcbKE44V1tK9ax90SDnXNQFoYNbf/zz90P5hYRVM/8Kt6OJxFrawTUtEfio GebG1TtxdnWdCLFOYz9l9RESjScwjILWYC1QYXuFZSdDLT8OpAkIHDQdUT/E8mBaHKub Tp0qWCwAU0DCsI/6IjtSOVIJQBZ4Onu29BBb8BwZjIithK0Zp3Z8AbZYbat/C/tGT9yq 1YDQ== X-Gm-Message-State: AJIora/XxfehyyQvKBa3OWnpeuiX222aF3jaOmnclCwvv4R8rpKekhWG 05G43rgmNLk+dPWFCBUccArqyiGA5PkykflO X-Google-Smtp-Source: AGRyM1t7jWRX7EZOTzxaIX+WkcgIRi1/j0P6YD+M24oXKq1QmMAVsVoc9qBicKMixvIPmfSwsvaK4A== X-Received: by 2002:a17:902:f60d:b0:16a:1a7f:a22f with SMTP id n13-20020a170902f60d00b0016a1a7fa22fmr4930701plg.13.1655667079967; Sun, 19 Jun 2022 12:31:19 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:19 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 08/15] oescripts: change compare logic in OEListPackageconfigTests Date: Sun, 19 Jun 2022 09:30:43 -1000 Message-Id: <8c74bca4d652af93c7e36a2a8847d8010b8cc009.1655666951.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167054 From: Mingli Yu When multilib enabled and add layers/meta-openembedded/meta-oe in conf/bblayers.conf, it reports below error when run oe-selftest. $ oe-selftest -r oescripts [snip] [20:36:33-0700] 2022-05-16 03:36:33,494 - oe-selftest - INFO - RESULTS - oescripts.OEListPackageconfigTests.test_packageconfig_flags_option_flags: FAILED (585.37s) [snip] It is because the output of "list-packageconfig-flags.py -f" as below: $ ../scripts/contrib/list-packageconfig-flags.py -f [snip] qt lib32-pinentry lib32-wxwidgets nativesdk-pinentry pinentry pinentry-native wxwidgets wxwidgets-native secret lib32-pinentry nativesdk-pinentry pinentry pinentry-native [snip] But the check logic as below: class OEListPackageconfigTests(OEScriptTests): #oe-core.scripts.List_all_the_PACKAGECONFIG's_flags def check_endlines(self, results, expected_endlines): for line in results.output.splitlines(): for el in expected_endlines: if line.split() == el.split(): expected_endlines.remove(el) break def test_packageconfig_flags_option_flags(self): results = runCmd('%s/contrib/list-packageconfig-flags.py -f' % self.scripts_dir) expected_endlines = [] expected_endlines.append("PACKAGECONFIG FLAG RECIPE NAMES") expected_endlines.append("qt nativesdk-pinentry pinentry pinentry-native") expected_endlines.append("secret nativesdk-pinentry pinentry pinentry-native") self.check_endlines(results, expected_endlines) And the test will fail as line.split() doesn't equal el.split() as line.split() is ['lib32-pinentry', 'lib32-wxwidgets', 'nativesdk-pinentry', 'pinentry', 'pinentry-native', 'wxwidgets', 'wxwidgets-native'] and el.split() is ['nativesdk-pinentry', 'pinentry', 'pinentry-native']. So change the compare logic to fix the gap. Signed-off-by: Mingli Yu Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 239f22847bcae0cb31769adb0a42b5440173a7c5) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/selftest/cases/oescripts.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/oescripts.py b/meta/lib/oeqa/selftest/cases/oescripts.py index cd687816c8..bd84f151cb 100644 --- a/meta/lib/oeqa/selftest/cases/oescripts.py +++ b/meta/lib/oeqa/selftest/cases/oescripts.py @@ -129,7 +129,8 @@ class OEListPackageconfigTests(OEScriptTests): def check_endlines(self, results, expected_endlines): for line in results.output.splitlines(): for el in expected_endlines: - if line.split() == el.split(): + if line and line.split()[0] == el.split()[0] and \ + ' '.join(sorted(el.split())) in ' '.join(sorted(line.split())): expected_endlines.remove(el) break From patchwork Sun Jun 19 19:30:44 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9341 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 D3F9EC43334 for ; Sun, 19 Jun 2022 19:31:27 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web08.22258.1655667083280819903 for ; Sun, 19 Jun 2022 12:31:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=I8x87Gpg; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id p5so2635804pjt.2 for ; Sun, 19 Jun 2022 12:31:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=B7lqG8KrwNpiotBJA3O3maITwfMivGhPBnK/ptalsdA=; b=I8x87Gpg/PRzvNYoqRn+wtw+lE0IKT7yy9yhv/6hLey8pP4gryvyRjhClgpGUWQNQI JUvvlcujIMAZoFsSnCtIKJvU6hyHMSUvrj3j6JNgjfkHZcyKGf4uUgkijMkpOuTpJkbO sG7z1FsWqBMFcoDYC0ENEnPGLwB0ESE7SJJbtv2tB6gJzIGJsYzQE3gzz27cHshvAv/W vZWW6rVl4S2dkidiKWO/aEFTLm59HUJeTqKJjuQHWBgQ6xv4yPppLAxvS4hp5UOJg3Mu tUaThNglZIY3407UqdQ5E9YzzuBP6q49R9PYWBq+ERr6cwhqhbt8JFIJMjkhcg0ck21q OH6g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=B7lqG8KrwNpiotBJA3O3maITwfMivGhPBnK/ptalsdA=; b=xNKqoDKBbCcxCHILJltVdfZOD3D6/mHdSx32gGeW/X6ON4ZCnETTuIYof/QKTZk1gf xtYoBUwP5Fvs46h8Av21gMA0mAir1wUt7WP/KRfMxavVv8PQe4bEHvDBBIY8pNLqPiX3 23yybN7vpQ+40qumVjL2msqkB8tL7mHG2CpmQ0W7L6LiFGjepYRib8swRhinT7BDGM8i yZLO/ucgwqn6SNLQ4CyY5ajfG4y4tn/LD+/yZTFPfkGvjvDReuea1grGphwQubjQ8qS3 5piclBnyo1/2Jz4V/CgfLFTfx0HtL3Ij51SMkYDMthg5j0kaipQPz9wbJWvsedWHRRkh g2Sg== X-Gm-Message-State: AJIora9KjNbQIPr9VOiIUEODaCXyCDQLp6XT9f9gM30nIgSzTQxzkiGJ +ie7An2Uwq+r1EIaZrjBmHHGBS2YlBtwh+Ro X-Google-Smtp-Source: AGRyM1vaUwI1O2Qx+kgYP2L8/UZe5PdvGuOyvpjL3z0YYqssiwv1Oe5Smo9H4RGqdhSqc7MGSgD4cw== X-Received: by 2002:a17:90b:354:b0:1ec:a915:c77a with SMTP id fh20-20020a17090b035400b001eca915c77amr1393677pjb.78.1655667082259; Sun, 19 Jun 2022 12:31:22 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 09/15] e2fsprogs: add alternatives handling of lsattr as well Date: Sun, 19 Jun 2022 09:30:44 -1000 Message-Id: <8876f33f08e07480c93803c19b517b2bed4dfe4c.1655666951.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167055 From: Rasmus Villemoes Building busybox with CONFIG_LSATTR=y and installing that in the same filesystem as e2fsprogs breaks: ERROR: ... do_rootfs: Postinstall scriptlets of ['busybox'] have failed. If the intention is to defer them to first boot, then please place them into pkg_postinst_ontarget:${PN} (). Deferring to first boot via 'exit 1' is no longer supported. Fix that by also alternatifying lsattr just as chattr already is. Signed-off-by: Rasmus Villemoes Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 96703961eeb3460e9da26503d7942cc965d1e573) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb index ec48f419c7..5b2d1921f0 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.46.5.bb @@ -51,6 +51,7 @@ do_install () { oe_multilib_header ext2fs/ext2_types.h install -d ${D}${base_bindir} mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs + mv ${D}${bindir}/lsattr ${D}${base_bindir}/lsattr.e2fsprogs install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/ @@ -99,10 +100,12 @@ FILES:libe2p = "${base_libdir}/libe2p.so.*" FILES:libext2fs = "${libdir}/e2initrd_helper ${base_libdir}/libext2fs.so.*" FILES:${PN}-dev += "${datadir}/*/*.awk ${datadir}/*/*.sed ${base_libdir}/*.so ${bindir}/compile_et ${bindir}/mk_cmds" -ALTERNATIVE:${PN} = "chattr" +ALTERNATIVE:${PN} = "chattr lsattr" ALTERNATIVE_PRIORITY = "100" ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr" ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs" +ALTERNATIVE_LINK_NAME[lsattr] = "${base_bindir}/lsattr" +ALTERNATIVE_TARGET[lsattr] = "${base_bindir}/lsattr.e2fsprogs" ALTERNATIVE:${PN}-doc = "fsck.8" ALTERNATIVE_LINK_NAME[fsck.8] = "${mandir}/man8/fsck.8" From patchwork Sun Jun 19 19:30:45 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9342 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 D0E1AC433EF for ; Sun, 19 Jun 2022 19:31:27 +0000 (UTC) Received: from mail-pl1-f174.google.com (mail-pl1-f174.google.com [209.85.214.174]) by mx.groups.io with SMTP id smtpd.web11.11782.1655667071878919231 for ; Sun, 19 Jun 2022 12:31:25 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=vgOkePQa; spf=softfail (domain: sakoman.com, ip: 209.85.214.174, mailfrom: steve@sakoman.com) Received: by mail-pl1-f174.google.com with SMTP id y6so8020656plg.0 for ; Sun, 19 Jun 2022 12:31:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=2eV+9z7VzfoDfDxQXYbxolMPWYXxgwkpJFzXwHjjFUA=; b=vgOkePQaQgMp5suisiZnLwRrbSeF798vzm8o4B9+p+8DRnw9dkglqTKChOTWVFzsAB 8VjIZ3sjrikOKzvMjM3+2rbJQR4SHGIY7UF9e5IvBLfzKUs/p5ojbVBbeZ119XwQa6XV WenN3Rfp2IVfZz/R87jGhzt4Hmy7kf9dTxetuhi/1OFUh7wQAwhxWvTbQeJ+Qyb2cYOK 98rNdcQsnPbf2qdbIowGIwA1zq4oHUIH+24hTvBMfMU5Zn5CjQbL/c1O7cJbSBPW4K1m J1+zYqkPNURW61ZLaFSJIRnxXKp6HUVjNqO2UgMBD3bNW2R3A2+TPD6YGFGKPSuV92o1 cJMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=2eV+9z7VzfoDfDxQXYbxolMPWYXxgwkpJFzXwHjjFUA=; b=LChZ/wI/kVLFJnUn7H6gnCJGFeInMy0fBpqj+hyoRlQlqEsPeYXpnEqLkQOlX/3PxI BXurd6fwqzMQSW1/DE57U6uyuAdg5RAFF2n53NhETd+sYCKUUYtauQPztcaCVg+fhXGP pcYnVtALjopz5dlixuYObeMBw/yUnFwTtDnRs0rWXWaBK0M6TSP7K5jN9d/Svh+n+qFr GL7bSkY909YQB5AgpfsE5yPmIu5BMlkQDy2JOENlpF6X9wvPAsGVuOMt1dSqceTztcBZ /9GNqwIDcLwXb5AoWFwbds5bRVJvdeTnZCW8Bjn6ZTlsoPKIatYvquUtmrCUgh8Mqpic nGMw== X-Gm-Message-State: AJIora/xd2hmYXUN5lnvtrLw5Bnhc+lD84ipHsuM3v2wSaNyfS9uv1To YBU2+dpNN8gOAQgP2J5MKiTKFXvXBV+bzhj3 X-Google-Smtp-Source: AGRyM1s37heRV/8v8iymIak68QwONkUVp20T1e6RC3kcG23bCjPBq1BPd4CRMQ5oqBLpIX2TJF0KcQ== X-Received: by 2002:a17:902:7c95:b0:168:e7c2:f5b2 with SMTP id y21-20020a1709027c9500b00168e7c2f5b2mr20182299pll.5.1655667084476; Sun, 19 Jun 2022 12:31:24 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 10/15] popt: fix override syntax in RDEPENDS Date: Sun, 19 Jun 2022 09:30:45 -1000 Message-Id: <6168dbc9b27da1ed88c277bab6f024e6e068e685.1655666951.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:27 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167056 From: Yi Zhao RDEPENDS_${PN}-ptest -> RDEPENDS:${PN}-ptest Signed-off-by: Yi Zhao Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 37a47bfced900c2f1e239b216d8614eb290f2f0c) Signed-off-by: Steve Sakoman --- meta/recipes-support/popt/popt_1.18.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/popt/popt_1.18.bb b/meta/recipes-support/popt/popt_1.18.bb index af8add4ad6..b465f8817d 100644 --- a/meta/recipes-support/popt/popt_1.18.bb +++ b/meta/recipes-support/popt/popt_1.18.bb @@ -17,7 +17,7 @@ SRC_URI[sha256sum] = "5159bc03a20b28ce363aa96765f37df99ea4d8850b1ece17d1e6ad5c24 inherit autotools gettext ptest -RDEPENDS_${PN}-ptest += "bash" +RDEPENDS:${PN}-ptest += "bash" do_compile_ptest() { sed 's#lt-test1#test1#g' ${S}/tests/testit.sh > ${B}/tests/testit.sh From patchwork Sun Jun 19 19:30:46 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9345 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 D4873CCA47A for ; Sun, 19 Jun 2022 19:31:37 +0000 (UTC) Received: from mail-pf1-f181.google.com (mail-pf1-f181.google.com [209.85.210.181]) by mx.groups.io with SMTP id smtpd.web10.21959.1655667087644043294 for ; Sun, 19 Jun 2022 12:31:27 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=xPd9N0G+; spf=softfail (domain: sakoman.com, ip: 209.85.210.181, mailfrom: steve@sakoman.com) Received: by mail-pf1-f181.google.com with SMTP id x4so2138591pfq.2 for ; Sun, 19 Jun 2022 12:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=okINGN9tgm7Iw3ag7ZtKloeetmi4k2NDRi/EmTdZVTY=; b=xPd9N0G+teMSqV82lG1zmyHQZaFxa3CFpKLCnCje4wmdsK0lSndp4pxffwRVMSahtG 0EUalXcCn45g/VpEgoVb6tnvMQAWf/gcKF8+gezuvHMdOap/RJQlx57Y8b2t6ZNjK59o S9dita9Bs8ZnWkhy2+JxGTWBDpU9kwf+6vyU1EWovzWJw5sVnuQcaHeUYe/mJq3Nnce3 v7Qh/oDF9qqtSIPd0uclvjVkuguEBurOpf8dlON7UMGSjVMSL6sQSoVCchZf3xsYVYXF tct2tvSzoArYc3T2l8O3WFSj+APuoDvkW2Ph42cVIstOXZ5b0kqPfgPQaZZ0gh0sz1BN ZYFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=okINGN9tgm7Iw3ag7ZtKloeetmi4k2NDRi/EmTdZVTY=; b=mdTL+xLrrR2t5Kw+ItQJHMykH3veFSTvZkccxi5sNp6xRKGf1prrYJGC384UtGI3Hm 03tZR6OvDR/TftP5rJsdmU/kQjI3PNubCbsQMo63BAIAHbYj5sj3swNprLZ57hbJwR9z ACRi5hIajFHPHh5/bSVqBnsHw+XgiyBSENlVlNZt677VDQIydwp8aRTFf7lScOseV4uj YtxBoJ746s6WlVuj2TPa1YxweuAfhwMrHVXPzAXAFR6AN7pMYxSbwJo9lpeEtam9KRSL i0J0pen4N8WsLMfylyzfumizt9yEk66AQH2TYCme1tZHd3fJC/Wqg/oLSlDRAihFOMHc IxMQ== X-Gm-Message-State: AJIora+pSq+pZRXsezCoCh/wJAM9giQQCfvU2sKoZ3NqtL9jQDxX1e0f mtUKMzQUnjb7rRSulabfbCU995e5jrmyL3/B X-Google-Smtp-Source: AGRyM1s0TlmfwR73L5dAVIxES+LFQ7WOTysHoHLXIVVqm+prSX+3aFb8S58bD3CsxFO9FpBPU3AOfw== X-Received: by 2002:a63:551e:0:b0:3fe:3f58:7ffb with SMTP id j30-20020a63551e000000b003fe3f587ffbmr18586416pgb.248.1655667086604; Sun, 19 Jun 2022 12:31:26 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 11/15] git: fix override syntax in RDEPENDS Date: Sun, 19 Jun 2022 09:30:46 -1000 Message-Id: <025d22e9c90ec0a46c1295149f1d43187c76cbe9.1655666951.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167057 From: Yi Zhao RDEPENDS_${PN}-tk -> RDEPENDS:${PN}-tk Signed-off-by: Yi Zhao Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 1ed9267a318d53a302991a8ec7259d3bb809eaaa) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/git/git_2.35.3.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/git/git_2.35.3.bb b/meta/recipes-devtools/git/git_2.35.3.bb index 68981d4fde..794045c8b7 100644 --- a/meta/recipes-devtools/git/git_2.35.3.bb +++ b/meta/recipes-devtools/git/git_2.35.3.bb @@ -147,7 +147,7 @@ RDEPENDS:${PN}-perltools = "${PN} perl perl-module-file-path findutils" # git-tk package with gitk and git-gui PACKAGES =+ "${PN}-tk" -#RDEPENDS_${PN}-tk = "${PN} tk tcl" +#RDEPENDS:${PN}-tk = "${PN} tk tcl" #EXTRA_OEMAKE = "TCL_PATH=${STAGING_BINDIR_CROSS}/tclsh" FILES:${PN}-tk = " \ ${bindir}/gitk \ From patchwork Sun Jun 19 19:30:47 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9347 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 DC9C2CCA47C for ; Sun, 19 Jun 2022 19:31:37 +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.web08.22261.1655667090086561902 for ; Sun, 19 Jun 2022 12:31:30 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=T5tpUgqO; spf=softfail (domain: sakoman.com, ip: 209.85.210.169, mailfrom: steve@sakoman.com) Received: by mail-pf1-f169.google.com with SMTP id w6so1305596pfw.5 for ; Sun, 19 Jun 2022 12:31:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=hWVd0rH+CBBeYrFJQqZNbuCUQw9OVaHKqZbYwuRpb1M=; b=T5tpUgqOCaY5U69p6zNqHBCOfNN2GVdxs9HvXGblARiYOSJi0GjaUJ4ReC5/4sqmb0 TKAzVAHfVa2mno8O/deAMe/8KJVy9HdMdoPkiCyBgInboQ9wnK61PuoDngwp3+AuDotz gXDVqBESxXivWVSfeaXRuTY5rGzvQ1NuRR/s2qqBkKRToRaQi6A0aXaK6MvRa0+m90nL Qad0MuGT8RBD7e3ojNWfJNY5NmjO1uWdqC26XjRQjD2MitB1i+JfE0NQBh1o0V5wh4iC WhIiTKlg+tB+QJ+/8UBmQVPNw4qx5XFL+B1HDcJ+deVHA3aeyhoXMjeyMn4BJ1VWAg7O oMNQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hWVd0rH+CBBeYrFJQqZNbuCUQw9OVaHKqZbYwuRpb1M=; b=ByPqI1xEpYKTYZT8RNkCTEIChPm/8LAiRcMQ7NRKpg9EI7EkhXyTsyu0zJf5T3YM0h XDs+xwfeWKC6LsN8w2HEDNnZhv7IkmiW07nWAgueyCzQ9GpPG+J2L9VOg9C/9GXGpLKa bXjU38CvbUT/tmsEIa8X8emgKuIopsXKmTR6Cr5v17i0IW2d0Za7HCB/j/NWk7db9XnS MbBweUqv+S+kylMLWu+VnLDT1Tr+UCOy6uj4Gomk56RSLtAzWu/2HUHlUeuZRztAGAVq fpnuooffK5SrB+xB7GN9+I0Y/Wgaoa5jRsJz5KXgpv5yGbH+OyQkYQvSJDUCK8AT1LEm RUqA== X-Gm-Message-State: AJIora+hSSroCOvxoBym6RaQgsPmNIE8MI+1qIcPE2G2p6h6+HuDVLph Y/Kerepw9v0OrJH5d4Ubmn4mWs8cuZgxtvDy X-Google-Smtp-Source: AGRyM1vsA/vdN3cWvTrjxz8kbqHnS8YLkKy5bt62y8+zGhiULN6EGIz0nhS8S26ErkdaCT+24wzLcA== X-Received: by 2002:a63:1c7:0:b0:40c:77e3:9b65 with SMTP id 190-20020a6301c7000000b0040c77e39b65mr7730066pgb.90.1655667089126; Sun, 19 Jun 2022 12:31:29 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:28 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 12/15] gcc-source: Fix incorrect task dependencies from ${B} Date: Sun, 19 Jun 2022 09:30:47 -1000 Message-Id: <7211a6fb51ef0e7f5c919f98a33eaf8094b9c814.1655666951.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167058 From: Richard Purdie Some tasks may reference ${B} for gcc-source which in general would not exist. It has dependencies on HOST_SYS and TARGET_SYS which are not appropriate for a shared recipe like gcc-source. This causes problems for the archiver and multiconfigs in particlar. Set B to something else to avoid these task hash issues. Acked-by: Jose Quaresma Signed-off-by: Richard Purdie Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit beb2a76c591e985c6fc7ed473abd1bee27f955a2) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/gcc/gcc-common.inc | 2 +- meta/recipes-devtools/gcc/gcc-source.inc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gcc/gcc-common.inc b/meta/recipes-devtools/gcc/gcc-common.inc index 0f70be7dd4..2abc0e355d 100644 --- a/meta/recipes-devtools/gcc/gcc-common.inc +++ b/meta/recipes-devtools/gcc/gcc-common.inc @@ -96,7 +96,7 @@ BINV = "${PV}" #S = "${WORKDIR}/gcc-${PV}" S = "${TMPDIR}/work-shared/gcc-${PV}-${PR}/gcc-${PV}" -B = "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" +B ?= "${WORKDIR}/gcc-${PV}/build.${HOST_SYS}.${TARGET_SYS}" target_includedir ?= "${includedir}" target_libdir ?= "${libdir}" diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 03bab97815..224b7778ef 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -18,6 +18,7 @@ INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "" PACKAGES = "" +B = "${WORKDIR}/build" # This needs to be Python to avoid lots of shell variables becoming dependencies. python do_preconfigure () { From patchwork Sun Jun 19 19:30:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9348 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 D4E23C433EF for ; Sun, 19 Jun 2022 19:31:37 +0000 (UTC) Received: from mail-pf1-f175.google.com (mail-pf1-f175.google.com [209.85.210.175]) by mx.groups.io with SMTP id smtpd.web12.22092.1655667076258179197 for ; Sun, 19 Jun 2022 12:31:34 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Ek/3RilN; spf=softfail (domain: sakoman.com, ip: 209.85.210.175, mailfrom: steve@sakoman.com) Received: by mail-pf1-f175.google.com with SMTP id bo5so8469122pfb.4 for ; Sun, 19 Jun 2022 12:31:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=rfI3RY6b60sB9rIF0om2dOL9c0rbMmwv436RJpHskbM=; b=Ek/3RilNZriBL5ndaGRjL+HwTAinhENboNZDmIYjsRQ0RurJdj3rZyIf4jpDupbnhh B6bXUfcARwUiwpKQWPKtKq2B+ITf6uemOTb2CLqR2aHX5mcQ+ZA7k9+HKGlUc0Q4kvHo hXHWpe8BHcMhSZTGaZriHTRJ3qXaLz09VdIetM/6eHkugZMSent3GUR3fdgPC0aGGyto /EBiXQB4YRJ2RHFAnjtqzhJuMxStdjN44SBYF7VymuyobRbyRCq9a6iumqeOFaCjbuoU gn7Kdbdu8weWf4ogsEIKcOPJdrOkGBsIv11gCTx8vblkkmdJrNXZK3bTPaexw9hIWTKV Guog== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=rfI3RY6b60sB9rIF0om2dOL9c0rbMmwv436RJpHskbM=; b=hZpB81bv4mNc+enKhYCixvjIZmiInOmx5jRS8jVBcUfh/Ju6H81LyzSaZbMUMyjcwl m6TofzrPzHqNL1jh7HEtHLCgs026oyuGD0aGZH3Fx5KiawEgWQMzcg7gZOaO403rbm4F sB2/GSrzWprMtsZ9wXFsa6v9CWKtB3cnD0/msq4BGtUQAxCB3o+91pxRmmYTqVo6/qhV O5aCtOW8H1vO+jeLztHvkw8OHCUWLPe4YjqOZbbkeHEiEGkK192CbBc3NrxLpBg/z2Oj CoqBP2lEQFuJE3oXppfxxdc4tYwOxST2ckHo2g/gEktesKNYpbdNyd27/EC1K5qk3BWE KdtA== X-Gm-Message-State: AJIora8Sqf9y6sZb9ZfveNShgCDWLwh+H0w/4BZLLJ2jh/+kN68LWLtF fG1wNXYp1hnN1TOz6cs9OTbNSsIeB4XkJPqH X-Google-Smtp-Source: AGRyM1vZIGQ94951CZxuN0gUbwj8zhkgWqp3QZFankOpigExEKkit+JDs+mtt4V0KVrrpbunYNW5KQ== X-Received: by 2002:a63:9b0a:0:b0:406:8c31:47e6 with SMTP id r10-20020a639b0a000000b004068c3147e6mr18534861pgd.329.1655667093056; Sun, 19 Jun 2022 12:31:33 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.31 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:32 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 13/15] archiver: don't use machine variables in shared recipes Date: Sun, 19 Jun 2022 09:30:48 -1000 Message-Id: <6fa49ffcf2d77aaae5c348b6eb1f0117aa93eeaf.1655666951.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167059 From: Jose Quaresma When using multiconfig with the same TMP folder we can have races because the shared recipes like gcc-source run twice. ARCHIVER_OUTDIR = ${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/ which includes TARGET_SYS and between the two different MACHINE values, this changes from 'arm-poky-linux-gnueabi' to 'aarch64-poky-linux'. This leads to the task running twice, once for each multiconfig. To solve this we need to store the shared output in a common place for all machines and in this way the stamps will be the same for each machine so the gcc-source will on run once regardless of the machine used. Signed-off-by: Jose Quaresma Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 5abe497aad39a6ce8d72556fcdda1938a0f8c1bc) Signed-off-by: Steve Sakoman --- meta/classes/archiver.bbclass | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 8d026067f4..33070cd17f 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -55,9 +55,10 @@ ARCHIVER_MODE[compression] ?= "xz" DEPLOY_DIR_SRC ?= "${DEPLOY_DIR}/sources" ARCHIVER_TOPDIR ?= "${WORKDIR}/archiver-sources" -ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${TARGET_SYS}/${PF}/" +ARCHIVER_ARCH = "${TARGET_SYS}" +ARCHIVER_OUTDIR = "${ARCHIVER_TOPDIR}/${ARCHIVER_ARCH}/${PF}/" ARCHIVER_RPMTOPDIR ?= "${WORKDIR}/deploy-sources-rpm" -ARCHIVER_RPMOUTDIR = "${ARCHIVER_RPMTOPDIR}/${TARGET_SYS}/${PF}/" +ARCHIVER_RPMOUTDIR = "${ARCHIVER_RPMTOPDIR}/${ARCHIVER_ARCH}/${PF}/" ARCHIVER_WORKDIR = "${WORKDIR}/archiver-work/" # When producing a combined mirror directory, allow duplicates for the case @@ -101,6 +102,10 @@ python () { bb.debug(1, 'archiver: %s is excluded, covered by gcc-source' % pn) return + # TARGET_SYS in ARCHIVER_ARCH will break the stamp for gcc-source in multiconfig + if pn.startswith('gcc-source'): + d.setVar('ARCHIVER_ARCH', "allarch") + def hasTask(task): return bool(d.getVarFlag(task, "task", False)) and not bool(d.getVarFlag(task, "noexec", False)) From patchwork Sun Jun 19 19:30:49 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9346 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 D0D30C43334 for ; Sun, 19 Jun 2022 19:31:37 +0000 (UTC) Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) by mx.groups.io with SMTP id smtpd.web10.21962.1655667096089030958 for ; Sun, 19 Jun 2022 12:31:36 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=K1Iv3aM/; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id a11-20020a17090acb8b00b001eca0041455so859890pju.1 for ; Sun, 19 Jun 2022 12:31:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=JJwdquBNbHl0PKJaEU9f0aKhxQ1QmC5XqrCPvSVi3rI=; b=K1Iv3aM/wcpIYnQYMCbwgoOZhFVCu4jXe8x18GYmuuAhxRteoK8aBZKuh6031T/4I4 RrgnLEPm7cN2CPHrxdKLLxyQhcZqxI9RFYOo7RzdhP7JA4ldhErsKci6TAqTP6vo2kf0 NmHeOEmegA4p3c3qmvZLfvgd2Hy0lm8YK3CB9R54ytPEIP9SaTgPvENt5Cvni82UvrYT O3KZgUZAWxlhLS4i8x8VsBE8Q3VeLeINRduFqQIUFkvgyNvCqfdx3bYfwdXqL6EFZWzp 6Lr3V7KqW3xw1p8w9OezSdTIS0TFVT0ROWNzg3Cv9TzKIKdZdBDpvm9moUsNOwLDSU0E UiaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=JJwdquBNbHl0PKJaEU9f0aKhxQ1QmC5XqrCPvSVi3rI=; b=v/PgmY8LLb0GVARW3oaWC+6GySDcIO6lo9DSyo9Rjd0vbDmj3sxm3DEe9vepZ3pa3x 8aX5tASze0f53Tpb1dUEqyABoOLsVZClvx9R9U2ogliRL+EVwRMhUttUmFgTGcG4uQWY wnMdat/zuYW4xBIHrkxZAVVTv/DSd+ZsL6kK/HFd2orAQC+IEkgIBrYmGRE1qzaIbK5u kzg8yrt9q4sjeuuWq5yxCJGklkNRDtck+VpatUjWbjNi9C2SY9NbRZogP8PBzbmJ2dNF 0zqNyOOXlWhyKTUU7656WDF8x6C6ZSO54J7sv/p7o/HxZPl+uBTIMwmIXssDZwyGKt08 CPuA== X-Gm-Message-State: AJIora8tZ3SH7tERlY5N2tJp7tXOIdWS1s8LSmybQSBvutOGGhXRvQZD MiyRpZXMeoylqPOlOOYMOEWARe7ewetj1kcC X-Google-Smtp-Source: AGRyM1uqa7K/k+i0yTwPk0TV2yEqPnrqrNWftYmYivjYe03GGvC2U3uROY356LuqE4QAeqzR6n+xUg== X-Received: by 2002:a17:90b:384d:b0:1e3:1266:d378 with SMTP id nl13-20020a17090b384d00b001e31266d378mr33777033pjb.127.1655667095150; Sun, 19 Jun 2022 12:31:35 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.34 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:34 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 14/15] systemd: update 0008-add-missing-FTW_-macros-for-musl.patch Date: Sun, 19 Jun 2022 09:30:49 -1000 Message-Id: <7cdaac4a5a30e8705fb725fd0d69629f268e7da3.1655666951.git.steve@sakoman.com> X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:37 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167060 From: Pavel Zhukov Fixes fuzz warning with insane class ihnerited introduced in 4c3f51142b Kirkstone specific, master has been updated to 251.2 and FTBFS with musl [Yocto 14838] Signed-off-by: Pavel Zhukov Signed-off-by: Steve Sakoman --- .../systemd/0008-add-missing-FTW_-macros-for-musl.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch index 4cce9a3fe6..0c0d3d0b62 100644 --- a/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch +++ b/meta/recipes-core/systemd/systemd/0008-add-missing-FTW_-macros-for-musl.patch @@ -21,12 +21,12 @@ Signed-off-by: Chen Qi 3 files changed, 22 insertions(+) diff --git a/src/basic/missing_type.h b/src/basic/missing_type.h -index aeaf6ad5ec..3df1084ef2 100644 +index 6c0456349d..5140892e22 100644 --- a/src/basic/missing_type.h +++ b/src/basic/missing_type.h -@@ -19,3 +19,23 @@ typedef int (*comparison_fn_t)(const void *, const void *); - #define __COMPAR_FN_T - typedef int (*__compar_fn_t)(const void *, const void *); +@@ -14,3 +14,23 @@ + #ifndef __GLIBC__ + typedef int (*comparison_fn_t)(const void *, const void *); #endif + +#ifndef FTW_ACTIONRETVAL From patchwork Sun Jun 19 19:30:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 9349 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 CF8F8C433EF for ; Sun, 19 Jun 2022 19:31: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.web10.21954.1655667067667873709 for ; Sun, 19 Jun 2022 12:31:38 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=jRO7V/iF; spf=softfail (domain: sakoman.com, ip: 209.85.215.174, mailfrom: steve@sakoman.com) Received: by mail-pg1-f174.google.com with SMTP id g186so8467911pgc.1 for ; Sun, 19 Jun 2022 12:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=QAEPZrNh6XuSEg58/phjidd4T/suM2kZoERDLF6aXhE=; b=jRO7V/iFkrZMo4KsXyOqVtxKCEYKs2Hp0WJhqU7vYtdmQddOxZ9GSiKmFxIf7XkPhx jkCJ75D83USkt5aygrnvWOCygObuKUBLe5Wso2crEZg6qentqHGwBAzwS7l2R2qhPdwA MODgsBwP42n0kKMbXb731GcEFiQHUh6pV/vEK2gTKMyseWupCy8Nh5VFmwQgvPh4y+bQ Ad0xVU9v8khjtXrpvdvKU4JYZJGOw6OKTLlFGNuV8H/93L1JkKS/rGB1npv03HZK6ihh j/v3Zi2FFwGtGQVfRkhOGjvbHWjDFZDFd2VMrlHcOoodCnIePckAs5GpgwqUcCXZYSQ9 wxgQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=QAEPZrNh6XuSEg58/phjidd4T/suM2kZoERDLF6aXhE=; b=BrY2zyXDQ+awXJq6VJ3KtyWfzH5o3DvK2AI9mxNC/HHiTZfu9oW/1MXxtOuQobp27M b6eoohHl/J3yRD+0EftK5CoilA3l+8b2sLW2awsEUlb7T5yCWO6nYR+kck+A273Y5aQU juj6xzq/uBXqVjINo7DbUe6simHmALl8brB8RQkJPNH+g/7ZVZ+2vWu3kR9LVgwNtXA7 9MtqL0k2DFsJdGORTqxtx99q5atc+kq24hvLPnEHnbJtlIvzoYwCwstT/aZISpOsaQSN TQ8Hqmmj+QW8xzOVXtLGKMZs4Q1QqZRaoMi52N60GjXFal1DqyYqUEo2EnaTTtOaNhWy I4eQ== X-Gm-Message-State: AJIora/JrgabrFBLKG8GXXRnhBFJg8IhyYRisd26XcUPCL/hJUlFoXBL M+SHe+dG4ERKD63OZAoste8VRzb7hTN/Cph7 X-Google-Smtp-Source: AGRyM1vJQf+h+XbXt8E62p9FJSNrLO0WRWy8fEWcc+vi3ZEwNkc6rNtkK6jBbDjaFPTPy5E1nZIyBA== X-Received: by 2002:a63:9558:0:b0:40c:7eb9:c419 with SMTP id t24-20020a639558000000b0040c7eb9c419mr6978774pgn.6.1655667097389; Sun, 19 Jun 2022 12:31:37 -0700 (PDT) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id o2-20020a637e42000000b003fe4836abdasm7432886pgn.1.2022.06.19.12.31.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 12:31:36 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][kirkstone 15/15] liberror-perl: Update sstate/equiv versions to clean cache Date: Sun, 19 Jun 2022 09:30:50 -1000 Message-Id: X-Mailer: git-send-email 2.25.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 ; Sun, 19 Jun 2022 19:31:47 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/167061 From: Richard Purdie There are cached reproducibility issues on the autobuilder due to the PRServ sstate checksum issues, flush the bad data out the system by bumping the versions. Signed-off-by: Richard Purdie (cherry picked from commit b12e6cfe3bb34e426c8bb74183d041948cb2ed89) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/perl/liberror-perl_0.17029.bb | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/meta/recipes-devtools/perl/liberror-perl_0.17029.bb b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb index 497f480347..67e5811f3c 100644 --- a/meta/recipes-devtools/perl/liberror-perl_0.17029.bb +++ b/meta/recipes-devtools/perl/liberror-perl_0.17029.bb @@ -9,6 +9,10 @@ LICENSE = "Artistic-1.0 | GPL-1.0-or-later" LIC_FILES_CHKSUM = "file://LICENSE;md5=8f3499d09ee74a050c0319391ff9d100" +# remove at next version upgrade or when output changes +PR = "r1" +HASHEQUIV_HASH_VERSION .= ".1" + DEPENDS += "perl" RDEPENDS:${PN} += " \