de-fuzz python-glance-store patch
With rpm version < 4.13, patch cmd will create .orig file for fuzzy patch in default. And this .orig file may lead to rpmbuild failure "error: Installed (but unpackaged) file(s) found:" Please visit below link to get more detail info: https://bugs.launchpad.net/starlingx/+bug/1794611 Story: 2003917 Task: 26970 Change-Id: I85f4fb8a5c5247151720268234db1059c5398696 Signed-off-by: slin14 <shuicheng.lin@intel.com>
This commit is contained in:
parent
dbd049dd11
commit
cfaac50247
@ -1,32 +1,32 @@
|
|||||||
From ec249641ede0728731c263a51fdf44d5f97d596a Mon Sep 17 00:00:00 2001
|
From bcdcfce2587d467d756d7493f40a41167c2b68ed Mon Sep 17 00:00:00 2001
|
||||||
From: Stefan Dinescu <stefan.dinescu@windriver.com>
|
From: Stefan Dinescu <stefan.dinescu@windriver.com>
|
||||||
Date: Thu, 16 Nov 2017 17:44:10 +0000
|
Date: Thu, 16 Nov 2017 17:44:10 +0000
|
||||||
Subject: [PATCH 1/1] Meta Glance Driver
|
Subject: Meta Glance Driver
|
||||||
|
|
||||||
---
|
---
|
||||||
SPECS/python-glance-store.spec | 2 ++
|
SPECS/python-glance-store.spec | 2 ++
|
||||||
1 file changed, 2 insertions(+)
|
1 file changed, 2 insertions(+)
|
||||||
|
|
||||||
diff --git a/SPECS/python-glance-store.spec b/SPECS/python-glance-store.spec
|
diff --git a/SPECS/python-glance-store.spec b/SPECS/python-glance-store.spec
|
||||||
index f001803..be60094 100644
|
index b60bd97..0c0d728 100644
|
||||||
--- a/SPECS/python-glance-store.spec
|
--- a/SPECS/python-glance-store.spec
|
||||||
+++ b/SPECS/python-glance-store.spec
|
+++ b/SPECS/python-glance-store.spec
|
||||||
@@ -12,6 +12,7 @@ Source0: https://tarballs.openstack.org/%{upstream_name}/%{upstream_name}
|
@@ -15,6 +15,7 @@ URL: https://github.com/openstack/%{upstream_name}
|
||||||
|
Source0: https://tarballs.openstack.org/%{upstream_name}/%{upstream_name}-%{upstream_version}.tar.gz
|
||||||
# WRS
|
# WRS
|
||||||
Patch0001: 0001-Check-ceph-cluster-free-space-before-creating-image.patch
|
Patch0001: 0001-Check-ceph-cluster-free-space-before-creating-image.patch
|
||||||
+Patch0002: 0002-Add-glance-driver.patch
|
+Patch0002: 0002-Add-glance-driver.patch
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: python2-devel
|
|
||||||
@@ -44,6 +45,7 @@ OpenStack image service store library
|
@@ -88,6 +89,7 @@ Requires: python3-oslo-privsep >= 1.9.0
|
||||||
|
|
||||||
# Apply WRS patches
|
# Apply WRS patches
|
||||||
%patch0001 -p1
|
%patch0001 -p1
|
||||||
+%patch0002 -p1
|
+%patch0002 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%{__python2} setup.py build
|
%py2_build
|
||||||
--
|
--
|
||||||
1.8.3.1
|
2.7.4
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user