From patchwork Mon May 2 23:02: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: 7513 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 31588C433F5 for ; Mon, 2 May 2022 23:03:19 +0000 (UTC) Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) by mx.groups.io with SMTP id smtpd.web11.4331.1651532589181596848 for ; Mon, 02 May 2022 16:03:09 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=p1OHcY1n; spf=softfail (domain: sakoman.com, ip: 209.85.210.176, mailfrom: steve@sakoman.com) Received: by mail-pf1-f176.google.com with SMTP id bo5so13425609pfb.4 for ; Mon, 02 May 2022 16:03: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=CCyv7WBStfESqPHWPPVlufFw57pmYyDrkpN++vttO5w=; b=p1OHcY1nFRYhUGmM86ldFsCjnYm3VBTJ2WqJaAM2IycJm9pQRnjkWv+t6uArtbF3jr TBwNWoqn+ScHaFCgmKTpeskaoG3p0oFHu/C4uyKH064boFhuV7BcAG7H8f1OYGjPQiZ/ brHHUz0GMweVcnZVHItP+ZZpCr8ojyawWgxjF6WsPj8yz0teUvcHJ9obAsZqNpJDse0G rKDzg42nsrYTFA6GuUlChMCl6OV0PuJLeS5pU5xT8nFIzZ76e6DWA8AeYZeWaS2AyQLE 1lIiPP28Goj3qiziW3AKEMgaRVbbuuRDw8QzcQ/tU6F0waW8XDBGuKsW/kDssGO76qME oyAw== 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=CCyv7WBStfESqPHWPPVlufFw57pmYyDrkpN++vttO5w=; b=hdz5RHu+gIppV+0ENXPECMDL3tnBtpqWx/lJY1ub7ix3hmRffGtrHOum+ORj4s/wj1 J0IypO0Rq34dOFnKYYyuwX05U8SGj97Q3KZQsK6Wk/QLYrxb0+MeKqCydBypMc4MUmrm pCofijtT9BlF0S75j0PxS5aVEO058eA3NIZBw66QEATaCPWgzkTiH19I8WkvZWqIqh+j SrzwB7Qyx+xBMDA/P26SF3oPh4xpOib7FYPLiIY0kpmSPtotf/gxMLfiYumJCQbPXVth 9T31GxmpqKqkEsVxIqIGd0fACBFjX8hNuV+hrnnXEAzp1K+hDrrN98Cpa6rv5cckP5Jl YNiw== X-Gm-Message-State: AOAM530DyXdwkDHaWt0u4rNw8N/UY9dupAdMebQICu7pJiIQ/h5XhkIE Wd8zqW4VyuT8mgpz3bHix1TPjlfveGtb2wz5Vu0= X-Google-Smtp-Source: ABdhPJw3KkeR7lLT2VrNlODOpmu+tLeJpn75R+uFTI6IEWGi4sXgZ6ejuLJaAnjw/AEIijxyoeexFQ== X-Received: by 2002:a05:6a00:130e:b0:4f3:9654:266d with SMTP id j14-20020a056a00130e00b004f39654266dmr13395815pfu.59.1651532587853; Mon, 02 May 2022 16:03:07 -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 s7-20020a170902988700b0015eaa9aee50sm2002945plp.202.2022.05.02.16.03.06 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 16:03:07 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 1/9] python3: ignore CVE-2015-20107 Date: Mon, 2 May 2022 13:02:46 -1000 Message-Id: <1ed7bb74d35f08af3babf73c68ee01af5f28a50b.1651531749.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 ; Mon, 02 May 2022 23:03:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165180 From: Ross Burton CVE-2015-20107 describes an arbitrary command execution in the mailcap module, but this is by design in mailcap and needs to be worked around by the calling application. Upstream Python will be documenting this flaw in the library reference, and it is likely that the mailcap module will be deprecated and removed in the future. Signed-off-by: Ross Burton Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 85fac8408baf92d8b71946f5bfea92952b7eab01) Signed-off-by: Steve Sakoman --- meta/recipes-devtools/python/python3_3.8.13.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-devtools/python/python3_3.8.13.bb b/meta/recipes-devtools/python/python3_3.8.13.bb index d7f6e9155d..040bacf97c 100644 --- a/meta/recipes-devtools/python/python3_3.8.13.bb +++ b/meta/recipes-devtools/python/python3_3.8.13.bb @@ -57,6 +57,9 @@ CVE_CHECK_WHITELIST += "CVE-2019-18348" # This is windows only issue. CVE_CHECK_WHITELIST += "CVE-2020-15523 CVE-2022-26488" +# The mailcap module is insecure by design, so this can't be fixed in a meaningful way. +# The module will be removed in the future and flaws documented. +CVE_CHECK_WHITELIST += "CVE-2015-20107" PYTHON_MAJMIN = "3.8" From patchwork Mon May 2 23:02: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: 7512 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 34DDFC4332F for ; Mon, 2 May 2022 23:03:19 +0000 (UTC) Received: from mail-pj1-f51.google.com (mail-pj1-f51.google.com [209.85.216.51]) by mx.groups.io with SMTP id smtpd.web12.4274.1651532591740912927 for ; Mon, 02 May 2022 16:03:11 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=iCrdIq8F; spf=softfail (domain: sakoman.com, ip: 209.85.216.51, mailfrom: steve@sakoman.com) Received: by mail-pj1-f51.google.com with SMTP id cx11-20020a17090afd8b00b001d9fe5965b3so688403pjb.3 for ; Mon, 02 May 2022 16:03: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=baXQ4HIxBg7mbP8c0D9hYtk0q7kznuF5jC/n/ag9sm8=; b=iCrdIq8FafGBhzSCBT/UVicPplv0WJCTJdclceUzoH2ShOKCdBk4269sD7qQhxK3KN KuTiwdCEXFwf5bqRr0v+F3OBTseZ9yImrfcLBN2yc6o+TY11n+7D9M9Dc1Bq65swAFkj X4iivlS9D3ltkyPHpRJT8L3ouHuDu5YVvxmEDV4dJa4+rtL8eqFBMicjANJ9vdCMPFLS XTcqr8o3qTbb0TQbbSQ3qJ+t0+Mdcl4Xcftl2DzBl4iu36oZycrdu9dyP3+Y82sJd61B Hnip8qSdI+RH3ctAATzvu92Gvu8SsfAOw+eanClW0CyHALS2h5Bs9WMbwXd5XYv79Pii 72lw== 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=baXQ4HIxBg7mbP8c0D9hYtk0q7kznuF5jC/n/ag9sm8=; b=umcAIlWRCcoE/BAzSgv73oibcBXiFb/TacZojRub5QBp7lHPdHqYHiW9VNSpWBI9ji rTBt6SvvtSbZY0tlQyEH9cZ3ikvTBe0g4aXo8TBf+7kPZtbIlC84+xUk0w8Ip9Kd+HSJ KLE4Ygh0LQAsGkJdyCVkjn9qRKeHD2HZJJirWiYGWpYpEYR/CyNWxkMIDp7uucy/4v+x rkm4t5YhDJkuQZ2L63nXI80KmHqlgwGwEP4o59/vgz7H9lPCBJrmGI7jeSLqGuyrzeFA +wHOaIKathxkqLpWbFW6zUi7F2lnrXQM1VxSNcSeCcaWHb9arDpYkrmDHSDKUhmsYeY0 wAPQ== X-Gm-Message-State: AOAM531TvPADvteMeMQbDVrkvMBoaOEQShI3bXR66K6xNcJaFKESyQJy ImTF+Bjkrk5bT4Z0hTzlLXU0CYz+q+UO8rFG7hY= X-Google-Smtp-Source: ABdhPJzDFOx2ZX8OH21xRxRPr7qxrP1g4EXslnk1DD5xtKOzwZZPh6i3SkT3bFD7eLCfViVL9sFeCw== X-Received: by 2002:a17:90a:fac:b0:1ca:5eb8:f3b2 with SMTP id 41-20020a17090a0fac00b001ca5eb8f3b2mr1571366pjz.37.1651532590589; Mon, 02 May 2022 16:03: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 s7-20020a170902988700b0015eaa9aee50sm2002945plp.202.2022.05.02.16.03.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 16:03:09 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 2/9] busybox: Use base_bindir instead of hardcoding /bin path Date: Mon, 2 May 2022 13:02:47 -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 ; Mon, 02 May 2022 23:03:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165181 From: Khem Raj This symlink is not valid when using usrmerge and ptest packaging would fail Exception: FileExistsError: [Errno 17] File exists: '/usr/bin/busybox.suid' -> '/mnt/b/yoe/master/build/tmp/work/ppc64p9le-yoe-linux-musl/busybox/1.35.0-r0/package/usr/lib/busybox/ptest/bin/login' Signed-off-by: Khem Raj Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 238fd30689054c7b44176dce7180fb6dac4e1b6f) Signed-off-by: Steve Sakoman --- meta/recipes-core/busybox/busybox.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox.inc b/meta/recipes-core/busybox/busybox.inc index e0522be729..3553376582 100644 --- a/meta/recipes-core/busybox/busybox.inc +++ b/meta/recipes-core/busybox/busybox.inc @@ -348,7 +348,7 @@ do_install_ptest () { # These access the internet which is not guaranteed to work on machines running the tests rm -rf ${D}${PTEST_PATH}/testsuite/wget sort ${B}/.config > ${D}${PTEST_PATH}/.config - ln -s /bin/busybox ${D}${PTEST_PATH}/busybox + ln -s ${base_bindir}/busybox ${D}${PTEST_PATH}/busybox } inherit update-alternatives From patchwork Mon May 2 23:02: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: 7511 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 334CEC433EF for ; Mon, 2 May 2022 23:03:19 +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.web11.4333.1651532594421276124 for ; Mon, 02 May 2022 16:03:14 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=P6GNjIDf; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id v11so3942921pff.6 for ; Mon, 02 May 2022 16:03:14 -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=+p5g+kdtUh9MEZTMZp5bvttxn3QpsSwUc/Tr6mdIh/c=; b=P6GNjIDfU/9QSOsL28J7zqsMGlFmEmY9mdswaUg6l6H9902E99JO69IG/VtIpUSsaG eSIFgUSrq7dbFmqQ5BHsa+V0e8UBr7Yb1JqQlIYsg2Wi87bUaWGNi+VBGPUkZ6PLzlo+ zgqeO2KH/Vy5TshdAyLrPRospp67ch5QKZMayL+yFXqFgIXdAW+o/1gglb4GTBm/Wh1x JIHWTj1m31BpC/oT7MD3+JPl1eUL/YKm4WfmWmpo4aKlEF51I2PBjB7t+KO9PX/Zro6R BkCWtkP+ZE+5ft/Qx/G//3hSHGPU6RYnwuu6bRw/81OoBL7fpxJVX/YNmma3hqNxzVXA vL3w== 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=+p5g+kdtUh9MEZTMZp5bvttxn3QpsSwUc/Tr6mdIh/c=; b=N+EjZg+Rn2DgHekYEc0T9i6wzCkrR4h69T6XKq4mSSIU372K1A8oarY6cUpxAwtiIS Q2JYc/Kz4asx9/TmYHCb9mHKZAfvl8ScQIB6rYPUENWYQ0eiFrLAEdWlBUmBYb4YWtVI R3BaRQJBVQvVm4UstmqBxHj/LqyYznLRuCAFH4Bx2QY9CFl6DS1ZsqIVKSYZUsXJ07Ne 35eZiL0wR6BjEZ24GflLykOWr8TPviRfWW41uZfG9ln5NZuqrfEqnnRGx26MkToYNN3k dQeDcMi1mVZdkS3mt7bVc9ahvymVlWEpHyNgVY0DiiVkvp5m3qIUVpnoNAQXMNONLNU3 6Syg== X-Gm-Message-State: AOAM532DWPJ4wNdnUgtIx0WnzR3IL2tt4KyI2AVmR7cJUXCbJRsZzP3z xNa1VAry4eIgEzPwVDa1236T9uRpO6tJhQeGlBg= X-Google-Smtp-Source: ABdhPJxSNjIFvPwIrEYb8Oy/hupMbT2nagJ2LmOjzOqjuWxpPJ5Cf0YknDMvsek1jmvUCgaX9hBCaA== X-Received: by 2002:a05:6a00:10cc:b0:506:e0:d6c3 with SMTP id d12-20020a056a0010cc00b0050600e0d6c3mr13636240pfu.33.1651532593229; Mon, 02 May 2022 16:03:13 -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 s7-20020a170902988700b0015eaa9aee50sm2002945plp.202.2022.05.02.16.03.11 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 16:03:12 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 3/9] devshell.bbclass: Allow devshell & pydevshell to use the network Date: Mon, 2 May 2022 13:02:48 -1000 Message-Id: <214a2fe628801af3fde5b540c31f1c515f6c855f.1651531749.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 ; Mon, 02 May 2022 23:03:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165182 From: Peter Kjellerstedt Otherwise it will fail if using OE_TERMINAL = "xterm" with the not so helpful error: xterm: Xt error: Can't open display: localhost:0.0 Signed-off-by: Peter Kjellerstedt Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit ba53fc3bcecfe32401471dc1008c7ead96504150) Signed-off-by: Steve Sakoman --- meta/classes/devshell.bbclass | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass index 76dd0b42ee..ad9f267848 100644 --- a/meta/classes/devshell.bbclass +++ b/meta/classes/devshell.bbclass @@ -21,6 +21,7 @@ addtask devshell after do_patch do_prepare_recipe_sysroot DEVSHELL_STARTDIR ?= "${S}" do_devshell[dirs] = "${DEVSHELL_STARTDIR}" do_devshell[nostamp] = "1" +do_devshell[network] = "1" # devshell and fakeroot/pseudo need careful handling since only the final # command should run under fakeroot emulation, any X connection should @@ -154,3 +155,4 @@ python do_devpyshell() { addtask devpyshell after do_patch do_devpyshell[nostamp] = "1" +do_devpyshell[network] = "1" From patchwork Mon May 2 23:02: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: 7514 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 3D47CC433FE for ; Mon, 2 May 2022 23:03:19 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web09.4407.1651532597177918166 for ; Mon, 02 May 2022 16:03:17 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=SEkF8zdB; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id iq10so13914098pjb.0 for ; Mon, 02 May 2022 16:03:17 -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=altBkWQWccBuFJ9UBI+xQTpSpnpdHHrlpJA3NDFWCGU=; b=SEkF8zdByI0T1G+NVJVIuNus6uVnyp/Jhp2u9LYszVgysUIF8wDUusr5kBVplCy/wM FnGfCbwYowTveWrD6PydJkWM4evrJQSqpPcZbTTD5IOlW2aGxXAO7Vh6rZtK2brXJFhJ +szN5PJZVXqM1wp2ySdSx9aMhKG1CEOft2iLq9KC5njtPzkkALneHHYmL0SMzi2UXXuj 3mJt6pJ3Llnbs3loVINGtP0Lk0Mm9tKmVcJIOZuSI1Y3WMbwqIn/Wv2kgS/Mp36nafO7 J70xo7F9UYfPUeiJUsq7MocUdw3kcSOVMYDErPekD3W5tQ2PZafHk4iANpLCcRFiIGK8 ijMg== 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=altBkWQWccBuFJ9UBI+xQTpSpnpdHHrlpJA3NDFWCGU=; b=YhlE/060YgiicMHC5mAj5CRzNhH9HxMm+RYwr+ceGrxfyTtwygA/RkpWZDprMmrxPJ PcwNmeSlX8Sz9+IaZLIQyuAVZiAbCTds0uu+XP6uigQmJUv+AIuJzwgpB4NlEwRMk+UG DtCUa5ZDZgmAdf/40SlvjfKxSi62PbOOi8MyKF14zNLjLKkH/pvBIdu7sd4Ncchbb3H4 6dlejtuEbI38pkTCnGYKSGrIwlA0Eh07zfhLd2aNFid6whTh2p+LHCh8NxCbvjB63MnP sDkbs45tFp/QmeiKZNJTZt8MX/PcbDIf+InADb2GIHEb4ddgyBJPyi3qEYHYI7X59b+l 6DVw== X-Gm-Message-State: AOAM531ucxDeIeOfvXwBmonkU7i8zwfLZT9o+OMcvdNzzkH5hrRCSGOF Y0z5qFALwrxY7V2CJA7uWIrQ7Njx5b6uBMkxfxE= X-Google-Smtp-Source: ABdhPJxXMV/Bze0e3TMm8R1FhBn4crUSROBEohAquW2zkqBv2u6OUQrf5umn8eHI1/XajChePHdxKg== X-Received: by 2002:a17:902:e550:b0:15c:f4f2:814f with SMTP id n16-20020a170902e55000b0015cf4f2814fmr13841253plf.123.1651532595878; Mon, 02 May 2022 16:03: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 s7-20020a170902988700b0015eaa9aee50sm2002945plp.202.2022.05.02.16.03.14 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 16:03:15 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 4/9] cases/buildepoxy.py: fix typo Date: Mon, 2 May 2022 13:02:49 -1000 Message-Id: <20648dcc44213e9b9a089d72fbfae8e8c20f469d.1651531749.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 ; Mon, 02 May 2022 23:03:19 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165183 From: Chen Qi Signed-off-by: Chen Qi Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry picked from commit 3a9b6e71d1e7e8e2ebc0ed047841e36f09300387) Signed-off-by: Steve Sakoman --- meta/lib/oeqa/sdk/cases/buildepoxy.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/sdk/cases/buildepoxy.py b/meta/lib/oeqa/sdk/cases/buildepoxy.py index 385f8ccca8..f69f720cd6 100644 --- a/meta/lib/oeqa/sdk/cases/buildepoxy.py +++ b/meta/lib/oeqa/sdk/cases/buildepoxy.py @@ -17,7 +17,7 @@ class EpoxyTest(OESDKTestCase): """ def setUp(self): if not (self.tc.hasHostPackage("nativesdk-meson")): - raise unittest.SkipTest("GalculatorTest class: SDK doesn't contain Meson") + raise unittest.SkipTest("EpoxyTest class: SDK doesn't contain Meson") def test_epoxy(self): with tempfile.TemporaryDirectory(prefix="epoxy", dir=self.tc.sdk_dir) as testdir: From patchwork Mon May 2 23:02: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: 7516 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 2D6BAC433FE for ; Mon, 2 May 2022 23:03:29 +0000 (UTC) Received: from mail-pf1-f177.google.com (mail-pf1-f177.google.com [209.85.210.177]) by mx.groups.io with SMTP id smtpd.web12.4277.1651532600624870880 for ; Mon, 02 May 2022 16:03:20 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=Rug/c4ej; spf=softfail (domain: sakoman.com, ip: 209.85.210.177, mailfrom: steve@sakoman.com) Received: by mail-pf1-f177.google.com with SMTP id i24so13408208pfa.7 for ; Mon, 02 May 2022 16:03: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=OZ8lPv8ypxQfolXlwtCUrIy8hIWB21PRNsM7swQWGe0=; b=Rug/c4ejPvx/xWbcRWGVCMGebFkQOJM+fydRzQ1fEpY2o5Cn4VRdpfrJgv4kwzPV+4 v7trkN0jK3EzHsz/fs+j2uaKcAb5FbXHUt/w0YNYycr3/TDm8uJW4TKZQzKGyIDCDgYY 26uSGPKaN7nzZasVjvjMfDm3HcFId3CQ1c59Is3Kxku2Eky8zMhvZLYuukZDXR+k0rSo +3CdNzG4AvFBx6kIIGh2xu2LF9mN34yeH7SEMxQf8ojhe342bF6+sCfsZYbercEUiX74 NAbaPdQ8LjYk269TihEB6LI05ZlWa6qIc+/Gh/KFyMj+lnvvhGC80K/CeDVlZ5RAkQBa fulQ== 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=OZ8lPv8ypxQfolXlwtCUrIy8hIWB21PRNsM7swQWGe0=; b=DwtqVPh0J19yZ7+VW2e+FHxocpuI9gFfub7+A0g3v67H8ylICRo1eUp3u+s2jkh17B VeoE+ccBWoUzQe9Ry7OQM1118IrjOmZ+HPPacE9GTtZKxGeBp8FeWIGkGc2aWjLGu1cw /b8eCEojrcMoMkDlxGjlOJb4ULAPoxH8/HlVrrtkNead/HKUlX0/VDvdvDB3NN7br5IU uQ2uvSAvjtJzl+7u2/8+6IN5V2LBpS0IB9qmIZh2jsvHWpQtJjCwi4/FIXSyt7JHVJuz /ZVsnreTgQeKbAUDEQW28OGUPemzM0BjDOyXWm9PiURwtJLB3uI7hYFom55kQEMzj4Ba xQlA== X-Gm-Message-State: AOAM531PDCSQ/EF1r/s17/jv3xgTDtgKQZ1ooSj1JJgAffmm4Fas3oCO 78D4VS4lpX7rZA6CNoa/7DnviltNbIOPBt/yP9Q= X-Google-Smtp-Source: ABdhPJxr5dtf4+ctoc7UQNU5R/M8UEfgQK1p9pYqtUeqQm0kpaZgSaVIyF9rS5QrI9CwTPuR/8kX7g== X-Received: by 2002:a63:6806:0:b0:3aa:a481:63f0 with SMTP id d6-20020a636806000000b003aaa48163f0mr11575826pgc.44.1651532599473; Mon, 02 May 2022 16:03: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 s7-20020a170902988700b0015eaa9aee50sm2002945plp.202.2022.05.02.16.03.18 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 16:03:18 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 5/9] install/devshell: Introduce git intercept script due to fakeroot issues Date: Mon, 2 May 2022 13:02:50 -1000 Message-Id: <2ef6841a1aaade0ec89c174e4168ef0629ba08a0.1651531749.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 ; Mon, 02 May 2022 23:03:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165184 From: Paul Gortmaker In a devshell, recent versions of git will complain if the repo is owned by someone other than the current UID - consider this example: ------ bitbake -c devshell linux-yocto [...] kernel-source#git branch fatal: unsafe repository ('/home/paul/poky/build-qemuarm64/tmp/work-shared/qemuarm64/kernel-source' is owned by someone else) To add an exception for this directory, call: git config --global --add safe.directory /home/paul/poky/build-qemuarm64/tmp/work-shared/qemuarm64/kernel-source kernel-source# ------ Of course the devshell has UID zero and the "real" UID is for "paul" in this case. And so recent git versions complain. As the whole purpose of the devshell is to invoke a shell where development can take place, having a non-functional git is clearly unacceptable. Richard suggested we could use PSEUDO_UNLOAD=1 to evade this issue, and I suggested we probably will see other similar instances like this and should make use of PATH to intercept via devshell wrappers - conveniently we already have examples of this. Here, we copy the existing "ar" example and tune it to the needs of git to combine Richard's suggestion and mine. As such we now also can store commit logs and use send-email with our user specific settings, instead of "root", so in additon to fixing basic commands like "git branch" it should also increase general usefulness. RP: Tweaked the patch so the PATH change only applies to the devshell task and is a generic git intercept rather than devshell specific. RP: Also apply the PATH change to do_install tasks since that also runs under fakeroot and several software projects inject "git describe" output into their binaries (systemd, iputils, llvm, ipt-gpu-tools at least) causing reproducibility issues from systems with different git versions. Signed-off-by: Paul Gortmaker Signed-off-by: Richard Purdie (cherry picked from commit 3266c327dfa186791e0f1e2ad63c6f5d39714814) Signed-off-by: Steve Sakoman --- meta/classes/base.bbclass | 1 + meta/classes/devshell.bbclass | 2 ++ scripts/git-intercept/git | 19 +++++++++++++++++++ 3 files changed, 22 insertions(+) create mode 100755 scripts/git-intercept/git diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 9ed736b0e1..398b098651 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -335,6 +335,7 @@ addtask install after do_compile do_install[dirs] = "${B}" # Remove and re-create ${D} so that is it guaranteed to be empty do_install[cleandirs] = "${D}" +PATH:prepend:task-install = "${COREBASE}/scripts/git-intercept:" base_do_install() { : diff --git a/meta/classes/devshell.bbclass b/meta/classes/devshell.bbclass index ad9f267848..114a50b20e 100644 --- a/meta/classes/devshell.bbclass +++ b/meta/classes/devshell.bbclass @@ -2,6 +2,8 @@ inherit terminal DEVSHELL = "${SHELL}" +PATH:prepend:task-devshell = "${COREBASE}/scripts/git-intercept:" + python do_devshell () { if d.getVarFlag("do_devshell", "manualfakeroot"): d.prependVar("DEVSHELL", "pseudo ") diff --git a/scripts/git-intercept/git b/scripts/git-intercept/git new file mode 100755 index 0000000000..8adf5c9ecb --- /dev/null +++ b/scripts/git-intercept/git @@ -0,0 +1,19 @@ +#!/usr/bin/env python3 +# +# Wrapper around 'git' that doesn't think we are root + +import os +import shutil +import sys + +os.environ['PSEUDO_UNLOAD'] = '1' + +# calculate path to the real 'git' +path = os.environ['PATH'] +path = path.replace(os.path.dirname(sys.argv[0]), '') +real_git = shutil.which('git', path=path) + +if len(sys.argv) == 1: + os.execl(real_git, 'git') + +os.execv(real_git, sys.argv) From patchwork Mon May 2 23:02:51 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7517 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 304A0C433F5 for ; Mon, 2 May 2022 23:03:29 +0000 (UTC) Received: from mail-pj1-f45.google.com (mail-pj1-f45.google.com [209.85.216.45]) by mx.groups.io with SMTP id smtpd.web12.4278.1651532603107347481 for ; Mon, 02 May 2022 16:03:23 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=3+gjEerv; spf=softfail (domain: sakoman.com, ip: 209.85.216.45, mailfrom: steve@sakoman.com) Received: by mail-pj1-f45.google.com with SMTP id w17-20020a17090a529100b001db302efed6so602705pjh.4 for ; Mon, 02 May 2022 16:03: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=ph4h93yco5nTOZoNgIN/oFnfNyqiMHzRE+weSH0Qnvs=; b=3+gjEerviWgEbJGCSrSjyi5M1N2zNiywAAKWzNFEAIRXNh9xqbjlf+eTKRZhOLe7yH muuls2FAbTFLGUObOcqxuIGGKirbu0tVKBfcFL52lr6tYI9ZnWXF202oFeMAAiwHvY9h KtzqqQzupEtInBnOEHRUE78KaK658ePMgr28973Qq2RyUtqcGqF0XiQNaRH43P2ou3ei QzTHtxAYxTAUh6EvgUsj8H7nEyQqg8rW7KhZc7CpDFhbPZUi5pHRvh7Es9yRgHGiH2dW bsZI+QEAOwvzRquXpojGSXgkpytJhDRdDYFdr5Qm3T88iZWlJfnuUfsCQB+CcAborzpj moXw== 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=ph4h93yco5nTOZoNgIN/oFnfNyqiMHzRE+weSH0Qnvs=; b=iLNVIXPIzMd798iSXDV6bCw+JcU4XK1Ne6TTqB68ROuZ7r+aIsN18MsRaOaYMtUXAQ dnVed9vTT5I4F4XT7gEYq/F7yb4+YGY0lnPoYaX0GaC8jsIkqx6qpZ2IsF4oQAq8pNc7 OnC0UHgcO9gBpWY1xRKoAADsx48MFcoRPSEKEYKkoEea/t/3jK0u6F0PgdtMRDlC92mN FQ1Myi71RUXpFkJc6dhf1AIHxFf1VNOLkIZEMxuNJ9e7d+eKfO7cREVsQMKIg9WOSBeD vXdVSVQTy22PAWkpAc37K56xqHX41f0FRCwdQ6bjB4luT6tVFP24beB2sKYz9YnOJDLM ULOA== X-Gm-Message-State: AOAM530Z/dHysLo+f5SYeHbTYhNXT88UoGWRXV5OWSKwzmzSlMDhtlpo oY3nobjD1nnnTiuCdcUBO6FJUUZcNrypwdIG/Tg= X-Google-Smtp-Source: ABdhPJzzVVwjaivgTc2CNDp8mg2tY+amwzR+zrIb7vfgqA1lRN/jC2SF/RcRF7WGBAzAABYJs4norA== X-Received: by 2002:a17:90b:3442:b0:1d9:8af8:28ff with SMTP id lj2-20020a17090b344200b001d98af828ffmr1564223pjb.201.1651532602016; Mon, 02 May 2022 16:03: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 s7-20020a170902988700b0015eaa9aee50sm2002945plp.202.2022.05.02.16.03.20 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 16:03:21 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 6/9] base: Drop git intercept Date: Mon, 2 May 2022 13:02:51 -1000 Message-Id: <57d92ba2fbb657df611607e0eb38c005a219bea3.1651531749.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 ; Mon, 02 May 2022 23:03:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165185 From: Richard Purdie We're going to use the environment approach for solving this issue. Signed-off-by: Richard Purdie (cherry picked from commit 0982977dc052ad4e65608f6853f930121d08837a) Signed-off-by: Steve Sakoman --- meta/classes/base.bbclass | 1 - 1 file changed, 1 deletion(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 398b098651..9ed736b0e1 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -335,7 +335,6 @@ addtask install after do_compile do_install[dirs] = "${B}" # Remove and re-create ${D} so that is it guaranteed to be empty do_install[cleandirs] = "${D}" -PATH:prepend:task-install = "${COREBASE}/scripts/git-intercept:" base_do_install() { : From patchwork Mon May 2 23:02:52 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7515 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 2F3DCC4332F for ; Mon, 2 May 2022 23:03:29 +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.4268.1651532606036144150 for ; Mon, 02 May 2022 16:03:26 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=gYEVahvw; spf=softfail (domain: sakoman.com, ip: 209.85.215.170, mailfrom: steve@sakoman.com) Received: by mail-pg1-f170.google.com with SMTP id j70so1835822pge.1 for ; Mon, 02 May 2022 16:03: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=ibq8oAokb7xi3qFrUEepHX9yDnhX2skPTBvluBceuOk=; b=gYEVahvw0E6GL6JM45GN1QaOLKoScdJhdo8JmFTOl7775/TRD48OfrPOPtOjA0j4gr 0HShdfcFXeWqhRzw1Oz9suUZGD98kc5bWDfzav6M4xgQoov7KcWOC8qqbIbZkWrE3eQ3 Noi/9Z0Cw8DdytmullNH2z6Rxf5JQ+QyHT/Yx64QPfcsgrtFDt5YNvDCaY3l09I9vYwn eyOBIYCz16bTgVsigozOpFUA3JCO5gGPpFqJf81Je+TCcTHP+BHcYaKGU1FQE3XT+sc2 43U7KSAGslMfi3SvYaB4GpQZw3v5sYamQswZruNs3h/hHjBZ9de5ojWN/0GToKnrIWs5 rRlA== 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=ibq8oAokb7xi3qFrUEepHX9yDnhX2skPTBvluBceuOk=; b=PV5vuUFCvmmZagDDvphlcIu1i2Bmz9fxibYmLSFiM+rWDYWiO3OLpKghAI0AcxINCA XQgN05YNpb+S9xWq6ylyUaelP/NiQxOF7uAsuT0cPL8H8rhn+cM6TOruQuzTEQG9IIcQ Utz8gTr4XFK/GTU2fCWeSI2Vscx+qT3br5YH6OwbP0c3ZntB5jEhHDRURO+1B7NVM1Gg XbKlv8+IJiD+VVYLo6ML9yV+qYt+PfMF0v0VEpv4P7Xxu8qoXmL14K1UoX2i6piG9m9K XDlS8UR6CbiK5lgKTDLgWmPUtI0z4zY4ZNFu8altGd13r1cpRvy1LipnNItY8sroQblx OLJA== X-Gm-Message-State: AOAM532o9wPEGOf/wc17QjbsQXJP9KndETkS7puo4NUdM8dTg+URONyQ zCxQ0ZqyiGMCIHaqA1E1uo71cVUTexXwNUCBGJY= X-Google-Smtp-Source: ABdhPJwxKYyKA6kWkNm6Hn432VEE2uxFuqYoFnYB+Y9SPPPuSHZVQcLflN7+wi4m5ovdebe8QRF3uw== X-Received: by 2002:a65:6e0e:0:b0:399:26d7:a224 with SMTP id bd14-20020a656e0e000000b0039926d7a224mr11576520pgb.437.1651532604871; Mon, 02 May 2022 16:03: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 s7-20020a170902988700b0015eaa9aee50sm2002945plp.202.2022.05.02.16.03.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 16:03:23 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 7/9] bitbake.conf: mark all directories as safe for git to read Date: Mon, 2 May 2022 13:02:52 -1000 Message-Id: <74229771436d2da0f2dbf821360e1c4ba82624e1.1651531749.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 ; Mon, 02 May 2022 23:03:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165186 From: Ross Burton Recent git releases containing [1] have an ownership check when opening repositories, and refuse to open a repository if it is owned by a different user. This breaks any use of git in do_install, as that is executed by the (fake) root user. Whilst not common, this does happen. Setting the git configuration safe.directories=* disables this check, so that git is usable in fakeroot tasks. This can be set globally via the internal environment variable GIT_CONFIG_PARAMETERS, we can't use GIT_CONFIG_*_KEY/VALUE as that isn't present in all the releases which have the ownership check. We already set GIT_CEILING_DIRECTORIES to ensure that git doesn't recurse up out of the work directory, so this isn't a security issue. [1] https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 8bed8e6993e7297bdcd68940aa0d47ef47120117) Signed-off-by: Steve Sakoman --- meta/conf/bitbake.conf | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 91f003d6dd..2b94e37861 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -726,10 +726,18 @@ export PKG_CONFIG_DISABLE_UNINSTALLED = "yes" export PKG_CONFIG_SYSTEM_LIBRARY_PATH = "${base_libdir}:${libdir}" export PKG_CONFIG_SYSTEM_INCLUDE_PATH = "${includedir}" +# Git configuration + # Don't allow git to chdir up past WORKDIR so that it doesn't detect the OE # repository when building a recipe export GIT_CEILING_DIRECTORIES = "${WORKDIR}" +# Treat all directories are safe, as during fakeroot tasks git will run as +# root so recent git releases (eg 2.30.3) will refuse to work on repositories. See +# https://github.com/git/git/commit/8959555cee7ec045958f9b6dd62e541affb7e7d9 for +# further details. +export GIT_CONFIG_PARAMETERS="'safe.directory=*'" + ### ### Config file processing ### From patchwork Mon May 2 23:02:53 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7518 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 3A8E8C43217 for ; Mon, 2 May 2022 23:03:29 +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.web11.4336.1651532608603073615 for ; Mon, 02 May 2022 16:03:28 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=KqJI7vM0; spf=softfail (domain: sakoman.com, ip: 209.85.216.49, mailfrom: steve@sakoman.com) Received: by mail-pj1-f49.google.com with SMTP id w17-20020a17090a529100b001db302efed6so602862pjh.4 for ; Mon, 02 May 2022 16:03:28 -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=AJFKtk3d4UYJmYtXtkmgRKhwsDHpuWcwlnVZUX1bnm8=; b=KqJI7vM06yNj26Pe3zF5DULmWzmV8omY1w/98oWQQfq62XP6UhMAkhuXSSuBV3ggVB 7GEkAFdy+e+rWfqE9eZRO7S2e+s7Bxlud7Gues3XCNu9Z2TwD6a4kuyrLsS1S+INu0wq iroBz5ifst2VXAsqSCGg1E5TCRLR0w9l8gyOmWvvjGt9kdEnwAdJzXcBy0tIT8JNiGib LTGdYa+zb3LmI9MLwTojRsnoUfhQmDGLOjTBcGzM1SGhKXLxxlfo6ZU+TEuGW/Nd2zbz nd2sE7zm6v22R+7jciWz3jfrubfYfv3Ii+JFhIhTvogoOc8s63v+j5ceLvmZ5UY20MIp 6oAg== 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=AJFKtk3d4UYJmYtXtkmgRKhwsDHpuWcwlnVZUX1bnm8=; b=rx+c76QVB12WmxxPXCvPyDwhjwSIGmGo8IuVABAVz+yr0+O4obEXyBwzH/YXMB7BvS DzreAf2v3LjpH/F+aF27fKBAMfZNJSOyqXVAVTXFeKPTp/vYhmABavh5JXqgwZG7U9/J dZuL1mo0SsJIfjOYTdphQmgBH0sJ7dIahysR530+ga95DFv0+JIQclDXybheD0StyXwD 6KpogPlDBS990JZTT/ySPONALlc59ZmXDaal5z4H/4gzOzRK9BoIVxF7ClmX/tLvK3Bj art8jvkQSpO6uSudQrt3fJ0Ch0vxQaB/i/HuufBfGZeXutST6iG6DLcse7PI3bNBmvN9 uYZQ== X-Gm-Message-State: AOAM531z30WZz67fTTxGhKz3YaAddmZomjYP6dA8/ySJjJNFzqKGP8D5 i+qjFhl1IZYM73SfCf1SJgfks/6cScijPsBzDm4= X-Google-Smtp-Source: ABdhPJxrIg8DhNvFwlJou+JIQQPdkh0TgUo35CdOTzYjsKsU8HqPoqrPFWYcoG7UZpcXAvOjSFiIDw== X-Received: by 2002:a17:90b:3ecc:b0:1d9:549d:8141 with SMTP id rm12-20020a17090b3ecc00b001d9549d8141mr1614992pjb.132.1651532607506; Mon, 02 May 2022 16:03:27 -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 s7-20020a170902988700b0015eaa9aee50sm2002945plp.202.2022.05.02.16.03.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 16:03:26 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 8/9] neard: Switch SRC_URI to git repo Date: Mon, 2 May 2022 13:02:53 -1000 Message-Id: <0a62632b431ff2e17aca1f1f80a74da8f217af67.1651531749.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 ; Mon, 02 May 2022 23:03:29 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165187 From: Rahul Kumar The tarball (neard-0.16.tar.xz) fetched by the recipe is incomplete. Few plugins (e.g. tizen) and tests scripts (e.g. Test-channel, test-see, neard-ui.py, ndef-agent etc) are missing. Since neard did not release latest tarballs, so as per community recommendation switching the recipe SRC_URI to git repo. Community Discussion: https://lists.openembedded.org/g/openembedded-core/topic/90058043#163681 Signed-off-by: Rahul Kumar Signed-off-by: Luca Ceresoli Signed-off-by: Richard Purdie (cherry-picked from b563f40ebf4461d9c35df72bd7599ea11e97da9c) Signed-off-by: Rahul Kumar Signed-off-by: Steve Sakoman --- meta/recipes-connectivity/neard/neard_0.16.bb | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/recipes-connectivity/neard/neard_0.16.bb b/meta/recipes-connectivity/neard/neard_0.16.bb index 7c124a3c0b..dd0742f792 100644 --- a/meta/recipes-connectivity/neard/neard_0.16.bb +++ b/meta/recipes-connectivity/neard/neard_0.16.bb @@ -2,21 +2,22 @@ SUMMARY = "Linux NFC daemon" DESCRIPTION = "A daemon for the Linux Near Field Communication stack" HOMEPAGE = "http://01.org/linux-nfc" LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ + file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ + " DEPENDS = "dbus glib-2.0 libnl" -SRC_URI = "${KERNELORG_MIRROR}/linux/network/nfc/${BP}.tar.xz \ +SRC_URI = "git://git.kernel.org/pub/scm/network/nfc/neard.git;protocol=git;branch=master \ file://neard.in \ file://Makefile.am-fix-parallel-issue.patch \ file://Makefile.am-do-not-ship-version.h.patch \ file://0001-Add-header-dependency-to-nciattach.o.patch \ " -SRC_URI[md5sum] = "5c691fb7872856dc0d909c298bc8cb41" -SRC_URI[sha256sum] = "eae3b11c541a988ec11ca94b7deab01080cd5b58cfef3ced6ceac9b6e6e65b36" -LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e \ - file://src/near.h;beginline=1;endline=20;md5=358e4deefef251a4761e1ffacc965d13 \ - " +SRCREV = "949795024f7625420e93e288c56e194cb9a3e74a" + +S = "${WORKDIR}/git" inherit autotools pkgconfig systemd update-rc.d From patchwork Mon May 2 23:02:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 7519 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 3BFEFC433EF for ; Mon, 2 May 2022 23:03:39 +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.4337.1651532611775958138 for ; Mon, 02 May 2022 16:03:31 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=BoSp0Eb8; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id a15-20020a17090ad80f00b001dc2e23ad84so684295pjv.4 for ; Mon, 02 May 2022 16:03:31 -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=03H1F4wiOOjegbDdGlQ6MFT6/kRYzd0pRB5obBMoQvY=; b=BoSp0Eb8f5lz9qsDSg2Amia+a3FFjEJWKZD7480jZ7GzXBkSkD99A3swtipUFHb+Mm 3aWqOSSLxLhrPia59Ih8fBbxLffIzAz4Zmw9wdCpjS6564toaQSr6rVdsjwTTTX0IKO0 1HSADRt+OmqXLU/McHzEPvDdE3gss2tYpUGDUyPlKyfjCiNoQUXidwgv7X+aX+jxiuvV Q++JYpAgLmgH4X8+ORrE7OUN1dSwUMHcjqyynPTBfoVnrcYkIbVjUwx/SCUbibbOiWAT G2d2tx2fAZ7OBw1LLw0w75LplZbRn7voSkzVTJmHJdm5d/n8J/X74LF7fiL8R2R7+0xo g5BA== 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=03H1F4wiOOjegbDdGlQ6MFT6/kRYzd0pRB5obBMoQvY=; b=a+2EmJYTXr0e8EcL+C1JSi1LcVNX9cQ9rRSIDo6ryAJYKqQqesuKc0/KmdW3HyGQgX Fp6VWVZDbuG4AnFqWAruPO0SVsgAvpKIdI4r33HI+Ifci8cs29dw9fEv3EG1ZUyjznxC JGqJuCjPTDSchSlExQdIt/8Vb9C5c0JrWLIaTrqYL+3XMAa/pdpTeTRi0w5SeCTns1ha ZQWo/1LvRIIPWtXm0DMMcl6AMwTA9wBQQ5Zk/VQl7XgFwK6l2BZ6jdj1MlXfQX7z47ix qgPGL6tdbuda6WzQZHg41xXH/SJEr+1uWKFPJCpCqi9YZDM5i+43j8E62EBAbs7TmxOP 21Zg== X-Gm-Message-State: AOAM533+/2Mi1aEMypo6pgfgWxcZfYCwR2/YqE8gtmCIWMxKBDexGxsL GF2jFojYcN1TaTrdI/sLjUBSo0sIMHEahLNjf5A= X-Google-Smtp-Source: ABdhPJxybsIQ3hx/sX3zYRKhuRxSpx3bIBjd9bkzAUCVEVXKe/g2Lp4qAFsxPFieibI+D4mFKgxecg== X-Received: by 2002:a17:903:244d:b0:15e:a3a2:5a75 with SMTP id l13-20020a170903244d00b0015ea3a25a75mr7527343pls.89.1651532610614; Mon, 02 May 2022 16:03:30 -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 s7-20020a170902988700b0015eaa9aee50sm2002945plp.202.2022.05.02.16.03.28 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 May 2022 16:03:29 -0700 (PDT) From: Steve Sakoman To: openembedded-core@lists.openembedded.org Subject: [OE-core][dunfell 9/9] uninative: Upgrade to 3.6 with gcc 12 support Date: Mon, 2 May 2022 13:02:54 -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 ; Mon, 02 May 2022 23:03:39 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/165188 From: Richard Purdie There are reports of issues with the new libstdc++ from gcc 12. This upgrades to a gcc 12 version of uninative to allow builds on those systems. Gcc 12 isn't finalised so we may need to add a new version of this if/as appropriate when it is. Signed-off-by: Richard Purdie (cherry picked from commit e3da4da7e5da5bb9e1d360e2be2fdd5132e69320) Signed-off-by: Steve Sakoman --- meta/conf/distro/include/yocto-uninative.inc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/conf/distro/include/yocto-uninative.inc b/meta/conf/distro/include/yocto-uninative.inc index bfe05ce1eb..411fe45a24 100644 --- a/meta/conf/distro/include/yocto-uninative.inc +++ b/meta/conf/distro/include/yocto-uninative.inc @@ -7,9 +7,9 @@ # UNINATIVE_MAXGLIBCVERSION = "2.35" -UNINATIVE_VERSION = "3.5" +UNINATIVE_VERSION = "3.6" UNINATIVE_URL ?= "http://downloads.yoctoproject.org/releases/uninative/${UNINATIVE_VERSION}/" -UNINATIVE_CHECKSUM[aarch64] ?= "6de0771bd21e0fcb5e80388e5b561a8023b24083bcbf46e056a089982aff75d7" -UNINATIVE_CHECKSUM[i686] ?= "8c8745becbfa1c341bae839c7eab56ddf17ce36c303bcd73d3b2f2f788b631c2" -UNINATIVE_CHECKSUM[x86_64] ?= "e8047a5748e6f266165da141eb6d08b23674f30e477b0e5505b6403d50fbc4b2" +UNINATIVE_CHECKSUM[aarch64] ?= "d64831cf2792c8e470c2e42230660e1a8e5de56a579cdd59978791f663c2f3ed" +UNINATIVE_CHECKSUM[i686] ?= "2f0ee9b66b1bb2c85e2b592fb3c9c7f5d77399fa638d74961330cdb8de34ca3b" +UNINATIVE_CHECKSUM[x86_64] ?= "9bfc4c970495b3716b2f9e52c4df9f968c02463a9a95000f6657fbc3fde1f098"