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 <berra...@redhat.com> > --- > 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 <ebl...@redhat.com> -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org
signature.asc
Description: OpenPGP digital signature
