From 94786e172d1de6771f9ed6bb9b0184f7e7fdf382 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Fri, 18 Mar 2011 11:33:10 -0500 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-support/db/db_5.1.19.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'meta/recipes-support/db/db_5.1.19.bb') 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" LICENSE = "BSD Sleepycat" VIRTUAL_NAME ?= "virtual/db" CONFLICTS = "db3" -PR = "r1" +PR = "r2" SRC_URI = "http://download.oracle.com/berkeley-db/db-${PV}.tar.gz" -#SRC_URI_MD5 = "http://downloads.sleepycat.com/db-${PV}.tar.gz.md5" -SRC_URI += "file://arm-thumb-mutex_db5.patch;patch=1" +SRC_URI += "file://arm-thumb-mutex_db5.patch;apply=no" SRC_URI[md5sum] = "76fcbfeebfcd09ba0b4d96bfdf8d884d" SRC_URI[sha256sum] = "0194d4ca9266ba1a1c0bfbc233b18bfd05f63163453c81ebcdfdc7112d5ac850" @@ -80,6 +79,10 @@ do_configure() { oe_runconf } +do_patch_append() { + os.system("cd ${S}/.. ; patch -p1 -i ${WORKDIR}/arm-thumb-mutex_db5.patch") +} + do_install_append() { mkdir -p ${D}/${includedir}/db51 #mv ${D}/${includedir}/db_185.h ${D}/${includedir}/db51/. -- cgit v1.2.3-54-g00ecf