diff options
author | Andrej Valek <andrej.valek@siemens.com> | 2018-04-12 09:08:57 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-05-04 09:54:57 +0100 |
commit | ec050b666ec3684918fd9dc564d2dce9a8d6a8ef (patch) | |
tree | 3d5f91a5a7792982c2ea467bb4d8d2a3571a6825 /meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch | |
parent | c1d680326cabd10d0940827e8dfdc884f67b1e9a (diff) | |
download | openembedded-core-contrib-ec050b666ec3684918fd9dc564d2dce9a8d6a8ef.tar.gz |
dropbear: update to 2018.76
- update dropbear to version 2018.76
- refresh and drop obsolete patches
- add option to use localoptions.h header file
- do not use harden stuff, which leads to QA warning
Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch')
-rw-r--r-- | meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch b/meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch new file mode 100644 index 0000000000..02a6cf9268 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch @@ -0,0 +1,51 @@ +From a63288c4d203850110a5a72d27fa0d7202ceadbc Mon Sep 17 00:00:00 2001 +From: Andrej Valek <andrej.valek@siemens.com> +Date: Tue, 10 Apr 2018 12:30:09 +0200 +Subject: [PATCH] fix localoptions.h searching in out of tree building + +When dropbear is build out of tree, is necessary to search for localoptions +header file is source directory. + +Upstream-Status: Submitted [https://github.com/mkj/dropbear/pull/62] + +Signed-off-by: Andrej Valek <andrej.valek@siemens.com> +--- + Makefile.in | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/Makefile.in b/Makefile.in +index e7d52a2..a615896 100644 +--- a/Makefile.in ++++ b/Makefile.in +@@ -17,6 +17,9 @@ STATIC_LTM=libtommath/libtommath.a + + LIBTOM_LIBS=@LIBTOM_LIBS@ + ++VPATH=@srcdir@ ++srcdir=@srcdir@ ++ + ifeq (@BUNDLED_LIBTOM@, 1) + LIBTOM_DEPS=$(STATIC_LTC) $(STATIC_LTM) + LIBTOM_CLEAN=ltc-clean ltm-clean +@@ -25,7 +28,7 @@ LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM) + endif + + OPTION_HEADERS = default_options_guard.h sysoptions.h +-ifneq ($(wildcard localoptions.h),) ++ifneq ($(wildcard $(srcdir)/localoptions.h),) + CFLAGS+=-DLOCALOPTIONS_H_EXISTS + OPTION_HEADERS += localoptions.h + endif +@@ -65,9 +68,6 @@ dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS) + dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS) + scpobjs=$(SCPOBJS) + +-VPATH=@srcdir@ +-srcdir=@srcdir@ +- + prefix=@prefix@ + exec_prefix=@exec_prefix@ + datarootdir = @datarootdir@ +-- +2.11.0 + |