Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame^] | 1 | When sources are included within debug information, a couple of areas of the |
| 2 | qemu build are not reproducible due to either full buildpaths or timestamps. |
| 3 | |
| 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. |
| 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] |
| 10 | RP 2021/3/1 |
| 11 | |
| 12 | Index: qemu-5.2.0/scripts/decodetree.py |
| 13 | =================================================================== |
| 14 | --- qemu-5.2.0.orig/scripts/decodetree.py |
| 15 | +++ qemu-5.2.0/scripts/decodetree.py |
| 16 | @@ -1303,8 +1303,8 @@ def main(): |
| 17 | toppat = ExcMultiPattern(0) |
| 18 | |
| 19 | for filename in args: |
| 20 | - input_file = filename |
| 21 | - f = open(filename, 'r') |
| 22 | + input_file = os.path.relpath(filename) |
| 23 | + f = open(input_file, 'r') |
| 24 | parse_file(f, toppat) |
| 25 | 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, |