diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-15 15:57:03 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-16 08:29:59 +0100 |
commit | d9aa32dbf9145d25565a17ac39b186e332ed9a12 (patch) | |
tree | 5d1c158c2e9c06265965641f638372a1e63c5135 /meta/recipes-devtools/qemu/qemu/determinism.patch | |
parent | a9e49336dcddf8b2a43116e7850c3e731786fb86 (diff) | |
download | poky-d9aa32dbf9145d25565a17ac39b186e332ed9a12.tar.gz |
qemu: Upgrade 5.2.0 -> 6.0.0
Building without PIE support seems broken upstream, enable it by default
to match the configuration others evidently use.
Tweak git submodule option to match upstream.
Drop backported/merged patches, refresh others.
(From OE-Core rev: ede1b86e663f1cafccc8aa8c35fa13ebd3f55d11)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/qemu/qemu/determinism.patch')
-rw-r--r-- | meta/recipes-devtools/qemu/qemu/determinism.patch | 29 |
1 files changed, 5 insertions, 24 deletions
diff --git a/meta/recipes-devtools/qemu/qemu/determinism.patch b/meta/recipes-devtools/qemu/qemu/determinism.patch index cb1c907777..330a31204d 100644 --- a/meta/recipes-devtools/qemu/qemu/determinism.patch +++ b/meta/recipes-devtools/qemu/qemu/determinism.patch | |||
@@ -4,38 +4,19 @@ qemu build are not reproducible due to either full buildpaths or timestamps. | |||
4 | Replace the full paths with relative ones. I couldn't figure out how to get | 4 | Replace the full paths with relative ones. I couldn't figure out how to get |
5 | meson to pass relative paths but we can fix that in the script. | 5 | meson to pass relative paths but we can fix that in the script. |
6 | 6 | ||
7 | For the keymaps, omit the timestamps as they don't matter to us. | ||
8 | |||
9 | Upstream-Status: Pending [some version of all/part of this may be accepted] | 7 | Upstream-Status: Pending [some version of all/part of this may be accepted] |
10 | RP 2021/3/1 | 8 | RP 2021/3/1 |
11 | 9 | ||
12 | Index: qemu-5.2.0/scripts/decodetree.py | 10 | Index: qemu-6.0.0/scripts/decodetree.py |
13 | =================================================================== | 11 | =================================================================== |
14 | --- qemu-5.2.0.orig/scripts/decodetree.py | 12 | --- qemu-6.0.0.orig/scripts/decodetree.py |
15 | +++ qemu-5.2.0/scripts/decodetree.py | 13 | +++ qemu-6.0.0/scripts/decodetree.py |
16 | @@ -1303,8 +1303,8 @@ def main(): | 14 | @@ -1304,7 +1304,7 @@ def main(): |
17 | toppat = ExcMultiPattern(0) | 15 | toppat = ExcMultiPattern(0) |
18 | 16 | ||
19 | for filename in args: | 17 | for filename in args: |
20 | - input_file = filename | 18 | - input_file = filename |
21 | - f = open(filename, 'r') | ||
22 | + input_file = os.path.relpath(filename) | 19 | + input_file = os.path.relpath(filename) |
23 | + f = open(input_file, 'r') | 20 | f = open(filename, 'rt', encoding='utf-8') |
24 | parse_file(f, toppat) | 21 | parse_file(f, toppat) |
25 | f.close() | 22 | f.close() |
26 | |||
27 | Index: qemu-5.2.0/ui/keycodemapdb/tools/keymap-gen | ||
28 | =================================================================== | ||
29 | --- qemu-5.2.0.orig/ui/keycodemapdb/tools/keymap-gen | ||
30 | +++ qemu-5.2.0/ui/keycodemapdb/tools/keymap-gen | ||
31 | @@ -317,9 +317,8 @@ class LanguageGenerator(object): | ||
32 | raise NotImplementedError() | ||
33 | |||
34 | def generate_header(self, database, args): | ||
35 | - today = time.strftime("%Y-%m-%d %H:%M") | ||
36 | self._boilerplate([ | ||
37 | - "This file is auto-generated from keymaps.csv on %s" % today, | ||
38 | + "This file is auto-generated from keymaps.csv", | ||
39 | "Database checksum sha256(%s)" % database.mapchecksum, | ||
40 | "To re-generate, run:", | ||
41 | " %s" % args, | ||