PATCHFILE was used by an older Git hook to preserve the original patch filename. Current GitApplyTree records that filename in refs/notes/devtool and extractPatches() reads the note when recreating patches.
No current OE-Core, BitBake or installed hook consumer remains, so remove the unused environment assignment. This to simplify the runcmd argv-list changes. Reviewed-by: Daniel Turull <[email protected]> Signed-off-by: Anders Heimer <[email protected]> --- meta/lib/oe/patch.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 1ff57a9f8a..9240637189 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py @@ -584,7 +584,7 @@ class GitApplyTree(PatchTree): check_dirtyness = True return check_dirtyness - def _commitpatch(self, patch, patchfilevar): + def _commitpatch(self, patch): output = "" # Add all files cmd = ["git", "add", "-f", "-A", "."] @@ -595,7 +595,6 @@ class GitApplyTree(PatchTree): # Commit the result (tmpfile, shellcmd) = self.prepareCommit(patch['file'], self.commituser, self.commitemail) try: - shellcmd.insert(0, patchfilevar) output += runcmd(["sh", "-c", " ".join(shellcmd)], self.dir) finally: os.remove(tmpfile) @@ -621,7 +620,6 @@ class GitApplyTree(PatchTree): patch_applied = True try: - patchfilevar = 'PATCHFILE="%s"' % os.path.basename(patch['file']) if self._need_dirty_check(): # Check dirtyness of the tree try: @@ -633,10 +631,10 @@ class GitApplyTree(PatchTree): # The tree is dirty, no need to try to apply patches with git anymore # since they fail, fallback directly to patch output = PatchTree._applypatch(self, patch, force, reverse, run) - output += self._commitpatch(patch, patchfilevar) + output += self._commitpatch(patch) return output try: - shellcmd = [patchfilevar, "git", "--work-tree=%s" % reporoot] + shellcmd = ["git", "--work-tree=%s" % reporoot] self.gitCommandUserOptions(shellcmd, self.commituser, self.commitemail) shellcmd += ["am", "--committer-date-is-author-date", "-3", "--keep-cr", "--no-scissors", "-p%s" % patch['strippath']] @@ -662,7 +660,7 @@ class GitApplyTree(PatchTree): except CmdError: # Fall back to patch output = PatchTree._applypatch(self, patch, force, reverse, run) - output += self._commitpatch(patch, patchfilevar) + output += self._commitpatch(patch) return output except: patch_applied = False
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#239398): https://lists.openembedded.org/g/openembedded-core/message/239398 Mute This Topic: https://lists.openembedded.org/mt/119940616/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
