[oe-commits] [openembedded-core] 06/07: dropbear: remove localoptions.h in source searching

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 40fe89027e1b9ed63c65ff026bc6cce5de1b814a
Author: Andrej Valek <andrej.valek at siemens.com>
AuthorDate: Wed Sep 19 15:02:52 2018 +0200

    dropbear: remove localoptions.h in source searching
    
    - localoptions.h is automatically searched in build directory
    
    Signed-off-by: Andrej Valek <andrej.valek at siemens.com>
    Signed-off-by: Ross Burton <ross.burton at intel.com>
---
 meta/recipes-core/dropbear/dropbear.inc            |  1 -
 .../0007-fix-localoptions-search-path.patch        | 51 ----------------------
 2 files changed, 52 deletions(-)

diff --git a/meta/recipes-core/dropbear/dropbear.inc b/meta/recipes-core/dropbear/dropbear.inc
index dc24ea7..d92a2f3 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)}"
 SRC_URI = "http://matt.ucc.asn.au/dropbear/releases/dropbear-${PV}.tar.bz2 \
            file://CVE-2018-15599.patch \
            file://0001-urandom-xauth-changes-to-options.h.patch \
-           file://0007-fix-localoptions-search-path.patch \
            file://init \
            file://dropbearkey.service \
            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 02a6cf9..0000000
--- a/meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From a63288c4d203850110a5a72d27fa0d7202ceadbc Mon Sep 17 00:00:00 2001
-From: Andrej Valek <andrej.valek at 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 at 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
-

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.