diff --git a/.gitignore b/.gitignore index cd0959a..0039371 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,9 @@ build.log.round* *.tgz !*.tar.*.* *.zip +*.jar +*.pom +*.xml commitmsg results/ rpms/ diff --git a/Makefile b/Makefile index 8fb54a2..7b591cd 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := acrn-hypervisor -URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w32.2-140000p.tar.gz +URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w33.3-140000p.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/acrn-hypervisor.spec b/acrn-hypervisor.spec index b54fc13..87bc598 100644 --- a/acrn-hypervisor.spec +++ b/acrn-hypervisor.spec @@ -4,10 +4,10 @@ # %define keepstatic 1 Name : acrn-hypervisor -Version : 2019w32.2.140000p -Release : 226 -URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w32.2-140000p.tar.gz -Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w32.2-140000p.tar.gz +Version : 2019w33.3.140000p +Release : 227 +URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w33.3-140000p.tar.gz +Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w33.3-140000p.tar.gz Summary : No detailed summary available Group : Development/Tools License : BSD-3-Clause CC-BY-4.0 ISC @@ -134,14 +134,14 @@ staticdev components for the acrn-hypervisor package. %prep -%setup -q -n acrn-hypervisor-acrn-2019w32.2-140000p +%setup -q -n acrn-hypervisor-acrn-2019w33.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=1565316224 +export SOURCE_DATE_EPOCH=1565883518 export GCC_IGNORE_WERROR=1 export CFLAGS="$CFLAGS -fno-lto " export FCFLAGS="$CFLAGS -fno-lto " @@ -151,12 +151,13 @@ make %{?_smp_mflags} all sbl-hypervisor BUILD_VERSION=”%{version}_%{release} %install -export SOURCE_DATE_EPOCH=1565316224 +export SOURCE_DATE_EPOCH=1565883518 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/acrn-hypervisor cp LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/LICENSE cp doc/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/doc_LICENSE cp misc/acrn-config/kconfig/LICENSE.kconfiglib %{buildroot}/usr/share/package-licenses/acrn-hypervisor/misc_acrn-config_kconfig_LICENSE.kconfiglib +cp misc/acrn-config/library/hypervisor_license %{buildroot}/usr/share/package-licenses/acrn-hypervisor/misc_acrn-config_library_hypervisor_license cp misc/tools/acrn-crashlog/license_header %{buildroot}/usr/share/package-licenses/acrn-hypervisor/misc_tools_acrn-crashlog_license_header %make_install sbl-hypervisor-install hypervisor-install-debug sbl-hypervisor-install-debug ## install_append content @@ -258,6 +259,7 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v /usr/share/package-licenses/acrn-hypervisor/LICENSE /usr/share/package-licenses/acrn-hypervisor/doc_LICENSE /usr/share/package-licenses/acrn-hypervisor/misc_acrn-config_kconfig_LICENSE.kconfiglib +/usr/share/package-licenses/acrn-hypervisor/misc_acrn-config_library_hypervisor_license /usr/share/package-licenses/acrn-hypervisor/misc_tools_acrn-crashlog_license_header %files services diff --git a/options.conf b/options.conf index a25a25c..34a78a6 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = acrn-hypervisor -url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w32.2-140000p.tar.gz +url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w33.3-140000p.tar.gz archives = giturl = https://github.com/projectacrn/acrn-hypervisor.git diff --git a/release b/release index f414671..2c36bbd 100644 --- a/release +++ b/release @@ -1 +1 @@ -226 +227 diff --git a/upstream b/upstream index 903cbcb..e624b19 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -c89b737fe5804cb81dc21e20880d1b92b457aeee/acrn-2019w32.2-140000p.tar.gz +ffd70b34e23b1fddd516d10f2b94824fe89ec3c5/acrn-2019w33.3-140000p.tar.gz diff --git a/versions b/versions index 2b2b15e..e2a322b 100644 --- a/versions +++ b/versions @@ -1 +1 @@ -2019w32.2.140000p +2019w33.3.140000p