From: Dan Streetman <ddstreet@canonical.com>
To: "Daniel P. Berrangé" <berrange@redhat.com>
Cc: Michael Tokarev <mjt@tls.msk.ru>,
qemu-devel@nongnu.org,
Christian Ehrhardt <christian.ehrhardt@canonical.com>,
Rafael David Tinoco <rafael.tinoco@canonical.com>
Subject: Re: [PATCH] configure: actually disable 'git_update' mode with --disable-git-update
Date: Fri, 16 Oct 2020 16:51:47 -0400 [thread overview]
Message-ID: <CAOZ2QJOJSFzMZZTRxV4Deq945CbVgzQD9i70FLVWnYL4QWwokQ@mail.gmail.com> (raw)
In-Reply-To: <20201002131130.GB2338114@redhat.com>
On Fri, Oct 2, 2020 at 9:11 AM Daniel P. Berrangé <berrange@redhat.com> wrote:
>
> On Wed, Sep 30, 2020 at 09:28:54PM -0400, Dan Streetman wrote:
> > On Tue, Sep 22, 2020 at 12:34 PM Daniel P. Berrangé <berrange@redhat.com> wrote:
> > >
> > > On Wed, Jul 29, 2020 at 03:58:29PM -0400, Dan Streetman wrote:
> > > > The --disable-git-update configure param sets git_update=no, but
> > > > some later checks only look for the .git dir. This changes the
> > > > --enable-git-update to set git_update=yes but also fail if it
> > > > does not find a .git dir. Then all the later checks for the .git
> > > > dir can just be changed to a check for $git_update = "yes".
> > > >
> > > > Also update the Makefile to skip the 'git_update' checks if it has
> > > > been disabled.
> > > >
> > > > This is needed because downstream packagers, e.g. Debian, Ubuntu, etc,
> > > > also keep the source code in git, but do not want to enable the
> > > > 'git_update' mode; with the current code, that's not possible even
> > > > if the downstream package specifies --disable-git-update.
> > >
> > > Lets recap the original intended behaviour
> > >
> > > 1. User building from master qemu.git or a fork
> > > a) git_update=yes (default)
> > > - Always sync submodules to required commit
> > >
> > > b) git_update=no (--disable-git-update)
> > > - Never sync submodules, user is responsible for sync
> > > - Validate submodules are at correct commit and fail if not.
> > >
> > > 2. User building from tarball
> > > - Never do anything git related at all
> > >
> > >
> > > Your change is removing the validation from 1.b).
> >
> > Would you accept adding a --disable-git-submodules-check so downstream
> > packagers can keep the source in git, but avoid the submodule
> > validation?
>
> It feels like the current option shouldn't be a boolean, rather
> a tri-state --with-git-submodules=[update|validate|ignore]
>
Ok, I updated the patch to do that:
https://lists.nongnu.org/archive/html/qemu-devel/2020-10/msg04799.html
> > Or do you have another suggestion for handling this?
>
> Assuming you're just using git for conveniently applying local
> downstream patches, you don't need the git repo to exist once
> getting to the build stage. IOW just delete the .git dir after
> applying patches before running a build.
>
>
> Regards,
> Daniel
> --
> |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :|
> |: https://libvirt.org -o- https://fstop138.berrange.com :|
> |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|
>
prev parent reply other threads:[~2020-10-16 20:53 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200715205013.2367760-1-ddstreet@canonical.com>
[not found] ` <20200716102213.2931209-1-ddstreet@canonical.com>
2020-07-24 9:55 ` [PATCH v2] configure: actually disable 'git_update' mode with --disable-git-update Michael Tokarev
2020-07-29 19:58 ` [PATCH] " Dan Streetman
2020-09-13 18:57 ` [PATCH resend] " Dan Streetman
2020-09-13 21:09 ` Philippe Mathieu-Daudé
2020-09-22 16:34 ` [PATCH] " Daniel P. Berrangé
2020-10-01 1:28 ` Dan Streetman
2020-10-02 13:11 ` Daniel P. Berrangé
2020-10-02 14:25 ` Peter Maydell
2020-10-02 14:44 ` Rafael David Tinoco
2020-10-16 20:51 ` Dan Streetman [this message]
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=CAOZ2QJOJSFzMZZTRxV4Deq945CbVgzQD9i70FLVWnYL4QWwokQ@mail.gmail.com \
--to=ddstreet@canonical.com \
--cc=berrange@redhat.com \
--cc=christian.ehrhardt@canonical.com \
--cc=mjt@tls.msk.ru \
--cc=qemu-devel@nongnu.org \
--cc=rafael.tinoco@canonical.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).