python-psycopg2: 2.6.2 -> 2.7.4

1.Upgrade python-psycopg2 from 2.6.2 to 2.7.4.
2.Modify remove-pg-config.patch, since the data has been changed.

Signed-off-by: Huang Qiyu <huangqy.fnst@cn.fujitsu.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>

2 files changed, 6 insertions, 5 deletions

diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch
index 37acc30..8f426f5 100644
--- a/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch
+++ b/meta-openstack/recipes-devtools/python/python-psycopg2/remove-pg-config.patch
@@ -14,13 +14,14 @@ diff --git a/setup.cfg b/setup.cfg
 index d00ce92..4b45aac 100644
 --- a/setup.cfg
 +++ b/setup.cfg
-@@ -1,5 +1,6 @@
+@@ -1,6 +1,6 @@
  [build_ext]
  define = 
+-pg_config = 
 +pg_config="/bin/true"
  use_pydatetime = 1
+ mx_include_dir = 
  have_ssl = 0
- 
 diff --git a/setup.py b/setup.py
 index d71d489..b101696 100644
 --- a/setup.py
@@ -42,7 +43,7 @@ index d71d489..b101696 100644
 +                pgversion = "9.4.4"
  
              verre = re.compile(
-                 r"(\d+)\.(\d+)(?:(?:\.(\d+))|(devel|(alpha|beta|rc)\d+))")
+                 r"(\d+)(?:\.(\d+))?(?:(?:\.(\d+))|(devel|(?:alpha|beta|rc)\d+))?")
 -- 
 2.7.4
 
diff --git a/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.2.bb b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.4.bb
index 37a4bdd..674322d 100644
--- a/meta-openstack/recipes-devtools/python/python-psycopg2_2.6.2.bb
+++ b/meta-openstack/recipes-devtools/python/python-psycopg2_2.7.4.bb
@@ -9,8 +9,8 @@ SRC_URI += " \
            file://remove-pg-config.patch \
           "
 
-SRC_URI[md5sum] = "4a392949ba31a378a18ed3e775a4693f"
-SRC_URI[sha256sum] = "70490e12ed9c5c818ecd85d185d363335cc8a8cbf7212e3c185431c79ff8c05c"
+SRC_URI[md5sum] = "70fc57072e084565a42689d416cf2c5c"
+SRC_URI[sha256sum] = "8bf51191d60f6987482ef0cfe8511bbf4877a5aa7f313d7b488b53189cf26209"
 
 inherit distutils pypi