From patchwork Wed Feb 4 14:37:31 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clement Faure X-Patchwork-Id: 80425 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 03B3DE9D3EB for ; Wed, 4 Feb 2026 14:37:48 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc01-g2.21752.1770215860761557033 for ; Wed, 04 Feb 2026 06:37:40 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: clement.faure@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id F024D150C; Wed, 4 Feb 2026 06:37:33 -0800 (PST) Received: from MGC575JXM4.emea.arm.com (MGC575JXM4.nice.Arm.com [10.34.111.18]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 8851D3F632; Wed, 4 Feb 2026 06:37:39 -0800 (PST) From: Clement Faure To: openembedded-core@lists.openembedded.org Cc: saul.wold@windriver.com, Clement Faure Subject: [PATCH 1/2] devtool: avoid recursion into nested git repos with submodules Date: Wed, 4 Feb 2026 15:37:31 +0100 Message-ID: <20260204143732.94832-2-clement.faure@arm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260204143732.94832-1-clement.faure@arm.com> References: <20260204143732.94832-1-clement.faure@arm.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 ; Wed, 04 Feb 2026 14:37:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/230537 Prevent devtool from recursing into nested git repositories with submodules to avoid double git submodule add operation. Signed-off-by: Clement Faure --- scripts/lib/devtool/__init__.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/lib/devtool/__init__.py b/scripts/lib/devtool/__init__.py index 969d6dc13a..dd7501440e 100644 --- a/scripts/lib/devtool/__init__.py +++ b/scripts/lib/devtool/__init__.py @@ -248,6 +248,10 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base', d=None): remote_url = stdout.splitlines()[0] logger.error(os.path.relpath(os.path.join(root, ".."), root)) bb.process.run('git submodule add %s %s' % (remote_url, os.path.relpath(root, os.path.join(root, ".."))), cwd=os.path.join(root, "..")) + # Do not descend into nested git repos that have submodules themselves. + if ".gitmodules" in dirs + files: + logger.warning('Nested git repository with submodules %s; devtool will not recurse into it', root) + dirs[:] = [] found = True if found: oe.patch.GitApplyTree.commitIgnored("Add additional submodule from SRC_URI", dir=os.path.join(root, ".."), d=d) From patchwork Wed Feb 4 14:37:32 2026 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Clement Faure X-Patchwork-Id: 80426 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 0A242E9D3ED for ; Wed, 4 Feb 2026 14:37:48 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.msgproc02-g2.21782.1770215862025167528 for ; Wed, 04 Feb 2026 06:37:42 -0800 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: clement.faure@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 32011339; Wed, 4 Feb 2026 06:37:35 -0800 (PST) Received: from MGC575JXM4.emea.arm.com (MGC575JXM4.nice.Arm.com [10.34.111.18]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id BAFBC3F632; Wed, 4 Feb 2026 06:37:40 -0800 (PST) From: Clement Faure To: openembedded-core@lists.openembedded.org Cc: saul.wold@windriver.com, Clement Faure Subject: [PATCH 2/2] oeqa/selftest/devtool: add devtool modify testcase for nested gitsm Date: Wed, 4 Feb 2026 15:37:32 +0100 Message-ID: <20260204143732.94832-3-clement.faure@arm.com> X-Mailer: git-send-email 2.50.1 In-Reply-To: <20260204143732.94832-1-clement.faure@arm.com> References: <20260204143732.94832-1-clement.faure@arm.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 ; Wed, 04 Feb 2026 14:37:48 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/230538 Add a selftest that exercises devtool modify against git repositories that contain nested git repositories with submodules. Signed-off-by: Clement Faure --- .../devtool/devtool-test-git-gitsm_git.bb | 10 ++++++++ meta/lib/oeqa/selftest/cases/devtool.py | 25 +++++++++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 meta-selftest/recipes-test/devtool/devtool-test-git-gitsm_git.bb diff --git a/meta-selftest/recipes-test/devtool/devtool-test-git-gitsm_git.bb b/meta-selftest/recipes-test/devtool/devtool-test-git-gitsm_git.bb new file mode 100644 index 0000000000..ad50c7f13c --- /dev/null +++ b/meta-selftest/recipes-test/devtool/devtool-test-git-gitsm_git.bb @@ -0,0 +1,10 @@ +SUMMARY = "Test recipe for fetching git submodules as second repo" +HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/git-submodule-test/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "git://git.yoctoproject.org/git-submodule-test;branch=master;name=repo-git \ + gitsm://git.yoctoproject.org/git-submodule-test;branch=master;name=repo-gitsm;destsuffix=${BB_GIT_DEFAULT_DESTSUFFIX}/nested/repo-gitsm" +SRCREV_repo-git = "a2885dd7d25380d23627e7544b7bbb55014b16ee" +SRCREV_repo-gitsm = "a2885dd7d25380d23627e7544b7bbb55014b16ee" +SRCREV_FORMAT = "repo-git_repo-gitsm" diff --git a/meta/lib/oeqa/selftest/cases/devtool.py b/meta/lib/oeqa/selftest/cases/devtool.py index cf5ac6e9d7..cdfcf4f813 100644 --- a/meta/lib/oeqa/selftest/cases/devtool.py +++ b/meta/lib/oeqa/selftest/cases/devtool.py @@ -1153,6 +1153,31 @@ class DevtoolModifyTests(DevtoolBase): result = bitbake(testrecipe) self.assertEqual(result.status, 0, "Bitbake failed, exit code %s, output %s" % (result.status, result.output)) + def test_devtool_modify_nested_gitsm(self): + """Checks that a recipe with multiple sources including a git repo with a nested git repo with + submodules can be used with devtool modify + """ + testrecipe = 'devtool-test-git-gitsm' + src_uri = get_bb_var('SRC_URI', testrecipe) + self.assertIn('git://', src_uri, 'This test expects the %s recipe to fetch a git source' % testrecipe) + self.assertIn('gitsm://', src_uri, 'This test expects the %s recipe to fetch a gitsm source' % testrecipe) + # Try modifying a recipe + tempdir = tempfile.mkdtemp(prefix='devtoolqa') + self.track_for_cleanup(tempdir) + self.track_for_cleanup(self.workspacedir) + self.add_command_to_tearDown('bitbake-layers remove-layer */workspace') + result = runCmd('devtool modify %s -x %s' % (testrecipe, tempdir)) + self.assertEqual(result.status, 0, "Could not modify recipe %s. Output: %s" % (testrecipe, result.output)) + # Test devtool status + result = runCmd('devtool status') + self.assertIn(testrecipe, result.output) + self.assertIn(tempdir, result.output) + # Submodules in repo-gitsm should be extracted + source_repo_gitsm_gitmodules = os.path.join(tempdir, 'nested/repo-gitsm') + self.assertExists(source_repo_gitsm_gitmodules, 'Nested repo repo-gitsm not found') + self.assertExists(os.path.join(source_repo_gitsm_gitmodules, 'bitbake'), 'Submodule not found') + self.assertExists(os.path.join(source_repo_gitsm_gitmodules, 'bitbake-gitsm-test1'), 'Submodule not found') + class DevtoolUpdateTests(DevtoolBase): def test_devtool_update_recipe(self):