Changeset 7754837 in clfs-embedded for BOOK/beyond-net/common

Timestamp:

Oct 17, 2013, 1:05:41 PM (11 years ago)

Author:

Andrew Bradford <andrew@…>

Branches:

master

Children:

dda0b13

Parents:

38bbcb3

git-author:

Andrew Bradford <andrew@…> (10/17/13 12:57:47)

git-committer:

Andrew Bradford <andrew@…> (10/17/13 13:05:41)

Message:

dropbear: Update for recent changes

Will install man pages, which is not desired.

Attempting to install scp will fail due to man page not existing.
Changelog says this was fixed but apparently it isn't fully.

File:

• BOOK/beyond-net/common/dropbear.xml (modified) (3 diffs)

BOOK/beyond-net/common/dropbear.xml

@@ -18 +18 @@
     <title/>
 
-    <para>Dropbear is a relatively small SSH 2 server and client. Dropbear has a small
+    <para>Dropbear is a relatively small SSH server and client. Dropbear has a small
      memory footprint suitable for memory-constrained environments, while still having
      the same features as OpenSSH. It does not depend on OpenSSL and it has a MIT
-     style license. Optionally it can even be made smaller.
-     </para>
+     style license.</para>
 
   </sect2>
@@ -29 +28 @@
     <title>Installation of Dropbear</title>
 
-    <para os="s1">Dropbear incorrectly calls ld instead of gcc for linking, so fix it:</para>
-
-    <screen os="s2"><userinput>cp Makefile.in{,.orig}
-sed -e s/@LD@/@CC@/ Makefile.in.orig > Makefile.in</userinput></screen>
-
     <para os="a">Configure dropbear:</para>
 
 <screen os="b"><userinput>CC="${CC} -Os" ./configure --prefix=/usr --host=${CLFS_TARGET}</userinput></screen>
-
-    <para os="c">Now we will utilize /dev/urandom instead of /dev/random. To allow
-    this to be utilized we use the following sed:</para>
-
-<screen os="d"><userinput>cp -v options.h options.h.backup
-sed -e "s@/dev/random@/dev/urandom@" options.h.backup > options.h</userinput></screen>
 
     <note os="e">
@@ -51 +39 @@
     <para os="f">Compile the package:</para>
 
-<screen os="g"><userinput>make MULTI=1 PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp"</userinput></screen>
+<screen os="g"><userinput>make MULTI=1</userinput></screen>
 
     <para os="h">Install the package:</para>
 
-<screen os="i"><userinput>make MULTI=1 PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
-    install DESTDIR=${CLFS}/targetfs
-ln -svf /usr/bin/dropbearmulti ${CLFS}/targetfs/usr/sbin/dropbear
-ln -svf /usr/bin/dropbearmulti ${CLFS}LFS}/targetfs/usr/bin/dbclient
-ln -svf /usr/bin/dropbearmulti ${CLFS}LFS}/targetfs/usr/bin/dropbearkey
-ln -svf /usr/bin/dropbearmulti ${CLFS}LFS}/targetfs/usr/bin/dropbearconvert
-ln -svf /usr/bin/dropbearmulti ${CLFS}LFS}/targetfs/usr/bin/scp</userinput></screen>
+<screen os="i"><userinput>make MULTI=1 install DESTDIR=${CLFS}/targetfs</userinput></screen>
 
     <para os="j">Create the directory for the dropbear key files:</para>