From 11ce06ae65258859cc43ab338e2a81f880b011e4 Mon Sep 17 00:00:00 2001 From: Gerard Beekmans Date: Fri, 6 Jul 2001 15:25:48 +0000 Subject: Removed indentation from commands (from
to git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@760 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689 --- chapter02/install.xml | 50 +++++++++++++++++++++------------- chapter03/creatingdirs.xml | 63 +++++++++++++++++++++---------------------- chapter03/creatingfs.xml | 8 +++--- chapter03/mounting.xml | 16 ++++++----- chapter05/bash-inst.xml | 20 +++++++------- chapter05/binutils-inst.xml | 14 +++++----- chapter05/bzip2-inst.xml | 22 ++++++++------- chapter05/diffutils-inst.xml | 17 ++++++------ chapter05/fileutils-inst.xml | 19 ++++++------- chapter05/gcc-inst.xml | 36 ++++++++++++------------- chapter05/grep-inst.xml | 18 ++++++------- chapter05/gzip-inst.xml | 20 +++++++------- chapter05/introduction.xml | 8 +++--- chapter05/kernel-inst.xml | 29 ++++++++++---------- chapter05/make-inst.xml | 13 ++++----- chapter05/mawk-inst.xml | 22 +++++++-------- chapter05/oldnsslib.xml | 16 ++++++----- chapter05/patch-inst.xml | 13 ++++----- chapter05/proc.xml | 8 +++--- chapter05/pwdgroup.xml | 40 ++++++++++++++------------- chapter05/sed-inst.xml | 18 ++++++------- chapter05/shellutils-inst.xml | 22 +++++++-------- chapter05/tar-inst.xml | 27 ++++++++++--------- chapter05/texinfo-inst.xml | 16 +++++------ chapter05/textutils-inst.xml | 15 ++++++----- 25 files changed, 292 insertions(+), 258 deletions(-) diff --git a/chapter02/install.xml b/chapter02/install.xml index d091763f0..07f72784c 100644 --- a/chapter02/install.xml +++ b/chapter02/install.xml @@ -13,9 +13,11 @@ section. To start with, change to the $LFS/usr/src directory by running: -
- cd $LFS/usr/src -
+ + +cd $LFS/usr/src + + If a file is tar'ed and gzip'ed, it is unpacked by @@ -23,10 +25,12 @@ running either one of the following two commands, depending on the filename: -
- tar xvzf filename.tar.gz - tar xvzf filename.tgz -
+ + +tar xvzf filename.tar.gz +tar xvzf filename.tgz + + @@ -34,9 +38,11 @@ If a file is tar'ed and bzip2'ed, it is unpacked by running: -
- bzcat filename.tar.bz2 | tar xv -
+ + +bzcat filename.tar.bz2 | tar xv + + Some tar programs (most of them nowadays but not all of them) are @@ -50,9 +56,11 @@ your host system decided to patch bzip2. If a file is just tar'ed, it is unpacked by running: -
- tar xvf filename.tar -
+ + +tar xvf filename.tar + + When an archive is unpacked, a new directory will be created under the @@ -73,17 +81,21 @@ can be used they need to be uncompressed first. If a file is gzip'ed, it is unpacked by running: -
- gunzip filename.gz -
+ + +gunzip filename.gz + + If a file is bzip2'ed, it is unpacked by running: -
- bunzip2 filename.bz2 -
+ + +bunzip2 filename.bz2 + + After a package has been installed, two things can be done with it: diff --git a/chapter03/creatingdirs.xml b/chapter03/creatingdirs.xml index 969b51859..d581f3ffd 100644 --- a/chapter03/creatingdirs.xml +++ b/chapter03/creatingdirs.xml @@ -8,33 +8,30 @@ url="http://www.pathname.com/fhs/">http://www.pathname.com/fhs/. Issuing the following commands will create a default directory layout: -
- cd $LFS - mkdir -p bin boot dev/pts etc/opt home lib mnt proc - root sbin tmp var opt - for dirname in $LFS/usr $LFS/usr/local -    do -    mkdir $dirname -    cd $dirname -    mkdir bin etc include lib sbin share - src var -    ln -s share/man man -    ln -s share/doc doc -    ln -s share/info info -    cd $dirname/share -    mkdir dict doc info locale man nls misc - terminfo zoneinfo -    cd $dirname/share/man -    mkdir man{1,2,3,4,5,6,7,8} - done - cd $LFS/var - mkdir -p lock log mail run spool tmp opt cache lib/misc - local - cd $LFS/opt - mkdir bin doc include info lib man - cd $LFS/usr - ln -s ../var/tmp tmp -
+ + +cd $LFS +mkdir -p bin boot dev/pts etc/opt home lib mnt proc root sbin tmp var opt +for dirname in $LFS/usr $LFS/usr/local +   do +   mkdir $dirname +   cd $dirname +   mkdir bin etc include lib sbin share src var +   ln -s share/man man +   ln -s share/doc doc +   ln -s share/info info +   cd $dirname/share +   mkdir dict doc info locale man nls misc terminfo zoneinfo +   cd $dirname/share/man +   mkdir man{1,2,3,4,5,6,7,8} +done +cd $LFS/var +mkdir -p lock log mail run spool tmp opt cache lib/misc local +cd $LFS/opt +mkdir bin doc include info lib man +cd $LFS/usr +ln -s ../var/tmp tmp + Normally, directories are created with permission mode 755, which isn't @@ -47,11 +44,13 @@ directory but cannot remove another user's files (the latter is caused by the so-called "sticky bit" - bit 1 of the 1777 bit mask). -
- cd $LFS && - chmod 0750 root && - chmod 1777 tmp var/tmp -
+ + +cd $LFS && +chmod 0750 root && +chmod 1777 tmp var/tmp + + Now that the directories are created, copy the source files that were diff --git a/chapter03/creatingfs.xml b/chapter03/creatingfs.xml index 14028202d..00130a99b 100644 --- a/chapter03/creatingfs.xml +++ b/chapter03/creatingfs.xml @@ -15,9 +15,11 @@ To create an ext2 file system, use the mke2fs command. The LFS partition is used as the only option to the command and the file system is created. -
- mke2fs /dev/xxx -
+ + +mke2fs /dev/xxx + + Replace "xxx" by the partition's designation (like hda11). diff --git a/chapter03/mounting.xml b/chapter03/mounting.xml index 562706186..d6c3b08e5 100644 --- a/chapter03/mounting.xml +++ b/chapter03/mounting.xml @@ -14,17 +14,21 @@ directory is chosen, just make sure you remember what you chose. Create the /mnt/lfs directory by running: -
- mkdir -p /mnt/lfs -
+ + +mkdir -p /mnt/lfs + + Now mount the LFS partition by running: -
- mount /dev/xxx /mnt/lfs -
+ + +mount /dev/xxx /mnt/lfs + + Replace xxx by the partition's designation (like hda11). diff --git a/chapter05/bash-inst.xml b/chapter05/bash-inst.xml index a5d4420b8..f25dbaf21 100644 --- a/chapter05/bash-inst.xml +++ b/chapter05/bash-inst.xml @@ -5,16 +5,16 @@ Install Bash by running the following commands: -
- ./configure --enable-static-link --prefix=$LFS/usr - \ -    --bindir=$LFS/bin - --with-curses && - make && - make install && - cd $LFS/bin && - ln -s bash sh -
+ + +./configure --enable-static-link --prefix=$LFS/usr \ +   --bindir=$LFS/bin --with-curses && +make && +make install && +cd $LFS/bin && +ln -s bash sh + + If the make install phase ends with something along the lines of diff --git a/chapter05/binutils-inst.xml b/chapter05/binutils-inst.xml index bcda9a2a7..81b4858ec 100644 --- a/chapter05/binutils-inst.xml +++ b/chapter05/binutils-inst.xml @@ -5,13 +5,13 @@ Install Binutils by running the following commands: -
- ./configure --prefix=$LFS/usr --disable-nls - && - make -e LDFLAGS=-all-static tooldir=$LFS/usr - && - make -e tooldir=$LFS/usr install -
+ + +./configure --prefix=$LFS/usr --disable-nls && +make -e LDFLAGS=-all-static tooldir=$LFS/usr && +make -e tooldir=$LFS/usr install + + diff --git a/chapter05/bzip2-inst.xml b/chapter05/bzip2-inst.xml index 847b2637b..2eb26464e 100644 --- a/chapter05/bzip2-inst.xml +++ b/chapter05/bzip2-inst.xml @@ -5,16 +5,18 @@ Install Bzip2 by running the following commands: -
- sed \ -    s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) - \$(LDFLAGS) -o"/ \ -    Makefile | make -f - - LDFLAGS=-static && - make PREFIX=$LFS/usr install && - cd $LFS/usr/bin && - mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin -
+ + +sed \ +   s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) +\$(LDFLAGS) -o"/ \ +   Makefile | make -f - +LDFLAGS=-static && +make PREFIX=$LFS/usr install && +cd $LFS/usr/bin && +mv bzcat bunzip2 bzip2 bzip2recover $LFS/bin + + diff --git a/chapter05/diffutils-inst.xml b/chapter05/diffutils-inst.xml index bff2e4813..e6e962bef 100644 --- a/chapter05/diffutils-inst.xml +++ b/chapter05/diffutils-inst.xml @@ -5,14 +5,15 @@ Install Diffutils by running the following commands: -
- export CPPFLAGS=-Dre_max_failures=re_max_failures2 - && - ./configure --prefix=$LFS/usr && - unset CPPFLAGS && - make LDFLAGS=-static && - make install -
+ + +export CPPFLAGS=-Dre_max_failures=re_max_failures2 && +./configure --prefix=$LFS/usr && +unset CPPFLAGS && +make LDFLAGS=-static && +make install + + diff --git a/chapter05/fileutils-inst.xml b/chapter05/fileutils-inst.xml index 080ed0efa..3034e700d 100644 --- a/chapter05/fileutils-inst.xml +++ b/chapter05/fileutils-inst.xml @@ -5,15 +5,16 @@ Install Fileutils by running the following commands: -
- ./configure --disable-nls \ -    --prefix=$LFS/usr --libexecdir=$LFS/bin - --bindir=$LFS/bin && - make LDFLAGS=-static && - make install && - cd $LFS/usr/bin && - ln -s ../../bin/install -
+ +./configure --disable-nls \ +   --prefix=$LFS/usr --libexecdir=$LFS/bin +--bindir=$LFS/bin && +make LDFLAGS=-static && +make install && +cd $LFS/usr/bin && +ln -s ../../bin/install + + diff --git a/chapter05/gcc-inst.xml b/chapter05/gcc-inst.xml index 3c76b821f..ea498ca45 100644 --- a/chapter05/gcc-inst.xml +++ b/chapter05/gcc-inst.xml @@ -5,25 +5,23 @@ Install GCC by running the following commands: -
- mkdir $LFS/usr/src/gcc-build && - cd $LFS/usr/src/gcc-build && - ../gcc-&gcc-version;/configure --prefix=/usr \ -    --enable-languages=c,c++ --disable-nls - \ -    --disable-shared - && - make -e LDFLAGS=-static bootstrap && - make prefix=$LFS/usr install && - cd $LFS/lib && - ln -s ../usr/bin/cpp - && - cd $LFS/usr/lib && - ln -s ../bin/cpp - && - cd $LFS/usr/bin && - ln -s gcc cc -
+ + +mkdir $LFS/usr/src/gcc-build && +cd $LFS/usr/src/gcc-build && +../gcc-&gcc-version;/configure --prefix=/usr \ +   --enable-languages=c,c++ --disable-nls \ +   --disable-shared && +make -e LDFLAGS=-static bootstrap && +make prefix=$LFS/usr install && +cd $LFS/lib && +ln -s ../usr/bin/cpp && +cd $LFS/usr/lib && +ln -s ../bin/cpp && +cd $LFS/usr/bin && +ln -s gcc cc + + diff --git a/chapter05/grep-inst.xml b/chapter05/grep-inst.xml index 4a856e361..6b1058547 100644 --- a/chapter05/grep-inst.xml +++ b/chapter05/grep-inst.xml @@ -5,15 +5,15 @@ Install Grep by running the following commands: -
- export CPPFLAGS=-Dre_max_failures=re_max_failures2 - && - ./configure --prefix=$LFS/usr --disable-nls - && - unset CPPFLAGS && - make LDFLAGS=-static && - make install -
+ + +export CPPFLAGS=-Dre_max_failures=re_max_failures2 && +./configure --prefix=$LFS/usr --disable-nls && +unset CPPFLAGS && +make LDFLAGS=-static && +make install + + diff --git a/chapter05/gzip-inst.xml b/chapter05/gzip-inst.xml index 1a5aba83b..f1d5d1ca6 100644 --- a/chapter05/gzip-inst.xml +++ b/chapter05/gzip-inst.xml @@ -5,16 +5,16 @@ Before Gzip is installed, the gzip patch file needs to be unpacked. -
- patch -Np1 -i ../gzip-&gzip-version;.patch - && - ./configure --prefix=$LFS/usr && - make LDFLAGS=-static && - make install && - cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip - $LFS/bin && - rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip -
+ + +patch -Np1 -i ../gzip-&gzip-version;.patch && +./configure --prefix=$LFS/usr && +make LDFLAGS=-static && +make install && +cp $LFS/usr/bin/gunzip $LFS/usr/bin/gzip $LFS/bin && +rm $LFS/usr/bin/gunzip $LFS/usr/bin/gzip + + diff --git a/chapter05/introduction.xml b/chapter05/introduction.xml index 05278c75c..8729787e2 100644 --- a/chapter05/introduction.xml +++ b/chapter05/introduction.xml @@ -40,9 +40,11 @@ Before we start, make sure the LFS environment variable is setup properly if you decided to make use of it. Run the following: -
- echo $LFS -
+ + +echo $LFS + + Check to make sure the output contains the correct directory to the LFS diff --git a/chapter05/kernel-inst.xml b/chapter05/kernel-inst.xml index c02df1090..27af821bc 100644 --- a/chapter05/kernel-inst.xml +++ b/chapter05/kernel-inst.xml @@ -13,21 +13,20 @@ compile the packages that need the kernel. The kernel configuration file is created by running the following command: -
- patch -Np1 -i ../linux-&kernel-version;.patch - && - make mrproper && - yes "" | make config && - make dep && - cd $LFS/usr/include && - cp -a ../src/linux/include/linux . && - chown root.root $LFS/usr/include/linux -R - && - mkdir asm && - cp -a ../src/linux/include/asm/* asm && - chown root.root $LFS/usr/include/asm -R - -
+ + +patch -Np1 -i ../linux-&kernel-version;.patch && +make mrproper && +yes "" | make config && +make dep && +cd $LFS/usr/include && +cp -a ../src/linux/include/linux . && +chown root.root $LFS/usr/include/linux -R && +mkdir asm && +cp -a ../src/linux/include/asm/* asm && +chown root.root $LFS/usr/include/asm -R + + diff --git a/chapter05/make-inst.xml b/chapter05/make-inst.xml index 4e8929b94..e07c8205b 100644 --- a/chapter05/make-inst.xml +++ b/chapter05/make-inst.xml @@ -5,12 +5,13 @@ Install Make by running the following commands: -
- ./configure --prefix=$LFS/usr - --disable-nls && - make LDFLAGS=-static && - make install -
+ + +./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install + + diff --git a/chapter05/mawk-inst.xml b/chapter05/mawk-inst.xml index a1f731bd1..67171df72 100644 --- a/chapter05/mawk-inst.xml +++ b/chapter05/mawk-inst.xml @@ -5,17 +5,17 @@ Install Mawk by running the following commands: -
- ./configure && - sed \ -    s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) -\$(CFLAGS) \$(LDFLAGS) -o"/ \ -    Makefile | make - -f - LDFLAGS=-static && - make BINDIR=$LFS/usr/bin \ -    MANDIR=$LFS/usr/share/man/man1 - install -
+ + +./configure && +sed \ +   s/"\$(CC) \$(CFLAGS) -o"/"\$(CC) \$(CFLAGS) +\$(LDFLAGS) -o"/ \ +   Makefile | make -f - LDFLAGS=-static && +make BINDIR=$LFS/usr/bin \ +   MANDIR=$LFS/usr/share/man/man1 install + + diff --git a/chapter05/oldnsslib.xml b/chapter05/oldnsslib.xml index 87357d6e0..54d5f8a3f 100644 --- a/chapter05/oldnsslib.xml +++ b/chapter05/oldnsslib.xml @@ -9,9 +9,11 @@ and groupid's. You can check which C library version your normal Linux system uses by simply executing the library, like this: -
- /lib/libc.so.6 -
+ + +/lib/libc.so.6 + + The first line will give you the release version. Following lines contain @@ -19,9 +21,11 @@ interesting information. If you have Glibc-2.0.x installed on your starting distribution, copy the NSS library files by running: -
- cp -av /lib/libnss* $LFS/lib -
+ + +cp -av /lib/libnss* $LFS/lib + + diff --git a/chapter05/patch-inst.xml b/chapter05/patch-inst.xml index b4e13ec63..3442d860b 100644 --- a/chapter05/patch-inst.xml +++ b/chapter05/patch-inst.xml @@ -5,12 +5,13 @@ Install Patch by running the following commands: -
- ./configure --prefix=$LFS/usr - && - make LDFLAGS=-static && - make install -
+ + +./configure --prefix=$LFS/usr && +make LDFLAGS=-static && +make install + + diff --git a/chapter05/proc.xml b/chapter05/proc.xml index 27cea3ee5..3a13f2be3 100644 --- a/chapter05/proc.xml +++ b/chapter05/proc.xml @@ -13,9 +13,11 @@ the kernel itself. The proc file system is mounted under $LFS/proc by running the following command: -
- mount proc $LFS/proc -t proc -
+ + +mount proc $LFS/proc -t proc + + diff --git a/chapter05/pwdgroup.xml b/chapter05/pwdgroup.xml index 279e73e18..28e17442b 100644 --- a/chapter05/pwdgroup.xml +++ b/chapter05/pwdgroup.xml @@ -21,32 +21,36 @@ Create a new file $LFS/etc/passwd by running the following command: -
- echo "root:x:0:0:root:/root:/bin/bash" > - $LFS/etc/passwd -
+ + +echo "root:x:0:0:root:/root:/bin/bash" > $LFS/etc/passwd + + + Create a new file $LFS/etc/group by running the following: - + + cat > $LFS/etc/group << "EOF" - 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: +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: EOF - + + diff --git a/chapter05/sed-inst.xml b/chapter05/sed-inst.xml index 7be838ca6..c410c0d88 100644 --- a/chapter05/sed-inst.xml +++ b/chapter05/sed-inst.xml @@ -5,15 +5,15 @@ Install Sed by running the following commands: -
- export CPPFLAGS=-Dre_max_failures=re_max_failures2 - && - ./configure --prefix=$LFS/usr - --bindir=$LFS/bin && - unset CPPFLAGS && - make LDFLAGS=-static && - make install -
+ + +export CPPFLAGS=-Dre_max_failures=re_max_failures2 && +./configure --prefix=$LFS/usr --bindir=$LFS/bin && +unset CPPFLAGS && +make LDFLAGS=-static && +make install + + diff --git a/chapter05/shellutils-inst.xml b/chapter05/shellutils-inst.xml index 618991830..0fa096a4c 100644 --- a/chapter05/shellutils-inst.xml +++ b/chapter05/shellutils-inst.xml @@ -5,17 +5,17 @@ Before Sh-utils is installed, the sh-utils patch file needs to be unpacked. -
- patch -Np1 -i ../sh-utils-&sh-utils-version;.patch - && - ./configure --prefix=$LFS/usr - --disable-nls && - make LDFLAGS=-static && - make install && - cd $LFS/usr/bin && - mv date echo false pwd stty $LFS/bin && - mv su true uname hostname $LFS/bin -
+ + +patch -Np1 -i ../sh-utils-&sh-utils-version;.patch && +./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install && +cd $LFS/usr/bin && +mv date echo false pwd stty $LFS/bin && +mv su true uname hostname $LFS/bin + + diff --git a/chapter05/tar-inst.xml b/chapter05/tar-inst.xml index c9ae8ca26..175cab6e9 100644 --- a/chapter05/tar-inst.xml +++ b/chapter05/tar-inst.xml @@ -12,24 +12,25 @@ for gzip files). Apply the patch by running the following command: -
- cd src && - patch -i ../../gnutarpatch.txt && - cd .. -
+ + +cd src && +patch -i ../../gnutarpatch.txt && +cd .. + + Install Tar by running the following commands: -
- ./configure --prefix=$LFS/usr - --disable-nls \ -    --libexecdir=$LFS/usr/bin - --bindir=$LFS/bin && - make LDFLAGS=-static && - make install -
+ + +./configure --prefix=$LFS/usr --disable-nls \ +   --libexecdir=$LFS/usr/bin --bindir=$LFS/bin && +make LDFLAGS=-static && +make install + diff --git a/chapter05/texinfo-inst.xml b/chapter05/texinfo-inst.xml index 358f09f66..2fed3e3b0 100644 --- a/chapter05/texinfo-inst.xml +++ b/chapter05/texinfo-inst.xml @@ -5,14 +5,14 @@ Install Texinfo by running the following commands: -
- patch -Np1 -i ../texinfo-&texinfo-version;.patch - && - ./configure --prefix=$LFS/usr - --disable-nls && - make LDFLAGS=-static && - make install -
+ + +patch -Np1 -i ../texinfo-&texinfo-version;.patch && +./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install + + diff --git a/chapter05/textutils-inst.xml b/chapter05/textutils-inst.xml index c21d6cd53..d0485f4d7 100644 --- a/chapter05/textutils-inst.xml +++ b/chapter05/textutils-inst.xml @@ -5,13 +5,14 @@ Install Textutils by running the following commands: -
- ./configure --prefix=$LFS/usr - --disable-nls && - make LDFLAGS=-static && - make install && - mv $LFS/usr/bin/cat $LFS/bin -
+ + +./configure --prefix=$LFS/usr --disable-nls && +make LDFLAGS=-static && +make install && +mv $LFS/usr/bin/cat $LFS/bin + + -- cgit v1.2.3-54-g00ecf