[PATCH 0/2] json-glib,dropbear: upgrade to new version

[PATCH 0/2] json-glib,dropbear: upgrade to new version

[Dengke Du]

The following changes since commit bd063fa288b49b6e3ea77982d0ccc46610feb1ad:

  tune-mips32*.inc: use consistent comments across all three .inc files (2017-05-30 10:15:20 +0100)

are available in the git repository at:

  https://github.com/DengkeDu/openembedded-core.git dengke/json-glib_dropbear_upgrade
  https://github.com//tree/dengke/json-glib_dropbear_upgrade

Dengke Du (2):
  json-glib: upgrade 1.2.2 -> 1.2.8
  dropbear: upgrade 2016.74 -> 2017.75

 .../dropbear/support-out-of-tree-builds.patch      | 43 ----------------------
 meta/recipes-core/dropbear/dropbear_2016.74.bb     |  7 ----
 meta/recipes-core/dropbear/dropbear_2017.75.bb     |  5 +++
 .../{json-glib_1.2.2.bb => json-glib_1.2.8.bb}     |  4 +-
 4 files changed, 7 insertions(+), 52 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch
 delete mode 100644 meta/recipes-core/dropbear/dropbear_2016.74.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2017.75.bb
 rename meta/recipes-gnome/json-glib/{json-glib_1.2.2.bb => json-glib_1.2.8.bb} (82%)

-- 
2.8.1

[PATCH 1/2] json-glib: upgrade 1.2.2 -> 1.2.8

[Dengke Du]

Signed-off-by: Dengke Du <dengke.du@windriver.com>
---
 .../json-glib/{json-glib_1.2.2.bb => json-glib_1.2.8.bb}              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename meta/recipes-gnome/json-glib/{json-glib_1.2.2.bb => json-glib_1.2.8.bb} (82%)

diff --git a/meta/recipes-gnome/json-glib/json-glib_1.2.2.bb b/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb
similarity index 82%
rename from meta/recipes-gnome/json-glib/json-glib_1.2.2.bb
rename to meta/recipes-gnome/json-glib/json-glib_1.2.8.bb
index 6869ba9..2c5d381 100644
--- a/meta/recipes-gnome/json-glib/json-glib_1.2.2.bb
+++ b/meta/recipes-gnome/json-glib/json-glib_1.2.8.bb
@@ -10,8 +10,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34"
 
 DEPENDS = "glib-2.0"
 
-SRC_URI[archive.md5sum] = "c1daefb8d0fb59612af0c072c8aabb58"
-SRC_URI[archive.sha256sum] = "ea128ab52a824fcd06e5448fbb2bd8d9a13740d51c66d445828edba71321a621"
+SRC_URI[archive.md5sum] = "ff31e7d0594df44318e12facda3d086e"
+SRC_URI[archive.sha256sum] = "fd55a9037d39e7a10f0db64309f5f0265fa32ec962bf85066087b83a2807f40a"
 
 inherit gnomebase gettext lib_package gobject-introspection gtk-doc manpages
 
-- 
2.8.1

[PATCH 2/2] dropbear: upgrade 2016.74 -> 2017.75

[Dengke Du]

Drop patch support-out-of-tree-builds.patch:

    Because the upstream has already contain it.

Signed-off-by: Dengke Du <dengke.du@windriver.com>
---
 .../dropbear/support-out-of-tree-builds.patch      | 43 ----------------------
 meta/recipes-core/dropbear/dropbear_2016.74.bb     |  7 ----
 meta/recipes-core/dropbear/dropbear_2017.75.bb     |  5 +++
 3 files changed, 5 insertions(+), 50 deletions(-)
 delete mode 100644 meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch
 delete mode 100644 meta/recipes-core/dropbear/dropbear_2016.74.bb
 create mode 100644 meta/recipes-core/dropbear/dropbear_2017.75.bb

diff --git a/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch b/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch
deleted file mode 100644
index df6efb4..0000000
--- a/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <henrik@knc.nu>
-Date: Wed, 11 May 2016 12:35:06 +0200
-Subject: [PATCH] Support out-of-tree builds usign bundled libtom
-
-When building out-of-tree we need both source and generated
-folders in include paths to find both distributed and generated
-headers.
-
-
-
-Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
-Upstream-Status: Backport
----
- libtomcrypt/Makefile.in | 2 +-
- libtommath/Makefile.in  | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in
-index 3056ef0..7970700 100644
---- a/libtomcrypt/Makefile.in
-+++ b/libtomcrypt/Makefile.in
-@@ -19,7 +19,7 @@ srcdir=@srcdir@
- 
- # Compilation flags. Note the += does not write over the user's CFLAGS!
- # The rest of the flags come from the parent Dropbear makefile
--CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ -DLTC_SOURCE -I$(srcdir)/../libtommath/
-+CFLAGS += -c -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/
- 
- # additional warnings (newer GCC 3.4 and higher)
- ifdef GCC_34
-diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in
-index 06aba68..019c50b 100644
---- a/libtommath/Makefile.in
-+++ b/libtommath/Makefile.in
-@@ -9,7 +9,7 @@ VPATH=@srcdir@
- srcdir=@srcdir@
- 
- # So that libtommath can include Dropbear headers for options and m_burn()
--CFLAGS += -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../
-+CFLAGS += -I. -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../
- 
- ifndef IGNORE_SPEED
- 
diff --git a/meta/recipes-core/dropbear/dropbear_2016.74.bb b/meta/recipes-core/dropbear/dropbear_2016.74.bb
deleted file mode 100644
index a702097..0000000
--- a/meta/recipes-core/dropbear/dropbear_2016.74.bb
+++ /dev/null
@@ -1,7 +0,0 @@
-require dropbear.inc
-
-SRC_URI += "file://support-out-of-tree-builds.patch"
-
-SRC_URI[md5sum] = "9ad0172731e0f16623937804643b5bd8"
-SRC_URI[sha256sum] = "2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891"
-
diff --git a/meta/recipes-core/dropbear/dropbear_2017.75.bb b/meta/recipes-core/dropbear/dropbear_2017.75.bb
new file mode 100644
index 0000000..cfb0d19
--- /dev/null
+++ b/meta/recipes-core/dropbear/dropbear_2017.75.bb
@@ -0,0 +1,5 @@
+require dropbear.inc
+
+SRC_URI[md5sum] = "e57e9b9d25705dcb073ba15c416424fd"
+SRC_URI[sha256sum] = "6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c"
+
-- 
2.8.1