fix series

2019-01-28 14:32:30 -06:00 · 2019-01-28 14:32:30 -06:00 · 1f33540455
parent e196964170
commit 1f33540455
8 changed files with 88 additions and 9 deletions
--- a/0001-Makefile-eliminate-mistakes-due-to-deprecated-PLATFO.patch
+++ b/0001-Makefile-eliminate-mistakes-due-to-deprecated-PLATFO.patch
@ -1,7 +1,7 @@
 From 46ed395bc516beb1818a88902277dafc28ace7d4 Mon Sep 17 00:00:00 2001
 From: Tw <wei.tan@intel.com>
 Date: Tue, 18 Dec 2018 13:42:53 +0800
-Subject: [PATCH 1/5] Makefile: eliminate mistakes due to deprecated PLATFORM
+Subject: [PATCH 1/6] Makefile: eliminate mistakes due to deprecated PLATFORM

 commit c932faa241af5129e6f096513d04d996b6607be9 master

--- a/0002-Makefile-support-SBL-binary-for-E2E-build.patch
+++ b/0002-Makefile-support-SBL-binary-for-E2E-build.patch
@ -1,7 +1,7 @@
 From 7a1ac37e13bf221ff49bff0ad08e6b0c94369b15 Mon Sep 17 00:00:00 2001
 From: Tw <wei.tan@intel.com>
 Date: Wed, 16 Jan 2019 10:17:01 +0800
-Subject: [PATCH 2/5] Makefile: support SBL binary for E2E build
+Subject: [PATCH 2/6] Makefile: support SBL binary for E2E build

 commit fe35dde42111520d92b7e68ce6475fbb0e4fce60 master

--- a/0003-Makefile-add-rules-for-installing-debug-information.patch
+++ b/0003-Makefile-add-rules-for-installing-debug-information.patch
@ -1,7 +1,7 @@
 From 2c62ea5c8610506d2547a62a92da2be398d9d9f9 Mon Sep 17 00:00:00 2001
 From: Tw <wei.tan@intel.com>
 Date: Tue, 22 Jan 2019 11:12:53 +0800
-Subject: [PATCH 3/5] Makefile: add rules for installing debug information
+Subject: [PATCH 3/6] Makefile: add rules for installing debug information

 commit 862ed16ed74894aa4d5831bc344d5eb91be378f3 master

--- a/0004-Use-MAKE-when-recursing.patch
+++ b/0004-Use-MAKE-when-recursing.patch
@ -1,7 +1,7 @@
 From d909107ab74da0770335c7feef0215c2ba1837ce Mon Sep 17 00:00:00 2001
 From: Ross Burton <ross.burton@intel.com>
 Date: Wed, 16 Jan 2019 21:35:20 +0000
-Subject: [PATCH 4/5] Use $(MAKE) when recursing
+Subject: [PATCH 4/6] Use $(MAKE) when recursing

 commit 5ba4afcffeaf699102c3f46e19cd38d6ca30d6bb master

--- a/0005-hv-Makefile-add-the-dependency-of-LIB_FLAGS.patch
+++ b/0005-hv-Makefile-add-the-dependency-of-LIB_FLAGS.patch
@ -0,0 +1,35 @@
+From 7d8335e53fb647bb58aabc3eea437ce01bc1e38b Mon Sep 17 00:00:00 2001
+From: Shiqing Gao <shiqing.gao@intel.com>
+Date: Tue, 22 Jan 2019 16:14:27 +0800
+Subject: [PATCH 5/6] hv: Makefile: add the dependency of $(LIB_FLAGS)
+
+commit a9709bf857b46610fe26e9449984a0e9cb2 master
+
+This patch adds the dependency of $(LIB_FLAGS) when building .out file.
+So that the target is updated whenever there is a update in
+debug/release library.
+
+Tracked-On: #2389
+Signed-off-by: Shiqing Gao <shiqing.gao@intel.com>
+Reviewed-by: Binbin Wu <binbin.wu@intel.com>
+Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
+---
+ hypervisor/Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hypervisor/Makefile b/hypervisor/Makefile
+index 53cdfc50..f7f76d29 100644
+--- a/hypervisor/Makefile
+++ b/hypervisor/Makefile
+@@ -318,7 +318,7 @@ $(HV_OBJDIR)/$(HV_FILE).32.out: $(HV_OBJDIR)/$(HV_FILE).out
+ $(HV_OBJDIR)/$(HV_FILE).bin: $(HV_OBJDIR)/$(HV_FILE).out
+ 	$(OBJCOPY) -O binary $< $(HV_OBJDIR)/$(HV_FILE).bin
+ 
+-$(HV_OBJDIR)/$(HV_FILE).out: $(C_OBJS) $(S_OBJS)
+$(HV_OBJDIR)/$(HV_FILE).out: $(C_OBJS) $(S_OBJS) $(LIB_FLAGS)
+ 	${BASH} ${LD_IN_TOOL} $(ARCH_LDSCRIPT_IN) $(ARCH_LDSCRIPT) ${HV_OBJDIR}/.config
+ 	$(CC) -Wl,-Map=$(HV_OBJDIR)/$(HV_FILE).map -o $@ $(LDFLAGS) $(ARCH_LDFLAGS) -T$(ARCH_LDSCRIPT) $^ $(LIB_FLAGS)
+ 
+-- 
+2.20.0
+
--- a/0006-Makefile-add-missing-dependency.patch
+++ b/0006-Makefile-add-missing-dependency.patch
@ -1,7 +1,7 @@
-From 294d821bda413223727ab8374f22ad76b28e4cd2 Mon Sep 17 00:00:00 2001
+From 35eef2956da6dc8e8597f67870446edde312482a Mon Sep 17 00:00:00 2001
 From: Tw <wei.tan@intel.com>
 Date: Thu, 24 Jan 2019 13:54:49 +0800
