This patchset is two git reverts, to revert ab78ac76f44a124 and fc35f24387703da. Those commits try to move the handling of version.h to entirely within the meson file with no external script, but unfortunately if you do that then there is no dependency information about it passed to ninja, so the file isn't recreated if it's missing. In particular this breaks incremental builds from a build tree that pre-dates those two commits.
There's been some on-list discussion: https://lore.kernel.org/qemu-devel/[email protected]/ Since it's not clear how we want to proceed, I'm posting this as the "revert to the situation we had before", so we can discuss what we want to do with a bit more leisure. thanks -- PMM Peter Maydell (2): Revert "meson: rewrite scripts/qemu-version.sh directly in meson.build" Revert "include: introduce qemu/version.h" meson.build | 29 +++++++++------------------- include/qemu/version.h | 20 ------------------- bsd-user/main.c | 2 +- linux-user/main.c | 2 +- monitor/qmp-cmds-control.c | 2 +- qemu-img.c | 2 +- qemu-io.c | 2 +- qemu-nbd.c | 2 +- qga/main.c | 2 +- scsi/qemu-pr-helper.c | 2 +- storage-daemon/qemu-storage-daemon.c | 2 +- system/vl.c | 2 +- tools/i386/qemu-vmsr-helper.c | 3 ++- tools/qemu-vnc/qemu-vnc.c | 2 +- util/module.c | 2 +- scripts/qemu-version.h.in | 1 - scripts/qemu-version.sh | 25 ++++++++++++++++++++++++ ui/cocoa.m | 2 +- 18 files changed, 49 insertions(+), 55 deletions(-) delete mode 100644 include/qemu/version.h delete mode 100644 scripts/qemu-version.h.in create mode 100755 scripts/qemu-version.sh -- 2.43.0
