[Clfs-commits] [CLFS Embedded]Cross-LFS Embedded Book branch, master, updated. 7f420276415b5caff43dca8a43940263124571fd
git
git at cross-lfs.org
Fri Jun 13 16:43:30 PDT 2014
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Cross-LFS Embedded Book".
The branch, master has been updated
via 7f420276415b5caff43dca8a43940263124571fd (commit)
via a5cb4ffaa19db69c394d5abb8bd04a7f787398a8 (commit)
via c0b04ff5b3b9feae9b461e4849ab004ef9130438 (commit)
via 524795ea15dc80dc94360aafc4eda5690f3e38fc (commit)
via 99bb0b84c5f952bafb968948f409aa2bf7226ca5 (commit)
via 58f4a428e4a625c2cebffa99c5c3aae4c2c0c35e (commit)
via bb75e1e65f68e0615282e3e6881b07b947278194 (commit)
via e0d570e1013a14da7faa8f3288261fefaae2353f (commit)
via 30f9ca7e2420f49251fd47bc808d5cec091a757b (commit)
via 7e8a7d8f5c06b744f28b88e801713762f3947c9f (commit)
via 209f20d1c5f43c95314b690cc7df785c527838b4 (commit)
via c4b23647b77dca5654d66c17195766b5e4f7a4b3 (commit)
via 1cf6d414d78f8e6479c91b23561b1eeda16e48b5 (commit)
via dd423a0eac0e41f5b2c7104fb1349f0db2895af2 (commit)
via 2864f08d4d162e71e87ce7ef0c2e2439cf06dd8f (commit)
via 75adfe0a70b51d026678f40a7a3141fb4eed6d52 (commit)
via f91b6ccc5d5766ddc308a4d057b09e8ddf3dc0d8 (commit)
via 458ac4c30b438ac038db669e55128c5bbff94037 (commit)
via 5846de5f9b980856d95515cd0abd6f205d924e21 (commit)
via e2ce6d78055e4c090bf21e405d1e9a2a668ab4a9 (commit)
from c5d3ce0df81570960a63bceafffd62359253bef7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7f420276415b5caff43dca8a43940263124571fd
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Fri Jun 13 16:52:59 2014 -0400
Update date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index f357463..871050a 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
-<!ENTITY month "10"> <!-- Use two digits -->
-<!ENTITY month_name "October">
-<!ENTITY day "24"> <!-- Use two digits -->
-<!ENTITY year "2013"> <!-- Use four digits -->
+<!ENTITY month "06"> <!-- Use two digits -->
+<!ENTITY month_name "June">
+<!ENTITY day "13"> <!-- Use two digits -->
+<!ENTITY year "2014"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit a5cb4ffaa19db69c394d5abb8bd04a7f787398a8
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Fri Jun 13 16:51:46 2014 -0400
Update changelog
diff --git a/BOOK/preface/common/changelog.xml b/BOOK/preface/common/changelog.xml
index 3d4b7a9..a5e540c 100644
--- a/BOOK/preface/common/changelog.xml
+++ b/BOOK/preface/common/changelog.xml
@@ -36,6 +36,39 @@
</listitem>
-->
<listitem>
+ <para>June 13, 2014</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Allow for easier starting over of targetfs build.
+ </para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Remove e2fsprogs, busybox version of utilities are
+ good enough.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Remove iptables, untested and largely
+ unused.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Add netplug utility to beyond.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Update binutils to v2.24.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Update busybox to v1.22.1.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Update musl to v1.0.3.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Simplify beyond sections into one section.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>October 24, 2013</para>
<itemizedlist>
<listitem>
commit c0b04ff5b3b9feae9b461e4849ab004ef9130438
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Jun 12 15:35:07 2014 -0400
the-end: Move boot info to theend
Both were small sections, should just be 1 page.
diff --git a/BOOK/the-end/boot.xml b/BOOK/the-end/boot.xml
deleted file mode 100644
index 1116e87..0000000
--- a/BOOK/the-end/boot.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-finish-boot">
- <?dbhtml filename="reboot.html"?>
-
- <title>Booting the System</title>
-
- <para>Assuming the boot loader was set up properly,
- <emphasis>CLFS &version;</emphasis> will boot automatically when you power on
- the target.</para>
-
- <para>When the boot is complete, the embedded CLFS system is ready for use!</para>
-
-</sect1>
diff --git a/BOOK/the-end/chapter.xml b/BOOK/the-end/chapter.xml
index 06f7437..c3a3e95 100644
--- a/BOOK/the-end/chapter.xml
+++ b/BOOK/the-end/chapter.xml
@@ -12,7 +12,6 @@
<title>The End</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="theend.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="boot.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="whatnow.xml"/>
</chapter>
diff --git a/BOOK/the-end/theend.xml b/BOOK/the-end/theend.xml
index 15326b0..c0d63f9 100644
--- a/BOOK/the-end/theend.xml
+++ b/BOOK/the-end/theend.xml
@@ -10,19 +10,11 @@
<title>The End</title>
- <indexterm zone="ch-finish-theend">
- <primary sortas="e-/etc/clfs-release">/etc/clfs-release</primary>
- </indexterm>
-
<para>Well done! The new CLFS system is installed! We wish you much
success with your shiny new custom-built Linux system.</para>
- <para>It may be a good idea to create an
- <filename>/etc/clfs-release</filename> file. By having this file, it is
- very easy for you (and for us if you need to ask for help at some
- point) to find out which CLFS version is installed on the system.
- Create this file by running:</para>
-
-<screen><userinput>echo CLFS-Embedded-&version; > ${CLFS}/etc/clfs-release</userinput></screen>
+ <para>Assuming the boot loader was set up properly,
+ <emphasis>CLFS &version;</emphasis> will boot automatically when you power on
+ the target.</para>
</sect1>
commit 524795ea15dc80dc94360aafc4eda5690f3e38fc
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Jun 12 15:30:06 2014 -0400
Move all beyond packages into single beyond section
There's only a few now, putting them all together makes sense.
diff --git a/BOOK/arm-index.xml b/BOOK/arm-index.xml
index 188b3a5..3493eb2 100644
--- a/BOOK/arm-index.xml
+++ b/BOOK/arm-index.xml
@@ -54,8 +54,6 @@
<title>Beyond CLFS Embedded</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-lib/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-net/chapter.xml"/>
</part>
diff --git a/BOOK/beyond-lib/chapter.xml b/BOOK/beyond-lib/chapter.xml
deleted file mode 100644
index 9de5090..0000000
--- a/BOOK/beyond-lib/chapter.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../general.ent">
- %general-entities;
-]>
-
-<chapter id="chapter-beyond-lib" xreflabel="Additional Libraries">
- <?dbhtml dir="beyond-lib"?>
- <?dbhtml filename="chapter.html"?>
-
- <title>Additional Libraries</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
-
-</chapter>
diff --git a/BOOK/beyond-lib/common/introduction.xml b/BOOK/beyond-lib/common/introduction.xml
deleted file mode 100644
index 2a5f1c7..0000000
--- a/BOOK/beyond-lib/common/introduction.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-beyond-lib-introduction">
- <?dbhtml filename="introduction.html"?>
-
- <title>Introduction</title>
-
- <para os="a">This chapter provides instructions on installing additional
- optional libraries. Please note that some of these libraries will be required
- in order to install other Beyond packages.</para>
-
-</sect1>
diff --git a/BOOK/beyond-lib/common/packages.xml b/BOOK/beyond-lib/common/packages.xml
deleted file mode 100644
index 4e381f9..0000000
--- a/BOOK/beyond-lib/common/packages.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-beyond-lib-packages-common">
- <?dbhtml filename="packages.html"?>
-
- <title>Beyond CLFS Additional Library Packages</title>
-
- <para>Download or otherwise obtain the following packages:</para>
-
- <variablelist role="beyond-lib">
-
- <varlistentry>
- <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&zlib-home;"/></para>
- <para>Download: <ulink url="&zlib-url;"/></para>
- <para>MD5 sum: <literal>&zlib-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- <para os="a">Total size of these packages: about <returnvalue/></para>
-
-</sect1>
diff --git a/BOOK/beyond-net/chapter.xml b/BOOK/beyond-net/chapter.xml
deleted file mode 100644
index 5546292..0000000
--- a/BOOK/beyond-net/chapter.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../general.ent">
- %general-entities;
-]>
-
-<chapter id="chapter-beyond-net" xreflabel="Networking Software">
- <?dbhtml dir="beyond-net"?>
- <?dbhtml filename="chapter.html"?>
-
- <title>Networking Software</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/netplug.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dropbear.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/wireless_tools.xml"/>
-
-</chapter>
diff --git a/BOOK/beyond-net/common/introduction.xml b/BOOK/beyond-net/common/introduction.xml
deleted file mode 100644
index 7550dfb..0000000
--- a/BOOK/beyond-net/common/introduction.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-beyond-net-networking-introduction">
- <?dbhtml filename="introduction.html"?>
-
- <title>Introduction</title>
-
- <para os="a">This chapter provides instructions on installing networking
- related packages.</para>
-
-</sect1>
diff --git a/BOOK/beyond/chapter.xml b/BOOK/beyond/chapter.xml
index 4c4cde4..6673d11 100644
--- a/BOOK/beyond/chapter.xml
+++ b/BOOK/beyond/chapter.xml
@@ -5,12 +5,18 @@
%general-entities;
]>
-<chapter id="chapter-beyond-introduction" xreflabel="Beyond Introduction">
- <?dbhtml dir="beyond-introduction"?>
+<chapter id="chapter-beyond" xreflabel="Beyond">
+ <?dbhtml dir="beyond"?>
<?dbhtml filename="chapter.html"?>
- <title>Beyond Introduction</title>
+ <title>Beyond CLFS Embedded</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/zlib.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/netplug.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dropbear.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/wireless_tools.xml"/>
</chapter>
diff --git a/BOOK/beyond-net/common/dropbear.xml b/BOOK/beyond/common/dropbear.xml
similarity index 96%
rename from BOOK/beyond-net/common/dropbear.xml
rename to BOOK/beyond/common/dropbear.xml
index 921a238..727f794 100644
--- a/BOOK/beyond-net/common/dropbear.xml
+++ b/BOOK/beyond/common/dropbear.xml
@@ -5,12 +5,12 @@
%general-entities;
]>
-<sect1 id="ch-beyond-net-dropbear" role="wrap">
+<sect1 id="ch-beyond-dropbear" role="wrap">
<?dbhtml filename="dropbear.html"?>
<title>Dropbear-&dropbear-version;</title>
- <indexterm zone="ch-beyond-net-dropbear">
+ <indexterm zone="ch-beyond-dropbear">
<primary sortas="a-Dropbear">Dropbear</primary>
</indexterm>
diff --git a/BOOK/beyond/common/introduction.xml b/BOOK/beyond/common/introduction.xml
index c096e55..eb74b33 100644
--- a/BOOK/beyond/common/introduction.xml
+++ b/BOOK/beyond/common/introduction.xml
@@ -5,7 +5,7 @@
%general-entities;
]>
-<sect1 id="ch-bclfs-introduction">
+<sect1 id="ch-bclfs">
<?dbhtml filename="introduction.html"?>
<title>Introduction</title>
diff --git a/BOOK/beyond-net/common/netplug.xml b/BOOK/beyond/common/netplug.xml
similarity index 94%
rename from BOOK/beyond-net/common/netplug.xml
rename to BOOK/beyond/common/netplug.xml
index c08394c..6c40d36 100644
--- a/BOOK/beyond-net/common/netplug.xml
+++ b/BOOK/beyond/common/netplug.xml
@@ -5,12 +5,12 @@
%general-entities;
]>
-<sect1 id="ch-beyond-net-netplug" role="wrap">
+<sect1 id="ch-beyond-netplug" role="wrap">
<?dbhtml filename="netplug.html"?>
<title>Netplug-&netplug-version;</title>
- <indexterm zone="ch-beyond-net-netplug">
+ <indexterm zone="ch-beyond-netplug">
<primary sortas="a-Netplug">Netplug</primary>
</indexterm>
diff --git a/BOOK/beyond-net/common/packages.xml b/BOOK/beyond/common/packages.xml
similarity index 78%
rename from BOOK/beyond-net/common/packages.xml
rename to BOOK/beyond/common/packages.xml
index 83439f0..1b0b42a 100644
--- a/BOOK/beyond-net/common/packages.xml
+++ b/BOOK/beyond/common/packages.xml
@@ -5,14 +5,14 @@
%general-entities;
]>
-<sect1 id="ch-beyond-net-packages-common">
+<sect1 id="ch-beyond-packages">
<?dbhtml filename="packages.html"?>
- <title>Beyond CLFS Networking Packages</title>
+ <title>Beyond CLFS Packages</title>
<para>Download or otherwise obtain the following packages:</para>
- <variablelist role="beyond-net">
+ <variablelist role="beyond">
<varlistentry>
<term>Dropbear (&dropbear-version;) - <token>&dropbear-size;</token>:</term>
@@ -40,6 +40,16 @@
<para>MD5 sum: <literal>&wireless_tools-md5;</literal></para>
</listitem>
</varlistentry>
+
+ <varlistentry>
+ <term>Zlib (&zlib-version;) - <token>&zlib-size;</token>:</term>
+ <listitem>
+ <para>Home page: <ulink url="&zlib-home;"/></para>
+ <para>Download: <ulink url="&zlib-url;"/></para>
+ <para>MD5 sum: <literal>&zlib-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
</variablelist>
<para os="a">Total size of these packages: about <returnvalue/></para>
diff --git a/BOOK/beyond-net/common/patches.xml b/BOOK/beyond/common/patches.xml
similarity index 92%
rename from BOOK/beyond-net/common/patches.xml
rename to BOOK/beyond/common/patches.xml
index 7bd87e9..dbe20d3 100644
--- a/BOOK/beyond-net/common/patches.xml
+++ b/BOOK/beyond/common/patches.xml
@@ -5,10 +5,10 @@
%general-entities;
]>
-<sect1 id="ch-beyond-clfs3-patches">
+<sect1 id="ch-beyond-patches">
<?dbhtml filename="patches.html"?>
- <title>Beyond CLFS Networking Patches</title>
+ <title>Beyond CLFS Patches</title>
<para>In addition to the packages, several patches are also required.
These patches correct any mistakes in the packages that should be
diff --git a/BOOK/beyond-net/common/wireless_tools.xml b/BOOK/beyond/common/wireless_tools.xml
similarity index 95%
rename from BOOK/beyond-net/common/wireless_tools.xml
rename to BOOK/beyond/common/wireless_tools.xml
index 52db4fd..342b4d3 100644
--- a/BOOK/beyond-net/common/wireless_tools.xml
+++ b/BOOK/beyond/common/wireless_tools.xml
@@ -5,12 +5,12 @@
%general-entities;
]>
-<sect1 id="ch-beyond-net-wireless_tools" role="wrap">
+<sect1 id="ch-beyond-wireless_tools" role="wrap">
<?dbhtml filename="wireless_tools.html"?>
<title>Wireless Tools-&wireless_tools-version;</title>
- <indexterm zone="ch-beyond-net-wireless_tools">
+ <indexterm zone="ch-beyond-wireless_tools">
<primary sortas="a-wireless_tools">wireless_tools</primary>
</indexterm>
diff --git a/BOOK/beyond-lib/common/zlib.xml b/BOOK/beyond/common/zlib.xml
similarity index 94%
rename from BOOK/beyond-lib/common/zlib.xml
rename to BOOK/beyond/common/zlib.xml
index c57b828..e56f4b4 100644
--- a/BOOK/beyond-lib/common/zlib.xml
+++ b/BOOK/beyond/common/zlib.xml
@@ -5,12 +5,12 @@
%general-entities;
]>
-<sect1 id="ch-beyond-lib-zlib" role="wrap">
+<sect1 id="ch-beyond-zlib" role="wrap">
<?dbhtml filename="zlib.html"?>
<title>Zlib-&zlib-version;</title>
- <indexterm zone="ch-beyond-lib-zlib">
+ <indexterm zone="ch-beyond-zlib">
<primary sortas="a-Zlib">Zlib</primary>
</indexterm>
@@ -72,7 +72,7 @@
<listitem>
<para>Contains compression and decompression
functions used by some programs</para>
- <indexterm zone="ch-beyond-lib-zlib libz">
+ <indexterm zone="ch-beyond-zlib libz">
<primary sortas="c-libz">libz</primary>
</indexterm>
</listitem>
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index 3138c41..23be718 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -54,8 +54,6 @@
<title>Beyond CLFS Embedded</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-lib/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-net/chapter.xml"/>
</part>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index a3c85e0..06d479d 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -55,8 +55,6 @@
<title>Beyond CLFS Embedded</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-lib/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-net/chapter.xml"/>
</part>
commit 99bb0b84c5f952bafb968948f409aa2bf7226ca5
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Jun 12 15:15:17 2014 -0400
beyond/intro: Clarify wording
We will not configure busybox, it's done already.
Only networking packages are in beyond, now.
diff --git a/BOOK/beyond/common/introduction.xml b/BOOK/beyond/common/introduction.xml
index 61ee0b4..c096e55 100644
--- a/BOOK/beyond/common/introduction.xml
+++ b/BOOK/beyond/common/introduction.xml
@@ -11,10 +11,6 @@
<title>Introduction</title>
<para os="a">Now that we have our base system built, we may add some optional
- additional functionality.</para>
-
- <para os="b">In this section, we explain how to compile additional packages
- for use with the system. We will also cover how to configure some of the
- BusyBox Utilities.</para>
+ additional networking software.</para>
</sect1>
commit 58f4a428e4a625c2cebffa99c5c3aae4c2c0c35e
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Jun 12 15:10:04 2014 -0400
Remove iptables
I have not tested even building iptables since late 2011 and no one else
has stepped up to support determining if it builds or functions.
diff --git a/BOOK/beyond-net/chapter.xml b/BOOK/beyond-net/chapter.xml
index 3d4cf56..5546292 100644
--- a/BOOK/beyond-net/chapter.xml
+++ b/BOOK/beyond-net/chapter.xml
@@ -16,7 +16,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/netplug.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dropbear.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iptables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/wireless_tools.xml"/>
</chapter>
diff --git a/BOOK/beyond-net/common/iptables.xml b/BOOK/beyond-net/common/iptables.xml
deleted file mode 100644
index 12356fb..0000000
--- a/BOOK/beyond-net/common/iptables.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-beyond-net-iptables" role="wrap">
- <?dbhtml filename="iptables.html"?>
-
- <title>IPTables-&iptables-version;</title>
-
- <indexterm zone="ch-beyond-net-iptables">
- <primary sortas="a-iptables">iptables</primary>
- </indexterm>
-
- <sect2 role="package">
- <title/>
-
- <para>iptables is the userspace command line program used to configure the Linux firewall.
- </para>
-
- </sect2>
-
- <sect2 role="installation">
- <title>Installation of iptables</title>
-
- <para os="a">Configure IPTables:</para>
-
-<screen os="b"><userinput>CC="${CC} -Os" ./configure --prefix=/usr --host=${CLFS_TARGET} \
- --libexecdir=/lib/iptables --without-kernel -enable-libipq --enable-shared</userinput></screen>
-
- <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make</userinput></screen>
-
- <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make DESTDIR=${CLFS}/targetfs install</userinput></screen>
-
- </sect2>
-
- <sect2 id="contents-iptables" role="content">
- <title>Contents of iptables</title>
-
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
-
- <seglistitem>
- <seg>To be Written</seg>
- </seglistitem>
- </segmentedlist>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/beyond-net/common/packages.xml b/BOOK/beyond-net/common/packages.xml
index e63e7e3..83439f0 100644
--- a/BOOK/beyond-net/common/packages.xml
+++ b/BOOK/beyond-net/common/packages.xml
@@ -24,15 +24,6 @@
</varlistentry>
<varlistentry>
- <term>Iptables (&iptables-version;) - <token>&iptables-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&iptables-home;"/></para>
- <para>Download: <ulink url="&iptables-url;"/></para>
- <para>MD5 sum: <literal>&iptables-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>Netplug (&netplug-version;) - <token>&netplug-size;</token>:</term>
<listitem>
<para>Home page: <ulink url="&netplug-home;"/></para>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 2f02efe..51b6fa9 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -82,12 +82,6 @@
<!ENTITY dropbear-md5 "fffa2fec0c887201bed3a3cc6df7fa35">
<!ENTITY dropbear-home "http://matt.ucc.asn.au/dropbear/dropbear.html">
-<!ENTITY iptables-version "1.4.19.1">
-<!ENTITY iptables-size "531 KB">
-<!ENTITY iptables-url "http://www.netfilter.org/projects/iptables/files/iptables-&iptables-version;.tar.bz2">
-<!ENTITY iptables-md5 "be97ce9007fa42c867901b496c935a0a">
-<!ENTITY iptables-home "http://www.netfilter.org/projects/iptables/">
-
<!ENTITY netplug-version "1.2.9.2">
<!ENTITY netplug-size "21 KB">
<!ENTITY netplug-url "http://www.red-bean.com/~bos/netplug/netplug-&netplug-version;.tar.bz2">
commit bb75e1e65f68e0615282e3e6881b07b947278194
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Jun 12 15:06:40 2014 -0400
Rename "beyond-introduction" directory to "beyond"
Will support combining every beyond package into one section.
diff --git a/BOOK/arm-index.xml b/BOOK/arm-index.xml
index 097ccfe..188b3a5 100644
--- a/BOOK/arm-index.xml
+++ b/BOOK/arm-index.xml
@@ -53,7 +53,7 @@
<title>Beyond CLFS Embedded</title>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-intro/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-lib/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-net/chapter.xml"/>
diff --git a/BOOK/beyond-intro/chapter.xml b/BOOK/beyond/chapter.xml
similarity index 100%
rename from BOOK/beyond-intro/chapter.xml
rename to BOOK/beyond/chapter.xml
diff --git a/BOOK/beyond-intro/common/introduction.xml b/BOOK/beyond/common/introduction.xml
similarity index 100%
rename from BOOK/beyond-intro/common/introduction.xml
rename to BOOK/beyond/common/introduction.xml
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index f9edd57..3138c41 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -53,7 +53,7 @@
<title>Beyond CLFS Embedded</title>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-intro/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-lib/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-net/chapter.xml"/>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index 449c39f..a3c85e0 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -54,7 +54,7 @@
<title>Beyond CLFS Embedded</title>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-intro/chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-lib/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-net/chapter.xml"/>
commit e0d570e1013a14da7faa8f3288261fefaae2353f
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Wed Jun 11 12:17:11 2014 -0400
Update musl to version 1.0.3
Latest stable series version.
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index b00c556..2f02efe 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -60,10 +60,10 @@
<!ENTITY mpfr-md5 "ee2c3ac63bf0c2359bf08fc3ee094c19">
<!ENTITY mpfr-home "http://www.mpfr.org/">
-<!ENTITY musl-version "0.9.14">
-<!ENTITY musl-size "806 KB">
+<!ENTITY musl-version "1.0.3">
+<!ENTITY musl-size "855 KB">
<!ENTITY musl-url "http://www.musl-libc.org/releases/musl-&musl-version;.tar.gz">
-<!ENTITY musl-md5 "bfb685695aa942e64c63170589e575b2">
+<!ENTITY musl-md5 "504e48bb43b4bc16875dc99b6bb2bcc9">
<!ENTITY musl-home "http://musl-libc.org/">
<!-- Beyond CLFS library packages -->
commit 30f9ca7e2420f49251fd47bc808d5cec091a757b
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Wed Jun 11 12:48:00 2014 -0400
Update busybox to version 1.22.1
Removes the need to patch busybox due to musl.
diff --git a/BOOK/final-system/common/busybox.xml b/BOOK/final-system/common/busybox.xml
index 9da9580..4711ec6 100644
--- a/BOOK/final-system/common/busybox.xml
+++ b/BOOK/final-system/common/busybox.xml
@@ -34,10 +34,6 @@
<screen os="b"><userinput>make distclean</userinput></screen>
- <para os="c">The following patch is needed for musl:</para>
-
-<screen os="d"><userinput>patch -Np1 -i ../&busybox-musl-patch;</userinput></screen>
-
<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>
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index 8c49dad..14d4c63 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -19,15 +19,6 @@
<variablelist role="materials">
<varlistentry>
- <term>BusyBox musl Patch - <token>&busybox-musl-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&busybox-musl-patch;"/></para>
- <para>MD5 sum: <literal>&busybox-musl-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>GCC musl Patch - <token>&gcc-musl-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index c0ab7e6..b00c556 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -10,10 +10,10 @@
<!ENTITY binutils-md5 "e0f71a7b2ddab0f8612336ac81d9636b">
<!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
-<!ENTITY busybox-version "1.21.1">
-<!ENTITY busybox-size "2150 KB">
+<!ENTITY busybox-version "1.22.1">
+<!ENTITY busybox-size "2167 KB">
<!ENTITY busybox-url "http://busybox.net/downloads/busybox-&busybox-version;.tar.bz2">
-<!ENTITY busybox-md5 "795394f83903b5eec6567d51eebb417e">
+<!ENTITY busybox-md5 "337d1a15ab1cb1d4ed423168b1eb7d7e">
<!ENTITY busybox-home "http://www.busybox.net">
<!ENTITY clfs-bootscripts-version "git master HEAD">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 07a3462..a1fcd2d 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -4,10 +4,6 @@
<!-- Core Patches -->
-<!ENTITY busybox-musl-patch "busybox-&busybox-version;-musl-1.patch">
-<!ENTITY busybox-musl-patch-md5 "335622b0f2bf4e18e9d93fd48afe53da">
-<!ENTITY busybox-musl-patch-size "1 KB">
-
<!ENTITY gcc-musl-patch "gcc-&gcc-version;-musl-1.patch">
<!ENTITY gcc-musl-patch-md5 "5b43765740ca9865b8afe3cc945a3f5d">
<!ENTITY gcc-musl-patch-size "26 KB">
diff --git a/patches/busybox-1.21.1-musl-1.patch b/patches/busybox-1.21.1-musl-1.patch
deleted file mode 100644
index e7becc4..0000000
--- a/patches/busybox-1.21.1-musl-1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Submitted By: Andrew Bradford <andrew at bradfordembedded.com>
-Date: 2013-10-16
-Initial Package Version: 1.21.1
-Origin: Buildroot git and BusyBox git
-Upstream Status: ifconfig.c and partially iplink.c yes, libbb.h no
-Description: Patches to BusyBox to build for musl-libc.
-
-diff -Naur busybox-1.21.1-orig/include/libbb.h busybox-1.21.1/include/libbb.h
---- busybox-1.21.1-orig/include/libbb.h 2013-06-29 10:58:06.000000000 -0400
-+++ busybox-1.21.1/include/libbb.h 2013-10-16 10:38:04.222276525 -0400
-@@ -37,7 +37,7 @@
- #include <libgen.h> /* dirname,basename */
- #undef basename
- #define basename dont_use_basename
--#include <sys/poll.h>
-+#include <poll.h>
- #include <sys/ioctl.h>
- #include <sys/mman.h>
- #include <sys/socket.h>
-diff -Naur busybox-1.21.1-orig/networking/ifconfig.c busybox-1.21.1/networking/ifconfig.c
---- busybox-1.21.1-orig/networking/ifconfig.c 2013-05-11 19:30:43.000000000 -0400
-+++ busybox-1.21.1/networking/ifconfig.c 2013-10-16 10:37:51.628945111 -0400
-@@ -56,7 +56,7 @@
- #endif
-
- #if ENABLE_FEATURE_IFCONFIG_SLIP
--# include <net/if_slip.h>
-+# include <linux/if_slip.h>
- #endif
-
- /* I don't know if this is needed for busybox or not. Anyone? */
-diff -Naur busybox-1.21.1-orig/networking/libiproute/iplink.c busybox-1.21.1/networking/libiproute/iplink.c
---- busybox-1.21.1-orig/networking/libiproute/iplink.c 2013-05-11 19:30:43.000000000 -0400
-+++ busybox-1.21.1/networking/libiproute/iplink.c 2013-10-16 10:59:59.925471509 -0400
-@@ -5,8 +5,7 @@
- * Licensed under GPLv2 or later, see file LICENSE in this source tree.
- */
- #include <net/if.h>
--#include <net/if_packet.h>
--#include <netpacket/packet.h>
-+#include <linux/if_packet.h>
- #include <netinet/if_ether.h>
-
- #include "ip_common.h" /* #include "libbb.h" is inside */
commit 7e8a7d8f5c06b744f28b88e801713762f3947c9f
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Wed Jun 11 11:39:02 2014 -0400
Update binutils to 2.24
Now supports musl without patching of binutils.
diff --git a/BOOK/cross-tools/common/binutils.xml b/BOOK/cross-tools/common/binutils.xml
index eb20b8e..44973fd 100644
--- a/BOOK/cross-tools/common/binutils.xml
+++ b/BOOK/cross-tools/common/binutils.xml
@@ -31,10 +31,6 @@
linker and assembler to determine which of their own features to
enable.</para>
- <para>In order to work with musl, bintuils needs to be patched:</para>
-
-<screen><userinput>patch -Np1 -i ../&binutils-musl-patch;</userinput></screen>
-
<para os="b">The Binutils documentation recommends building Binutils outside of the
source directory in a dedicated build directory:</para>
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index 2c5624d..8c49dad 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -19,15 +19,6 @@
<variablelist role="materials">
<varlistentry>
- <term>Binutils musl Patch - <token>&binutils-musl-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&binutils-musl-patch;"/></para>
- <para>MD5 sum: <literal>&binutils-musl-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
<term>BusyBox musl Patch - <token>&busybox-musl-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 041d498..c0ab7e6 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -4,10 +4,10 @@
<!-- Note: For empty *-home entities use " " not "" -->
-<!ENTITY binutils-version "2.23.2">
-<!ENTITY binutils-size "20937 KB">
+<!ENTITY binutils-version "2.24">
+<!ENTITY binutils-size "22185 KB">
<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
-<!ENTITY binutils-md5 "4f8fa651e35ef262edc01d60fb45702e">
+<!ENTITY binutils-md5 "e0f71a7b2ddab0f8612336ac81d9636b">
<!ENTITY binutils-home "http://www.gnu.org/software/binutils/">
<!ENTITY busybox-version "1.21.1">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index ce5291d..07a3462 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -4,10 +4,6 @@
<!-- Core Patches -->
-<!ENTITY binutils-musl-patch "binutils-&binutils-version;-musl-1.patch">
-<!ENTITY binutils-musl-patch-md5 "dde64feb7f4cf821cbd887b53026fd67">
-<!ENTITY binutils-musl-patch-size "1 KB">
-
<!ENTITY busybox-musl-patch "busybox-&busybox-version;-musl-1.patch">
<!ENTITY busybox-musl-patch-md5 "335622b0f2bf4e18e9d93fd48afe53da">
<!ENTITY busybox-musl-patch-size "1 KB">
diff --git a/patches/binutils-2.23.2-musl-1.patch b/patches/binutils-2.23.2-musl-1.patch
deleted file mode 100644
index fcdc841..0000000
--- a/patches/binutils-2.23.2-musl-1.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Submitted By: Andrew Bradford <andrew at bradfordembedded.com>
-Date: 2013-10-14
-Initial Package Version: 2.23.2
-Origin: Gregor Richards' musl-cross
-Upstream Status: None
-Description: Patches to binutils to build for musl-libc.
-
-diff -r 54fa2047c3af config.sub
---- a/config.sub Fri Mar 29 16:27:22 2013 -0400
-+++ b/config.sub Fri Mar 29 16:28:11 2013 -0400
-@@ -123,6 +123,7 @@
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
- nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
-+ linux-musl* | \
- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
- knetbsd*-gnu* | netbsd*-gnu* | \
- kopensolaris*-gnu* | \
-@@ -1361,6 +1362,7 @@
- | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
- | -mingw32* | -linux-gnu* | -linux-android* \
- | -linux-newlib* | -linux-uclibc* \
-+ | -linux-musl* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-diff -Naur a/bfd/doc/bfd.texinfo b/bfd/doc/bfd.texinfo
---- a/bfd/doc/bfd.texinfo 2010-10-28 07:40:25.000000000 -0400
-+++ b/bfd/doc/bfd.texinfo 2013-10-02 15:57:07.556185659 -0400
-@@ -322,7 +322,7 @@
- @printindex cp
-
- @tex
--% I think something like @colophon should be in texinfo. In the
-+% I think something like @@colophon should be in texinfo. In the
- % meantime:
- \long\def\colophon{\hbox to0pt{}\vfill
- \centerline{The body of this manual is set in}
-@@ -333,7 +333,7 @@
- \centerline{{\sl\fontname\tensl\/}}
- \centerline{are used for emphasis.}\vfill}
- \page\colophon
--% Blame: doc at cygnus.com, 28mar91.
-+% Blame: doc@@cygnus.com, 28mar91.
- @end tex
-
- @bye
commit 209f20d1c5f43c95314b690cc7df785c527838b4
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Nov 4 14:54:47 2013 -0500
kernel: s/simplify/reduce complexity of booting/
As per recommendation of nu shto.
diff --git a/BOOK/bootable/common/kernel.xml b/BOOK/bootable/common/kernel.xml
index d227fa2..f159c4c 100644
--- a/BOOK/bootable/common/kernel.xml
+++ b/BOOK/bootable/common/kernel.xml
@@ -45,7 +45,7 @@
components are console/video, disk, and network. With out these built
in, the system will not function properly. It is recommended to
configure the kernel without modules in order to conserve disk space
- and to simplify.</para></note>
+ and to reduce the complexity of booting.</para></note>
<screen os="g"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
commit c4b23647b77dca5654d66c17195766b5e4f7a4b3
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Nov 4 14:34:57 2013 -0500
gcc: Add notes for static vs final builds
To clarify that the first pass is mainly to build the libc and the
second pass uses that libc to build the actual cross compiler.
diff --git a/BOOK/cross-tools/common/gcc-final.xml b/BOOK/cross-tools/common/gcc-final.xml
index 3cf8122..d394b50 100644
--- a/BOOK/cross-tools/common/gcc-final.xml
+++ b/BOOK/cross-tools/common/gcc-final.xml
@@ -17,9 +17,14 @@
<secondary>cross tools, final</secondary>
</indexterm>
- <xi:include role="package" xmlns:xi="http://www.w3.org/2003/XInclude"
- href="gcc-static.xml"
- xpointer="xpointer(//*[@role='package'])"/>
+ <sect2 role="package">
+ <title/>
+
+ <para>The GCC package contains the GNU compiler collection, which includes
+ the C compiler. This second build of GCC will produce the final cross
+ compiler which will use the previously built C library.</para>
+
+ </sect2>
<sect2 role="installation">
<title>Installation of GCC Cross Compiler</title>
diff --git a/BOOK/cross-tools/common/gcc-static.xml b/BOOK/cross-tools/common/gcc-static.xml
index 7180f7c..5052328 100644
--- a/BOOK/cross-tools/common/gcc-static.xml
+++ b/BOOK/cross-tools/common/gcc-static.xml
@@ -21,7 +21,8 @@
<title/>
<para>The GCC package contains the GNU compiler collection, which includes
- the C compiler.</para>
+ the C compiler. This build of GCC is mainly done so that the C library
+ can be built next.</para>
</sect2>
commit 1cf6d414d78f8e6479c91b23561b1eeda16e48b5
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Nov 4 14:02:21 2013 -0500
cflags: Don't deal with CXXFLAGS
We don't build c++ compiler and thus CXXFLAGS should not be used.
diff --git a/BOOK/cross-tools/common/cflags.xml b/BOOK/cross-tools/common/cflags.xml
index 3fbb036..f6db1ad 100644
--- a/BOOK/cross-tools/common/cflags.xml
+++ b/BOOK/cross-tools/common/cflags.xml
@@ -10,19 +10,13 @@
<title>Build CFLAGS</title>
- <para><envar>CFLAGS</envar> and <envar>CXXFLAGS</envar> must not be
+ <para><envar>CFLAGS</envar> must not be
set during the building of cross-tools.</para>
- <para>To disable <envar>CFLAGS</envar> and <envar>CXXFLAGS</envar>
+ <para>To disable <envar>CFLAGS</envar>
use the following commands:</para>
<screen><userinput>unset CFLAGS
-unset CXXFLAGS</userinput></screen>
-
- <para>Now add these to <filename>~/.bashrc</filename>, just in
- case you have to exit and restart building later:</para>
-
-<screen><userinput>echo unset CFLAGS >> ~/.bashrc
-echo unset CXXFLAGS >> ~/.bashrc</userinput></screen>
+echo unset CFLAGS >> ~/.bashrc</userinput></screen>
</sect1>
commit dd423a0eac0e41f5b2c7104fb1349f0db2895af2
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Wed Jun 11 12:47:06 2014 -0400
Rename musl-libc to just musl
Proper name seems to be just "musl" from the documentation.
diff --git a/BOOK/cross-tools/common/binutils.xml b/BOOK/cross-tools/common/binutils.xml
index a92a45a..eb20b8e 100644
--- a/BOOK/cross-tools/common/binutils.xml
+++ b/BOOK/cross-tools/common/binutils.xml
@@ -31,7 +31,7 @@
linker and assembler to determine which of their own features to
enable.</para>
- <para>In order to work with musl-libc, bintuils needs to be patched:</para>
+ <para>In order to work with musl, bintuils needs to be patched:</para>
<screen><userinput>patch -Np1 -i ../&binutils-musl-patch;</userinput></screen>
diff --git a/BOOK/cross-tools/common/gcc-static.xml b/BOOK/cross-tools/common/gcc-static.xml
index 4f034d1..7180f7c 100644
--- a/BOOK/cross-tools/common/gcc-static.xml
+++ b/BOOK/cross-tools/common/gcc-static.xml
@@ -29,7 +29,7 @@
<title os="a">Installation of Cross GCC Compiler with Static libgcc
and no Threads</title>
- <para os="aa">In order to work with musl-libc, GCC needs to be patched:</para>
+ <para os="aa">In order to work with musl, GCC needs to be patched:</para>
<screen os="ab"><userinput>patch -Np1 -i ../&gcc-musl-patch;</userinput></screen>
diff --git a/BOOK/cross-tools/common/libc.xml b/BOOK/cross-tools/common/libc.xml
index c39ad29..c69e560 100644
--- a/BOOK/cross-tools/common/libc.xml
+++ b/BOOK/cross-tools/common/libc.xml
@@ -8,17 +8,17 @@
<sect1 id="ch-cross-tools-libc" role="wrap">
<?dbhtml filename="libc.html"?>
- <title>musl-libc-&musl-libc-version;</title>
+ <title>musl-&musl-version;</title>
<indexterm zone="ch-cross-tools-libc">
- <primary sortas="a-libc">musl-libc</primary>
+ <primary sortas="a-libc">musl</primary>
<secondary>cross tools</secondary>
</indexterm>
<sect2 role="package">
<title/>
- <para>The musl-libc package contains the main C library. This library provides
+ <para>The musl package contains the main C library. This library provides
the basic routines for allocating memory, searching directories, opening and
closing files, reading and writing files, string handling, pattern matching,
arithmetic, and so on.</para>
@@ -26,7 +26,7 @@
</sect2>
<sect2 role="installation">
- <title>Installation of musl-libc</title>
+ <title>Installation of musl</title>
<para os="h">Configure the package:</para>
@@ -44,15 +44,15 @@
</sect2>
- <sect2 id="contents-musl-libc" role="content">
- <title>Contents of musl-libc</title>
+ <sect2 id="contents-musl" role="content">
+ <title>Contents of musl</title>
<segmentedlist>
<segtitle>Installed Programs</segtitle>
<segtitle>Installed Libraries</segtitle>
<segtitle>Installed Headers</segtitle>
<seglistitem>
- <seg>ld-musl-libc.so.0</seg>
+ <seg>ld-musl.so.0</seg>
<seg> libc.so.0, libcrypt.so.0, libdl.so.0, libm.so.0, libpthread.so.0,
librt.so.0</seg>
<seg>To be written...</seg>
@@ -64,12 +64,12 @@
<?dbfo list-presentation="list"?>
<?dbhtml list-presentation="table"?>
- <varlistentry id="ld-musl-libc">
- <term><command>ld-musl-libc</command></term>
+ <varlistentry id="ld-musl">
+ <term><command>ld-musl</command></term>
<listitem>
- <para>The musl-libc dynamic linker / loader</para>
- <indexterm zone="ch-cross-tools-libc ld-musl-libc">
- <primary sortas="b-ld-musl-libc">ld-musl-libc</primary>
+ <para>The musl dynamic linker / loader</para>
+ <indexterm zone="ch-cross-tools-libc ld-musl">
+ <primary sortas="b-ld-musl">ld-musl</primary>
</indexterm>
</listitem>
</varlistentry>
@@ -97,7 +97,7 @@
<varlistentry id="libdl">
<term><filename class="libraryfile">libdl</filename></term>
<listitem>
- <para>The musl-libc dynamic linker / loader library</para>
+ <para>The musl dynamic linker / loader library</para>
<indexterm zone="ch-cross-tools-libc libdl">
<primary sortas="c-libdl">libdl</primary>
</indexterm>
diff --git a/BOOK/final-system/common/busybox.xml b/BOOK/final-system/common/busybox.xml
index a489eaa..9da9580 100644
--- a/BOOK/final-system/common/busybox.xml
+++ b/BOOK/final-system/common/busybox.xml
@@ -34,7 +34,7 @@
<screen os="b"><userinput>make distclean</userinput></screen>
- <para os="c">The following patch is needed for musl-libc:</para>
+ <para os="c">The following patch is needed for musl:</para>
<screen os="d"><userinput>patch -Np1 -i ../&busybox-musl-patch;</userinput></screen>
@@ -49,7 +49,7 @@
<screen os="g"><userinput>ARCH="${CLFS_ARCH}" make defconfig</userinput></screen>
<para os="fa">Disable building both ifplugd and inetd as they both have
- issues building against musl-libc:</para>
+ issues building against musl:</para>
<screen os="fb"><userinput>sed -i 's/\(CONFIG_\)\(.*\)\(INETD\)\(.*\)=y/# \1\2\3\4 is not set/g' .config
sed -i 's/\(CONFIG_IFPLUGD\)=y/# \1 is not set/' .config</userinput></screen>
diff --git a/BOOK/materials/common/packages.xml b/BOOK/materials/common/packages.xml
index 56af7cb..2017205 100644
--- a/BOOK/materials/common/packages.xml
+++ b/BOOK/materials/common/packages.xml
@@ -96,11 +96,11 @@
</varlistentry>
<varlistentry>
- <term>musl-libc (&musl-libc-version;) - <token>&musl-libc-size;</token>:</term>
+ <term>musl (&musl-version;) - <token>&musl-size;</token>:</term>
<listitem>
- <para>Home page: <ulink url="&musl-libc-home;"/></para>
- <para>Download: <ulink url="&musl-libc-url;"/></para>
- <para>MD5 sum: <literal>&musl-libc-md5;</literal></para>
+ <para>Home page: <ulink url="&musl-home;"/></para>
+ <para>Download: <ulink url="&musl-url;"/></para>
+ <para>MD5 sum: <literal>&musl-md5;</literal></para>
</listitem>
</varlistentry>
diff --git a/BOOK/materials/common/patches.xml b/BOOK/materials/common/patches.xml
index 4421aa8..2c5624d 100644
--- a/BOOK/materials/common/patches.xml
+++ b/BOOK/materials/common/patches.xml
@@ -19,7 +19,7 @@
<variablelist role="materials">
<varlistentry>
- <term>Binutils musl-libc Patch - <token>&binutils-musl-patch-size;</token>:</term>
+ <term>Binutils musl Patch - <token>&binutils-musl-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&binutils-musl-patch;"/></para>
@@ -28,7 +28,7 @@
</varlistentry>
<varlistentry>
- <term>BusyBox musl-libc Patch - <token>&busybox-musl-patch-size;</token>:</term>
+ <term>BusyBox musl Patch - <token>&busybox-musl-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&busybox-musl-patch;"/></para>
@@ -37,7 +37,7 @@
</varlistentry>
<varlistentry>
- <term>GCC musl-libc Patch - <token>&gcc-musl-patch-size;</token>:</term>
+ <term>GCC musl Patch - <token>&gcc-musl-patch-size;</token>:</term>
<listitem>
<para>Download: <ulink
url="&patches-root;&gcc-musl-patch;"/></para>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index c99dc7c..041d498 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -60,11 +60,11 @@
<!ENTITY mpfr-md5 "ee2c3ac63bf0c2359bf08fc3ee094c19">
<!ENTITY mpfr-home "http://www.mpfr.org/">
-<!ENTITY musl-libc-version "0.9.14">
-<!ENTITY musl-libc-size "806 KB">
-<!ENTITY musl-libc-url "http://www.musl-libc.org/releases/musl-&musl-libc-version;.tar.gz">
-<!ENTITY musl-libc-md5 "bfb685695aa942e64c63170589e575b2">
-<!ENTITY musl-libc-home "http://musl-libc.org/">
+<!ENTITY musl-version "0.9.14">
+<!ENTITY musl-size "806 KB">
+<!ENTITY musl-url "http://www.musl-libc.org/releases/musl-&musl-version;.tar.gz">
+<!ENTITY musl-md5 "bfb685695aa942e64c63170589e575b2">
+<!ENTITY musl-home "http://musl-libc.org/">
<!-- Beyond CLFS library packages -->
commit 2864f08d4d162e71e87ce7ef0c2e2439cf06dd8f
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Fri Oct 25 16:27:36 2013 -0400
Add netplug to beyond-net
Not yet supported by bootscripts although instructions are in this
commit.
diff --git a/BOOK/beyond-net/chapter.xml b/BOOK/beyond-net/chapter.xml
index 2e69804..3d4cf56 100644
--- a/BOOK/beyond-net/chapter.xml
+++ b/BOOK/beyond-net/chapter.xml
@@ -14,6 +14,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/patches.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/netplug.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/dropbear.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iptables.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/wireless_tools.xml"/>
diff --git a/BOOK/beyond-net/common/netplug.xml b/BOOK/beyond-net/common/netplug.xml
new file mode 100644
index 0000000..c08394c
--- /dev/null
+++ b/BOOK/beyond-net/common/netplug.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+ "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+ <!ENTITY % general-entities SYSTEM "../../general.ent">
+ %general-entities;
+]>
+
+<sect1 id="ch-beyond-net-netplug" role="wrap">
+ <?dbhtml filename="netplug.html"?>
+
+ <title>Netplug-&netplug-version;</title>
+
+ <indexterm zone="ch-beyond-net-netplug">
+ <primary sortas="a-Netplug">Netplug</primary>
+ </indexterm>
+
+ <sect2 role="package">
+ <title/>
+
+ <para>Netplug is a daemon that detects insertion and removal of network
+ cables and reacts to bring up or take down the network interface.</para>
+
+ </sect2>
+
+ <sect2 role="installation">
+ <title>Installation of Netplug</title>
+
+ <para>Patch netplug to fix issues:</para>
+
+ <screen><userinput>patch -Np1 -i ../&netplug-patch;</userinput></screen>
+
+ <para os="f">Compile the package:</para>
+
+<screen os="g"><userinput>make</userinput></screen>
+
+ <para os="h">Install the package:</para>
+
+<screen os="i"><userinput>make DESTDIR=${CLFS}/targetfs install</userinput></screen>
+
+ </sect2>
+
+ <sect2 role="bootscripts">
+ <title>Installation of Netplug Bootscripts</title>
+
+ <para os="l">From the clfs-bootscripts package, install the Netplug
+ bootscripts:</para>
+
+<screen os="m"><userinput>make install-netplug DESTDIR=${CLFS}/targetfs</userinput></screen>
+
+
+ </sect2>
+
+ <sect2 id="contents-netplug" role="content">
+ <title>Contents of Netplug</title>
+
+ <segmentedlist>
+ <segtitle>Installed programs</segtitle>
+
+ <seglistitem>
+ <seg>/sbin/netplugd</seg>
+ </seglistitem>
+ </segmentedlist>
+
+ </sect2>
+
+</sect1>
diff --git a/BOOK/beyond-net/common/packages.xml b/BOOK/beyond-net/common/packages.xml
index b8bca2b..e63e7e3 100644
--- a/BOOK/beyond-net/common/packages.xml
+++ b/BOOK/beyond-net/common/packages.xml
@@ -33,6 +33,15 @@
</varlistentry>
<varlistentry>
+ <term>Netplug (&netplug-version;) - <token>&netplug-size;</token>:</term>
+ <listitem>
+ <para>Home page: <ulink url="&netplug-home;"/></para>
+ <para>Download: <ulink url="&netplug-url;"/></para>
+ <para>MD5 sum: <literal>&netplug-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ <varlistentry>
<term>Wireless Tools (&wireless_tools-version;) - <token>&wireless_tools-size;</token>:</term>
<listitem>
<para>Home page: <ulink url="&wireless_tools-home;"/></para>
diff --git a/BOOK/beyond-net/common/patches.xml b/BOOK/beyond-net/common/patches.xml
index becda1d..7bd87e9 100644
--- a/BOOK/beyond-net/common/patches.xml
+++ b/BOOK/beyond-net/common/patches.xml
@@ -16,9 +16,18 @@
make the packages easier to work with. The following patches will be
needed in order to build the associated packages:</para>
-<!--<variablelist role="beyond-clfs3">
- </variablelist>
--->
+ <variablelist role="patches">
+
+ <varlistentry>
+ <term>Netplug Patch - <token>&netplug-patch-size;</token>:</term>
+ <listitem>
+ <para>Download: <ulink
+ url="&patches-root;&netplug-patch;"/></para>
+ <para>MD5 sum: <literal>&netplug-patch-md5;</literal></para>
+ </listitem>
+ </varlistentry>
+
+ </variablelist>
<para os="a">Total size of these patches: about <returnvalue/></para>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 15aa7f2..c99dc7c 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -88,6 +88,12 @@
<!ENTITY iptables-md5 "be97ce9007fa42c867901b496c935a0a">
<!ENTITY iptables-home "http://www.netfilter.org/projects/iptables/">
+<!ENTITY netplug-version "1.2.9.2">
+<!ENTITY netplug-size "21 KB">
+<!ENTITY netplug-url "http://www.red-bean.com/~bos/netplug/netplug-&netplug-version;.tar.bz2">
+<!ENTITY netplug-md5 "1d6db99536bdf875ce441f2c0e45ebf2">
+<!ENTITY netplug-home "http://www.red-bean.com/~bos/">
+
<!ENTITY wireless_tools-version "29">
<!ENTITY wireless_tools-size "288 KB">
<!ENTITY wireless_tools-url "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.&wireless_tools-version;.tar.gz">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 4c2ca01..ce5291d 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -21,3 +21,7 @@
<!ENTITY iana-etc-update-patch-size "4 KB">
<!-- Beyond patches -->
+
+<!ENTITY netplug-patch "netplug-&netplug-version;-fixes-1.patch">
+<!ENTITY netplug-patch-md5 "">
+<!ENTITY netplug-patch-size "1 KB">
diff --git a/patches/netplug-1.2.9.2-fixes-1.patch b/patches/netplug-1.2.9.2-fixes-1.patch
new file mode 100644
index 0000000..2e11627
--- /dev/null
+++ b/patches/netplug-1.2.9.2-fixes-1.patch
@@ -0,0 +1,42 @@
+Submitted By: Andrew Bradford <andrew at bradfordembedded.com>
+Date: 2013-10-25
+Initial Package Version: 1.2.9.2
+Origin: CLFS specific
+Upstream Status: Not Applied
+Description: Fixes build problems.
+
+diff -Naur netplug-1.2.9.2.orig/lib.c netplug-1.2.9.2/lib.c
+--- netplug-1.2.9.2.orig/lib.c 2013-10-25 16:23:21.270934264 -0400
++++ netplug-1.2.9.2/lib.c 2013-10-25 16:24:26.067667210 -0400
+@@ -200,20 +200,6 @@
+ }
+
+
+-void
+-__assert_fail(const char *assertion, const char *file,
+- unsigned int line, const char *function)
+-{
+- do_log(LOG_CRIT, "%s:%u: %s%sAssertion `%s' failed",
+- file, line,
+- function ? function : "",
+- function ? ": " : "",
+- assertion);
+-
+- abort();
+-}
+-
+-
+ /*
+ * Local variables:
+ * c-file-style: "stroustrup"
+diff -Naur netplug-1.2.9.2.orig/netplug.h netplug-1.2.9.2/netplug.h
+--- netplug-1.2.9.2.orig/netplug.h 2013-10-25 16:23:21.270934264 -0400
++++ netplug-1.2.9.2/netplug.h 2013-10-25 16:24:17.054324652 -0400
+@@ -25,6 +25,7 @@
+ #include <sys/socket.h>
+ #include <linux/netlink.h>
+ #include <linux/rtnetlink.h>
++#include <time.h>
+
+ #define NP_SCRIPT NP_SCRIPT_DIR "/netplug"
+
commit 75adfe0a70b51d026678f40a7a3141fb4eed6d52
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Fri Oct 25 11:14:10 2013 -0400
zlib: Set optimization in CFLAGS
No need to alter configure, it'll respect CFLAGS.
diff --git a/BOOK/beyond-lib/common/zlib.xml b/BOOK/beyond-lib/common/zlib.xml
index dba3525..c57b828 100644
--- a/BOOK/beyond-lib/common/zlib.xml
+++ b/BOOK/beyond-lib/common/zlib.xml
@@ -25,14 +25,9 @@
<sect2 role="installation">
<title>Installation of Zlib</title>
- <para os="a">Change the default optimization to Os</para>
+ <para os="c">Prepare Zlib for compilation and set to optimize for size:</para>
-<screen os="b"><userinput>cp configure{,.orig}
-sed -e 's/-O3/-Os/g' configure.orig > configure</userinput></screen>
-
- <para os="c">Prepare Zlib for compilation:</para>
-
-<screen os="d"><userinput>./configure --shared</userinput></screen>
+<screen os="d"><userinput>CFLAGS="-Os" ./configure --shared</userinput></screen>
<variablelist os="aa">
<title>The meaning of the configure options:</title>
commit f91b6ccc5d5766ddc308a4d057b09e8ddf3dc0d8
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Wed Jun 11 12:46:39 2014 -0400
Remove e2fsprogs and beyond-filesys section
busybox has some e2fsprog abilities. e2fsprogs uses some glibc-isms
which are annoying to patch correctly. Most people won't use the
e2fsprogs actual package as busybox versions can do fsck.
diff --git a/BOOK/arm-index.xml b/BOOK/arm-index.xml
index 4643484..097ccfe 100644
--- a/BOOK/arm-index.xml
+++ b/BOOK/arm-index.xml
@@ -56,7 +56,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-intro/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-lib/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-net/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-filesys/chapter.xml"/>
</part>
diff --git a/BOOK/beyond-filesys/chapter.xml b/BOOK/beyond-filesys/chapter.xml
deleted file mode 100644
index de3772d..0000000
--- a/BOOK/beyond-filesys/chapter.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../general.ent">
- %general-entities;
-]>
-
-<chapter id="chapter-beyond-filesystem-tools" xreflabel="File System Tools">
- <?dbhtml dir="beyond-filesys"?>
- <?dbhtml filename="chapter.html"?>
-
- <title>File System Tools</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/packages.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/e2fsprogs.xml"/>
-
-</chapter>
diff --git a/BOOK/beyond-filesys/common/e2fsprogs.xml b/BOOK/beyond-filesys/common/e2fsprogs.xml
deleted file mode 100644
index 6d951b4..0000000
--- a/BOOK/beyond-filesys/common/e2fsprogs.xml
+++ /dev/null
@@ -1,481 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-system-e2fsprogs" role="wrap">
- <?dbhtml filename="e2fsprogs.html"?>
-
- <title>E2fsprogs-&e2fsprogs-version;</title>
-
- <indexterm zone="ch-system-e2fsprogs">
- <primary sortas="a-E2fsprogs">E2fsprogs</primary>
- </indexterm>
-
- <sect2 role="package">
- <title/>
-
- <para>The E2fsprogs package contains the utilities for handling the
- <systemitem class="filesystem">ext2</systemitem> file system. It also
- supports the <systemitem class="filesystem">ext3</systemitem> and
- <systemitem class="filesystem">ext4</systemitem> journaling
- file systems.</para>
-
- </sect2>
-
- <sect2 role="installation">
- <title>Installation of E2fsprogs</title>
-
- <para os="a">The E2fsprogs documentation recommends that the package be
- built in a subdirectory of the source tree:</para>
-
-<screen os="b"><userinput>mkdir -v build
-cd build</userinput></screen>
-
- <para os="c">Prepare E2fsprogs for compilation:</para>
-
-<screen os="d"><userinput>CC="${CC} -Os" ../configure --prefix=/usr \
- --with-root-prefix="" --host=${CLFS_TARGET} --disable-tls \
- --disable-debugfs --disable-e2initrd-helper --disable-nls</userinput></screen>
-
- <variablelist os="e">
- <title>The meaning of the configure options:</title>
-
- <varlistentry os="e1">
- <term><parameter>--with-root-prefix=""</parameter></term>
- <listitem>
- <para>Certain programs (such as the <command>e2fsck</command>
- program) are considered essential programs. When, for example,
- <filename class="directory">/usr</filename> is not mounted,
- these programs still need to be available. They belong in
- directories like <filename class="directory">/lib</filename> and
- <filename class="directory">/sbin</filename>. If this option is
- not passed to E2fsprogs' configure, the programs are installed into
- the <filename class="directory">/usr</filename> directory.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="e2">
- <term><parameter>--disable-tls</parameter></term>
- <listitem>
- <para>Disable thread local support</para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="e3">
- <term><parameter>--disable-debugfs</parameter></term>
- <listitem>
- <para>Disable building of the debugfs program.
- The debugfs program relies upon utime.h which is not
- available in the embedded system.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="e4">
- <term><parameter>--disable-e2initrd-helper</parameter></term>
- <listitem>
- <para>Disable building of the e2initrd-helper.
- The e2initrd-helper program relies upon utime.h which is not
- available in the embedded system.</para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="e5">
- <term><parameter>--disable-nls</parameter></term>
- <listitem>
- <para>Disable native language support.</para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- <para os="f">Compile the package:</para>
-
-<screen os="g"><userinput>make</userinput></screen>
-
- <para os="h">Install the binaries, documentation, and shared libraries:</para>
-
-<screen os="i"><userinput>make DESTDIR=${CLFS}/targetfs install</userinput></screen>
-
- <para os="j">Install the static libraries and headers:</para>
-
-<screen os="k"><userinput>make DESTDIR=${CLFS}/targetfs install-libs</userinput></screen>
-
- </sect2>
-
- <sect2 id="contents-e2fsprogs" role="content">
- <title>Contents of E2fsprogs</title>
-
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
- <segtitle>Installed libraries</segtitle>
-
- <seglistitem>
- <seg>badblocks, blkid, chattr, compile_et, dumpe2fs,
- e2fsck, e2image, e2label, filefrag, findfs, fsck, fsck.ext2, fsck.ext3,
- fsck.ext4, logsave, lsattr, mk_cmds, mke2fs, mkfs.ext2, mkfs.ext3,
- mkfs.ext4, mklost+found, resize2fs, tune2fs, and uuidgen.</seg>
- <seg>libblkid.[a,so], libcom_err.[a,so], libe2p.[a,so],
- libext2fs.[a,so], libss.[a,so], and libuuid.[a,so]</seg>
- </seglistitem>
- </segmentedlist>
-
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="badblocks">
- <term><command>badblocks</command></term>
- <listitem>
- <para>Searches a device (usually a disk partition) for bad
- blocks</para>
- <indexterm zone="ch-system-e2fsprogs badblocks">
- <primary sortas="b-badblocks">badblocks</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="blkid">
- <term><command>blkid</command></term>
- <listitem>
- <para>A command line utility to locate and print block device
- attributes</para>
- <indexterm zone="ch-system-e2fsprogs blkid">
- <primary sortas="b-blkid">blkid</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="chattr">
- <term><command>chattr</command></term>
- <listitem>
- <para>Changes the attributes of files on an <systemitem
- class="filesystem">ext2</systemitem> file system; it also
- changes <systemitem class="filesystem">ext3</systemitem>
- file systems, the journaling version of <systemitem
- class="filesystem">ext2</systemitem> file systems</para>
- <indexterm zone="ch-system-e2fsprogs chattr">
- <primary sortas="b-chattr">chattr</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="compile_et">
- <term><command>compile_et</command></term>
- <listitem>
- <para>An error table compiler; it converts a table of error-code
- names and messages into a C source file suitable for use with the
- <filename class="libraryfile">com_err</filename> library</para>
- <indexterm zone="ch-system-e2fsprogs compile_et">
- <primary sortas="b-compile_et">compile_et</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="dumpe2fs">
- <term><command>dumpe2fs</command></term>
- <listitem>
- <para>Prints the super block and blocks group information for the
- file system present on a given device</para>
- <indexterm zone="ch-system-e2fsprogs dumpe2fs">
- <primary sortas="b-dumpe2fs">dumpe2fs</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="e2fsck">
- <term><command>e2fsck</command></term>
- <listitem>
- <para>Is used to check, and optionally repair <systemitem
- class="filesystem">ext2</systemitem> file systems and <systemitem
- class="filesystem">ext3</systemitem> file systems</para>
- <indexterm zone="ch-system-e2fsprogs e2fsck">
- <primary sortas="b-e2fsck">e2fsck</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="e2image">
- <term><command>e2image</command></term>
- <listitem>
- <para>Is used to save critical <systemitem
- class="filesystem">ext2</systemitem> file system data to a file</para>
- <indexterm zone="ch-system-e2fsprogs e2image">
- <primary sortas="b-e2image">e2image</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="e2label">
- <term><command>e2label</command></term>
- <listitem>
- <para>Displays or changes the file system label on the <systemitem
- class="filesystem">ext2</systemitem> file system present on a given
- device</para>
- <indexterm zone="ch-system-e2fsprogs e2label">
- <primary sortas="b-e2label">e2label</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="filefrag">
- <term><command>filefrag</command></term>
- <listitem>
- <para>Reports on how badly fragmented a particular file might be</para>
- <indexterm zone="ch-system-e2fsprogs filefrag">
- <primary sortas="b-filefrag">filefrag</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="findfs">
- <term><command>findfs</command></term>
- <listitem>
- <para>Finds a file system by label or Universally Unique Identifier
- (UUID)</para>
- <indexterm zone="ch-system-e2fsprogs findfs">
- <primary sortas="b-findfs">findfs</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="fsck">
- <term><command>fsck</command></term>
- <listitem>
- <para>Is used to check, and optionally repair, file systems</para>
- <indexterm zone="ch-system-e2fsprogs fsck">
- <primary sortas="b-fsck">fsck</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="fsck.ext2">
- <term><command>fsck.ext2</command></term>
- <listitem>
- <para>By default checks <systemitem class="filesystem">ext2</systemitem>
- file systems</para>
- <indexterm zone="ch-system-e2fsprogs fsck.ext2">
- <primary sortas="b-fsck.ext2">fsck.ext2</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="fsck.ext3">
- <term><command>fsck.ext3</command></term>
- <listitem>
- <para>By default checks <systemitem class="filesystem">ext3</systemitem>
- file systems</para>
- <indexterm zone="ch-system-e2fsprogs fsck.ext3">
- <primary sortas="b-fsck.ext3">fsck.ext3</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="fsck.ext4">
- <term><command>fsck.ext4</command></term>
- <listitem>
- <para>By default checks <systemitem class="filesystem">ext4</systemitem>
- file systems</para>
- <indexterm zone="ch-system-e2fsprogs fsck.ext4">
- <primary sortas="b-fsck.ext4">fsck.ext4</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="logsave">
- <term><command>logsave</command></term>
- <listitem>
- <para>Saves the output of a command in a log file</para>
- <indexterm zone="ch-system-e2fsprogs logsave">
- <primary sortas="b-logsave">logsave</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="lsattr">
- <term><command>lsattr</command></term>
- <listitem>
- <para>Lists the attributes of files on a second extended file
- system</para>
- <indexterm zone="ch-system-e2fsprogs lsattr">
- <primary sortas="b-lsattr">lsattr</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="mk_cmds">
- <term><command>mk_cmds</command></term>
- <listitem>
- <para>Converts a table of command names and help messages into a C
- source file suitable for use with the <filename
- class="libraryfile">libss</filename> subsystem library</para>
- <indexterm zone="ch-system-e2fsprogs mk_cmds">
- <primary sortas="b-mk_cmds">mk_cmds</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="mke2fs">
- <term><command>mke2fs</command></term>
- <listitem>
- <para>Creates an <systemitem class="filesystem">ext2</systemitem>
- or <systemitem class="filesystem">ext3</systemitem> file system on
- the given device</para>
- <indexterm zone="ch-system-e2fsprogs mke2fs">
- <primary sortas="b-mke2fs">mke2fs</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="mkfs.ext2">
- <term><command>mkfs.ext2</command></term>
- <listitem>
- <para>By default creates <systemitem class="filesystem">ext2</systemitem>
- file systems</para>
- <indexterm zone="ch-system-e2fsprogs mkfs.ext2">
- <primary sortas="b-mkfs.ext2">mkfs.ext2</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="mkfs.ext3">
- <term><command>mkfs.ext3</command></term>
- <listitem>
- <para>By default creates <systemitem class="filesystem">ext3</systemitem>
- file systems</para>
- <indexterm zone="ch-system-e2fsprogs mkfs.ext3">
- <primary sortas="b-mkfs.ext3">mkfs.ext3</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="mkfs.ext4">
- <term><command>mkfs.ext4</command></term>
- <listitem>
- <para>By default creates <systemitem class="filesystem">ext4</systemitem>
- file systems</para>
- <indexterm zone="ch-system-e2fsprogs mkfs.ext4">
- <primary sortas="b-mkfs.ext4">mkfs.ext4</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="mklost-found">
- <term><command>mklost+found</command></term>
- <listitem>
- <para>Used to create a <filename class="directory">lost+found</filename>
- directory on an <systemitem class="filesystem">ext2</systemitem> file
- system; it pre-allocates disk blocks to this directory to lighten the
- task of <command>e2fsck</command></para>
- <indexterm zone="ch-system-e2fsprogs mklost-found">
- <primary sortas="b-mklost+found">mklost+found</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="resize2fs">
- <term><command>resize2fs</command></term>
- <listitem>
- <para>Can be used to enlarge or shrink an <systemitem
- class="filesystem">ext2</systemitem> file system</para>
- <indexterm zone="ch-system-e2fsprogs resize2fs">
- <primary sortas="b-resize2fs">resize2fs</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="tune2fs">
- <term><command>tune2fs</command></term>
- <listitem>
- <para>Adjusts tunable file system parameters on an <systemitem
- class="filesystem">ext2</systemitem> file system</para>
- <indexterm zone="ch-system-e2fsprogs tune2fs">
- <primary sortas="b-tune2fs">tune2fs</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="uuidgen">
- <term><command>uuidgen</command></term>
- <listitem>
- <para>Creates new UUIDs. Each new UUID can reasonably be considered
- unique among all UUIDs created, on the local system and on other
- systems, in the past and in the future</para>
- <indexterm zone="ch-system-e2fsprogs uuidgen">
- <primary sortas="b-uuidgen">uuidgen</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libblkid">
- <term><filename class="libraryfile">libblkid</filename></term>
- <listitem>
- <para>Contains routines for device identification and token
- extraction</para>
- <indexterm zone="ch-system-e2fsprogs libblkid">
- <primary sortas="c-libblkid">libblkid</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libcom_err">
- <term><filename class="libraryfile">libcom_err</filename></term>
- <listitem>
- <para>The common error display routine</para>
- <indexterm zone="ch-system-e2fsprogs libcom_err">
- <primary sortas="c-libcom_err">libcom_err</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libe2p">
- <term><filename class="libraryfile">libe2p</filename></term>
- <listitem>
- <para>Used by <command>dumpe2fs</command>, <command>chattr</command>,
- and <command>lsattr</command></para>
- <indexterm zone="ch-system-e2fsprogs libe2p">
- <primary sortas="c-libe2p">libe2p</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libext2fs">
- <term><filename class="libraryfile">libext2fs</filename></term>
- <listitem>
- <para>Contains routines to enable user-level programs to manipulate an
- <systemitem class="filesystem">ext2</systemitem> file system</para>
- <indexterm zone="ch-system-e2fsprogs libext2fs">
- <primary sortas="c-libext2fs">libext2fs</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libss">
- <term><filename class="libraryfile">libss</filename></term>
- <listitem>
- <para>Contains routines for command line interface parsing</para>
- <indexterm zone="ch-system-e2fsprogs libss">
- <primary sortas="c-libss">libss</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="libuuid">
- <term><filename class="libraryfile">libuuid</filename></term>
- <listitem>
- <para>Contains routines for generating unique identifiers for objects
- that may be accessible beyond the local system</para>
- <indexterm zone="ch-system-e2fsprogs libuuid">
- <primary sortas="c-libuuid">libuuid</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/beyond-filesys/common/introduction.xml b/BOOK/beyond-filesys/common/introduction.xml
deleted file mode 100644
index 73578a2..0000000
--- a/BOOK/beyond-filesys/common/introduction.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-beyond-filesys-introduction">
- <?dbhtml filename="introduction.html"?>
-
- <title>Introduction</title>
-
- <para os="a">This chapter provides instructions on installing file system
- related packages.</para>
-
-</sect1>
diff --git a/BOOK/beyond-filesys/common/packages.xml b/BOOK/beyond-filesys/common/packages.xml
deleted file mode 100644
index 18f421b..0000000
--- a/BOOK/beyond-filesys/common/packages.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!DOCTYPE sect1 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
- "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
- <!ENTITY % general-entities SYSTEM "../../general.ent">
- %general-entities;
-]>
-
-<sect1 id="ch-beyond-filesys-packages-common">
- <?dbhtml filename="packages.html"?>
-
- <title>Beyond CLFS File System Packages</title>
-
- <para>Download or otherwise obtain the following packages:</para>
-
- <variablelist role="beyond-filesys">
-
- <varlistentry>
- <term>E2fsprogs (&e2fsprogs-version;) - <token>&e2fsprogs-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&e2fsprogs-home;"/></para>
- <para>Download: <ulink url="&e2fsprogs-url;"/></para>
- <para>MD5 sum: <literal>&e2fsprogs-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- <para os="a">Total size of these packages: about <returnvalue/></para>
-
-</sect1>
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index 8e4e689..f9edd57 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -56,7 +56,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-intro/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-lib/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-net/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-filesys/chapter.xml"/>
</part>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 7d6eb77..15aa7f2 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -93,11 +93,3 @@
<!ENTITY wireless_tools-url "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/wireless_tools.&wireless_tools-version;.tar.gz">
<!ENTITY wireless_tools-md5 "e06c222e186f7cc013fd272d023710cb">
<!ENTITY wireless_tools-home "http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/Tools.html">
-
-<!-- Beyond CLFS file system packages -->
-
-<!ENTITY e2fsprogs-version "1.42.7">
-<!ENTITY e2fsprogs-size "5840 KB">
-<!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
-<!ENTITY e2fsprogs-md5 "a1ec22ef003688dae9f76c74881b22b9">
-<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index e01bb55..449c39f 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -57,7 +57,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-intro/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-lib/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-net/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="beyond-filesys/chapter.xml"/>
</part>
commit 458ac4c30b438ac038db669e55128c5bbff94037
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Oct 24 15:45:26 2013 -0400
bootscripts: No symlink needed
init will find the startup and shutdown scripts via the configuration
given in inittab.
diff --git a/BOOK/bootscripts/common/bootscripts.xml b/BOOK/bootscripts/common/bootscripts.xml
index ac9c33c..61c3d0a 100644
--- a/BOOK/bootscripts/common/bootscripts.xml
+++ b/BOOK/bootscripts/common/bootscripts.xml
@@ -37,14 +37,6 @@
<screen><userinput>make DESTDIR=${CLFS}/targetfs install-bootscripts</userinput></screen>
- <para>The CLFS startup bootscript is <filename>/etc/rc.d/startup</filename>,
- but BusyBox will look for <filename>/etc/init.d/rcS</filename> to use as its
- startup script. To ensure BusyBox finds the startup script, create the
- <filename>${CLFS}/targetfs/etc/init.d</filename> directory and a symlink:</para>
-
-<screen><userinput>install -dv ${CLFS}/targetfs/etc/init.d
-ln -sv ../rc.d/startup ${CLFS}/targetfs/etc/init.d/rcS</userinput></screen>
-
</sect2>
<sect2 id="contents-bootscripts" role="content">
commit 5846de5f9b980856d95515cd0abd6f205d924e21
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Oct 24 15:38:07 2013 -0400
fstab: Just a root line
The bootscripts will take care of all the tmpfs-like file systems.
diff --git a/BOOK/bootable/common/fstab.xml b/BOOK/bootable/common/fstab.xml
index e370334..bddf774 100644
--- a/BOOK/bootable/common/fstab.xml
+++ b/BOOK/bootable/common/fstab.xml
@@ -20,36 +20,18 @@
to mounting. Create a new file systems table like this:</para>
<screen><userinput>cat > ${CLFS}/targetfs/etc/fstab << "EOF"
-<literal># Begin /etc/fstab
-
-# file system mount-point type options dump fsck
-# order
-
-/dev/<replaceable>[xxx]</replaceable> / <replaceable>[fff]</replaceable> defaults 1 1
-/dev/<replaceable>[yyy]</replaceable> swap swap pri=1 0 0
-proc /proc proc defaults 0 0
-sysfs /sys sysfs defaults 0 0
-devpts /dev/pts devpts gid=4,mode=620 0 0
-shm /dev/shm tmpfs defaults 0 0
-# End /etc/fstab</literal>
+<literal># file-system mount-point type options dump fsck
+/dev/<replaceable>[xxx]</replaceable> / <replaceable>[fff]</replaceable> defaults 1 1</literal>
EOF</userinput></screen>
- <para os="b">Replace <replaceable>[xxx]</replaceable>,
- <replaceable>[yyy]</replaceable>, and <replaceable>[fff]</replaceable>
+ <para os="b">Replace <replaceable>[xxx]</replaceable>
+ and <replaceable>[fff]</replaceable>
with the values appropriate for the system, for example, <filename
- class="partition">hda2</filename>, <filename
- class="partition">hda5</filename>, and <systemitem
- class="filesystem">ext2</systemitem>. For details on the six
+ class="partition">mmcblk0p2</filename>
+ and <systemitem class="filesystem">ext4</systemitem>. For details on the
fields in this file, see <command>man 5 fstab</command>.</para>
- <para os="c">The <filename class="directory">/dev/shm</filename> mount point
- for <systemitem class="filesystem">tmpfs</systemitem> is included to
- allow enabling POSIX-shared memory. The kernel must have the required
- support built into it for this to work (more about this is in the next
- section). Please note that very little software currently uses
- POSIX-shared memory. Therefore, consider the <filename
- class="directory">/dev/shm</filename> mount point optional. For more
- information, see <filename>Documentation/filesystems/tmpfs.txt</filename>
- in the kernel source tree.</para>
+ <para>You may also add any other file systems, such as swap or other partitions
+ or network file systems, to this fstab as well.</para>
</sect1>
commit e2ce6d78055e4c090bf21e405d1e9a2a668ab4a9
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Thu Oct 24 15:15:26 2013 -0400
Move setting toolchain vars to cross-tools
So that once you have built a toolchain, you can always go back to the
"Building the CLFS System" section, delete your targetfs dir, and start
over building for a target, again.
diff --git a/BOOK/cross-tools/arm-chapter.xml b/BOOK/cross-tools/arm-chapter.xml
index d95626b..a4e460c 100644
--- a/BOOK/cross-tools/arm-chapter.xml
+++ b/BOOK/cross-tools/arm-chapter.xml
@@ -20,5 +20,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/gcc-static.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/gcc-final.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
</chapter>
diff --git a/BOOK/final-system/common/toolchain.xml b/BOOK/cross-tools/common/toolchain.xml
similarity index 100%
rename from BOOK/final-system/common/toolchain.xml
rename to BOOK/cross-tools/common/toolchain.xml
diff --git a/BOOK/cross-tools/mips-chapter.xml b/BOOK/cross-tools/mips-chapter.xml
index bde6741..e227202 100644
--- a/BOOK/cross-tools/mips-chapter.xml
+++ b/BOOK/cross-tools/mips-chapter.xml
@@ -21,5 +21,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-static.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/gcc-final.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
</chapter>
diff --git a/BOOK/cross-tools/x86-chapter.xml b/BOOK/cross-tools/x86-chapter.xml
index 7ec9cc9..bb1462e 100644
--- a/BOOK/cross-tools/x86-chapter.xml
+++ b/BOOK/cross-tools/x86-chapter.xml
@@ -20,5 +20,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/gcc-static.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/libc.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/gcc-final.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
</chapter>
diff --git a/BOOK/final-system/chapter.xml b/BOOK/final-system/chapter.xml
index 46483b5..f97bcff 100644
--- a/BOOK/final-system/chapter.xml
+++ b/BOOK/final-system/chapter.xml
@@ -14,7 +14,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingdirs.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/creatingfiles.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/toolchain.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/busybox.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/iana-etc.xml"/>
-----------------------------------------------------------------------
Summary of changes:
BOOK/arm-index.xml | 5 +-
BOOK/beyond-filesys/chapter.xml | 18 -
BOOK/beyond-filesys/common/e2fsprogs.xml | 481 --------------------
BOOK/beyond-filesys/common/packages.xml | 30 --
BOOK/beyond-intro/chapter.xml | 16 -
BOOK/beyond-intro/common/introduction.xml | 20 -
BOOK/beyond-lib/chapter.xml | 18 -
BOOK/beyond-lib/common/introduction.xml | 17 -
BOOK/beyond-lib/common/packages.xml | 30 --
BOOK/beyond-net/common/introduction.xml | 16 -
BOOK/beyond-net/common/iptables.xml | 56 ---
BOOK/{beyond-net => beyond}/chapter.xml | 9 +-
BOOK/{beyond-net => beyond}/common/dropbear.xml | 4 +-
.../common/introduction.xml | 6 +-
BOOK/beyond/common/netplug.xml | 66 +++
BOOK/{beyond-net => beyond}/common/packages.xml | 24 +-
BOOK/{beyond-net => beyond}/common/patches.xml | 19 +-
.../common/wireless_tools.xml | 4 +-
BOOK/{beyond-lib => beyond}/common/zlib.xml | 15 +-
BOOK/bootable/common/fstab.xml | 34 +-
BOOK/bootable/common/kernel.xml | 2 +-
BOOK/bootscripts/common/bootscripts.xml | 8 -
BOOK/cross-tools/arm-chapter.xml | 1 +
BOOK/cross-tools/common/binutils.xml | 4 -
BOOK/cross-tools/common/cflags.xml | 12 +-
BOOK/cross-tools/common/gcc-final.xml | 11 +-
BOOK/cross-tools/common/gcc-static.xml | 5 +-
BOOK/cross-tools/common/libc.xml | 26 +-
.../common/toolchain.xml | 0
BOOK/cross-tools/mips-chapter.xml | 1 +
BOOK/cross-tools/x86-chapter.xml | 1 +
BOOK/final-system/chapter.xml | 1 -
BOOK/final-system/common/busybox.xml | 6 +-
BOOK/general.ent | 8 +-
BOOK/materials/common/packages.xml | 8 +-
BOOK/materials/common/patches.xml | 20 +-
BOOK/mips-index.xml | 5 +-
BOOK/packages.ent | 40 +-
BOOK/patches.ent | 12 +-
BOOK/preface/common/changelog.xml | 33 ++
BOOK/the-end/boot.xml | 19 -
BOOK/the-end/chapter.xml | 1 -
BOOK/the-end/theend.xml | 14 +-
BOOK/x86-index.xml | 5 +-
patches/binutils-2.23.2-musl-1.patch | 47 --
patches/busybox-1.21.1-musl-1.patch | 44 --
patches/netplug-1.2.9.2-fixes-1.patch | 42 ++
47 files changed, 264 insertions(+), 1000 deletions(-)
delete mode 100644 BOOK/beyond-filesys/chapter.xml
delete mode 100644 BOOK/beyond-filesys/common/e2fsprogs.xml
delete mode 100644 BOOK/beyond-filesys/common/packages.xml
delete mode 100644 BOOK/beyond-intro/chapter.xml
delete mode 100644 BOOK/beyond-intro/common/introduction.xml
delete mode 100644 BOOK/beyond-lib/chapter.xml
delete mode 100644 BOOK/beyond-lib/common/introduction.xml
delete mode 100644 BOOK/beyond-lib/common/packages.xml
delete mode 100644 BOOK/beyond-net/common/introduction.xml
delete mode 100644 BOOK/beyond-net/common/iptables.xml
rename BOOK/{beyond-net => beyond}/chapter.xml (78%)
rename BOOK/{beyond-net => beyond}/common/dropbear.xml (96%)
rename BOOK/{beyond-filesys => beyond}/common/introduction.xml (69%)
create mode 100644 BOOK/beyond/common/netplug.xml
rename BOOK/{beyond-net => beyond}/common/packages.xml (64%)
rename BOOK/{beyond-net => beyond}/common/patches.xml (62%)
rename BOOK/{beyond-net => beyond}/common/wireless_tools.xml (95%)
rename BOOK/{beyond-lib => beyond}/common/zlib.xml (81%)
rename BOOK/{final-system => cross-tools}/common/toolchain.xml (100%)
delete mode 100644 BOOK/the-end/boot.xml
delete mode 100644 patches/binutils-2.23.2-musl-1.patch
delete mode 100644 patches/busybox-1.21.1-musl-1.patch
create mode 100644 patches/netplug-1.2.9.2-fixes-1.patch
hooks/post-receive
--
Cross-LFS Embedded Book
More information about the Clfs-commits
mailing list