diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-29 22:39:11 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-10-03 00:37:27 +0100 |
| commit | 75b79d5c056b5abb44c546af773e3431d4c09476 (patch) | |
| tree | 0bf9f95625d5645d04c4f2e9ff1ce9ad1ce8798d | |
| parent | 1b3415acd28d2184a95a2bb05ecd4413bd060f35 (diff) | |
| download | poky-75b79d5c056b5abb44c546af773e3431d4c09476.tar.gz | |
bitbake: data: Ensure functions are defined in a deterministic order
When writing functions into shell scripts, write then in a deterministic
order. This is unlikely to affect anything at runtime but it does change
the signatures of the generated useradd postinst scripts in OE-Core and is
a good thing to be consistent about in general.
(Bitbake rev: 8a181dc8f3c8c9c9885ea3011cb234321a296d92)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | bitbake/lib/bb/data.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/bitbake/lib/bb/data.py b/bitbake/lib/bb/data.py index 97022853ca..9d18b1e2bf 100644 --- a/bitbake/lib/bb/data.py +++ b/bitbake/lib/bb/data.py | |||
| @@ -226,7 +226,7 @@ def emit_func(func, o=sys.__stdout__, d = init()): | |||
| 226 | deps = newdeps | 226 | deps = newdeps |
| 227 | seen |= deps | 227 | seen |= deps |
| 228 | newdeps = set() | 228 | newdeps = set() |
| 229 | for dep in deps: | 229 | for dep in sorted(deps): |
| 230 | if d.getVarFlag(dep, "func", False) and not d.getVarFlag(dep, "python", False): | 230 | if d.getVarFlag(dep, "func", False) and not d.getVarFlag(dep, "python", False): |
| 231 | emit_var(dep, o, d, False) and o.write('\n') | 231 | emit_var(dep, o, d, False) and o.write('\n') |
| 232 | newdeps |= bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep)) | 232 | newdeps |= bb.codeparser.ShellParser(dep, logger).parse_shell(d.getVar(dep)) |
