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

dropbear: fix CRYPTLIB patch

Browse Source 
(From OE-Core rev: 6ec513e7e6e6959a5eb19f0b06b9e7207fb15ada)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2011-12-27 13:54:23 -08:00
committed by Richard Purdie
parent abd108a45f
commit aff9305b36
2 changed files with 49 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
meta/recipes-core/dropbear/dropbear/dropbear-0.53.1-static_build_fix.patch
View File

@@ -1,29 +1,58 @@
Upstream-Status: Inappropriate [Pending]
Get this patch from buildroot maillist.
Upstream-Status: Submitted
dropbear: fix static build
The latest release 0.53.1 change: lcrypt needs to be before object files for static linking
the -lcrypt is missing during the link
A more appropriate fix is to remove @CRYPTLIB@ from the objs
line, since it will cause problems with target checking,
this change also meets the goals of the orignal change which
was to not link libcrypt to all binaries.
svr-authpasswd.o: In function `svr_auth_password':
svr-authpasswd.c:(.text+0xfc): undefined reference to `crypt'
collect2: ld returned 1 exit status
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj at jcrosoft.com>
Signed-off-by: Mei Lei <lei.mei@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
diff --git a/Makefile.in b/Makefile.in
index 8d81647..0b9b769 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -77,7 +77,7 @@ STRIP=@STRIP@
INSTALL=@INSTALL@
CPPFLAGS=@CPPFLAGS@
CFLAGS+=-I. -I$(srcdir) $(CPPFLAGS) @CFLAGS@
-LIBS+=@LIBS@
+LIBS+=@CRYPTLIB@ @LIBS@
LDFLAGS=@LDFLAGS@
Index: dropbear-2011.54/Makefile.in
===================================================================
--- dropbear-2011.54.orig/Makefile.in 2011-11-08 04:48:15.000000000 -0800
+++ dropbear-2011.54/Makefile.in 2011-12-27 13:44:41.644354442 -0800
@@ -56,7 +56,7 @@
loginrec.h atomicio.h x11fwd.h agentfwd.h tcpfwd.h compat.h \
listener.h fake-rfc2553.h
-dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS) @CRYPTLIB@
+dropbearobjs=$(COMMONOBJS) $(CLISVROBJS) $(SVROBJS)
dbclientobjs=$(COMMONOBJS) $(CLISVROBJS) $(CLIOBJS)
dropbearkeyobjs=$(COMMONOBJS) $(KEYOBJS)
dropbearconvertobjs=$(COMMONOBJS) $(CONVERTOBJS)
@@ -158,7 +158,10 @@
dropbearkey: $(dropbearkeyobjs)
dropbearconvert: $(dropbearconvertobjs)
-dropbear dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
+dropbear: $(HEADERS) $(LIBTOM_DEPS) Makefile
+ $(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS) @CRYPTLIB@
+
+dbclient dropbearkey dropbearconvert: $(HEADERS) $(LIBTOM_DEPS) Makefile
$(CC) $(LDFLAGS) -o $@$(EXEEXT) $($@objs) $(LIBS)
# scp doesn't use the libs so is special.
@@ -169,14 +172,14 @@
# multi-binary compilation.
MULTIOBJS=
ifeq ($(MULTI),1)
- MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs))) @CRYPTLIB@
+ MULTIOBJS=dbmulti.o $(sort $(foreach prog, $(PROGRAMS), $($(prog)objs)))
CFLAGS+=$(addprefix -DDBMULTI_, $(PROGRAMS)) -DDROPBEAR_MULTI
endif
dropbearmulti: multilink
multibinary: $(HEADERS) $(MULTIOBJS) $(LIBTOM_DEPS) Makefile
- $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS)
+ $(CC) $(LDFLAGS) -o dropbearmulti$(EXEEXT) $(MULTIOBJS) $(LIBS) @CRYPTLIB@
multilink: multibinary $(addprefix link, $(PROGRAMS))
EXEEXT=@EXEEXT@

2
meta/recipes-core/dropbear/dropbear_2011.54.bb
View File

@@ -3,4 +3,4 @@ require dropbear.inc
SRC_URI[md5sum] = "ce1e236c4a8df0cb95253defee6716b5"
SRC_URI[sha256sum] = "a5fe60fa9c11e7b0f6a21ef6e86a53ce3d55236548901905070ff1c1716fbf47"
PR = "r0"
PR = "r1"