From 4e5b9b01a5ddc6fa7323ebfd7770c1da40e5c804 Mon Sep 17 00:00:00 2001 From: Miguel Bernal Marin Date: Thu, 19 Mar 2020 02:29:54 -0600 Subject: [PATCH] acrn-hypervisor: update to acrn-2020w12.3-140000p Wei Liu (2): acrn-config: add missed include in pci_dev.c for logical partition acrn-config: fix missing passthru parameter for launch config Yuan Liu (1): hv: unmap SR-IOV VF MMIO when the VF physical device is disabled --- Makefile | 2 +- acrn-hypervisor.spec | 26 +++++++++++++------------- buildreq_cache | 2 +- options.conf | 2 +- release | 2 +- upstream | 2 +- versions | 2 +- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/Makefile b/Makefile index 69bae92..a47f1b4 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := acrn-hypervisor -URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2020w12.1-140000p.tar.gz +URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2020w12.3-140000p.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/acrn-hypervisor.spec b/acrn-hypervisor.spec index 89a5b6f..1529fb1 100644 --- a/acrn-hypervisor.spec +++ b/acrn-hypervisor.spec @@ -4,10 +4,10 @@ # %define keepstatic 1 Name : acrn-hypervisor -Version : 2020w12.1.140000p -Release : 271 -URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2020w12.1-140000p.tar.gz -Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2020w12.1-140000p.tar.gz +Version : 2020w12.3.140000p +Release : 272 +URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2020w12.3-140000p.tar.gz +Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2020w12.3-140000p.tar.gz Summary : No detailed summary available Group : Development/Tools License : BSD-3-Clause CC-BY-4.0 ISC @@ -128,15 +128,15 @@ staticdev components for the acrn-hypervisor package. %prep -%setup -q -n acrn-hypervisor-acrn-2020w12.1-140000p -cd %{_builddir}/acrn-hypervisor-acrn-2020w12.1-140000p +%setup -q -n acrn-hypervisor-acrn-2020w12.3-140000p +cd %{_builddir}/acrn-hypervisor-acrn-2020w12.3-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.UTF-8 -export SOURCE_DATE_EPOCH=1584347188 +export SOURCE_DATE_EPOCH=1584606566 export GCC_IGNORE_WERROR=1 export CFLAGS="$CFLAGS -fno-lto " export FCFLAGS="$CFLAGS -fno-lto " @@ -146,14 +146,14 @@ make %{?_smp_mflags} RELEASE=0 all sbl-hypervisor BUILD_VERSION=%{version}_%{r %install -export SOURCE_DATE_EPOCH=1584347188 +export SOURCE_DATE_EPOCH=1584606566 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/acrn-hypervisor -cp %{_builddir}/acrn-hypervisor-acrn-2020w12.1-140000p/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/3cc9b5c24d3ab78578359aa1b98166ee5cf6df9b -cp %{_builddir}/acrn-hypervisor-acrn-2020w12.1-140000p/doc/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/50862f16be94cd4a0162ee82eb55697c5b54c70e -cp %{_builddir}/acrn-hypervisor-acrn-2020w12.1-140000p/misc/acrn-config/kconfig/LICENSE.kconfiglib %{buildroot}/usr/share/package-licenses/acrn-hypervisor/0256be14ad1f607cb4bd89d716442115dab0294c -cp %{_builddir}/acrn-hypervisor-acrn-2020w12.1-140000p/misc/acrn-config/library/hypervisor_license %{buildroot}/usr/share/package-licenses/acrn-hypervisor/e769dc34d30330fcb407f27559c817e502fdfb13 -cp %{_builddir}/acrn-hypervisor-acrn-2020w12.1-140000p/misc/tools/acrn-crashlog/license_header %{buildroot}/usr/share/package-licenses/acrn-hypervisor/b63d865a65562d341e07541b47e5b542a3e2ca67 +cp %{_builddir}/acrn-hypervisor-acrn-2020w12.3-140000p/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/3cc9b5c24d3ab78578359aa1b98166ee5cf6df9b +cp %{_builddir}/acrn-hypervisor-acrn-2020w12.3-140000p/doc/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/50862f16be94cd4a0162ee82eb55697c5b54c70e +cp %{_builddir}/acrn-hypervisor-acrn-2020w12.3-140000p/misc/acrn-config/kconfig/LICENSE.kconfiglib %{buildroot}/usr/share/package-licenses/acrn-hypervisor/0256be14ad1f607cb4bd89d716442115dab0294c +cp %{_builddir}/acrn-hypervisor-acrn-2020w12.3-140000p/misc/acrn-config/library/hypervisor_license %{buildroot}/usr/share/package-licenses/acrn-hypervisor/e769dc34d30330fcb407f27559c817e502fdfb13 +cp %{_builddir}/acrn-hypervisor-acrn-2020w12.3-140000p/misc/tools/acrn-crashlog/license_header %{buildroot}/usr/share/package-licenses/acrn-hypervisor/b63d865a65562d341e07541b47e5b542a3e2ca67 %make_install RELEASE=0 sbl-hypervisor-install hypervisor-install-debug sbl-hypervisor-install-debug ## install_append content mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants diff --git a/buildreq_cache b/buildreq_cache index 96c23fa..f645dda 100644 --- a/buildreq_cache +++ b/buildreq_cache @@ -1,2 +1,2 @@ -2020w12.1.140000p +2020w12.3.140000p numactl-dev \ No newline at end of file diff --git a/options.conf b/options.conf index 80e4a48..250f353 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = acrn-hypervisor -url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2020w12.1-140000p.tar.gz +url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2020w12.3-140000p.tar.gz archives = giturl = https://github.com/projectacrn/acrn-hypervisor.git domain = diff --git a/release b/release index e6a4f00..31e9cf9 100644 --- a/release +++ b/release @@ -1 +1 @@ -271 +272 diff --git a/upstream b/upstream index f55dd48..33a81ad 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -415afd038e30d8c5ef4dc44ea1824273bdfd1c62/acrn-2020w12.1-140000p.tar.gz +1c01428295f3c44f94d13f1c0537c4de135f8a8c/acrn-2020w12.3-140000p.tar.gz diff --git a/versions b/versions index b164f92..f345ce5 100644 --- a/versions +++ b/versions @@ -1 +1 @@ -2020w12.1.140000p +2020w12.3.140000p