diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-29 00:39:37 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-30 16:50:46 +0100 |
| commit | eb11f60d9d87aa24e93a86f366764b1848bb5cb1 (patch) | |
| tree | 61671baa5ce3638e302b7d53bdc01777c131e50a | |
| parent | 8f72cae18961e9556e54db76a416bde497dc8b6d (diff) | |
| download | openembedded-core-eb11f60d9d87aa24e93a86f366764b1848bb5cb1.tar.gz openembedded-core-eb11f60d9d87aa24e93a86f366764b1848bb5cb1.tar.bz2 openembedded-core-eb11f60d9d87aa24e93a86f366764b1848bb5cb1.zip | |
db: Refresh patches
The patches were failing to apply in some cases, refresh them aganst the
current source.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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> dist/Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/dist/Makefile.in b/dist/Makefile.in -index 0a42375..d9e05b9 100644 ---- a/dist/Makefile.in -+++ b/dist/Makefile.in +Index: db-6.0.30/dist/Makefile.in +=================================================================== +--- db-6.0.30.orig/dist/Makefile.in ++++ db-6.0.30/dist/Makefile.in @@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) $(LN) -s $(libdb_version) $(libdb) @@ -27,6 +27,3 @@ index 0a42375..d9e05b9 100644 $(SOLINK) $(SOFLAGS) $(LDFLAGS) -o $@ $(C_OBJS) \ $(LIBCSO_LIBS) $(RM) $(libdb) --- -1.7.9.5 - 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> Makefile.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/Makefile.in b/Makefile.in -index e451f70..0a42375 100644 ---- db/dist/Makefile.in -+++ db/dist/Makefile.in +Index: db-6.0.30/dist/Makefile.in +=================================================================== +--- db-6.0.30.orig/dist/Makefile.in ++++ db-6.0.30/dist/Makefile.in @@ -863,7 +863,7 @@ $(libdb_version): $(C_OBJS) $(LN) -s $(libdb_version) $(libdb) 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] Author: jbowler@nslu2-linux.org ---- 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 @@ +Index: db-6.0.30/src/dbinc/mutex_int.h +=================================================================== +--- 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 /* gcc/arm: 0 is clear, 1 is set. */ @@ -38,7 +40,7 @@ Author: jbowler@nslu2-linux.org #define MUTEX_SET(tsl) ({ \ int __r; \ __asm__ volatile( \ -@@ -484,6 +503,7 @@ +@@ -484,6 +503,7 @@ typedef unsigned char tsl_t; ); \ __r & 1; \ }) 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 Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- db/dist.orig/Makefile.in 2012-05-11 19:57:48.000000000 +0200 -+++ db/dist/Makefile.in 2013-10-31 18:17:11.875532522 +0100 -@@ -1034,7 +1034,7 @@ +Index: db-6.0.30/dist/Makefile.in +=================================================================== +--- 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) $(POSTLINK) $@ |