Changeset 3c75105 in clfs-embedded for BOOK

Timestamp:

Oct 15, 2013, 1:00:05 PM (11 years ago)

Author:

Andrew Bradford <andrew@…>

Branches:

master

Children:

e05a3dc

Parents:

9137ee9

git-author:

Andrew Bradford <andrew@…> (10/14/13 12:16:17)

git-committer:

Andrew Bradford <andrew@…> (10/15/13 13:00:05)

Message:

beyond-net: Use ${CLFS}/targetfs

Location:

BOOK/beyond-net/common

Files:

• dropbear.xml (modified) (2 diffs)
• hostapd.xml (modified) (3 diffs)
• iptables.xml (modified) (1 diff)
• libnl.xml (modified) (1 diff)
• wireless_tools.xml (modified) (1 diff)

BOOK/beyond-net/common/dropbear.xml

@@ -56 +56 @@
 
 <screen os="i"><userinput>make MULTI=1 PROGRAMS="dropbear dbclient dropbearkey dropbearconvert scp" \
-    install DESTDIR=${CLFS}
-ln -svf /usr/bin/dropbearmulti ${CLFS}/usr/sbin/dropbear
-ln -svf /usr/bin/dropbearmulti ${CLFS}/usr/bin/dbclient
-ln -svf /usr/bin/dropbearmulti ${CLFS}/usr/bin/dropbearkey
-ln -svf /usr/bin/dropbearmulti ${CLFS}/usr/bin/dropbearconvert
-ln -svf /usr/bin/dropbearmulti ${CLFS}/usr/bin/scp</userinput></screen>
+    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>
 
     <para os="j">Create the directory for the dropbear key files:</para>
 
-<screen os="k"><userinput>install -dv ${CLFS}/etc/dropbear</userinput></screen>
+<screen os="k"><userinput>install -dv ${CLFS}/targetfs/etc/dropbear</userinput></screen>
 
   </sect2>
@@ -75 +75 @@
             bootscripts:</para>
 
-<screen os="m"><userinput>make install-dropbear DESTDIR=${CLFS}</userinput></screen>
+<screen os="m"><userinput>make install-dropbear DESTDIR=${CLFS}/targetfs</userinput></screen>
 
 

BOOK/beyond-net/common/hostapd.xml

@@ -58 +58 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>cp hostapd hostapd_cli ${CLFS}/usr/sbin</userinput></screen>
+<screen os="f"><userinput>cp hostapd hostapd_cli ${CLFS}/targetfs/usr/sbin</userinput></screen>
 
   </sect2>
@@ -67 +67 @@
     <para os="h">From the clfs-bootscripts package, install the hostapd bootscripts:</para>
 
-<screen os="i"><userinput>make install-hostapd DESTDIR=${CLFS}</userinput></screen>
+<screen os="i"><userinput>make install-hostapd DESTDIR=${CLFS}/targetfs</userinput></screen>
 
   </sect2>
@@ -78 +78 @@
     channel 4:</para>
 
-<screen os="k"><userinput>cat &gt; ${CLFS}/etc/hostapd.conf &lt;&lt; EOF
+<screen os="k"><userinput>cat &gt; ${CLFS}/targetfs/etc/hostapd.conf &lt;&lt; EOF
 <literal># Sample hostapd.conf
 # See hostapd/hostapd.conf in your hostap source tree for a more detailed version

BOOK/beyond-net/common/iptables.xml

@@ -37 +37 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS}/targetfs install</userinput></screen>
 
   </sect2>

BOOK/beyond-net/common/libnl.xml

@@ -35 +35 @@
     <para os="e">Install the package:</para>
 
-<screen os="f"><userinput>make DESTDIR=${CLFS} install</userinput></screen>
+<screen os="f"><userinput>make DESTDIR=${CLFS}/targetfs install</userinput></screen>
 
   </sect2>

BOOK/beyond-net/common/wireless_tools.xml

@@ -44 +44 @@
     <filename>INSTALL</filename> file for more information.</para></note>
 
-<screen><userinput>make PREFIX=${CLFS}/usr</userinput></screen>
+<screen><userinput>make PREFIX=${CLFS}/targetfs/usr</userinput></screen>
 
     <para os="c">Install the package:</para>
 
-<screen><userinput>make install PREFIX=${CLFS}/usr</userinput></screen>
+<screen><userinput>make install PREFIX=${CLFS}/targetfs/usr</userinput></screen>
 
   </sect2>