From patchwork Mon Mar 9 21:21:23 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Siebold X-Patchwork-Id: 82941 X-Patchwork-Delegate: yoann.congal@smile.fr 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 DA197FCA18F for ; Mon, 9 Mar 2026 21:21:48 +0000 (UTC) Received: from mail-qt1-f175.google.com (mail-qt1-f175.google.com [209.85.160.175]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.25832.1773091303764532502 for ; Mon, 09 Mar 2026 14:21:43 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=FkT4VuNJ; spf=pass (domain: gmail.com, ip: 209.85.160.175, mailfrom: michael.siebold@gmail.com) Received: by mail-qt1-f175.google.com with SMTP id d75a77b69052e-5091d71aa11so13255461cf.1 for ; Mon, 09 Mar 2026 14:21:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773091303; x=1773696103; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=5PQA59VihzRC6NNs7DM1JbRhJyLHlUaiMHrpfdMnchI=; b=FkT4VuNJdXllUsmTZYmMRIgOKr7RYbZerxxmBhZHmYieE0LuggCXYv1h0EJuBxfI/+ rs3qLeMJs/GKLJoV+TwvkYNcWA2ghrHA3JOBu9SuZHBZ7jM+4KipcBC+8jQT4k/uR8FX XIT4pf6/19jorFSDAN6VjqhDZP3kPQctxIiwCX1uiHELZ3byLtEhUDac1bRjTsb/g/GN 3fKANoME27SwgNXohUQ4kHxhPHnz5gYk/M24Brg2M5x3XrKcDdEc2Liafw6W6wBPxzar sU+jXbH7G+haLCv9K3+BSiwwM+FQuyIXUn+ZO2lUoh6qOtIdUQ3SatilyOvLjBPDQMDK z9Xw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773091303; x=1773696103; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=5PQA59VihzRC6NNs7DM1JbRhJyLHlUaiMHrpfdMnchI=; b=OL70G/500jMv6DIOe8tmG/FH/+XbvONj8VDSoebgnsi5LICBQISZdbDnhopri1v/HJ uMiNqenQMEPVsTQz4wLh6MSTgBZClyMdCHAkpMLUkHhGSpi0CmeoyNeS/ysmKjeWWhMv gGhpyNXbgbz0WhQ72cc8+KgC9jK5WgvXqZonLbiYEppVaDEk3bgWWBglZJRXycQimIQy Iv3327QWuKBTzDBSNBkTK7nkqO8KeTXnJ3ebSG7JDQZk4LlLmYzE3s5+0b5ceL93YG99 is33OWIhovVIy9zaBtPPa9PAnkagUKvdw2QSCeu8rzqahrs/Ic/DaN+1zbPShdldkodE WKCA== X-Gm-Message-State: AOJu0YykM8PI1Qww99QKFoAeSBIBtmP5+veMvuua7R9rplIfM4Wf1otj s22ZvbphrEyzZAbIHBzJ0WI5peX7lfPjLqB+nazIK9TZ3cctv59vPUe1 X-Gm-Gg: ATEYQzwZ+vApvCnBSzfMJPDegFRmf+3G0P6dXT9l2+7E91zV/nVW9VdGg/+0orJIf2Z 27AWfqJZ0doDLIf60klBKf78j464RTgAiPuDi/gjfkv+pDXOH97qhL40iW+cygSsAQ4Dq6WlOrF gaS4ct6mkDD4qhHP3oCoZbLqzwgWSlhIvrqjjqm4VIOCpfJ4sKmXNSTqdXUtrAD1nI6vC/C6Cg3 TlznHwkMY2rK5JtsiW0a6YXhMv3QCj88kh1NOsd85axLW3FhBQwopxUiwYDpAlx4Sz/mhoiihOq I/1U2z3qN9PTN1kOmSsZf148Rmj7obAC2FbnWSkl0ZwbUMrG0OWCq+siiw7z1ZfDOruu/4kPJh5 GDo7Fkywh/NYAgtN2ZZJv2w9Hn+Wk+5dB5NL7Rb2VnXGltBmakRL//Uc2COAa8PAP3eICHg8JLw XAxDQ7/DZZWq8OtMdCHNaNjh9mpSn3ij3FQHY7euREvYPl9k8EqLa5fwxLWg== X-Received: by 2002:a05:622a:198c:b0:508:fac4:76e8 with SMTP id d75a77b69052e-50925fcd216mr14900321cf.1.1773091302650; Mon, 09 Mar 2026 14:21:42 -0700 (PDT) Received: from beeblebrox.pc.cognex.com ([143.170.79.157]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50924937718sm8522881cf.29.2026.03.09.14.21.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 14:21:42 -0700 (PDT) From: Michael Siebold To: Yoann Congal Cc: bitbake-devel@lists.openembedded.org, Robert Yang , Richard Purdie , Michael Siebold Subject: [PATCH 1/3] bitbake: gitsm: Add clean function Date: Mon, 9 Mar 2026 14:21:23 -0700 Message-Id: <20260309212125.3172717-2-michael.siebold@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260309212125.3172717-1-michael.siebold@gmail.com> References: <20260309212125.3172717-1-michael.siebold@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 09 Mar 2026 21:21:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/19127 From: Robert Yang Fixed: $ bitbake utfcpp -cfetch && bitbake utfcpp -ccleanall The downloads/git2/github.com.nemtrif.ftest won't be cleaned without this fix. (Bitbake rev: 79f25fc5c1b8d0e08540f4aa07875309f5325f47) Upstream-Status: Backport [from commit 5bce38fbae] Signed-off-by: Robert Yang Signed-off-by: Richard Purdie (cherry picked from commit 5bce38fbaea0a7d1228740e2cb313957c914cfdf) Signed-off-by: Michael Siebold --- bitbake/lib/bb/fetch2/gitsm.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py index fab4b1164c..ba62517f08 100644 --- a/bitbake/lib/bb/fetch2/gitsm.py +++ b/bitbake/lib/bb/fetch2/gitsm.py @@ -249,6 +249,19 @@ class GitSM(Git): # should also be skipped as these files were already smudged in the fetch stage if lfs # was enabled. runfetchcmd("GIT_LFS_SKIP_SMUDGE=1 %s submodule update --recursive --no-fetch" % (ud.basecmd), d, quiet=True, workdir=ud.destdir) + def clean(self, ud, d): + def clean_submodule(ud, url, module, modpath, workdir, d): + url += ";bareclone=1;nobranch=1" + try: + newfetch = Fetch([url], d, cache=False) + newfetch.clean() + except Exception as e: + logger.warning('gitsm: submodule clean failed: %s %s' % (type(e).__name__, str(e))) + + self.call_process_submodules(ud, d, True, clean_submodule) + + # Clean top git dir + Git.clean(self, ud, d) def implicit_urldata(self, ud, d): import shutil, subprocess, tempfile From patchwork Mon Mar 9 21:21:24 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Siebold X-Patchwork-Id: 82942 X-Patchwork-Delegate: yoann.congal@smile.fr 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 291A5FCA193 for ; Mon, 9 Mar 2026 21:21:49 +0000 (UTC) Received: from mail-qt1-f176.google.com (mail-qt1-f176.google.com [209.85.160.176]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.25835.1773091307667384467 for ; Mon, 09 Mar 2026 14:21:47 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=JAxbSF/c; spf=pass (domain: gmail.com, ip: 209.85.160.176, mailfrom: michael.siebold@gmail.com) Received: by mail-qt1-f176.google.com with SMTP id d75a77b69052e-509149ab7d7so16477661cf.2 for ; Mon, 09 Mar 2026 14:21:47 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773091307; x=1773696107; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MnMKH8d+DJSlBuQf1IO3qJstcQR5rKGsLq8lyNdbwN8=; b=JAxbSF/cbbeDpl+rp9+AqRQFi4yo61JzgnCfZuf48ES0rcD4I1C+wRroUZlG44ZzKl CUjVHouYbVanZ3oPO22s1qc5XV9SirCfxKTpJb8WMiwb+FsZ/NgQlBK3a0hgIy4DJRYG SsXSWFjpbkfDrxhpWfE/f12J9A0xFFPtVUL5L1bpZhNNivOPht3NhdsE8QvFhDvuzvlH /qZLhJbXzeGdSA36q/eE1/G6TxAHFFbodxvwG/rkYf+ks6IQWFqfAAMUbDv3rDoDai/n LeiGYdJ0wskC6ZagkX1hBPLRWMKMCVGqQjHJjXPorGS63/6H1bEf04I6C0dv0LRVrLq7 js1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773091307; x=1773696107; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=MnMKH8d+DJSlBuQf1IO3qJstcQR5rKGsLq8lyNdbwN8=; b=RG57y3nvMd5kP+U4c6bvInhRYnL6k5fYNZpG9t86JWSbHVGyHsyXcex0xINF+a2lAg mVhTnN7p6VTBLx6qkmh6kqSvASFeQmPd6045xGSwpzpAgPlBULdfznnnKsuZERrfRmu0 PxK6cUS+f6nVAkWAhPjTrQuGQl4Ahlc7+c7pjZHAcV9idMlGlPAP22N0s4vgUxpimDle zUbVDr0ILlogrYIhIUcgyoH+sdEOXSSiG461HzNLdtAPUDDrPE8nSdCo9N6oGJnpsyHR AbQf34dVtiyKaKtXXZz9yLpRWxfn5KcsucwwKe4fiaSoEVyFRyrRjszIoMHXA7wOlYmH ltXQ== X-Gm-Message-State: AOJu0YzODngq6JGMquy3YNAkHtR2513sb3iLYDCz2XkVb4f5tQxHcKhN Qhujjy8xxJEIiguDTVDxfk+SBS8utQMixGgc3in7lteRVDQoIbrM2m2s X-Gm-Gg: ATEYQzzhaLdGGsHVkm6vupB3S7nDoRR5fOo7rDVIzEjHtwnpmVg6SbZPl7KiLOdd5CZ /SeH6v+B0ZmgE6m5GRjyeGyrNOKY9JnNdRyDmvB01CS55ay5qBcs0AKlWJSHWKdKnzSB6H7CQAb TsWR7phkxLmdEz5wiYkzybU6fTVG4L/BI4FZIvXlZMqsBjza+NdxksDOF6CKq/WlrcA9XG+txT5 SsXXJoyB7760wVaOuOh8YZeGxB+f6zE6391MmyeWlCiiKK5Elp+765hgZ+FS+18PD5yZ0nStTuZ gn4Wa0hLgOqNBqTC8lftSf+yx7v0vCnzTP7qXwRhHvd28aMsm4+yWlHcjIqzZYK1oJz88XvgPil bZI2qgWSAPN+t11+pGb9EWKe2RIR9AOmV9oRB+syo3IzjnLUjBQMM2Z87/TtzNq/wE2D2cdWPAZ 2fe1eTmh98AB9dASptDObrzLnoxQ62q247jjdQCUFwdxxF1CI= X-Received: by 2002:ac8:5f4c:0:b0:509:20de:4ad1 with SMTP id d75a77b69052e-50920de58c2mr38984331cf.10.1773091306596; Mon, 09 Mar 2026 14:21:46 -0700 (PDT) Received: from beeblebrox.pc.cognex.com ([143.170.79.157]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50924937718sm8522881cf.29.2026.03.09.14.21.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 14:21:45 -0700 (PDT) From: Michael Siebold To: Yoann Congal Cc: bitbake-devel@lists.openembedded.org, Philip Lorenz , Richard Purdie , Michael Siebold Subject: [PATCH 2/3] bitbake: fetch2: Fix incorrect lfs parametrization for submodules Date: Mon, 9 Mar 2026 14:21:24 -0700 Message-Id: <20260309212125.3172717-3-michael.siebold@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260309212125.3172717-1-michael.siebold@gmail.com> References: <20260309212125.3172717-1-michael.siebold@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 09 Mar 2026 21:21:49 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/19129 From: Philip Lorenz The existing code would pass `True` or `False` to the git fetcher. As the fetcher expects `lfs` to be set to `1` this always lead to LFS fetching being disabled. (Bitbake rev: 5e487a5a096400271ed1e29b0df72903f2304e49) Upstream-Status: Backport [from commit eb6d89e9e6] Signed-off-by: Philip Lorenz Signed-off-by: Richard Purdie (cherry picked from commit eb6d89e9e6f27b683da6f2ba2227707a965a0094) Signed-off-by: Michael Siebold --- bitbake/lib/bb/fetch2/gitsm.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py index ba62517f08..5c98991480 100644 --- a/bitbake/lib/bb/fetch2/gitsm.py +++ b/bitbake/lib/bb/fetch2/gitsm.py @@ -123,7 +123,7 @@ class GitSM(Git): url += ";name=%s" % module url += ";subpath=%s" % module url += ";nobranch=1" - url += ";lfs=%s" % self._need_lfs(ud) + url += ";lfs=%s" % ("1" if self._need_lfs(ud) else "0") # Note that adding "user=" here to give credentials to the # submodule is not supported. Since using SRC_URI to give git:// # URL a password is not supported, one have to use one of the From patchwork Mon Mar 9 21:21:25 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Siebold X-Patchwork-Id: 82943 X-Patchwork-Delegate: yoann.congal@smile.fr 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 106B4FCA191 for ; Mon, 9 Mar 2026 21:21:59 +0000 (UTC) Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.25784.1773091311081217488 for ; Mon, 09 Mar 2026 14:21:51 -0700 Authentication-Results: mx.groups.io; dkim=pass header.i=@gmail.com header.s=20230601 header.b=atD04Z6+; spf=pass (domain: gmail.com, ip: 209.85.160.177, mailfrom: michael.siebold@gmail.com) Received: by mail-qt1-f177.google.com with SMTP id d75a77b69052e-50919fc3a14so18002251cf.2 for ; Mon, 09 Mar 2026 14:21:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773091310; x=1773696110; darn=lists.openembedded.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=Wv9Mh7vxSWPXnxM2Wgjm7Jr1OYMYU6bLY2rw53KpFOA=; b=atD04Z6+BHcjO5J8S3WaZHwTz2yRhLZ0XvO/heLtLDt25HWIpGXGmkVkcl1FakdEca BrCX6Z0sRyUPGJL2/Q9K2p09rMXSzG8pinRiJc5oF98e8bdQ4srt2ki7joGP8Ahkp23G nwppqR0rbJe7YwuUxq3g3wm1aOP4IfkbhGKm3M3ngUF5as6NqvpO1nbPpr0zMj0+UiLS lUfabKJjbOpM0c1v8gczMkeCZ1ZEYFc6cYjYQgbSr7uglsfHQqHbvxlPRI0/hzvqXRSJ PxUALCKPNYEZs9/zTk2aTQIWwqkInypk9O5TqSMv0X/5IY94rVbFIr2hIK//cyOZsr/T aqmQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1773091310; x=1773696110; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=Wv9Mh7vxSWPXnxM2Wgjm7Jr1OYMYU6bLY2rw53KpFOA=; b=LNkBKoM2/vPb0oQZ1fLskdjVIIcK6p7RL86FLqJWFlLW0b/kPsjpSmLXHRziPz4psW uWgeQI39TG/OwZkDZJB4gH37Ya4oZTJH5H8P7v3Q00kzAJZqh5vVUfMeY5XBLmPADArW 75XOTUDjj8oPxlpvHdT21bTFSvffoAhfv4z+dG9L9DtrFf2VpKoSeNElanE7k9H/tb4t /h/8iQk1zQr3k3mfyBmv6I7ZCs4IJGKQH/IKJOypn/2T/vPBYl1ViOG000W67V8KsiH2 0XZY5VHFQbzVkNe41LT2H9WECnFHp9C8iYpBp2KsNB8v1w4W17hZM92sRzxCCBKDC8pw Hlfw== X-Gm-Message-State: AOJu0Yw4LdbgaJsfT281klqEKeSA3l796ve7AZIpkso0cCezSuxU4Frn hmYJIWkXOOLdgT2cDPtA+CoM8WukG+cONUXgAtASEi3TL1XlYlva5F8skjMHGCC3 X-Gm-Gg: ATEYQzyc/Dpf81Smm39LySOnGYFxsLqNHUSShMGSPDHxm2hDuR+aroFfy5fbLqBlCKl FIv0AjnLZdKtxrtLXvNWqYVsqANCXXgWfTaxm3mFak5Op0eGNgU0D5A8JyNkCQVWX7Idc78akNU k1toV78Xe5TCX0MFaqVN0xG4n6RsEtOT+wR0kwtu+L0gA0YftmQ1VHw1GReO0jn5XziaTpI9tgO MS0MCbNaF2P4HFeZd4iPqOquuAzzVWtiwpqWaMhuoz7LFviks0GYO6fer4HMOMIFTwtZHlbx+3T RfpMo1Lwicn73eB520Vx3u477w6aPt4apXgQfcMVzRSTS+TxcKkuSaWUDkOwROmnfRyjND4jfO/ dz3HqOIW5DiR4PFd0AuRZvFaHr3as/YVkhGWeqm8k6Ay7y7uE7y9733YvGM57ttctxyyPIbpVES d1PhrxbnU7o+Dl66Hy3rG7HZ7EPC4FoTZxWQ+Fvv75X2NN274= X-Received: by 2002:a05:622a:14c6:b0:509:1d55:6367 with SMTP id d75a77b69052e-5091d556a77mr47729701cf.36.1773091310111; Mon, 09 Mar 2026 14:21:50 -0700 (PDT) Received: from beeblebrox.pc.cognex.com ([143.170.79.157]) by smtp.gmail.com with ESMTPSA id d75a77b69052e-50924937718sm8522881cf.29.2026.03.09.14.21.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 09 Mar 2026 14:21:49 -0700 (PDT) From: Michael Siebold To: Yoann Congal Cc: bitbake-devel@lists.openembedded.org, Philip Lorenz , Richard Purdie , Michael Siebold Subject: [PATCH 3/3] bitbake: fetch2: Fix LFS object checkout in submodules Date: Mon, 9 Mar 2026 14:21:25 -0700 Message-Id: <20260309212125.3172717-4-michael.siebold@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260309212125.3172717-1-michael.siebold@gmail.com> References: <20260309212125.3172717-1-michael.siebold@gmail.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from 45-33-107-173.ip.linodeusercontent.com [45.33.107.173] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 09 Mar 2026 21:21:59 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/bitbake-devel/message/19130 From: Philip Lorenz Skipping smudging prevents the LFS objects from replacing their placeholder files when `git submodule update` actually checks out the target revision in the submodule. Smudging cannot happen earlier as the clone stored in `.git/modules` is bare. This should be fine as long as all LFS objects are available in the download cache (which they are after the other fixes are applied). (Bitbake rev: d270e33a07c50bb9c08861cf9a6dc51e1fd2d874) Upstream-Status: Backport [from commit 3eeac69385] Signed-off-by: Philip Lorenz Signed-off-by: Richard Purdie (cherry picked from commit 3eeac69385e8f29a08d022a17b28b5d504deed66) Signed-off-by: Michael Siebold --- bitbake/lib/bb/fetch2/gitsm.py | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/bitbake/lib/bb/fetch2/gitsm.py b/bitbake/lib/bb/fetch2/gitsm.py index 5c98991480..ef19053330 100644 --- a/bitbake/lib/bb/fetch2/gitsm.py +++ b/bitbake/lib/bb/fetch2/gitsm.py @@ -243,12 +243,11 @@ class GitSM(Git): ret = self.process_submodules(ud, ud.destdir, unpack_submodules, d) if not ud.bareclone and ret: - # All submodules should already be downloaded and configured in the tree. This simply - # sets up the configuration and checks out the files. The main project config should - # remain unmodified, and no download from the internet should occur. As such, lfs smudge - # should also be skipped as these files were already smudged in the fetch stage if lfs - # was enabled. - runfetchcmd("GIT_LFS_SKIP_SMUDGE=1 %s submodule update --recursive --no-fetch" % (ud.basecmd), d, quiet=True, workdir=ud.destdir) + cmdprefix = "" + # Avoid LFS smudging (replacing the LFS pointers with the actual content) when LFS shouldn't be used but git-lfs is installed. + if not self._need_lfs(ud): + cmdprefix = "GIT_LFS_SKIP_SMUDGE=1 " + runfetchcmd("%s%s submodule update --recursive --no-fetch" % (cmdprefix, ud.basecmd), d, quiet=True, workdir=ud.destdir) def clean(self, ud, d): def clean_submodule(ud, url, module, modpath, workdir, d): url += ";bareclone=1;nobranch=1"