mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-04 02:00:04 +00:00
Code Issues Projects Releases Wiki Activity

dropbear: remove localoptions.h in source searching

Browse Source 
- 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>
This commit is contained in:
Andrej Valek
2018-09-19 15:02:52 +02:00
committed by Richard Purdie
parent 2d760d2d61
commit a52a4a7a4c
2 changed files with 0 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-core/dropbear/dropbear.inc
-1
View File
@@ -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 \
meta/recipes-core/dropbear/dropbear/0007-fix-localoptions-search-path.patch
-51
View File
@@ -1,51 +0,0 @@
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