From: Pavel Zhukov <pavel.zhu...@huawei.com>
If PATCHTOOL="git" has been specified but workdir is not git repo
bitbake fails to apply the patches. Fix this by initializing the repo
before patching.
This allows binary git patches to be applied.
Signed-off-by: Pavel Zhukov <pavel.zhu...@huawei.com>
---
meta/lib/oe/patch.py | 17 +++++++++++++++++
meta/lib/oeqa/selftest/cases/bbtests.py | 6 ++++++
2 files changed, 23 insertions(+)
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py
index fccbedb519..8326cb55bc 100644
--- a/meta/lib/oe/patch.py
+++ b/meta/lib/oe/patch.py
@@ -56,6 +56,10 @@ def runcmd(args, dir = None):
if dir:
os.chdir(olddir)
+def getstatusoutput(cmd):
+ import subprocess
+ return subprocess.getstatusoutput(cmd.split())
+
class PatchError(Exception):
def __init__(self, msg):
self.msg = msg
@@ -298,6 +302,19 @@ 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():
+ self._initRepo()
+
+ def _isInitialized(self):
+ cmd = "git rev-parse --show-toplevel"
+ (status, output) = getstatusoutput(cmd)
+ ## Make sure we're in builddir to not break top-level git repos
+ return status == 0 and os.path.samedir(output, self.dir)
+
+ def _initRepo(self):
+ runcmd("git init".split(), self.dir)
+ runcmd("git add .".split(), self.dir)
+ runcmd("git commit -a --allow-empty -m Patching_started".split(),
self.dir)
@staticmethod
def extractPatchHeader(patchfile):
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py
b/meta/lib/oeqa/selftest/cases/bbtests.py
index 6779e62103..2c3defc6b7 100644
--- a/meta/lib/oeqa/selftest/cases/bbtests.py
+++ b/meta/lib/oeqa/selftest/cases/bbtests.py
@@ -297,3 +297,9 @@ INHERIT:remove = \"report-error\"
test_recipe_summary_after = get_bb_var('SUMMARY', test_recipe)
self.assertEqual(expected_recipe_summary, test_recipe_summary_after)
+
+ def test_git_patchtool(self):
+ self.write_recipeinc('man-db', 'PATCHTOOL=\"git\"')
+ result = bitbake('man-db -c patch', ignore_status=False)
+ self.delete_recipeinc('man-db')
+ bitbake('-cclean man-db')
--
2.34.0
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#159037):
https://lists.openembedded.org/g/openembedded-core/message/159037
Mute This Topic: https://lists.openembedded.org/mt/87431239/21656
Group Owner: openembedded-core+ow...@lists.openembedded.org
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
