From: Alexey Kardashevskiy <aik@ozlabs.ru>
To: "Daniel P. Berrange" <berrange@redhat.com>, qemu-devel@nongnu.org
Cc: "Eric Blake" <eblake@redhat.com>,
"Peter Maydell" <peter.maydell@linaro.org>,
"Philippe Mathieu-Daudé" <f4bug@amsat.org>
Subject: Re: [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling
Date: Mon, 6 Nov 2017 11:22:15 +1100 [thread overview]
Message-ID: <c20a8639-8288-3525-2ebf-76681e2e9243@ozlabs.ru> (raw)
In-Reply-To: <20171103153333.6416-1-berrange@redhat.com>
On 04/11/17 02:33, Daniel P. Berrange wrote:
> This short series of patches improves the reliability of the submodule
> handling to cope with various dev env scenarios that have since emerged
>
> v2: https://lists.gnu.org/archive/html/qemu-devel/2017-10/msg06272.html
>
> Changed in v3:
>
> - Avoid use of mktemp
> - Use '=' instead of '==' (bashism) in conditional tests
> - Fix problem with short-circuiting for empty submodule list
> - Ensure help message is displayed on all errors
>
> Daniel P. Berrange (5):
> build: allow setting a custom GIT binary for transparent proxying
> build: don't create temporary files in source dir
> build: allow automatic git submodule updates to be disabled
> build: don't fail if given a git submodule which does not exist
> build: delay check for empty git submodule list
>
> Makefile | 15 ++++++++--
> configure | 12 ++++++++
> scripts/git-submodule.sh | 72 ++++++++++++++++++++++++++++++++++++++----------
> 3 files changed, 83 insertions(+), 16 deletions(-)
It is getting more complicated.
So, same setup,
git checkout v2.10.0
./configure --target-list=ppc64-softmmu
make
All good.
Then:
git checkout git-submodule (upstream + this patchset)
./configure --target-list=ppc64-softmmu
I see an error and educational page about --disable-git-update, good.
./configure --target-list=ppc64-softmmu --disable-git-update
make
Now I get:
GIT submodule checkout is out of date. Please run
scripts/git-submodule.sh update ui/keycodemapdb dtc capstone
from the source directory checkout /home/aik/p/qemu
Good, as I wanted.
I do this on the server:
scripts/git-submodule.sh update ui/keycodemapdb dtc capstone
and repeat "make" on the build machine but get the very same error. Then I
add "set -x" to scripts/git-submodule.sh and see:
+ substat=.git-submodule-status
+ command=status
+ shift
+ maybe_modules=ui/keycodemapdb dtc capstone
+ test -z git
+ modules=
+ git submodule status ui/keycodemapdb
+ test 0 = 0
+ modules= ui/keycodemapdb
+ git submodule status dtc
+ test 0 = 0
+ modules= ui/keycodemapdb dtc
+ git submodule status capstone
+ test 0 = 0
+ modules= ui/keycodemapdb dtc capstone
+ test -n ui/keycodemapdb dtc capstone
+ test -e .git
+ test -z ui/keycodemapdb dtc capstone
+ test -f .git-submodule-status
+ git submodule status ui/keycodemapdb dtc capstone
+ CURSTATUS=-22ead3e0bfdb87516656453336160e0a37b066bf capstone
558cd81bdd432769b59bff01240c44f82cfb1a9d dtc (v1.4.4)
10739aa26051a5d49d88132604539d3ed085e72e ui/keycodemapdb (heads/master)
+ cat .git-submodule-status
+ OLDSTATUS= 558cd81bdd432769b59bff01240c44f82cfb1a9d dtc (v1.4.4)
10739aa26051a5d49d88132604539d3ed085e72e ui/keycodemapdb (heads/master)
+ test -22ead3e0bfdb87516656453336160e0a37b066bf capstone
558cd81bdd432769b59bff01240c44f82cfb1a9d dtc (v1.4.4)
10739aa26051a5d49d88132604539d3ed085e72e ui/keycodemapdb (heads/master) =
558cd81bdd432769b59bff01240c44f82cfb1a9d dtc (v1.4.4)
10739aa26051a5d49d88132604539d3ed085e72e ui/keycodemapdb (heads/master)
+ exit 1
What is that new module - capstone - about? It is not in the status file:
[vpl1 qemu]$ cat .git-submodule-status
558cd81bdd432769b59bff01240c44f82cfb1a9d dtc (v1.4.4)
10739aa26051a5d49d88132604539d3ed085e72e ui/keycodemapdb (heads/master)
--
Alexey
next prev parent reply other threads:[~2017-11-06 0:22 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-03 15:33 [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling Daniel P. Berrange
2017-11-03 15:33 ` [Qemu-devel] [PATCH v3 1/5] build: allow setting a custom GIT binary for transparent proxying Daniel P. Berrange
2017-11-03 18:27 ` Eric Blake
2017-11-03 15:33 ` [Qemu-devel] [PATCH v3 2/5] build: don't create temporary files in source dir Daniel P. Berrange
2017-11-03 18:28 ` Eric Blake
2017-11-03 15:33 ` [Qemu-devel] [PATCH v3 3/5] build: allow automatic git submodule updates to be disabled Daniel P. Berrange
2017-11-03 18:35 ` Eric Blake
2017-11-03 15:33 ` [Qemu-devel] [PATCH v3 4/5] build: don't fail if given a git submodule which does not exist Daniel P. Berrange
2017-11-03 18:36 ` Eric Blake
2017-11-03 15:33 ` [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list Daniel P. Berrange
2017-11-03 18:37 ` Eric Blake
2017-11-07 4:12 ` Alexey Kardashevskiy
2017-11-07 5:13 ` Alexey Kardashevskiy
2017-11-07 10:12 ` Daniel P. Berrange
2017-11-07 22:58 ` Alexey Kardashevskiy
2017-11-08 9:02 ` Daniel P. Berrange
2017-11-08 1:43 ` Alexey Kardashevskiy
2017-11-08 8:28 ` Alexey Kardashevskiy
2017-11-08 9:01 ` Daniel P. Berrange
2017-11-03 18:03 ` [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling Peter Maydell
2017-11-06 10:44 ` Daniel P. Berrange
2017-11-06 14:30 ` Daniel P. Berrange
2017-11-07 2:04 ` Alexey Kardashevskiy
2017-11-03 19:38 ` Philippe Mathieu-Daudé
2017-11-06 0:22 ` Alexey Kardashevskiy [this message]
2017-11-06 4:44 ` Alexey Kardashevskiy
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=c20a8639-8288-3525-2ebf-76681e2e9243@ozlabs.ru \
--to=aik@ozlabs.ru \
--cc=berrange@redhat.com \
--cc=eblake@redhat.com \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.