acrn-hypervisor: Autospec creation for update from version 2018w50.5.140000p to version 2018w51.2.140000p
This commit is contained in:
Alek Du
parent
1b86ba16ec
commit
e8b139de06
|
|
@ -1,31 +1,38 @@
|
|||
From 017c7440431ceba7db32f268089ad4a1ea7e1c4a Mon Sep 17 00:00:00 2001
|
||||
From d0f368de3346046cec06bfff79e223c309c6846d Mon Sep 17 00:00:00 2001
|
||||
From: Alek Du <alek.du@intel.com>
|
||||
Date: Fri, 7 Dec 2018 09:18:42 +0000
|
||||
Subject: [PATCH] add install debug target
|
||||
Date: Wed, 19 Dec 2018 13:06:37 +0000
|
||||
Subject: [PATCH 1/2] add install debug target
|
||||
|
||||
Rebased according to 2018ww49.5 acrn release.
|
||||
Rebased according to 2018ww51.2 acrn release.
|
||||
|
||||
Signed-off-by: Alek Du <alek.du@intel.com>
|
||||
---
|
||||
hypervisor/Makefile | 8 ++++++++
|
||||
1 file changed, 8 insertions(+)
|
||||
efi-stub/Makefile | 4 ++++
|
||||
hypervisor/Makefile | 4 ++++
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/hypervisor/Makefile b/hypervisor/Makefile
|
||||
index bc68c15..989cf85 100644
|
||||
--- a/hypervisor/Makefile
|
||||
+++ b/hypervisor/Makefile
|
||||
@@ -282,11 +282,19 @@ efi: $(HV_OBJDIR)/$(HV_FILE).bin
|
||||
diff --git a/efi-stub/Makefile b/efi-stub/Makefile
|
||||
index f5390ca..da42a7d 100644
|
||||
--- a/efi-stub/Makefile
|
||||
+++ b/efi-stub/Makefile
|
||||
@@ -89,6 +89,10 @@ all: $(EFIBIN)
|
||||
install: $(EFIBIN) install-conf
|
||||
install -D $(EFIBIN) $(DESTDIR)/usr/lib/acrn/$(HV_FILE).efi
|
||||
|
||||
install: efi
|
||||
make -C bsp/uefi/efi HV_OBJDIR=$(HV_OBJDIR) install
|
||||
+
|
||||
+install-debug: $(HV_OBJDIR)/$(HV_FILE).map $(HV_OBJDIR)/$(HV_FILE).out
|
||||
+ install -D $(HV_OBJDIR)/$(HV_FILE).out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).efi.out
|
||||
+ install -D $(HV_OBJDIR)/$(HV_FILE).map $(DESTDIR)/usr/lib/acrn/$(HV_FILE).efi.map
|
||||
endif
|
||||
+
|
||||
$(EFIBIN): $(BOOT)
|
||||
|
||||
$(EFI_OBJDIR)/boot.efi: $(EFI_OBJDIR)/boot.so
|
||||
diff --git a/hypervisor/Makefile b/hypervisor/Makefile
|
||||
index c9e88ba..f9a002e 100644
|
||||
--- a/hypervisor/Makefile
|
||||
+++ b/hypervisor/Makefile
|
||||
@@ -279,6 +279,10 @@ all: lib $(HV_OBJDIR)/$(HV_FILE).32.out $(HV_OBJDIR)/$(HV_FILE).bin
|
||||
ifeq ($(CONFIG_PLATFORM_SBL),y)
|
||||
install: $(HV_OBJDIR)/$(HV_FILE).32.out
|
||||
install: lib $(HV_OBJDIR)/$(HV_FILE).32.out
|
||||
install -D $(HV_OBJDIR)/$(HV_FILE).32.out $(DESTDIR)/usr/lib/acrn/$(HV_FILE).sbl
|
||||
+
|
||||
+install-debug: $(HV_OBJDIR)/$(HV_FILE).map $(HV_OBJDIR)/$(HV_FILE).out
|
||||
|
|
@ -35,5 +42,5 @@ index bc68c15..989cf85 100644
|
|||
|
||||
.PHONY: header
|
||||
--
|
||||
2.19.1
|
||||
2.19.2
|
||||
|
||||
|
|
|
|||
|
|
@ -1,29 +1,33 @@
|
|||
From 2fdd6d9a21299db3df6227a64ae8d1956fe8ae5f Mon Sep 17 00:00:00 2001
|
||||
From: Miguel Bernal Marin <miguel.bernal.marin@linux.intel.com>
|
||||
Date: Tue, 9 Oct 2018 15:28:30 -0500
|
||||
Subject: [PATCH] makefile: install-debug
|
||||
From 8cfc0cdbcd2931d335abefe93dc441527a008c3a Mon Sep 17 00:00:00 2001
|
||||
From: Alek Du <alek.du@intel.com>
|
||||
Date: Wed, 19 Dec 2018 13:14:12 +0000
|
||||
Subject: [PATCH 2/2] makefile: install-debug
|
||||
|
||||
Signed-off-by: Alek Du <alek.du@intel.com>
|
||||
---
|
||||
Makefile | 6 ++++++
|
||||
1 file changed, 6 insertions(+)
|
||||
Makefile | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index e45451d8..faf7a3c4 100644
|
||||
index e7b7ffa..0aa6bd7 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -52,6 +52,12 @@ hypervisor-install:
|
||||
sbl-hypervisor-install:
|
||||
make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl PLATFORM=sbl RELEASE=$(RELEASE) install
|
||||
@@ -87,7 +87,14 @@ ifeq ($(PLATFORM),uefi)
|
||||
endif
|
||||
|
||||
sbl-hypervisor-install:
|
||||
- make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE) install
|
||||
+ make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl BOARD=apl-mrb FIRMWARE=sbl RELEASE=$(RELEASE) install
|
||||
+
|
||||
+hypervisor-install-debug:
|
||||
+ make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) install-debug
|
||||
+ make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) BOARD=$(BOARD) FIRMWARE=$(FIRMWARE) RELEASE=$(RELEASE)
|
||||
+ make -C $(T)/efi-stub HV_OBJDIR=$(HV_OUT) EFI_OBJDIR=$(EFI_OUT) all install-debug
|
||||
+
|
||||
+sbl-hypervisor-install-debug:
|
||||
+ make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT)-sbl PLATFORM=sbl RELEASE=$(RELEASE) install-debug
|
||||
+
|
||||
|
||||
devicemodel-install:
|
||||
make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install
|
||||
|
||||
--
|
||||
2.19.1
|
||||
2.19.2
|
||||
|
||||
|
|
|
|||
2
Makefile
2
Makefile
|
|
@ -1,5 +1,5 @@
|
|||
PKG_NAME := acrn-hypervisor
|
||||
URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w50.5-140000p.tar.gz
|
||||
URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w51.2-140000p.tar.gz
|
||||
ARCHIVES =
|
||||
|
||||
include ../common/Makefile.common
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@
|
|||
#
|
||||
%define keepstatic 1
|
||||
Name : acrn-hypervisor
|
||||
Version : 2018w50.5.140000p
|
||||
Release : 133
|
||||
URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w50.5-140000p.tar.gz
|
||||
Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w50.5-140000p.tar.gz
|
||||
Version : 2018w51.2.140000p
|
||||
Release : 134
|
||||
URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w51.2-140000p.tar.gz
|
||||
Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w51.2-140000p.tar.gz
|
||||
Summary : No detailed summary available
|
||||
Group : Development/Tools
|
||||
License : BSD-3-Clause CC-BY-4.0 ISC
|
||||
|
|
@ -120,7 +120,7 @@ services components for the acrn-hypervisor package.
|
|||
|
||||
|
||||
%prep
|
||||
%setup -q -n acrn-hypervisor-acrn-2018w50.5-140000p
|
||||
%setup -q -n acrn-hypervisor-acrn-2018w51.2-140000p
|
||||
%patch1 -p1
|
||||
%patch2 -p1
|
||||
%patch3 -p1
|
||||
|
|
@ -130,12 +130,12 @@ export http_proxy=http://127.0.0.1:9/
|
|||
export https_proxy=http://127.0.0.1:9/
|
||||
export no_proxy=localhost,127.0.0.1,0.0.0.0
|
||||
export LANG=C
|
||||
export SOURCE_DATE_EPOCH=1545007479
|
||||
export SOURCE_DATE_EPOCH=1545226910
|
||||
make %{?_smp_mflags} all sbl-hypervisor BUILD_VERSION=”%{version}_%{release}” BUILD_TAG=”%{version}”
|
||||
|
||||
|
||||
%install
|
||||
export SOURCE_DATE_EPOCH=1545007479
|
||||
export SOURCE_DATE_EPOCH=1545226910
|
||||
rm -rf %{buildroot}
|
||||
mkdir -p %{buildroot}/usr/share/package-licenses/acrn-hypervisor
|
||||
cp LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/LICENSE
|
||||
|
|
@ -157,7 +157,10 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v
|
|||
%defattr(-,root,root,-)
|
||||
%exclude /usr/lib/acrn/acrn.efi.map
|
||||
%exclude /usr/lib/acrn/acrn.efi.out
|
||||
%exclude /usr/lib/acrn/acrn.sbl.map
|
||||
%exclude /usr/lib/acrn/acrn.sbl.out
|
||||
/usr/lib/acrn/acrn.efi
|
||||
/usr/lib/acrn/acrn.sbl
|
||||
/usr/lib/systemd/network/50-acrn.netdev
|
||||
/usr/lib/systemd/network/50-acrn.network
|
||||
/usr/lib/systemd/network/50-acrn_tap0.netdev
|
||||
|
|
@ -218,6 +221,8 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v
|
|||
%defattr(-,root,root,-)
|
||||
/usr/lib/acrn/acrn.efi.map
|
||||
/usr/lib/acrn/acrn.efi.out
|
||||
/usr/lib/acrn/acrn.sbl.map
|
||||
/usr/lib/acrn/acrn.sbl.out
|
||||
|
||||
%files license
|
||||
%defattr(0644,root,root,0755)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = acrn-hypervisor
|
||||
url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w50.5-140000p.tar.gz
|
||||
url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w51.2-140000p.tar.gz
|
||||
archives =
|
||||
giturl = https://github.com/projectacrn/acrn-hypervisor.git
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue