Changeset 76135be in clfs-embedded

Timestamp:

Oct 16, 2013, 11:10:53 AM (11 years ago)

Author:

Andrew Bradford <andrew@…>

Branches:

master

Children:

b748208

Parents:

828afdc

git-author:

Andrew Bradford <andrew@…> (10/16/13 11:10:22)

git-committer:

Andrew Bradford <andrew@…> (10/16/13 11:10:53)

Message:

Add busybox-musl patch

Required in order to build busybox released version 1.21.1.

Files:

• BOOK/final-system/common/busybox.xml (modified) (1 diff)
• BOOK/materials/common/patches.xml (modified) (1 diff)
• BOOK/patches.ent (modified) (1 diff)
• patches/busybox-1.21.1-musl-1.patch (added)

BOOK/final-system/common/busybox.xml

@@ -31 +31 @@
     <title>Installation of BusyBox</title>
 
-<!-- Version 1.18.4 does not require any "fixes" patch, none exists, yet
-    <para os="p1">The following patch contains a number of fixes to version
-    &busybox-version; by the BusyBox developers:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&busybox-fixes-patch;</userinput></screen>
--->
-
     <para os="a">First ensure the BusyBox source is completely clean:</para>
 
 <screen os="b"><userinput>make distclean</userinput></screen>
 
-    <para os="c">The following patch contains a default configuration for BusyBox:</para>
+    <para os="c">The following patch is needed for musl-libc:</para>
 
-<screen os="d"><userinput>patch -Np1 -i ../&busybox-config-patch;
-cp -v clfs/config .config</userinput></screen>
+<screen os="d"><userinput>patch -Np1 -i ../&busybox-musl-patch;</userinput></screen>
 
-    <note os="e">
-      <para>Currently we are just telling BusyBox to use a generic
-      configuration. For those for more adventurous, you can use
-      <command>make menuconfig</command>, and create a custom or modified
-      configuration for your build.</para>
+    <note os="e"> <para>We tell BusyBox to use the generic defconfig.  For those
+        for more adventurous, you can use <command>make menuconfig</command>,
+        and create a custom or modified configuration for your build.</para>
     </note>
 
-    <para os="f">The following tells BusyBox to validate the configuration,
-    and makes sure all required options are defined:</para>
+    <para os="f">The following tells BusyBox to use the default
+      configuration:</para>
 
-<screen os="g"><userinput>make oldconfig</userinput></screen>
+<screen os="g"><userinput>ARCH="${CLFS_ARCH}" make defconfig</userinput></screen>
 
     <para os="h">Compile the package:</para>
 
-<screen os="i"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-"</userinput></screen>
+<screen os="i"><userinput>ARCH="${CLFS_ARCH}" CROSS_COMPILE="${CLFS_TARGET}-" make</userinput></screen>
 
     <para os="j">Install the package:</para>
 
-<screen os="k"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" \
+<screen os="k"><userinput>ARCH="${CLFS_ARCH}" CROSS_COMPILE="${CLFS_TARGET}-" make  \
   CONFIG_PREFIX="${CLFS}/targetfs" install</userinput></screen>
 

BOOK/materials/common/patches.xml

@@ -29 +29 @@
 
     <varlistentry>
-      <term>BusyBox Config Patch - <token>&busybox-config-patch-size;</token>:</term>
+      <term>BusyBox musl-libc Patch - <token>&busybox-musl-patch-size;</token>:</term>
       <listitem>
         <para>Download: <ulink
-        url="&patches-root;&busybox-config-patch;"/></para>
-        <para>MD5 sum: <literal>&busybox-config-patch-md5;</literal></para>
+        url="&patches-root;&busybox-musl-patch;"/></para>
+        <para>MD5 sum: <literal>&busybox-musl-patch-md5;</literal></para>
       </listitem>
     </varlistentry>

BOOK/patches.ent

@@ -9 +9 @@
 <!ENTITY binutils-musl-patch-size "1 KB">
 
-<!ENTITY busybox-config-patch "busybox-&busybox-version;-config-1.patch">
-<!ENTITY busybox-config-patch-md5 "bd06ac3799960df8c72f73bb4ad27e30">
-<!ENTITY busybox-config-patch-size "26 KB">
+<!ENTITY busybox-musl-patch "busybox-&busybox-version;-musl-1.patch">
+<!ENTITY busybox-musl-patch-md5 "335622b0f2bf4e18e9d93fd48afe53da">
+<!ENTITY busybox-musl-patch-size "1 KB">
 
 <!--