diff options
author | Pavel Zhukov <pavel@zhukoff.net> | 2022-03-07 11:30:26 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-22 22:18:51 +0000 |
commit | 02a3d2d460c8172251c783d52b00ca256d23f351 (patch) | |
tree | c521a76e78a08206e677842299eb2344c5cb2ee4 /meta | |
parent | 677d20b0b8b530ab9196c685b46f32e3d6b3284b (diff) | |
download | poky-02a3d2d460c8172251c783d52b00ca256d23f351.tar.gz |
patch.py: Prevent git repo reinitialization
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: 29d86bcad4fc43e09d7499c3f6fba8c499170b9b)
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>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/patch.py | 11 | ||||
-rw-r--r-- | meta/lib/oeqa/selftest/cases/bbtests.py | 18 |
2 files changed, 24 insertions, 5 deletions
diff --git a/meta/lib/oe/patch.py b/meta/lib/oe/patch.py index 950fe723dc..9034fcae03 100644 --- a/meta/lib/oe/patch.py +++ b/meta/lib/oe/patch.py | |||
@@ -304,14 +304,19 @@ class GitApplyTree(PatchTree): | |||
304 | 304 | ||
305 | def _isInitialized(self): | 305 | def _isInitialized(self): |
306 | cmd = "git rev-parse --show-toplevel" | 306 | cmd = "git rev-parse --show-toplevel" |
307 | (status, output) = subprocess.getstatusoutput(cmd.split()) | 307 | try: |
308 | output = runcmd(cmd.split(), self.dir).strip() | ||
309 | except CmdError as err: | ||
310 | ## runcmd returned non-zero which most likely means 128 | ||
311 | ## Not a git directory | ||
312 | return False | ||
308 | ## Make sure repo is in builddir to not break top-level git repos | 313 | ## Make sure repo is in builddir to not break top-level git repos |
309 | return status == 0 and os.path.samedir(output, self.dir) | 314 | return os.path.samefile(output, self.dir) |
310 | 315 | ||
311 | def _initRepo(self): | 316 | def _initRepo(self): |
312 | runcmd("git init".split(), self.dir) | 317 | runcmd("git init".split(), self.dir) |
313 | runcmd("git add .".split(), self.dir) | 318 | runcmd("git add .".split(), self.dir) |
314 | runcmd("git commit -a --allow-empty -m Patching_started".split(), self.dir) | 319 | runcmd("git commit -a --allow-empty -m bitbake_patching_started".split(), self.dir) |
315 | 320 | ||
316 | @staticmethod | 321 | @staticmethod |
317 | def extractPatchHeader(patchfile): | 322 | def extractPatchHeader(patchfile): |
diff --git a/meta/lib/oeqa/selftest/cases/bbtests.py b/meta/lib/oeqa/selftest/cases/bbtests.py index 0a618bb9a6..4187cb840a 100644 --- a/meta/lib/oeqa/selftest/cases/bbtests.py +++ b/meta/lib/oeqa/selftest/cases/bbtests.py | |||
@@ -310,8 +310,22 @@ INHERIT_remove = \"report-error\" | |||
310 | src = get_bb_var("SRC_URI",test_recipe) | 310 | src = get_bb_var("SRC_URI",test_recipe) |
311 | gitscm = re.search("git://", src) | 311 | gitscm = re.search("git://", src) |
312 | self.assertFalse(gitscm, "test_git_patchtool pre-condition failed: {} test recipe contains git repo!".format(test_recipe)) | 312 | self.assertFalse(gitscm, "test_git_patchtool pre-condition failed: {} test recipe contains git repo!".format(test_recipe)) |
313 | result = bitbake('man-db -c patch', ignore_status=False) | 313 | result = bitbake('{} -c patch'.format(test_recipe), ignore_status=False) |
314 | fatal = re.search("fatal: not a git repository (or any of the parent directories)", result.output) | 314 | fatal = re.search("fatal: not a git repository (or any of the parent directories)", result.output) |
315 | self.assertFalse(fatal, "Failed to patch using PATCHTOOL=\"git\"") | 315 | self.assertFalse(fatal, "Failed to patch using PATCHTOOL=\"git\"") |
316 | self.delete_recipeinc(test_recipe) | 316 | self.delete_recipeinc(test_recipe) |
317 | bitbake('-cclean man-db') | 317 | bitbake('-cclean {}'.format(test_recipe)) |
318 | |||
319 | def test_git_patchtool2(self): | ||
320 | """ Test if PATCHTOOL=git works with git repo and doesn't reinitialize it | ||
321 | """ | ||
322 | test_recipe = "gitrepotest" | ||
323 | src = get_bb_var("SRC_URI",test_recipe) | ||
324 | gitscm = re.search("git://", src) | ||
325 | self.assertTrue(gitscm, "test_git_patchtool pre-condition failed: {} test recipe doesn't contains git repo!".format(test_recipe)) | ||
326 | result = bitbake('{} -c patch'.format(test_recipe), ignore_status=False) | ||
327 | srcdir = get_bb_var('S', test_recipe) | ||
328 | result = runCmd("git log", cwd = srcdir) | ||
329 | self.assertFalse("bitbake_patching_started" in result.output, msg = "Repository has been reinitialized. {}".format(srcdir)) | ||
330 | self.delete_recipeinc(test_recipe) | ||
331 | bitbake('-cclean {}'.format(test_recipe)) | ||