All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ian Jackson <ian.jackson@citrix.com>
To: Wei Liu <wei.liu2@citrix.com>,
	Anthony PERARD <anthony.perard@citrix.com>,
	Olaf Hering <olaf@aepfle.de>, Juergen Gross <jgross@suse.com>,
	Jan Beulich <JBeulich@suse.com>
Cc: xen-devel@lists.xenproject.org
Subject: [PATCH STABLE] tools/firmware: update OVMF Makefile, when necessary
Date: Mon, 29 Apr 2019 16:26:38 +0100	[thread overview]
Message-ID: <23751.6062.590245.436664@mariner.uk.xensource.com> (raw)

On advice from Wei, I am about to push this squashed backport to the
stable trees.  We think this will help fix osstest on those branches
following the upgrade to Debian stretch.

Ian.

From e983e8ae84efd5e43045a3d20a820f13cb4a75bf Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@citrix.com>
Date: Wed, 28 Nov 2018 17:43:33 +0000
Subject: [PATCH] tools/firmware: update OVMF Makefile, when necessary

[ This is two commits from master aka staging-4.12: ]

OVMF has become dependent on OpenSSL, which is included as a
submodule.  Initialise submodules before building.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
(cherry picked from commit b16281870e06f5f526029a4e69634a16dc38e8e4)

tools: only call git when necessary in OVMF Makefile

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>
Release-acked-by: Juergen Gross <jgross@suse.com>
(cherry picked from commit 68292c94a60eab24514ab4a8e4772af24dead807)
---
 tools/firmware/ovmf-makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
index 2838744461..55f9992145 100644
--- a/tools/firmware/ovmf-makefile
+++ b/tools/firmware/ovmf-makefile
@@ -16,6 +16,7 @@ all: build
 
 .PHONY: build
 build:
+	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

WARNING: multiple messages have this Message-ID (diff)
From: Ian Jackson <ian.jackson@citrix.com>
To: Wei Liu <wei.liu2@citrix.com>,
	Anthony PERARD <anthony.perard@citrix.com>,
	 Olaf Hering <olaf@aepfle.de>, Juergen Gross <jgross@suse.com>,
	Jan Beulich <JBeulich@suse.com>
Cc: xen-devel@lists.xenproject.org
Subject: [Xen-devel] [PATCH STABLE] tools/firmware: update OVMF Makefile, when necessary
Date: Mon, 29 Apr 2019 16:26:38 +0100	[thread overview]
Message-ID: <23751.6062.590245.436664@mariner.uk.xensource.com> (raw)
Message-ID: <20190429152638.JWHpz76eLltXybxrV3LlE1Ni6kQXc9n2zXE58YlQUYM@z> (raw)

On advice from Wei, I am about to push this squashed backport to the
stable trees.  We think this will help fix osstest on those branches
following the upgrade to Debian stretch.

Ian.

From e983e8ae84efd5e43045a3d20a820f13cb4a75bf Mon Sep 17 00:00:00 2001
From: Wei Liu <wei.liu2@citrix.com>
Date: Wed, 28 Nov 2018 17:43:33 +0000
Subject: [PATCH] tools/firmware: update OVMF Makefile, when necessary

[ This is two commits from master aka staging-4.12: ]

OVMF has become dependent on OpenSSL, which is included as a
submodule.  Initialise submodules before building.

Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Anthony PERARD <anthony.perard@citrix.com>
(cherry picked from commit b16281870e06f5f526029a4e69634a16dc38e8e4)

tools: only call git when necessary in OVMF Makefile

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>
Release-acked-by: Juergen Gross <jgross@suse.com>
(cherry picked from commit 68292c94a60eab24514ab4a8e4772af24dead807)
---
 tools/firmware/ovmf-makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tools/firmware/ovmf-makefile b/tools/firmware/ovmf-makefile
index 2838744461..55f9992145 100644
--- a/tools/firmware/ovmf-makefile
+++ b/tools/firmware/ovmf-makefile
@@ -16,6 +16,7 @@ all: build
 
 .PHONY: build
 build:
+	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

             reply	other threads:[~2019-04-29 15:26 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-29 15:26 Ian Jackson [this message]
2019-04-29 15:26 ` [Xen-devel] [PATCH STABLE] tools/firmware: update OVMF Makefile, when necessary Ian Jackson
2019-04-29 15:30 ` Ian Jackson
2019-04-29 15:30   ` [Xen-devel] " Ian Jackson
2019-05-01 10:41   ` Ian Jackson
2019-05-01 10:41     ` [Xen-devel] " Ian Jackson
2019-05-07 11:09   ` [PATCH STABLE] tools/firmware: update OVMF Makefile, when necessaryf Ian Jackson
2019-05-07 11:09     ` [Xen-devel] " Ian Jackson
2019-05-28 19:59   ` Stable trees (4.6 and 4.7), building on stretch, osstest, redux Ian Jackson
2019-05-28 19:59     ` [Xen-devel] " Ian Jackson
2019-05-29  6:36     ` Olaf Hering
2019-05-29  6:36       ` [Xen-devel] " Olaf Hering
2019-05-29  7:49     ` Jan Beulich
2019-05-29  7:49       ` [Xen-devel] " Jan Beulich
2019-05-29 10:35       ` Ian Jackson
2019-05-29 10:35         ` [Xen-devel] " Ian Jackson
2019-05-29 11:38     ` Ian Jackson
2019-05-29 11:38       ` [Xen-devel] " Ian Jackson
2019-05-30 12:57       ` Ian Jackson
2019-05-30 12:57         ` [Xen-devel] " Ian Jackson

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=23751.6062.590245.436664@mariner.uk.xensource.com \
    --to=ian.jackson@citrix.com \
    --cc=JBeulich@suse.com \
    --cc=anthony.perard@citrix.com \
    --cc=jgross@suse.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.