gronod/lfs
1
0
Fork 0
mirror of https://git.linuxfromscratch.org/lfs.git synced 2025-06-19 11:49:20 +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-17 15:07:16 +01:00
commit 0632116b70
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Makefile
View File

@ -48,6 +48,9 @@ ifneq ($(ARCH), default)
endif endif
endif endif
# https://github.com/docbook/xslt10-stylesheets/issues/239
SED_XMLNS_XLINK = sed -i 's/xmlns:xlink.*xlink"//'
book: validate profile-html book: validate profile-html
@echo "Generating chunked XHTML files at $(BASEDIR)/ ..." @echo "Generating chunked XHTML files at $(BASEDIR)/ ..."
$(Q)xsltproc --nonet \ $(Q)xsltproc --nonet \
@ -61,7 +64,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)$(SED_XMLNS_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
@ -114,7 +117,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) $(Q)$(SED_XMLNS_XLINK) $(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

2
chapter08/systemd.xml
View File

@ -157,7 +157,7 @@ meson setup \
</varlistentry> </varlistentry>
<varlistentry> <varlistentry>
<term><parameter>-Dman=false</parameter></term> <term><parameter>-Dman=disabled</parameter></term>
<listitem> <listitem>
<para>Prevent the generation of man pages to avoid extra <para>Prevent the generation of man pages to avoid extra
dependencies. We will install pre-generated man pages for systemd dependencies. We will install pre-generated man pages for systemd