mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-01 13:09:50 +00:00
Code Issues Projects Releases Wiki Activity

db: Refresh patches

Browse Source 
The patches were failing to apply in some cases, refresh them aganst the
current source.

(From OE-Core rev: eb11f60d9d87aa24e93a86f366764b1848bb5cb1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie
2016-09-29 00:39:37 +01:00
parent 9393b16073
commit 3b6ec40519
4 changed files with 19 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
+4 -7
View File
@@ -14,10 +14,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
dist/Makefile.in | 2 +- dist/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dist/Makefile.in b/dist/Makefile.in Index: db-6.0.30/dist/Makefile.in
index 0a42375..d9e05b9 100644 ===================================================================
--- a/dist/Makefile.in --- db-6.0.30.orig/dist/Makefile.in
+++ b/dist/Makefile.in +++ db-6.0.30/dist/Makefile.in
@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) @@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
$(LN) -s $(libdb_version) $(libdb) $(LN) -s $(libdb_version) $(libdb)
@@ -27,6 +27,3 @@ index 0a42375..d9e05b9 100644
$(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \ $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
$(LIBCSO_LIBS) $(LIBCSO_LIBS)
$(RM) $(libdb) $(RM) $(libdb)
--
1.7.9.5
meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
+4 -4
View File
@@ -15,10 +15,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Makefile.in | 2 +- Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.in b/Makefile.in Index: db-6.0.30/dist/Makefile.in
index e451f70..0a42375 100644 ===================================================================
--- db/dist/Makefile.in --- db-6.0.30.orig/dist/Makefile.in
+++ db/dist/Makefile.in +++ db-6.0.30/dist/Makefile.in
@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) @@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
$(LN) -s $(libdb_version) $(libdb) $(LN) -s $(libdb_version) $(libdb)
meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
+6 -4
View File
@@ -10,9 +10,11 @@ Upstream-Status: Inappropriate [embedded specific]
Author: jbowler@nslu2-linux.org Author: jbowler@nslu2-linux.org
--- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 Index: db-6.0.30/src/dbinc/mutex_int.h
+++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 ===================================================================
@@ -474,6 +474,25 @@ --- db-6.0.30.orig/src/dbinc/mutex_int.h
+++ db-6.0.30/src/dbinc/mutex_int.h
@@ -474,6 +474,25 @@ typedef unsigned char tsl_t;
#ifdef LOAD_ACTUAL_MUTEX_CODE #ifdef LOAD_ACTUAL_MUTEX_CODE
/* gcc/arm: 0 is clear, 1 is set. */ /* gcc/arm: 0 is clear, 1 is set. */
@@ -38,7 +40,7 @@ Author: jbowler@nslu2-linux.org
#define MUTEX_SET(tsl) ({ \ #define MUTEX_SET(tsl) ({ \
int __r; \ int __r; \
__asm__ volatile( \ __asm__ volatile( \
@@ -484,6 +503,7 @@ @@ -484,6 +503,7 @@ typedef unsigned char tsl_t;
); \ ); \
__r & 1; \ __r & 1; \
}) })
meta/recipes-support/db/db/fix-parallel-build.patch
+5 -3
View File
@@ -6,9 +6,11 @@ Upstream-Status: Pending
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
--- db/dist.orig/Makefile.in 2012-05-11 19:57:48.000000000 +0200 Index: db-6.0.30/dist/Makefile.in
+++ db/dist/Makefile.in 2013-10-31 18:17:11.875532522 +0100 ===================================================================
@@ -1034,7 +1034,7 @@ --- db-6.0.30.orig/dist/Makefile.in
+++ db-6.0.30/dist/Makefile.in
@@ -1041,7 +1041,7 @@ db_recover: db_recover@o@ util_sig@o@ $(
db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS) db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
$(POSTLINK) $@ $(POSTLINK) $@