From aec038d85e05e4e18283593756e85398be6220f1 Mon Sep 17 00:00:00 2001
From: Poltern <2363951+Poltern@users.noreply.github.com>
Date: Wed, 31 Jan 2024 21:41:07 +0500
Subject: [PATCH] Packages update and small fix
---
Makefile | 66 +++++++++++++++---------------
appendices/dependencies.xml | 2 +-
chapter01/changelog.xml | 44 ++++++++++++++++++++
chapter01/whatsnew.xml | 20 ++++++----
chapter03/patches.xml | 6 +--
chapter07/python.xml | 17 ++++----
chapter08/gcc.xml | 2 +-
chapter08/libtool.xml | 5 ++-
chapter08/pkgconf.xml | 4 +-
chapter10/kernel/kernel.version | 2 +-
packages.ent | 71 +++++++++++++++++----------------
patches.ent | 4 ++
12 files changed, 149 insertions(+), 94 deletions(-)
diff --git a/Makefile b/Makefile
index 27e6356..6de06f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,4 @@
# vim:ts=3
-#BASEDIR = ~/lfs-book
-#SYSDDIR = ~/lfs-systemd
-#DUMPDIR = ~/lfs-commands
RENDERTMP = $(HOME)/tmp
CHUNK_QUIET = 1
ROOT_ID =
@@ -24,15 +21,15 @@ ifneq ($(REV), sysv)
endif
ifeq ($(REV), sysv)
- BASEDIR ?= ~/public_html/lfs-book
+ BASEDIR ?= $(HOME)/public_html/lfs-book
PDF_OUTPUT ?= LFS-BOOK.pdf
NOCHUNKS_OUTPUT ?= LFS-BOOK.html
- DUMPDIR ?= ~/lfs-commands
+ DUMPDIR ?= $(HOME)/lfs-commands
else
- BASEDIR ?= ~/public_html/lfs-systemd
+ BASEDIR ?= $(HOME)/public_html/lfs-systemd
PDF_OUTPUT ?= LFS-SYSD-BOOK.pdf
NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html
- DUMPDIR ?= ~/lfs-sysd-commands
+ DUMPDIR ?= $(HOME)/lfs-sysd-commands
endif
book: validate profile-html
@@ -47,7 +44,8 @@ book: validate profile-html
@echo "Copying CSS code and images..."
$(Q)mkdir -p $(BASEDIR)/stylesheets
$(Q)cp stylesheets/lfs-xsl/*.css $(BASEDIR)/stylesheets
- $(Q)sed -i 's|../stylesheet|stylesheet|' $(BASEDIR)/index.html
+ $(Q)sed -e 's|../stylesheet|stylesheet|' \
+ -i $(BASEDIR)/index.html
$(Q)mkdir -p $(BASEDIR)/images
$(Q)cp images/*.png $(BASEDIR)/images
@@ -55,11 +53,10 @@ book: validate profile-html
@echo "Running Tidy and obfuscate.sh..."
$(Q)for filename in `find $(BASEDIR) -name "*.html"`; do \
tidy -config tidy.conf $$filename; \
- true; \
/bin/bash obfuscate.sh $$filename; \
- sed -e "s@text/html@application/xhtml+xml@g" \
+ sed -e "s|text/html|application/xhtml+xml|g" \
-i $$filename; \
- done;
+ done
$(Q)$(MAKE) --no-print-directory wget-list md5sums
@@ -107,16 +104,16 @@ nochunks: validate profile-html
--output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
stylesheets/lfs-nochunks.xsl \
$(RENDERTMP)/lfs-html.xml
-# $(RENDERTMP)/lfs-html2.xml
@echo "Running Tidy..."
$(Q)tidy -config tidy.conf $(BASEDIR)/$(NOCHUNKS_OUTPUT) || true
@echo "Running obfuscate.sh..."
$(Q)bash obfuscate.sh $(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@../md5sums@md5sums@" $(BASEDIR)/$(NOCHUNKS_OUTPUT)
+ $(Q)sed -e "s|text/html|application/xhtml+xml|g" \
+ -e "s|../wget-list|wget-list|" \
+ -e "s|../md5sums|md5sums|" \
+ -i $(BASEDIR)/$(NOCHUNKS_OUTPUT)
@echo "Output at $(BASEDIR)/$(NOCHUNKS_OUTPUT)"
@@ -135,16 +132,16 @@ validate: tmpdir version
@echo "Adjusting for revision $(REV)..."
$(Q)xsltproc --nonet \
--xinclude \
- --output $(RENDERTMP)/lfs-html2.xml \
--stringparam profile.revision $(REV) \
+ --output $(RENDERTMP)/lfs-html2.xml \
stylesheets/lfs-xsl/profile.xsl \
index.xml
@echo "Validating the book..."
- $(Q)xmllint --nonet \
- --noent \
- --postvalid \
- -o $(RENDERTMP)/lfs-full.xml \
+ $(Q)xmllint --nonet \
+ --encode UTF-8 \
+ --postvalid \
+ --output $(RENDERTMP)/lfs-full.xml \
$(RENDERTMP)/lfs-html2.xml
$(Q)rm -f appendices/*.script
@@ -159,42 +156,45 @@ profile-html:
stylesheets/lfs-xsl/profile.xsl \
$(RENDERTMP)/lfs-full.xml
+DOWNLOADS_DEP = chapter03/packages.xml chapter03/patches.xml \
+ packages.ent patches.ent general.ent
+
wget-list: $(BASEDIR)/wget-list $(BASEDIR)/wget-list-$(REV)
-$(BASEDIR)/wget-list: stylesheets/wget-list.xsl chapter03/chapter03.xml \
- packages.ent patches.ent general.ent
+$(BASEDIR)/wget-list: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
@echo "Generating consolidated wget list at $(BASEDIR)/wget-list ..."
$(Q)mkdir -p $(BASEDIR)
- $(Q)xsltproc --xinclude --nonet \
+ $(Q)xsltproc --nonet \
+ --xinclude \
--output $(BASEDIR)/wget-list \
- stylesheets/wget-list.xsl \
+ stylesheets/wget-list.xsl \
chapter03/chapter03.xml
-$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl \
- chapter03/chapter03.xml \
- packages.ent patches.ent general.ent
- $(Q)xsltproc --nonet --xinclude \
+$(BASEDIR)/wget-list-$(REV): stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
+ $(Q)xsltproc --nonet \
+ --xinclude \
--stringparam profile.revision $(REV) \
--output $(RENDERTMP)/wget-list.xml \
stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
- $(Q)xsltproc --xinclude --nonet \
+
+ $(Q)xsltproc --nonet \
--output $(BASEDIR)/wget-list-$(REV) \
stylesheets/wget-list.xsl \
$(RENDERTMP)/wget-list.xml
md5sums: $(BASEDIR)/md5sums
-$(BASEDIR)/md5sums: stylesheets/wget-list.xsl chapter03/chapter03.xml \
- packages.ent patches.ent
+$(BASEDIR)/md5sums: stylesheets/wget-list.xsl $(DOWNLOADS_DEP)
@echo "Generating consolidated md5sum file at $(BASEDIR)/md5sums ..."
$(Q)mkdir -p $(BASEDIR)
- $(Q)xsltproc --nonet --xinclude \
+ $(Q)xsltproc --nonet \
+ --xinclude \
--stringparam profile.revision $(REV) \
--output $(RENDERTMP)/md5sum.xml \
stylesheets/lfs-xsl/profile.xsl \
chapter03/chapter03.xml
- $(Q)xsltproc --xinclude --nonet \
+ $(Q)xsltproc --nonet \
--output $(BASEDIR)/md5sums \
stylesheets/md5sum.xsl \
$(RENDERTMP)/md5sum.xml
diff --git a/appendices/dependencies.xml b/appendices/dependencies.xml
index 31df484..255d9ae 100644
--- a/appendices/dependencies.xml
+++ b/appendices/dependencies.xml
@@ -1044,7 +1044,7 @@
python. - Нужный архив это
python. + Сейчас необходимо распаковать файл
фатальную ошибку. Сообщение следует проигнорировать. - Просто убедитесь, что команда