diff options
| author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-05-23 15:44:05 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-25 07:49:54 +0100 |
| commit | b1613c946d1d6e5d7f5964e4d24f1d3146dfe39e (patch) | |
| tree | 465ac4216faaaf217ad8af73da8986cb7f2fd437 | |
| parent | 72792a2fd900fe86d18bd8e330bc0535e2eeb80d (diff) | |
| download | openembedded-core-b1613c946d1d6e5d7f5964e4d24f1d3146dfe39e.tar.gz openembedded-core-b1613c946d1d6e5d7f5964e4d24f1d3146dfe39e.tar.bz2 openembedded-core-b1613c946d1d6e5d7f5964e4d24f1d3146dfe39e.zip | |
dropbear: Upgrade 2015.71 -> 2016.73
Backport a patch to fix out-of-tree build.
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch | 43 | ||||
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear_2015.71.bb | 5 | ||||
| -rw-r--r-- | meta/recipes-core/dropbear/dropbear_2016.73.bb | 7 |
3 files changed, 50 insertions, 5 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 new file mode 100644 index 0000000000..df6efb4534 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch @@ -0,0 +1,43 @@ +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_2015.71.bb b/meta/recipes-core/dropbear/dropbear_2015.71.bb deleted file mode 100644 index 6332579e77..0000000000 --- a/meta/recipes-core/dropbear/dropbear_2015.71.bb +++ /dev/null @@ -1,5 +0,0 @@ -require dropbear.inc - -SRC_URI[md5sum] = "2ccc0a2f3e37ca221db12c5af6a88137" -SRC_URI[sha256sum] = "376214169c0e187ee9f48ae1a99b3f835016ad5b98ede4bfd1cf581deba783af" - diff --git a/meta/recipes-core/dropbear/dropbear_2016.73.bb b/meta/recipes-core/dropbear/dropbear_2016.73.bb new file mode 100644 index 0000000000..71a36bd1b0 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear_2016.73.bb @@ -0,0 +1,7 @@ +require dropbear.inc + +SRC_URI += "file://support-out-of-tree-builds.patch" + +SRC_URI[md5sum] = "8d6d78ce60ca52350ec04fcbd711ce9b" +SRC_URI[sha256sum] = "5c61a4f69b093b688629cd365be38701485ff63cfb23642dab7a05ad250aefd7" + |