[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH] keycodemapdb: try fix makefile deps
From: |
Daniel P. Berrange |
Subject: |
Re: [Qemu-devel] [PATCH] keycodemapdb: try fix makefile deps |
Date: |
Fri, 6 Oct 2017 14:58:22 +0100 |
User-agent: |
Mutt/1.9.0 (2017-09-02) |
On Fri, Oct 06, 2017 at 01:13:42PM +0200, Gerd Hoffmann wrote:
> (1) make .git-submodule-status depend on config-host.mak,
> for GIT_SUBMODULES changes.
>
> (2) make $(KEYCODEMAP_{GEN,CSV}) depend on .git-submodule-status
> so make knows what to do if they are not there.
>
> I still get errors because make tries to generate the files before they are
> checked out,
> but make seems to notice it has to start over and correctly generates the
> files on the
> second attempt.
>
> [ ... ]
> GEN config-host.h
> GEN module_block.h
> GEN ui/input-keymap-linux-to-qcode.c
> GEN ui/input-keymap-qcode-to-qnum.c
> GEN ui/input-keymap-qnum-to-qcode.c
> python: can't open file
> '/home/kraxel/projects/qemu/ui/keycodemapdb/tools/keymap-gen': [Errno 2] No
> such file or directory
> python: can't open file
> '/home/kraxel/projects/qemu/ui/keycodemapdb/tools/keymap-gen': [Errno 2] No
> such file or directory
> python: can't open file
> '/home/kraxel/projects/qemu/ui/keycodemapdb/tools/keymap-gen': [Errno 2] No
> such file or directory
We could perhaps avoid that error message by changing the make rule to
do "test -e $(KEYCODEMAP_GEN) && $(KEYCODEMAP_GEN) || exit 0"
> make: Leaving directory `/home/kraxel/projects/qemu/build-default'
> make: Entering directory `/home/kraxel/projects/qemu/build-default'
> GIT ui/keycodemapdb
> GEN trace/generated-tcg-tracers.h
> GEN trace/generated-helpers-wrappers.h
> GEN trace/generated-helpers.h
> GEN trace/generated-helpers.c
> GEN ui/input-keymap-linux-to-qcode.c
> GEN ui/input-keymap-qcode-to-qnum.c
> GEN ui/input-keymap-qnum-to-qcode.c
> CC qga/main.o
> [ ... ]
> ---
> Makefile | 7 +++++--
> 1 file changed, 5 insertions(+), 2 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 1d3b31f074..c97258629e 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -33,7 +33,7 @@ git-submodule-update:
> endif
> endif
>
> -.git-submodule-status: git-submodule-update
> +.git-submodule-status: git-submodule-update config-host.mak
>
> Makefile: .git-submodule-status
>
> @@ -225,7 +225,7 @@ KEYCODEMAP_FILES = \
>
> GENERATED_FILES += $(KEYCODEMAP_FILES)
>
> -ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV)
> $(SRC_PATH)/ui/Makefile.objs .git-submodule-status
> +ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV)
> $(SRC_PATH)/ui/Makefile.objs
> $(call quiet-command,\
> src=$$(echo $@ | sed -E -e
> "s,^ui/input-keymap-(.+)-to-(.+)\.c$$,\1,") && \
> dst=$$(echo $@ | sed -E -e
> "s,^ui/input-keymap-(.+)-to-(.+)\.c$$,\2,") && \
> @@ -235,6 +235,9 @@ ui/input-keymap-%.c: $(KEYCODEMAP_GEN) $(KEYCODEMAP_CSV)
> $(SRC_PATH)/ui/Makefile
> code-map $(KEYCODEMAP_CSV) $${src} $${dst} \
> > $@ || rm $@, "GEN", "$@")
>
> +$(KEYCODEMAP_GEN): .git-submodule-status
> +$(KEYCODEMAP_CSV): .git-submodule-status
> +
> # Don't try to regenerate Makefile or configure
> # We don't generate any of them
> Makefile: ;
This looks like a plausible solution to the problem. I've just kicked off
a travis buld with the patch applied:
https://travis-ci.org/berrange/qemu/builds/284220642
Regards,
Daniel
--
|: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
|: https://libvirt.org -o- https://fstop138.berrange.com :|
|: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|