Another jhalfs helper. As has been discussed before, it would be nice to mark the screen sections with an attribute to announce that it will be installing to the system rather than just working in the source/build tree. Manuel suggested adding the attribute userlevel="install", so I've done that for the Ch. 6 packages and the kernel in Ch. 8.
This allows a really simple stylesheet to be created so that interesting things can be done. For instance, I created a paco stylesheet to wrap the install commands like so: paco -lp+ ${package}-${version} " make install " Combined with the previous patch to export the package name and version number, LFS is practically ready for a package manager and it required no additional hacks. Any objections? Again, there was no diff in the HTML. There might still be interest in deciding what are install actions and what aren't, but that's a separate discussion. -- Dan BOOK/chapter06/autoconf.xml | 2 +- BOOK/chapter06/automake.xml | 2 +- BOOK/chapter06/bash.xml | 2 +- BOOK/chapter06/binutils.xml | 4 ++-- BOOK/chapter06/bison.xml | 2 +- BOOK/chapter06/bzip2.xml | 4 ++-- BOOK/chapter06/coreutils.xml | 6 +++--- BOOK/chapter06/db.xml | 4 ++-- BOOK/chapter06/diffutils.xml | 2 +- BOOK/chapter06/e2fsprogs.xml | 4 ++-- BOOK/chapter06/file.xml | 2 +- BOOK/chapter06/findutils.xml | 4 ++-- BOOK/chapter06/flex.xml | 6 +++--- BOOK/chapter06/gawk.xml | 2 +- BOOK/chapter06/gcc.xml | 6 +++--- BOOK/chapter06/gettext.xml | 2 +- BOOK/chapter06/glibc.xml | 14 +++++++------- BOOK/chapter06/grep.xml | 2 +- BOOK/chapter06/groff.xml | 4 ++-- BOOK/chapter06/grub.xml | 2 +- BOOK/chapter06/gzip.xml | 4 ++-- BOOK/chapter06/iana-etc.xml | 2 +- BOOK/chapter06/inetutils.xml | 4 ++-- BOOK/chapter06/iproute2.xml | 4 ++-- BOOK/chapter06/kbd.xml | 4 ++-- BOOK/chapter06/less.xml | 2 +- BOOK/chapter06/libtool.xml | 2 +- BOOK/chapter06/linux-headers.xml | 2 +- BOOK/chapter06/m4.xml | 2 +- BOOK/chapter06/make.xml | 2 +- BOOK/chapter06/man-db.xml | 4 ++-- BOOK/chapter06/man-pages.xml | 2 +- BOOK/chapter06/mktemp.xml | 2 +- BOOK/chapter06/module-init-tools.xml | 2 +- BOOK/chapter06/ncurses.xml | 14 +++++++------- BOOK/chapter06/patch.xml | 2 +- BOOK/chapter06/perl.xml | 2 +- BOOK/chapter06/procps.xml | 2 +- BOOK/chapter06/psmisc.xml | 6 +++--- BOOK/chapter06/readline.xml | 6 +++--- BOOK/chapter06/sed.xml | 2 +- BOOK/chapter06/shadow.xml | 8 ++++---- BOOK/chapter06/sysklogd.xml | 4 ++-- BOOK/chapter06/sysvinit.xml | 4 ++-- BOOK/chapter06/tar.xml | 2 +- BOOK/chapter06/texinfo.xml | 4 ++-- BOOK/chapter06/udev.xml | 12 ++++++------ BOOK/chapter06/util-linux.xml | 2 +- BOOK/chapter06/vim.xml | 8 ++++---- BOOK/chapter06/zlib.xml | 8 ++++---- BOOK/chapter08/kernel.xml | 10 +++++----- BOOK/stylesheets/dump-commands.xsl | 2 +- 52 files changed, 106 insertions(+), 106 deletions(-) diff --git a/BOOK/chapter06/autoconf.xml b/BOOK/chapter06/autoconf.xml index b85fd8b..fb4d980 100644 --- a/BOOK/chapter06/autoconf.xml +++ b/BOOK/chapter06/autoconf.xml @@ -56,7 +56,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/automake.xml b/BOOK/chapter06/automake.xml index 2ede092..6204a59 100644 --- a/BOOK/chapter06/automake.xml +++ b/BOOK/chapter06/automake.xml @@ -54,7 +54,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/bash.xml b/BOOK/chapter06/bash.xml index e9b69e9..721029b 100644 --- a/BOOK/chapter06/bash.xml +++ b/BOOK/chapter06/bash.xml @@ -92,7 +92,7 @@ chown -Rv nobody ./</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Run the newly compiled <command>bash</command> program (replacing the one that is currently being executed):</para> diff --git a/BOOK/chapter06/binutils.xml b/BOOK/chapter06/binutils.xml index bc86ff3..3925219 100644 --- a/BOOK/chapter06/binutils.xml +++ b/BOOK/chapter06/binutils.xml @@ -103,12 +103,12 @@ cd ../binutils-build</userinput></screen> <para>Install the package:</para> -<screen><userinput>make tooldir=/usr install</userinput></screen> +<screen userlevel="install"><userinput>make tooldir=/usr install</userinput></screen> <para>Install the <filename class="headerfile">libiberty</filename> header file that is needed by some packages:</para> -<screen><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen> +<screen userlevel="install"><userinput>cp -v ../binutils-&binutils-version;/include/libiberty.h /usr/include</userinput></screen> </sect2> diff --git a/BOOK/chapter06/bison.xml b/BOOK/chapter06/bison.xml index 0b129b5..d78bf8e 100644 --- a/BOOK/chapter06/bison.xml +++ b/BOOK/chapter06/bison.xml @@ -59,7 +59,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/bzip2.xml b/BOOK/chapter06/bzip2.xml index 22f6917..ecc4da5 100644 --- a/BOOK/chapter06/bzip2.xml +++ b/BOOK/chapter06/bzip2.xml @@ -73,13 +73,13 @@ make clean</userinput></screen> <para>Install the programs:</para> -<screen><userinput>make PREFIX=/usr install</userinput></screen> +<screen userlevel="install"><userinput>make PREFIX=/usr install</userinput></screen> <para>Install the shared <command>bzip2</command> binary into the <filename class="directory">/bin</filename> directory, make some necessary symbolic links, and clean up:</para> -<screen><userinput>cp -v bzip2-shared /bin/bzip2 +<screen userlevel="install"><userinput>cp -v bzip2-shared /bin/bzip2 cp -av libbz2.so* /lib ln -sv ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so rm -v /usr/bin/{bunzip2,bzcat,bzip2} diff --git a/BOOK/chapter06/coreutils.xml b/BOOK/chapter06/coreutils.xml index 884a3c4..d4dbd95 100644 --- a/BOOK/chapter06/coreutils.xml +++ b/BOOK/chapter06/coreutils.xml @@ -103,11 +103,11 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Move programs to the locations specified by the FHS:</para> -<screen><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin +<screen userlevel="install"><userinput>mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin mv -v /usr/bin/{false,hostname,ln,ls,mkdir,mknod,mv,pwd,readlink,rm} /bin mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin mv -v /usr/bin/chroot /usr/sbin</userinput></screen> @@ -118,7 +118,7 @@ mv -v /usr/bin/chroot /usr/sbin</userinput></screen> may not be available during the early stages of booting, those binaries need to be on the root partition:</para> -<screen><userinput>mv -v /usr/bin/{head,sleep,nice} /bin</userinput></screen> +<screen userlevel="install"><userinput>mv -v /usr/bin/{head,sleep,nice} /bin</userinput></screen> </sect2> diff --git a/BOOK/chapter06/db.xml b/BOOK/chapter06/db.xml index b08d199..32f8f37 100644 --- a/BOOK/chapter06/db.xml +++ b/BOOK/chapter06/db.xml @@ -102,7 +102,7 @@ <para>Install the package:</para> -<screen><userinput>make docdir=/usr/share/doc/db-&db-version; install</userinput></screen> +<screen userlevel="install"><userinput>make docdir=/usr/share/doc/db-&db-version; install</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> @@ -119,7 +119,7 @@ <para>Fix the ownership of the installed documentation:</para> -<screen><userinput>chown -Rv root:root /usr/share/doc/db-&db-version;</userinput></screen> +<screen userlevel="install"><userinput>chown -Rv root:root /usr/share/doc/db-&db-version;</userinput></screen> </sect2> diff --git a/BOOK/chapter06/diffutils.xml b/BOOK/chapter06/diffutils.xml index df9e529..0cb04ed 100644 --- a/BOOK/chapter06/diffutils.xml +++ b/BOOK/chapter06/diffutils.xml @@ -66,7 +66,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/e2fsprogs.xml b/BOOK/chapter06/e2fsprogs.xml index ec1de4c..412a963 100644 --- a/BOOK/chapter06/e2fsprogs.xml +++ b/BOOK/chapter06/e2fsprogs.xml @@ -101,11 +101,11 @@ cd build</userinput></screen> <para>Install the binaries, documentation, and shared libraries:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Install the static libraries and headers:</para> -<screen><userinput>make install-libs</userinput></screen> +<screen userlevel="install"><userinput>make install-libs</userinput></screen> </sect2> diff --git a/BOOK/chapter06/file.xml b/BOOK/chapter06/file.xml index 2eb08e7..98acd71 100644 --- a/BOOK/chapter06/file.xml +++ b/BOOK/chapter06/file.xml @@ -52,7 +52,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/findutils.xml b/BOOK/chapter06/findutils.xml index 8a54ae9..6ea7d83 100644 --- a/BOOK/chapter06/findutils.xml +++ b/BOOK/chapter06/findutils.xml @@ -70,7 +70,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Some of the scripts in the LFS-Bootscripts package depend on <command>find</command>. As <filename class="directory">/usr</filename> @@ -78,7 +78,7 @@ needs to be on the root partition. The <command>updatedb</command> script also needs to be modified to correct an explicit path:</para> -<screen><userinput>mv -v /usr/bin/find /bin +<screen userlevel="install"><userinput>mv -v /usr/bin/find /bin sed -i -e 's/find:=${BINDIR}/find:=\/bin/' /usr/bin/updatedb</userinput></screen> </sect2> diff --git a/BOOK/chapter06/flex.xml b/BOOK/chapter06/flex.xml index 709b719..e2a2913 100644 --- a/BOOK/chapter06/flex.xml +++ b/BOOK/chapter06/flex.xml @@ -53,14 +53,14 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>There are some packages that expect to find the <filename class="libraryfile">lex</filename> library in <filename class="directory">/usr/lib</filename>. Create a symlink to account for this:</para> -<screen><userinput>ln -sv libfl.a /usr/lib/libl.a</userinput></screen> +<screen userlevel="install"><userinput>ln -sv libfl.a /usr/lib/libl.a</userinput></screen> <para>A few programs do not know about <command>flex</command> yet and try to run its predecessor, <command>lex</command>. To support those @@ -68,7 +68,7 @@ calls <filename>flex</filename> in <command>lex</command> emulation mode:</para> -<screen><userinput>cat > /usr/bin/lex << "EOF" +<screen userlevel="install"><userinput>cat > /usr/bin/lex << "EOF" <literal>#!/bin/sh # Begin /usr/bin/lex diff --git a/BOOK/chapter06/gawk.xml b/BOOK/chapter06/gawk.xml index 1e0dea1..e8ab46c 100644 --- a/BOOK/chapter06/gawk.xml +++ b/BOOK/chapter06/gawk.xml @@ -68,7 +68,7 @@ EOF</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/gcc.xml b/BOOK/chapter06/gcc.xml index 4d55442..9f47fba 100644 --- a/BOOK/chapter06/gcc.xml +++ b/BOOK/chapter06/gcc.xml @@ -117,18 +117,18 @@ cd ../gcc-build</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Some packages expect the C preprocessor to be installed in the <filename class="directory">/lib</filename> directory. To support those packages, create this symlink:</para> -<screen><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen> +<screen userlevel="install"><userinput>ln -sv ../usr/bin/cpp /lib</userinput></screen> <para>Many packages use the name <command>cc</command> to call the C compiler. To satisfy those packages, create a symlink:</para> -<screen><userinput>ln -sv gcc /usr/bin/cc</userinput></screen> +<screen userlevel="install"><userinput>ln -sv gcc /usr/bin/cc</userinput></screen> <para>Now that our final toolchain is in place, it is important to again ensure that compiling and linking will work as expected. We do this by performing diff --git a/BOOK/chapter06/gettext.xml b/BOOK/chapter06/gettext.xml index 07425ef..b4cec81 100644 --- a/BOOK/chapter06/gettext.xml +++ b/BOOK/chapter06/gettext.xml @@ -56,7 +56,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/glibc.xml b/BOOK/chapter06/glibc.xml index 7eb0a4d..c88ad9b 100644 --- a/BOOK/chapter06/glibc.xml +++ b/BOOK/chapter06/glibc.xml @@ -174,11 +174,11 @@ grep Error glibc-check-log</userinput></screen> complain about the absence of <filename>/etc/ld.so.conf</filename>. Prevent this warning with:</para> -<screen><userinput>touch /etc/ld.so.conf</userinput></screen> +<screen userlevel="install"><userinput>touch /etc/ld.so.conf</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>The locales that can make the system respond in a different language were not installed by the above command. None of the locales are required, @@ -196,7 +196,7 @@ grep Error glibc-check-log</userinput></screen> The following instructions will install the minimum set of locales necessary for the optimal coverage of tests:</para> -<screen role="nodump"><userinput>mkdir -pv /usr/lib/locale +<screen role="nodump" userlevel="install"><userinput>mkdir -pv /usr/lib/locale localedef -i de_DE -f ISO-8859-1 de_DE localedef -i [EMAIL PROTECTED] -f ISO-8859-15 [EMAIL PROTECTED] localedef -i en_HK -f ISO-8859-1 en_HK @@ -219,7 +219,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen> (it includes every locale listed above and many more) at once with the following time-consuming command:</para> -<screen><userinput>make localedata/install-locales</userinput></screen> +<screen userlevel="install"><userinput>make localedata/install-locales</userinput></screen> <para>Then use the <command>localedef</command> command to create and install locales not listed in the @@ -249,7 +249,7 @@ localedef -i ja_JP -f EUC-JP ja_JP</userinput></screen> <para>Create a new file <filename>/etc/nsswitch.conf</filename> by running the following:</para> -<screen><userinput>cat > /etc/nsswitch.conf << "EOF" +<screen userlevel="install"><userinput>cat > /etc/nsswitch.conf << "EOF" <literal># Begin /etc/nsswitch.conf passwd: files @@ -283,7 +283,7 @@ EOF</userinput></screen> <para>Then create the <filename>/etc/localtime</filename> file by running:</para> -<screen><userinput>cp -v --remove-destination /usr/share/zoneinfo/<replaceable><xxx></replaceable> \ +<screen userlevel="install"><userinput>cp -v --remove-destination /usr/share/zoneinfo/<replaceable><xxx></replaceable> \ /etc/localtime</userinput></screen> <para>Replace <replaceable><xxx></replaceable> with the name of the @@ -331,7 +331,7 @@ EOF</userinput></screen> <para>Create a new file <filename>/etc/ld.so.conf</filename> by running the following:</para> -<screen><userinput>cat > /etc/ld.so.conf << "EOF" +<screen userlevel="install"><userinput>cat > /etc/ld.so.conf << "EOF" <literal># Begin /etc/ld.so.conf /usr/local/lib diff --git a/BOOK/chapter06/grep.xml b/BOOK/chapter06/grep.xml index 139ce30..298bdf8 100644 --- a/BOOK/chapter06/grep.xml +++ b/BOOK/chapter06/grep.xml @@ -62,7 +62,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/groff.xml b/BOOK/chapter06/groff.xml index fe5a300..e934ea1 100644 --- a/BOOK/chapter06/groff.xml +++ b/BOOK/chapter06/groff.xml @@ -78,12 +78,12 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Some documentation programs, such as <command>xman</command>, will not work properly without the following symlinks:</para> -<screen><userinput>ln -sv eqn /usr/bin/geqn +<screen userlevel="install"><userinput>ln -sv eqn /usr/bin/geqn ln -sv tbl /usr/bin/gtbl</userinput></screen> </sect2> diff --git a/BOOK/chapter06/grub.xml b/BOOK/chapter06/grub.xml index 4652064..3768bab 100644 --- a/BOOK/chapter06/grub.xml +++ b/BOOK/chapter06/grub.xml @@ -65,7 +65,7 @@ <para>Install the package:</para> -<screen><userinput>make install +<screen userlevel="install"><userinput>make install mkdir -v /boot/grub cp -v /usr/lib/grub/i386-pc/stage{1,2} /boot/grub</userinput></screen> diff --git a/BOOK/chapter06/gzip.xml b/BOOK/chapter06/gzip.xml index 24ea945..d54df6b 100644 --- a/BOOK/chapter06/gzip.xml +++ b/BOOK/chapter06/gzip.xml @@ -53,11 +53,11 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Move some programs that do not need to be on the root filesystem:</para> -<screen><userinput>mv -v /bin/{gzexe,uncompress,zcmp,zdiff,zegrep} /usr/bin +<screen userlevel="install"><userinput>mv -v /bin/{gzexe,uncompress,zcmp,zdiff,zegrep} /usr/bin mv -v /bin/{zfgrep,zforce,zgrep,zless,zmore,znew} /usr/bin</userinput></screen> </sect2> diff --git a/BOOK/chapter06/iana-etc.xml b/BOOK/chapter06/iana-etc.xml index 17669b2..fdfd467 100644 --- a/BOOK/chapter06/iana-etc.xml +++ b/BOOK/chapter06/iana-etc.xml @@ -50,7 +50,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/inetutils.xml b/BOOK/chapter06/inetutils.xml index c926cbc..62880b2 100644 --- a/BOOK/chapter06/inetutils.xml +++ b/BOOK/chapter06/inetutils.xml @@ -115,12 +115,12 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Move the <command>ping</command> program to its FHS-compliant place:</para> -<screen><userinput>mv -v /usr/bin/ping /bin</userinput></screen> +<screen userlevel="install"><userinput>mv -v /usr/bin/ping /bin</userinput></screen> </sect2> diff --git a/BOOK/chapter06/iproute2.xml b/BOOK/chapter06/iproute2.xml index 79818f8..bc6de56 100644 --- a/BOOK/chapter06/iproute2.xml +++ b/BOOK/chapter06/iproute2.xml @@ -68,7 +68,7 @@ <para>Install the package:</para> -<screen><userinput>make SBINDIR=/sbin install</userinput></screen> +<screen userlevel="install"><userinput>make SBINDIR=/sbin install</userinput></screen> <para>The <command>arpd</command> binary links against the Berkeley DB libraries that reside in <filename class="directory">/usr</filename> and @@ -76,7 +76,7 @@ according to the FHS, it must be in <filename class="directory">/usr/sbin</filename>. Move it there:</para> - <screen><userinput>mv -v /sbin/arpd /usr/sbin</userinput></screen> + <screen userlevel="install"><userinput>mv -v /sbin/arpd /usr/sbin</userinput></screen> </sect2> diff --git a/BOOK/chapter06/kbd.xml b/BOOK/chapter06/kbd.xml index 18d4bf5..2d2286e 100644 --- a/BOOK/chapter06/kbd.xml +++ b/BOOK/chapter06/kbd.xml @@ -79,7 +79,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <note> <para>For some languages (e.g., Belarusian) the Kbd package doesn't @@ -94,7 +94,7 @@ may not be available during the early stages of booting, those binaries need to be on the root partition:</para> -<screen><userinput>mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen> +<screen userlevel="install"><userinput>mv -v /usr/bin/{kbd_mode,openvt,setfont} /bin</userinput></screen> diff --git a/BOOK/chapter06/less.xml b/BOOK/chapter06/less.xml index f212122..1e13456 100644 --- a/BOOK/chapter06/less.xml +++ b/BOOK/chapter06/less.xml @@ -65,7 +65,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/libtool.xml b/BOOK/chapter06/libtool.xml index 8ac7b45..eac9b3d 100644 --- a/BOOK/chapter06/libtool.xml +++ b/BOOK/chapter06/libtool.xml @@ -54,7 +54,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/linux-headers.xml b/BOOK/chapter06/linux-headers.xml index 5cb8145..7eb16c5 100644 --- a/BOOK/chapter06/linux-headers.xml +++ b/BOOK/chapter06/linux-headers.xml @@ -54,7 +54,7 @@ <para>Install the header files:</para> -<screen><userinput>make mrproper +<screen userlevel="install"><userinput>make mrproper make headers_check make INSTALL_HDR_PATH=dest headers_install cp -rv dest/include/* /usr/include</userinput></screen> diff --git a/BOOK/chapter06/m4.xml b/BOOK/chapter06/m4.xml index 6543147..1f89bdc 100644 --- a/BOOK/chapter06/m4.xml +++ b/BOOK/chapter06/m4.xml @@ -52,7 +52,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/make.xml b/BOOK/chapter06/make.xml index fcd7dcd..5d8ae79 100644 --- a/BOOK/chapter06/make.xml +++ b/BOOK/chapter06/make.xml @@ -52,7 +52,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/man-db.xml b/BOOK/chapter06/man-db.xml index 120b419..4afc1fa 100644 --- a/BOOK/chapter06/man-db.xml +++ b/BOOK/chapter06/man-db.xml @@ -112,7 +112,7 @@ EOF</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Some packages provide UTF-8 man pages which this version of <command>man</command> is unable to display. The following script will @@ -124,7 +124,7 @@ EOF</userinput></screen> during the system build, for public data, we will not bother with error checking, nor use a non-predictable temporary file name:</para> -<screen><userinput>cat >> convert-mans << "EOF" +<screen userlevel="install"><userinput>cat >> convert-mans << "EOF" <literal>#!/bin/sh -e FROM="$1" TO="$2" diff --git a/BOOK/chapter06/man-pages.xml b/BOOK/chapter06/man-pages.xml index 3ab5855..576fe0b 100644 --- a/BOOK/chapter06/man-pages.xml +++ b/BOOK/chapter06/man-pages.xml @@ -41,7 +41,7 @@ <para>Install Man-pages by running:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/mktemp.xml b/BOOK/chapter06/mktemp.xml index 65cac5d..9a3e23f 100644 --- a/BOOK/chapter06/mktemp.xml +++ b/BOOK/chapter06/mktemp.xml @@ -74,7 +74,7 @@ <para>Install the package:</para> -<screen><userinput>make install +<screen userlevel="install"><userinput>make install make install-tempfile</userinput></screen> </sect2> diff --git a/BOOK/chapter06/module-init-tools.xml b/BOOK/chapter06/module-init-tools.xml index d45136f..97829fe 100644 --- a/BOOK/chapter06/module-init-tools.xml +++ b/BOOK/chapter06/module-init-tools.xml @@ -63,7 +63,7 @@ make distclean</userinput></screen> <para>Install the package:</para> -<screen><userinput>make INSTALL=install install</userinput></screen> +<screen userlevel="install"><userinput>make INSTALL=install install</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> diff --git a/BOOK/chapter06/ncurses.xml b/BOOK/chapter06/ncurses.xml index ab63a93..eaacc01 100644 --- a/BOOK/chapter06/ncurses.xml +++ b/BOOK/chapter06/ncurses.xml @@ -101,28 +101,28 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Correct the permissions of a library that should not be executable: </para> -<screen><userinput>chmod -v 644 /usr/lib/libncurses++w.a</userinput></screen> +<screen userlevel="install"><userinput>chmod -v 644 /usr/lib/libncurses++w.a</userinput></screen> <para>Move the libraries to the <filename class="directory">/lib</filename> directory, where they are expected to reside:</para> -<screen><userinput>mv -v /usr/lib/libncursesw.so.5* /lib</userinput></screen> +<screen userlevel="install"><userinput>mv -v /usr/lib/libncursesw.so.5* /lib</userinput></screen> <para>Because the libraries have been moved, one symlink points to a non-existent file. Recreate it:</para> -<screen><userinput>ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so</userinput></screen> +<screen userlevel="install"><userinput>ln -sfv ../../lib/libncursesw.so.5 /usr/lib/libncursesw.so</userinput></screen> <para>Many applications still expect the linker to be able to find non-wide-character Ncurses libraries. Trick such applications into linking with wide-character libraries by means of symlinks and linker scripts:</para> -<screen><userinput>for lib in curses ncurses form panel menu ; do \ +<screen userlevel="install"><userinput>for lib in curses ncurses form panel menu ; do \ rm -vf /usr/lib/lib${lib}.so ; \ echo "INPUT(-l${lib}w)" >/usr/lib/lib${lib}.so ; \ ln -sfv lib${lib}w.a /usr/lib/lib${lib}.a ; \ @@ -133,7 +133,7 @@ ln -sfv libncurses++w.a /usr/lib/libncurses++.a</userinput></screen> <filename class="libraryfile">-lcurses</filename> at build time are still buildable:</para> -<screen><userinput>echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so && +<screen userlevel="install"><userinput>echo "INPUT(-lncursesw)" >/usr/lib/libcursesw.so && ln -sfv libncurses.so /usr/lib/libcurses.so && ln -sfv libncursesw.a /usr/lib/libcursesw.a && ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen> @@ -145,7 +145,7 @@ ln -sfv libncurses.a /usr/lib/libcurses.a</userinput></screen> of some binary-only application, build them with the following commands:</para> -<screen role="nodump"><userinput>make distclean && +<screen role="nodump" userlevel="install"><userinput>make distclean && ./configure --prefix=/usr --with-shared --without-normal \ --without-debug --without-cxx-binding && make sources libs && diff --git a/BOOK/chapter06/patch.xml b/BOOK/chapter06/patch.xml index 863d144..3dcde77 100644 --- a/BOOK/chapter06/patch.xml +++ b/BOOK/chapter06/patch.xml @@ -53,7 +53,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/perl.xml b/BOOK/chapter06/perl.xml index 64d1233..f251f9f 100644 --- a/BOOK/chapter06/perl.xml +++ b/BOOK/chapter06/perl.xml @@ -88,7 +88,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/procps.xml b/BOOK/chapter06/procps.xml index f2eae7d..66be404 100644 --- a/BOOK/chapter06/procps.xml +++ b/BOOK/chapter06/procps.xml @@ -47,7 +47,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/psmisc.xml b/BOOK/chapter06/psmisc.xml index 1e0cb1d..9557ec0 100644 --- a/BOOK/chapter06/psmisc.xml +++ b/BOOK/chapter06/psmisc.xml @@ -68,14 +68,14 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>There is no reason for the <command>pstree</command> and <command>pstree.x11</command> programs to reside in <filename class="directory">/bin</filename>. Therefore, move them to <filename class="directory">/usr/bin</filename>:</para> -<screen><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen> +<screen userlevel="install"><userinput>mv -v /bin/pstree* /usr/bin</userinput></screen> <para>By default, Psmisc's <command>pidof</command> program is not installed. This usually is not a problem because it is installed later @@ -84,7 +84,7 @@ particular system, complete the installation of Psmisc by creating the following symlink:</para> -<screen><userinput>ln -sv killall /bin/pidof</userinput></screen> +<screen userlevel="install"><userinput>ln -sv killall /bin/pidof</userinput></screen> </sect2> diff --git a/BOOK/chapter06/readline.xml b/BOOK/chapter06/readline.xml index 740682b..427044f 100644 --- a/BOOK/chapter06/readline.xml +++ b/BOOK/chapter06/readline.xml @@ -81,17 +81,17 @@ sed -i '/{OLDSUFF}/c:' support/shlib-install</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Now move the static libraries to a more appropriate location:</para> -<screen><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen> +<screen userlevel="install"><userinput>mv -v /lib/lib{readline,history}.a /usr/lib</userinput></screen> <para>Next, remove the <filename class="extension">.so</filename> files in <filename class="directory">/lib</filename> and relink them into <filename class="directory">/usr/lib</filename>:</para> -<screen><userinput>rm -v /lib/lib{readline,history}.so +<screen userlevel="install"><userinput>rm -v /lib/lib{readline,history}.so ln -sfv ../../lib/libreadline.so.5 /usr/lib/libreadline.so ln -sfv ../../lib/libhistory.so.5 /usr/lib/libhistory.so</userinput></screen> diff --git a/BOOK/chapter06/sed.xml b/BOOK/chapter06/sed.xml index 80e3108..b38285c 100644 --- a/BOOK/chapter06/sed.xml +++ b/BOOK/chapter06/sed.xml @@ -63,7 +63,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/shadow.xml b/BOOK/chapter06/shadow.xml index 032df18..29be769 100644 --- a/BOOK/chapter06/shadow.xml +++ b/BOOK/chapter06/shadow.xml @@ -126,15 +126,15 @@ convert-mans UTF-8 ISO-8859-9 man/tr/*.?</userinput></screen> <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Move a misplaced program to its proper location:</para> -<screen><userinput>mv -v /usr/bin/passwd /bin</userinput></screen> +<screen userlevel="install"><userinput>mv -v /usr/bin/passwd /bin</userinput></screen> <para>Move Shadow's libraries to more appropriate locations:</para> -<screen><userinput>mv -v /lib/libshadow.*a /usr/lib +<screen userlevel="install"><userinput>mv -v /lib/libshadow.*a /usr/lib rm -v /lib/libshadow.so ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> @@ -170,7 +170,7 @@ ln -sfv ../../lib/libshadow.so.0 /usr/lib/libshadow.so</userinput></screen> change the default home directory for new users and prevent the creation of mail spool files:</para> -<screen><userinput>useradd -D -b /home +<screen userlevel="install"><userinput>useradd -D -b /home sed -i 's/yes/no/' /etc/default/useradd</userinput></screen> </sect2> diff --git a/BOOK/chapter06/sysklogd.xml b/BOOK/chapter06/sysklogd.xml index 67c033e..1ae9f84 100644 --- a/BOOK/chapter06/sysklogd.xml +++ b/BOOK/chapter06/sysklogd.xml @@ -59,7 +59,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> @@ -78,7 +78,7 @@ <para>Create a new <filename>/etc/syslog.conf</filename> file by running the following:</para> -<screen><userinput>cat > /etc/syslog.conf << "EOF" +<screen userlevel="install"><userinput>cat > /etc/syslog.conf << "EOF" <literal># Begin /etc/syslog.conf auth,authpriv.* -/var/log/auth.log diff --git a/BOOK/chapter06/sysvinit.xml b/BOOK/chapter06/sysvinit.xml index 9515a90..635764a 100644 --- a/BOOK/chapter06/sysvinit.xml +++ b/BOOK/chapter06/sysvinit.xml @@ -62,7 +62,7 @@ <para>Install the package:</para> -<screen><userinput>make -C src install</userinput></screen> +<screen userlevel="install"><userinput>make -C src install</userinput></screen> </sect2> @@ -81,7 +81,7 @@ <para>Create a new file <filename>/etc/inittab</filename> by running the following:</para> -<screen><userinput>cat > /etc/inittab << "EOF" +<screen userlevel="install"><userinput>cat > /etc/inittab << "EOF" <literal># Begin /etc/inittab id:3:initdefault: diff --git a/BOOK/chapter06/tar.xml b/BOOK/chapter06/tar.xml index 9e90841..7f7368f 100644 --- a/BOOK/chapter06/tar.xml +++ b/BOOK/chapter06/tar.xml @@ -52,7 +52,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/texinfo.xml b/BOOK/chapter06/texinfo.xml index 10aa308..05a0439 100644 --- a/BOOK/chapter06/texinfo.xml +++ b/BOOK/chapter06/texinfo.xml @@ -66,13 +66,13 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Optionally, install the components belonging in a TeX installation:</para> <!-- FIXME: doesn't the TeX installation in BLFS overwrite files there? --> -<screen><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen> +<screen userlevel="install"><userinput>make TEXMF=/usr/share/texmf install-tex</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> diff --git a/BOOK/chapter06/udev.xml b/BOOK/chapter06/udev.xml index 6cfbee5..d842006 100644 --- a/BOOK/chapter06/udev.xml +++ b/BOOK/chapter06/udev.xml @@ -81,7 +81,7 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen> <para>Install the package:</para> -<screen><userinput>make DESTDIR=/ EXTRAS="`echo extras/*/`" install</userinput></screen> +<screen userlevel="install"><userinput>make DESTDIR=/ EXTRAS="`echo extras/*/`" install</userinput></screen> <variablelist> <title>The meaning of the make parameter:</title> @@ -101,27 +101,27 @@ ln -sv /proc/kcore /lib/udev/devices/core</userinput></screen> installs a few configuration files by default. First install the commonly-used rules files provided by Udev:</para> -<screen><userinput>cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/</userinput></screen> +<screen userlevel="install"><userinput>cp -v etc/udev/rules.d/[0-9]* /etc/udev/rules.d/</userinput></screen> <para>Now install the LFS-specific rules files:</para> -<screen><userinput>cd &udev-config; +<screen userlevel="install"><userinput>cd &udev-config; make install</userinput></screen> <para>Install the documentation that explains the LFS-specific rules files:</para> -<screen><userinput>make install-doc</userinput></screen> +<screen userlevel="install"><userinput>make install-doc</userinput></screen> <para>Install the documentation that explains the commonly-used rules files provided by Udev:</para> -<screen><userinput>make install-extra-doc</userinput></screen> +<screen userlevel="install"><userinput>make install-extra-doc</userinput></screen> <para>Install the documentation that explains how to create custom Udev rules:</para> -<screen><userinput>cd .. +<screen userlevel="install"><userinput>cd .. install -m644 -v docs/writing_udev_rules/index.html \ /usr/share/doc/udev-&udev-version;/index.html</userinput></screen> diff --git a/BOOK/chapter06/util-linux.xml b/BOOK/chapter06/util-linux.xml index 87565df..f1bd307 100644 --- a/BOOK/chapter06/util-linux.xml +++ b/BOOK/chapter06/util-linux.xml @@ -97,7 +97,7 @@ patch -Np1 -i ../&util-linux-lseek-patch;</userinput></screen> <para>Install the package:</para> -<screen><userinput>make HAVE_KILL=yes HAVE_SLN=yes install</userinput></screen> +<screen userlevel="install"><userinput>make HAVE_KILL=yes HAVE_SLN=yes install</userinput></screen> </sect2> diff --git a/BOOK/chapter06/vim.xml b/BOOK/chapter06/vim.xml index 84aca7e..27115a9 100644 --- a/BOOK/chapter06/vim.xml +++ b/BOOK/chapter06/vim.xml @@ -104,7 +104,7 @@ <para>Install the package:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Many users are used to using <command>vi</command> instead of <command>vim</command>. To allow execution of <command>vim</command> @@ -112,7 +112,7 @@ symlink for both the binary and the man page in the provided languages:</para> -<screen><userinput>ln -sv vim /usr/bin/vi +<screen userlevel="install"><userinput>ln -sv vim /usr/bin/vi for L in "" fr it pl ru; do ln -sv vim.1 /usr/share/man/$L/man1/vi.1 done</userinput></screen> @@ -123,7 +123,7 @@ done</userinput></screen> class="directory">/usr/share/doc/vim-&vim-version;</filename>, making it consistent with the location of documentation for other packages:</para> -<screen><userinput>ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen> +<screen userlevel="install"><userinput>ln -sv ../&vim-docdir;/doc /usr/share/doc/vim-&vim-version;</userinput></screen> <para>If an X Window System is going to be installed on the LFS system, it may be necessary to recompile Vim after installing X. Vim @@ -151,7 +151,7 @@ done</userinput></screen> other settings, and overrides must come after this setting. Create a default <command>vim</command> configuration file by running the following:</para> -<screen><userinput>cat > /etc/vimrc << "EOF" +<screen userlevel="install"><userinput>cat > /etc/vimrc << "EOF" <literal>" Begin /etc/vimrc set nocompatible diff --git a/BOOK/chapter06/zlib.xml b/BOOK/chapter06/zlib.xml index 0c86ea9..80322cd 100644 --- a/BOOK/chapter06/zlib.xml +++ b/BOOK/chapter06/zlib.xml @@ -62,14 +62,14 @@ <para>Install the shared library:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>The previous command installed a <filename class="extension">.so</filename> file in <filename class="directory">/lib</filename>. We will remove it and relink it into <filename class="directory">/usr/lib</filename>:</para> -<screen><userinput>rm -v /lib/libz.so +<screen userlevel="install"><userinput>rm -v /lib/libz.so ln -sfv ../../lib/libz.so.&zlib-version; /usr/lib/libz.so</userinput></screen> <para>Build the static library:</para> @@ -83,11 +83,11 @@ make</userinput></screen> <para>Install the static library:</para> -<screen><userinput>make install</userinput></screen> +<screen userlevel="install"><userinput>make install</userinput></screen> <para>Fix the permissions on the static library:</para> -<screen><userinput>chmod -v 644 /usr/lib/libz.a</userinput></screen> +<screen userlevel="install"><userinput>chmod -v 644 /usr/lib/libz.a</userinput></screen> </sect2> diff --git a/BOOK/chapter08/kernel.xml b/BOOK/chapter08/kernel.xml index 0de9af8..a00d343 100644 --- a/BOOK/chapter08/kernel.xml +++ b/BOOK/chapter08/kernel.xml @@ -106,7 +106,7 @@ <para>Install the modules, if the kernel configuration uses them:</para> -<screen><userinput>make modules_install</userinput></screen> +<screen userlevel="install"><userinput>make modules_install</userinput></screen> <para>After kernel compilation is complete, additional steps are required to complete the installation. Some files need to be copied to @@ -115,14 +115,14 @@ <para>The path to the kernel image may vary depending on the platform being used. The following command assumes an x86 architecture:</para> -<screen><userinput>cp -v arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen> +<screen userlevel="install"><userinput>cp -v arch/i386/boot/bzImage /boot/lfskernel-&linux-version;</userinput></screen> <para><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> -<screen><userinput>cp -v System.map /boot/System.map-&linux-version;</userinput></screen> +<screen userlevel="install"><userinput>cp -v System.map /boot/System.map-&linux-version;</userinput></screen> <para>The kernel configuration file <filename>.config</filename> produced by the <command>make menuconfig</command> step @@ -130,11 +130,11 @@ that was just compiled. It is a good idea to keep this file for future reference:</para> -<screen><userinput>cp -v .config /boot/config-&linux-version;</userinput></screen> +<screen userlevel="install"><userinput>cp -v .config /boot/config-&linux-version;</userinput></screen> <para>Install the documentation for the Linux kernel:</para> -<screen><userinput>install -d /usr/share/doc/linux-&linux-version; && +<screen userlevel="install"><userinput>install -d /usr/share/doc/linux-&linux-version; && cp -r Documentation/* /usr/share/doc/linux-&linux-version;</userinput></screen> <para>It is important to note that the files in the kernel source diff --git a/BOOK/stylesheets/dump-commands.xsl b/BOOK/stylesheets/dump-commands.xsl index 9d2dfb5..f71c6e5 100644 --- a/BOOK/stylesheets/dump-commands.xsl +++ b/BOOK/stylesheets/dump-commands.xsl @@ -72,7 +72,7 @@ <xsl:template match="screen"> <xsl:if test="child::* = userinput"> <xsl:choose> - <xsl:when test="@role = 'root'"> + <xsl:when test="@userlevel = 'install'"> <xsl:text># Run this as root</xsl:text> <xsl:value-of select="$newline"/> <xsl:apply-templates select="userinput"/> -- 1.5.1.6 -- http://linuxfromscratch.org/mailman/listinfo/lfs-dev FAQ: http://www.linuxfromscratch.org/faq/ Unsubscribe: See the above information page