starlingx/virt
Code Issues Proposed changes

libvirt-python spec was failing to build

Browse Source 
The py2_build_wheel macro was evaluating to a command
that failed to build libvirt-python.

libvirt-python has its own set of CFLAGS so those are
being used.

This also fixes the scenario where a non centos build env
would have been missing the BuildRequires for the wheel command.

Closes-Bug: 1799735
Change-Id: Ib9cf8a120069fa15f1832c925c2ba56c6ee8e971
Signed-off-by: Al Bailey <Al.Bailey@windriver.com>
This commit is contained in:
Al Bailey 2018-10-24 14:51:42 -05:00
parent f4a6e1d78a
commit 2f4a046b79
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virt/libvirt-python/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=2
TIS_PATCH_VER=3

28
virt/libvirt-python/centos/meta_patches/0002-Build-python-wheel.patch
View File

@ -1,14 +1,14 @@
From 6f9c900059e3065081fccb19bd8c135036df5fe9 Mon Sep 17 00:00:00 2001
From 8feb14092d9db4aacd907bd8f76d90931f537eda Mon Sep 17 00:00:00 2001
From: Don Penney <don.penney@windriver.com>
Date: Wed, 17 Oct 2018 15:25:33 -0400
Subject: [PATCH] Build python wheel
Subject: [PATCH 2/2] Build python wheel
---
SPECS/libvirt-python.spec | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
SPECS/libvirt-python.spec | 18 ++++++++++++++++++
1 file changed, 18 insertions(+)
diff --git a/SPECS/libvirt-python.spec b/SPECS/libvirt-python.spec
index 475bb0a..7a01e94 100644
index 475bb0a..4d7fced 100644
--- a/SPECS/libvirt-python.spec
+++ b/SPECS/libvirt-python.spec
@@ -36,6 +36,7 @@ Name: libvirt-python
@ -19,7 +19,7 @@ index 475bb0a..7a01e94 100644
Url: http://libvirt.org
License: LGPLv2+
BuildRequires: libvirt-devel == %{version}
@@ -44,6 +45,8 @@ BuildRequires: libvirt-devel == %{version}
@@ -44,10 +45,14 @@ BuildRequires: libvirt-devel == %{version}
BuildRequires: python2-devel
BuildRequires: python2-nose
BuildRequires: python2-lxml
@ -28,7 +28,13 @@ index 475bb0a..7a01e94 100644
%else
BuildRequires: python-devel
BuildRequires: python-nose
@@ -106,6 +109,7 @@ of recent versions of Linux (and other OSes).
BuildRequires: python-lxml
+BuildRequires: python2-pip
+BuildRequires: python2-wheel
%endif
%endif
%if %{with_python3}
@@ -106,6 +111,7 @@ of recent versions of Linux (and other OSes).
%prep
%setup -q
@ -36,15 +42,15 @@ index 475bb0a..7a01e94 100644
# Unset execute bit for example scripts; it can introduce spurious
# RPM dependencies, like /usr/bin/python which can pull in python2
@@ -120,6 +124,7 @@ exit 1
@@ -120,6 +126,7 @@ exit 1
%if %{with_python2}
CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py build
+%py2_build_wheel
+CFLAGS="$RPM_OPT_FLAGS" %{__python2} setup.py bdist_wheel
%endif
%if %{with_python3}
CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
@@ -128,6 +133,8 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
@@ -128,6 +135,8 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
%install
%if %{with_python2}
%{__python2} setup.py install --skip-build --root=%{buildroot}
@ -53,7 +59,7 @@ index 475bb0a..7a01e94 100644
%endif
%if %{with_python3}
%{__python3} setup.py install --skip-build --root=%{buildroot}
@@ -166,4 +173,13 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
@@ -166,4 +175,13 @@ CFLAGS="$RPM_OPT_FLAGS" %{__python3} setup.py build
%{python3_sitearch}/*egg-info
%endif