[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Qemu-devel] [PATCH v3 4/5] build: don't fail if given a git submodu
From: |
Eric Blake |
Subject: |
Re: [Qemu-devel] [PATCH v3 4/5] build: don't fail if given a git submodule which does not exist |
Date: |
Fri, 3 Nov 2017 13:36:26 -0500 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.4.0 |
On 11/03/2017 10:33 AM, Daniel P. Berrange wrote:
> If going back in time in git history, across a commit that introduces a new
> submodule, the 'git-submodule.sh' script will fail, causing rebuild to fail.
>
> This is because config-host.mak contains a GIT_SUBMODULES variable that lists
> a submodule that only exists in the later commit. config-host.mak won't get
> repopulated until config.status is invoked, but make won't get this far due to
> the submodule error.
>
> This change makes 'git-submodule.sh' check whether each module is known to git
> and drops any which are not present. A warning message will be printed when
> any
> submodule is dropped in this manner.
>
> Signed-off-by: Daniel P. Berrange <address@hidden>
> ---
> scripts/git-submodule.sh | 16 ++++++++++++++--
> 1 file changed, 14 insertions(+), 2 deletions(-)
>
> +do
> + $GIT submodule status $m 1> /dev/null 2>&1
> + if test $? = 0
> + then
> + modules="$modules $m"
> + else
> + echo "warn: ignoring non-existant submodule $m"
s/existant/existent/
With the typo fix,
Reviewed-by: Eric Blake <address@hidden>
--
Eric Blake, Principal Software Engineer
Red Hat, Inc. +1-919-301-3266
Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, (continued)
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Eric Blake, 2017/11/03
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Alexey Kardashevskiy, 2017/11/06
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Alexey Kardashevskiy, 2017/11/07
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Alexey Kardashevskiy, 2017/11/08
- Re: [Qemu-devel] [PATCH v3 5/5] build: delay check for empty git submodule list, Daniel P. Berrange, 2017/11/08
[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
- Re: [Qemu-devel] [PATCH v3 4/5] build: don't fail if given a git submodule which does not exist,
Eric Blake <=
Re: [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling, Peter Maydell, 2017/11/03
Re: [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling, Philippe Mathieu-Daudé, 2017/11/03
Re: [Qemu-devel] [PATCH v3 0/5] Various improvements/bugfixes to submodule handling, Alexey Kardashevskiy, 2017/11/05