diff --git a/Makefile b/Makefile index d9618ee..7e4e6e7 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := acrn-hypervisor -URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.1-140000p.tar.gz +URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.4-140000p.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/acrn-hypervisor.spec b/acrn-hypervisor.spec index bf6626d..712bd81 100644 --- a/acrn-hypervisor.spec +++ b/acrn-hypervisor.spec @@ -4,10 +4,10 @@ # %define keepstatic 1 Name : acrn-hypervisor -Version : 2019w11.1.140000p -Release : 171 -URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.1-140000p.tar.gz -Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.1-140000p.tar.gz +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 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.1-140000p +%setup -q -n acrn-hypervisor-acrn-2019w11.4-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=1552307369 +export SOURCE_DATE_EPOCH=1552559410 export LDFLAGS="${LDFLAGS} -fno-lto" make %{?_smp_mflags} all sbl-hypervisor BUILD_VERSION=”%{version}_%{release}” BUILD_TAG=”%{version}” %install -export SOURCE_DATE_EPOCH=1552307369 +export SOURCE_DATE_EPOCH=1552559410 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/acrn-hypervisor cp LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/LICENSE @@ -150,14 +150,11 @@ 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,13 +203,13 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v /usr/share/acrn/samples/apl-mrb/runC.json /usr/share/acrn/samples/apl-mrb/sos_bootargs_debug.txt /usr/share/acrn/samples/apl-mrb/sos_bootargs_release.txt -/usr/share/acrn/samples/nuc/acrn.conf +/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/launch_hard_rt_vm.sh /usr/share/acrn/samples/nuc/launch_uos.sh +/usr/share/acrn/samples/nuc/launch_zephyr.sh /usr/share/acrn/samples/nuc/runC.json -/usr/share/acrn/samples/up2/launch_uos.sh -/usr/share/acrn/samples/up2/sos_bootargs_debug.txt -/usr/share/acrn/samples/up2/sos_bootargs_release.txt /usr/share/clr-service-restart/acrnd.service /usr/share/defaults/telemetrics/acrnprobe.xml @@ -223,8 +220,6 @@ 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 4dcc14e..3427118 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.1-140000p.tar.gz +url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w11.4-140000p.tar.gz archives = giturl = https://github.com/projectacrn/acrn-hypervisor.git diff --git a/release b/release index b34c321..730a054 100644 --- a/release +++ b/release @@ -1 +1 @@ -171 +172 diff --git a/upstream b/upstream index 0282f34..a343dba 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -bda191ed2a556bfd3d61c839baa845587ed4ff2a/acrn-2019w11.1-140000p.tar.gz +51c8363ac970df2028429c131178dfd6c861cd5c/acrn-2019w11.4-140000p.tar.gz