From 955533beaf30ff65be18b3e5c1e3909928dd169a Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Thu, 11 Sep 2003 21:35:35 +0000 Subject: [PATCH] Removed LILO and Bin86. Replaced them with Grub git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@2774 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- appendixa/appendixa.xml | 3 +-- appendixa/bin86-dep.xml | 16 ------------ appendixa/bin86-desc.xml | 34 ------------------------- appendixa/bin86-down.xml | 7 ----- appendixa/bin86-shortdesc.xml | 14 ---------- appendixa/bin86.xml | 13 ---------- appendixa/grub-dep.xml | 9 +++++++ appendixa/grub-desc.xml | 7 +++++ appendixa/grub-down.xml | 7 +++++ appendixa/grub-shortdesc.xml | 5 ++++ appendixa/grub.xml | 13 ++++++++++ appendixa/lilo-dep.xml | 18 ------------- appendixa/lilo-desc.xml | 23 ----------------- appendixa/lilo-down.xml | 7 ----- appendixa/lilo-shortdesc.xml | 12 --------- appendixa/lilo.xml | 13 ---------- appendixb/appendixb.xml | 9 ------- chapter01/changelog.xml | 7 +++++ chapter04/chapter04.xml | 12 ++++----- chapter06/bin86-inst.xml | 26 ------------------- chapter06/bin86.xml | 12 --------- chapter06/chapter06.xml | 3 +-- chapter06/grub-inst.xml | 36 ++++++++++++++++++++++++++ chapter06/grub.xml | 12 +++++++++ chapter06/lilo-inst.xml | 28 -------------------- chapter06/lilo.xml | 12 --------- chapter08/chapter08.xml | 2 +- chapter08/grub.xml | 8 ++++++ chapter08/lilo.xml | 48 ----------------------------------- entities/bin86.ent | 20 --------------- entities/grub.ent | 25 ++++++++++++++++++ entities/lilo.ent | 22 ---------------- index.xml | 6 ++--- 33 files changed, 140 insertions(+), 349 deletions(-) delete mode 100644 appendixa/bin86-dep.xml delete mode 100644 appendixa/bin86-desc.xml delete mode 100644 appendixa/bin86-down.xml delete mode 100644 appendixa/bin86-shortdesc.xml delete mode 100644 appendixa/bin86.xml create mode 100644 appendixa/grub-dep.xml create mode 100644 appendixa/grub-desc.xml create mode 100644 appendixa/grub-down.xml create mode 100644 appendixa/grub-shortdesc.xml create mode 100644 appendixa/grub.xml delete mode 100644 appendixa/lilo-dep.xml delete mode 100644 appendixa/lilo-desc.xml delete mode 100644 appendixa/lilo-down.xml delete mode 100644 appendixa/lilo-shortdesc.xml delete mode 100644 appendixa/lilo.xml delete mode 100644 chapter06/bin86-inst.xml delete mode 100644 chapter06/bin86.xml create mode 100644 chapter06/grub-inst.xml create mode 100644 chapter06/grub.xml delete mode 100644 chapter06/lilo-inst.xml delete mode 100644 chapter06/lilo.xml create mode 100644 chapter08/grub.xml delete mode 100644 chapter08/lilo.xml delete mode 100644 entities/bin86.ent create mode 100644 entities/grub.ent delete mode 100644 entities/lilo.ent diff --git a/appendixa/appendixa.xml b/appendixa/appendixa.xml index d51cda4fe..5328e7c34 100644 --- a/appendixa/appendixa.xml +++ b/appendixa/appendixa.xml @@ -6,7 +6,6 @@ &aa-autoconf; &aa-automake; &aa-bash; -&aa-bin86; &aa-binutils; &aa-bison; &aa-bzip2; @@ -23,6 +22,7 @@ &aa-glibc; &aa-grep; &aa-groff; +&aa-grub; &aa-gzip; &aa-inetutils; &aa-kbd; @@ -30,7 +30,6 @@ &aa-bootscripts; &aa-lfs-utils; &aa-libtool; -&aa-lilo; &aa-kernel; &aa-m4; &aa-make; diff --git a/appendixa/bin86-dep.xml b/appendixa/bin86-dep.xml deleted file mode 100644 index 753bf8b97..000000000 --- a/appendixa/bin86-dep.xml +++ /dev/null @@ -1,16 +0,0 @@ -   - - -Bin86 Installation Dependencies - -(Last checked against version &bin86-depversion;.) - -Bash: sh -Binutils: as, ld, strip -Fileutils: chmod, install, ln, mv -Gcc: cc, cc1, collect2, cpp0 -Make: make -Sed: sed - - - diff --git a/appendixa/bin86-desc.xml b/appendixa/bin86-desc.xml deleted file mode 100644 index a3aae9a71..000000000 --- a/appendixa/bin86-desc.xml +++ /dev/null @@ -1,34 +0,0 @@ -   - -Descriptions - -(Last checked against version &bin86-contversion;.) - -Program file descriptions - -as86 -as86 is an assembler for the 8086...80386 -processors. - -as86_encap -as86_encap is a shell script to call as86 and convert the created binary -into a C file prog.v to be included in or linked with programs like boot -block installers. - -ld86 -ld86 understands only the object files produced by the as86 assembler. It -can link them into either an impure or a -separate I&D executable. - -nm86 -The symbol table of the binary file. - -objdump86 -Dumps detailed information about a binary file. - -size86 -Summary sizes of the data in a binary file. - - - - diff --git a/appendixa/bin86-down.xml b/appendixa/bin86-down.xml deleted file mode 100644 index eb0d392f2..000000000 --- a/appendixa/bin86-down.xml +++ /dev/null @@ -1,7 +0,0 @@ - -Official Download Location - -Bin86 (&bin86-version;): - - - diff --git a/appendixa/bin86-shortdesc.xml b/appendixa/bin86-shortdesc.xml deleted file mode 100644 index ff3558b9a..000000000 --- a/appendixa/bin86-shortdesc.xml +++ /dev/null @@ -1,14 +0,0 @@ -Contents of Bin86 - -(Last checked against version &bin86-contversion;.) - -Bin86 is a simple assembler and linker for 8086 - 80386 machine - code. - -Bin86 installs the following: - -Program Files -as86, as86_encap, ld86, nm86 (link to objdump86), objdump86 and -size86 (link to objdump86) - - diff --git a/appendixa/bin86.xml b/appendixa/bin86.xml deleted file mode 100644 index e94c6fa4d..000000000 --- a/appendixa/bin86.xml +++ /dev/null @@ -1,13 +0,0 @@ - -Bin86 - - -For installation instructions see . - -&aa-bin86-down; -&aa-bin86-shortdesc; -&aa-bin86-desc; -&aa-bin86-dep; - - - diff --git a/appendixa/grub-dep.xml b/appendixa/grub-dep.xml new file mode 100644 index 000000000..70d9a27bb --- /dev/null +++ b/appendixa/grub-dep.xml @@ -0,0 +1,9 @@ +   + + +Grub Installation Dependencies + +(To be determined) + + + diff --git a/appendixa/grub-desc.xml b/appendixa/grub-desc.xml new file mode 100644 index 000000000..a65ab0849 --- /dev/null +++ b/appendixa/grub-desc.xml @@ -0,0 +1,7 @@ +   + +Descriptions + +(To be determined) + + diff --git a/appendixa/grub-down.xml b/appendixa/grub-down.xml new file mode 100644 index 000000000..986e0ba0b --- /dev/null +++ b/appendixa/grub-down.xml @@ -0,0 +1,7 @@ + +Official Download Location + +Grub (&grub-version;): + + + diff --git a/appendixa/grub-shortdesc.xml b/appendixa/grub-shortdesc.xml new file mode 100644 index 000000000..194130d1f --- /dev/null +++ b/appendixa/grub-shortdesc.xml @@ -0,0 +1,5 @@ +Contents of Grub + +(To be determined) + + diff --git a/appendixa/grub.xml b/appendixa/grub.xml new file mode 100644 index 000000000..1d109a7a8 --- /dev/null +++ b/appendixa/grub.xml @@ -0,0 +1,13 @@ + +Grub + + +For installation instructions see . + +&aa-grub-down; +&aa-grub-shortdesc; +&aa-grub-desc; +&aa-grub-dep; + + + diff --git a/appendixa/lilo-dep.xml b/appendixa/lilo-dep.xml deleted file mode 100644 index 5359a59e0..000000000 --- a/appendixa/lilo-dep.xml +++ /dev/null @@ -1,18 +0,0 @@ -   - - -Lilo Installation Dependencies - -(Last checked against version &lilo-depversion;.) - -Bash: sh -Bin86: as86, ld86 -Binutils: as, ld, strip -Fileutils: cp, dd, ln -Gcc: cc, cc1, collect2, cpp0 -Make: make -Sed: sed -Textutils: cat - - - diff --git a/appendixa/lilo-desc.xml b/appendixa/lilo-desc.xml deleted file mode 100644 index 26ee78806..000000000 --- a/appendixa/lilo-desc.xml +++ /dev/null @@ -1,23 +0,0 @@ -   - -Descriptions - -(Last checked against version &lilo-contversion;.) - -Program file descriptions - -lilo -lilo installs the Linux boot loader which is used to start a Linux -system. - -mkrescue -mkrescue makes a bootable rescue floppy using the existing kernel -and any initial ramdisk. - -keytab-lilo.pl -keytab-lilo.pl compiles keytable definitions into a format which -lilo can use in order to set the keyboard type during boot. - - - - diff --git a/appendixa/lilo-down.xml b/appendixa/lilo-down.xml deleted file mode 100644 index 8160108fa..000000000 --- a/appendixa/lilo-down.xml +++ /dev/null @@ -1,7 +0,0 @@ - -Official Download Location - -Lilo (&lilo-version;): - - - diff --git a/appendixa/lilo-shortdesc.xml b/appendixa/lilo-shortdesc.xml deleted file mode 100644 index 4ad9f5712..000000000 --- a/appendixa/lilo-shortdesc.xml +++ /dev/null @@ -1,12 +0,0 @@ -Contents of Lilo - -(Last checked against version &lilo-contversion;.) - -Lilo is the LInux LOader. - -Lilo installs the following: - -Program Files -lilo, mkrescue and keytab-lilo.pl - - diff --git a/appendixa/lilo.xml b/appendixa/lilo.xml deleted file mode 100644 index d389a7dab..000000000 --- a/appendixa/lilo.xml +++ /dev/null @@ -1,13 +0,0 @@ - -Lilo - - -For installation instructions see . - -&aa-lilo-down; -&aa-lilo-shortdesc; -&aa-lilo-desc; -&aa-lilo-dep; - - - diff --git a/appendixb/appendixb.xml b/appendixb/appendixb.xml index 92247c5ca..c420ab670 100644 --- a/appendixb/appendixb.xml +++ b/appendixb/appendixb.xml @@ -20,8 +20,6 @@ to which it belongs. arch : arp : as : -as86 : -as86_encap : attrs : autoconf : autoheader : @@ -250,7 +248,6 @@ to which it belongs. kbdrate : kbd_mode : kernelversion : -keytab-lilo.pl : kill : kill : killall : @@ -262,7 +259,6 @@ to which it belongs. lastlog : ld : ld.so : -ld86 : ldconfig : ldd : lddlibc4 : @@ -321,7 +317,6 @@ to which it belongs. libutil : libuuid : libz : -lilo : line : link : linux : @@ -373,7 +368,6 @@ to which it belongs. mklost+found : mknod : mkpasswd : -mkrescue : mkswap : mktemp : mk_cmds : @@ -413,14 +407,12 @@ to which it belongs. nisdomainname : nl : nm : -nm86 : nohup : nroff : nscd : nscd_nischeck : objcopy : objdump : -objdump86 : od : oldps : Opcode : @@ -546,7 +538,6 @@ to which it belongs. shtags.pl : shutdown : size : -size86 : skill : slattach : sleep : diff --git a/chapter01/changelog.xml b/chapter01/changelog.xml index a1cea4f90..fef8ac631 100644 --- a/chapter01/changelog.xml +++ b/chapter01/changelog.xml @@ -56,6 +56,8 @@ gcc-2.95.3-2.patch gcc-3.3.1-no_fixincludes-2.patch gcc-3.3.1-specs.patch +grub-0.93 +grub-0.93-gcc33-1.patch inetutils-1.4.2 lfs-utils-0.3 ncurses-5.3-etip.patch @@ -67,12 +69,14 @@ Removed: +bin86-0.16.3 fileutils-4.1 fileutils-4.1.patch findutils-4.1-segfault.patch findutils-4.1.patch gcc-3.2.3-mmap_test.patch gzip-1.2.4b.patch +lilo-22.2 netkit-base-0.17 sh-utils-2.0 sh-utils-2.0.patch @@ -83,6 +87,9 @@ +September 11th, 2003 [gerard]: Removed Bin86 and LILO and +replaced it with Grub. + September 11th, 2003 [jeremy]: Dropped non-toolchain tests to optional actions. Added a note to use the wiki for failed tests. diff --git a/chapter04/chapter04.xml b/chapter04/chapter04.xml index 4fe6465cb..e4bf547d9 100644 --- a/chapter04/chapter04.xml +++ b/chapter04/chapter04.xml @@ -54,9 +54,6 @@ Automake (&automake-version;) - &automake-size;: Bash (&bash-version;) - &bash-size;: -Bin86 (&bin86-version;) - &bin86-size;: - - Binutils (&binutils-version;) - &binutils-size;: @@ -123,6 +120,9 @@ Grep (&grep-version;) - &grep-size;: Groff (&groff-version;) - &groff-size;: +Grub (&grub-version;) - &grub-size;: + + Gzip (&gzip-version;) - &gzip-size;: @@ -144,9 +144,6 @@ Lfs-Utils (&lfs-utils-version;) - &lfs-utils-size;: Libtool (&libtool-version;) - &libtool-size;: -Lilo (&lilo-version;) - &lilo-size;: - - Linux (&kernel-version;) - &kernel-size;: @@ -271,6 +268,9 @@ GCC Suppress Libiberty Patch: Glibc Sscanf Patch: +Grub Patch (&grub-patch-version;) - &grub-patch-size;: + + Kbd Patch (&kbd-patch-version;) - &kbd-patch-size;: diff --git a/chapter06/bin86-inst.xml b/chapter06/bin86-inst.xml deleted file mode 100644 index ee2fb4c3a..000000000 --- a/chapter06/bin86-inst.xml +++ /dev/null @@ -1,26 +0,0 @@ -   - - -Installation of Bin86 - -This package is only needed if you decide to use Lilo on your LFS -system. If you're going to use something else like Grub you won't need -bin86. Check the documentation for your favorite boot loader to see if -you need the bin86 package (usually only ld86 and/or as86 from this -package are required). - -Keep in mind, though, that it's not just boot -loaders that use the bin86 package. There is always the chance that some -other package needs programs from this package, so keep that in mind if -you decide to skip this. - -Compile the package: - -make - -And install it: - -make PREFIX=/usr install - - - diff --git a/chapter06/bin86.xml b/chapter06/bin86.xml deleted file mode 100644 index 34b663707..000000000 --- a/chapter06/bin86.xml +++ /dev/null @@ -1,12 +0,0 @@ - -Installing Bin86-&bin86-version; - - -Estimated build time: &bin86-time; -Estimated required disk space: &bin86-compsize; - -&aa-bin86-shortdesc; -&aa-bin86-dep; -&c6-bin86-inst; - - diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index b4d9ad8a9..fc943e5f6 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -41,16 +41,15 @@ &c6-bash; &c6-file; &c6-libtool; -&c6-bin86; &c6-bzip2; &c6-ed; &c6-kbd; &c6-diffutils; &c6-e2fsprogs; &c6-grep; +&c6-grub; &c6-gzip; &c6-man; -&c6-lilo; &c6-make; &c6-modutils; &c6-patch; diff --git a/chapter06/grub-inst.xml b/chapter06/grub-inst.xml new file mode 100644 index 000000000..de889e0d9 --- /dev/null +++ b/chapter06/grub-inst.xml @@ -0,0 +1,36 @@ +   + + +Installation of Grub + +Grub needs a patch applied that fixes a compile problem with +GCC-3.3.1: + +patch -Np1 -i ../grub-&grub-patch-version;.patch + +Prepare Grub for compilation: + +./configure --prefix=/usr + +Compile the package: + +make + +And install it: + +make install +mkdir /boot/grub +cp /usr/share/grub/i386-pc/stage{1,2} /boot/grub + +Replace i386-pc with whatever +directory is appropriate for your hardware. + +The i386-pc directory also +contains a number of *stage1_5 files, different ones +for different filesystems. Have a look at the ones available and copy the +appropriate ones to the /boot/grub +directory. Most people will copy the e2fs_stage1_5 +and/or reiserfs_stage1_5 files. + + + diff --git a/chapter06/grub.xml b/chapter06/grub.xml new file mode 100644 index 000000000..1eadcb226 --- /dev/null +++ b/chapter06/grub.xml @@ -0,0 +1,12 @@ + +Installing Grub-&grub-version; + + +Estimated build time: &grub-time; +Estimated required disk space: &grub-compsize; + +&aa-grub-shortdesc; +&aa-grub-dep; +&c6-grub-inst; + + diff --git a/chapter06/lilo-inst.xml b/chapter06/lilo-inst.xml deleted file mode 100644 index 0dc483e5f..000000000 --- a/chapter06/lilo-inst.xml +++ /dev/null @@ -1,28 +0,0 @@ -   - - -Installation of Lilo - -We have chosen Lilo as a boot loader because we feel comfortable with it, but you -may wish to choose another. Fabio Fracassi has written a hint on -GRUB, which is available at . - -Compile Lilo: - -make - -And install it: - -make install - -At the end of the installation, a message will appear stating that -/sbin/lilo has to be executed. This is pointless because -the /etc/lilo.conf file isn't present yet. We will -complete the installation of lilo in Chapter 8. - -The standard LILO prompt, or menu, may be replaced by the -LFS logo or any logo you like. Martin Imobersteg has written a -hint about this, which is located at -. - - diff --git a/chapter06/lilo.xml b/chapter06/lilo.xml deleted file mode 100644 index fe4e951c6..000000000 --- a/chapter06/lilo.xml +++ /dev/null @@ -1,12 +0,0 @@ - -Installing Lilo-&lilo-version; - - -Estimated build time: &lilo-time; -Estimated required disk space: &lilo-compsize; - -&aa-lilo-shortdesc; -&aa-lilo-dep; -&c6-lilo-inst; - - diff --git a/chapter08/chapter08.xml b/chapter08/chapter08.xml index 2b6e70ab7..90ef69e72 100644 --- a/chapter08/chapter08.xml +++ b/chapter08/chapter08.xml @@ -5,6 +5,6 @@ &c8-introduction; &c8-fstab; &c8-kernel; -&c8-lilo; +&c8-grub; diff --git a/chapter08/grub.xml b/chapter08/grub.xml new file mode 100644 index 000000000..8585aad12 --- /dev/null +++ b/chapter08/grub.xml @@ -0,0 +1,8 @@ + +Making the LFS system bootable + + +(To be filled in) + + + diff --git a/chapter08/lilo.xml b/chapter08/lilo.xml deleted file mode 100644 index 4c7cb1fa0..000000000 --- a/chapter08/lilo.xml +++ /dev/null @@ -1,48 +0,0 @@ - -Making the LFS system bootable - - -In order to be able to boot the LFS system, we need to update our -bootloader. We're assuming that your host system is using Lilo (since -that's the most commonly used boot loader at the moment). - -We will not be running the lilo program inside chroot. Running lilo -inside chroot can have fatal side-effects which render your MBR useless -and you'd need a boot disk to be able to start any Linux system (either -the host system or the LFS system). - -First we'll exit chroot and copy the lfskernel file to the host -system: - -logout -cp $LFS/boot/lfskernel /boot - -The next step is adding an entry to /etc/lilo.conf so that we can -choose LFS when booting the computer: - -cat >> /etc/lilo.conf << "EOF" -image=/boot/lfskernel - label=lfs - root=<partition> - read-only -EOF - -<partition> must be replaced with the LFS -partition's designation. - -Also note that if you are using reiserfs for your root partition, -the line read-only should be changed to -read-write. - -Now, update the boot loader by running: - -/sbin/lilo -v - -The last step is synchronizing the host system's lilo -configuration files with the LFS system's: - -cp /etc/lilo.conf $LFS/etc -cp $(grep "image.*=" /etc/lilo.conf | cut -f 2 -d "=") $LFS/boot - - - diff --git a/entities/bin86.ent b/entities/bin86.ent deleted file mode 100644 index 8ac056cab..000000000 --- a/entities/bin86.ent +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/entities/grub.ent b/entities/grub.ent new file mode 100644 index 000000000..8248ee8f4 --- /dev/null +++ b/entities/grub.ent @@ -0,0 +1,25 @@ + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/entities/lilo.ent b/entities/lilo.ent deleted file mode 100644 index 9e37f95e8..000000000 --- a/entities/lilo.ent +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff --git a/index.xml b/index.xml index 67a382594..e8d9d4f88 100644 --- a/index.xml +++ b/index.xml @@ -40,7 +40,6 @@ - @@ -61,6 +60,7 @@ + @@ -68,7 +68,6 @@ - @@ -112,7 +111,6 @@ %automake-entities; %bash-entities; %basic-net-entities; -%bin86-entities; %binutils-entities; %bison-entities; %bootscripts-entities; @@ -133,6 +131,7 @@ %glibc-entities; %grep-entities; %groff-entities; +%grub-entities; %gzip-entities; %inetutils-entities; %kbd-entities; @@ -140,7 +139,6 @@ %less-entities; %lfs-utils-entities; %libtool-entities; -%lilo-entities; %lockingglibc-entities; %m4-entities; %make-entities;