From patchwork Wed Nov 9 14:29:33 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15228 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 E4EF1C433FE for ; Wed, 9 Nov 2022 14:30:00 +0000 (UTC) Received: from mail-pg1-f179.google.com (mail-pg1-f179.google.com [209.85.215.179]) by mx.groups.io with SMTP id smtpd.web09.3946.1668004191857003826 for ; Wed, 09 Nov 2022 06:29:52 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=2IBTu+T2; spf=softfail (domain: sakoman.com, ip: 209.85.215.179, mailfrom: steve@sakoman.com) Received: by mail-pg1-f179.google.com with SMTP id q1so16347811pgl.11 for ; Wed, 09 Nov 2022 06:29:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=7WKON8Xqgm7mfACpFVqMDSuF3F0b35OxeVGF/9TkqNg=; b=2IBTu+T2NQc6QH2snT6vryTwelt38rCdTXY+gkxYiwnh6GkZ/Bfqnzh9aV80MtA9Qh sQHiv0w7MCIhgKaI6dJoj9xOFdnMyclvyjB6aakSCj8gz0QIUgPE+ZDh6VWU24uzQ8Mm G8iC5z/bqE17t6XDa+jfjIWHVCzq3Y1UV2AcsLwRfeA1vrStzloCc7K2pgTkFphIBa8d uTni33PZ5O6Jizai0qf6yQCgM/I2DZe6a8NFAK4i/U+iNSpS+nPv+GY9mrkSJaBl2nBS As1ai4hoZd4YBJAednLCg6ceFwvYHhHzmAj3lJRgVzP/AxYsXvcHVAKZJWyXzfSklj27 CwmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7WKON8Xqgm7mfACpFVqMDSuF3F0b35OxeVGF/9TkqNg=; b=zWiEFK2TSSjkoi0xf37jmWHrUwNqjSTn0ZPO8rOtgnCR55W67/xPsL3KM4z2LwC/oN VUuVvnsodwV1KuhJLRWYARSnUFh1k9q9M/vlMMFfal+z60qIq+AxjX00Zk4NXeS9yM9z 4dur/A6Qkf5KvpHU3k+pckHG+dRPelP63ou7huEQIOqweV6TvtT2x/OKQVOsUzPjVPHq qmKhKBsYxC/Sbjl2dLrYvbPubOB+w/3uEvfAs2mWvXSONhmugzebTci6rk/pebk2Yv0V /XT0DPnOBiVjCXG69MgaxJVDSvpx26dsim7/VPiCkPVsaqhUNvthbrbOjT1Tt/rKO1CA pvXg== X-Gm-Message-State: ACrzQf2M4a7rycxQ1wjHCnJ7LLOwyMBRIL/dOmtZye0YsmQwWBjgewTp ZAXQsdRQrX351bOfUzSRM+3nfZBZ/fXEGR8u X-Google-Smtp-Source: AMsMyM4AToYM+PeS7beqOsMCoHbN+l0bVUzuBOi64GUDDLZFyJfEDSl85nonmUPBRXMAmMtclmu6NA== X-Received: by 2002:a05:6a00:22c3:b0:56b:f793:5ad1 with SMTP id f3-20020a056a0022c300b0056bf7935ad1mr61975603pfj.58.1668004190929; Wed, 09 Nov 2022 06:29:50 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id nn14-20020a17090b38ce00b00213d28a6dedsm1308611pjb.13.2022.11.09.06.29.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 06:29:50 -0800 (PST) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][langdale][2.2][PATCH 1/4] bitbake-user-manual: details about variable flags starting with underscore Date: Wed, 9 Nov 2022 04:29:33 -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 ; Wed, 09 Nov 2022 14:30:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/14062 From: Michael Opdenacker Fixes [YOCTO #14140] Signed-off-by: Michael Opdenacker Signed-off-by: Richard Purdie (cherry picked from commit 0f3e9d87168813ce49995ff04bccdce11c5f7b47) Signed-off-by: Steve Sakoman --- doc/bitbake-user-manual/bitbake-user-manual-metadata.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst b/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst index b533d9dc..b7c3d809 100644 --- a/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst +++ b/doc/bitbake-user-manual/bitbake-user-manual-metadata.rst @@ -422,6 +422,12 @@ documentation to a BitBake variable as follows:: CACHE[doc] = "The directory holding the cache of the metadata." +.. note:: + + Variable flag names starting with an underscore (``_``) character + are allowed but are ignored by ``d.getVarFlags("VAR")`` + in Python code. Such flag names are used internally by BitBake. + Inline Python Variable Expansion -------------------------------- From patchwork Wed Nov 9 14:29:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15229 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 ECCF0C43217 for ; Wed, 9 Nov 2022 14:30:00 +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.web10.3969.1668004193856984079 for ; Wed, 09 Nov 2022 06:29:54 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=iAZPiwMU; spf=softfail (domain: sakoman.com, ip: 209.85.216.43, mailfrom: steve@sakoman.com) Received: by mail-pj1-f43.google.com with SMTP id b1-20020a17090a7ac100b00213fde52d49so2065584pjl.3 for ; Wed, 09 Nov 2022 06:29:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=wljpKbtmYUJvTpqZEI788O8HXmcIrCd9rFF/kkd1VNQ=; b=iAZPiwMUU3/cM7GbIlL6KFjDE1ht4TTSb4baI9cI8PmGqDZkdWxNCEYiCrG42WNFmw FygZNP91/HQBGZHqJVav1whL+bTnmzJPlLCo52sFwolkcvvDsbqme4ss/2cwaud2jP5+ 0uS0+5wrM9ZCx/fsAyq7l3py79D2iTRbmSQvvroduqNwThBEeZ9l6Ji0d2WHE51edWaQ wZz2ZGWaqJPa/L/tS+2BDcAL1/yU6Sjit7F0E7tenIBsgc9EWjmtg7QQRbSlXHcV2/np 02/BR/cP97jpCxF1hIQEUHP9bFmXsOaFD2SP9qPm1wMt2fakuhTMlmYPc5bM0m8rBZmD zWmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=wljpKbtmYUJvTpqZEI788O8HXmcIrCd9rFF/kkd1VNQ=; b=Ju3Kzy/WPYZaAnOFGYD/TyX5ch0BE8t5O9Ado5Tc9C32wzPsCnacd1LwbobkR3EYN6 lB3wg/31BGfTVJ+fk2ISMCvSgJo2KC7AReYYts7rr7yaUmRVu3ah9yohJlxYpFJtICmC I7DrY86eAK/mIzIwrlCIgqlfT3lCCpr6c5GdTcv/h9+5sq+SEW98bsTxGYmbi9kpUYl+ koyT332ngJvcdO0QAfCMa9DmGK7bS+mid5PTYAIdlKlMsCSZDxzThUv/jRkZqo19XdkZ leSYyQwHlpvxtKC+aGRFU2w6xxRfVsDwfyRgcXSLXEP3m4M+s/VpHG8yHcS8PbYKl4p4 nEyQ== X-Gm-Message-State: ACrzQf0wc0C3rIcYn8W+IrPyhsB2C1jvchkKPACbPjCX7XsxAOkWpxY4 1p3M3Qqq6z01GQ7lLhE06X6a4nb9W2U+THhC X-Google-Smtp-Source: AMsMyM5GKhJbMkjbpsWJSgHv/nSSWSlc9wRq9Z2NZUvK2eE3Z/Yxa/MlUz+iQmK1a1oiNOH8+asY/A== X-Received: by 2002:a17:90a:88f:b0:210:f235:1151 with SMTP id v15-20020a17090a088f00b00210f2351151mr1212909pjc.230.1668004192755; Wed, 09 Nov 2022 06:29:52 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id nn14-20020a17090b38ce00b00213d28a6dedsm1308611pjb.13.2022.11.09.06.29.51 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 06:29:52 -0800 (PST) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][langdale][2.2][PATCH 2/4] fetch2/git: don't set core.fsyncobjectfiles=0 Date: Wed, 9 Nov 2022 04:29:34 -1000 Message-Id: <0b7011c4fb3f641e1e14ab92c489518264adc4f5.1668003926.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 ; Wed, 09 Nov 2022 14:30:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/14063 From: Ross Burton This git configuration variable is deprecated in 2.36.0 onwards, so git warns in the logs for every git call. Luckily the default value has always been false[1], so we can just remove this. [ YOCTO #14939 ] [1] https://github.com/git/git/commit/aafe9fbaf4f1d1f27a6f6e3eb3e246fff81240ef Signed-off-by: Ross Burton Signed-off-by: Richard Purdie (cherry picked from commit 8ad310633e0c5d5593631c1196cbdde30147efce) Signed-off-by: Steve Sakoman --- lib/bb/fetch2/git.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index 17d49049..578edc59 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -243,7 +243,7 @@ class Git(FetchMethod): for name in ud.names: ud.unresolvedrev[name] = 'HEAD' - ud.basecmd = d.getVar("FETCHCMD_git") or "git -c core.fsyncobjectfiles=0 -c gc.autoDetach=false -c core.pager=cat" + ud.basecmd = d.getVar("FETCHCMD_git") or "git -c gc.autoDetach=false -c core.pager=cat" write_tarballs = d.getVar("BB_GENERATE_MIRROR_TARBALLS") or "0" ud.write_tarballs = write_tarballs != "0" or ud.rebaseable From patchwork Wed Nov 9 14:29:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Sakoman X-Patchwork-Id: 15226 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 E00A7C4332F for ; Wed, 9 Nov 2022 14:30:00 +0000 (UTC) Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) by mx.groups.io with SMTP id smtpd.web12.3853.1668004195470038238 for ; Wed, 09 Nov 2022 06:29:55 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=cxtxw0aU; spf=softfail (domain: sakoman.com, ip: 209.85.214.178, mailfrom: steve@sakoman.com) Received: by mail-pl1-f178.google.com with SMTP id d20so16177979plr.10 for ; Wed, 09 Nov 2022 06:29:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=Ih6NBxKOxF9OIBcKOQ2JpJwOJJIhjlRzXLEOKPm8Czk=; b=cxtxw0aUlfK+9tluQbn3TsXRae94k/tQrb6XXk4bGnsXqnXSo+zz9UxYW1kO8dG9R+ J39WYddKhcKR88I4QtLYXx8AbNnHW3Zep8eY+otA455oY5CxhsjdTKDO18N36gNoG5RL YotFkUvezvD+kdcXaJEyH31AiqGG68y9/S+8/smuDZuTgNjAiJdtVOsODby1D5UQOqLh Q24QNbdSio4e74dssm+yRiIldNKzZOrQCFy90Z6R1mm/GDr4CMlrZegvuMd2SwKbvTap dkQe2xmOIUJSbpRSP5CywLbqhl4Wft+SjWaIu0S3vh6Jgz64KKniUpPspg/Oy7I88taX BIEA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Ih6NBxKOxF9OIBcKOQ2JpJwOJJIhjlRzXLEOKPm8Czk=; b=H6miiZovjiNZ6QUIHD2J2DFd3UIZWsLmo2zoU+rj7FJ4Mc3/NkyQqrU/np3zUAfvLt 8CLLL/4kxKgTdm8ulvMbYilK1ZiwDtVMWMykFgrQMkUmVE4/rtIu/qkpetquOWXQdWxB XCa95vUNFcHnphxXB50Wk5C5jxjfD6CLnr/rdHDU8rx5xkH2n6AwdjrZm9GcfOteYa6P 0saML3SS3zLvVpNBhe2XKUVIrup0Mcbkah2rQE+bDbvEF/3dFLj/8mB/uT8q0M7WTvz+ Ajd74DQKWqjg13uE6qkzki3/nLsxkEW6pSVct4UfJUq44+Zqii+DZ7E3b/D8NroYwdXO 7Hhg== X-Gm-Message-State: ACrzQf1aL77PGmH6TLydd6ZEDfW44Pmj7fR4G8XIK3XpkE4iVkYHcJsS cDHS5jnD8fpMtIJOyVmlt70VF6vNy69V129z X-Google-Smtp-Source: AMsMyM7WfSOvk3yH/uNmdEhL3sCLCHX9CCiLL9BLuMxhCQXXDElAhzT6EsDkkfLGlzoKC0485zQBsg== X-Received: by 2002:a17:90a:f306:b0:213:b191:f3bf with SMTP id ca6-20020a17090af30600b00213b191f3bfmr60622422pjb.237.1668004194615; Wed, 09 Nov 2022 06:29:54 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id nn14-20020a17090b38ce00b00213d28a6dedsm1308611pjb.13.2022.11.09.06.29.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 06:29:54 -0800 (PST) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][langdale][2.2][PATCH 3/4] asyncrpc: serv: correct closed client socket detection Date: Wed, 9 Nov 2022 04:29:35 -1000 Message-Id: <22b8ec06e61d058a0775957702204f1331e47210.1668003926.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 ; Wed, 09 Nov 2022 14:30:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/14064 From: Justin Bronder If the client socket is closed, asyncio.StreamReader.readline() will return an empty bytes object, not None. This prevents multiple tracebacks being logged by bitbake-hashserv each time bitbake is started and performs a connection check. Signed-off-by: Justin Bronder Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit 2d07f252704dff7747fa1f9adf223a452806717f) Signed-off-by: Steve Sakoman --- lib/bb/asyncrpc/serv.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/bb/asyncrpc/serv.py b/lib/bb/asyncrpc/serv.py index 5cf45f90..d2de4891 100644 --- a/lib/bb/asyncrpc/serv.py +++ b/lib/bb/asyncrpc/serv.py @@ -42,7 +42,7 @@ class AsyncServerConnection(object): # Read protocol and version client_protocol = await self.reader.readline() - if client_protocol is None: + if not client_protocol: return (client_proto_name, client_proto_version) = client_protocol.decode('utf-8').rstrip().split() @@ -59,7 +59,7 @@ class AsyncServerConnection(object): # an empty line to signal the end of the headers while True: line = await self.reader.readline() - if line is None: + if not line: return line = line.decode('utf-8').rstrip() From patchwork Wed Nov 9 14:29: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: 15227 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 E6333C4321E for ; Wed, 9 Nov 2022 14:30:00 +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.web09.3947.1668004197424767315 for ; Wed, 09 Nov 2022 06:29:57 -0800 Authentication-Results: mx.groups.io; dkim=pass header.i=@sakoman-com.20210112.gappssmtp.com header.s=20210112 header.b=PsBVHPS8; spf=softfail (domain: sakoman.com, ip: 209.85.210.179, mailfrom: steve@sakoman.com) Received: by mail-pf1-f179.google.com with SMTP id i3so16822604pfc.11 for ; Wed, 09 Nov 2022 06:29:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sakoman-com.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=6himniHtQZwjP++OVwDsJa68gFBfVXk+0BkJEQBHiz8=; b=PsBVHPS8+X9gM9HWJPw6kmNlTfC6fsLi1yQNo74fVydRUil8b7YxUwnUgvwkgel+zn yMqcRAeszbec2o+uEgqqIVYOaceeeRHzsmaqz3JsV3C8BMqmXR0ea+pKGM2J/2X6+Pdp CqIg8dxz6AXBvA8dESuRAFHdyDwgU+l3i+5aZEfCGWMDMBlc7fVdV5r64ctI6l2YKyP0 d1euikpDgBLG5HlSU/qDLRjF1hQByOEK2ewf8Vt/JSTubl1bG4itT1EbOLAM7bA9SkqN 1DHPZfNd8c9JD/X9/yw2YI8r+0VELzWtPUIiczcf8bI5HSGYAGRKaZkTSaY1jjOU146z 6jVQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6himniHtQZwjP++OVwDsJa68gFBfVXk+0BkJEQBHiz8=; b=xcpwjMfz/IrEc1+nc1yJB7MHyI+pjTEjrP/m/LVx1Y4B8hRwWci94KyZ5Q9hp6noRF w/dD8TyJjM219dUfFr15ouflggklOpTGZtfM9QA0xk1c0PbbBYfYCioFYmgIUA+X8rbF xNgXjlUBu4NE2I2P5KQfH34C2K+BrOXs70ooco1hXmCRCBZyErI4PxDSYhG1o7FtH9Ep SAXVblMo4B9r3/4OeFeqEXZ2fwWewwUOu5CiFe3ihleeS8epViG4EmPvnlYAT7gbMvF1 lDySOdyjISKnpNXQW8zQzrjZVSIzD6ebCdHvszGzmGgWUXpu+IVu71q/3m4Hbhj0wpyH nzhw== X-Gm-Message-State: ACrzQf1oTDOeLdhVfYcK4C9RioDrYYZg4PVBDHcnwG6v5bV3jbiiShw4 /W8+nfiprEtbehxUnoHSJb/8KAGyemoPS5HU X-Google-Smtp-Source: AMsMyM61jnZCxNk80UcAwE7RlshT6sdXUPMwtT6neOy3ELZ4KgaER9Dqa2+95YKxBAL5PNSJ3+/97g== X-Received: by 2002:a63:fc0b:0:b0:46f:87a8:97aa with SMTP id j11-20020a63fc0b000000b0046f87a897aamr51372345pgi.234.1668004196526; Wed, 09 Nov 2022 06:29:56 -0800 (PST) Received: from hexa.router0800d9.com (dhcp-72-253-6-214.hawaiiantel.net. [72.253.6.214]) by smtp.gmail.com with ESMTPSA id nn14-20020a17090b38ce00b00213d28a6dedsm1308611pjb.13.2022.11.09.06.29.55 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Nov 2022 06:29:56 -0800 (PST) From: Steve Sakoman To: bitbake-devel@lists.openembedded.org Subject: [bitbake][langdale][2.2][PATCH 4/4] bitbake: bitbake-layers: checkout layer(s) branch when clone exists Date: Wed, 9 Nov 2022 04:29:36 -1000 Message-Id: <42d63b381a60c217145dc2fdba47eaf02c893f3e.1668003926.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 ; Wed, 09 Nov 2022 14:30:00 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/14065 From: Mark Asselstine [YOCTO #7852] Fixes 'bitbake-layers layerindex-fetch --branch kirkstone meta-arm' not checking out the branch if the repo is already cloned and on a different branch. If a clone of a layer being added already exists check what branch it is on and if necessary attempt to switch to the given branch. If the switch fails to happen the git error will be reported. We also warn if there are uncommitted changes as the changes might go unnoticed and result in unexpected behaviors. Signed-off-by: Mark Asselstine Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie (cherry picked from commit d2cb388f58a37db2149fad34e4572d954e6e5441) Signed-off-by: Steve Sakoman --- lib/bblayers/layerindex.py | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/lib/bblayers/layerindex.py b/lib/bblayers/layerindex.py index 0ac8fd2e..ba91fac6 100644 --- a/lib/bblayers/layerindex.py +++ b/lib/bblayers/layerindex.py @@ -49,6 +49,31 @@ class LayerIndexPlugin(ActionPlugin): else: logger.plain("Repository %s needs to be fetched" % url) return subdir, layername, layerdir + elif os.path.exists(repodir) and branch: + """ + If the repo is already cloned, ensure it is on the correct branch, + switching branches if necessary and possible. + """ + base_cmd = ['git', '--git-dir=%s/.git' % repodir, '--work-tree=%s' % repodir] + cmd = base_cmd + ['branch'] + completed_proc = subprocess.run(cmd, text=True, capture_output=True) + if completed_proc.returncode: + logger.error("Unable to validate repo %s (%s)" % (repodir, stderr)) + return None, None, None + else: + if branch != completed_proc.stdout[2:-1]: + cmd = base_cmd + ['status', '--short'] + completed_proc = subprocess.run(cmd, text=True, capture_output=True) + if completed_proc.stdout.count('\n') != 0: + logger.warning("There are uncommitted changes in repo %s" % repodir) + cmd = base_cmd + ['checkout', branch] + completed_proc = subprocess.run(cmd, text=True, capture_output=True) + if completed_proc.returncode: + # Could be due to original shallow clone on a different branch for example + logger.error("Unable to automatically switch %s to desired branch '%s' (%s)" + % (repodir, branch, completed_proc.stderr)) + return None, None, None + return subdir, layername, layerdir elif os.path.exists(layerdir): return subdir, layername, layerdir else: