summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrej Valek <andrej.valek@siemens.com>2018-09-19 15:02:52 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-09-21 18:45:46 -0700
commita52a4a7a4c46d34539788a34b547f670b4cbd551 (patch)
tree2a074acd6a8daadeaf0335b5f3f7ad4a7c8e54bd
parent2d760d2d61583c259fac15e86a54b6085b5528ef (diff)
downloadpoky-a52a4a7a4c46d34539788a34b547f670b4cbd551.tar.gz
dropbear: remove localoptions.h in source searching
- localoptions.h is automatically searched in build directory (From OE-Core rev: 40fe89027e1b9ed63c65ff026bc6cce5de1b814a) Signed-off-by: Andrej Valek <andrej.valek@siemens.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.inc1
-rw-r--r--meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch51
2 files changed, 0 insertions, 52 deletions
diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index dc24ea71bf..d92a2f3991 100644
--- a/meta/recipes-core/dropbear/dropbear.inc
+++ b/meta/recipes-core/dropbear/dropbear.inc
@@ -15,7 +15,6 @@ DEPENDS += "${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
15SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \ 15SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
16 file://CVE-2018-15599.patch \ 16 file://CVE-2018-15599.patch \
17 file://0001-urandom-xauth-changes-to-options.h.patch \ 17 file://0001-urandom-xauth-changes-to-options.h.patch \
18 file://0007-fix-localoptions-search-path.patch \
19 file://init \ 18 file://init \
20 file://dropbearkey.service \ 19 file://dropbearkey.service \
21 file://dropbear@.service \ 20 file://dropbear@.service \
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
deleted file mode 100644
index 02a6cf9268..0000000000
--- a/meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
1From a63288c4d203850110a5a72d27fa0d7202ceadbc Mon Sep 17 00:00:00 2001
2From: Andrej Valek <andrej.valek@siemens.com>
3Date: Tue, 10 Apr 2018 12:30:09 +0200
4Subject: [PATCH] fix localoptions.h searching in out of tree building
5
6When dropbear is build out of tree, is necessary to search for localoptions
7header file is source directory.
8
9Upstream-Status: Submitted [https://github.com/mkj/dropbear/pull/62]
10
11Signed-off-by: Andrej Valek <andrej.valek@siemens.com>
12---
13 Makefile.in | 8 ++++----
14 1 file changed, 4 insertions(+), 4 deletions(-)
15
16diff --git a/Makefile.in b/Makefile.in
17index e7d52a2..a615896 100644
18--- a/Makefile.in
19+++ b/Makefile.in
20@@ -17,6 +17,9 @@ STATIC_LTM=libtommath/libtommath.a
21
22 LIBTOM_LIBS=@LIBTOM_LIBS@
23
24+VPATH=@srcdir@
25+srcdir=@srcdir@
26+
27 ifeq (@BUNDLED_LIBTOM@, 1)
28 LIBTOM_DEPS=$(STATIC_LTC) $(STATIC_LTM)
29 LIBTOM_CLEAN=ltc-clean ltm-clean
30@@ -25,7 +28,7 @@ LIBTOM_LIBS=$(STATIC_LTC) $(STATIC_LTM)
31 endif
32
33 OPTION_HEADERS = default_options_guard.h sysoptions.h
34-ifneq ($(wildcard localoptions.h),)
35+ifneq ($(wildcard $(srcdir)/localoptions.h),)
36 CFLAGS+=-DLOCALOPTIONS_H_EXISTS
37 OPTION_HEADERS += localoptions.h
38 endif
39@@ -65,9 +68,6 @@ dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
40 dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
41 scpobjs=$(SCPOBJS)
42
43-VPATH=@srcdir@
44-srcdir=@srcdir@
45-
46 prefix=@prefix@
47 exec_prefix=@exec_prefix@
48 datarootdir = @datarootdir@
49--
502.11.0
51