diff --git a/Makefile b/Makefile index ad9348d..e7da21c 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := acrn-hypervisor -URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w43.3-140000p.tar.gz +URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w44.3-140000p.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/acrn-hypervisor.spec b/acrn-hypervisor.spec index ba9241f..498746d 100644 --- a/acrn-hypervisor.spec +++ b/acrn-hypervisor.spec @@ -4,10 +4,10 @@ # %define keepstatic 1 Name : acrn-hypervisor -Version : 2019w43.3.140000p -Release : 244 -URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w43.3-140000p.tar.gz -Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w43.3-140000p.tar.gz +Version : 2019w44.3.140000p +Release : 245 +URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w44.3-140000p.tar.gz +Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w44.3-140000p.tar.gz Summary : No detailed summary available Group : Development/Tools License : BSD-3-Clause CC-BY-4.0 ISC @@ -102,14 +102,6 @@ Requires: acrn-hypervisor = %{version}-%{release} dev components for the acrn-hypervisor package. -%package extras -Summary: extras components for the acrn-hypervisor package. -Group: Default - -%description extras -extras components for the acrn-hypervisor package. - - %package license Summary: license components for the acrn-hypervisor package. Group: Default @@ -136,14 +128,15 @@ staticdev components for the acrn-hypervisor package. %prep -%setup -q -n acrn-hypervisor-acrn-2019w43.3-140000p +%setup -q -n acrn-hypervisor-acrn-2019w44.3-140000p +cd %{_builddir}/acrn-hypervisor-acrn-2019w44.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=1571959113 +export SOURCE_DATE_EPOCH=1572556254 export GCC_IGNORE_WERROR=1 export CFLAGS="$CFLAGS -fno-lto " export FCFLAGS="$CFLAGS -fno-lto " @@ -153,14 +146,14 @@ make %{?_smp_mflags} all sbl-hypervisor BUILD_VERSION=”%{version}_%{release} %install -export SOURCE_DATE_EPOCH=1571959113 +export SOURCE_DATE_EPOCH=1572556254 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/acrn-hypervisor -cp %{_builddir}/acrn-hypervisor-acrn-2019w43.3-140000p/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/3cc9b5c24d3ab78578359aa1b98166ee5cf6df9b -cp %{_builddir}/acrn-hypervisor-acrn-2019w43.3-140000p/doc/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/50862f16be94cd4a0162ee82eb55697c5b54c70e -cp %{_builddir}/acrn-hypervisor-acrn-2019w43.3-140000p/misc/acrn-config/kconfig/LICENSE.kconfiglib %{buildroot}/usr/share/package-licenses/acrn-hypervisor/0256be14ad1f607cb4bd89d716442115dab0294c -cp %{_builddir}/acrn-hypervisor-acrn-2019w43.3-140000p/misc/acrn-config/library/hypervisor_license %{buildroot}/usr/share/package-licenses/acrn-hypervisor/e769dc34d30330fcb407f27559c817e502fdfb13 -cp %{_builddir}/acrn-hypervisor-acrn-2019w43.3-140000p/misc/tools/acrn-crashlog/license_header %{buildroot}/usr/share/package-licenses/acrn-hypervisor/b63d865a65562d341e07541b47e5b542a3e2ca67 +cp %{_builddir}/acrn-hypervisor-acrn-2019w44.3-140000p/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/3cc9b5c24d3ab78578359aa1b98166ee5cf6df9b +cp %{_builddir}/acrn-hypervisor-acrn-2019w44.3-140000p/doc/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/50862f16be94cd4a0162ee82eb55697c5b54c70e +cp %{_builddir}/acrn-hypervisor-acrn-2019w44.3-140000p/misc/acrn-config/kconfig/LICENSE.kconfiglib %{buildroot}/usr/share/package-licenses/acrn-hypervisor/0256be14ad1f607cb4bd89d716442115dab0294c +cp %{_builddir}/acrn-hypervisor-acrn-2019w44.3-140000p/misc/acrn-config/library/hypervisor_license %{buildroot}/usr/share/package-licenses/acrn-hypervisor/e769dc34d30330fcb407f27559c817e502fdfb13 +cp %{_builddir}/acrn-hypervisor-acrn-2019w44.3-140000p/misc/tools/acrn-crashlog/license_header %{buildroot}/usr/share/package-licenses/acrn-hypervisor/b63d865a65562d341e07541b47e5b542a3e2ca67 %make_install sbl-hypervisor-install hypervisor-install-debug sbl-hypervisor-install-debug ## install_append content mkdir -p %{buildroot}/usr/lib/systemd/system/multi-user.target.wants @@ -186,19 +179,18 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v /usr/lib/acrn/acrn.apl-up2.uefi.hybrid.32.out /usr/lib/acrn/acrn.apl-up2.uefi.hybrid.map /usr/lib/acrn/acrn.apl-up2.uefi.hybrid.out -/usr/lib/acrn/acrn.efi -/usr/lib/acrn/acrn.kbl-nuc-i7.industry.efi -/usr/lib/acrn/acrn.kbl-nuc-i7.industry.efi.map -/usr/lib/acrn/acrn.kbl-nuc-i7.industry.efi.out -/usr/lib/acrn/acrn.kbl-nuc-i7.uefi.industry.32.out -/usr/lib/acrn/acrn.kbl-nuc-i7.uefi.industry.map -/usr/lib/acrn/acrn.kbl-nuc-i7.uefi.industry.out -/usr/lib/acrn/acrn.nuc6cayh.sdc.efi -/usr/lib/acrn/acrn.nuc6cayh.sdc.efi.map -/usr/lib/acrn/acrn.nuc6cayh.sdc.efi.out -/usr/lib/acrn/acrn.nuc6cayh.uefi.sdc.32.out -/usr/lib/acrn/acrn.nuc6cayh.uefi.sdc.map -/usr/lib/acrn/acrn.nuc6cayh.uefi.sdc.out +/usr/lib/acrn/acrn.nuc7i7dnb.industry.efi +/usr/lib/acrn/acrn.nuc7i7dnb.industry.efi.map +/usr/lib/acrn/acrn.nuc7i7dnb.industry.efi.out +/usr/lib/acrn/acrn.nuc7i7dnb.sdc.efi +/usr/lib/acrn/acrn.nuc7i7dnb.sdc.efi.map +/usr/lib/acrn/acrn.nuc7i7dnb.sdc.efi.out +/usr/lib/acrn/acrn.nuc7i7dnb.uefi.industry.32.out +/usr/lib/acrn/acrn.nuc7i7dnb.uefi.industry.map +/usr/lib/acrn/acrn.nuc7i7dnb.uefi.industry.out +/usr/lib/acrn/acrn.nuc7i7dnb.uefi.sdc.32.out +/usr/lib/acrn/acrn.nuc7i7dnb.uefi.sdc.map +/usr/lib/acrn/acrn.nuc7i7dnb.uefi.sdc.out /usr/lib/systemd/network/50-acrn.netdev /usr/lib/systemd/network/50-acrn.network /usr/lib/systemd/network/50-eth.network @@ -268,11 +260,6 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v /usr/include/acrn/vhm_ioctl_defs.h /usr/include/acrn/vmm.h -%files extras -%defattr(-,root,root,-) -/usr/lib/acrn/acrn.efi.map -/usr/lib/acrn/acrn.efi.out - %files license %defattr(0644,root,root,0755) /usr/share/package-licenses/acrn-hypervisor/0256be14ad1f607cb4bd89d716442115dab0294c diff --git a/buildreq_cache b/buildreq_cache index 79dfa72..b2a8c04 100644 --- a/buildreq_cache +++ b/buildreq_cache @@ -1,2 +1,2 @@ -2019w43.3.140000p +2019w44.3.140000p util-linux \ No newline at end of file diff --git a/options.conf b/options.conf index 7d010d6..50f1150 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = acrn-hypervisor -url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w43.3-140000p.tar.gz +url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w44.3-140000p.tar.gz archives = giturl = https://github.com/projectacrn/acrn-hypervisor.git domain = diff --git a/release b/release index 7f05eed..2c2b1af 100644 --- a/release +++ b/release @@ -1 +1 @@ -244 +245 diff --git a/upstream b/upstream index 6fbf63b..ccf4a65 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -04339a3fa26a1061242b51c760367dd1557aa79d/acrn-2019w43.3-140000p.tar.gz +fb820ed0eacca6f161a06ae3b5b7a599102cdb26/acrn-2019w44.3-140000p.tar.gz diff --git a/versions b/versions index 0a2fda7..3a98136 100644 --- a/versions +++ b/versions @@ -1 +1 @@ -2019w43.3.140000p +2019w44.3.140000p