diff --git a/acrn-hypervisor.spec b/acrn-hypervisor.spec index e879e72..5313efa 100644 --- a/acrn-hypervisor.spec +++ b/acrn-hypervisor.spec @@ -5,7 +5,7 @@ %define keepstatic 1 Name : acrn-hypervisor Version : 2019w50.5.140000p -Release : 253 +Release : 254 URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w50.5-140000p.tar.gz Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2019w50.5-140000p.tar.gz Summary : No detailed summary available @@ -13,6 +13,7 @@ Group : Development/Tools License : BSD-3-Clause CC-BY-4.0 ISC Requires: acrn-hypervisor-autostart = %{version}-%{release} Requires: acrn-hypervisor-bin = %{version}-%{release} +Requires: acrn-hypervisor-config = %{version}-%{release} Requires: acrn-hypervisor-data = %{version}-%{release} Requires: acrn-hypervisor-license = %{version}-%{release} Requires: acrn-hypervisor-services = %{version}-%{release} @@ -29,6 +30,7 @@ BuildRequires : gnu-efi-staticdev BuildRequires : libevent-dev BuildRequires : libusb-dev BuildRequires : libxml2-dev +BuildRequires : numactl-dev BuildRequires : pip BuildRequires : pkgconfig(openssl) BuildRequires : pkgconfig(pciaccess) @@ -64,6 +66,7 @@ autostart components for the acrn-hypervisor package. Summary: bin components for the acrn-hypervisor package. Group: Binaries Requires: acrn-hypervisor-data = %{version}-%{release} +Requires: acrn-hypervisor-config = %{version}-%{release} Requires: acrn-hypervisor-license = %{version}-%{release} Requires: acrn-hypervisor-services = %{version}-%{release} @@ -71,6 +74,14 @@ Requires: acrn-hypervisor-services = %{version}-%{release} bin components for the acrn-hypervisor package. +%package config +Summary: config components for the acrn-hypervisor package. +Group: Default + +%description config +config components for the acrn-hypervisor package. + + %package data Summary: data components for the acrn-hypervisor package. Group: Data @@ -125,17 +136,17 @@ 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=1576518774 +export SOURCE_DATE_EPOCH=1576520015 export GCC_IGNORE_WERROR=1 export CFLAGS="$CFLAGS -fno-lto " export FCFLAGS="$CFLAGS -fno-lto " export FFLAGS="$CFLAGS -fno-lto " export CXXFLAGS="$CXXFLAGS -fno-lto " -make %{?_smp_mflags} all sbl-hypervisor BUILD_VERSION=”%{version}_%{release}” BUILD_TAG=”%{version}” +make %{?_smp_mflags} RELEASE=0 all sbl-hypervisor BUILD_VERSION=”%{version}_%{release}” BUILD_TAG=”%{version}” %install -export SOURCE_DATE_EPOCH=1576518774 +export SOURCE_DATE_EPOCH=1576520015 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/package-licenses/acrn-hypervisor cp %{_builddir}/acrn-hypervisor-acrn-2019w50.5-140000p/LICENSE %{buildroot}/usr/share/package-licenses/acrn-hypervisor/3cc9b5c24d3ab78578359aa1b98166ee5cf6df9b @@ -143,7 +154,7 @@ cp %{_builddir}/acrn-hypervisor-acrn-2019w50.5-140000p/doc/LICENSE %{buildroot}/ cp %{_builddir}/acrn-hypervisor-acrn-2019w50.5-140000p/misc/acrn-config/kconfig/LICENSE.kconfiglib %{buildroot}/usr/share/package-licenses/acrn-hypervisor/0256be14ad1f607cb4bd89d716442115dab0294c cp %{_builddir}/acrn-hypervisor-acrn-2019w50.5-140000p/misc/acrn-config/library/hypervisor_license %{buildroot}/usr/share/package-licenses/acrn-hypervisor/e769dc34d30330fcb407f27559c817e502fdfb13 cp %{_builddir}/acrn-hypervisor-acrn-2019w50.5-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 +%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 ln -s ../acrnd.service %{buildroot}/usr/lib/systemd/system/multi-user.target.wants/acrnd.service @@ -192,7 +203,20 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v %files bin %defattr(-,root,root,-) /usr/bin/acrn-dm +/usr/bin/acrnctl /usr/bin/acrnd +/usr/bin/acrnlog +/usr/bin/acrnprobe +/usr/bin/acrntrace +/usr/bin/crashlogctl +/usr/bin/debugger +/usr/bin/usercrash-wrapper +/usr/bin/usercrash_c +/usr/bin/usercrash_s + +%files config +%defattr(-,root,root,-) +/usr/lib/tmpfiles.d/acrn-crashlog-dirs.conf %files data %defattr(-,root,root,-) @@ -208,6 +232,8 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v /usr/share/acrn/bios/changelog_vsbl.txt /usr/share/acrn/conf/add/vm1.args /usr/share/acrn/conf/add/vm1.sh +/usr/share/acrn/crashlog/40-watchdog.conf +/usr/share/acrn/crashlog/80-coredump.conf /usr/share/acrn/samples/apl-mrb/acrn_guest.service /usr/share/acrn/samples/apl-mrb/launch_uos.args /usr/share/acrn/samples/apl-mrb/launch_uos.sh @@ -221,6 +247,7 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v /usr/share/acrn/samples/nuc/launch_zephyr.sh /usr/share/acrn/samples/nuc/runC.json /usr/share/clr-service-restart/acrnd.service +/usr/share/defaults/telemetrics/acrnprobe.xml %files dev %defattr(-,root,root,-) @@ -246,6 +273,9 @@ ln -s ../../samples/apl-mrb/launch_uos.sh %{buildroot}/usr/share/acrn/conf/add/v %exclude /usr/lib/systemd/system/multi-user.target.wants/acrnd.service /usr/lib/systemd/system/acrn_guest.service /usr/lib/systemd/system/acrnd.service +/usr/lib/systemd/system/acrnlog.service +/usr/lib/systemd/system/acrnprobe.service +/usr/lib/systemd/system/usercrash.service %files staticdev %defattr(-,root,root,-) diff --git a/buildreq_cache b/buildreq_cache index 1191328..9b360b4 100644 --- a/buildreq_cache +++ b/buildreq_cache @@ -1,2 +1,3 @@ -2019w45.2.140000p +2019w50.5.140000p +numactl-dev util-linux \ No newline at end of file diff --git a/release b/release index 63fe24a..f1aaa90 100644 --- a/release +++ b/release @@ -1 +1 @@ -253 +254 diff --git a/used_libs b/used_libs index 9011d62..6c92b8b 100644 --- a/used_libs +++ b/used_libs @@ -1,7 +1,15 @@ +libblkid.so.1 libc.so.6 +libcom_err.so.2 libcrypto.so.1.1 +libevent-2.1.so.6 +libext2fs.so.2 +libnuma.so.1 libpciaccess.so.0 libpthread.so.0 librt.so.1 +libsystemd.so.0 +libtelemetry.so.4 libusb-1.0.so.0 libuuid.so.1 +libxml2.so.2