diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2024-02-19 02:28:31 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-02-19 16:03:22 +0000 |
commit | dc2e09417d172ec3da01786e42ebe5e0734ee9ae (patch) | |
tree | f8e19f7d04f831b67cd4f3c32c08fc646af9d51e | |
parent | 85b5e87c7de6d77cf93e424e9d5c4e5311d6992f (diff) | |
download | poky-dc2e09417d172ec3da01786e42ebe5e0734ee9ae.tar.gz |
patch.bbclass: Make use of oe.patch.GitApplyTree.commitIgnored()
This makes use of the oe.patch.GitApplyTree.commitIgnored() function to
create commits that shall be ignored by `devtool finish`.
(From OE-Core rev: 2393dc35a93546eccee0dd313a6927c7d1512c3b)
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes-global/patch.bbclass | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/meta/classes-global/patch.bbclass b/meta/classes-global/patch.bbclass index e3157c7b18..e5786b1c9a 100644 --- a/meta/classes-global/patch.bbclass +++ b/meta/classes-global/patch.bbclass | |||
@@ -79,9 +79,7 @@ python patch_task_postfunc() { | |||
79 | bb.process.run('git checkout patches', cwd=srcsubdir) | 79 | bb.process.run('git checkout patches', cwd=srcsubdir) |
80 | stdout, _ = bb.process.run('git status --porcelain .', cwd=srcsubdir) | 80 | stdout, _ = bb.process.run('git status --porcelain .', cwd=srcsubdir) |
81 | if stdout: | 81 | if stdout: |
82 | useroptions = [] | 82 | oe.patch.GitApplyTree.commitIgnored("Add changes from %s" % func, dir=srcsubdir, files=['.'], d=d) |
83 | oe.patch.GitApplyTree.gitCommandUserOptions(useroptions, d=d) | ||
84 | bb.process.run('git add .; git %s commit -a -m "Committing changes from %s\n\n%s"' % (' '.join(useroptions), func, oe.patch.GitApplyTree.ignore_commit_prefix + ' - from %s' % func), cwd=srcsubdir) | ||
85 | } | 83 | } |
86 | 84 | ||
87 | def src_patches(d, all=False, expand=True): | 85 | def src_patches(d, all=False, expand=True): |