CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch.py: Initialize git repo before patching

Browse Source 
If PATCHTOOL="git" has been specified but workdir is not git repo
bitbake fails to apply the patches with error message:
Command Error: 'git rev-parse --show-toplevel' exited with 0  Output:
fatal: not a git repository (or any of the parent directories): .git

Fix this by initializing the repo before patching.
This allows binary git patches to be applied.

(From OE-Core rev: c3e8317b15b1b78511a6f9aedfed54b59ab6972f)

Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 6184b56a7a0fc6f5d19fdfb81e7453667f7da940)
Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Pavel Zhukov 2021-12-02 08:56:04 +01:00 committed by Richard Purdie
parent 34be1b3bad
commit 65d0414bdb
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
meta/lib/oe/patch.py
View File

@ -4,6 +4,7 @@
import oe.path
import oe.types
import subprocess
class NotFoundError(bb.BBHandledException):
def __init__(self, path):
@ -25,7 +26,6 @@ class CmdError(bb.BBHandledException):
def runcmd(args, dir = None):
import pipes
import subprocess
if dir:
olddir = os.path.abspath(os.curdir)
@ -56,6 +56,7 @@ def runcmd(args, dir = None):
if dir:
os.chdir(olddir)
class PatchError(Exception):
def __init__(self, msg):
self.msg = msg
@ -298,6 +299,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) = subprocess.getstatusoutput(cmd.split())
## Make sure repo is 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):

15
meta/lib/oeqa/selftest/cases/bbtests.py
View File

@ -300,3 +300,18 @@ 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):
""" PATCHTOOL=git should work with non-git sources like tarballs
test recipe for the test must NOT containt git:// repository in SRC_URI
"""
test_recipe = "man-db"
self.write_recipeinc(test_recipe, 'PATCHTOOL=\"git\"')
src = get_bb_var("SRC_URI",test_recipe)
gitscm = re.search("git://", src)
self.assertFalse(gitscm, "test_git_patchtool pre-condition failed: {} test recipe contains git repo!".format(test_recipe))
result = bitbake('man-db -c patch', ignore_status=False)
fatal = re.search("fatal: not a git repository (or any of the parent directories)", result.output)
self.assertFalse(fatal, "Failed to patch using PATCHTOOL=\"git\"")
self.delete_recipeinc(test_recipe)
bitbake('-cclean man-db')