From patchwork Tue Apr 13 07:02:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 410 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c543:0:0:0:0:0 with SMTP id j3csp2520647ooq; Tue, 13 Apr 2021 08:02:57 -0700 (PDT) X-Received: by 2002:a19:c753:: with SMTP id x80mr22653520lff.589.1618326177113; Tue, 13 Apr 2021 08:02:57 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1618326177; cv=pass; d=google.com; s=arc-20160816; b=G4cMGmluuZQkqZja0f/CYpF1S9ZYpzK5D9fTH40PUtO/Qwtc1L/uttOVXEwurj+mSv m6p1goboBeFtccbt7Mh9OJ0+VN1cMO8xautvK4m56J1E6ABDE2ZAUshyB81OnBGO4IN4 zjnKdeaeOAdDQPA+OTBpEOtxP9OjNBSxRG7jS9Q44L/dyPwW3KBavyMR0MmfwyOozMgk ifkFB4CRttj0eyI8Ay1g0TXsMUpDEAqEGSGh0VwLn0ZCBev78w5JkIHp3D6fXbWosTox d4DeSy6z3ay7vT9LTDluVUmf0IiSQSoUKehewsbv4v/LjHMuMRUAaz/AQDk8c4mIoKY5 vTJQ== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=dmrC8IVfG3XRnMFHhIRpdyilzzaWO72H3mTY1Jp+sp4=; b=QnXgjiXzRyVRihGpXxyEKWxuDhkvsdP6OjeuhEHG03LOm2p9pE9SnTyKGj0i9VCM6e lNx85IyuFMwsBh7mcpTuFh/mVcGt/sRqI+3fbMTstPu7JITO/KaGomQaJmGJ5comyX6E aMpRiFG2LmSb3az1Je5Mt41D5O7S+pePyPq6v3Mfgn5kFm+o0x2WVYZYWIXvyRxrw3b4 DBfnJf4gQki/JHu90bAbszLvgpFeYclsmGA2Jpqg7etfPSDi4YDVx5L9izps54cAV4WF yVJwRrlXbnX2lRz9NSC5FhwbjTVzv85qvORhcvFTphatNtq15vdwYJ+IGm6TPxroebFP DjHQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=LL+lC5az; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbihf22bqmgqemfy5iva@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBIHF22BQMGQEMFY5IVA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id k6sor184308lfg.160.2021.04.13.08.02.56 (Google Transport Security); Tue, 13 Apr 2021 08:02:57 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbihf22bqmgqemfy5iva@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=LL+lC5az; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbihf22bqmgqemfy5iva@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBIHF22BQMGQEMFY5IVA@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1618326176; cv=pass; d=google.com; s=arc-20160816; b=eA9fCixyDmcJ9cnllX1EFOwcv1OuPzzf4BZyuQGtp+1StRRsA0LqyQDof61jiUa6nA wc1iyBRg4VgKvAnVdLQlugX4pWTlMnDPJ8Y/CvsJH8TxbOsJIMh6Djs2y9nRtkQQhEzZ S0TcR9vSDoYyDVhAhIwYB6+Ek7F30RPAYDXuNRvlpYHYRWGvjJ2YGL9jsuBWPR6T5l3D vCixdmQsh6vSVxgPjC8ed7YYpb+D0cbHuepuVrr4UXdaavrscs43A762BGd/0EN/Eipj PNzl5UhQtgEQJDZU7+33cRnGlQLXaybloNXcl1735hkeijXKrw3hj5hQM5MTLYFe6CAV EvOg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:message-id:date :subject:cc:to:from:sender:dkim-signature; bh=dmrC8IVfG3XRnMFHhIRpdyilzzaWO72H3mTY1Jp+sp4=; b=dhJldNfauFJWP/QSNiwAC+qVkJBMui9gszWKKjjK1GNu0MsB65o/KDdiX5iFvPz/ws ZHxe3ALClb/fi0bezZ6XOCm9OYKLqQgwvhL/aMZwQkZkBDZbsLfiDxqYQ3Tb3gmPJzSs Z5i0/v8E0oMfqfBr5cNlnmYzttJZuyPUGZARMlD2lMICQoI8UfHMd/xbxjdzeTb0QkfF 5cwPNo4iNmKHW2Mq+ELEJJbUX36a14LzREb2iLN45tRvWWn7z5qldXHOodjDrQBQesXh VrowecgoKypo6J/vgiYBNXKX2uLGdkm+9a07RrrBMu5f2UV97THDha6PyvDwRgyV5w0H 7JSw== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :x-original-sender:x-original-authentication-results:precedence :mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=dmrC8IVfG3XRnMFHhIRpdyilzzaWO72H3mTY1Jp+sp4=; b=LL+lC5azqJ87N+TXYOKX8f1DWYnpIG8fM8hkfWEtEadvOvqO8VENVQZtwUAe/RufHl QAGXfmFIvrCSZ9vSZ0c1jC7sPaRbN1iMgmMMS2pOaFuzS29JkAru8fa96P97vUkmAJTa 9qPpOB7r6zh4ilKhobnXHI4Uc3wW50wVf102M/QNyp5tSCBlmXJHgJQHNKNGOVOewmzP Y9/R+uxAap5NmaMtxo7yW6lmbjSLk+i+ij8frbAF/thjnPi2SUutuJDvrsQ6NQlh93m4 AtXVQde1T+JCEQELPdRl6NKAYv6+FfMrJxlqUUPvLylM0359CPXfT9F9pwcYhr4K43OP Li6Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:x-spam-checked-in-group:list-post :list-help:list-archive:list-subscribe:list-unsubscribe; bh=dmrC8IVfG3XRnMFHhIRpdyilzzaWO72H3mTY1Jp+sp4=; b=YEYcAItRJYGcU7AL84wYFl23l2bjUCC1VRjpBXYmidpyA+OHrgFJZYsJI5yFeAZN3h OmxZEsNDIdFu5aVUfHEl9/Y2oq7hbKIOhikSmylpc1yURQoWdTvB1sqj1hTgxOqPSpbx F6BTNSFP0gBVQ+NuiojJ+DIdamAlybY/lcgXj9J6ATU9FwKiR6K5NpIFFaHlCjIiV211 mUwFHDhU7ZniBfyZsIwy4YSgIZANXXj4rJUrAXJVyJaFhFmOaqPeLAl7SUIjrFSvVKpY Y3bLLEwUpZ+h037MukS5tSV8tpHGpbR5Adgg5ql0v/lZdXvb5aWsxFAfJnysVQbm9tNw vdRg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM530iRU4TcPuV4jiV7dbm1fZYI3bdL1TerLOH0obMK6xwPpdZds5U 8rFrqfy45PBnxSmb6VZsUBY= X-Google-Smtp-Source: ABdhPJyVa25baOqzY1sdTxySd/6BEwLFwjC2Tw2w6YE9Lp9QI568xL/Tm+JmhEohjYFrrON7zcigtQ== X-Received: by 2002:ac2:4e83:: with SMTP id o3mr11079434lfr.616.1618326176440; Tue, 13 Apr 2021 08:02:56 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:9b0e:: with SMTP id u14ls1744576lji.5.gmail; Tue, 13 Apr 2021 08:02:55 -0700 (PDT) X-Received: by 2002:a05:6512:555:: with SMTP id h21mr17582230lfl.645.1618326175448; Tue, 13 Apr 2021 08:02:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618326175; cv=none; d=google.com; s=arc-20160816; b=GqPMAsVh45A+aMJ1ol8O4zUwFY7u8sIAWbS8teWSlw69wXNYXVBmJoP2yQB60g475k lhSLFAYfHfsrNROt1HQejIU1bfy89a4/jEwa51fk1yMKRAvKp1RkXctAkVrO5jTOb8OV XSWXDTEhDfdw1OVY8OpANzxLF3halm5TZKL6sN0nP79yekoqCduBEZDv2mz8ybt2Obqv 8KS/p9y8GAoy+S6gV2GDduA+YcU4lm3XmKucbbPaGMeB3q8z/PhDDY3OEgw2eQ7EoGP1 G00lXyg0tUQSWWz8yM2IdP2STnhEEk7M1Jdc/CE8OP9FsGrpRY7FAZp6Muj28kEFacVu 3qWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from; bh=+E0ub95PikeB1KBRtBC9+Zi9X5EY14N0l/v4OP73gSo=; b=lD6cmLOGoo51ZP+Cjr3uo0AD3uAuLqUhHxfJIrt4wj8oQgQ1UCCrIgg2u1sB/+hII+ yIMz7bMARZIhO+ZLJwgOOkn3Vl98rTjmOVfwKFBIVsYV0/RnArf75hnu1WXSj+pT0M8A qvpiqHFGYE81pJPvcxn9PAqp+1aNDrAKl+BY0+9FSvWDpHbX8TRLXf1P/kmWc/6+Fto7 Fve9wiCQI1/6h00MAGoEbNlza3AZ3vjRV5ir6BbCXlhd8XzAoqNd8FqcdicVgG9waioy CV/QTCx/++B9suRol2Yk1O6XnbJJ3b/NoP9vhCnHmaG45gkacfkruX2tn4/cqyOH+fk1 AzTg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id j7si528399ljc.6.2021.04.13.08.02.55 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Apr 2021 08:02:55 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 13DF2sX5008165 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Apr 2021 17:02:54 +0200 Received: from localhost.localdomain ([167.87.48.83]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 13DF2rM2021528; Tue, 13 Apr 2021 17:02:53 +0200 From: Henning Schild To: bitbake-devel@lists.openembedded.org Cc: isar-users@googlegroups.com, Richard Purdie , Cedric Hombourger , Chris Larson , Henning Schild Subject: [PATCH v2 1/3] fetch/git: add support for disabling shared clones on unpack Date: Tue, 13 Apr 2021 17:02:49 +0200 Message-Id: <20210413150251.1969-1-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1696848006270555052?= X-GMAIL-MSGID: =?utf-8?q?1696937989458340073?= By default the unpacker will create a "shared" clone when cloning from the DL_DIR to the WORKDIR. This patch introduces an option to control that behaviour. Imagine some recipe steps are executed in a namespace that is different from the one your downloader and unpacker ran in. (chroot) Because a "shared" clone has an absolute reference to its "alternate" you now have to make that "alternate" visible in that new namespace (chroot) at the exact place. With this patch you can unpack "noshared" and get a stand-alone copy. This copy will also work if the "alternate" is not visible or existant. The switch is a global bitbake switch and will affect all git urls. Build systems that need "noshared" most likely need it for everything they do with git. Signed-off-by: Henning Schild --- lib/bb/fetch2/git.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/bb/fetch2/git.py b/lib/bb/fetch2/git.py index e3ba80a3f52a..3e25b4b6047c 100644 --- a/lib/bb/fetch2/git.py +++ b/lib/bb/fetch2/git.py @@ -168,7 +168,11 @@ class Git(FetchMethod): if len(branches) != len(ud.names): raise bb.fetch2.ParameterError("The number of name and branch parameters is not balanced", ud.url) - ud.cloneflags = "-s -n" + ud.noshared = d.getVar("BB_GIT_NOSHARED") == "1" + + ud.cloneflags = "-n" + if not ud.noshared: + ud.cloneflags += " -s" if ud.bareclone: ud.cloneflags += " --mirror" From patchwork Tue Apr 13 07:02:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 411 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c543:0:0:0:0:0 with SMTP id j3csp2524119ooq; Tue, 13 Apr 2021 08:06:34 -0700 (PDT) X-Received: by 2002:a17:906:4b01:: with SMTP id y1mr17644986eju.218.1618326393926; Tue, 13 Apr 2021 08:06:33 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1618326393; cv=pass; d=google.com; s=arc-20160816; b=GlOb7chCpxgqvJMPSwCenJ9Quoix2gKBKNs2JumzigOQuoXQOjLkTEiLI/XjnbNDpC YfkDqSwdCWXxUvFZdQF1lgkunjDgp/MjfX4OntVCID020Ys6UDcGdUhVIxp2u4Avlo4O LoiQCOZHyMJKNja68YfeZ1g6YLhm7tb9W2FUOUvFmwvn2LGNUQFjQEEJG5YUpgOLG9FV numLExe+SLquZCV6s2fJ9ubSJFygTZkRtx3dc8J1NlPlTKeHVoP3OycCc5h2Cf4G7aKI DY7EHbVkBT7p8gSGSTxQnoXAXb1YzY69Te/MoiFRRa6i79DJrQtck1FEkAd+D3rxQCsC byLg== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Ia0PLpqNnc323BLbrMPdpq59hYytwAkViW7DTExLMhA=; b=avnUchHK9Avi6RC2hFuJsfc2XZwuSKUEA55hPMgC61cKmlREFHz2u32GEpg982q6ms VveniBDIVIQvLF1QkY4uQ5sfuQRKge5ezWQ0amsBcmnsBNzigE6pv3DnvM/UdLtBxb6j Aqsq+XMUWYiUhB999Ya5gXgXkQ/f3KC3IVRPImBA3ffvYi2arTQ3/B08C+bg01UfZu+C Z0cMowCGUG8fxOk6HBF2QDoiI7ijq2rKsYNSBIhTdUk55Oe3gSJLmgjS4gzjrbiLNlzY L7zNDCOUvSgLGbIUMg3dPvJzqLF05ufdKUbij8vpOZ3GT+UgAzQW90siBGWAJuQWsYhJ Sfrg== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=E2hGyLK3; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrb6pg22bqmgqejfxk24y@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRB6PG22BQMGQEJFXK24Y@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id g19sor7398429ejs.27.2021.04.13.08.06.33 (Google Transport Security); Tue, 13 Apr 2021 08:06:33 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrb6pg22bqmgqejfxk24y@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=E2hGyLK3; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrb6pg22bqmgqejfxk24y@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRB6PG22BQMGQEJFXK24Y@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1618326393; cv=pass; d=google.com; s=arc-20160816; b=sDCLEkpHoxoJBxyI9Q1ohrB4W+hwFReWSuJJCDVI/410N9Pq+/MzfbK2nJBw7VYSS/ TfJXQtyA8NgTNsduVgKp851tx5h8FQvIsPzwEVkZGdJ9mgZuH7CLdX2nXJlu0fhizbmS jRx16D/8rez8PmpC5Kjl1+h9tQz38CF4RbFFqzuCTUjiC+6lmVmpBjI3fT2BYLvFTpsB iS7+tGAQ/TyiMxP65gHGyxWWIPcXsAnoo5+6unoZrKDtyHQI2NunblzDYmCttGRKYV2X V48DFx0I8bGnzfCczvJ2/hXRg9tvJDxCkk22r6TtS8qPKx1p5auF+pitXGVdmoJ1YJzK Mtcg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=Ia0PLpqNnc323BLbrMPdpq59hYytwAkViW7DTExLMhA=; b=UF6yTbMCAjbqKeYJ6uVzBGlGY6u9PhFZjVapYXP1vi9efFw9dwdzjzPsH+sQlr288J WyUp4ge2VuHAgeGyH+L6MDIk/YJFK07J/1nDVJxzFofbrH8cES8xFnqB9HioZaDIAp4b hpB3DLIfK99bVrnLKAi7Or0iDExJKoj1oOoAA0Yrtlm1nbbDHnEu1WrTUqlAV0fb8tsm RxFd4hIIx29UcUoPFA3BrWKxN/gkUhSxLpkoj6LmUpki72WhXpC2BU8FPo6H3cyM2jCs HhRtzr9ZYspVDB3hGaHNcvZ125zFR+GkoDhozrKrynBTROd8WQPFtOyDhdQp1KrhVzQm bPjQ== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Ia0PLpqNnc323BLbrMPdpq59hYytwAkViW7DTExLMhA=; b=E2hGyLK3ESOJQPMFLBOvy2Y+ri4PP9k0KCYwTLxPdWpfuggbvoMY/olxTDRu6QN7mQ jE6hl8hceQn5a7Jf2FJ2Ei2Wcp2aLvhW6ZjzfCO+sT+/byzdgq2MCgsN9bvN16FCVJro fax+GjERkUR4ZsvEoP5vm9EPhh7Xi/REq2e78Y0W9GPqLFUx5XOb+SUnLtTvXmBcJNXj Z3La591XSa0+OCJfRDHvCyTuRYt/Rtoz7FO1VxK9idHevVtISAw1TP3Wl0Gu8XslYtYs kaWhErWPUE9W15k3Jk8tPvRn1nhCuVccNJYyGA3bBfN+JIMWGq09E9i5BP3Q9+/PZ5CN TP9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=Ia0PLpqNnc323BLbrMPdpq59hYytwAkViW7DTExLMhA=; b=ODtjyFHA0TkMjg0gVn2iZ92PY0ZKSlHAESKUd2iqDfIMuKmiIUmD/IekKc0C4kbiNz h9jz3Qe9JtImraGJm+Bafkvr9bq8FgEcKN2232Z/c5YLEw7HK5nQxeXBt0I/DvWfsJj2 bt+nRemogCXW+Wnkbqb7qA4kBJmamf2k2MM+4LqenhEc/hnfz1P056yUwlzehed//92d jqhcwNmVGLgCufsrHTvOkOjovl2wEYd2RSJ+CKfG+/WoD0pWHb5yC0NlBUPzqwYgxvbu f0dPMYYWeg+mi059Z2P3PXCLkQ+g4ZWlueJ32qnKEjWAd6Kf5VAC8T1rMsdEZ80Swf+N pDSg== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM531DadO3QtFwYNMN4yWVh133EMRnJyXJFGYPd3iGlJBZqDN8yItA JmXOMaA/70u5vAc41tYgARA= X-Google-Smtp-Source: ABdhPJzVvEyuSMivSlt5TofG0EjLhvPaO2EtCor8TAyotv+HJYmFbwgqTkTywodw8QL1ov/QA/iA7g== X-Received: by 2002:a05:6402:1284:: with SMTP id w4mr34943485edv.181.1618326393644; Tue, 13 Apr 2021 08:06:33 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6402:4c2:: with SMTP id n2ls3943122edw.2.gmail; Tue, 13 Apr 2021 08:06:32 -0700 (PDT) X-Received: by 2002:aa7:dc0b:: with SMTP id b11mr35889906edu.124.1618326392795; Tue, 13 Apr 2021 08:06:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618326392; cv=none; d=google.com; s=arc-20160816; b=GewKKKm/NLDpNiQxl8cVaXlZwuKPHWZ/1COhu/oKvvMkUoshb/6AIxHUX2trnPz1QH 7ER/y87DgaO+Tsfig2gTi0kF7OMMvdDKy7A6iPvPZ4eWORHnbuonaFNmSoF0I85xZrsV 7DI/Ul3wL80haY/uZbRMC13k2PGi784WCdRqqmE1EecNQVxyypu/SSsoN7YPbW11WDBr dXR6/IK6YDys7jRBNipBXcfjgrU773ZkPVp0FXa4nq8UvZ+g94mAlolkY1nx4kEtnnbE Zyrko8DuRXj5AjX0J2eW2EHHkC7XMiJTt85gCO83/az4ktT9OYz63hjDZ06MVPvYhPTx 9mTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=pISVF+c9b1J/nXrWAuW/NSbaUevBj1SThJbGe2I4i5c=; b=HoEY45vlCHN0JXXCajnvkQUaEHxZS3rkUGoywu7NyZz9Xbk6+bk3k5WZe1ba4qouZD dW7I8DH9cDbndVdL2czOPad7ZaxifmIUn78geQO0RNO6YGdnVlImwkUujl8EC+yeO1Ny 55lQUd/Vgl9BX1aKRBjPnIebYVF3W5E9csSiS2VJuSj6OCrAfe+p96WrptGaCkg0UNlP nlpxA2ACrc1F1iGu+fX3wKoO7zjyZc+PdUYa65AFvS1upBnubqVSfyXoC+wATUM3D4wo tXMCuPzRVepYm5rKaSiFfCPe+7GMZHx3ShDY8+LjOK7pUYeV9wwFFcFBLDl4H+kJ6mAR 9FXA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id c12si1122887eds.0.2021.04.13.08.06.32 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Apr 2021 08:06:32 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 13DF6Wo5012254 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Apr 2021 17:06:32 +0200 Received: from localhost.localdomain ([167.87.48.83]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 13DF2rM3021528; Tue, 13 Apr 2021 17:02:54 +0200 From: Henning Schild To: bitbake-devel@lists.openembedded.org Cc: isar-users@googlegroups.com, Richard Purdie , Cedric Hombourger , Chris Larson , Henning Schild Subject: [PATCH v2 2/3] tests/fetch: deduplicate local git testing code Date: Tue, 13 Apr 2021 17:02:50 +0200 Message-Id: <20210413150251.1969-2-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210413150251.1969-1-henning.schild@siemens.com> References: <20210413150251.1969-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1696938217275815490?= X-GMAIL-MSGID: =?utf-8?q?1696938217275815490?= Purely cosmetic change that probably improves the code. Signed-off-by: Henning Schild --- lib/bb/tests/fetch.py | 33 +++++++-------------------------- 1 file changed, 7 insertions(+), 26 deletions(-) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index ddf6e97439b5..76797473db8a 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -673,7 +673,7 @@ class FetcherLocalTest(FetcherTest): with self.assertRaises(bb.fetch2.UnpackError): self.fetchUnpack(['file://a;subdir=/bin/sh']) - def test_local_gitfetch_usehead(self): + def dummyGitTest(self, suffix): # Create dummy local Git repo src_dir = tempfile.mkdtemp(dir=self.tempdir, prefix='gitfetch_localusehead_') @@ -690,7 +690,7 @@ class FetcherLocalTest(FetcherTest): # Fetch and check revision self.d.setVar("SRCREV", "AUTOINC") - url = "git://" + src_dir + ";protocol=file;usehead=1" + url = "git://" + src_dir + ";protocol=file;" + suffix fetcher = bb.fetch.Fetch([url], self.d) fetcher.download() fetcher.unpack(self.unpackdir) @@ -699,31 +699,12 @@ class FetcherLocalTest(FetcherTest): unpack_rev = stdout[0].strip() self.assertEqual(orig_rev, unpack_rev) - def test_local_gitfetch_usehead_withname(self): - # Create dummy local Git repo - src_dir = tempfile.mkdtemp(dir=self.tempdir, - prefix='gitfetch_localusehead_') - src_dir = os.path.abspath(src_dir) - bb.process.run("git init", cwd=src_dir) - bb.process.run("git commit --allow-empty -m'Dummy commit'", - cwd=src_dir) - # Use other branch than master - bb.process.run("git checkout -b my-devel", cwd=src_dir) - bb.process.run("git commit --allow-empty -m'Dummy commit 2'", - cwd=src_dir) - stdout = bb.process.run("git rev-parse HEAD", cwd=src_dir) - orig_rev = stdout[0].strip() - # Fetch and check revision - self.d.setVar("SRCREV", "AUTOINC") - url = "git://" + src_dir + ";protocol=file;usehead=1;name=newName" - fetcher = bb.fetch.Fetch([url], self.d) - fetcher.download() - fetcher.unpack(self.unpackdir) - stdout = bb.process.run("git rev-parse HEAD", - cwd=os.path.join(self.unpackdir, 'git')) - unpack_rev = stdout[0].strip() - self.assertEqual(orig_rev, unpack_rev) + def test_local_gitfetch_usehead(self): + self.dummyGitTest("usehead=1") + + def test_local_gitfetch_usehead_withname(self): + self.dummyGitTest("usehead=1;name=newName") class FetcherNoNetworkTest(FetcherTest): def setUp(self): From patchwork Tue Apr 13 07:02:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Henning Schild X-Patchwork-Id: 412 Return-Path: Delivered-To: ilbers.mnt@gmail.com Received: by 2002:a4a:c543:0:0:0:0:0 with SMTP id j3csp2530942ooq; Tue, 13 Apr 2021 08:13:53 -0700 (PDT) X-Received: by 2002:a1c:7315:: with SMTP id d21mr466362wmb.155.1618326833025; Tue, 13 Apr 2021 08:13:53 -0700 (PDT) ARC-Seal: i=3; a=rsa-sha256; t=1618326833; cv=pass; d=google.com; s=arc-20160816; b=DRyHm9cquNtB0vccXtIi5RXIlIxnkXHrPsvjNCEGOTLNwmTooRBMd0a44qQsjY+Cso 4SxVkptnqSxSDnDmUh2X4f3dJIvnNEpJr1sFUJ+xbxjTRnlEPk9tAOSkXYYfmlDaqIN9 6/hg9jOtDIIaJxN0weAtlfKzo/fGhPZ3a5tB6y0dlG2AnQMW2SBdtIP6P/gxclAOxgrS V8A+b7lvrcfTJ/hNm5t57hH+OSdWbeCYPZQ0SJge2LNwIhdCNCJBtYhKYqWLtRbekfES Fu7jpU4jCYIF529pECtTpAn03izvEX21s7rHIZH4CsSTqBqualmnbDQMyv0l4+9TS1jt 0f6w== ARC-Message-Signature: i=3; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=oSRPVefaO5PX5LbFUSiK0gDK/h6HlRpeJ7sneHZwbw0=; b=Gj8T2YjHIUNfPOp6fJmQ/Hzjj/3iK0sSUIHjbe9Sp8fyV3En2//SfHR0CsgoIVI04G vIFXHSZka7DIsxRKAqKwlyCM4PUc38zKlWFf5GBpCdHNrQFItTipq2uL0n32mGxEWQlm bgP7VM3O7iib8sg5kgVtjVUEaEKUHOKDyY0QqAm/pJMvwDhwjOos7gJbd+FOo7+Tu6Z7 nvMozQXwAGp5U4SbojmVeawEcKC3hPS0KKNnNsO7Mq4uKj3shIEAQxxfWaFcFsV3hhv/ q+yfieztcMnVlZf6mJUyyq4pG3Hba+yJSE+kEQsPGhe+XgqRKPFwActbGzkTBZ7KJqIT 2xNQ== ARC-Authentication-Results: i=3; mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=rqx7rcJm; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbmhk22bqmgqedqqsjai@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBMHK22BQMGQEDQQSJAI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com Received: from mail-sor-f55.google.com (mail-sor-f55.google.com. [209.85.220.55]) by mx.google.com with SMTPS id a10sor1570682wmj.14.2021.04.13.08.13.52 (Google Transport Security); Tue, 13 Apr 2021 08:13:53 -0700 (PDT) Received-SPF: pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbmhk22bqmgqedqqsjai@googlegroups.com designates 209.85.220.55 as permitted sender) client-ip=209.85.220.55; Authentication-Results: mx.google.com; dkim=pass header.i=@googlegroups.com header.s=20161025 header.b=rqx7rcJm; arc=pass (i=2 spf=pass spfdomain=siemens.com dmarc=pass fromdomain=siemens.com); spf=pass (google.com: domain of isar-users+bncbdjmjpgy2mgrbmhk22bqmgqedqqsjai@googlegroups.com designates 209.85.220.55 as permitted sender) smtp.mailfrom=isar-users+bncBDJMJPGY2MGRBMHK22BQMGQEDQQSJAI@googlegroups.com; dmarc=fail (p=NONE sp=NONE dis=NONE arc=pass) header.from=siemens.com ARC-Seal: i=2; a=rsa-sha256; t=1618326832; cv=pass; d=google.com; s=arc-20160816; b=MLyxFsTrpH6lmV5VDVC1hTRkcZsBkJSZyZkkAopHqt9qoCLgHRQuLkav/U1dQ2g56Q EpAvF2pxczP6qfYpP3lJW9z1zYRgDr47zY3fhvEA+0lczESHXzjuKbh3yt7Y6w403cDH ZbNBlObQmeQtK2RIHrUjRvXyTQP3rmviPMZC5GFvxLNAqxy0xYBwLEKKxtnZN6O14rSB KldEYCOgyJMVbvC+kxTtxH4+RYlkc6VvWEy0BFSRiESEeztuWawwGlzjrBwcGsuiy3lN MycPM9h7tpQGTXhVaSf6uDbr0cU5OcvC36jynk4Htkj53u7dd5hB6EB/qTghwcTM72Bn +tMQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:dkim-signature; bh=oSRPVefaO5PX5LbFUSiK0gDK/h6HlRpeJ7sneHZwbw0=; b=eOqNFdTZK5A0c3Jspgy7NjEJM5N5wCONNwYDXiLMiG24V4Yu/nOe+pH//tnxY4rQZr 4kc7MG46qJsb8k2/2O4njcuk1Z4uESc8K7kSw47Ld5fzpj7t4+jNlhVqMbE2oJBcgi95 rvah9F6EyhFU1ABAyCeLmSmQxAFAupEuqGIi1V0zPeSenDGf93m213Q6ED3zV08fyLO2 goq0GFHJ5t7Dh2QwfE0rOGgB9wf2eiLn3yAfgwmk7om6MNhjJ41Zxj4KycD1/s+73z/x QEas+ZZC4uGDw63zrZyeVXPB00OvrWWVghbOYFNuKrSg+O/66zrzfHaRbw6eZgLwtR1Y gegA== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=oSRPVefaO5PX5LbFUSiK0gDK/h6HlRpeJ7sneHZwbw0=; b=rqx7rcJmUdyMF78893XuaxbLTclQigGX2Lvr0j5zYZue3DLH5HjfmKLveqHIgyeXC7 eIdsMDuGpqlk05EeIntV5NkSjpFnOb2M55Xswv/zeMKsu1mPE/gZjHOzdoO8U+5E0OzW 1ZDCCHetUdcEYl1WQ/zK8zUFZIQwqYe4BcryGxuIJAB7ndMDKn66rXYgW+lxwZNlZq2H 6v+CdloLlRVPATvCcYA5EhU0r/DUu7QScvSL9/yC++371q5LUE3ieVrp6/kNRrULWuJC +ZXP5cvY9iZhtpD16pdEtZ2F+SM9TgqtLdfYCo8F1Wfwabtn/CdENb19qDCy5hcnJwiy /gSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=oSRPVefaO5PX5LbFUSiK0gDK/h6HlRpeJ7sneHZwbw0=; b=uhPIyJq9zW5Bh1GGkJDyZ056AZVE1LU7NMrwJf4ka/L2540yC40nc/17p2xJlA9Qom sN00+rHlqjUuEfsS+aGtCZ+dTSjVUyK6v/a5sqmLG6VMWOLx839SIxrUOMHt6bu1n4Sh GfR5j+12lombbKP2JIZ7hQ3RyDgYdcWE1as4N0Dj9jkKxmUiZZ0/WnnU70cgGDBwQ72+ nQ4H3+nIgk+lGoEvOs1O6Iiop84MwSEd2vUq5cLOu/YrQmxAT+QRYk5M3BZYSue1qNKr /7ub6OTsV2WoRfP9jivwnZ5PwQfkk+nG5vlKoS41b1wX+Zq2NWeBc6OjOlzDx/Wf4NHw l5fA== Sender: isar-users@googlegroups.com X-Gm-Message-State: AOAM533aPqHk8o6qHzyw1HL0K1TcSDaOhOwj5Prk8nTRokb94o/0616r JiE0BW7a4A9gNDnl+6dfk6A= X-Google-Smtp-Source: ABdhPJwjsTwcUJ8CASa2Ojq+kZPWcLqR2t5W9ISYeB1yjTCujPYzI5O397qkCTrUqKiBHyksCf8HhA== X-Received: by 2002:a1c:457:: with SMTP id 84mr508100wme.38.1618326832761; Tue, 13 Apr 2021 08:13:52 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a7b:c1c3:: with SMTP id a3ls1556244wmj.0.gmail; Tue, 13 Apr 2021 08:13:52 -0700 (PDT) X-Received: by 2002:a1c:2b05:: with SMTP id r5mr455363wmr.107.1618326832034; Tue, 13 Apr 2021 08:13:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1618326832; cv=none; d=google.com; s=arc-20160816; b=q/+1gRFh/DGwXHtAtMNbYPvsHLKq+5E+bZlw60FApZZdcCgIg4f2h73F1mA41hMK1v k23UTXf1CLlZq3jZgVzYUMTBkhKjvbdUnPn4xKa7tcDbh4l5lAOE7Oce4hlZjpWR9hFg UUy7MO3TgQtgQv4wovEhooKQ0fLA+SRXk9v/3l4Ja2faSsB8QN0zqN+SRc0GIP/L6ewM qUBP//vmLLUD11wM8B1TNbweoL2DTwmqFjSycuFmVVznpYSf4WslSUhAzycQT8lOru0D 87Xd4Fam3Bn5YmGdKYrTUt5NqWOQpWya7WT0bPqXcmOjxHMYvYgDThPme5OEAcG6x2oc 9TcA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=lQIkFwl7aceqOZE2mngX5lQQYs6u5DYqoysJN93xzC8=; b=LJkTZWaRDN3FqfG4FbEHuCMkr84fx42Uj9m5BmLzCo8XyWJjnJe5RocecCtfrwTW1r 8CBShOSxTrzZPR0dwHvGQmAKazbCrSifTlZgUbfFdZMFm6eESHpEfJvhiDwnDr1E8Ckd cEIBtY4mXeZs2Bk5RrU18Tyfv4yOOCwHwc5RjBbOR3UiPs74pOYBqRT8JesnjJLJfuCW sva773az6Mb//LMNjxog7UjSvgsNV8yfxK5q3hBohYB+G0HvSGa3NLDoNHlX+bkieLDu 8JltoOVtbYQCwHaWYDO9iCe6WdlzRIS7+kzJ4R9w2tdIifdzPKKgl2Qv5Yd4q8CsLD7F 77nw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from lizzard.sbs.de (lizzard.sbs.de. [194.138.37.39]) by gmr-mx.google.com with ESMTPS id e17si71319wrx.1.2021.04.13.08.13.51 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Apr 2021 08:13:52 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) client-ip=194.138.37.39; Received: from mail2.sbs.de (mail2.sbs.de [192.129.41.66]) by lizzard.sbs.de (8.15.2/8.15.2) with ESMTPS id 13DFDpeq021685 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 13 Apr 2021 17:13:51 +0200 Received: from localhost.localdomain ([167.87.48.83]) by mail2.sbs.de (8.15.2/8.15.2) with ESMTP id 13DF2rM4021528; Tue, 13 Apr 2021 17:02:54 +0200 From: Henning Schild To: bitbake-devel@lists.openembedded.org Cc: isar-users@googlegroups.com, Richard Purdie , Cedric Hombourger , Chris Larson , Henning Schild Subject: [PATCH v2 3/3] tests/fetch: add tests for local and remote "noshared" git fetching Date: Tue, 13 Apr 2021 17:02:51 +0200 Message-Id: <20210413150251.1969-3-henning.schild@siemens.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210413150251.1969-1-henning.schild@siemens.com> References: <20210413150251.1969-1-henning.schild@siemens.com> MIME-Version: 1.0 X-Original-Sender: henning.schild@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 194.138.37.39 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: =?utf-8?q?1696938677112194923?= X-GMAIL-MSGID: =?utf-8?q?1696938677112194923?= Signed-off-by: Henning Schild --- lib/bb/tests/fetch.py | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/lib/bb/tests/fetch.py b/lib/bb/tests/fetch.py index 76797473db8a..74ba3fda65f5 100644 --- a/lib/bb/tests/fetch.py +++ b/lib/bb/tests/fetch.py @@ -706,6 +706,18 @@ class FetcherLocalTest(FetcherTest): def test_local_gitfetch_usehead_withname(self): self.dummyGitTest("usehead=1;name=newName") + def test_local_gitfetch_shared(self): + self.dummyGitTest("usehead=1;name=sharedName") + alt = os.path.join(self.unpackdir, 'git/.git/objects/info/alternates') + self.assertTrue(os.path.exists(alt)) + + def test_local_gitfetch_noshared(self): + self.d.setVar('BB_GIT_NOSHARED', '1') + self.unpackdir += '_noshared' + self.dummyGitTest("usehead=1;name=unsharedName") + alt = os.path.join(self.unpackdir, 'git/.git/objects/info/alternates') + self.assertFalse(os.path.exists(alt)) + class FetcherNoNetworkTest(FetcherTest): def setUp(self): super().setUp() @@ -2615,3 +2627,29 @@ class NPMTest(FetcherTest): fetcher = bb.fetch.Fetch(['npmsw://' + swfile], self.d) fetcher.download() self.assertTrue(os.path.exists(ud.localpath)) + +class GitSharedTest(FetcherTest): + def setUp(self): + super(GitSharedTest, self).setUp() + self.recipe_url = "git://git.openembedded.org/bitbake" + self.d.setVar('SRCREV', '82ea737a0b42a8b53e11c9cde141e9e9c0bd8c40') + + @skipIfNoNetwork() + def test_shared_unpack(self): + fetcher = bb.fetch.Fetch([self.recipe_url], self.d) + + fetcher.download() + fetcher.unpack(self.unpackdir) + alt = os.path.join(self.unpackdir, 'git/.git/objects/info/alternates') + self.assertTrue(os.path.exists(alt)) + + @skipIfNoNetwork() + def test_noshared_unpack(self): + self.d.setVar('BB_GIT_NOSHARED', '1') + self.unpackdir += '_noshared' + fetcher = bb.fetch.Fetch([self.recipe_url], self.d) + + fetcher.download() + fetcher.unpack(self.unpackdir) + alt = os.path.join(self.unpackdir, 'git/.git/objects/info/alternates') + self.assertFalse(os.path.exists(alt))