Changeset 08a6368 for general.ent

Timestamp:

10/15/2021 10:21:18 AM (3 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

57e2684d

Parents:

0b5f7d87 (diff), fa32551 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge upstream

File:

• general.ent (modified) (1 diff)

general.ent

@@ -1 @@
-<!-- version info automatically generated by git
-     comment the following two lines for release -->
+<!-- Editing  up to the line of ==== should be enough
+     to generate a book for development, release, or rc-->
+<!ENTITY % development "INCLUDE"><!-- set to INCLUDE for development,
+                                      set to IGNORE for release or rc -->
+<!ENTITY % release     "IGNORE"> <!-- set to INCLUDE for release,
+                                      set to IGNORE for development or rc -->
+<!ENTITY % rc          "IGNORE"> <!-- set to INCLUDE for rc,
+                                      set to IGNORE for development or
+                                       release -->
+<!ENTITY % relnum "11.1"><!-- must be given for release or rc -->
+<!ENTITY % reldate "March 1st, 2022"><!-- must ve given for release or rc -->
+<!ENTITY % crdate "1999-2022"><!-- must ve given for release or rc -->
+<!ENTITY % rcnum  "2"><!-- must be given only for rc -->
+<!-- ================================================================== -->
+<!-- Do not change anything below unless the www or book layouts change -->
+
+<!-- Automatically generated by git-version.sh. Used for release or dev -->
+<!ENTITY % conditional-entities SYSTEM "conditional.ent">
+%conditional-entities;
+
+<![ %development; [
+<!-- version info automatically generated by git -->
 <!ENTITY % version-entities SYSTEM "version.ent">
 %version-entities;
+<![ %sysv; [
+<!ENTITY short-version   "svn">    <!-- Used below in &blfs-book; -->
+<!ENTITY errata          "&lfs-root;lfs/errata/development/">
+]]>
+<![ %systemd; [
+<!ENTITY short-version  "systemd"> <!-- Used below in &blfs-book; -->
+<!ENTITY errata          "&lfs-root;lfs/errata/systemd/">
+]]>
+<!ENTITY generic-version "development"> <!-- Used below in
+                                             &patches-root;,
+                                             &donwloads-root;, and
+                                             &test-results; -->
+]]><!-- End %development -->
 
-<!-- uncomment and edit the following four lines
-     for releases (including -rc) -->
-<!--
-<!ENTITY version         "10.2-rc1">
-<!ENTITY versiond        "10.2-systemd-rc1">
-<!ENTITY releasedate     "August 26th, 2021">
-<!ENTITY copyrightdate   "1999-2021">
--->
+<![ %release; [
+<![ %sysv; [
+<!ENTITY version         "%relnum;">
+<!ENTITY short-version   "%relnum;">  <!-- Used below in &blfs-book; -->
+]]>
+<![ %systemd; [
+<!ENTITY version         "%relnum;-systemd">
+<!ENTITY short-version   "stable-systemd"> <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;"> <!-- Used below in
+                                          &patches-root;,
+                                          &donwloads-root;, and
+                                          &test-results; -->
+<!ENTITY releasedate     "%reldate;">
+<!ENTITY copyrightdate   "%crdate;">
+]]>
 
-<!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}]" -->
-
-<!ENTITY short-versiond  "systemd">  <!--Change to stable-systemd for release  -->
-<!ENTITY generic-versiond "systemd">
+<![ %rc; [
+<![ %sysv; [
+<!ENTITY version         "%relnum;-rc%rcnum;">
+<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book; -->
+]]>
+<![ %systemd; [
+<!ENTITY version         "%relnum;-systemd-rc%rcnum;">
+<!ENTITY short-version   "systemd">  <!-- Used below in &blfs-book; -->
+]]>
+<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
+<!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
+                                                    &patches-root;,
+                                                    &downloads-root;, and
+                                                    &test-results; -->
+<!ENTITY releasedate     "%reldate;">
+<!ENTITY copyrightdate   "%crdate;">
+]]>
 
 <!ENTITY lfs-root        "https://www.linuxfromscratch.org/">
 <!ENTITY blfs-root       "&lfs-root;blfs/">
 <!ENTITY blfs-book       "&blfs-root;view/&short-version;/">
-<!ENTITY blfs-systemd-book "&blfs-root;view/&short-versiond;/">
 <!ENTITY faq-root        "&lfs-root;faq/">
 <!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
 <!ENTITY hints-index     "&lfs-root;hints/list.html">
 <!ENTITY patches-root    "&lfs-root;patches/lfs/&generic-version;/">
+<!-- Only used for sysv (lfs-bootscripts): -->
 <!ENTITY downloads-root  "&lfs-root;lfs/downloads/&generic-version;/">
 <!ENTITY livecd-root     "&lfs-root;livecd/">
 <!ENTITY test-results    "&lfs-root;lfs/build-logs/&generic-version;/">
-<!ENTITY errata          "&lfs-root;lfs/errata/&generic-version;/">
 <!ENTITY secadv          "&lfs-root;lfs/advisories/">
 <!ENTITY min-kernel      "3.2">
-
+<!--
 <!ENTITY patches-rootd   "&lfs-root;patches/lfs/&generic-versiond;/">
 <!ENTITY downloads-rootd "&lfs-root;lfs/downloads/&generic-versiond;/">
 <!ENTITY test-resultsd   "&lfs-root;lfs/build-logs/&generic-versiond;/">
 <!ENTITY erratad         "&lfs-root;lfs/errata/&generic-versiond;/">
-
+-->
 <!ENTITY lfs-ticket-root "https://wiki.linuxfromscratch.org/lfs/ticket/">