Skip to contentSkip to conversation

Python RPATH Fix and some updates

PATCH In review Saul Wold 2 participants 5 messages Sep 29, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

cover Python RPATH Fix and some updates

Richard,

This addresses the python-sqlite3 RPATH issue in the most clean way I could figure out.

Also a couple of package updates.

Sau!

The following changes since commit 18ad3a84dacc0d6c107b56874bb23d2a3c0a429f:

util-linux: Ensure perl scripts reference the correct perl (2011-09-28 21:51:36 +0100)

are available in the git repository at:
git://git.yoctoproject.org/poky-contrib sgw/oe-updates
http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=sgw/oe-updates

Saul Wold (3):
glew: update to 1.7.0
sysstat: update to 10.0.2
python: fix sqlite RPATH issue

 .../python/python/remove_sqlite_rpath.patch        |   12 ++++++++++++
 meta/recipes-devtools/python/python_2.6.6.bb       |    3 ++-
 meta/recipes-extended/sysstat/sysstat_10.0.0.bb    |   10 ----------
 meta/recipes-extended/sysstat/sysstat_10.0.2.bb    |   10 ++++++++++
 .../glew/{glew_1.6.0.bb => glew_1.7.0.bb}          |    4 ++--
 5 files changed, 26 insertions(+), 13 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python/remove_sqlite_rpath.patch
 delete mode 100644 meta/recipes-extended/sysstat/sysstat_10.0.0.bb
 create mode 100644 meta/recipes-extended/sysstat/sysstat_10.0.2.bb
 rename meta/recipes-graphics/glew/{glew_1.6.0.bb => glew_1.7.0.bb} (80%)
Signature · 1 line
1.7.6
author
#1 lore raw

PATCH 1/3 glew: update to 1.7.0

Signed-off-by Saul Wold <[email protected]>
---
 .../glew/{glew_1.6.0.bb => glew_1.7.0.bb}          |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-graphics/glew/{glew_1.6.0.bb => glew_1.7.0.bb} (80%)
meta/recipes-graphics/glew/glew_1.7.0.bb renamed from meta/recipes-graphics/glew/glew_1.6.0.bb +2 -2
similarity index 80%
rename from meta/recipes-graphics/glew/glew_1.6.0.bb
rename to meta/recipes-graphics/glew/glew_1.7.0.bb
index 8824667..e65663d 100644
@@ -13,7 +13,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \
            file://autotools.patch \
           "
 
-SRC_URI[md5sum] = "7dfbb444b5a4e125bc5dba0aef403082"
-SRC_URI[sha256sum] = "bea2a7e9bb97a7a5054d4a65d16aaeedeaa091719359ad3fcd9bfdb0fe8eb7fa"
+SRC_URI[md5sum] = "fb7a8bb79187ac98a90b57f0f27a3e84"
+SRC_URI[sha256sum] = "1653a63fb1e1a518c4b5ccbaf1a617f1a0b4c1c29d39ae4e2583844d98365c09"
 
 inherit autotools lib_package
Signature · 1 line
1.7.6
author
#2 lore raw

PATCH 2/3 sysstat: update to 10.0.2

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/recipes-extended/sysstat/sysstat_10.0.0.bb |   10 ----------
 meta/recipes-extended/sysstat/sysstat_10.0.2.bb |   10 ++++++++++
 2 files changed, 10 insertions(+), 10 deletions(-)
 delete mode 100644 meta/recipes-extended/sysstat/sysstat_10.0.0.bb
 create mode 100644 meta/recipes-extended/sysstat/sysstat_10.0.2.bb
