Changeset 7146c9d

Timestamp:

09/22/2021 09:19:23 PM (3 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.1, 11.1-rc1, 11.2, 11.2-rc1, 11.3, 11.3-rc1, 12.0, 12.0-rc1, 12.1, 12.1-rc1, arm, bdubbs/gcc13, multilib, renodr/libudev-from-systemd, s6-init, trunk, xry111/arm64, xry111/arm64-12.0, xry111/clfs-ng, xry111/lfs-next, xry111/loongarch, xry111/loongarch-12.0, xry111/loongarch-12.1, xry111/mips64el, xry111/pip3, xry111/rust-wip-20221008, xry111/update-glibc

Children:

a1422e1

Parents:

46d9bd8

git-author:

Pierre Labastie <pierre.labastie@…> (09/01/2021 12:38:08 PM)

git-committer:

Pierre Labastie <pierre.labastie@…> (09/22/2021 09:19:23 PM)

Message:

Make generic-version the same on both books

Needs to make a conditional for errata

File:

• general.ent (modified) (2 diffs)

general.ent

@@ -24 +24 @@
 <!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; 
                                       Change to x.y for release but not -rc releases -->
-<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 ]]>
 <![ %systemd; [
 <!ENTITY short-version  "systemd">  <!--Change to stable-systemd for release  -->
-<!ENTITY generic-version "systemd"> 
 ]]>
+<!ENTITY generic-version "development"> <!-- Use "development"  or "x.y[-pre{x}]" -->
 
 <!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
@@ -41 +40 @@
 <!ENTITY livecd-root     "&lfs-root;livecd/">
 <!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
+<![ %sysv; [
 <!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
+]]>
+<![ %systemd; [
+<!ENTITY errata          "&lfs-root;lfs/errata/&short-version;/">
+]]>
 <!ENTITY secadv          "&lfs-root;lfs/advisories/">
 <!ENTITY min-kernel      "3.2">