diff --git a/Makefile b/Makefile index d87b357..f1f36e1 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := acrn-hypervisor -URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w16.5-140000p.tar.gz +URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w17.4-160000p.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/acrn-hypervisor.spec b/acrn-hypervisor.spec index d2f6b2d..8fb3220 100644 --- a/acrn-hypervisor.spec +++ b/acrn-hypervisor.spec @@ -4,10 +4,10 @@ # %define keepstatic 1 Name : acrn-hypervisor -Version : 2019w16.5.140000p -Release : 190 -URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w16.5-140000p.tar.gz -Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w16.5-140000p.tar.gz +Version : 2019w17.4.160000p +Release : 191 +URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w17.4-160000p.tar.gz +Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w17.4-160000p.tar.gz Summary : No detailed summary available Group : Development/Tools License : BSD-3-Clause CC-BY-4.0 ISC @@ -87,6 +87,7 @@ Group: Development Requires: acrn-hypervisor-bin = %{version}-%{release} Requires: acrn-hypervisor-data = %{version}-%{release} Provides: acrn-hypervisor-devel = %{version}-%{release} +Requires: acrn-hypervisor = %{version}-%{release} %description dev dev components for the acrn-hypervisor package. @@ -116,21 +117,30 @@ Group: Systemd services services components for the acrn-hypervisor package. +%package staticdev +Summary: staticdev components for the acrn-hypervisor package. +Group: Default +Requires: acrn-hypervisor-dev = %{version}-%{release} + +%description staticdev +staticdev components for the acrn-hypervisor package. + + %prep -%setup -q -n acrn-hypervisor-acrn-2019w16.5-140000p +%setup -q -n acrn-hypervisor-acrn-2019w17.4-160000p %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=1555677106 +export SOURCE_DATE_EPOCH=1556206394 export LDFLAGS="${LDFLAGS} -fno-lto" make %{?_smp_mflags} all sbl-hypervisor BUILD_VERSION=”%{version}_%{release}” BUILD_TAG=”%{version}” %install -export SOURCE_DATE_EPOCH=1555677106 +export SOURCE_DATE_EPOCH=1556206394 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/acrn-hypervisor cp LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/LICENSE @@ -223,7 +233,6 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v %files dev %defattr(-,root,root,-) /usr/include/acrn/acrn_mngr.h -/usr/lib64/*.a %files extras %defattr(-,root,root,-) @@ -247,3 +256,7 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v /usr/lib/systemd/system/acrnlog.service /usr/lib/systemd/system/acrnprobe.service /usr/lib/systemd/system/usercrash.service + +%files staticdev +%defattr(-,root,root,-) +/usr/lib64/libacrn-mngr.a diff --git a/options.conf b/options.conf index ea204a4..d2e7df0 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = acrn-hypervisor -url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w16.5-140000p.tar.gz +url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w17.4-160000p.tar.gz archives = giturl = https://github.com/projectacrn/acrn-hypervisor.git diff --git a/release b/release index 598ed30..88b2e78 100644 --- a/release +++ b/release @@ -1 +1 @@ -190 +191 diff --git a/upstream b/upstream index 0f83f64..c97a7d9 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -1892748ac7092a74f30ceeda123f5f7171b973d8/acrn-2019w16.5-140000p.tar.gz +88c048d6af8d1864487a6c2a0601ab96da8dc0f3/acrn-2019w17.4-160000p.tar.gz