-Subject: [PATCH 5/5] Makefile: add missing dependency
+Subject: [PATCH 6/6] Makefile: add missing dependency

 commit 6584b5476e10524acc67d72deae479a068f7302b master

@ -17,12 +17,12 @@ Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
 1 file changed, 3 insertions(+), 1 deletion(-)

 diff --git a/hypervisor/Makefile b/hypervisor/Makefile
-index 53cdfc50..22b49a3a 100644
+index f7f76d29..beb04b31 100644
 --- a/hypervisor/Makefile
 +++ b/hypervisor/Makefile
@@ -320,7 +320,9 @@ $(HV_OBJDIR)/$(HV_FILE).bin: $(HV_OBJDIR)/$(HV_FILE).out
 
- $(HV_OBJDIR)/$(HV_FILE).out: $(C_OBJS) $(S_OBJS)
+ $(HV_OBJDIR)/$(HV_FILE).out: $(C_OBJS) $(S_OBJS) $(LIB_FLAGS)
 	${BASH} ${LD_IN_TOOL} $(ARCH_LDSCRIPT_IN) $(ARCH_LDSCRIPT) ${HV_OBJDIR}/.config
 -	$(CC) -Wl,-Map=$(HV_OBJDIR)/$(HV_FILE).map -o $@ $(LDFLAGS) $(ARCH_LDFLAGS) -T$(ARCH_LDSCRIPT) $^ $(LIB_FLAGS)
 +	$(CC) -Wl,-Map=$(HV_OBJDIR)/$(HV_FILE).map -o $@ $(LDFLAGS) $(ARCH_LDFLAGS) -T$(ARCH_LDSCRIPT) $^
--- a/0007-Makefile-add-install-samples-up2.patch
+++ b/0007-Makefile-add-install-samples-up2.patch
@ -0,0 +1,42 @@
+From ce515e1c86365beb3756769c4f304fcbc2c3c6b7 Mon Sep 17 00:00:00 2001
+From: Tw <wei.tan@intel.com>
+Date: Mon, 24 Dec 2018 16:57:28 +0800
+Subject: [PATCH] Makefile: add install-samples-up2
+
+commit e5c12a64d544767dc0a1621d684f6513d24d3920 master
+
+Add a rule to add UP2 related samples in rootfs.
+
+Tracked-On: #1995
+Signed-off-by: Tw <wei.tan@intel.com>
+Reviewed-by: Binbin Wu <binbin.wu@intel.com>
+Signed-off-by: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
+---
+ devicemodel/Makefile | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/devicemodel/Makefile b/devicemodel/Makefile
+index b928bbd0..96d2e6ff 100644
+--- a/devicemodel/Makefile
+++ b/devicemodel/Makefile
+@@ -157,6 +157,7 @@ PROGRAM := acrn-dm
+ 
+ SAMPLES_NUC := $(wildcard samples/nuc/*)
+ SAMPLES_MRB := $(wildcard samples/apl-mrb/*)
+SAMPLES_UP2 := $(wildcard samples/up2/*)
+ 
+ BIOS_BIN := $(wildcard bios/*)
+ 
+@@ -211,6 +212,9 @@ $(DM_OBJDIR)/%.o: %.c $(HEADERS)
+ install: $(DM_OBJDIR)/$(PROGRAM) install-samples-nuc install-samples-mrb install-bios install-vmcfg install-samples-up2
+ 	install -D --mode=0755 $(DM_OBJDIR)/$(PROGRAM) $(DESTDIR)/usr/bin/$(PROGRAM)
+ 
+install-samples-up2: $(SAMPLES_UP2)
+	install -D -t $(DESTDIR)/usr/share/acrn/samples/up2 $^
+
+ install-samples-nuc: $(SAMPLES_NUC)
+ 	install -D -t $(DESTDIR)/usr/share/acrn/samples/nuc $^
+ 
+-- 
+2.20.0
+
--- a/4
+++ b/4
@ -3,4 +3,6 @@
 0002-Makefile-support-SBL-binary-for-E2E-build.patch
 0003-Makefile-add-rules-for-installing-debug-information.patch
 0004-Use-MAKE-when-recursing.patch
-0005-Makefile-add-missing-dependency.patch
+0005-hv-Makefile-add-the-dependency-of-LIB_FLAGS.patch
+0006-Makefile-add-missing-dependency.patch
+0007-Makefile-add-install-samples-up2.patch