summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/dropbear
diff options
context:
space:
mode:
Diffstat (limited to 'meta/recipes-core/dropbear')
-rw-r--r--meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch43
-rw-r--r--meta/recipes-core/dropbear/dropbear_2015.71.bb5
-rw-r--r--meta/recipes-core/dropbear/dropbear_2016.73.bb7
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 @@
1From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <henrik@knc.nu>
2Date: Wed, 11 May 2016 12:35:06 +0200
3Subject: [PATCH] Support out-of-tree builds usign bundled libtom
4
5When building out-of-tree we need both source and generated
6folders in include paths to find both distributed and generated
7headers.
8
9
10
11Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
12Upstream-Status: Backport
13---
14 libtomcrypt/Makefile.in | 2 +-
15 libtommath/Makefile.in | 2 +-
16 2 files changed, 2 insertions(+), 2 deletions(-)
17
18diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in
19index 3056ef0..7970700 100644
20--- a/libtomcrypt/Makefile.in
21+++ b/libtomcrypt/Makefile.in
22@@ -19,7 +19,7 @@ srcdir=@srcdir@
23
24 # Compilation flags. Note the += does not write over the user's CFLAGS!
25 # The rest of the flags come from the parent Dropbear makefile
26-CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ -DLTC_SOURCE -I$(srcdir)/../libtommath/
27+CFLAGS += -c -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/
28
29 # additional warnings (newer GCC 3.4 and higher)
30 ifdef GCC_34
31diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in
32index 06aba68..019c50b 100644
33--- a/libtommath/Makefile.in
34+++ b/libtommath/Makefile.in
35@@ -9,7 +9,7 @@ VPATH=@srcdir@
36 srcdir=@srcdir@
37
38 # So that libtommath can include Dropbear headers for options and m_burn()
39-CFLAGS += -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../
40+CFLAGS += -I. -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../
41
42 ifndef IGNORE_SPEED
43
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 @@
1require dropbear.inc
2
3SRC_URI[md5sum] = "2ccc0a2f3e37ca221db12c5af6a88137"
4SRC_URI[sha256sum] = "376214169c0e187ee9f48ae1a99b3f835016ad5b98ede4bfd1cf581deba783af"
5
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 @@
1require dropbear.inc
2
3SRC_URI += "file://support-out-of-tree-builds.patch"
4
5SRC_URI[md5sum] = "8d6d78ce60ca52350ec04fcbd711ce9b"
6SRC_URI[sha256sum] = "5c61a4f69b093b688629cd365be38701485ff63cfb23642dab7a05ad250aefd7"
7