diff --git a/Makefile b/Makefile index e024d1cb1..9ac5a675f 100644 --- a/Makefile +++ b/Makefile @@ -1,13 +1,9 @@ -BASEDIR = ~/lfs-book -SYSDDIR = ~/lfs-systemd -DUMPDIR = ~/lfs-commands +#BASEDIR = ~/lfs-book +#SYSDDIR = ~/lfs-systemd +#DUMPDIR = ~/lfs-commands RENDERTMP = $(HOME)/tmp CHUNK_QUIET = 1 ROOT_ID = -PDF_OUTPUT = LFS-BOOK.pdf -PDF_SYSD_OUTPUT = LFS-SYSD-BOOK.pdf -NOCHUNKS_OUTPUT = LFS-BOOK.html -NOCHUNKS_SYSD_FILE = LFS-SYSD-BOOK.html SHELL = /bin/bash ifdef V @@ -16,14 +12,30 @@ else Q = @ endif -sysv: validate profile-html - $(Q)xsltproc --nonet \ - --output $(RENDERTMP)/lfs-html2.xml \ - --stringparam profile.revision sysv \ - stylesheets/lfs-xsl/profile.xsl \ - $(RENDERTMP)/lfs-html.xml +ifndef REV + REV = sysv +endif - @echo "Generating chunked XHTML files..." +ifneq ($(REV), sysv) + ifneq ($(REV), systemd) + $(error REV must be 'sysv' (default) or 'systemd'.) + endif +endif + +ifeq ($(REV), sysv) + BASEDIR = ~/lfs-book + PDF_OUTPUT = LFS-BOOK.pdf + NOCHUNKS_OUTPUT = LFS-BOOK.html + DUMPDIR = ~/lfs-commands +else + BASEDIR = ~/lfs-systemd + PDF_OUTPUT = LFS-SYSD-BOOK.pdf + NOCHUNKS_OUTPUT = LFS-SYSD-BOOK.html + DUMPDIR = ~/lfs-sysd-commands +endif + +book: validate profile-html + @echo "Generating chunked XHTML files at $(BASEDIR)/ ..." $(Q)xsltproc --nonet \ --stringparam chunk.quietly $(CHUNK_QUIET) \ --stringparam rootid "$(ROOT_ID)" \ @@ -53,48 +65,13 @@ sysv: validate profile-html $(Q)$(MAKE) --no-print-directory wget-list md5sums -systemd: validated profile-html - $(Q)xsltproc --nonet \ - --output $(RENDERTMP)/lfs-html2.xml \ - --stringparam profile.revision systemd \ - stylesheets/lfs-xsl/profile.xsl \ - $(RENDERTMP)/lfs-html.xml - - @echo "Generating chunked XHTML files..." - $(Q)xsltproc --nonet \ - --stringparam chunk.quietly $(CHUNK_QUIET) \ - --stringparam rootid "$(ROOT_ID)" \ - --stringparam base.dir $(SYSDDIR)/ \ - stylesheets/lfs-chunked.xsl \ - $(RENDERTMP)/lfs-html2.xml - - @echo "Copying CSS code and images..." - $(Q)mkdir -p $(SYSDDIR)/stylesheets - $(Q)cp stylesheets/lfs-xsl/*.css $(SYSDDIR)/stylesheets - - $(Q)mkdir -p $(SYSDDIR)/images - $(Q)cp images/*.png $(SYSDDIR)/images - - @echo "Running Tidy and obfuscate.sh..." - $(Q)for filename in `find $(SYSDDIR) -name "*.html"`; do \ - tidy -config tidy.conf $$filename; \ - true; \ - /bin/bash obfuscate.sh $$filename; \ - sed -e "s@text/html@application/xhtml+xml@g" \ - -e "s/\xa9/\©/ " \ - -i $$filename; \ - done; - - $(Q)$(MAKE) --no-print-directory wget-listd md5sumsd - pdf: validate @echo "Generating profiled XML for PDF..." $(Q)xsltproc --nonet \ --stringparam profile.condition pdf \ - --stringparam profile.revision sysv \ --output $(RENDERTMP)/lfs-pdf.xml \ stylesheets/lfs-xsl/profile.xsl \ - $(RENDERTMP)/lfs-full.xml + $(RENDERTMP)/lfs-html2.xml @echo "Generating FO file..." $(Q)xsltproc --nonet \ @@ -113,39 +90,7 @@ pdf: validate @echo "$(BASEDIR)/$(PDF_OUTPUT) created" @echo "fop.log created" -pdfd: validated - @echo "Generating profiled XML for PDF..." - $(Q)xsltproc --nonet \ - --stringparam profile.condition pdf \ - --stringparam profile.revision systemd \ - --output $(RENDERTMP)/lfs-pdf.xml \ - stylesheets/lfs-xsl/profile.xsl \ - $(RENDERTMP)/lfs-full.xml - - @echo "Generating FO file..." - $(Q)xsltproc --nonet \ - --stringparam rootid "$(ROOT_ID)" \ - --output $(RENDERTMP)/lfs-pdf.fo \ - stylesheets/lfs-pdf.xsl \ - $(RENDERTMP)/lfs-pdf.xml - - $(Q)sed -i -e 's/span="inherit"/span="all"/' $(RENDERTMP)/lfs-pdf.fo - $(Q)bash pdf-fixups.sh $(RENDERTMP)/lfs-pdf.fo - - @echo "Generating PDF file..." - $(Q)mkdir -p $(SYSDDIR) - - $(Q)fop -q $(RENDERTMP)/lfs-pdf.fo $(SYSDDIR)/$(PDF_SYSD_OUTPUT) 2>fop.log - @echo "$(SYSDDIR)/$(PDF_SYSD_OUTPUT) created" - @echo "fop.log created" - nochunks: validate profile-html - $(Q)xsltproc --nonet \ - --output $(RENDERTMP)/lfs-html2.xml \ - --stringparam profile.revision sysv \ - stylesheets/lfs-xsl/profile.xsl \ - $(RENDERTMP)/lfs-html.xml - @echo "Generating non chunked XHTML file..." $(Q)xsltproc --nonet \ --stringparam rootid "$(ROOT_ID)" \ @@ -165,81 +110,55 @@ nochunks: validate profile-html @echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)" -nochunksd: validated profile-html - $(Q)xsltproc --nonet \ - --output $(RENDERTMP)/lfs-html2.xml \ - --stringparam profile.revision systemd \ - stylesheets/lfs-xsl/profile.xsl \ - $(RENDERTMP)/lfs-html.xml - - @echo "Generating non chunked XHTML file..." - $(Q)xsltproc --nonet \ - --stringparam rootid "$(ROOT_ID)" \ - --output $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) \ - stylesheets/lfs-nochunks.xsl \ - $(RENDERTMP)/lfs-html2.xml - - @echo "Running Tidy..." - $(Q)tidy -config tidy.conf $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) || true - - @echo "Running obfuscate.sh..." - $(Q)bash obfuscate.sh $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) - $(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) - $(Q)sed -i -e "s@../wget-list@wget-list@" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) - $(Q)sed -i -e "s@../md5sums@md5sums@" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) - $(Q)sed -i -e "s@\xa9@\©@" $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE) - - @echo "Output at $(SYSDDIR)/$(NOCHUNKS_SYSD_FILE)" - tmpdir: @echo "Creating and cleaning $(RENDERTMP)" $(Q)mkdir -p $(RENDERTMP) $(Q)rm -f $(RENDERTMP)/lfs*.xml - $(Q)rm -f $(RENDERTMP)/sysd*.xml + $(Q)rm -f $(RENDERTMP)/*wget* + $(Q)rm -f $(RENDERTMP)/*md5sum* $(Q)rm -f $(RENDERTMP)/*pdf.fo validate: tmpdir @echo "Processing bootscripts..." $(Q)bash process-scripts.sh + + @echo "Adjusting for revision $(REV)..." + $(Q)xsltproc --nonet \ + --xinclude \ + --output $(RENDERTMP)/lfs-html2.xml \ + --stringparam profile.revision $(REV) \ + stylesheets/lfs-xsl/profile.xsl \ + index.xml + @echo "Validating the book..." $(Q)xmllint --nonet \ --noent \ - --xinclude \ --postvalid \ -o $(RENDERTMP)/lfs-full.xml \ - index.xml + $(RENDERTMP)/lfs-html2.xml + $(Q)rm -f appendices/*.script $(Q)./aux-file-data.sh $(RENDERTMP)/lfs-full.xml @echo "Validation complete." -validated: tmpdir - @echo "Validating the book..." - $(Q)xmllint --nonet \ - --noent \ - --xinclude \ - --postvalid \ - -o $(RENDERTMP)/lfs-full.xml \ - indexd.xml - @echo "Validation complete." - profile-html: @echo "Generating profiled XML for XHTML..." $(Q)xsltproc --nonet \ --stringparam profile.condition html \ --output $(RENDERTMP)/lfs-html.xml \ stylesheets/lfs-xsl/profile.xsl \ - $(RENDERTMP)/lfs-full.xml + $(RENDERTMP)/lfs-html2.xml wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \ packages.ent patches.ent - @echo "Generating wget list for sysv..." + @echo "Generating wget list for sysv at $(BASEDIR)/wget-list ..." $(Q)mkdir -p $(BASEDIR) - $(Q)xsltproc --nonet --xinclude \ - --stringparam profile.revision sysv \ - --output $(RENDERTMP)/sysd-wget.xml \ - stylesheets/lfs-xsl/profile.xsl \ + $(Q)xsltproc --nonet --xinclude \ + --stringparam profile.revision $(REV) \ + --output $(RENDERTMP)/sysd-wget.xml \ + stylesheets/lfs-xsl/profile.xsl \ chapter03/chapter03.xml $(Q)xsltproc --xinclude --nonet \ @@ -247,31 +166,14 @@ $(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \ stylesheets/wget-list.xsl \ chapter03/chapter03.xml -wget-listd: $(SYSDDIR)/wget-listd -$(SYSDDIR)/wget-listd: stylesheets/wget-list.xsl chapter03/chapter03.xml \ - packages.ent patches.ent - @echo "Generating wget list for systemd..." - $(Q)mkdir -p $(SYSDDIR) - - $(Q)xsltproc --xinclude --nonet \ - --stringparam profile.revision systemd \ - --output $(RENDERTMP)/sysd-wget.xml \ - stylesheets/lfs-xsl/profile.xsl \ - chapter03/chapter03.xml - - $(Q)xsltproc --xinclude --nonet \ - --output $(SYSDDIR)/wget-list \ - stylesheets/wget-list.xsl \ - $(RENDERTMP)/sysd-wget.xml - md5sums: $(BASEDIR)/md5sums $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \ packages.ent patches.ent - @echo "Generating md5sum file for sysv..." + @echo "Generating md5sum file for sysv at $(BASEDIR)/md5sums ..." $(Q)mkdir -p $(BASEDIR) $(Q)xsltproc --nonet --xinclude \ - --stringparam profile.revision sysv \ + --stringparam profile.revision $(REV) \ --output $(RENDERTMP)/sysv-md5sum.xml \ stylesheets/lfs-xsl/profile.xsl \ chapter03/chapter03.xml @@ -284,28 +186,12 @@ $(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \ "s/BOOTSCRIPTS-MD5SUM/$(shell md5sum lfs-bootscripts*.tar.bz2 | cut -d' ' -f1)/" \ $(BASEDIR)/md5sums -md5sumsd: $(SYSDDIR)/md5sums -$(SYSDDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \ - packages.ent patches.ent - @echo "Generating md5sum file for systemd..." - $(Q)mkdir -p $(SYSDDIR) - $(Q)xsltproc --nonet --xinclude \ - --stringparam profile.revision systemd \ - --output $(RENDERTMP)/sysd-md5sum.xml \ - stylesheets/lfs-xsl/profile.xsl \ - chapter03/chapter03.xml - - $(Q)xsltproc --xinclude --nonet \ - --output $(SYSDDIR)/md5sums \ - stylesheets/md5sum.xsl \ - $(RENDERTMP)/sysd-md5sum.xml - dump-commands: validate @echo "Dumping book commands..." - $(Q)xsltproc --nonet \ - --output $(RENDERTMP)/lfs-html.xml \ - --stringparam profile.revision sysv \ - stylesheets/lfs-xsl/profile.xsl \ + $(Q)xsltproc --nonet \ + --output $(RENDERTMP)/lfs-html.xml \ + --stringparam profile.revision $(REV) \ + stylesheets/lfs-xsl/profile.xsl \ $(RENDERTMP)/lfs-full.xml $(Q)rm -rf $(DUMPDIR) @@ -315,22 +201,7 @@ dump-commands: validate $(RENDERTMP)/lfs-html.xml @echo "Dumping book commands complete in $(DUMPDIR)" -dump-commandsd: validated - @echo "Dumping book commands..." - $(Q)xsltproc --nonet \ - --output $(RENDERTMP)/lfs-html.xml \ - --stringparam profile.revision systemd \ - stylesheets/lfs-xsl/profile.xsl \ - $(RENDERTMP)/lfs-full.xml +all: book nochunks pdf dump-commands - $(Q)rm -rf $(DUMPDIR) - - $(Q)xsltproc --output $(DUMPDIR)/ \ - stylesheets/dump-commands.xsl \ - $(RENDERTMP)/lfs-html.xml - @echo "Dumping book commands complete in $(DUMPDIR)" - -all: lfs nochunks pdf dump-commands - -.PHONY : all sysv systemd dump-commands lfs nochunks pdf profile-html tmpdir validate +.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list diff --git a/appendices/acknowledgments.xml b/appendices/acknowledgments.xml index 340951148..5ebcbfa95 100644 --- a/appendices/acknowledgments.xml +++ b/appendices/acknowledgments.xml @@ -214,7 +214,7 @@ - Philippe Baqué + Philippe Baque <baque@cict.fr> – lfs.cict.fr mirror diff --git a/appendices/scripts.xml b/appendices/scripts.xml index abe836cb7..69d653bdc 100644 --- a/appendices/scripts.xml +++ b/appendices/scripts.xml @@ -32,7 +32,7 @@ %general-entities; ]> - + diff --git a/appendices/udev-rules.xml b/appendices/udev-rules.xml index cdc968776..d1ab70dcf 100644 --- a/appendices/udev-rules.xml +++ b/appendices/udev-rules.xml @@ -6,7 +6,7 @@ %general-entities; ]> - + diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 264834493..300e8c57d 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -67,10 +67,11 @@ + + + - - @@ -82,16 +83,20 @@ - + + + + + + - - + + diff --git a/chapter06/chapter06d.xml b/chapter06/chapter06d.xml deleted file mode 100644 index d08135f7e..000000000 --- a/chapter06/chapter06d.xml +++ /dev/null @@ -1,87 +0,0 @@ - - - %general-entities; -]> - - - - - - Installing Basic System Software - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/chapter06/dbus.xml b/chapter06/dbus.xml index ee5390137..0448659f6 100644 --- a/chapter06/dbus.xml +++ b/chapter06/dbus.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + diff --git a/chapter06/eudev.xml b/chapter06/eudev.xml index 498ec8c30..2930b8e02 100644 --- a/chapter06/eudev.xml +++ b/chapter06/eudev.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + @@ -152,7 +152,7 @@ make -f &udev-lfs-version;/Makefile.lfs install Short Descriptions - + udevadm Generic udev administration tool: controls the udevd daemon, diff --git a/chapter06/sysklogd.xml b/chapter06/sysklogd.xml index db76b6c85..d4cf68ecb 100644 --- a/chapter06/sysklogd.xml +++ b/chapter06/sysklogd.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + diff --git a/chapter06/systemd.xml b/chapter06/systemd.xml index bbfac9c61..76ed51378 100644 --- a/chapter06/systemd.xml +++ b/chapter06/systemd.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + diff --git a/chapter06/sysvinit.xml b/chapter06/sysvinit.xml index 33376f7c2..7ef8bc4e6 100644 --- a/chapter06/sysvinit.xml +++ b/chapter06/sysvinit.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + diff --git a/chapter07/bootscripts.xml b/chapter07/bootscripts.xml index 76bde3d03..8c4c1695e 100644 --- a/chapter07/bootscripts.xml +++ b/chapter07/bootscripts.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + diff --git a/chapter07/chapter07.xml b/chapter07/chapter07.xml index e1abbc637..e3cdcd721 100644 --- a/chapter07/chapter07.xml +++ b/chapter07/chapter07.xml @@ -16,16 +16,23 @@ - - - - - - - + + + + + + + + + + + + + + diff --git a/chapter07/chapter07d.xml b/chapter07/chapter07d.xml deleted file mode 100644 index a2c30abe0..000000000 --- a/chapter07/chapter07d.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - %general-entities; -]> - - - - - - Basic System Configuration - - - - - - - - - - - - - diff --git a/chapter07/clock.xml b/chapter07/clock.xml index 0dbdc7eaf..f5e710ebe 100644 --- a/chapter07/clock.xml +++ b/chapter07/clock.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Configuring the system clock diff --git a/chapter07/consoled.xml b/chapter07/consoled.xml index ea1062c23..f9d2ea0d5 100644 --- a/chapter07/consoled.xml +++ b/chapter07/consoled.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Configuring the Linux Console diff --git a/chapter07/introduction.xml b/chapter07/introduction.xml index 8ee7384cd..810c927cc 100644 --- a/chapter07/introduction.xml +++ b/chapter07/introduction.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Introduction diff --git a/chapter07/introductiond.xml b/chapter07/introductiond.xml index 59d618b8b..dbd6705ce 100644 --- a/chapter07/introductiond.xml +++ b/chapter07/introductiond.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Introduction diff --git a/chapter07/locale.xml b/chapter07/locale.xml index 76dbb7251..3e6c2aa7a 100644 --- a/chapter07/locale.xml +++ b/chapter07/locale.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Configuring the System Locale diff --git a/chapter07/network.xml b/chapter07/network.xml index f70f23c41..f95f0e26d 100644 --- a/chapter07/network.xml +++ b/chapter07/network.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + General Network Configuration diff --git a/chapter07/networkd.xml b/chapter07/networkd.xml index 86dcb3e53..17e879fb7 100644 --- a/chapter07/networkd.xml +++ b/chapter07/networkd.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + General Network Configuration diff --git a/chapter07/profile.xml b/chapter07/profile.xml index a3b066fd0..8bbcb8eae 100644 --- a/chapter07/profile.xml +++ b/chapter07/profile.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + The Bash Shell Startup Files diff --git a/chapter07/symlinks.xml b/chapter07/symlinks.xml index 0993f2305..e80f839dd 100644 --- a/chapter07/symlinks.xml +++ b/chapter07/symlinks.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Managing Devices diff --git a/chapter07/symlinksd.xml b/chapter07/symlinksd.xml index 354ae319a..b0d6460cf 100644 --- a/chapter07/symlinksd.xml +++ b/chapter07/symlinksd.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Creating Custom Symlinks to Devices diff --git a/chapter07/systemd-custom.xml b/chapter07/systemd-custom.xml index 0c8ca75b9..3f2f84f3f 100644 --- a/chapter07/systemd-custom.xml +++ b/chapter07/systemd-custom.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Systemd Usage and Configuration diff --git a/chapter07/udev.xml b/chapter07/udev.xml index 7d1f9b59c..f42260fb6 100644 --- a/chapter07/udev.xml +++ b/chapter07/udev.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Overview of Device and Module Handling diff --git a/chapter07/udevd.xml b/chapter07/udevd.xml index 548a2d2ee..d63592415 100644 --- a/chapter07/udevd.xml +++ b/chapter07/udevd.xml @@ -5,7 +5,7 @@ %general-entities; ]> - + Device and Module Handling on an LFS System diff --git a/chapter07/usage.xml b/chapter07/usage.xml index f0e62b6c3..b710e484b 100644 --- a/chapter07/usage.xml +++ b/chapter07/usage.xml @@ -6,7 +6,7 @@ %general-entities; ]> - + System V Bootscript Usage and Configuration diff --git a/index.xml b/index.xml index 5795b8b8d..d20257f57 100644 --- a/index.xml +++ b/index.xml @@ -41,8 +41,11 @@ + + + diff --git a/indexd.xml b/indexd.xml deleted file mode 100644 index a733fb3c8..000000000 --- a/indexd.xml +++ /dev/null @@ -1,48 +0,0 @@ - - - %general-entities; -]> - - - - - - -Introduction - - - - - - -Preparing for the Build - - - - - - - - -Building the LFS System - - - - - - - - -Appendices - - - - - - - - - - -