From e3cf3d317467ac5cccb96ef77fce9a68079bc2a0 Mon Sep 17 00:00:00 2001 From: Miguel Bernal Marin Date: Thu, 21 Jun 2018 14:42:35 -0500 Subject: [PATCH] acrn-hypervisor: Autospec creation for update from version 2018w24.7.181200p to version 2018w25.4.140000p --- acrn-hypervisor.spec | 28 ++++++++++++++++++---------- buildreq_add | 1 + options.conf | 2 +- release | 2 +- upstream | 2 +- 5 files changed, 22 insertions(+), 13 deletions(-) diff --git a/acrn-hypervisor.spec b/acrn-hypervisor.spec index e324039..4cf15ab 100644 --- a/acrn-hypervisor.spec +++ b/acrn-hypervisor.spec @@ -3,13 +3,13 @@ # Generated by: autospec.py # Name : acrn-hypervisor -Version : 2018w24.7.181200p -Release : 31 -URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w24.7-181200p.tar.gz -Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w24.7-181200p.tar.gz +Version : 2018w25.4.140000p +Release : 32 +URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w25.4-140000p.tar.gz +Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w25.4-140000p.tar.gz Summary : No detailed summary available Group : Development/Tools -License : BSD-3-Clause CC-BY-4.0 +License : BSD-3-Clause CC-BY-4.0 ISC Requires: acrn-hypervisor-bin Requires: acrn-hypervisor-config Requires: acrn-hypervisor-autostart @@ -21,6 +21,7 @@ BuildRequires : gnu-efi-dev BuildRequires : libevent-dev BuildRequires : libusb-dev BuildRequires : libxml2-dev +BuildRequires : pip BuildRequires : pkgconfig(openssl) BuildRequires : pkgconfig(pciaccess) BuildRequires : pkgconfig(uuid) @@ -32,7 +33,8 @@ BuildRequires : telemetrics-client-dev # Suppress stripping binaries %define __strip /bin/true %define debug_package %{nil} -Patch1: 0002-Makefile-tools-fix-typo-at-acrn-manager-install.patch +Patch1: 0002-acrn-bridge-Do-not-overwrite-system-files.patch +Patch2: 0003-acrn-bridge-improve-systemd-network-units.patch %description This directory contains configuration files to ignore errors found in @@ -83,23 +85,25 @@ license components for the acrn-hypervisor package. %prep -%setup -q -n acrn-hypervisor-acrn-2018w24.7-181200p +%setup -q -n acrn-hypervisor-acrn-2018w25.4-140000p %patch1 -p1 +%patch2 -p1 %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=1529340571 +export SOURCE_DATE_EPOCH=1529610142 make %{?_smp_mflags} all sbl-hypervisor %install -export SOURCE_DATE_EPOCH=1529340571 +export SOURCE_DATE_EPOCH=1529610142 rm -rf %{buildroot} mkdir -p %{buildroot}/usr/share/doc/acrn-hypervisor cp LICENSE %{buildroot}/usr/share/doc/acrn-hypervisor/LICENSE cp tools/acrn-crashlog/license_header %{buildroot}/usr/share/doc/acrn-hypervisor/tools_acrn-crashlog_license_header +cp scripts/kconfig/LICENSE.kconfiglib %{buildroot}/usr/share/doc/acrn-hypervisor/scripts_kconfig_LICENSE.kconfiglib cp doc/LICENSE %{buildroot}/usr/share/doc/acrn-hypervisor/doc_LICENSE %make_install install sbl-hypervisor-install ## make_install_append content @@ -151,6 +155,10 @@ ln -sf /usr/lib/systemd/system/cbc_lifecycle.service %{buildroot}/usr/share/clr- %exclude /usr/lib/systemd/system/multi-user.target.wants/cbc_lifecycle.service %exclude /usr/lib/systemd/system/multi-user.target.wants/prepare.service %exclude /usr/lib/systemd/system/multi-user.target.wants/usercrash.service +/usr/lib/systemd/network/50-acrn.netdev +/usr/lib/systemd/network/50-acrn.network +/usr/lib/systemd/network/50-acrn_tap0.netdev +/usr/lib/systemd/network/50-eth.network /usr/lib/systemd/system.conf.d/40-watchdog.conf /usr/lib/systemd/system/acrnlog.service /usr/lib/systemd/system/acrnprobe.service @@ -167,7 +175,6 @@ ln -sf /usr/lib/systemd/system/cbc_lifecycle.service %{buildroot}/usr/share/clr- /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/nuc/bridge.sh /usr/share/acrn/samples/nuc/launch_uos.sh /usr/share/clr-service-restart/acrnprobe.service /usr/share/clr-service-restart/cbc_attach.service @@ -180,4 +187,5 @@ ln -sf /usr/lib/systemd/system/cbc_lifecycle.service %{buildroot}/usr/share/clr- %defattr(-,root,root,-) /usr/share/doc/acrn-hypervisor/LICENSE /usr/share/doc/acrn-hypervisor/doc_LICENSE +/usr/share/doc/acrn-hypervisor/scripts_kconfig_LICENSE.kconfiglib /usr/share/doc/acrn-hypervisor/tools_acrn-crashlog_license_header diff --git a/buildreq_add b/buildreq_add index dd0d3cd..152c36c 100644 --- a/buildreq_add +++ b/buildreq_add @@ -5,6 +5,7 @@ gnu-efi-dev libevent-dev libusb-dev libxml2-dev +pip pkgconfig(openssl) pkgconfig(pciaccess) pkgconfig(uuid) diff --git a/options.conf b/options.conf index 895c77e..5e7761a 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = acrn-hypervisor -url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w24.7-181200p.tar.gz +url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w25.4-140000p.tar.gz archives = giturl = https://github.com/projectacrn/acrn-hypervisor.git diff --git a/release b/release index e85087a..f5c8955 100644 --- a/release +++ b/release @@ -1 +1 @@ -31 +32 diff --git a/upstream b/upstream index d493fcd..01e5b6a 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -3640ff0750bd2f4c6355ed58c9c06450d20c7d97/acrn-2018w24.7-181200p.tar.gz +4ae5394003c1c2ce485338f9ad88b772a2dd2979/acrn-2018w25.4-140000p.tar.gz