diff options
| author |   Paul Eggleton <paul.eggleton@microsoft.com> | 2022-07-11 02:26:15 +0000 |
|---|---|---|
| committer |   Paul Eggleton <paul.eggleton@linux.microsoft.com> | 2022-07-12 18:32:34 -0700 |
| commit | da55e9f53def9d5aa84986119aac3ce7a3160fe6 (patch) | |
| tree | bfb70dfb90bfad0332f5b696ddd5cfe14b6af155 | |
| parent | db22dbc1f66d2f76dab719597986cfd96cf18d71 (diff) | |
| download | openembedded-core-contrib-da55e9f53def9d5aa84986119aac3ce7a3160fe6.tar.gz | |
patch: handle if S points to a subdirectory of a git repo
If PATCHTOOL = "git", SRC_URI fetches from a git repo and S points to
a subdirectory of the checked out sources, then we were erroneously
initialising the subdirectory as its own git repo. Check if the returned
top-level repo directory is a subdirectory of WORKDIR and do not
run initialise the source directory if that is the case.
(This was a regression introduced with OE-Core revision
6184b56a7a0fc6f5d19fdfb81e7453667f7da940, however we didn't have a test
that verified the behaviour.)
Signed-off-by: Paul Eggleton <paul.eggleton@microsoft.com>
| -rw-r--r-- | meta/lib/oe/patch.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 95b915a6ab..4ec9caed45 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -299,10 +299,10 @@ class GitApplyTree(PatchTree): PatchTree.__init__(self, dir, d) self.commituser = d.getVar('PATCH_GIT_USER_NAME') self.commitemail = d.getVar('PATCH_GIT_USER_EMAIL') - if not self._isInitialized(): + if not self._isInitialized(d): self._initRepo() - def _isInitialized(self): + def _isInitialized(self, d): cmd = "git rev-parse --show-toplevel" try: output = runcmd(cmd.split(), self.dir).strip() @@ -310,8 +310,8 @@ class GitApplyTree(PatchTree): ## runcmd returned non-zero which most likely means 128 ## Not a git directory return False - ## Make sure repo is in builddir to not break top-level git repos - return os.path.samefile(output, self.dir) + ## Make sure repo is in builddir to not break top-level git repos, or under workdir + return os.path.samefile(output, self.dir) or oe.path.is_path_parent(d.getVar('WORKDIR'), output) def _initRepo(self): runcmd("git init".split(), self.dir) |