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:46:07 +0100 |
commit | 987eca1c6d85580f0e99eee7b5e999cd2ea45124 (patch) | |
tree | a697160b1ca9f6b7c14cab5a44a2a03d946e406a | |
parent | 05dbcf304624381327c94015587cb09f3c46390a (diff) | |
download | poky-987eca1c6d85580f0e99eee7b5e999cd2ea45124.tar.gz |
dropbear: upgrade 2016.74 -> 2017.75
Drop patch support-out-of-tree-builds.patch:
Because the upstream has already contain it.
(From OE-Core rev: 2fd0757ae7fd63bc93a4ce8579c6ba0cdbb4c1cd)
Signed-off-by: Dengke Du <dengke.du@windriver.com>
Signed-off-by: Ross Burton <ross.burton@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_2016.74.bb | 7 | ||||
-rw-r--r-- | meta/recipes-core/dropbear/dropbear_2017.75.bb | 5 |
3 files changed, 5 insertions, 50 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 @@ | |||
1 | From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= <henrik@knc.nu> | ||
2 | Date: Wed, 11 May 2016 12:35:06 +0200 | ||
3 | Subject: [PATCH] Support out-of-tree builds usign bundled libtom | ||
4 | |||
5 | When building out-of-tree we need both source and generated | ||
6 | folders in include paths to find both distributed and generated | ||
7 | headers. | ||
8 | |||
9 | |||
10 | |||
11 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
12 | Upstream-Status: Backport | ||
13 | --- | ||
14 | libtomcrypt/Makefile.in | 2 +- | ||
15 | libtommath/Makefile.in | 2 +- | ||
16 | 2 files changed, 2 insertions(+), 2 deletions(-) | ||
17 | |||
18 | diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in | ||
19 | index 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 | ||
31 | diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in | ||
32 | index 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_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 @@ | |||
1 | require dropbear.inc | ||
2 | |||
3 | SRC_URI += "file://support-out-of-tree-builds.patch" | ||
4 | |||
5 | SRC_URI[md5sum] = "9ad0172731e0f16623937804643b5bd8" | ||
6 | SRC_URI[sha256sum] = "2720ea54ed009af812701bcc290a2a601d5c107d12993e5d92c0f5f81f718891" | ||
7 | |||
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 @@ | |||
1 | require dropbear.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "e57e9b9d25705dcb073ba15c416424fd" | ||
4 | SRC_URI[sha256sum] = "6cbc1dcb1c9709d226dff669e5604172a18cf5dbf9a201474d5618ae4465098c" | ||
5 | |||