gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-07-11 06:44:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge of trunk into multilib

Browse Source
This commit is contained in:
Thomas Trepl 2024-01-15 00:30:10 +01:00
commit 4647f824cf
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile
View File

@ -1,3 +1,4 @@
# vim:ts=3
#BASEDIR = ~/lfs-book #BASEDIR = ~/lfs-book
#SYSDDIR = ~/lfs-systemd #SYSDDIR = ~/lfs-systemd
#DUMPDIR = ~/lfs-commands #DUMPDIR = ~/lfs-commands
@ -23,12 +24,12 @@ ifneq ($(REV), sysv)
endif endif
ifeq ($(REV), sysv) ifeq ($(REV), sysv)
BASEDIR ?= ~/lfs-book BASEDIR ?= ~/public_html/lfs-book
PDF_OUTPUT ?= LFS-BOOK.pdf PDF_OUTPUT ?= LFS-BOOK.pdf
NOCHUNKS_OUTPUT ?= LFS-BOOK.html NOCHUNKS_OUTPUT ?= LFS-BOOK.html
DUMPDIR ?= ~/lfs-commands DUMPDIR ?= ~/lfs-commands
else else
BASEDIR ?= ~/lfs-systemd BASEDIR ?= ~/public_html/lfs-systemd
PDF_OUTPUT ?= LFS-SYSD-BOOK.pdf PDF_OUTPUT ?= LFS-SYSD-BOOK.pdf
NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html
DUMPDIR ?= ~/lfs-sysd-commands DUMPDIR ?= ~/lfs-sysd-commands
@ -60,6 +61,7 @@ book: validate profile-html
$(Q)mkdir -p $(BASEDIR)/stylesheets $(Q)mkdir -p $(BASEDIR)/stylesheets
$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets $(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
$(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html $(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
$(Q)sed -i 's/xmlns:xlink.*xlink"//' $(BASEDIR)/longindex.html
$(Q)mkdir -p $(BASEDIR)/images $(Q)mkdir -p $(BASEDIR)/images
$(Q)cp images/*.png $(BASEDIR)/images $(Q)cp images/*.png $(BASEDIR)/images
@ -112,6 +114,7 @@ nochunks: validate profile-html
$(RENDERTMP)/lfs-html.xml $(RENDERTMP)/lfs-html.xml
# $(RENDERTMP)/lfs-html2.xml # $(RENDERTMP)/lfs-html2.xml
$(Q)sed 's/xmlns:xlink.*xlink"//' -i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
@echo "Running Tidy..." @echo "Running Tidy..."
$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true $(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
@ -120,7 +123,6 @@ nochunks: validate profile-html
$(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@text/html@application/xhtml+xml@g" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)sed -i -e "s@../wget-list@wget-list@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@../wget-list@wget-list@" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)sed -i -e "s@../md5sums@md5sums@" $(BASEDIR)/$(NOCHUNKS_OUTPUT) $(Q)sed -i -e "s@../md5sums@md5sums@" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
$(Q)sed -i -e "s@\xa9@\©@" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
@echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)" @echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"

2
chapter08/udev.xml
View File

@ -137,7 +137,7 @@ meson setup \
<screen><userinput remap="make">ninja udevadm systemd-hwdb \ <screen><userinput remap="make">ninja udevadm systemd-hwdb \
$(ninja -n | grep -Eo '(src/(lib)?udev|rules.d|hwdb.d)/[^ ]*') \ $(ninja -n | grep -Eo '(src/(lib)?udev|rules.d|hwdb.d)/[^ ]*') \
$(realpath libudev.so --relative-to .) \ $(realpath libudev.so --relative-to .) \
$udev_helpers udevadm</userinput></screen> $udev_helpers</userinput></screen>
<para>Install the package:</para> <para>Install the package:</para>

3
stylesheets/lfs-xsl/nochunks.xsl
View File

@ -10,9 +10,6 @@
<!-- Upstream XHTML templates --> <!-- Upstream XHTML templates -->
<xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/> <xsl:import href="http://docbook.sourceforge.net/release/xsl/current/xhtml/docbook.xsl"/>
<!-- Fix encoding issues with default UTF-8 output of the xhtml stylesheet -->
<xsl:output method="html" encoding="ISO-8859-1" indent="no" />
<!-- Include our customized templates --> <!-- Include our customized templates -->
<xsl:include href="common.xsl"/> <xsl:include href="common.xsl"/>
<xsl:include href="xhtml/lfs-index.xsl"/> <xsl:include href="xhtml/lfs-index.xsl"/>