[AUH][PATCH v2 3/9] upgrade-helper.py: allow to set the git directory from layer-dir

<[email protected]>
Newsgroups org.yoctoproject.lists.yocto-patches
Message-ID <[email protected]>
From: Daniel Turull <[email protected]>

Replace the assumption that the poky directory is the first PATH entry
and reuse --layer-dir to setup directory for git repo.

This is useful when not using poky and each meta-layer is its own git.
Without this fix, commit_changes fails in non-poky layouts:

  git add .../openembedded-core/meta/recipes-support/gnupg
  fatal: '.../openembedded-core/meta/recipes-support/gnupg'
  is outside repository at '.../yocto-scarthgap'

Assisted-by: Claude, Anthropic
Signed-off-by: Daniel Turull <[email protected]>
---
 upgrade-helper.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/upgrade-helper.py b/upgrade-helper.py
index 98391f3..df927d1 100755
--- a/upgrade-helper.py
+++ b/upgrade-helper.py
@@ -184,6 +184,9 @@ class Updater(object):
                     _layer_settings_error(s)
 
             self.git = Git(self.opts['layer_dir'])
+        elif settings.get('layer_dir'):
+            # allow to set the git repo directory without enabling layer_mode
+            self.git = Git(settings.get('layer_dir'))
         else:
             # use scripts_path to get oe-core directory
             self.git = Git(os.path.dirname(scripts_path))
-- 
2.34.1
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.