mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

patch.py: Prevent git repo reinitialization

Browse Source 
There were few bugs in the _isInitialized() function which might trigger
git repo to be reinitialized and patches failing to apply.

(From OE-Core rev: 427f4ef11beb8ceee007b5c7e152f2383a114aca)

Signed-off-by: Pavel Zhukov <pavel.zhukov@huawei.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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
2022-03-07 11:19:29 +01:00
committed by Richard Purdie
parent 2c9e93bc40
commit 630d754ea3
4 changed files with 49 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/lib/oe/patch.py
+8 -3
View File
@@ -304,14 +304,19 @@ class GitApplyTree(PatchTree):
def _isInitialized(self):
cmd = "git rev-parse --show-toplevel"
(status, output) = subprocess.getstatusoutput(cmd.split())
try:
output = runcmd(cmd.split(), self.dir).strip()
except CmdError as err:
## 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 status == 0 and os.path.samedir(output, self.dir)
return os.path.samefile(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)
runcmd("git commit -a --allow-empty -m bitbake_patching_started".split(), self.dir)
@staticmethod
def extractPatchHeader(patchfile):
meta/lib/oeqa/selftest/cases/bbtests.py
+16 -2
View File
@@ -310,8 +310,22 @@ INHERIT:remove = \"report-error\"
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)
result = bitbake('{} -c patch'.format(test_recipe), 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')
bitbake('-cclean {}'.format(test_recipe))
def test_git_patchtool2(self):
""" Test if PATCHTOOL=git works with git repo and doesn't reinitialize it
"""
test_recipe = "gitrepotest"
src = get_bb_var("SRC_URI",test_recipe)
gitscm = re.search("git://", src)
self.assertTrue(gitscm, "test_git_patchtool pre-condition failed: {} test recipe doesn't contains git repo!".format(test_recipe))
result = bitbake('{} -c patch'.format(test_recipe), ignore_status=False)
srcdir = get_bb_var('S', test_recipe)
result = runCmd("git log", cwd = srcdir)
self.assertFalse("bitbake_patching_started" in result.output, msg = "Repository has been reinitialized. {}".format(srcdir))
self.delete_recipeinc(test_recipe)
bitbake('-cclean {}'.format(test_recipe))