diff options
| author |   Dengke Du <dengke.du@windriver.com> | 2017-06-01 05:38:42 -0400 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-06-03 23:45:52 +0100 |
| commit | 2fd0757ae7fd63bc93a4ce8579c6ba0cdbb4c1cd (patch) | |
| tree | 176763cf7d11e54c546678c7f325e9e69c43ed0d /meta/recipes-core/dropbear/dropbear | |
| parent | 9d4c5d9eb7385f14bf11405d1da04cd34dc48fb0 (diff) | |
| download | openembedded-core-contrib-2fd0757ae7fd63bc93a4ce8579c6ba0cdbb4c1cd.tar.gz | |
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 <dengke.du@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear')
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch | 43 |
1 files changed, 0 insertions, 43 deletions
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?= <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 - |