Re: [Qemu-devel] [PULL 0/2] slirp: move slirp as git submodule project

[Philippe Mathieu-Daudé]

On 5/3/19 2:54 PM, Peter Maydell wrote:
> On Thu, 2 May 2019 at 23:30, Samuel Thibault
> <address@hidden> wrote:
>>
>> The following changes since commit 8482ff2eb3bb95020eb2f370a9b3ea26511e41df:
>>
>>   Merge remote-tracking branch 'remotes/jnsnow/tags/bitmaps-pull-request' 
>> into staging (2019-05-02 12:04:51 +0100)
>>
>> are available in the Git repository at:
>>
>>   https://people.debian.org/~sthibault/qemu.git tags/samuel-thibault
>>
>> for you to fetch changes up to 7c57bdd82026ba03f3158bbcd841afde7c2dc43a:
>>
>>   build-sys: move slirp as git submodule project (2019-05-03 00:15:37 +0200)
>>
>> ----------------------------------------------------------------
>> slirp: move slirp as git submodule project
>>
>> Marc-André Lureau (2):
>>   build-sys: pass CFLAGS & LDFLAGS to subdir-slirp
>>   build-sys: move slirp as git submodule project
>>
>> ----------------------------------------------------------------
>> Marc-André Lureau (2):
>>       build-sys: pass CFLAGS & LDFLAGS to subdir-slirp
>>       build-sys: move slirp as git submodule project
>>
> 
> 
> Applied, thanks.

TL;DR: You might need to run 'git submodule deinit --force slirp' if ou
get errors after merging this.

--

FYI I was running MinGW tests with "make address@hidden
SHOW_ENV=1 J=8 NETWORK=1" and ran "git pull" to refresh my local repo,
and got:

$ make address@hidden SHOW_ENV=1 J=8 NETWORK=1
make[1]: Entering directory '/home/phil/source/qemu'
  GEN
/home/phil/source/qemu/docker-src.2019-05-03-16.55.51.7157/qemu.tar
slirp: unmerged (59a1b1f165458c2acb7ff0525b543945f7416225)
fatal: git-write-tree: error building trees
Cannot save the current index state
Cloning into
'/home/phil/source/qemu/docker-src.2019-05-03-16.55.51.7157/qemu.tar.vroot'...
done.
error: pathspec 'slirp:' did not match any file(s) known to git.
error: pathspec 'needs' did not match any file(s) known to git.
error: pathspec 'merge' did not match any file(s) known to git.
failed to checkout slirp: needs merge revision
tar: /var/tmp/qemu/qemu.tar: Cannot open: No such file or directory
tar: Error is not recoverable: exiting now
Failed to untar source
tests/docker/Makefile.include:203: recipe for target 'docker-run' failed
make[1]: *** [docker-run] Error 1

I don't run builds on this host (no tools installed) but everything via
Docker, so (re-)running ./configure is not an option.

$ git status
Unmerged paths:
  (use "git reset HEAD <file>..." to unstage)
  (use "git add <file>..." to mark resolution)

        added by us:     slirp

$ ls -la slirp/
total 8
drwxr-xr-x  2 phil phil 4096 May  3 16:49 .
drwxr-xr-x 56 phil phil 4096 May  3 16:55 ..

$ git submodule status slirp
U0000000000000000000000000000000000000000 slirp

Daniel suggested on IRC to run:

$ git submodule deinit --force slirp

It worked fine after running it.

Regards,

Phil.