starlingx/integ
Code Issues Proposed changes

rebase python patch to CentOS 7.6 version

Browse Source 
Test:
Pass build and simplex deploy test

Depends-On: https://review.openstack.org/626065

Story: 2004522
Task: 28396

Change-Id: I850651bb4c5ca2e60d4b63434d5f1cfe72d64069
Signed-off-by: Zhe Hu <zhe.hu@intel.com>
This commit is contained in:
Zhe Hu 2018-12-19 10:23:32 +08:00
parent e25c1acc9b
commit 2c308d90d5
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
python/python-2.7.5/centos/build_srpm.data
View File

@ -1 +1 @@
TIS_PATCH_VER=3 TIS_PATCH_VER=4

6
python/python-2.7.5/centos/meta_patches/0001-Update-package-versioning-for-TIS-format.patch
View File

@ -11,12 +11,12 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec
index 2af363e..c3706be 100644 index 2af363e..c3706be 100644
--- a/SPECS/python.spec --- a/SPECS/python.spec
+++ b/SPECS/python.spec +++ b/SPECS/python.spec
@@ -106,7 +106,7 @@ Summary: An interpreted, interactive, object-oriented programming language @@ -114,7 +114,7 @@ Summary: An interpreted, interactive, object-oriented programming language
Name: %{python} Name: %{python}
# Remember to also rebase python-docs when changing this: # Remember to also rebase python-docs when changing this:
Version: 2.7.5 Version: 2.7.5
-Release: 69%{?dist} -Release: 76%{?dist}
+Release: 69.el7_5%{?_tis_dist}.%{tis_patch_ver} +Release: 76.el7%{?_tis_dist}.%{tis_patch_ver}
License: Python License: Python
Group: Development/Languages Group: Development/Languages
Requires: %{python}-libs%{?_isa} = %{version}-%{release} Requires: %{python}-libs%{?_isa} = %{version}-%{release}

2
python/python-2.7.5/centos/meta_patches/0002-Disable-unittest-check-phase.patch
View File

@ -11,7 +11,7 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec
index a9fd32f..1030c57 100644 index a9fd32f..1030c57 100644
--- a/SPECS/python.spec --- a/SPECS/python.spec
+++ b/SPECS/python.spec +++ b/SPECS/python.spec
@@ -54,7 +54,7 @@ @@ -62,7 +62,7 @@
%global with_gdbm 1 %global with_gdbm 1
# Turn this to 0 to turn off the "check" phase: # Turn this to 0 to turn off the "check" phase:

6
python/python-2.7.5/centos/meta_patches/0003-Make-Python-Faster.patch
View File

@ -11,7 +11,7 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec
index 94adb05..36289ea 100644 index 94adb05..36289ea 100644
--- a/SPECS/python.spec --- a/SPECS/python.spec
+++ b/SPECS/python.spec +++ b/SPECS/python.spec
@@ -1259,6 +1259,8 @@ Patch305: 00305-CVE-2016-2183.patch @@ -1301,6 +1301,8 @@ Patch306: 00306-fix-oserror-17-upon-semaphores-creation.patch
# above: # above:
Patch5000: 05000-autotool-intermediates.patch Patch5000: 05000-autotool-intermediates.patch
@ -20,7 +20,7 @@ index 94adb05..36289ea 100644
# ====================================================== # ======================================================
# Additional metadata, and subpackages # Additional metadata, and subpackages
# ====================================================== # ======================================================
@@ -1670,6 +1672,7 @@ find -name "*~" |xargs rm -f @@ -1719,6 +1721,7 @@ find -name "*~" |xargs rm -f
%patch5000 -p0 -b .autotool-intermediates %patch5000 -p0 -b .autotool-intermediates
%endif %endif
@ -28,7 +28,7 @@ index 94adb05..36289ea 100644
# ====================================================== # ======================================================
# Configuring and building the code: # Configuring and building the code:
@@ -1800,7 +1803,7 @@ BuildPython debug \ @@ -1849,7 +1852,7 @@ BuildPython debug \
BuildPython optimized \ BuildPython optimized \
python \ python \
python%{pybasever} \ python%{pybasever} \

2
python/python-2.7.5/centos/meta_patches/0004-Turn-off-with_systemtap-to-disable-dtrace.patch
View File

@ -11,7 +11,7 @@ diff --git a/SPECS/python.spec b/SPECS/python.spec
index 2441951..c2edce8 100644 index 2441951..c2edce8 100644
--- a/SPECS/python.spec --- a/SPECS/python.spec
+++ b/SPECS/python.spec +++ b/SPECS/python.spec
@@ -42,7 +42,7 @@ @@ -43,7 +43,7 @@
%global with_gdb_hooks 1 %global with_gdb_hooks 1

2
python/python-2.7.5/centos/srpm_path
View File

@ -1,2 +1,2 @@
mirror:Source/python-2.7.5-69.el7_5.src.rpm mirror:Source/python-2.7.5-76.el7.src.rpm