meta/recipes-extended/sysstat/sysstat_10.0.0.bb deleted +0 -10
deleted file mode 100644
index 2faac32..0000000
@@ -1,10 +0,0 @@
-require sysstat.inc
-
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-
-PR = "r2"
-
-
-
-SRC_URI[md5sum] = "accc17cc1fa855be6b27def77dd92a0d"
-SRC_URI[sha256sum] = "12b2ddb1c30a6d69a84ced8243b0745b4ab7f1a3b0048b9e1c21ac052d89cd43"
meta/recipes-extended/sysstat/sysstat_10.0.2.bb new file +10 -0
new file mode 100644
index 0000000..bd559d8
@@ -0,0 +1,10 @@
+require sysstat.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+
+PR = "r0"
+
+
+
+SRC_URI[md5sum] = "0253058fed65e9394c49255821b8803e"
+SRC_URI[sha256sum] = "c89c7baa904f47aa62f3829a90f87509207bfc26ce11c3c4ec415d027ed3f78a"
Signature · 1 line
1.7.6
author
#3 lore raw

PATCH 3/3 python: fix sqlite RPATH issue

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../python/python/remove_sqlite_rpath.patch        |   12 ++++++++++++
 meta/recipes-devtools/python/python_2.6.6.bb       |    3 ++-
 2 files changed, 14 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python/remove_sqlite_rpath.patch
meta/recipes-devtools/python/python/remove_sqlite_rpath.patch new file +12 -0
new file mode 100644
index 0000000..350151e
@@ -0,0 +1,12 @@
+Index: Python-2.6.6/setup.py
+===================================================================
+--- Python-2.6.6.orig/setup.py	2011-09-28 14:22:57.000000000 -0700
++++ Python-2.6.6/setup.py	2011-09-28 16:11:25.147279633 -0700
+@@ -1079,7 +1079,6 @@
+                                   include_dirs=["Modules/_sqlite",
+                                                 sqlite_incdir],
+                                   library_dirs=sqlite_libdir,
+-                                  runtime_library_dirs=sqlite_libdir,
+                                   extra_link_args=sqlite_extra_link_args,
+                                   libraries=["sqlite3",]))
+         else:
meta/recipes-devtools/python/python_2.6.6.bb +2 -1
index aa7ec3c..77c0ff4 100644
@@ -1,7 +1,7 @@
 require python.inc
 DEPENDS = "python-native db gdbm openssl readline sqlite3 zlib"
 DEPENDS_sharprom = "python-native db readline zlib gdbm openssl"
-PR = "${INC_PR}.10"
+PR = "${INC_PR}.11"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=38fdd546420fab09ac6bd3d8a1c83eb6"
 
 DISTRO_SRC_URI ?= "file://sitecustomize.py"

@@ -21,6 +21,7 @@ SRC_URI = "\
   file://multilib.patch \
   file://security_issue_2254_fix.patch \
   file://cgi_py.patch \
+  file://remove_sqlite_rpath.patch \
 "
 
 SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14"
Signature · 1 line
1.7.6
#4 lore raw

Re: [PATCH 3/3] python: fix sqlite RPATH issue

Quoted 15 lines · Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 .../python/python/remove_sqlite_rpath.patch        |   12 ++++++++++++
 meta/recipes-devtools/python/python_2.6.6.bb       |    3 ++-
 2 files changed, 14 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python/remove_sqlite_rpath.patch
meta/recipes-devtools/python/python/remove_sqlite_rpath.patch new file +2 -0
new file mode 100644
index 0000000..350151e
@@ -0,0 +1,12 @@
+Index: Python-2.6.6/setup.py
+===================================================================

meta/recipes-devtools/python/python/remove_sqlite_rpath.patch line 12

Quoted 10 lines
meta/recipes-devtools/python/python/remove_sqlite_rpath.patch new file +10 -0
+--- Python-2.6.6.orig/setup.py	2011-09-28 14:22:57.000000000 -0700
++++ Python-2.6.6/setup.py	2011-09-28 16:11:25.147279633 -0700
+@@ -1079,7 +1079,6 @@
+                                   include_dirs=["Modules/_sqlite",
+                                                 sqlite_incdir],
+                                   library_dirs=sqlite_libdir,
+-                                  runtime_library_dirs=sqlite_libdir,
+                                   extra_link_args=sqlite_extra_link_args,
+                                   libraries=["sqlite3",]))
+         else:

Looks reasonable to me but no patch header? ;-)

Cheers,

Richard