Skip to contentSkip to conversation

Fix a program with ".." in a DB patch's path.

PATCH Applied Mark Hatle 2 participants 3 messages Mar 18, 2011

lore
Share & tools
lore

Mark Hatle

author
#0 lore raw

cover Fix a program with ".." in a DB patch's path.

Fix a problem with ".." in a DB patch's path.

Likely this is not the final technically correct fix.. but we need it ASAP to avoid build problems on Fedora 14.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: mhatle/bernard/fixes
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/bernard/fixes

Thanks,
Mark Hatle <[email protected]>
---

Mark Hatle (1):
db: Fix path of arm-thumb patch

 .../db/db/arm-thumb-mutex_db5.patch                |    4 ++--
 meta/recipes-support/db/db_5.1.19.bb               |    9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)
Signature · 1 line
1.7.4
author
#1 lore raw

PATCH 1/1 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.

Signed-off-by Mark Hatle <[email protected]>
---
 .../db/db/arm-thumb-mutex_db5.patch                |    4 ++--
 meta/recipes-support/db/db_5.1.19.bb               |    9 ++++++---
 2 files changed, 8 insertions(+), 5 deletions(-)
meta/recipes-support/db/db/arm-thumb-mutex_db5.patch +2 -2
index 37d0d93..51d4854 100644
@@ -1,5 +1,5 @@
---- db-5.1.19/../src/dbinc/mutex_int.h.orig	2011-01-05 19:21:42.181805366 -0600
-+++ db-5.1.19/../src/dbinc/mutex_int.h	2011-01-05 19:24:53.141853117 -0600
+--- db-5.1.19/src/dbinc/mutex_int.h.orig	2011-01-05 19:21:42.181805366 -0600
++++ db-5.1.19/src/dbinc/mutex_int.h	2011-01-05 19:24:53.141853117 -0600
 @@ -474,6 +474,25 @@
  
  #ifdef LOAD_ACTUAL_MUTEX_CODE
meta/recipes-support/db/db_5.1.19.bb +6 -3
index 919e532..94ce180 100644
@@ -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/.
Signature · 1 line
1.7.4
Applied
#2 lore raw
In reply to Mark Hatle
Quoted 9 lines · Mark Hatle

Fix a problem with ".." in a DB patch's path.

Likely this is not the final technically correct fix.. but we need it ASAP to avoid build problems on Fedora 14.

Pull URL: git://git.pokylinux.org/poky-contrib.git
Branch: mhatle/bernard/fixes
Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=mhatle/bernard/fixes

Quoted 7 lines

Thanks,
Mark Hatle <[email protected]>
---

Mark Hatle (1):
db: Fix path of arm-thumb patch

Merged to master, thanks.

Richard