summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-29 00:39:37 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-09-30 16:51:15 +0100
commit3b6ec40519da70544d74ce4f5fa1fdbc6965337d (patch)
tree27128e0dbf685c17ab5d915eb911da3c63c23de4 /meta
parent9393b160733c19af1b1d70cc066b1bddac83bcee (diff)
downloadpoky-3b6ec40519da70544d74ce4f5fa1fdbc6965337d.tar.gz
db: Refresh patches
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>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch11
-rw-r--r--meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch8
-rw-r--r--meta/recipes-support/db/db/arm-thumb-mutex_db5.patch10
-rw-r--r--meta/recipes-support/db/db/fix-parallel-build.patch8
4 files changed, 19 insertions, 18 deletions
diff --git a/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch b/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
index d4c6bb8e05..68a213136b 100644
--- a/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
+++ b/meta/recipes-support/db/db/Makefile-let-libdb-6.0.la-depend-os_map.l.patch
@@ -14,10 +14,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14 dist/Makefile.in | 2 +- 14 dist/Makefile.in | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-) 15 1 file changed, 1 insertion(+), 1 deletion(-)
16 16
17diff --git a/dist/Makefile.in b/dist/Makefile.in 17Index: db-6.0.30/dist/Makefile.in
18index 0a42375..d9e05b9 100644 18===================================================================
19--- a/dist/Makefile.in 19--- db-6.0.30.orig/dist/Makefile.in
20+++ b/dist/Makefile.in 20+++ db-6.0.30/dist/Makefile.in
21@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) 21@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
22 $(LN) -s $(libdb_version) $(libdb) 22 $(LN) -s $(libdb_version) $(libdb)
23 23
@@ -27,6 +27,3 @@ index 0a42375..d9e05b9 100644
27 $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \ 27 $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \
28 $(LIBCSO_LIBS) 28 $(LIBCSO_LIBS)
29 $(RM) $(libdb) 29 $(RM) $(libdb)
30--
311.7.9.5
32
diff --git a/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch b/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
index 9ec117ae4e..8680408347 100644
--- a/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
+++ b/meta/recipes-support/db/db/Makefile-let-libso_target-depend-on-bt_rec.patch
@@ -15,10 +15,10 @@ Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
15 Makefile.in | 2 +- 15 Makefile.in | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-) 16 1 file changed, 1 insertion(+), 1 deletion(-)
17 17
18diff --git a/Makefile.in b/Makefile.in 18Index: db-6.0.30/dist/Makefile.in
19index e451f70..0a42375 100644 19===================================================================
20--- db/dist/Makefile.in 20--- db-6.0.30.orig/dist/Makefile.in
21+++ db/dist/Makefile.in 21+++ db-6.0.30/dist/Makefile.in
22@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) 22@@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS)
23 $(LN) -s $(libdb_version) $(libdb) 23 $(LN) -s $(libdb_version) $(libdb)
24 24
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 34e8db84df..6a8eada605 100644
--- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
+++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch
@@ -10,9 +10,11 @@ Upstream-Status: Inappropriate [embedded specific]
10 10
11Author: jbowler@nslu2-linux.org 11Author: jbowler@nslu2-linux.org
12 12
13--- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 13Index: db-6.0.30/src/dbinc/mutex_int.h
14+++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 14===================================================================
15@@ -474,6 +474,25 @@ 15--- db-6.0.30.orig/src/dbinc/mutex_int.h
16+++ db-6.0.30/src/dbinc/mutex_int.h
17@@ -474,6 +474,25 @@ typedef unsigned char tsl_t;
16 18
17 #ifdef LOAD_ACTUAL_MUTEX_CODE 19 #ifdef LOAD_ACTUAL_MUTEX_CODE
18 /* gcc/arm: 0 is clear, 1 is set. */ 20 /* gcc/arm: 0 is clear, 1 is set. */
@@ -38,7 +40,7 @@ Author: jbowler@nslu2-linux.org
38 #define MUTEX_SET(tsl) ({ \ 40 #define MUTEX_SET(tsl) ({ \
39 int __r; \ 41 int __r; \
40 __asm__ volatile( \ 42 __asm__ volatile( \
41@@ -484,6 +503,7 @@ 43@@ -484,6 +503,7 @@ typedef unsigned char tsl_t;
42 ); \ 44 ); \
43 __r & 1; \ 45 __r & 1; \
44 }) 46 })
diff --git a/meta/recipes-support/db/db/fix-parallel-build.patch b/meta/recipes-support/db/db/fix-parallel-build.patch
index 88bc6b35e5..27632e1ddb 100644
--- a/meta/recipes-support/db/db/fix-parallel-build.patch
+++ b/meta/recipes-support/db/db/fix-parallel-build.patch
@@ -6,9 +6,11 @@ Upstream-Status: Pending
6 6
7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 7Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
8 8
9--- db/dist.orig/Makefile.in 2012-05-11 19:57:48.000000000 +0200 9Index: db-6.0.30/dist/Makefile.in
10+++ db/dist/Makefile.in 2013-10-31 18:17:11.875532522 +0100 10===================================================================
11@@ -1034,7 +1034,7 @@ 11--- db-6.0.30.orig/dist/Makefile.in
12+++ db-6.0.30/dist/Makefile.in
13@@ -1041,7 +1041,7 @@ db_recover: db_recover@o@ util_sig@o@ $(
12 db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS) 14 db_recover@o@ util_sig@o@ $(DEF_LIB) $(LIBS)
13 $(POSTLINK) $@ 15 $(POSTLINK) $@
14 16