[Clfs-commits] [Cross-LFS]Cross-LFS Book branch, master, updated. 8f1ae86d73fbe57497e46d5836eb4aeaaff4431c
git
git at cross-lfs.org
Sun Aug 8 17:42:15 PDT 2010
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 Book".
The branch, master has been updated
via 8f1ae86d73fbe57497e46d5836eb4aeaaff4431c (commit)
via 34be04a6cab56e5abf0198256fbbb5f8c056c7f6 (commit)
from 41969c7b7468101e2d5e82c2a4777c901c825f22 (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 8f1ae86d73fbe57497e46d5836eb4aeaaff4431c
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 8 20:43:25 2010 -0400
Migrated the UID and GID Map from Sysroot.
diff --git a/BOOK/boot/common/changingowner.xml b/BOOK/boot/common/changingowner.xml
index cffc03f..487a6d8 100644
--- a/BOOK/boot/common/changingowner.xml
+++ b/BOOK/boot/common/changingowner.xml
@@ -18,6 +18,13 @@
<systemitem class="username">root</systemitem>. Change the ownership
for ${CLFS} and its subdirectories by running this command:</para>
-<screen os="b"><userinput>chown -Rv root:root ${CLFS}</userinput></screen>
+<screen os="b"><userinput>chown -Rv &uid-root;:&gid-root; ${CLFS}</userinput></screen>
+
+ <para>The following files are to be owned by the group
+ <systemitem class="username">utmp</systemitem> not by
+ <systemitem class="username">root</systemitem>.</para>
+
+<screen><userinput>chgrp -v &gid-utmp; ${CLFS}/var/run/utmp ${CLFS}/var/log/lastlog</userinput></screen>
+
</sect1>
diff --git a/BOOK/boot/common/fstab.xml b/BOOK/boot/common/fstab.xml
index fcff3f4..b62e53e 100644
--- a/BOOK/boot/common/fstab.xml
+++ b/BOOK/boot/common/fstab.xml
@@ -29,7 +29,7 @@
/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
+devpts /dev/pts devpts gid=&gid-tty;,mode=620 0 0
shm /dev/shm tmpfs defaults 0 0
# End /etc/fstab</literal>
EOF</userinput></screen>
diff --git a/BOOK/boot/common/pwdgroup.xml b/BOOK/boot/common/pwdgroup.xml
index 2f9d0ec..8219860 100644
--- a/BOOK/boot/common/pwdgroup.xml
+++ b/BOOK/boot/common/pwdgroup.xml
@@ -43,7 +43,7 @@
the following command:</para>
<screen><userinput>cat > ${CLFS}/etc/passwd << "EOF"
-<literal>root::0:0:root:/root:/bin/bash</literal>
+<literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
EOF</userinput></screen>
<para os="b">The actual password for <systemitem class="username">root</systemitem>
@@ -55,56 +55,56 @@ EOF</userinput></screen>
<title>Additional users you may want to add:</title>
<varlistentry>
- <term><literal>bin:x:1:1:bin:/bin:/bin/false</literal></term>
+ <term><literal>bin:x:&uid-bin;:&gid-bin;:bin:/bin:/bin/false</literal></term>
<listitem>
<para>Can be useful for compatibility with legacy applications.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>daemon:x:2:6:daemon:/sbin:/bin/false</literal></term>
+ <term><literal>daemon:x:&uid-daemon;:&gid-daemon;:daemon:/sbin:/bin/false</literal></term>
<listitem>
<para>It is often recommended to use an unprivileged User ID/Group ID
for daemons to run as, in order to limit their access to the system.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>adm:x:3:16:adm:/var/adm:/bin/false</literal></term>
+ <term><literal>adm:x:&uid-adm;:&gid-adm;:adm:/var/adm:/bin/false</literal></term>
<listitem>
<para>Was used for programs that performed administrative tasks.</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>lp:x:10:9:lp:/var/spool/lp:/bin/false</literal></term>
+ <term><literal>lp:x:&uid-lp;:&gid-lp;:lp:/var/spool/lp:/bin/false</literal></term>
<listitem>
<para>Used by programs for printing</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>mail:x:30:30:mail:/var/mail:/bin/false</literal></term>
+ <term><literal>mail:x:&uid-mail;:&gid-mail;:mail:/var/mail:/bin/false</literal></term>
<listitem>
<para>Often used by email programs</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>news:x:31:31:news:/var/spool/news:/bin/false</literal></term>
+ <term><literal>news:x:&uid-news;:&gid-news;:news:/var/spool/news:/bin/false</literal></term>
<listitem>
<para>Often used for network news servers</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>operator:x:50:0:operator:/root:/bin/bash</literal></term>
+ <term><literal>operator:x:&uid-operator;:&gid-root;:operator:/root:/bin/bash</literal></term>
<listitem>
<para>Often used to allow system operators to access the system</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>postmaster:x:51:30:postmaster:/var/spool/mail:/bin/false</literal></term>
+ <term><literal>postmaster:x:&uid-postmaster;:&gid-mail;:postmaster:/var/spool/mail:/bin/false</literal></term>
<listitem>
<para>Generally used as an account that receives all the information of troubles with the mail server</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>nobody:x:65534:65534:nobody:/:/bin/false</literal></term>
+ <term><literal>nobody:x:&uid-nobody;:&gid-nobody;:nobody:/:/bin/false</literal></term>
<listitem>
<para>Used by NFS</para>
</listitem>
@@ -116,21 +116,21 @@ EOF</userinput></screen>
<screen><userinput>cat > ${CLFS}/etc/group << "EOF"
<literal>root:x:0:
-bin:x:1:
-sys:x:2:
-kmem:x:3:
-tty:x:4:
-tape:x:5:
-daemon:x:6:
-floppy:x:7:
-disk:x:8:
-lp:x:9:
-dialout:x:10:
-audio:x:11:
-video:x:12:
-utmp:x:13:
-usb:x:14:
-cdrom:x:15:</literal>
+bin:x:&gid-bin;:
+sys:x:&gid-sys;:
+kmem:x:&gid-kmem;:
+tty:x:&gid-tty;:
+tape:x:&gid-tape;:
+daemon:x:&gid-daemon;:
+floppy:x:&gid-floppy;:
+disk:x:&gid-disk;:
+lp:x:&gid-lp;:
+dialout:x:&gid-dialout;:
+audio:x:&gid-audio;:
+video:x:&gid-video;:
+utmp:x:&gid-utmp;:
+usb:x:&gid-usb;:
+cdrom:x:&gid-cdrom;:</literal>
EOF</userinput></screen>
<variablelist os="d">
@@ -138,50 +138,50 @@ EOF</userinput></screen>
<title>Additional groups you may want to add</title>
<varlistentry>
- <term><literal>adm:x:16:root,adm,daemon</literal></term>
+ <term><literal>adm:x:&gid-adm;:root,adm,daemon</literal></term>
<listitem>
<para>All users in this group are allowed to do administrative tasks</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>console:x:17:</literal></term>
+ <term><literal>console:x:&gid-console;:</literal></term>
<listitem>
<para>This group has direct access to the console</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>cdrw:x:18:</literal></term>
+ <term><literal>cdrw:x:&gid-cdrw;:</literal></term>
<listitem>
<para>This group is allowed to use the CDRW drive</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>mail:x:30:mail</literal></term>
+ <term><literal>mail:x:&gid-mail;:mail</literal></term>
<listitem>
<para>Used by MTAs (Mail Transport Agents)</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>news:x:31:news</literal></term>
+ <term><literal>news:x:&gid-news;:news</literal></term>
<listitem>
<para>Used by Network News Servers</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>users:x:1000:</literal></term>
+ <term><literal>users:x:&gid-users;:</literal></term>
<listitem>
<para>The default GID used by shadow for new users</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>nogroup:x:65533:</literal></term>
+ <term><literal>nogroup:x:&gid-nogroup;:</literal></term>
<listitem>
<para>This is a default group used by some programs that do not
require a group</para>
</listitem>
</varlistentry>
<varlistentry>
- <term><literal>nobody:x:65534:</literal></term>
+ <term><literal>nobody:x:&gid-nobody;:</literal></term>
<listitem>
<para>This is used by NFS</para>
</listitem>
diff --git a/BOOK/bootable/common/fstab.xml b/BOOK/bootable/common/fstab.xml
index 0f56934..df254a6 100644
--- a/BOOK/bootable/common/fstab.xml
+++ b/BOOK/bootable/common/fstab.xml
@@ -29,7 +29,7 @@
/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
+devpts /dev/pts devpts gid=&gid-tty;,mode=620 0 0
shm /dev/shm tmpfs defaults 0 0
# End /etc/fstab</literal>
EOF</userinput></screen>
diff --git a/BOOK/chroot/common/devices.xml b/BOOK/chroot/common/devices.xml
index a5e507a..178d0d9 100644
--- a/BOOK/chroot/common/devices.xml
+++ b/BOOK/chroot/common/devices.xml
@@ -20,7 +20,7 @@
<para>Mount the proper virtual (kernel) file systems on the
newly-created directories:</para>
-<screen><userinput>mount -vt devpts -o gid=4,mode=620 none /dev/pts
+<screen><userinput>mount -vt devpts -o gid=&gid-tty;,mode=620 none /dev/pts
mount -vt tmpfs none /dev/shm</userinput></screen>
<para>The <command>mount</command> commands executed above may result
diff --git a/BOOK/chroot/common/kernfs.xml b/BOOK/chroot/common/kernfs.xml
index 6ef8e21..ccd5119 100644
--- a/BOOK/chroot/common/kernfs.xml
+++ b/BOOK/chroot/common/kernfs.xml
@@ -54,6 +54,6 @@ mknod -m 666 ${CLFS}/dev/null c 1 3</userinput></screen>
for each of these now:</para>
<screen><userinput>mount -f -vt tmpfs tmpfs ${CLFS}/dev/shm
-mount -f -vt devpts -o gid=4,mode=620 devpts ${CLFS}/dev/pts</userinput></screen>
+mount -f -vt devpts -o gid=&gid-tty;,mode=620 devpts ${CLFS}/dev/pts</userinput></screen>
</sect1>
diff --git a/BOOK/chroot/common/pwdgroup.xml b/BOOK/chroot/common/pwdgroup.xml
index 85c2e37..f6eda61 100644
--- a/BOOK/chroot/common/pwdgroup.xml
+++ b/BOOK/chroot/common/pwdgroup.xml
@@ -42,7 +42,7 @@
following command:</para>
<screen><userinput>cat > /etc/passwd << "EOF"
-<literal>root:x:0:0:root:/root:/bin/bash</literal>
+<literal>root:x:&uid-root;:&gid-root;:root:/root:/bin/bash</literal>
EOF</userinput></screen>
<para os="b">The actual password for
@@ -58,21 +58,21 @@ EOF</userinput></screen>
<screen><userinput>cat > /etc/group << "EOF"
<literal>root:x:0:
-bin:x:1:
-sys:x:2:
-kmem:x:3:
-tty:x:4:
-tape:x:5:
-daemon:x:6:
-floppy:x:7:
-disk:x:8:
-lp:x:9:
-dialout:x:10:
-audio:x:11:
-video:x:12:
-utmp:x:13:
-usb:x:14:
-cdrom:x:15:</literal>
+bin:x:&gid-bin;:
+sys:x:&gid-sys;:
+kmem:x:&gid-kmem;:
+tty:x:&gid-tty;:
+tape:x:&gid-tape;:
+daemon:x:&gid-daemon;:
+floppy:x:&gid-floppy;:
+disk:x:&gid-disk;:
+lp:x:&gid-lp;:
+dialout:x:&gid-dialout;:
+audio:x:&gid-audio;:
+video:x:&gid-video;:
+utmp:x:&gid-utmp;:
+usb:x:&gid-usb;:
+cdrom:x:&gid-cdrom;:</literal>
EOF</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/general.ent b/BOOK/general.ent
index 5cbd0e0..c41ead3 100644
--- a/BOOK/general.ent
+++ b/BOOK/general.ent
@@ -56,3 +56,6 @@
<!ENTITY % patches-entities SYSTEM "patches.ent">
%patches-entities;
+
+<!ENTITY % uid-gid-entities SYSTEM "users_groups.ent">
+%uid-gid-entities;
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 36397c2..19cb4ca 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,9 @@
<para>August 08, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Migrated the UID and GID Map from Sysroot.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Removed Lilo and bin86 from x86_64-64 in favor
of GRUB.</para>
</listitem>
diff --git a/BOOK/users_groups.ent b/BOOK/users_groups.ent
new file mode 100644
index 0000000..b00dad3
--- /dev/null
+++ b/BOOK/users_groups.ent
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!-- User IDs for use throught the book -->
+
+<!ENTITY uid-root "0">
+<!ENTITY uid-bin "1">
+<!ENTITY uid-daemon "2">
+<!ENTITY uid-adm "3">
+<!ENTITY uid-lp "10">
+<!ENTITY uid-mail "30">
+<!ENTITY uid-news "31">
+<!ENTITY uid-operator "50">
+<!ENTITY uid-postmaster "51">
+<!ENTITY uid-nobody "65534">
+
+<!-- Group IDs for use throught the book -->
+
+<!ENTITY gid-root "0">
+<!ENTITY gid-bin "1">
+<!ENTITY gid-sys "2">
+<!ENTITY gid-kmem "3">
+<!ENTITY gid-tty "4">
+<!ENTITY gid-tape "5">
+<!ENTITY gid-daemon "6">
+<!ENTITY gid-floppy "7">
+<!ENTITY gid-disk "8">
+<!ENTITY gid-lp "9">
+<!ENTITY gid-dialout "10">
+<!ENTITY gid-audio "11">
+<!ENTITY gid-video "12">
+<!ENTITY gid-utmp "13">
+<!ENTITY gid-usb "14">
+<!ENTITY gid-cdrom "15">
+<!ENTITY gid-adm "16">
+<!ENTITY gid-console "17">
+<!ENTITY gid-cdrw "18">
+<!ENTITY gid-mail "30">
+<!ENTITY gid-news "31">
+<!ENTITY gid-users "1000">
+<!ENTITY gid-nogroup "65533">
+<!ENTITY gid-nobody "65534">
commit 34be04a6cab56e5abf0198256fbbb5f8c056c7f6
Author: Joe Ciccone <jciccone at gmail.com>
Date: Sun Aug 8 19:43:42 2010 -0400
Removed Lilo and bin86 from x86_64-64 in favor of GRUB.
diff --git a/BOOK/boot/x86_64-64-chapter.xml b/BOOK/boot/x86_64-64-chapter.xml
index b8443cd..ed84e73 100644
--- a/BOOK/boot/x86_64-64-chapter.xml
+++ b/BOOK/boot/x86_64-64-chapter.xml
@@ -22,15 +22,15 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/pwdgroup.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64/kernel.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bootloaders.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo-build.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo-build.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/settingenviron.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/flags.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/bootscripts.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/devices.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/changingowner.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>
+<!-- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/> -->
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/whatnext.xml"/>
</chapter>
diff --git a/BOOK/boot/x86_64-64/bin86.xml b/BOOK/boot/x86_64-64/bin86.xml
deleted file mode 100644
index 5c37d80..0000000
--- a/BOOK/boot/x86_64-64/bin86.xml
+++ /dev/null
@@ -1,64 +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-boot-bin86" role="wrap">
- <?dbhtml filename="bin86.html"?>
-
- <title>Bin86-&bin86-version;</title>
-
- <indexterm zone="ch-boot-bin86">
- <primary sortas="a-Bin86">Bin86</primary>
- <secondary>boot</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86_64-64/bin86.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Bin86</title>
-
- <para os="a">We are building Bin86 so that we can compile Lilo.
- Both <command>as86</command> and <command>ld86</command> need to
- run on the host system to assemble x86_64 code. We cannot
- compile the whole package like this, but fortunately these two
- programs are the only parts we require.</para>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86_64-64/bin86.xml"
- xpointer="xpointer(//*[@os='p1'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86_64-64/bin86.xml"
- xpointer="xpointer(//*[@os='p2'])"/>
-
- <para os="b">The Bin86 package does not contain a <command>configure
- </command> script. Natively compile only the necessary parts with:
- </para>
-
-<screen os="c"><userinput>make CC=gcc -C as as86
-make CC=gcc -C ld ld86</userinput></screen>
-
- <para os="e">Install the assembler and linker into
- <filename class="directory">/cross-tools</filename> so they will be in
- the PATH when we build Lilo, using prefixes to show that their
- output is not for a native system:</para>
-
-<screen os="f"><userinput>install -v -m 755 -s as/as86 /cross-tools/bin/${CLFS_TARGET}-as86
-install -v -m 755 -s ld/ld86 /cross-tools/bin/${CLFS_TARGET}-ld86</userinput></screen>
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-bin86" role="."/></para>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/boot/x86_64-64/lilo-build.xml b/BOOK/boot/x86_64-64/lilo-build.xml
deleted file mode 100644
index f827e0f..0000000
--- a/BOOK/boot/x86_64-64/lilo-build.xml
+++ /dev/null
@@ -1,53 +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-boot-lilo-build" role="wrap">
- <?dbhtml filename="lilo-build.html"?>
-
- <title>Lilo-&lilo-version;</title>
-
- <indexterm zone="ch-boot-lilo-build">
- <primary sortas="a-Lilo">Lilo</primary>
- <secondary>boot</secondary>
- </indexterm>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86_64-64/lilo.xml"
- xpointer="xpointer(//*[@role='package'])"/>
-
- <sect2 role="installation">
- <title>Installation of Lilo</title>
-
- <para os="a">The following patch forces Lilo to use our cross-compiler
- (except for a couple of utilities which run during the compile),
- and to look for <command>as86</command> and <command>ld86</command>
- under the names by which we installed them.</para>
-
-<screen os="b"><userinput>patch -Np1 -i ../&lilo-cross-x86_64-patch;</userinput></screen>
-
- <para os="c">Compile the program which installs the loader, linking
- it statically so that it does not have to link to host libraries
- when it runs:</para>
-
-<screen os="d"><userinput>make lilo.static</userinput></screen>
-
- <para os="e">Install only the parts we need:</para>
-
-<screen os="f"><userinput>install -v -m755 lilo.static /tools/bin
-install -v -m755 keytab-lilo.pl /tools/bin</userinput></screen>
-
- </sect2>
-
- <sect2 role="content">
- <title/>
-
- <para>Details on this package are located in <xref
- linkend="contents-lilo" role="."/></para>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/boot/x86_64-64/lilo.xml b/BOOK/boot/x86_64-64/lilo.xml
deleted file mode 100644
index bd7c808..0000000
--- a/BOOK/boot/x86_64-64/lilo.xml
+++ /dev/null
@@ -1,115 +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-boot-lilo">
- <?dbhtml filename="lilo.html"?>
-
- <title>Making the CLFS System Bootable</title>
-
- <indexterm zone="ch-boot-lilo">
- <primary sortas="a-Lilo">Lilo</primary>
- <secondary>configuring</secondary>
- </indexterm>
-
-<!--
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='n1'])"/>
--->
-
- <para os="a">You are nearly ready to boot to the new temporary system.
- One of the last things to do is to ensure that the system can be booted.
- The instructions below apply only to x86_64 machines on which Lilo is going
- to be installed. Information on using a pre-installed GRUB on machines
- currently running as x86 or x86_64 multilib should be available in the
- usual resource-specific locations for those architectures. If you have
- installed an x86 version of Lilo, these instructions should be modified
- to refer to the <command>lilo</command> and <command>keytab-lilo.pl
- </command> commands you installed on the host system.</para>
-
-<!--
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='b'])"/>
--->
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86_64-64/lilo.xml"
- xpointer="xpointer(//*[@os='c'])"/>
-
- <para os="d">Earlier, we compiled and installed the Lilo boot loader software
- in preparation for this step. The procedure involves writing a boot image to
- a specific location on the hard drive. If you have a floppy disk drive, or
- if you have installed a CD recording program, we highly recommend using
- <command>mkrescue</command> to create a Lilo boot floppy, or CD (using e.g.
- <command>dvdrecord</command> from dvdrtools) as a test and as a backup.</para>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86_64-64/lilo.xml"
- xpointer="xpointer(//*[@os='e'])"/>
-
-<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >${CLFS}/boot/uk.ktl</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86_64-64/lilo.xml"
- xpointer="xpointer(//*[@os='g'])"/>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86_64-64/lilo.xml"
- xpointer="xpointer(//*[@os='i'])"/>
-
-<screen os="j" role="nodump"><userinput>cat > ${CLFS}/etc/lilo.conf << "EOF"
-<literal># Begin /etc/lilo.conf
-# lilo.conf
-#
-# global options
-boot=/dev/<bootdisk>
-keytable=/boot/<keytable>
-lba32
-map=/boot/map
-prompt
-
-# set the name of the default image to boot
-default=clfs
-
-# define an image
-image=/boot/clfskernel&linux-version;
- label=clfs
- root=/dev/<partition>
- read-only
-# optionally add parameters to pass, e.g.
-# append="video=radeonfb:1024x768-16 at 70"
-
-# if you had an existing system, you could
-# add its details here.
-EOF</literal></userinput></screen>
-
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86_64-64/lilo.xml"
- xpointer="xpointer(//*[@os='k'])"/>
-
- <warning os="l">
- <para>The following command will overwrite any current boot loader.
- Do not run the command if this is not desired. If you have
- cross-compiled on a different machine from the target, you must
- install the bootloader on the target machine, the installed boot
- block is not a file which can be copied with <command>tar</command>.
- </para>
- </warning>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86_64-64/lilo.xml"
- xpointer="xpointer(//*[@os='m'])"/>
-
-<screen os="n" role="nodump"><userinput>/tools/bin/lilo.static -v -C ${CLFS}/etc/lilo.conf</userinput></screen>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../bootable/x86_64-64/lilo.xml"
- xpointer="xpointer(//*[@os='o'])"/>
-
-</sect1>
diff --git a/BOOK/bootable/x86/kernel.xml b/BOOK/bootable/x86/kernel.xml
index daeb07a..d702576 100644
--- a/BOOK/bootable/x86/kernel.xml
+++ b/BOOK/bootable/x86/kernel.xml
@@ -94,7 +94,7 @@
<para os="v">Issue the following command to install the kernel:</para>
-<screen><userinput>cp -v arch/i386/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp -v arch/i386/boot/bzImage /boot/vmlinuz-clfs-&linux-version;</userinput></screen>
<para os="w"><filename>System.map</filename> is a symbol file for the kernel.
It maps the function entry points of every function in the kernel API,
diff --git a/BOOK/bootable/x86_64-64-chapter.xml b/BOOK/bootable/x86_64-64-chapter.xml
index c81021b..42866c6 100644
--- a/BOOK/bootable/x86_64-64-chapter.xml
+++ b/BOOK/bootable/x86_64-64-chapter.xml
@@ -14,6 +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="x86_64/kernel.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
</chapter>
diff --git a/BOOK/bootable/x86_64-64/lilo.xml b/BOOK/bootable/x86_64-64/lilo.xml
deleted file mode 100644
index b7b4231..0000000
--- a/BOOK/bootable/x86_64-64/lilo.xml
+++ /dev/null
@@ -1,136 +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-lilo">
- <?dbhtml filename="lilo.html"?>
-
- <title>Making the CLFS System Bootable</title>
-
- <indexterm zone="ch-bootable-lilo">
- <primary sortas="a-Lilo">Lilo</primary>
- <secondary>configuring</secondary>
- </indexterm>
-
- <para os="a">Your shiny new CLFS system is almost complete. One of the
- last things to do is to ensure that the system can be properly booted. The
- instructions below apply only to computers using Lilo, which in the
- context of this book means x86_64 Pure64 systems. Information on
- <quote>boot loading</quote> for other architectures should be available in
- the usual resource-specific locations for those architectures.</para>
-
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/grub.xml"
- xpointer="xpointer(//*[@os='b'])"/>
-
- <para os="c">If you have multiple systems on your machine using a different
- bootloader such as GRUB, you may prefer to use that instead - consult the
- appropriate documentation. The rest of this section assumes you are going
- to use Lilo.</para>
-
- <para os="d">Earlier, we compiled and installed the Lilo boot loader
- software in preparation for this step. The procedure involves writing a
- boot image to a specific location on the hard drive. We highly recommend
- using <command>mkrescue</command> to create a Lilo boot CD (using e.g.
- <command>dvdrecord</command> from dvdrtools) as a backup (this requires
- loopback block device support in the kernel).</para>
-
- <para os="e">Normally, you interact with Lilo by using the cursor and
- <literal>enter</literal> keys to select from the available option(s), but
- sometimes it is necessary to add other boot options, such as e.g.
- 'init=/bin/bash' to debug boot failures. The more your keyboard layout
- differs from the US qwerty layout, the harder it becomes to type boot
- options unless Lilo knows about your keyboard layout. So, we will create a
- key table for Lilo (.ktl) file - at one point in the documentation these
- are referred to as .klt files, which may be a typo, but has been followed
- by some distros. The name, and location, are not important but it is
- conventional to put these in <filename class="directory">/boot</filename>
- with the name representing the key layout. For a British keyboard layout,
- the following command will achieve this:</para>
-
-<screen os="f" role="nodump"><userinput>keytab-lilo.pl uk >/boot/uk.ktl</userinput></screen>
-
- <para os="g">The argument to the command is the name of the keymap, or if
- necessary you can specify the full path to the keymap. Use whatever is
- appropriate for your keyboard.</para>
-
- <para os="h">When the x86 CLFS book used to include Lilo, it advised
- against running it from chroot in case the MBR became corrupted.
- Provided you have <filename class="directory">/proc</filename> mounted
- and have device special files for the disks, it seems to be safe to run
- recent versions of Lilo in chroot, although it is always possible that
- an updated bootloader, or defective configuration file, may render the
- system unbootable.</para>
-
- <para os="i">The next step is to create
- <filename>/etc/lilo.conf</filename>:</para>
-
-<screen os="j" role="nodump"><userinput>cat > /etc/lilo.conf << "EOF"
-<literal># Begin /etc/lilo.conf
-# lilo.conf
-#
-# global options
-boot=/dev/<bootdisk>
-keytable=/boot/<keytable>
-lba32
-map=/boot/map
-prompt
-
-# set the name of the default image to boot
-default=clfs
-
-# define an image
-image=/boot/clfskernel-&linux-version;
- label=clfs
- root=/dev/<partition>
- read-only
-# optionally add parameters to pass, e.g.
-# append="video=radeonfb:1024x768-16 at 70"
-
-# repeat for any other kernel images
-
-# optionally, add legacy operating systems
-# see man lilo.conf for examples
-EOF</literal></userinput></screen>
-
-
- <para os="k">Replace <bootdisk> with the name of the disk (or
- partition) on which the boot sector is to be written, e.g. sda.
- Replace <keytable> with the name of the keytable file you
- created, and <partition> with the name of the root partition
- for the new system.
- </para>
-
- <warning os="l">
- <para>The following command will overwrite the current boot loader.
- Do not run the command if this is not desired.</para>
- </warning>
-
- <para os="m">Run Lilo:</para>
-
-<screen os="n" role="nodump"><userinput>/sbin/lilo -v</userinput></screen>
-
- <note os='o'>
- <para>People who have been used to GRUB need to be aware that Lilo works
- differently - in particular, you cannot edit the available choices as you
- can in the <command>grub</command> shell, and Lilo records the block
- addresses of the kernels into the boot blocks each time
- <command>/sbin/lilo</command> is run. This means that when you compile a
- new kernel, you have to add it to <filename>/etc/lilo.conf</filename> and
- rerun <command>/sbin/lilo</command>. It also means that if you recompile
- an existing kernel and save it to the same name you still have to rerun
- <command>/sbin/lilo</command> in case it now occupies different blocks on
- the filesystem.</para>
- </note>
-
- <para os="p">If you are running multiple systems on this box and using
- Lilo, it is a good idea to ensure that each system is running the same
- version of Lilo, otherwise an old version may not be able to overwrite
- the bootloader from a newer version. You will also need to ensure that the
- copies of <filename>/etc/lilo.conf</filename> on each system are kept
- synchronised.</para>
-
-</sect1>
diff --git a/BOOK/bootable/x86_64/kernel.xml b/BOOK/bootable/x86_64/kernel.xml
index 34525b5..23afe93 100644
--- a/BOOK/bootable/x86_64/kernel.xml
+++ b/BOOK/bootable/x86_64/kernel.xml
@@ -93,7 +93,7 @@
href="../x86/kernel.xml"
xpointer="xpointer(//*[@os='v'])"/>
-<screen><userinput>cp arch/x86_64/boot/bzImage /boot/clfskernel-&linux-version;</userinput></screen>
+<screen><userinput>cp arch/x86_64/boot/bzImage /boot/vmlinuz-clfs-&linux-version;</userinput></screen>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../x86/kernel.xml"
diff --git a/BOOK/final-system/x86_64-64-chapter.xml b/BOOK/final-system/x86_64-64-chapter.xml
index 4d56669..8645ed9 100644
--- a/BOOK/final-system/x86_64-64-chapter.xml
+++ b/BOOK/final-system/x86_64-64-chapter.xml
@@ -69,8 +69,7 @@
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/texinfo.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/udev.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/vim.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/bin86.xml"/>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86_64-64/lilo.xml"/>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="x86/grub.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/aboutdebug.xml"/>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude" href="common/stripping.xml"/>
diff --git a/BOOK/final-system/x86_64-64/bin86.xml b/BOOK/final-system/x86_64-64/bin86.xml
deleted file mode 100644
index 5e343c4..0000000
--- a/BOOK/final-system/x86_64-64/bin86.xml
+++ /dev/null
@@ -1,118 +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-bin86" role="wrap">
- <?dbhtml filename="bin86.html"?>
-
- <title>Bin86-&bin86-version;</title>
-
- <indexterm zone="ch-system-bin86">
- <primary sortas="a-Bin86">Bin86</primary>
- </indexterm>
-
- <sect2 role="package">
- <title/>
-
- <para>The Bin86 package contains an assembler and linker to produce
- 16 or 32-bit 8086 machine code.</para>
-
- </sect2>
-
-
- <sect2 role="installation">
- <title>Installation of Bin86</title>
-
- <para os="a">We are building Bin86 because it is required to
- compile Lilo, and at the moment no other bootloader builds and runs
- on a pure64 system. If your machine has multiple systems (i.e. x86
- or multilib) you may prefer to use the bootloader from those
- systems, such as GRUB.</para>
-
- <para os="p1">This patch updates Bin86 to compile on x86_64:</para>
-
-<screen os="p2"><userinput>patch -Np1 -i ../&bin86-x86_64-patch;</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 PREFIX=/usr install</userinput></screen>
-
- </sect2>
-
- <sect2 id="contents-bin86" role="content">
- <title>Contents of Bin86</title>
-
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
-
- <seglistitem>
- <seg>as86, ld86, nm86, objdump86, size86</seg>
- </seglistitem>
- </segmentedlist>
-
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="as86">
- <term><command>as86</command></term>
- <listitem>
- <para>An 8086 assembler</para>
- <indexterm zone="ch-system-bin86 as86">
- <primary sortas="b-as86">as86</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="ld86">
- <term><command>ld86</command></term>
- <listitem>
- <para>A linker for the object files produced by as86</para>
- <indexterm zone="ch-system-bin86 ld86">
- <primary sortas="b-ld86">ld86</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="nm86">
- <term><command>nm86</command></term>
- <listitem>
- <para>Symbolic link to objdump86</para>
- <indexterm zone="ch-system-bin86 nm86">
- <primary sortas="b-nm86">nm86</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="objdump86">
- <term><command>objdump86</command></term>
- <listitem>
- <para>A utility to examine and report on the output from as86 and ld86</para>
- <indexterm zone="ch-system-bin86 objdump86">
- <primary sortas="b-objdump86">objdump86</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="size86">
- <term><command>size86</command></term>
- <listitem>
- <para>Symbolic link to objdump86</para>
- <indexterm zone="ch-system-bin86 size86">
- <primary sortas="b-size86">size86</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/final-system/x86_64-64/lilo.xml b/BOOK/final-system/x86_64-64/lilo.xml
deleted file mode 100644
index eb243fd..0000000
--- a/BOOK/final-system/x86_64-64/lilo.xml
+++ /dev/null
@@ -1,115 +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-lilo" role="wrap">
- <?dbhtml filename="lilo.html"?>
-
- <title>Lilo-&lilo-version;</title>
-
- <indexterm zone="ch-system-lilo">
- <primary sortas="a-Lilo">Lilo</primary>
- </indexterm>
-
- <sect2 role="package">
- <title/>
-
- <para os="a">The Lilo package contains the Linux Loader, a bootloader.</para>
-
- <para os="b">We have chosen to use Lilo because at the moment no other
- bootloader builds and runs on a pure64 system. If your machine has
- multiple systems (i.e. x86 or multilib) you may prefer to use the
- bootloader from the other system, such as GRUB.</para>
-
- </sect2>
-
- <sect2 role="installation">
- <title>Installation of Lilo</title>
-<!--
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../../final-system/x86/grub.xml"
- xpointer="xpointer(//*[@os='n1'])"/>
--->
- <para os="c">Compile the package:</para>
-
-<screen os="d"><userinput>make all</userinput></screen>
-
- <para os="e">Install the package:</para>
-
-<screen os="f"><userinput>make install</userinput></screen>
-
- <para>At the end of the installation the make install process will
- print a message stating that /sbin/lilo has to be executed to
- complete the update. Don't do this as it has no use. The
- /etc/lilo.conf isn't present yet. We will complete the
- installation of Lilo in chapter 12.</para>
-
- </sect2>
-
- <sect2 id="contents-lilo" role="content">
- <title>Contents of Lilo</title>
-
- <segmentedlist>
- <segtitle>Installed programs</segtitle>
-
- <seglistitem>
- <seg>diag1.img, lilo, mkrescue, keytab-lilo.pl</seg>
- </seglistitem>
- </segmentedlist>
-
- <variablelist>
- <bridgehead renderas="sect3">Short Descriptions</bridgehead>
- <?dbfo list-presentation="list"?>
- <?dbhtml list-presentation="table"?>
-
- <varlistentry id="diag1.img">
- <term><command>diag1.img</command></term>
- <listitem>
- <para>A diagnostic disk boot image.</para>
- <indexterm zone="ch-system-lilo diag1.img">
- <primary sortas="b-diag1.img">diag1.img</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="lilo">
- <term><command>lilo</command></term>
- <listitem>
- <para>Lilo installs the Linux boot loader which is used to start
- a Linux system.</para>
- <indexterm zone="ch-system-lilo lilo">
- <primary sortas="b-lilo">lilo</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="mkrescue">
- <term><command>mkrescue</command></term>
- <listitem>
- <para>A script to make a bootable floppy or CD image using the
- default settings from the configuration file.</para>
- <indexterm zone="ch-system-lilo mkrescue">
- <primary sortas="b-mkrescue">mkrescue</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- <varlistentry id="keytab-lilo.pl">
- <term><command>keytab-lilo.pl</command></term>
- <listitem>
- <para>A perl script to create a keyboard translation table to
- allow the bootloader to process keystrokes to match your
- keyboard layout.</para>
- <indexterm zone="ch-system-lilo keytab-lilo.pl">
- <primary sortas="b-keytab-lilo.pl">keytab-lilo.pl</primary>
- </indexterm>
- </listitem>
- </varlistentry>
-
- </variablelist>
-
- </sect2>
-
-</sect1>
diff --git a/BOOK/introduction/common/changelog.xml b/BOOK/introduction/common/changelog.xml
index 40e9ee4..36397c2 100644
--- a/BOOK/introduction/common/changelog.xml
+++ b/BOOK/introduction/common/changelog.xml
@@ -40,6 +40,10 @@
<para>August 08, 2010</para>
<itemizedlist>
<listitem>
+ <para>[jciccone] - Removed Lilo and bin86 from x86_64-64 in favor
+ of GRUB.</para>
+ </listitem>
+ <listitem>
<para>[jciccone] - Updated the GCC Pure64 Patch to -2. -1 has
inconsistancies and errors.</para>
</listitem>
diff --git a/BOOK/materials/x86_64-64/packages.xml b/BOOK/materials/x86_64-64/packages.xml
index 19ca82d..adc4dcc 100644
--- a/BOOK/materials/x86_64-64/packages.xml
+++ b/BOOK/materials/x86_64-64/packages.xml
@@ -12,23 +12,9 @@
<variablelist role="materials">
- <varlistentry>
- <term>Bin86 (&bin86-version;) - <token>&bin86-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&bin86-home;"/></para>
- <para>Download: <ulink url="&bin86-url;"/></para>
- <para>MD5 sum: <literal>&bin86-md5;</literal></para>
- </listitem>
- </varlistentry>
-
- <varlistentry>
- <term>Lilo (&lilo-version;) - <token>&lilo-size;</token>:</term>
- <listitem>
- <para>Home page: <ulink url="&lilo-home;"/></para>
- <para>Download: <ulink url="&lilo-url;"/></para>
- <para>MD5 sum: <literal>&lilo-md5;</literal></para>
- </listitem>
- </varlistentry>
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../x86/packages.xml"
+ xpointer="xpointer(//*[@os='grub'])"/>
</variablelist>
diff --git a/BOOK/materials/x86_64-64/patches.xml b/BOOK/materials/x86_64-64/patches.xml
index db8755b..02f84cd 100644
--- a/BOOK/materials/x86_64-64/patches.xml
+++ b/BOOK/materials/x86_64-64/patches.xml
@@ -12,15 +12,6 @@
<variablelist role="materials">
- <varlistentry os="bin86 x86_64-patch">
- <term>Bin86 x86_64 Patch - <token>&bin86-x86_64-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&bin86-x86_64-patch;"/></para>
- <para>MD5 sum: <literal>&bin86-x86_64-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
<varlistentry os="gcc-pure64-patch">
<term>GCC Pure 64 Patch - <token>&gcc-pure64-patch-size;</token>:</term>
<listitem>
@@ -39,15 +30,6 @@
</listitem>
</varlistentry>
- <varlistentry os="lilo-cross-x86_64-patch">
- <term>Lilo x86_64 Cross Compile Patch - <token>&lilo-cross-x86_64-patch-size;</token>:</term>
- <listitem>
- <para>Download: <ulink
- url="&patches-root;&lilo-cross-x86_64-patch;"/></para>
- <para>MD5 sum: <literal>&lilo-cross-x86_64-patch-md5;</literal></para>
- </listitem>
- </varlistentry>
-
</variablelist>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
diff --git a/BOOK/materials/x86_64/packages.xml b/BOOK/materials/x86_64/packages.xml
index e08be60..a830478 100644
--- a/BOOK/materials/x86_64/packages.xml
+++ b/BOOK/materials/x86_64/packages.xml
@@ -10,9 +10,13 @@
<title>Additional Packages for x86_64 Multilib</title>
- <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
- href="../x86/packages.xml"
- xpointer="xpointer(//*[@role='materials'])"/>
+ <variablelist role="materials">
+
+ <xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
+ href="../x86/packages.xml"
+ xpointer="xpointer(//*[@os='grub'])"/>
+
+ </variablelist>
<xi:include xmlns:xi="http://www.w3.org/2003/XInclude"
href="../common/packages.xml"
diff --git a/BOOK/packages.ent b/BOOK/packages.ent
index 934c37d..1c65412 100644
--- a/BOOK/packages.ent
+++ b/BOOK/packages.ent
@@ -36,12 +36,6 @@
<!ENTITY bash-md5 "9800d8724815fd84994d9be65ab5e7b8">
<!ENTITY bash-home "&gnu-software;bash">
-<!ENTITY bin86-version "0.16.17">
-<!ENTITY bin86-size "148 KB">
-<!ENTITY bin86-url "http://homepage.ntlworld.com/robert.debath/dev86/bin86-&bin86-version;.tar.gz">
-<!ENTITY bin86-md5 "c9e8d72dd2e7457b52d0e3164fc199a1">
-<!ENTITY bin86-home "http://homepage.ntlworld.com/robert.debath">
-
<!ENTITY binutils-version "2.20.1">
<!ENTITY binutils-size "17,092 KB">
<!ENTITY binutils-url "&gnu;binutils/binutils-&binutils-version;.tar.bz2">
@@ -252,13 +246,6 @@
<!ENTITY libtool-md5 "2eba13ecd07653d0e34d4efe8e2974d8">
<!ENTITY libtool-home "&gnu-software;libtool">
-<!ENTITY lilo-version "22.8">
-<!ENTITY lilo-size "427 KB">
-<!ENTITY lilo-url "ftp://metalab.unc.edu/pub/Linux/system/boot/lilo/lilo-&lilo-version;.src.tar.gz">
-<!ENTITY lilo-md5 "72765f2aafd20e23ecf07ebd22baeec7">
-<!-- appears to be dead <!ENTITY lilo-home "http://lilo.go.dyndns.org"> -->
-<!ENTITY lilo-home " ">
-
<!ENTITY linux-dl-version "2.6">
<!ENTITY linux-version "2.6.35">
diff --git a/BOOK/patches.ent b/BOOK/patches.ent
index 3082c8b..b10a374 100644
--- a/BOOK/patches.ent
+++ b/BOOK/patches.ent
@@ -161,13 +161,3 @@
<!ENTITY silo-fixes-patch "silo-&silo-version;-fixes-1.patch">
<!ENTITY silo-fixes-patch-md5 "03e8897c5d33d0e6ee81e8e8aeeb772f">
<!ENTITY silo-fixes-patch-size "696 KB">
-
-<!-- Start of x86/x86_64 patches -->
-
-<!ENTITY bin86-x86_64-patch "bin86-&bin86-version;-x86_64-1.patch">
-<!ENTITY bin86-x86_64-patch-md5 "92bdce7b0655cd2e9f83c83fc56d128e">
-<!ENTITY bin86-x86_64-patch-size "1 KB">
-
-<!ENTITY lilo-cross-x86_64-patch "lilo-&lilo-version;-cross_compile_x86_64-2.patch">
-<!ENTITY lilo-cross-x86_64-patch-md5 "a7440e18ef7fa6c5d1c6181dc0cc4d10">
-<!ENTITY lilo-cross-x86_64-patch-size "2 KB">
diff --git a/patches/bin86-0.16.17-x86_64-1.patch b/patches/bin86-0.16.17-x86_64-1.patch
deleted file mode 100644
index 152413e..0000000
--- a/patches/bin86-0.16.17-x86_64-1.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-Submitted By: Ken Moffat <ken at kenmoffat.uklinux.net>
-Date: 2005-06-28
-Initial Package Version: 0.16.14
-Upstream Status: Submitted Upstream
-Origin: from ROCK Linux
-Description: Allows bin86 to compile on x86_64, which permits lilo to
- be used in a 64-bit system. I'm dubious about ROCK's attempts to
- automatically add dual-licensing to all their patches, but bin86 is
- already GPL'd. I've heard from the maintainer that this will be
- included in the next upload.
-
-
-# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
-#
-# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
-# Please add additional copyright information _after_ the line containing
-# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
-# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
-#
-# ROCK Linux: rock-src/package/x86/bin86/x86_64.patch
-# ROCK Linux is Copyright (C) 1998 - 2005 Clifford Wolf
-#
-# This patch file is dual-licensed. It is available under the license the
-# patched project is licensed under, as long as it is an OpenSource license
-# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms
-# of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
-#
-# --- ROCK-COPYRIGHT-NOTE-END ---
-
-diff -urN bin86-0.16.14-orig/ld/x86_aout.h bin86-0.16.14/ld/x86_aout.h
---- bin86-0.16.14-orig/ld/x86_aout.h 2004-11-07 20:07:31.506442000 +0100
-+++ bin86-0.16.14/ld/x86_aout.h 2004-11-07 20:07:41.106982496 +0100
-@@ -12,6 +12,9 @@
- #if defined(i386) || defined(__BCC__) || defined(MSDOS)
- typedef long Long;
- #define __OUT_OK 1
-+#elif defined(__x86_64__)
-+typedef int Long;
-+#define __OUT_OK 1
- #else
- typedef char Long[4];
- #endif
diff --git a/patches/lilo-22.8-cross_compile_x86_64-2.patch b/patches/lilo-22.8-cross_compile_x86_64-2.patch
deleted file mode 100644
index 5da7dd2..0000000
--- a/patches/lilo-22.8-cross_compile_x86_64-2.patch
+++ /dev/null
@@ -1,88 +0,0 @@
-Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
-Date: 2006-03-11
-Initial Package Version: 22.7.1
-Upstream Status: Not submitted, purely for cross-compiling for x86_64(-64)
-Origin: Self
-Description: Allows lilo-static to be built with a cross-compiler (plus
- cross as86, ld86).
-
-diff -Nru lilo-22.8-ori/checkit lilo-22.8/checkit
---- lilo-22.8-ori/checkit 2006-08-13 21:24:45.000000000 +0200
-+++ lilo-22.8/checkit 2007-02-27 07:53:07.000000000 +0100
-@@ -58,29 +58,29 @@
-
- echo
- echo AS86 version $dev or later is required
--as86 -v 1>foo1 2>foo2
-+x86_64-unknown-linux-gnu-as86 -v 1>foo1 2>foo2
- A=`cat foo1 foo2 | grep version | cut -d " " -f 3`
- rm -f foo1 foo2
- if [ -z $A ]; then
-- echo as86 is not present
-+ echo x86_64-unknown-linux-gnu-as86 is not present
- ret=1
- else
- vers_min $A $dev
-- echo as86 version $A
-+ echo x86_64-unknown-linux-gnu-as86 version $A
- if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi
- fi
-
- echo
- echo LD86 version $dev or later is required
--ld86 -v 1>foo1 2>foo2
-+x86_64-unknown-linux-gnu-ld86 -v 1>foo1 2>foo2
- L=`cat foo1 foo2 | grep version | cut -d " " -f 3`
- rm -f foo1 foo2
- if [ -z $L ]; then
-- echo ld86 is not present
-+ echo x86_64-unknown-linux-gnu-ld86 is not present
- ret=1
- else
- vers_min $L $dev
-- echo ld86 version $L
-+ echo x86_64-unknown-linux-gnu-ld86 version $L
- if [ $rc = 0 ]; then echo OKAY; else echo ERROR; ret=1; fi
- fi
-
-diff -Nru lilo-22.8-ori/Makefile lilo-22.8/Makefile
---- lilo-22.8-ori/Makefile 2007-02-19 18:15:10.000000000 +0100
-+++ lilo-22.8/Makefile 2007-02-27 07:57:03.000000000 +0100
-@@ -101,18 +101,18 @@
- cat $$ROOT/etc/lilo.defines; else echo $(CONFIG); fi ) | \
- sed 's/-D/-DLCF_/g'`
- LILO=-DLILO=0xbb920890
--KVER=`if [ -f /usr/include/linux/version.h ]; then echo -DHAS_VERSION_H; fi`
--HDM=`if [ -f /usr/include/libdevmapper.h ]; then echo -DHAS_LIBDEVMAPPER_H; fi`
--DEVMAPPER=`if [ -f /usr/include/libdevmapper.h ]; then echo "-ldevmapper"; fi`
-+KVER=
-+HDM=
-+DEVMAPPER=
-
- TMP=_TmP_
-
-
- SHELL=/bin/sh
--CC=gcc
-+#CC=gcc
- CPP=$(CC) -E
--AS86=as86 -0 -a
--LD86=ld86 -0
-+AS86=x86_64-unknown-linux-gnu-as86 -0 -a
-+LD86=x86_64-unknown-linux-gnu-ld86 -0
- NASM=nasm
- G=`cat foo1 foo2 | grep version | cut -d " " -f 3`
-
-@@ -471,10 +471,10 @@
- mv tmp_make Makefile
-
- version: common.c lilo.h common.h
-- $(CC) $(CFLAGS) -DSHS_MAIN -o version common.c
-+ gcc $(CFLAGS) -DSHS_MAIN -o version common.c
-
- mkloader: temp.c
-- $(CC) $(CFLAGS) -DLILO_BINARY -o mkloader temp.c
-+ gcc $(CFLAGS) -DLILO_BINARY -o mkloader temp.c
-
- tidy:
- rm -f core $(LIS) *.shs *.crc $(TMP)*
-----------------------------------------------------------------------
Summary of changes:
BOOK/boot/common/changingowner.xml | 9 ++-
BOOK/boot/common/fstab.xml | 2 +-
BOOK/boot/common/pwdgroup.xml | 66 ++++++------
BOOK/boot/x86_64-64-chapter.xml | 6 +-
BOOK/boot/x86_64-64/bin86.xml | 64 -----------
BOOK/boot/x86_64-64/lilo-build.xml | 53 ---------
BOOK/boot/x86_64-64/lilo.xml | 115 --------------------
BOOK/bootable/common/fstab.xml | 2 +-
BOOK/bootable/x86/kernel.xml | 2 +-
BOOK/bootable/x86_64-64-chapter.xml | 2 +-
BOOK/bootable/x86_64-64/lilo.xml | 136 ------------------------
BOOK/bootable/x86_64/kernel.xml | 2 +-
BOOK/chroot/common/devices.xml | 2 +-
BOOK/chroot/common/kernfs.xml | 2 +-
BOOK/chroot/common/pwdgroup.xml | 32 +++---
BOOK/final-system/x86_64-64-chapter.xml | 3 +-
BOOK/final-system/x86_64-64/bin86.xml | 118 --------------------
BOOK/final-system/x86_64-64/lilo.xml | 115 --------------------
BOOK/general.ent | 3 +
BOOK/introduction/common/changelog.xml | 7 ++
BOOK/materials/x86_64-64/packages.xml | 20 +---
BOOK/materials/x86_64-64/patches.xml | 18 ---
BOOK/materials/x86_64/packages.xml | 10 ++-
BOOK/packages.ent | 13 ---
BOOK/patches.ent | 10 --
BOOK/users_groups.ent | 41 +++++++
patches/bin86-0.16.17-x86_64-1.patch | 44 --------
patches/lilo-22.8-cross_compile_x86_64-2.patch | 88 ---------------
28 files changed, 129 insertions(+), 856 deletions(-)
delete mode 100644 BOOK/boot/x86_64-64/bin86.xml
delete mode 100644 BOOK/boot/x86_64-64/lilo-build.xml
delete mode 100644 BOOK/boot/x86_64-64/lilo.xml
delete mode 100644 BOOK/bootable/x86_64-64/lilo.xml
delete mode 100644 BOOK/final-system/x86_64-64/bin86.xml
delete mode 100644 BOOK/final-system/x86_64-64/lilo.xml
create mode 100644 BOOK/users_groups.ent
delete mode 100644 patches/bin86-0.16.17-x86_64-1.patch
delete mode 100644 patches/lilo-22.8-cross_compile_x86_64-2.patch
hooks/post-receive
--
Cross-LFS Book
More information about the Clfs-commits
mailing list