qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Eric Blake <eblake@redhat.com>
To: Samuel Thibault <samuel.thibault@ens-lyon.org>,
	qemu-devel@nongnu.org, peter.maydell@linaro.org
Cc: jan.kiszka@siemens.com, stefanha@redhat.com,
	"Marc-André Lureau" <marcandre.lureau@redhat.com>
Subject: Re: [Qemu-devel] [PULL 0/2] slirp: move slirp as git submodule project
Date: Tue, 7 May 2019 09:11:09 -0500	[thread overview]
Message-ID: <0da3ec00-9040-f367-7666-a54824f1dcde@redhat.com> (raw)
In-Reply-To: <20190502223007.29494-1-samuel.thibault@ens-lyon.org>

[-- Attachment #1: Type: text/plain, Size: 1989 bytes --]

On 5/2/19 5:30 PM, Samuel Thibault 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

After this series, an in-tree build is seeing a dirty tree, thanks to:

> Changes not staged for commit:
>   (use "git add <file>..." to update what will be committed)
>   (use "git checkout -- <file>..." to discard changes in working directory)
>   (commit or discard the untracked or modified content in submodules)
> 
> 	modified:   slirp (untracked content)

which in reality is due to:

$ cd slirp/
$ git status
HEAD detached at 59a1b1f
Untracked files:
  (use "git add <file>..." to include in what will be committed)

	libslirp.a
	src/arp_table.d
	src/arp_table.o
...

libslirp probably needs a .gitignore for *.a, *.o, *.d, and
src/libslirp-version.h

And actually getting it to apply during qemu's build will need another
submodule update.

In the meantime, where do we stand on our goal of disabling in-tree builds?

-- 
Eric Blake, Principal Software Engineer
Red Hat, Inc.           +1-919-301-3226
Virtualization:  qemu.org | libvirt.org


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

  parent reply	other threads:[~2019-05-07 14:13 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-05-02 22:30 [Qemu-devel] [PULL 0/2] slirp: move slirp as git submodule project Samuel Thibault
2019-05-02 22:30 ` Samuel Thibault
2019-05-02 22:30 ` [Qemu-devel] [PULL 1/2] build-sys: pass CFLAGS & LDFLAGS to subdir-slirp Samuel Thibault
2019-05-02 22:30   ` Samuel Thibault
2019-05-02 22:30 ` [Qemu-devel] [PULL 2/2] build-sys: move slirp as git submodule project Samuel Thibault
2019-05-03 12:54 ` [Qemu-devel] [PULL 0/2] slirp: " Peter Maydell
2019-05-03 12:54   ` Peter Maydell
2019-05-03 15:05   ` Philippe Mathieu-Daudé
2019-05-03 15:05     ` Philippe Mathieu-Daudé
2019-05-03 15:12     ` Peter Maydell
2019-05-03 15:12       ` Peter Maydell
2019-05-07 14:11 ` Eric Blake [this message]
2019-05-07 14:19   ` Daniel P. Berrangé
2019-05-07 17:01     ` Peter Maydell
2019-05-08  5:48       ` Philippe Mathieu-Daudé

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=0da3ec00-9040-f367-7666-a54824f1dcde@redhat.com \
    --to=eblake@redhat.com \
    --cc=jan.kiszka@siemens.com \
    --cc=marcandre.lureau@redhat.com \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=samuel.thibault@ens-lyon.org \
    --cc=stefanha@redhat.com \
    /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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).