From 573e8e1e444e4bcd3eed3fabe5339ce906ced40d Mon Sep 17 00:00:00 2001 From: Miguel Bernal Marin Date: Fri, 18 May 2018 16:42:08 -0500 Subject: [PATCH] acrn-hypervisor: Autospec creation for version 2018w20.5.163000p --- ...-PLATFORM-variable-at-install-target.patch | 31 +++++++++++ Makefile | 2 +- acrn-hypervisor.spec | 55 +++++++++++++------ buildreq_add | 4 ++ make_args | 1 - make_install_args | 1 - options.conf | 2 +- release | 2 +- requires_add | 1 + requires_ban | 3 + series | 1 + upstream | 2 +- used_libs | 6 ++ 13 files changed, 88 insertions(+), 23 deletions(-) create mode 100644 0001-Makefile-fix-PLATFORM-variable-at-install-target.patch create mode 100644 used_libs diff --git a/0001-Makefile-fix-PLATFORM-variable-at-install-target.patch b/0001-Makefile-fix-PLATFORM-variable-at-install-target.patch new file mode 100644 index 0000000..611c219 --- /dev/null +++ b/0001-Makefile-fix-PLATFORM-variable-at-install-target.patch @@ -0,0 +1,31 @@ +From 63cdaac6e3406bf13cdc9b4a8fa3530d24fa5933 Mon Sep 17 00:00:00 2001 +From: Miguel Bernal Marin +Date: Fri, 18 May 2018 16:35:34 -0500 +Subject: [PATCH] Makefile: fix PLATFORM variable at install target + +The variable PLAT was renamed to PLATFORM, but was not updated in the +install target giving a failure when installing ACRN hypervisor. + +Fixes: fc2b6fbe86e8 ("Makefile: keep using 'PLATFORM' variable for existing documentation") + +Signed-off-by: Miguel Bernal Marin +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 938c01c..c483aa5 100644 +--- a/Makefile ++++ b/Makefile +@@ -34,7 +34,7 @@ clean: + install: hypervisor-install devicemodel-install tools-install + + hypervisor-install: +- make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) PLATFORM=$(PLAT) RELEASE=$(RELEASE) install ++ make -C $(T)/hypervisor HV_OBJDIR=$(HV_OUT) PLATFORM=$(PLATFORM) RELEASE=$(RELEASE) install + + devicemodel-install: + make -C $(T)/devicemodel DM_OBJDIR=$(DM_OUT) install +-- +2.17.0 + diff --git a/Makefile b/Makefile index 28ef730..03afbc9 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PKG_NAME := acrn-hypervisor -URL = https://github.com/projectacrn/acrn-hypervisor/archive/v0.1-rc4.tar.gz +URL = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w20.5-163000p.tar.gz ARCHIVES = include ../common/Makefile.common diff --git a/acrn-hypervisor.spec b/acrn-hypervisor.spec index f435504..74fca84 100644 --- a/acrn-hypervisor.spec +++ b/acrn-hypervisor.spec @@ -3,28 +3,40 @@ # Generated by: autospec.py # Name : acrn-hypervisor -Version : 0.1.rc4 -Release : 9 -URL : https://github.com/projectacrn/acrn-hypervisor/archive/v0.1-rc4.tar.gz -Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/v0.1-rc4.tar.gz +Version : 2018w20.5.163000p +Release : 10 +URL : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w20.5-163000p.tar.gz +Source0 : https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w20.5-163000p.tar.gz Summary : No detailed summary available Group : Development/Tools -License : BSD-3-Clause +License : BSD-3-Clause CC-BY-4.0 +Requires: acrn-hypervisor-bin Requires: acrn-hypervisor-data +Requires: acpica-unix2 BuildRequires : gnu-efi BuildRequires : gnu-efi-dev +BuildRequires : pkgconfig(openssl) +BuildRequires : pkgconfig(pciaccess) +BuildRequires : pkgconfig(uuid) +BuildRequires : pkgconfig(zlib) # Suppress stripping binaries %define __strip /bin/true %define debug_package %{nil} -Patch1: 0001-fix-uefi-os-loader-name.patch +Patch1: 0001-Makefile-fix-PLATFORM-variable-at-install-target.patch %description -Embedded-Hypervisor -################### -This open source embedded hypervisor defines a software architecture for -running multiple software subsystems managed securely on a consolidated -system (by means of a virtual machine manager), and defines a reference -framework Device Model implementation for devices emulation +This directory contains configuration files to ignore errors found in +the build and test process which are known to the developers and for +now can be safely ignored. + +%package bin +Summary: bin components for the acrn-hypervisor package. +Group: Binaries +Requires: acrn-hypervisor-data + +%description bin +bin components for the acrn-hypervisor package. + %package data Summary: data components for the acrn-hypervisor package. @@ -35,7 +47,7 @@ data components for the acrn-hypervisor package. %prep -%setup -q -n acrn-hypervisor-0.1-rc4 +%setup -q -n acrn-hypervisor-acrn-2018w20.5-163000p %patch1 -p1 %build @@ -43,18 +55,27 @@ 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=1525111070 -make %{?_smp_mflags} PLATFORM=uefi +export SOURCE_DATE_EPOCH=1526679722 +make %{?_smp_mflags} %install -export SOURCE_DATE_EPOCH=1525111070 +export SOURCE_DATE_EPOCH=1526679722 rm -rf %{buildroot} -%make_install PLATFORM=uefi +%make_install %files %defattr(-,root,root,-) +%files bin +%defattr(-,root,root,-) +/usr/bin/acrn-dm +/usr/bin/acrnctl +/usr/bin/acrnlog +/usr/bin/acrntrace + %files data %defattr(-,root,root,-) /usr/share/acrn/acrn.efi /usr/share/acrn/demo/acrn.conf +/usr/share/acrn/demo/bridge.sh +/usr/share/acrn/demo/launch_uos.sh diff --git a/buildreq_add b/buildreq_add index 03c3c6d..215cfcf 100644 --- a/buildreq_add +++ b/buildreq_add @@ -2,3 +2,7 @@ # picked up automatically. One name per line, no whitespace. gnu-efi gnu-efi-dev +pkgconfig(uuid) +pkgconfig(openssl) +pkgconfig(pciaccess) +pkgconfig(zlib) diff --git a/make_args b/make_args index fa024dd..e69de29 100644 --- a/make_args +++ b/make_args @@ -1 +0,0 @@ -PLATFORM=uefi diff --git a/make_install_args b/make_install_args index fa024dd..e69de29 100644 --- a/make_install_args +++ b/make_install_args @@ -1 +0,0 @@ -PLATFORM=uefi diff --git a/options.conf b/options.conf index a0f52ac..8d0f044 100644 --- a/options.conf +++ b/options.conf @@ -1,6 +1,6 @@ [package] name = acrn-hypervisor -url = https://github.com/projectacrn/acrn-hypervisor/archive/v0.1-rc4.tar.gz +url = https://github.com/projectacrn/acrn-hypervisor/archive/acrn-2018w20.5-163000p.tar.gz archives = giturl = diff --git a/release b/release index ec63514..f599e28 100644 --- a/release +++ b/release @@ -1 +1 @@ -9 +10 diff --git a/requires_add b/requires_add index ecd3915..6468e8f 100644 --- a/requires_add +++ b/requires_add @@ -1,2 +1,3 @@ # This file contains additional runtime requirements that did not get # picked up automatically. One name per line, no whitespace. +acpica-unix2 diff --git a/requires_ban b/requires_ban index 20ae780..37379af 100644 --- a/requires_ban +++ b/requires_ban @@ -1,2 +1,5 @@ # This file contains runtime requirements that get picked up but are # undesirable. One entry per line, no whitespace. +Sphinx +docutils +sphinx_rtd_theme diff --git a/series b/series index e69de29..b7e950d 100644 --- a/series +++ b/series @@ -0,0 +1 @@ +0001-Makefile-fix-PLATFORM-variable-at-install-target.patch diff --git a/upstream b/upstream index b39dcea..2bff449 100644 --- a/upstream +++ b/upstream @@ -1 +1 @@ -998a6748def83806a0fa48e3c1de18c3b395b31b/v0.1-rc4.tar.gz +e18d3af4aa91e33adc30b55011f7fcd05b95e73b/acrn-2018w20.5-163000p.tar.gz diff --git a/used_libs b/used_libs new file mode 100644 index 0000000..88332d6 --- /dev/null +++ b/used_libs @@ -0,0 +1,6 @@ +libc.so.6 +libcrypto.so.1.0.0 +libpciaccess.so.0 +libpthread.so.0 +librt.so.1 +libuuid.so.1