| Newsgroups |
gmane.linux.lfs.book |
| Message-ID |
<177360801237.22424.13909641447125391392@rivendell.linuxfromscratch.org> |
This is an automated email from the git hooks/post-receive script.
git pushed a commit to branch multilib
in repository lfs.
The following commit(s) were added to refs/heads/multilib by this push:
new d3685cebc Multiple rendering changes for ML.
d3685cebc is described below
commit d3685cebcce904a2296858690d0498950337d017
Author: Zeckmathederg <[email protected]>
AuthorDate: Sun Mar 15 14:45:02 2026 -0600
Multiple rendering changes for ML.
These changes deviate from LFS a bit, but makes life much easier for
rendering, releasing, makes things cleaner, and other nicities.
The Makefile has been slightly reordered. First is that we check if
systemd is defined, then check sysv, instead of the other way around.
Systemd is now the priority. We also no longer do a check for Sysv, else
do this. While there are only two revisions, it's probably better to be
less ambiguous of what the other revision is. BASEDIR and others
changed, so the default revision now outputs to /mlfs instead of
/mlfs-book. The systemd revision no longer is suffixed with
systemd/sysd. sysv, instead of being /mlfs-book, is now /mlfs-sysv.
Other targets that aren't used in MLFS are now gone. I don't know if
this breaks Thomas' rendering script, though it seems to already be
broken because of the way it pulls in changes.
whatsnew fixed a change from trunk that assumed Systemd is the only
revision, thus is missing a revision="systemd" flag.
git-version.sh had the most changes, but it boils down to using a Git
hash for version tracking for users to more easily track where the book
is in its history, instead of the number of commits since the latest
tag. This avoids needing tags for ML in the first place. I namely don't
want to clutter the LFS repo with MLFS tags. The version no longer has a
suffix determining which revision it is for. That's prologue/bookinfo's
job now and has similar handling to BLFS. For that, only when it's the
SysVinit revision will it attach to the title with "(SysVinit Edition)".
---
Makefile | 39 +++++++++++++++------------------------
chapter01/whatsnew.xml | 6 +++---
general.ent | 2 +-
git-version.sh | 20 ++++----------------
prologue/bookinfo.xml | 2 +-
5 files changed, 24 insertions(+), 45 deletions(-)
diff --git a/Makefile b/Makefile
index 452c24e64..e16ccda36 100644
--- a/Makefile
+++ b/Makefile
@@ -14,22 +14,23 @@ ifndef REV
REV = systemd
endif
-ifneq ($(REV), sysv)
- ifneq ($(REV), systemd)
- $(error REV must be 'sysv' or 'systemd' (default).)
+ifneq ($(REV), systemd)
+ ifneq ($(REV), sysv)
+ $(error REV must be 'systemd' (default) or 'sysv'.)
endif
endif
-ifeq ($(REV), sysv)
- BASEDIR ?= $(HOME)/public_html/mlfs-book
- PDF_OUTPUT ?= MLFS-BOOK.pdf
- NOCHUNKS_OUTPUT ?= MLFS-BOOK.html
+ifeq ($(REV), systemd)
+ BASEDIR ?= $(HOME)/public_html/mlfs
+ PDF_OUTPUT ?= MLFS.pdf
+ NOCHUNKS_OUTPUT ?= MLFS.html
DUMPDIR ?= $(HOME)/mlfs-commands
-else
- BASEDIR ?= $(HOME)/public_html/mlfs-systemd
- PDF_OUTPUT ?= MLFS-SYSD-BOOK.pdf
- NOCHUNKS_OUTPUT ?= MLFS-SYSD-BOOK.html
- DUMPDIR ?= $(HOME)/mlfs-sysd-commands
+endif
+ifeq ($(REV), sysv)
+ BASEDIR ?= $(HOME)/public_html/mlfs-sysv
+ PDF_OUTPUT ?= MLFS-SYSV.pdf
+ NOCHUNKS_OUTPUT ?= MLFS-SYSV.html
+ DUMPDIR ?= $(HOME)/mlfs-sysv-commands
endif
ifndef ARCH
@@ -51,7 +52,7 @@ else
endif
book: validate profile-html
- @echo "Generating chunked XHTML files at $(BASEDIR)/ ..."
+ @echo "Generating chunked XHTML files at $(BASEDIR)..."
$(Q)xsltproc --nonet \
--stringparam chunk.quietly $(CHUNK_QUIET) \
--stringparam rootid "$(ROOT_ID)" \
@@ -228,14 +229,4 @@ dump-commands: validate
all: book nochunks pdf dump-commands
-dist:
- $(Q)DIST=/tmp/LFS-RELEASE ./git-version.sh $(REV)
- $(Q)rm -f lfs-$$(</tmp/LFS-RELEASE).tar.xz
- $(Q)tar cJf lfs-$$(</tmp/LFS-RELEASE).tar.xz \
- $(shell git ls-tree HEAD . --name-only -r) version.ent \
- -C /tmp LFS-RELEASE \
- --transform "s,^,lfs-$$(</tmp/LFS-RELEASE)/,"
- $(Q)echo "Generated XML tarball lfs-$$(</tmp/LFS-RELEASE).tar.xz"
-
-.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list version dist
-
+.PHONY : all book dump-commands nochunks pdf profile-html tmpdir validate md5sums wget-list version
diff --git a/chapter01/whatsnew.xml b/chapter01/whatsnew.xml
index 1a9964d51..8d09bd2fb 100644
--- a/chapter01/whatsnew.xml
+++ b/chapter01/whatsnew.xml
@@ -245,7 +245,7 @@
<!--<listitem revision="sysv">
<para>Sysklogd-&sysklogd-version;</para>
</listitem>-->
- <listitem>
+ <listitem revision="systemd">
<para>Systemd-&systemd-version;</para>
</listitem>
<!--<listitem revision="sysv">
@@ -263,9 +263,9 @@
<listitem>
<para>Tzdata-&tzdata-version;</para>
</listitem>
- <!--<listitem revision="sysv">
+ <listitem revision="sysv">
<para>Udev from Systemd-&systemd-version;</para>
- </listitem>-->
+ </listitem>
<!--<listitem>
<para>Util-linux-&util-linux-version;</para>
</listitem>-->
diff --git a/general.ent b/general.ent
index 0e3b4ddb7..fda49a185 100644
--- a/general.ent
+++ b/general.ent
@@ -43,7 +43,7 @@
<!ENTITY short-version "%relnum;"> <!-- Used below in &blfs-book; -->
]]>
<![ %systemd; [
-<!ENTITY version "%relnum;-systemd">
+<!ENTITY version "%relnum;">
<!ENTITY short-version "%relnum;-systemd"> <!-- Used below in &blfs-book; -->
]]>
<!ENTITY errata "&lfs-root;lfs/errata/&version;/">
diff --git a/git-version.sh b/git-version.sh
index ae4a4cec3..4c9d431eb 100755
--- a/git-version.sh
+++ b/git-version.sh
@@ -14,10 +14,6 @@ fi
echo "<!ENTITY % sysv \"$SYSV\">" > conditional.ent
echo "<!ENTITY % systemd \"$SYSTEMD\">" >> conditional.ent
-if [ -e LFS-RELEASE ]; then
- exit 0
-fi
-
if ! git status > /dev/null; then
# Either it's not a git repository or git is unavailable.
# Just workaround.
@@ -51,23 +47,15 @@ esac
full_date="$month $day$suffix, $year"
-sha="$(git describe --tags --abbrev=1)"
-rev=$(echo "$sha" | sed 's/-g[^-]*$//')
-version="$rev"
-versiond="$rev-systemd"
-
-if [ "$(git diff HEAD | wc -l)" != "0" ]; then
- version="$version-wip"
- versiond="$versiond-wip"
-fi
+sha="$(git describe --abbrev=1 --always --exclude '*')"
+githash=$(echo -n "#" && echo -n "$sha")
+version="$githash"
echo "<![ %sysv; [" > version.ent
echo "<!ENTITY version \"$version\">" >> version.ent
echo "]]>" >> version.ent
echo "<![ %systemd; [" >> version.ent
-echo "<!ENTITY version \"$versiond\">" >> version.ent
+echo "<!ENTITY version \"$version\">" >> version.ent
echo "]]>" >> version.ent
echo "<!ENTITY releasedate \"$full_date\">" >> version.ent
echo "<!ENTITY copyrightdate \"1999-$year\">" >> version.ent
-
-[ -z "$DIST" ] || echo $version > "$DIST"
diff --git a/prologue/bookinfo.xml b/prologue/bookinfo.xml
index a75244e03..a47e015d1 100644
--- a/prologue/bookinfo.xml
+++ b/prologue/bookinfo.xml
@@ -6,7 +6,7 @@
]>
<bookinfo>
- <title>Multilib Linux From Scratch</title>
+ <title>Multilib Linux From Scratch<phrase revision='sysv'> (SysVinit Edition)</phrase></title>
<subtitle>Version &version;</subtitle>
<subtitle>Published &releasedate;</subtitle>
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
--
http://lists.linuxfromscratch.org/sympa/info/lfs-book
Unsubscribe: See the above information page