qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: "Michael S. Tsirkin" <mst@redhat.com>
To: "Philippe Mathieu-Daudé" <f4bug@amsat.org>
Cc: qemu-devel@nongnu.org, "Daniel P. Berrangé" <berrange@redhat.com>,
	"Thomas Huth" <thuth@redhat.com>,
	"Stefan Hajnoczi" <stefanha@redhat.com>,
	"Alex Bennée" <alex.bennee@linaro.org>,
	"Paolo Bonzini" <pbonzini@redhat.com>
Subject: Re: [PATCH] gitmodules: recurse by default
Date: Thu, 6 Oct 2022 11:29:05 -0400	[thread overview]
Message-ID: <20221006112753-mutt-send-email-mst@kernel.org> (raw)
In-Reply-To: <27e666ae-0a91-1843-8eb0-c816ab261eb1@amsat.org>

On Thu, Oct 06, 2022 at 05:10:10PM +0200, Philippe Mathieu-Daudé wrote:
> Hi Michael,
> 
> On 6/10/22 13:39, Michael S. Tsirkin wrote:
> > The most commmon complaint about submodules is that
> 
> Typo "common"
> 
> > they don't follow when one switches branches in the
> > main repo. Enable recursing into submodules by default
> > to address that.
> > 
> > Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
> > ---
> >   .gitmodules | 23 +++++++++++++++++++++++
> >   1 file changed, 23 insertions(+)
> 
> We have 3 kinds of submodule (or more?):
> 1/ required to *build* QEMU
> 2/ required to *test* QEMU
> 3/ only here for satisfies license of firmware blobs shipped with QEMU.
> 
> IIUC, long-term we want to move 3/ in another repository.
> 
> Could we only set "recurse=true" for 1/ ?
> 
> What is your use-case? Do we need it also for 2/ ?

The use case is avoiding git diff output simply by switching
branches. to serve that purpose all submodules need to be recurse=true
unless they never change.

> > diff --git a/.gitmodules b/.gitmodules
> > index aedd9a03d4..5f32332aff 100644
> > --- a/.gitmodules
> > +++ b/.gitmodules
> > @@ -1,69 +1,92 @@
> >   [submodule "roms/seabios"]
> >   	path = roms/seabios
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/seabios.git/
> >   [submodule "roms/SLOF"]
> >   	path = roms/SLOF
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/SLOF.git
> >   [submodule "roms/ipxe"]
> >   	path = roms/ipxe
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/ipxe.git
> >   [submodule "roms/openbios"]
> >   	path = roms/openbios
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/openbios.git
> >   [submodule "roms/qemu-palcode"]
> >   	path = roms/qemu-palcode
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/qemu-palcode.git
> >   [submodule "roms/sgabios"]
> >   	path = roms/sgabios
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/sgabios.git
> >   [submodule "dtc"]
> >   	path = dtc
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/dtc.git
> >   [submodule "roms/u-boot"]
> >   	path = roms/u-boot
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/u-boot.git
> >   [submodule "roms/skiboot"]
> >   	path = roms/skiboot
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/skiboot.git
> >   [submodule "roms/QemuMacDrivers"]
> >   	path = roms/QemuMacDrivers
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/QemuMacDrivers.git
> >   [submodule "ui/keycodemapdb"]
> >   	path = ui/keycodemapdb
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/keycodemapdb.git
> >   [submodule "roms/seabios-hppa"]
> >   	path = roms/seabios-hppa
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/seabios-hppa.git
> >   [submodule "roms/u-boot-sam460ex"]
> >   	path = roms/u-boot-sam460ex
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/u-boot-sam460ex.git
> >   [submodule "tests/fp/berkeley-testfloat-3"]
> >   	path = tests/fp/berkeley-testfloat-3
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/berkeley-testfloat-3.git
> >   [submodule "tests/fp/berkeley-softfloat-3"]
> >   	path = tests/fp/berkeley-softfloat-3
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/berkeley-softfloat-3.git
> >   [submodule "roms/edk2"]
> >   	path = roms/edk2
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/edk2.git
> >   [submodule "slirp"]
> >   	path = slirp
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/libslirp.git
> >   [submodule "roms/opensbi"]
> >   	path = roms/opensbi
> > +	recurse = true
> >   	url = 	https://gitlab.com/qemu-project/opensbi.git
> >   [submodule "roms/qboot"]
> >   	path = roms/qboot
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/qboot.git
> >   [submodule "meson"]
> >   	path = meson
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/meson.git
> >   [submodule "roms/vbootrom"]
> >   	path = roms/vbootrom
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/vbootrom.git
> >   [submodule "tests/lcitool/libvirt-ci"]
> >   	path = tests/lcitool/libvirt-ci
> > +	recurse = true
> >   	url = https://gitlab.com/libvirt/libvirt-ci.git
> >   [submodule "subprojects/libvfio-user"]
> >   	path = subprojects/libvfio-user
> > +	recurse = true
> >   	url = https://gitlab.com/qemu-project/libvfio-user.git



  parent reply	other threads:[~2022-10-06 16:22 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-06 11:39 [PATCH] gitmodules: recurse by default Michael S. Tsirkin
2022-10-06 13:02 ` Peter Maydell
2022-10-06 14:30   ` Michael S. Tsirkin
2022-10-06 15:10 ` Philippe Mathieu-Daudé via
2022-10-06 15:23   ` Peter Maydell
2022-10-06 15:29   ` Michael S. Tsirkin [this message]
2022-10-06 18:54 ` Daniel P. Berrangé
2022-10-07  0:24   ` Michael S. Tsirkin
2022-10-07  8:07     ` Daniel P. Berrangé
2022-10-07 10:11       ` Michael S. Tsirkin
2022-10-07 10:45         ` Daniel P. Berrangé
2022-10-07 11:09           ` Daniel P. Berrangé
2022-10-11 22:32             ` Michael S. Tsirkin
2022-10-12  7:51               ` Daniel P. Berrangé
2022-10-12 11:31                 ` Michael S. Tsirkin

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=20221006112753-mutt-send-email-mst@kernel.org \
    --to=mst@redhat.com \
    --cc=alex.bennee@linaro.org \
    --cc=berrange@redhat.com \
    --cc=f4bug@amsat.org \
    --cc=pbonzini@redhat.com \
    --cc=qemu-devel@nongnu.org \
    --cc=stefanha@redhat.com \
    --cc=thuth@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).