From: Anthony PERARD <anthony.perard@citrix.com>
To: Wei Liu <wei.liu2@citrix.com>
Cc: xen-devel@lists.xenproject.org, Olaf Hering <olaf@aepfle.de>,
Ian Jackson <ian.jackson@eu.citrix.com>
Subject: Re: [PATCH] tools/firmware: update OVMF Makefile
Date: Mon, 14 Jan 2019 18:22:48 +0000 [thread overview]
Message-ID: <20190114182248.GC1271@perard.uk.xensource.com> (raw)
In-Reply-To: <20190114174457.mlrzxcjtyklim5gc@zion.uk.xensource.com>
On Mon, Jan 14, 2019 at 05:44:57PM +0000, Wei Liu wrote:
> On Mon, Jan 14, 2019 at 06:27:44PM +0100, Olaf Hering wrote:
> > Am Mon, 14 Jan 2019 17:11:56 +0000
> > schrieb Anthony PERARD <anthony.perard@citrix.com>:
> >
> > > I think it's fine to keep the current `submodule update` call where it
> > > is. We could just make it check that it's an actual git worktree by
> > > checking for the presence of ".git" (file or directory) before executing
> > > git.
> > >
> > > Would that be good enough?
> >
> > Maybe. Whatever works with env WGET/GIT=/bin/false ./configure $options.
> >
>
> Can you try this?
>
> diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
> index 3de2fc0300..649482bca8 100644
> --- a/tools/firmware/ovmf-makefile
> +++ b/tools/firmware/ovmf-makefile
> @@ -16,7 +16,7 @@ all: build
>
> .PHONY: build
> build:
> - $(GIT) submodule update --init --recursive
> + [ -d .git ] && $(GIT) submodule update --init --recursive
Please, use -e or -r, it is perfectly reasonable to have .git been a
file. (someone could use `git worktree`, or even a submodule)
Also, I think we should use `if`, As make must not fail if it isn't a
git worktree. (or "|| true" or "||:", but that would hide git failures.)
> OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4
> cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin
>
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
next prev parent reply other threads:[~2019-01-14 18:24 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-11-28 17:43 [PATCH] tools/firmware: update OVMF Makefile Wei Liu
2018-11-28 17:47 ` Wei Liu
2018-11-29 11:31 ` Anthony PERARD
2018-11-29 11:39 ` Wei Liu
2018-11-29 12:02 ` Anthony PERARD
2018-11-29 13:03 ` Wei Liu
2019-01-09 10:58 ` Anthony PERARD
2019-01-09 11:11 ` Wei Liu
2019-01-09 14:56 ` Tamas K Lengyel
2019-01-09 14:56 ` Tamas K Lengyel
2019-01-09 15:46 ` Anthony PERARD
2019-01-09 16:03 ` Tamas K Lengyel
2019-01-09 18:27 ` Anthony PERARD
2019-01-13 20:17 ` Olaf Hering
2019-01-14 11:28 ` Wei Liu
2019-01-14 11:48 ` Olaf Hering
2019-01-14 17:11 ` Anthony PERARD
2019-01-14 17:27 ` Olaf Hering
2019-01-14 17:44 ` Wei Liu
2019-01-14 18:22 ` Anthony PERARD [this message]
2019-01-14 19:22 ` Olaf Hering
2019-01-14 17:42 ` Wei Liu
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=20190114182248.GC1271@perard.uk.xensource.com \
--to=anthony.perard@citrix.com \
--cc=ian.jackson@eu.citrix.com \
--cc=olaf@aepfle.de \
--cc=wei.liu2@citrix.com \
--cc=xen-devel@lists.xenproject.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.