summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@windriver.com>2011-03-18 11:33:10 -0500
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-03-18 23:23:31 +0000
commit94786e172d1de6771f9ed6bb9b0184f7e7fdf382 (patch)
tree9dc954688b9383789181b6390a5efd5f76cc6009 /meta
parentdebcc6c34767d41433c8ded80511312a2901e59a (diff)
downloadpoky-94786e172d1de6771f9ed6bb9b0184f7e7fdf382.tar.gz
db: Fix path of arm-thumb patch
Newer versions of patch, such as in Fedora 14, don't like ".." within the middle of the file to be patched path. In order to fix the issue we have to hand apply the patch instead of using the normal mechanisms. Only flaw with the os.system(...) approach is if it fails we don't get any notification or a resolver failure. (From OE-Core rev: 4e592efe8c5ff918a77f7b7b2c17a6b698b1dd68) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/db/db/arm-thumb-mutex_db5.patch4
-rw-r--r--meta/recipes-support/db/db_5.1.19.bb9
2 files changed, 8 insertions, 5 deletions
diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
index 37d0d93abd..51d485499e 100644
--- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
+++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
@@ -1,5 +1,5 @@
1--- db-5.1.19/../src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 1--- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600
2+++ db-5.1.19/../src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 2+++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600
3@@ -474,6 +474,25 @@ 3@@ -474,6 +474,25 @@
4 4
5 #ifdef LOAD_ACTUAL_MUTEX_CODE 5 #ifdef LOAD_ACTUAL_MUTEX_CODE
diff --git a/meta/recipes-support/db/db_5.1.19.bb b/meta/recipes-support/db/db_5.1.19.bb
index 919e532be1..94ce180cf9 100644
--- a/meta/recipes-support/db/db_5.1.19.bb
+++ b/meta/recipes-support/db/db_5.1.19.bb
@@ -14,11 +14,10 @@ HOMEPAGE = "http://www.oracle.com/technology/products/berkeley-db/db/index.html"
14LICENSE = "BSD Sleepycat" 14LICENSE = "BSD Sleepycat"
15VIRTUAL_NAME ?= "virtual/db" 15VIRTUAL_NAME ?= "virtual/db"
16CONFLICTS = "db3" 16CONFLICTS = "db3"
17PR = "r1" 17PR = "r2"
18 18
19SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" 19SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz"
20#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5" 20SRC_URI += "file://arm-thumb-mutex_db5.patch;apply=no"
21SRC_URI += "file://arm-thumb-mutex_db5.patch;patch=1"
22 21
23SRC_URI[md5sum] = "76fcbfeebfcd09ba0b4d96bfdf8d884d" 22SRC_URI[md5sum] = "76fcbfeebfcd09ba0b4d96bfdf8d884d"
24SRC_URI[sha256sum] = "0194d4ca9266ba1a1c0bfbc233b18bfd05f63163453c81ebcdfdc7112d5ac850" 23SRC_URI[sha256sum] = "0194d4ca9266ba1a1c0bfbc233b18bfd05f63163453c81ebcdfdc7112d5ac850"
@@ -80,6 +79,10 @@ do_configure() {
80 oe_runconf 79 oe_runconf
81} 80}
82 81
82do_patch_append() {
83 os.system("cd ${S}/.. ; patch -p1 -i ${WORKDIR}/arm-thumb-mutex_db5.patch")
84}
85
83do_install_append() { 86do_install_append() {
84 mkdir -p ${D}/${includedir}/db51 87 mkdir -p ${D}/${includedir}/db51
85 #mv ${D}/${includedir}/db_185.h ${D}/${includedir}/db51/. 88 #mv ${D}/${includedir}/db_185.h ${D}/${includedir}/db51/.