[Clfs-commits] [CLFS Embedded]Cross-LFS Embedded Book branch, master, updated. 151f7c48177e3356a4205dd580e01659cc8f414e
git
git at cross-lfs.org
Mon Oct 21 11:19:52 PDT 2013
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 151f7c48177e3356a4205dd580e01659cc8f414e (commit)
via 7ff081610bda667724ea614e1165bd56fc1eb1c0 (commit)
via 796fc87f8d29b0ab21e66e9a427e685a9614d085 (commit)
via ce86847353d223fc3e97d0e0647d254fd6db190a (commit)
via 1f7d01ff513c977f57dd5745b4014bc1a4a98f2e (commit)
via ba3133b45e1029481768022f821858bdf2393ee9 (commit)
via 6d39c134d590cae2ecb68334f387ce793c8f755b (commit)
via 9764e0c79d2b39ddf667e7023009cf051547f86e (commit)
via e5957c5a68c102abbf5965cb1a74c36162ab1344 (commit)
via bfed8f5836041df71a6eb9955fb8832929476b33 (commit)
via 5cba5fc2fa25988204bad9554058a61484dbfa92 (commit)
via 1385870c398d8e53e0aa4cfae01cf9910890f8c2 (commit)
via a65e0bba925802e313d03f4f660c16a78e869181 (commit)
via 390c34ad793c71a4c191d8f24152b73930333c2d (commit)
via d4c0817e9d029bc956e13c278248ed1d29c06e3a (commit)
via 90856995a2f2b4e79bc92afd9dedbc9f04e4c163 (commit)
from 7e2c90d578f3dda83ec6b230d312ae338b7d19d6 (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 151f7c48177e3356a4205dd580e01659cc8f414e
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 11:03:02 2013 -0400
Update date
diff --git a/BOOK/general.ent b/BOOK/general.ent
index b0c18dd..0bb9e5c 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -2,7 +2,7 @@
<!ENTITY month "10"> <!-- Use two digits -->
<!ENTITY month_name "October">
-<!ENTITY day "18"> <!-- Use two digits -->
+<!ENTITY day "21"> <!-- Use two digits -->
<!ENTITY year "2013"> <!-- Use four digits -->
<!ENTITY releasedate "&month_name; &day;, &year;">
commit 7ff081610bda667724ea614e1165bd56fc1eb1c0
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 11:01:20 2013 -0400
Update changelog
diff --git a/BOOK/preface/common/changelog.xml b/BOOK/preface/common/changelog.xml
index a933277..095e362 100644
--- a/BOOK/preface/common/changelog.xml
+++ b/BOOK/preface/common/changelog.xml
@@ -36,6 +36,22 @@
</listitem>
-->
<listitem>
+ <para>October 21, 2013</para>
+ <itemizedlist>
+ <listitem>
+ <para>[abradford] - Cleanup the kernel build.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Move bootloaders into bootable section, just give
+ recommendations no exact steps.</para>
+ </listitem>
+ <listitem>
+ <para>[abradford] - Create top level README and LICENSE.</para>
+ </listitem>
+ </itemizedlist>
+ </listitem>
+
+ <listitem>
<para>October 18, 2013</para>
<itemizedlist>
<listitem>
commit 796fc87f8d29b0ab21e66e9a427e685a9614d085
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:52:15 2013 -0400
general.ent: Delete useless ENTITYs
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 9ccb9d4..b0c18dd 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -26,12 +26,8 @@
<!ENTITY gnu "http://ftp.gnu.org/gnu/">
<!ENTITY gnu-software "http://www.gnu.org/software/">
-<!ENTITY alpha-gnu "ftp://alpha.gnu.org/gnu/">
-<!ENTITY redhat "ftp://sources.redhat.com/pub/">
<!ENTITY kernel "http://www.kernel.org/pub/">
<!ENTITY sourceforge "http://downloads.sourceforge.net/">
-<!ENTITY svn-clfs-config "http://svn.cross-lfs.org/svn/repos/cross-lfs/branches/clfs-embedded/config/">
-<!ENTITY svn-clfs-software "http://svn.cross-lfs.org/svn/repos/cross-lfs/branches/clfs-embedded/software/">
<!ENTITY dependencies "Installation depends on">
<!ENTITY testsuites "Test suite depends on">
commit ce86847353d223fc3e97d0e0647d254fd6db190a
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:49:43 2013 -0400
Add bootloaders page to bootable section
Just list out popular bootloaders. Telling how to configure each for
any desired target is not reasonable.
diff --git a/BOOK/bootable/chapter.xml b/BOOK/bootable/chapter.xml
index f7c397f..e44a1ab 100644
--- a/BOOK/bootable/chapter.xml
+++ b/BOOK/bootable/chapter.xml
@@ -14,5 +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/fstab.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernel.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/bootloaders.xml"/>
</chapter>
diff --git a/BOOK/bootable/common/bootloaders.xml b/BOOK/bootable/common/bootloaders.xml
new file mode 100644
index 0000000..1abb6d9
--- /dev/null
+++ b/BOOK/bootable/common/bootloaders.xml
@@ -0,0 +1,52 @@
+<?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-bootable-bootloaders">
+ <?dbhtml filename="bootloaders.html"?>
+
+ <title>Bootloaders</title>
+
+ <para>There are many different bootloaders. Creating detailed instructions on
+ how to use even the more popular ones is difficult as each architecture and
+ board often has different levels of support or configuration options within
+ each bootloader. Often, development kits will ship with a bootloader
+ already configured, if your board comes with a bootloader pre-configured,
+ it's best to start using that and then venture on to building the bootloader
+ yourself later.</para>
+
+<para>A few of the popular bootloaders include:</para>
+
+<variablelist>
+
+ <varlistentry>
+ <term>Barebox</term>
+ <listitem><para><ulink url="http://barebox.org/" /></para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>CoLo</term>
+ <listitem><para><ulink url="http://www.colonel-panic.org/cobalt-mips/" /></para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>GNU GRUB</term>
+ <listitem><para><ulink url="https://www.gnu.org/software/grub/" /></para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>Syslinux</term>
+ <listitem><para><ulink url="http://www.syslinux.org/wiki/index.php/The_Syslinux_Project" /></para></listitem>
+ </varlistentry>
+
+ <varlistentry>
+ <term>u-boot</term>
+ <listitem><para><ulink url="http://www.denx.de/wiki/U-Boot" /></para></listitem>
+ </varlistentry>
+
+</variablelist>
+
+</sect1>
commit 1f7d01ff513c977f57dd5745b4014bc1a4a98f2e
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:34:56 2013 -0400
Licenses: Update (C) date to start at 1999
First dated version of LFS I'm able to find.
diff --git a/BOOK/preface/common/license.xml b/BOOK/preface/common/license.xml
index 695b602..c81f7fa 100644
--- a/BOOK/preface/common/license.xml
+++ b/BOOK/preface/common/license.xml
@@ -24,7 +24,7 @@
<para>Proper form for an incorporation by reference is as follows:</para>
<blockquote>
- <para>Copyright © &year; by each contributor.
+ <para>Copyright © 1999-&year; by each contributor.
This material may be distributed only subject to the terms and conditions
set forth in the Open Publication License, v1.0 or later (the latest
version is presently available at <ulink
diff --git a/LICENSE b/LICENSE
index 600bcdf..1c5fef0 100644
--- a/LICENSE
+++ b/LICENSE
@@ -10,8 +10,8 @@ displayed in the reproduction.
Proper form for an incorporation by reference is as follows:
- Copyright © 2013 by each contributor. This material may be distributed only
- subject to the terms and conditions set forth in the Open Publication
+ Copyright © 1999-2013 by each contributor. This material may be distributed
+ only subject to the terms and conditions set forth in the Open Publication
License, v1.0 or later (the latest version is presently available at
http://www.opencontent.org/openpub/).
commit ba3133b45e1029481768022f821858bdf2393ee9
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:26:47 2013 -0400
license.xml: Remove open pub mailing list info
Not required or important.
diff --git a/BOOK/preface/common/license.xml b/BOOK/preface/common/license.xml
index 89c5555..695b602 100644
--- a/BOOK/preface/common/license.xml
+++ b/BOOK/preface/common/license.xml
@@ -156,33 +156,4 @@
unless prior permission is obtained from the copyright holder.' to the
license reference or copy.</para>
-
- <bridgehead renderas="sect2">OPEN PUBLICATION POLICY APPENDIX</bridgehead>
-
- <para>(This is not considered part of the license.)</para>
-
- <para>Open Publication works are available in source format via the Open
- Publication home page at <ulink url="http://works.opencontent.org/"/>.</para>
-
- <para>Open Publication authors who want to include their own license on
- Open Publication works may do so, as long as their terms are not more
- restrictive than the Open Publication license.</para>
-
- <para>If you have questions about the Open Publication License, please
- contact <ulink url="mailto:dw at opencontent.org">David Wiley</ulink>, and/or the
- <ulink url="mailto:opal at opencontent.org">Open Publication Authors'
- List</ulink>, via email.</para>
-
- <para>To <emphasis role="strong">subscribe</emphasis> to the Open Publication
- Authors' List: Send E-mail to opal-request at opencontent.org with the word
- "subscribe" in the body.</para>
-
- <para>To <emphasis role="strong">post</emphasis> to the Open Publication
- Authors' List: Send E-mail to opal at opencontent.org or simply reply to a
- previous post.</para>
-
- <para>To <emphasis role="strong">unsubscribe</emphasis> from the Open
- Publication Authors' List: Send E-mail to opal-request at opencontent.org
- with the word "unsubscribe" in the body.</para>
-
</sect1>
commit 6d39c134d590cae2ecb68334f387ce793c8f755b
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:25:42 2013 -0400
Create top level LICENSE file
Containing the open publication license
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..600bcdf
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,113 @@
+Open Publication License v1.0, 8 June 1999
+
+I. REQUIREMENTS ON BOTH UNMODIFIED AND MODIFIED VERSIONS
+
+The Open Publication works may be reproduced and distributed in whole or in
+part, in any medium physical or electronic, provided that the terms of this
+license are adhered to, and that this license or an incorporation of it by
+reference (with any options elected by the author(s) and/or publisher) is
+displayed in the reproduction.
+
+Proper form for an incorporation by reference is as follows:
+
+ Copyright © 2013 by each contributor. This material may be distributed only
+ subject to the terms and conditions set forth in the Open Publication
+ License, v1.0 or later (the latest version is presently available at
+ http://www.opencontent.org/openpub/).
+
+The reference must be immediately followed with any options elected by the
+author(s) and/or publisher of the document (see section VI).
+
+Commercial redistribution of Open Publication-licensed material is permitted.
+
+Any publication in standard (paper) book form shall require the citation of the
+original publisher and author. The publisher and author's names shall appear on
+all outer surfaces of the book. On all outer surfaces of the book the original
+publisher's name shall be as large as the bridgehead of the work and cited as
+possessive with respect to the bridgehead.
+
+II. COPYRIGHT
+
+The copyright to each Open Publication is owned by its author(s) or designee.
+
+III. SCOPE OF LICENSE
+
+The following license terms apply to all Open Publication works, unless
+otherwise explicitly stated in the document.
+
+Mere aggregation of Open Publication works or a portion of an Open Publication
+work with other works or programs on the same media shall not cause this license
+to apply to those other works. The aggregate work shall contain a notice
+specifying the inclusion of the Open Publication material and appropriate
+copyright notice.
+
+SEVERABILITY. If any part of this license is found to be unenforceable in any
+jurisdiction, the remaining portions of the license remain in force.
+
+NO WARRANTY. Open Publication works are licensed and provided "as is" without
+warranty of any kind, express or implied, including, but not limited to, the
+implied warranties of merchantability and fitness for a particular purpose or a
+warranty of non-infringement.
+
+IV. REQUIREMENTS ON MODIFIED WORKS
+
+All modified versions of documents covered by this license, including
+translations, anthologies, compilations and partial documents, must meet the
+following requirements:
+
+ The modified version must be labeled as such.
+
+ The person making the modifications must be identified and the modifications
+ dated.
+
+ Acknowledgement of the original author and publisher if applicable must be
+ retained according to normal academic citation practices.
+
+ The location of the original unmodified document must be identified.
+
+ The original author's (or authors') name(s) may not be used to assert or
+ imply endorsement of the resulting document without the original author's
+ (or authors') permission.
+
+V. GOOD-PRACTICE RECOMMENDATIONS
+
+In addition to the requirements of this license, it is requested from and
+strongly recommended of redistributors that:
+
+ If you are distributing Open Publication works on hardcopy or CD-ROM, you
+ provide email notification to the authors of your intent to redistribute at
+ least thirty days before your manuscript or media freeze, to give the
+ authors time to provide updated documents. This notification should describe
+ modifications, if any, made to the document.
+
+ All substantive modifications (including deletions) be either clearly marked
+ up in the document or else described in an attachment to the document.
+
+ Finally, while it is not mandatory under this license, it is considered good
+ form to offer a free copy of any hardcopy and CD-ROM expression of an Open
+ Publication-licensed work to its author(s).
+
+VI. LICENSE OPTIONS
+
+The author(s) and/or publisher of an Open Publication-licensed document may
+elect certain options by appending language to the reference to or copy of the
+license. These options are considered part of the license instance and must be
+included with the license (or its incorporation by reference) in derived works.
+
+A. To prohibit distribution of substantively modified versions without the
+explicit permission of the author(s). "Substantive modification" is defined as a
+change to the semantic content of the document, and excludes mere changes in
+format or typographical corrections.
+
+To accomplish this, add the phrase `Distribution of substantively modified
+versions of this document is prohibited without the explicit permission of the
+copyright holder.' to the license reference or copy.
+
+B. To prohibit any publication of this work or derivative works in whole or in
+part in standard (paper) book form for commercial purposes is prohibited unless
+prior permission is obtained from the copyright holder.
+
+To accomplish this, add the phrase 'Distribution of the work or derivative of
+the work in any standard (paper) book form is prohibited unless prior permission
+is obtained from the copyright holder.' to the license reference or copy. OPEN
+PUBLICATION POLICY APPENDIX
commit 9764e0c79d2b39ddf667e7023009cf051547f86e
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:19:53 2013 -0400
Create top level README
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..87abb2f
--- /dev/null
+++ b/README.md
@@ -0,0 +1,14 @@
+Cross Linux From Scratch Embedded
+=================================
+
+Cross Linux From Scratch (CLFS) Embedded shows you how to build a Linux system
+from source, targeting users who want to make a very small system.
+
+Running with 16 MB of RAM and 16 MB of "disk" is very possible.
+
+For more information about CLFS, visit the [CLFS website][trac].
+
+To build the book, please see the BOOK/INSTALL.md file for requirements and
+exact steps.
+
+[trac]:http://trac.cross-lfs.org
commit e5957c5a68c102abbf5965cb1a74c36162ab1344
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:14:36 2013 -0400
INSTALL: Rename .md extension, format to markdown
For pretty rendering on places like github but which is still readable
in txt form.
diff --git a/BOOK/INSTALL b/BOOK/INSTALL
deleted file mode 100644
index 122a861..0000000
--- a/BOOK/INSTALL
+++ /dev/null
@@ -1,36 +0,0 @@
-CLFS Book Conversion Tools Installation Instructions
-
-After downloading the book source, there are some things that need to be set up
-on your computer if you want to convert the XML source into something easier to
-read (e.g. HTML, TXT, or PDF).
-
--------------------------------------------------------------------------------
-
-If you want to convert the XML to HTML, install the following:
-
-* libxml2
-* libxslt
-* DocBook DTD
-* DocBook XSL Stylesheets
-* HTMLTidy
-
--------------------------------------------------------------------------------
-
-If you want to convert the XML to TXT, install the above items, and then install
-the following:
-
-* lynx
-
--------------------------------------------------------------------------------
-
-If you want to convert the XML to PDF, install the items listed above (except
-lynx) and then install the following:
-
-* JDK
-* FOP and JAI
-
-To convert the Docbook XML source into rendered form:
-
-To XHTML: make
-To single file XHTML (nochunks): make nochunks
-To PDF: make pdf
diff --git a/BOOK/INSTALL.md b/BOOK/INSTALL.md
new file mode 100644
index 0000000..7b1ff57
--- /dev/null
+++ b/BOOK/INSTALL.md
@@ -0,0 +1,32 @@
+CLFS Book Conversion Tools
+==========================
+
+After downloading the book source, there are some things that need to be set up
+on your computer if you want to convert the XML source into something easier to
+read (e.g. HTML, TXT, or PDF).
+
+If you want to convert the Docbook XML to HTML, install the following:
+
+* libxml2
+* libxslt
+* DocBook DTD
+* DocBook XSL Stylesheets
+* HTMLTidy
+
+If you want to convert the Docbook XML to TXT, install the above items, and then
+install the following:
+
+* lynx
+
+If you want to convert the Docbook XML to PDF, install the items listed above
+(except lynx) and then install the following:
+
+* JDK
+* FOP and JAI
+
+To actually convert the Docbook XML source into rendered form, which will be
+located at ../render by default (override with BASEDIR=), execute:
+
+* To XHTML: `make`
+* To single file XHTML (nochunks): `make nochunks`
+* To PDF: `make pdf`
commit bfed8f5836041df71a6eb9955fb8832929476b33
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:10:21 2013 -0400
Put README conversion info into INSTALL doc
diff --git a/BOOK/INSTALL b/BOOK/INSTALL
index 7e0232f..122a861 100644
--- a/BOOK/INSTALL
+++ b/BOOK/INSTALL
@@ -28,3 +28,9 @@ lynx) and then install the following:
* JDK
* FOP and JAI
+
+To convert the Docbook XML source into rendered form:
+
+To XHTML: make
+To single file XHTML (nochunks): make nochunks
+To PDF: make pdf
diff --git a/BOOK/README b/BOOK/README
deleted file mode 100644
index bcdb341..0000000
--- a/BOOK/README
+++ /dev/null
@@ -1,28 +0,0 @@
-LFS Book README
-
-This document is meant to instruct the user on how to convert the book's XML
-source to other formats (e.g. HTML, PDF, PS and TXT). First, if you have not
-already done so, please read the INSTALL file for instructions on how to install
-the required software. If you have already completed the steps outlined in the
-INSTALL file, then continue reading for examples how to convert these files into
-various other formats.
-
-XML to XHTML:
--------------
-make BASEDIR=/path/to/output/location
-
-
-XML to single file XHTML (nochunks):
-------------------------------------
-make BASEDIR=/path/to/output/location nochunks
-
-
-XML to TXT
-----------
-Follow the instructions for nochunks and then run:
-lynx -dump /path/to/nochunks >/path/to/output
-
-
-XML to PDF:
------------
-make BASEDIR=/path/to/output/location pdf
commit 5cba5fc2fa25988204bad9554058a61484dbfa92
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:07:06 2013 -0400
Shorten up the INSTALL file
diff --git a/BOOK/INSTALL b/BOOK/INSTALL
index 4e744b6..7e0232f 100644
--- a/BOOK/INSTALL
+++ b/BOOK/INSTALL
@@ -1,31 +1,18 @@
-LFS Book Conversion Tools Installation Instructions
+CLFS Book Conversion Tools Installation Instructions
-After downloading the SVN source, there are some things that need to be set up
+After downloading the book source, there are some things that need to be set up
on your computer if you want to convert the XML source into something easier to
-read (e.g. HTML, TXT, or PDF). If you are interested in this, then keep
-reading. If you are only interested in editing the XML source for re-
-submission to the lfs-book or lfs-dev mailing lists, then you do not need this
-document. Instead, you need to read the LFS Editor's Manual. See the LFS
-website at http://www.linuxfromscratch.org for more information.
+read (e.g. HTML, TXT, or PDF).
-------------------------------------------------------------------------------
If you want to convert the XML to HTML, install the following:
* libxml2
- - http://www.linuxfromscratch.org/blfs/view/svn/general/libxml2.html
-
* libxslt
- - http://www.linuxfromscratch.org/blfs/view/svn/general/libxslt.html
-
* DocBook DTD
- - http://www.linuxfromscratch.org/blfs/view/svn/pst/xml.html
-
* DocBook XSL Stylesheets
- - http://www.linuxfromscratch.org/blfs/view/svn/pst/docbook-xsl.html
-
* HTMLTidy
- - http://www.linuxfromscratch.org/blfs/view/svn/general/tidy.html
-------------------------------------------------------------------------------
@@ -33,7 +20,6 @@ If you want to convert the XML to TXT, install the above items, and then install
the following:
* lynx
- - http://www.linuxfromscratch.org/blfs/view/svn/basicnet/lynx.html
-------------------------------------------------------------------------------
@@ -41,7 +27,4 @@ If you want to convert the XML to PDF, install the items listed above (except
lynx) and then install the following:
* JDK
- - http://www.linuxfromscratch.org/blfs/view/svn/general/jdk.html
-
* FOP and JAI
- - http://www.linuxfromscratch.org/blfs/view/svn/pst/fop.html
commit 1385870c398d8e53e0aa4cfae01cf9910890f8c2
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:04:18 2013 -0400
Don't obfuscate emails
The only ones present are for the license. These are already published
all over the place, so there's no need to add obfuscation.
diff --git a/BOOK/obfuscate.sh b/BOOK/obfuscate.sh
deleted file mode 100644
index dd2bf24..0000000
--- a/BOOK/obfuscate.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-
-# obfuscate.sh
-# obfuscate email addresses in XML/HTML
-# Script written (and slight perl modification) by Archaic <archaic AT linuxfromscratch D0T org>
-# Modified from "sed -i" to old style "sed -e" by Manuel Canales <manuel AT linuxfromscratch D0T org>
-# to prevent hangs on very long files, like nonckunked books.
-# Original Perl expression by Anderson Lizardo <lizardo AT linuxfromscratch D0T org>
-# Released under the GNU General Public License
-#
-# This script currently only seeks out mailto: addresses. If those same
-# addresses also appear in plaintext, we need to obfuscate those as well.
-#
-# This script was made for a very specific purpose so I was a bit lazy in
-# writing the regex's.
-#
-# Please send comments, enhancements, etc. to the above address
-
-#set -e # Bail on all errors
-
-# First, ensure that we are given a file to process
-# if [ $# -lt 1 ]; then
-# echo -e "\nYou must provide an input file."
-# exit 1
-# fi
-
-# Nothing like a backup plan!
-#cp "$1" "$1".bak
-
-for i in `grep -o '"mailto:.*@.*"' ${1} |sed -e 's|^"mailto:||' -e 's|"$||'`; do
- link=`echo $i | perl -pe 's/[^\n]/"\\\&#".ord($&)."\;"/ge'`
- plaintext=`echo $i | sed -e 's|@| AT |' -e 's|\.| D0T |g'`
- cp ${1}{,.tmp}
- sed -e "s|mailto:$i|mailto:$link|" \
- -e "s|$i|$plaintext|" ${1}.tmp > ${1}
- rm ${1}.tmp
-done
-#rm $FILE.tmp
-#exit 0
diff --git a/BOOK/tidy.sh b/BOOK/tidy.sh
index 1819f3b..ff7f86a 100755
--- a/BOOK/tidy.sh
+++ b/BOOK/tidy.sh
@@ -11,12 +11,10 @@ TOP=`dirname $0`
if test -d "$1"; then
find "$1" -type f -name \*.html | while read file; do
tidy -config "${TOP}/tidy.conf" "$file"
- bash "${TOP}/obfuscate.sh" "$file"
sed -i -e "s at text/html at application/xhtml+xml at g" "$file"
done
else
tidy -config "${TOP}/tidy.conf" "$1"
- bash "${TOP}/obfuscate.sh" "$1"
sed -i -e "s at text/html at application/xhtml+xml at g" "$1"
fi
commit a65e0bba925802e313d03f4f660c16a78e869181
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 10:00:19 2013 -0400
patches.eng: Cleanup and remove useless comments
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 08cc73a..a4395f2 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -2,7 +2,7 @@
<!ENTITY patches-root "http://patches.cross-lfs.org/embedded-dev/">
-<!-- Start of Common Patches -->
+<!-- Core Patches -->
<!ENTITY binutils-musl-patch "binutils-&binutils-version;-musl-1.patch">
<!ENTITY binutils-musl-patch-md5 "dde64feb7f4cf821cbd887b53026fd67">
@@ -12,12 +12,6 @@
<!ENTITY busybox-musl-patch-md5 "335622b0f2bf4e18e9d93fd48afe53da">
<!ENTITY busybox-musl-patch-size "1 KB">
-<!--
-<!ENTITY busybox-fixes-patch "busybox-&busybox-version;-fixes-1.patch">
-<!ENTITY busybox-fixes-patch-md5 "64bee07ba3efbb512fb4f348e814bf31">
-<!ENTITY busybox-fixes-patch-size "4 KB">
--->
-
<!ENTITY gcc-musl-patch "gcc-&gcc-version;-musl-1.patch">
<!ENTITY gcc-musl-patch-md5 "5b43765740ca9865b8afe3cc945a3f5d">
<!ENTITY gcc-musl-patch-size "26 KB">
@@ -27,7 +21,3 @@
<!ENTITY iana-etc-update-patch-size "864 KB">
<!-- Beyond patches -->
-
-<!-- ARM Patches -->
-
-<!-- MIPS Patches -->
commit 390c34ad793c71a4c191d8f24152b73930333c2d
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 09:57:22 2013 -0400
Remove bootloaders section and bootloaders
Only MIPS had any information and only for COLO.
There's many many different bootloaders and methods for getting to the
point where Linux can run depending on arch, board, and user desires.
Later, we'll move a quick bit of info about picking a bootloader to the
"bootable" section after building the kernel.
Trying to document how to build every possible, even just the popular,
bootloaders, isn't reasonable.
diff --git a/BOOK/arm-index.xml b/BOOK/arm-index.xml
index eeedae5..4643484 100644
--- a/BOOK/arm-index.xml
+++ b/BOOK/arm-index.xml
@@ -45,7 +45,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootloaders/arm-chapter.xml"/>
</part>
diff --git a/BOOK/bootloaders/arm-chapter.xml b/BOOK/bootloaders/arm-chapter.xml
deleted file mode 100644
index 5fe4e64..0000000
--- a/BOOK/bootloaders/arm-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-bootloaders" xreflabel="Bootloaders">
- <?dbhtml dir="bootloaders"?>
- <?dbhtml filename="chapter.html"?>
-
- <title>Bootloaders</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="arm/packages.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/patches.xml"/>
-
-</chapter>
diff --git a/BOOK/bootloaders/arm/packages.xml b/BOOK/bootloaders/arm/packages.xml
deleted file mode 100644
index d869185..0000000
--- a/BOOK/bootloaders/arm/packages.xml
+++ /dev/null
@@ -1,22 +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-bootloaders-packages-common">
- <?dbhtml filename="packages.html"?>
-
- <title>Bootloader Packages</title>
-
- <para>Download or otherwise obtain the following packages:</para>
-
-<!--
- <variablelist role="bootloader">
-
- </variablelist>
--->
- <para os="a">Total size of these packages: about <returnvalue/></para>
-
-</sect1>
diff --git a/BOOK/bootloaders/arm/patches.xml b/BOOK/bootloaders/arm/patches.xml
deleted file mode 100644
index 9a56b0a..0000000
--- a/BOOK/bootloaders/arm/patches.xml
+++ /dev/null
@@ -1,25 +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-bootloaders-patches-mips">
- <?dbhtml filename="patches.html"?>
-
- <title>Needed Patches</title>
-
- <para>In addition to the bootloader packages, several patches are
- also required. These patches correct any mistakes in the packages that
- should be fixed by the maintainer. The patches also make small modifications to
- make the packages easier to work with. The following patches will be
- needed to build a CLFS system:</para>
-<!--
- <variablelist role="bootpatches">
-
- </variablelist>
--->
- <para os="a">Total size of these patches: about <returnvalue/></para>
-
-</sect1>
diff --git a/BOOK/bootloaders/common/introduction.xml b/BOOK/bootloaders/common/introduction.xml
deleted file mode 100644
index 10f5c4f..0000000
--- a/BOOK/bootloaders/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-bootloaders-introduction">
- <?dbhtml filename="introduction.html"?>
-
- <title>Introduction</title>
-
- <para os="a">Since every embedded architecture has a different type of
- bootloader, we will discuss how to configure them in this section.</para>
-
-</sect1>
diff --git a/BOOK/bootloaders/mips-chapter.xml b/BOOK/bootloaders/mips-chapter.xml
deleted file mode 100644
index 053533b..0000000
--- a/BOOK/bootloaders/mips-chapter.xml
+++ /dev/null
@@ -1,19 +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-bootloaders" xreflabel="Bootloaders">
- <?dbhtml dir="bootloaders"?>
- <?dbhtml filename="chapter.html"?>
-
- <title>Bootloaders</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="mips/packages.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/patches.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/colo.xml"/>
-
-</chapter>
diff --git a/BOOK/bootloaders/mips/colo.xml b/BOOK/bootloaders/mips/colo.xml
deleted file mode 100644
index ee3120d..0000000
--- a/BOOK/bootloaders/mips/colo.xml
+++ /dev/null
@@ -1,175 +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-bootloaders-colo" role="wrap">
- <?dbhtml filename="colo.html"?>
-
- <title>Colo-&colo-version;</title>
-
- <indexterm zone="ch-bootloaders-colo">
- <primary sortas="a-Colo">Colo</primary>
- </indexterm>
-
- <sect2 role="package">
- <title/>
-
- <para>This bootloader is for the MIPS based cobalt servers RaQ,
- RaQ2, Qube, or the Qube2.</para>
-
- </sect2>
-
- <sect2 role="installation">
- <title>Installation of Colo</title>
-
- <para os="p1">This patch updates the Colo bootloader to build under
- cross-compiled conditions:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&colo-make-patch;</userinput></screen>
-
- <para os="p3">This patch fixes a relocation error when linking with
- Binutils:</para>
-
-<screen os="p4"><userinput>patch -Np1 -i ../&colo-relocation-patch;</userinput></screen>
-
- <para os="a">Compile the Colo package:</para>
-
-<screen os="b"><userinput>make CROSS_COMPILE="${CLFS_TARGET}-" binary
-make CROSS_COMPILE="${CLFS_TARGET}-" tooldirs</userinput></screen>
-
- <para os="c">Install the package:</para>
-
-<screen os="d"><userinput>install -v tools/lcdtools/e2fsck-lcd/e2fsck-lcd ${CLFS}/sbin
-install -v tools/lcdtools/e2fsck-lcd/e2fsck-lcd.8 ${CLFS}/usr/man/man8
-install -v tools/lcdtools/paneld/paneld ${CLFS}/sbin
-install -v tools/lcdtools/paneld/paneld.8 ${CLFS}/usr/man/man8
-install -v tools/lcdtools/putlcd/putlcd ${CLFS}/sbin
-install -v tools/lcdtools/putlcd/putlcd.8 ${CLFS}/usr/man/man8
-cp -v chain/colo-chain.elf ${CLFS}/boot/vmlinux
-gzip -9 ${CLFS}/boot/vmlinux</userinput></screen>
-
- </sect2>
-
- <sect2 role="configuration">
- <title>Configuration of Colo</title>
-
- <para os="e">Your shiny new CLFS system is almost complete. One of the last
- things to do is ensure you can boot it. The instructions below apply
- only to Cobalt RaQ1/RaQ2/Cube2 servers. Information on <quote>boot
- loading</quote> for other architectures should be available in the
- usual resource-specific locations for those architectures.</para>
-
- <para os="f">Boot loading can be a complex area, so a few cautionary words
- are in order. Be familiar with the current boot loader and any other
- operating systems present on the hard drive(s) that need to be bootable.
- Make sure that an emergency boot disk is ready to <quote>rescue</quote>
- the computer if the computer becomes unusable (un-bootable).</para>
-
- <para os="g">Earlier, we compiled and installed the Cobalt boot loader
- software in preparation for this step. Now we will configure our system
- to boot using Colo. Here is a simple <filename>default.colo</filename>
- to use.</para>
-
-<screen os="h"><userinput>cat > /boot/default.colo << EOF
-<literal>#:CoLo:#
-#
-# load linux
-#
-lcd 'Booting &linux-version;...'
-load vmlinux-&linux-version;.gz
-execute root=/dev/hda2 console=ttyS0,115200 ide1=noprobe</literal>
-EOF</userinput></screen>
-
- <para os="i">The FHS stipulates that the bootloader's configuration file should
- be symlinked to <filename class="symlink">/etc/{Bootloader Name}</filename>.
- To satisfy this requirement for Colo, issue the following command:</para>
-
-<screen os="j"><userinput>mkdir -v ${CLFS}/etc/colo &&
-ln -sv ../boot/colo/default.colo ${CLFS}/etc/colo</userinput></screen>
-
-</sect2>
-
- <sect2 role="kernel">
- <title>Kernel Configuration for Colo</title>
-
- <para os="k">To help keep our system small Colo allows us to
- compress our kernel. The followings step will show you how to
- compress the kernel the way colo expects it:</para>
-
-<screen os="l"><userinput>gzip -9 ${CLFS}/boot/vmlinux-&linux-version;</userinput></screen>
-
-</sect2>
-
- <sect2 id="contents-colo" role="content">
- <title>Contents of Colo</title>
-
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
-
- <seglistitem>
- <seg>colo-chain.elf, e2fsck-lcd, paneld and putlcd</seg>
- </seglistitem>
- </segmentedlist>
-
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="colo-chain.elf">
- <term><command>colo</command></term>
- <listitem>
- <para>Is the Cobalt Bootloader's chain mode executeable. This
- file gets gzipped and renamed to <filename>vmlinux.gz</filename>,
- so it can be booted automatically by the Cobalt's existing
- firmware</para>
- <indexterm zone="ch-bootloaders-colo colo-chain.elf">
- <primary sortas="b-colo-chain.elf">colo-chain.elf</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="e2fsck-lcd">
- <term><command>e2fsck-lcd</command></term>
- <listitem>
- <para>Will output file system check progress information on the
- Cobalt LCD</para>
- <indexterm zone="ch-bootloaders-colo e2fsck-lcd">
- <primary sortas="b-e2fsck-lcd">e2fsck-lcd</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="paneld">
- <term><command>paneld</command></term>
- <listitem>
- <para>Is an admin tool for the LCD panel of Cobalt machines. By
- default, it will display the current time and optionally a message.
- When you hold the enter or select button for a couple of seconds
- you will get an admin menu. The menu will allow you to either halt
- or reboot your Cobalt machine</para>
- <indexterm zone="ch-bootloaders-colo paneld">
- <primary sortas="b-paneld">paneld</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="putlcd">
- <term><command>putlcd</command></term>
- <listitem>
- <para>Is a tool to display text on the LCD display of Cobalt
- machines</para>
- <indexterm zone="ch-bootloaders-colo putlcd">
- <primary sortas="b-putlcd">putlcd</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/bootloaders/mips/packages.xml b/BOOK/bootloaders/mips/packages.xml
deleted file mode 100644
index faa4987..0000000
--- a/BOOK/bootloaders/mips/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-bootloaders-packages-common">
- <?dbhtml filename="packages.html"?>
-
- <title>Bootloader Packages</title>
-
- <para>Download or otherwise obtain the following packages:</para>
-
- <variablelist role="bootloader">
-
- <varlistentry>
- <term>Colo (&colo-version;) - <token>&colo-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&colo-home;"/></para>
- <para>Download: <ulink url="&colo-url;"/></para>
- <para>MD5 sum: <literal>&colo-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- <para os="a">Total size of these packages: about <returnvalue/></para>
-
-</sect1>
diff --git a/BOOK/bootloaders/mips/patches.xml b/BOOK/bootloaders/mips/patches.xml
deleted file mode 100644
index 7128b75..0000000
--- a/BOOK/bootloaders/mips/patches.xml
+++ /dev/null
@@ -1,41 +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-bootloaders-patches-mips">
- <?dbhtml filename="patches.html"?>
-
- <title>Needed Patches</title>
-
- <para>In addition to the bootloader packages, several patches are
- also required. These patches correct any mistakes in the packages that
- should be fixed by the maintainer. The patches also make small modifications to
- make the packages easier to work with. The following patches will be
- needed to build a CLFS system:</para>
-
- <variablelist role="bootpatches">
-
- <varlistentry os="colo-mips-patch">
- <term>Colo Make Patch - <token>&colo-make-patch-size;</token>:</term> <listitem>
- <para>Download: <ulink
- url="&patches-root;&colo-make-patch;"/></para>
- <para>MD5 sum: <literal>&colo-make-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="colo-relocation-patch">
- <term>Colo Relocation Patch - <token>&colo-relocation-patch-size;</token>:</term> <listitem>
- <para>Download: <ulink
- url="&patches-root;&colo-relocation-patch;"/></para>
- <para>MD5 sum: <literal>&colo-relocation-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- <para os="a">Total size of these patches: about <returnvalue/></para>
-
-</sect1>
diff --git a/BOOK/bootloaders/x86-chapter.xml b/BOOK/bootloaders/x86-chapter.xml
deleted file mode 100644
index f6c8484..0000000
--- a/BOOK/bootloaders/x86-chapter.xml
+++ /dev/null
@@ -1,16 +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-bootloaders" xreflabel="Bootloaders">
- <?dbhtml dir="bootloaders"?>
- <?dbhtml filename="chapter.html"?>
-
- <title>Bootloaders</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/introduction.xml"/>
-
-</chapter>
diff --git a/BOOK/bootloaders/x86/patches.xml b/BOOK/bootloaders/x86/patches.xml
deleted file mode 100644
index 2bd4bc1..0000000
--- a/BOOK/bootloaders/x86/patches.xml
+++ /dev/null
@@ -1,43 +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-bootloaders-patches-x86">
- <?dbhtml filename="patches.html"?>
-
- <title>Needed Patches</title>
-
- <para>In addition to the bootloader packages, several patches are
- also required. These patches correct any mistakes in the packages that
- should be fixed by the maintainer. The patches also make small modifications to
- make the packages easier to work with. The following patches will be
- needed to build a CLFS system:</para>
-
-<!--
- <variablelist role="bootpatches">
-
- <varlistentry os="colo-mips-patch">
- <term>Colo Make Patch - <token>&colo-make-patch-size;</token>:</term> <listitem>
- <para>Download: <ulink
- url="&patches-root;&colo-make-patch;"/></para>
- <para>MD5 sum: <literal>&colo-make-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry os="colo-relocation-patch">
- <term>Colo Relocation Patch - <token>&colo-relocation-patch-size;</token>:</term> <listitem>
- <para>Download: <ulink
- url="&patches-root;&colo-relocation-patch;"/></para>
- <para>MD5 sum: <literal>&colo-relocation-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- <para os="a">Total size of these patches: about <returnvalue/></para>
--->
-
-</sect1>
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index f100a3d..8e4e689 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -45,7 +45,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootloaders/mips-chapter.xml"/>
</part>
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 2d0d5bd..7d6eb77 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -101,11 +101,3 @@
<!ENTITY e2fsprogs-url "&sourceforge;e2fsprogs/e2fsprogs-&e2fsprogs-version;.tar.gz">
<!ENTITY e2fsprogs-md5 "a1ec22ef003688dae9f76c74881b22b9">
<!ENTITY e2fsprogs-home "http://e2fsprogs.sourceforge.net">
-
-<!-- MIPS Bootloaders -->
-
-<!ENTITY colo-version "1.22">
-<!ENTITY colo-size "251 KB">
-<!ENTITY colo-url "http://www.colonel-panic.org/cobalt-mips/colo/colo-&colo-version;.tar.gz">
-<!ENTITY colo-md5 "52c16ad31f3b88f710f0fdb5abed0457">
-<!ENTITY colo-home "http://www.colonel-panic.org/cobalt-mips">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 79dd9c1..08cc73a 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -31,14 +31,3 @@
<!-- ARM Patches -->
<!-- MIPS Patches -->
-
-<!-- MIPS Bootloader Patches -->
-
-<!ENTITY colo-make-patch "colo-&colo-version;-make_fix-1.patch">
-<!ENTITY colo-make-patch-md5 "b89575a0e385b5366b19a6b5f176d49b">
-<!ENTITY colo-make-patch-size "2 KB">
-
-<!ENTITY colo-relocation-patch "colo-&colo-version;-relocation_fix-1.patch">
-<!ENTITY colo-relocation-patch-md5 "e0607ee1071f2f805ffa1ef1c5b1a766">
-<!ENTITY colo-relocation-patch-size ".7 KB">
-
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index 4751bdd..e01bb55 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -46,7 +46,6 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootloaders/x86-chapter.xml"/>
</part>
diff --git a/patches/colo-1.22-make_fix-1.patch b/patches/colo-1.22-make_fix-1.patch
deleted file mode 100644
index c46c65a..0000000
--- a/patches/colo-1.22-make_fix-1.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-Submitted By: Joe Ciccone <joeciccone at crazyeyesoft.com>
-Date: 2005-11-23
-Initial Package Version: 1.19
-Upstream Status: Sent
-Origin: Joe Ciccone <joeciccone at crazyeyesoft.com
-Description: Adds flags to the stage1, stage2, and chain Makefiles
- forcing them to build as 32bit.
-
- 2-2-06 Updated for Colo 1.21
-diff -Naur colo-1.21.orig/chain/Makefile colo-1.21/chain/Makefile
---- colo-1.21.orig/chain/Makefile 2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/chain/Makefile 2006-02-02 15:43:32.000000000 +0000
-@@ -18,9 +18,9 @@
-
- DEPS=$(OBJS:.o=.d)
-
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-
- all:
- $(MAKE) -C .. binary
-diff -Naur colo-1.21.orig/stage1/Makefile colo-1.21/stage1/Makefile
---- colo-1.21.orig/stage1/Makefile 2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/stage1/Makefile 2006-02-02 15:44:18.000000000 +0000
-@@ -21,9 +21,9 @@
-
- DEPS=$(OBJS:.o=.d)
-
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-
- all:
- $(MAKE) -C .. binary
-diff -Naur colo-1.21.orig/stage2/Makefile colo-1.21/stage2/Makefile
---- colo-1.21.orig/stage2/Makefile 2006-01-17 23:03:58.000000000 +0000
-+++ colo-1.21/stage2/Makefile 2006-02-02 15:44:02.000000000 +0000
-@@ -54,9 +54,9 @@
-
- DEPS=$(OBJS:.o=.d)
-
--LDFLAGS= -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
--CFLAGS= -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
--CPPFLAGS= -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-+LDFLAGS= -mabi=32 -nostdlib -Wl,-T,$(TARG).lnk,-Map,$(TARG).map,--emit-relocs
-+CFLAGS= -mabi=32 -Werror -Wall -Wstrict-prototypes -fomit-frame-pointer -O2 -fno-strict-aliasing $(CFLAGS_CPU) $(CFLAGS_COLO)
-+CPPFLAGS= -mabi=32 -MD -nostdinc -Iinclude -I../include -D_DEBUG $(CPPFLAGS_GCC)
-
- LOADADDR= $(shell $(CROSS_COMPILE)readelf -l $(TARG) | awk '$$1 ~ /^LOAD$$/ { print $$3 }')
-
diff --git a/patches/colo-1.22-relocation_fix-1.patch b/patches/colo-1.22-relocation_fix-1.patch
deleted file mode 100644
index 1e7cbca..0000000
--- a/patches/colo-1.22-relocation_fix-1.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Submitted By: Joe Ciccone <jciccone at linuxfromscratch.org>
-Date: 2006-06-11
-Initial Package Version: 1.21
-Upstream Status: Unknown
-Origin: Joe Ciccone
-Description: Fixes relocation errors when linking.
-
-diff -Naur colo-1.21.orig/stage1/include/lib.h colo-1.21/stage1/include/lib.h
---- colo-1.21.orig/stage1/include/lib.h 2006-01-17 18:03:58.000000000 -0500
-+++ colo-1.21/stage1/include/lib.h 2006-07-11 01:01:29.000000000 -0400
-@@ -47,8 +47,8 @@
-
- /* fast.c */
-
--extern void * __attribute__((section(".data"))) _memcpy_w(void *, const void *, size_t);
--extern void * __attribute__((section(".data"))) _memset_w(void *, int, size_t);
-+extern void * _memcpy_w(void *, const void *, size_t);
-+extern void * _memset_w(void *, int, size_t);
-
- #endif
-
commit d4c0817e9d029bc956e13c278248ed1d29c06e3a
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 09:43:14 2013 -0400
kernel: First pass at cleanup
Remove any recommendation of using modules, they're evil :)
Recommend use of u-boot tools for creating uImages.
diff --git a/BOOK/bootable/common/kernel.xml b/BOOK/bootable/common/kernel.xml
index f0a576b..d227fa2 100644
--- a/BOOK/bootable/common/kernel.xml
+++ b/BOOK/bootable/common/kernel.xml
@@ -36,107 +36,60 @@
kernel compilation. Do not rely on the source tree being clean after
un-tarring.</para>
- <para os="e">Configure the kernel via a menu-driven interface.
- Please note that the udev bootscript requires "rtc" and "tmpfs" to be
- enabled and built into the kernel, not as modules. BLFS has
- some information regarding particular kernel configuration requirements of
- packages outside of CLFS at <ulink
- url="&blfs-root;view/svn/longindex.html#kernel-config-index"/>:</para>
-
- <note os="f"><para>Since we are building for an embedded system we need to make sure
- our key components are built into the kernel and not as modules. Our key
- components are console/video, disk, and network. With out these built in our
- system will not function properly. If your concerned about disk space, your kernel
- should be without modules.</para></note>
+ <para os="e">Configure the kernel via a menu-driven interface. Be sure to
+ enable DEVTMPFS so that <filename class="directory">/dev</filename> will
+ be populated automatically.</para>
+
+ <note os="f"><para>Since you are building for an embedded system make sure
+ all key components are built into the kernel and not as modules. The key
+ 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>
<screen os="g"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
- <para os="h">Alternatively, <command>make oldconfig</command> may be more
- appropriate in some situations. See the <filename>README</filename>
- file for more information.</para>
+<para os="h">Alternatively, the <command>make oldconfig</command> or
+ <command>make <replaceable>${CLFS_TARGET}</replaceable>_defconfig</command>
+ may be more appropriate in some situations. See the
+ <filename>README</filename> file for more information.</para>
<para os="i">If desired, skip kernel configuration by copying the kernel
- config file, <filename>.config</filename>, from the host system
+ config file, <filename>.config</filename>, from an example system
(assuming it is available) to the root directory of the unpacked kernel
- sources. However, we do not recommend this option. It is often better
- to explore all the configuration menus and create the kernel configuration
- from scratch.</para>
+ sources.</para>
- <para os="j">Compile the kernel image and modules:</para>
+ <note><para>If you are using the u-boot bootloader, creating a
+ <filename>uImage</filename> type kernel is recommended. Install the
+ u-boot tools (not documented here) and append "uImage" when compiling the
+ kernel.</para></note>
+
+ <para os="j">Compile the configured kernel image and modules:</para>
<screen os="k"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}-</userinput></screen>
<para os="l">If using kernel modules, an
- <filename>/etc/modprobe.conf</filename> file may be needed.
- Information pertaining to modules and kernel configuration is
- located in the kernel documentation in the <filename
- class="directory">Documentation</filename> directory of the kernel
- sources tree. Also, <filename>modprobe.conf(5)</filename> may
- be of interest.</para>
-
- <para os="m">Be very careful when reading other documentation relating to
- kernel modules because it usually applies to 2.4.x kernels only. As
- far as we know, kernel configuration issues specific to Hotplug and
- Udev are not documented. The problem is that Udev will create a device
- node only if Hotplug or a user-written script inserts the corresponding
- module into the kernel, and not all modules are detectable by Hotplug.
- Note that statements like the one below in the
- <filename>/etc/modprobe.conf</filename> file do not work with Udev:</para>
-
-<screen os="n"><literal>alias char-major-XXX some-module</literal></screen>
-
- <para os="o">Because of the complications with Udev and modules,
- we strongly recommend starting with a completely non-modular kernel
- configuration, especially if this is the first time using Udev.</para>
-
- <para os="p">Install the modules, if the kernel configuration uses
- them:</para>
-
-<screen os="q"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
- <para os="r">After kernel compilation is complete, additional steps are
- required to complete the installation. Some files need to be copied to
- the <filename class="directory">${CLFS}/boot</filename> directory.</para>
-
- <para os="s">Issue the following command to install the kernel:</para>
-
-<screen os="t"><userinput>cp vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
+ <filename>/etc/modprobe.conf</filename> file may be needed. Information
+ pertaining to modules and kernel configuration is located in the kernel
+ documentation in the <filename class="directory">Documentation</filename>
+ directory of the kernel sources tree. Also,
+ <filename>modprobe.conf(5)</filename> may be of interest.</para>
- <para os="u"><filename>System.map</filename> is a symbol file for the kernel.
- It maps the function entry points of every function in the kernel API,
- as well as the addresses of the kernel data structures for the running
- kernel. Issue the following command to install the map file:</para>
+ <para os="p">If building modules, install the modules:</para>
-<screen os="v"><userinput>cp System.map ${CLFS}/boot/System.map-&linux-version;</userinput></screen>
-
- <para os="w">If we compiled our kernel with modules and we made sure
- <command>depmod.pl</command> is avaiable from BusyBox, we need to create the
- module dependency list by issuing the following command:</para>
-
-<screen os="x"><userinput>${CLFS}/cross-tools/bin/depmod.pl -F ${CLFS}/boot/System.map-&linux-version; \
- -b ${CLFS}/lib/modules/&linux-version;</userinput></screen>
+<screen os="q"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- \
+ INSTALL_MOD_PATH=${CLFS}/targetfs modules_install</userinput></screen>
<para os="y">The kernel configuration file <filename>.config</filename>
produced by the <command>make menuconfig</command> step above contains
all the configuration selections for the kernel that was just compiled.
- It is a good idea to keep this file for future reference:</para>
-
-<screen os="z"><userinput>cp .config ${CLFS}/boot/config-&linux-version;</userinput></screen>
-
- <warning os="aa">
- <para>Some kernel documentation recommends creating a symlink from
- <filename class="symlink">/usr/src/linux</filename> pointing to the
- kernel source directory. This is specific to kernels prior to the
- 2.6 series and <emphasis>must not</emphasis> be created on an CLFS
- system as it can cause problems for packages you may wish to build
- once your base CLFS system is complete.</para>
-
- </warning>
+ It is a good idea to keep this file for future reference.</para>
- <para os="ab">The bootloaders section contains more information on
- how to configure the kernel for specifc bootloaders. Please refer
- to this section for your specific needs.</para>
+ <para>The resulting kernel will be located within the <filename
+ class="directory">arch/${CLFS_ARCH}/boot</filename>. There may be more
+ than one version of the same kernel, simply with different compression or
+ bootloader helpers added. Follow your bootloader's instructions on how to
+ copy the kernel to the final system.</para>
</sect2>
@@ -147,8 +100,7 @@
<segtitle>Installed files</segtitle>
<seglistitem>
- <seg>config-[linux-version], clfskernel-[linux-version],
- and System.map-[linux-version]</seg>
+ <seg>.config, Image files, and System.map</seg>
</seglistitem>
</segmentedlist>
@@ -158,40 +110,25 @@
<?dbhtml list-presentation="table"?>
<varlistentry id="config">
- <term><filename>config-[linux-version]</filename></term>
+ <term><filename>.config</filename></term>
<listitem>
<para>Contains all the configuration selections for the kernel</para>
- <indexterm zone="ch-bootable-kernel config">
- <primary sortas="e-/boot/config">/boot/config-[linux-version]</primary>
- </indexterm>
</listitem>
</varlistentry>
- <varlistentry id="clfskernel">
- <term><filename>clfskernel-[linux-version]</filename></term>
+ <varlistentry id="kernel">
+ <term><filename>zImage, uImage, bzImage, vmlinux</filename></term>
<listitem>
- <para>The engine of the Linux system. When turning on the
- computer, the kernel is the first part of the operating system
- that gets loaded. It detects and initializes all components of
- the computer's hardware, then makes these components available
- as a tree of files to the software and turns a single CPU into
- a multitasking machine capable of running scores of programs
- seemingly at the same time.</para>
- <indexterm zone="ch-bootable-kernel clfskernel">
- <primary sortas="b-clfskernel">clfskernel-[linux-version]</primary>
- </indexterm>
+ <para>The compiled Linux kernel.</para>
</listitem>
</varlistentry>
<varlistentry id="System.map">
- <term><filename>System.map-[linux-version]</filename></term>
+ <term><filename>System.map</filename></term>
<listitem>
<para>A list of addresses and symbols; it maps the entry points
and addresses of all the functions and data structures in the
- kernel</para>
- <indexterm zone="ch-bootable-kernel System.map">
- <primary sortas="e-/boot/System.map">/boot/System.map-[linux-version]</primary>
- </indexterm>
+ kernel. Useful for debugging, sometimes.</para>
</listitem>
</varlistentry>
commit 90856995a2f2b4e79bc92afd9dedbc9f04e4c163
Author: Andrew Bradford <andrew at bradfordembedded.com>
Date: Mon Oct 21 09:20:18 2013 -0400
Make bootable/kernel common
There's really no difference between each arch since the generated image
format is really just dependent on the bootloader's desires.
diff --git a/BOOK/arm-index.xml b/BOOK/arm-index.xml
index efc4794..eeedae5 100644
--- a/BOOK/arm-index.xml
+++ b/BOOK/arm-index.xml
@@ -43,7 +43,7 @@
<title>Building the CLFS System</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/arm-chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootloaders/arm-chapter.xml"/>
diff --git a/BOOK/bootable/arm-chapter.xml b/BOOK/bootable/arm-chapter.xml
deleted file mode 100644
index 97daef7..0000000
--- a/BOOK/bootable/arm-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-bootable" xreflabel="Making the CLFS System Bootable">
- <?dbhtml dir="bootable"?>
- <?dbhtml filename="chapter.html"?>
-
- <title>Making the CLFS System Bootable</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/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="arm/kernel.xml"/>
-
-</chapter>
diff --git a/BOOK/bootable/arm/kernel.xml b/BOOK/bootable/arm/kernel.xml
deleted file mode 100644
index 70bb5cd..0000000
--- a/BOOK/bootable/arm/kernel.xml
+++ /dev/null
@@ -1,135 +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-bootable-kernel" role="wrap">
- <?dbhtml filename="kernel.html"?>
-
- <title>Linux-&linux-version;</title>
-
- <indexterm zone="ch-bootable-kernel">
- <primary sortas="a-Linux">Linux</primary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of the kernel</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="g"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- zImage modules</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='l'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='m'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='n'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='o'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='p'])"/>
-
-<screen os="q"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='r'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='s'])"/>
-
-<screen os="t"><userinput>cp arch/${CLFS_ARCH}/boot/zImage ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='u'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='v'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='w'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='x'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='y'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='z'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='aa'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='ab'])"/>
-
- </sect2>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@role='content'])"/>
-
-</sect1>
diff --git a/BOOK/bootable/x86-chapter.xml b/BOOK/bootable/chapter.xml
similarity index 88%
rename from BOOK/bootable/x86-chapter.xml
rename to BOOK/bootable/chapter.xml
index fc30d35..f7c397f 100644
--- a/BOOK/bootable/x86-chapter.xml
+++ b/BOOK/bootable/chapter.xml
@@ -13,6 +13,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/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/kernel.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/kernel.xml"/>
</chapter>
diff --git a/BOOK/bootable/x86/kernel.xml b/BOOK/bootable/common/kernel.xml
similarity index 100%
rename from BOOK/bootable/x86/kernel.xml
rename to BOOK/bootable/common/kernel.xml
diff --git a/BOOK/bootable/mips-chapter.xml b/BOOK/bootable/mips-chapter.xml
deleted file mode 100644
index aeca479..0000000
--- a/BOOK/bootable/mips-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-bootable" xreflabel="Making the CLFS System Bootable">
- <?dbhtml dir="bootable"?>
- <?dbhtml filename="chapter.html"?>
-
- <title>Making the CLFS System Bootable</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/fstab.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="mips/kernel.xml"/>
-
-</chapter>
diff --git a/BOOK/bootable/mips/kernel.xml b/BOOK/bootable/mips/kernel.xml
deleted file mode 100644
index cc0d5fb..0000000
--- a/BOOK/bootable/mips/kernel.xml
+++ /dev/null
@@ -1,135 +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-bootable-kernel" role="wrap">
- <?dbhtml filename="kernel.html"?>
-
- <title>Linux-&linux-version;</title>
-
- <indexterm zone="ch-bootable-kernel">
- <primary sortas="a-Linux">Linux</primary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of the kernel</title>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='a'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='d'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='f'])"/>
-
-<screen os="g"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- menuconfig</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='h'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='j'])"/>
-
-<screen os="k"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- </userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='l'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='m'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='n'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='o'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='p'])"/>
-
-<screen os="q"><userinput>make ARCH=${CLFS_ARCH} CROSS_COMPILE=${CLFS_TARGET}- \
- INSTALL_MOD_PATH=${CLFS} modules_install</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='r'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='s'])"/>
-
-<screen os="t"><userinput>cp arch/${CLFS_ARCH}/boot/vmlinux ${CLFS}/boot/clfskernel-&linux-version;</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='u'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='v'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='w'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='x'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='y'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='z'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='aa'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@os='ab'])"/>
-
- </sect2>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/kernel.xml"
- xpointer="xpointer(//*[@role='content'])"/>
-
-</sect1>
diff --git a/BOOK/mips-index.xml b/BOOK/mips-index.xml
index 9af8fe1..f100a3d 100644
--- a/BOOK/mips-index.xml
+++ b/BOOK/mips-index.xml
@@ -43,7 +43,7 @@
<title>Building the CLFS System</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/mips-chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootloaders/mips-chapter.xml"/>
diff --git a/BOOK/x86-index.xml b/BOOK/x86-index.xml
index 459381a..4751bdd 100644
--- a/BOOK/x86-index.xml
+++ b/BOOK/x86-index.xml
@@ -44,7 +44,7 @@
<title>Building the CLFS System</title>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="final-system/chapter.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/x86-chapter.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootable/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootscripts/chapter.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="bootloaders/x86-chapter.xml"/>
-----------------------------------------------------------------------
Summary of changes:
BOOK/INSTALL | 47 ------
BOOK/INSTALL.md | 32 ++++
BOOK/README | 28 ----
BOOK/arm-index.xml | 3 +-
BOOK/bootable/arm-chapter.xml | 18 --
BOOK/bootable/arm/kernel.xml | 135 ----------------
BOOK/bootable/{x86-chapter.xml => chapter.xml} | 3 +-
BOOK/bootable/common/bootloaders.xml | 52 ++++++
BOOK/bootable/common/kernel.xml | 139 ++++++++++++++++
BOOK/bootable/mips-chapter.xml | 18 --
BOOK/bootable/mips/kernel.xml | 135 ----------------
BOOK/bootable/x86/kernel.xml | 202 ------------------------
BOOK/bootloaders/arm-chapter.xml | 18 --
BOOK/bootloaders/arm/packages.xml | 22 ---
BOOK/bootloaders/arm/patches.xml | 25 ---
BOOK/bootloaders/common/introduction.xml | 16 --
BOOK/bootloaders/mips-chapter.xml | 19 ---
BOOK/bootloaders/mips/colo.xml | 175 --------------------
BOOK/bootloaders/mips/packages.xml | 30 ----
BOOK/bootloaders/mips/patches.xml | 41 -----
BOOK/bootloaders/x86-chapter.xml | 16 --
BOOK/bootloaders/x86/patches.xml | 43 -----
BOOK/general.ent | 6 +-
BOOK/mips-index.xml | 3 +-
BOOK/obfuscate.sh | 39 -----
BOOK/packages.ent | 8 -
BOOK/patches.ent | 23 +---
BOOK/preface/common/changelog.xml | 16 ++
BOOK/preface/common/license.xml | 31 +----
BOOK/tidy.sh | 2 -
BOOK/x86-index.xml | 3 +-
LICENSE | 113 +++++++++++++
README.md | 14 ++
patches/colo-1.22-make_fix-1.patch | 57 -------
patches/colo-1.22-relocation_fix-1.patch | 21 ---
35 files changed, 374 insertions(+), 1179 deletions(-)
delete mode 100644 BOOK/INSTALL
create mode 100644 BOOK/INSTALL.md
delete mode 100644 BOOK/README
delete mode 100644 BOOK/bootable/arm-chapter.xml
delete mode 100644 BOOK/bootable/arm/kernel.xml
rename BOOK/bootable/{x86-chapter.xml => chapter.xml} (78%)
create mode 100644 BOOK/bootable/common/bootloaders.xml
create mode 100644 BOOK/bootable/common/kernel.xml
delete mode 100644 BOOK/bootable/mips-chapter.xml
delete mode 100644 BOOK/bootable/mips/kernel.xml
delete mode 100644 BOOK/bootable/x86/kernel.xml
delete mode 100644 BOOK/bootloaders/arm-chapter.xml
delete mode 100644 BOOK/bootloaders/arm/packages.xml
delete mode 100644 BOOK/bootloaders/arm/patches.xml
delete mode 100644 BOOK/bootloaders/common/introduction.xml
delete mode 100644 BOOK/bootloaders/mips-chapter.xml
delete mode 100644 BOOK/bootloaders/mips/colo.xml
delete mode 100644 BOOK/bootloaders/mips/packages.xml
delete mode 100644 BOOK/bootloaders/mips/patches.xml
delete mode 100644 BOOK/bootloaders/x86-chapter.xml
delete mode 100644 BOOK/bootloaders/x86/patches.xml
delete mode 100644 BOOK/obfuscate.sh
create mode 100644 LICENSE
create mode 100644 README.md
delete mode 100644 patches/colo-1.22-make_fix-1.patch
delete mode 100644 patches/colo-1.22-relocation_fix-1.patch
hooks/post-receive
--
Cross-LFS Embedded Book
More information about the Clfs-commits
mailing list