* [PATCH] tools: only call git when necessary in OVMF Makefile
@ 2019-01-15 11:09 Wei Liu
2019-01-15 11:13 ` Anthony PERARD
` (2 more replies)
0 siblings, 3 replies; 9+ messages in thread
From: Wei Liu @ 2019-01-15 11:09 UTC (permalink / raw)
To: xen-devel; +Cc: Anthony PERARD, Ian Jackson, Olaf Hering, Wei Liu
Users may choose to export a snapshot of OVMF and build it
with xen.git supplied ovmf-makefile. In that case we don't
need to call `git submodule`.
Fixes b16281870e.
Reported-by: Olaf Hering <olaf@aepfle.de>
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
---
tools/firmware/ovmf-makefile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
index 3de2fc0300..55f9992145 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
+ if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4
cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin
--
2.11.0
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply related [flat|nested] 9+ messages in thread* Re: [PATCH] tools: only call git when necessary in OVMF Makefile
2019-01-15 11:09 [PATCH] tools: only call git when necessary in OVMF Makefile Wei Liu
@ 2019-01-15 11:13 ` Anthony PERARD
2019-01-15 11:27 ` Andrew Cooper
2019-01-15 11:40 ` Wei Liu
2 siblings, 0 replies; 9+ messages in thread
From: Anthony PERARD @ 2019-01-15 11:13 UTC (permalink / raw)
To: Wei Liu; +Cc: xen-devel, Olaf Hering, Ian Jackson
On Tue, Jan 15, 2019 at 11:09:40AM +0000, Wei Liu wrote:
> Users may choose to export a snapshot of OVMF and build it
> with xen.git supplied ovmf-makefile. In that case we don't
> need to call `git submodule`.
>
> Fixes b16281870e.
>
> Reported-by: Olaf Hering <olaf@aepfle.de>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
> ---
> tools/firmware/ovmf-makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
> index 3de2fc0300..55f9992145 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
> + if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
> OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4
> cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin
>
> --
> 2.11.0
>
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] tools: only call git when necessary in OVMF Makefile
2019-01-15 11:09 [PATCH] tools: only call git when necessary in OVMF Makefile Wei Liu
2019-01-15 11:13 ` Anthony PERARD
@ 2019-01-15 11:27 ` Andrew Cooper
2019-01-15 11:29 ` Wei Liu
2019-01-15 11:40 ` Wei Liu
2 siblings, 1 reply; 9+ messages in thread
From: Andrew Cooper @ 2019-01-15 11:27 UTC (permalink / raw)
To: Wei Liu, xen-devel; +Cc: Anthony PERARD, Olaf Hering, Ian Jackson
On 15/01/2019 11:09, Wei Liu wrote:
> Users may choose to export a snapshot of OVMF and build it
> with xen.git supplied ovmf-makefile. In that case we don't
> need to call `git submodule`.
>
> Fixes b16281870e.
>
> Reported-by: Olaf Hering <olaf@aepfle.de>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/firmware/ovmf-makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
> index 3de2fc0300..55f9992145 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
> + if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
You want -d rather than -e.
~Andrew
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] tools: only call git when necessary in OVMF Makefile
2019-01-15 11:27 ` Andrew Cooper
@ 2019-01-15 11:29 ` Wei Liu
2019-01-15 11:33 ` Andrew Cooper
2019-01-15 11:36 ` Anthony PERARD
0 siblings, 2 replies; 9+ messages in thread
From: Wei Liu @ 2019-01-15 11:29 UTC (permalink / raw)
To: Andrew Cooper
Cc: Anthony PERARD, xen-devel, Olaf Hering, Wei Liu, Ian Jackson
On Tue, Jan 15, 2019 at 11:27:12AM +0000, Andrew Cooper wrote:
> On 15/01/2019 11:09, Wei Liu wrote:
> > Users may choose to export a snapshot of OVMF and build it
> > with xen.git supplied ovmf-makefile. In that case we don't
> > need to call `git submodule`.
> >
> > Fixes b16281870e.
> >
> > Reported-by: Olaf Hering <olaf@aepfle.de>
> > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > ---
> > tools/firmware/ovmf-makefile | 2 +-
> > 1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
> > index 3de2fc0300..55f9992145 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
> > + if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
>
> You want -d rather than -e.
Anthony said .git could be a link.
Wei.
>
> ~Andrew
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] tools: only call git when necessary in OVMF Makefile
2019-01-15 11:29 ` Wei Liu
@ 2019-01-15 11:33 ` Andrew Cooper
2019-01-15 11:36 ` Anthony PERARD
1 sibling, 0 replies; 9+ messages in thread
From: Andrew Cooper @ 2019-01-15 11:33 UTC (permalink / raw)
To: Wei Liu; +Cc: Anthony PERARD, xen-devel, Olaf Hering, Ian Jackson
On 15/01/2019 11:29, Wei Liu wrote:
> On Tue, Jan 15, 2019 at 11:27:12AM +0000, Andrew Cooper wrote:
>> On 15/01/2019 11:09, Wei Liu wrote:
>>> Users may choose to export a snapshot of OVMF and build it
>>> with xen.git supplied ovmf-makefile. In that case we don't
>>> need to call `git submodule`.
>>>
>>> Fixes b16281870e.
>>>
>>> Reported-by: Olaf Hering <olaf@aepfle.de>
>>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
>>> ---
>>> tools/firmware/ovmf-makefile | 2 +-
>>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>>
>>> diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
>>> index 3de2fc0300..55f9992145 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
>>> + if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
>> You want -d rather than -e.
> Anthony said .git could be a link.
Hmm - so it can...
You get some weird effects with it being a link, but git does seem to
tolerate it.
Sorry for the noise.
~Andrew
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] tools: only call git when necessary in OVMF Makefile
2019-01-15 11:29 ` Wei Liu
2019-01-15 11:33 ` Andrew Cooper
@ 2019-01-15 11:36 ` Anthony PERARD
2019-01-15 11:39 ` Wei Liu
1 sibling, 1 reply; 9+ messages in thread
From: Anthony PERARD @ 2019-01-15 11:36 UTC (permalink / raw)
To: Wei Liu; +Cc: Andrew Cooper, Olaf Hering, Ian Jackson, xen-devel
On Tue, Jan 15, 2019 at 11:29:38AM +0000, Wei Liu wrote:
> On Tue, Jan 15, 2019 at 11:27:12AM +0000, Andrew Cooper wrote:
> > On 15/01/2019 11:09, Wei Liu wrote:
> > > Users may choose to export a snapshot of OVMF and build it
> > > with xen.git supplied ovmf-makefile. In that case we don't
> > > need to call `git submodule`.
> > >
> > > Fixes b16281870e.
> > >
> > > Reported-by: Olaf Hering <olaf@aepfle.de>
> > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > > ---
> > > tools/firmware/ovmf-makefile | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
> > > index 3de2fc0300..55f9992145 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
> > > + if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
> >
> > You want -d rather than -e.
>
> Anthony said .git could be a link.
Actually, it can be a file. Example when `git worktree add` as been
used:
$ ls -l .git
-rw-r--r-- 1 user users 59 Dec 6 14:23 .git
$ cat .git
gitdir: /local/home/user/work/xen/.git/worktrees/git.72d1
And that's a submodule:
$ ls -l .git
-rw-r--r-- 1 user users 43 Oct 18 2017 .git
$ cat .git
gitdir: ../../.git/modules/ui/keycodemapdb
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] tools: only call git when necessary in OVMF Makefile
2019-01-15 11:36 ` Anthony PERARD
@ 2019-01-15 11:39 ` Wei Liu
0 siblings, 0 replies; 9+ messages in thread
From: Wei Liu @ 2019-01-15 11:39 UTC (permalink / raw)
To: Anthony PERARD
Cc: Andrew Cooper, Olaf Hering, Wei Liu, Ian Jackson, xen-devel
On Tue, Jan 15, 2019 at 11:36:42AM +0000, Anthony PERARD wrote:
> On Tue, Jan 15, 2019 at 11:29:38AM +0000, Wei Liu wrote:
> > On Tue, Jan 15, 2019 at 11:27:12AM +0000, Andrew Cooper wrote:
> > > On 15/01/2019 11:09, Wei Liu wrote:
> > > > Users may choose to export a snapshot of OVMF and build it
> > > > with xen.git supplied ovmf-makefile. In that case we don't
> > > > need to call `git submodule`.
> > > >
> > > > Fixes b16281870e.
> > > >
> > > > Reported-by: Olaf Hering <olaf@aepfle.de>
> > > > Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> > > > ---
> > > > tools/firmware/ovmf-makefile | 2 +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > >
> > > > diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
> > > > index 3de2fc0300..55f9992145 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
> > > > + if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
> > >
> > > You want -d rather than -e.
> >
> > Anthony said .git could be a link.
>
> Actually, it can be a file. Example when `git worktree add` as been
> used:
>
> $ ls -l .git
> -rw-r--r-- 1 user users 59 Dec 6 14:23 .git
> $ cat .git
> gitdir: /local/home/user/work/xen/.git/worktrees/git.72d1
>
> And that's a submodule:
>
> $ ls -l .git
> -rw-r--r-- 1 user users 43 Oct 18 2017 .git
> $ cat .git
> gitdir: ../../.git/modules/ui/keycodemapdb
My bad. Not enough caffeine in the morning.
This patch still stands though.
Wei.
>
> --
> Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] tools: only call git when necessary in OVMF Makefile
2019-01-15 11:09 [PATCH] tools: only call git when necessary in OVMF Makefile Wei Liu
2019-01-15 11:13 ` Anthony PERARD
2019-01-15 11:27 ` Andrew Cooper
@ 2019-01-15 11:40 ` Wei Liu
2019-01-15 11:41 ` Juergen Gross
2 siblings, 1 reply; 9+ messages in thread
From: Wei Liu @ 2019-01-15 11:40 UTC (permalink / raw)
To: xen-devel
Cc: Anthony PERARD, Ian Jackson, Olaf Hering, Wei Liu, Juergen Gross
Forgot to CC Juergen. Now done.
On Tue, Jan 15, 2019 at 11:09:40AM +0000, Wei Liu wrote:
> Users may choose to export a snapshot of OVMF and build it
> with xen.git supplied ovmf-makefile. In that case we don't
> need to call `git submodule`.
>
> Fixes b16281870e.
>
> Reported-by: Olaf Hering <olaf@aepfle.de>
> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
> tools/firmware/ovmf-makefile | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
> index 3de2fc0300..55f9992145 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
> + if test -e .git ; then $(GIT) submodule update --init --recursive ; fi
> OvmfPkg/build.sh -a X64 -b $(TARGET) -n 4
> cp Build/OvmfX64/$(TARGET)_GCC*/FV/OVMF.fd ovmf.bin
>
> --
> 2.11.0
>
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] tools: only call git when necessary in OVMF Makefile
2019-01-15 11:40 ` Wei Liu
@ 2019-01-15 11:41 ` Juergen Gross
0 siblings, 0 replies; 9+ messages in thread
From: Juergen Gross @ 2019-01-15 11:41 UTC (permalink / raw)
To: Wei Liu, xen-devel; +Cc: Anthony PERARD, Olaf Hering, Ian Jackson
On 15/01/2019 12:40, Wei Liu wrote:
> Forgot to CC Juergen. Now done.
>
> On Tue, Jan 15, 2019 at 11:09:40AM +0000, Wei Liu wrote:
>> Users may choose to export a snapshot of OVMF and build it
>> with xen.git supplied ovmf-makefile. In that case we don't
>> need to call `git submodule`.
>>
>> Fixes b16281870e.
>>
>> Reported-by: Olaf Hering <olaf@aepfle.de>
>> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Release-acked-by: Juergen Gross <jgross@suse.com>
Juergen
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xenproject.org
https://lists.xenproject.org/mailman/listinfo/xen-devel
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2019-01-15 11:41 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-01-15 11:09 [PATCH] tools: only call git when necessary in OVMF Makefile Wei Liu
2019-01-15 11:13 ` Anthony PERARD
2019-01-15 11:27 ` Andrew Cooper
2019-01-15 11:29 ` Wei Liu
2019-01-15 11:33 ` Andrew Cooper
2019-01-15 11:36 ` Anthony PERARD
2019-01-15 11:39 ` Wei Liu
2019-01-15 11:40 ` Wei Liu
2019-01-15 11:41 ` Juergen Gross
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.