From 2fd0757ae7fd63bc93a4ce8579c6ba0cdbb4c1cd Mon Sep 17 00:00:00 2001 From: Dengke Du Date: Thu, 1 Jun 2017 05:38:42 -0400 Subject: dropbear: upgrade 2016.74 -> 2017.75 Drop patch support-out-of-tree-builds.patch: Because the upstream has already contain it. Signed-off-by: Dengke Du Signed-off-by: Ross Burton --- .../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 (limited to 'meta/recipes-core/dropbear') 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 df6efb4534..0000000000 --- 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?= -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 -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 a7020978a1..0000000000 --- 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 0000000000..cfb0d199b3 --- /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" + -- cgit 1.2.3-korg