From 4061e2e9dd28f4d85f0b6e9bc7f3756b26a7c1a6 Mon Sep 17 00:00:00 2001 From: Miguel Bernal Marin Date: Fri, 15 Mar 2019 14:29:58 +0000 Subject: [PATCH] acrn-hypervisor: update to acrn-2019w11.5-140000p David B. Kinder (3): doc: add 0.7 release notes doc: add v0.7 version to master branch (/latest) doc: fix utf-8 punctuation, branding, spelling Qi Yadong (3): doc: fix wrong desciption of trusty's memory mapping hv: trusty: refine control registers switching method hv: seed: refine header file Zhao Yakui (2): acrn/dm: Remove the memory leak in gvt mediator ACRN/DM: Destroy the created pci_device iterator to fix memory leak in passthru_init Binbin Wu (1): hv: vtd: check bus number when assign/unassign device Jack Ren (1): version: 0.8-unstable Kaige Fu (1): DM: Mark thre_int_pending as true when THR is empty Minggui Cao (1): DM: fix memory leak Shiqing Gao (1): doc: add some rules related to naming convention Tw (1): Makefile: build for apl-nuc by default Zide Chen (1): hv: cleanup some hva/hpa conversion code liuygzhuli (1): Tools: Acrnd fix reporting unnecessary error on NUC and UP2 wenlingz (1): remove apl_sdc_stable branch story --- Makefile | 2 +- acrn-hypervisor.spec | 20 +++++++++++++------- options.conf | 2 +- release | 2 +- upstream | 2 +- 5 files changed, 17 insertions(+), 11 deletions(-) diff --git a/Makefile b/Makefile index 7e4e6e7..27aefab 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := acrn-hypervisor -URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.4-140000p.tar.gz +URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.5-140000p.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/acrn-hypervisor.spec b/acrn-hypervisor.spec index 712bd81..b8f75b7 100644 --- a/acrn-hypervisor.spec +++ b/acrn-hypervisor.spec @@ -4,10 +4,10 @@ # %define keepstatic 1 Name : acrn-hypervisor -Version : 2019w11.4.140000p -Release : 172 -URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.4-140000p.tar.gz -Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.4-140000p.tar.gz +Version : 2019w11.5.140000p +Release : 173 +URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.5-140000p.tar.gz +Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.5-140000p.tar.gz Summary : No detailed summary available Group : Development/Tools License : BSD-3-Clause CC-BY-4.0 ISC @@ -117,20 +117,20 @@ services components for the acrn-hypervisor package. %prep -%setup -q -n acrn-hypervisor-acrn-2019w11.4-140000p +%setup -q -n acrn-hypervisor-acrn-2019w11.5-140000p %build 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=1552559410 +export SOURCE_DATE_EPOCH=1552660191 export LDFLAGS="${LDFLAGS} -fno-lto" make %{?_smp_mflags} all sbl-hypervisor BUILD_VERSION=”%{version}_%{release}” BUILD_TAG=”%{version}” %install -export SOURCE_DATE_EPOCH=1552559410 +export SOURCE_DATE_EPOCH=1552660191 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/acrn-hypervisor cp LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/LICENSE @@ -150,11 +150,14 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v %files %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.apl-up2.sbl /usr/lib/acrn/acrn.apl-up2.sbl.map /usr/lib/acrn/acrn.apl-up2.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 @@ -206,6 +209,7 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v /usr/share/acrn/samples/apl-up2/launch_uos.sh /usr/share/acrn/samples/apl-up2/sos_bootargs_debug.txt /usr/share/acrn/samples/apl-up2/sos_bootargs_release.txt +/usr/share/acrn/samples/nuc/acrn.conf /usr/share/acrn/samples/nuc/launch_hard_rt_vm.sh /usr/share/acrn/samples/nuc/launch_uos.sh /usr/share/acrn/samples/nuc/launch_zephyr.sh @@ -220,6 +224,8 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v %files extras %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 diff --git a/options.conf b/options.conf index 3427118..92360d0 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = acrn-hypervisor -url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.4-140000p.tar.gz +url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.5-140000p.tar.gz archives = giturl = https://github.com/projectacrn/acrn-hypervisor.git diff --git a/release b/release index 730a054..c4597e5 100644 --- a/release +++ b/release @@ -1 +1 @@ -172 +173 diff --git a/upstream b/upstream index a343dba..4ef2fe5 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -51c8363ac970df2028429c131178dfd6c861cd5c/acrn-2019w11.4-140000p.tar.gz +ee0eea72f488da4e47beee7c33a5ce71c010121d/acrn-2019w11.5-140000p.tar.gz