Changeset 4c0df5c4

Timestamp:

03/01/2022 09:07:36 AM (2 years ago)

Author:

Pierre Labastie <pierre.labastie@…>

Branches:

11.2, 11.3, 12.0, 12.1, kea, ken/TL2024, ken/inkscape-core-mods, ken/tuningfonts, lazarus, lxqt, plabs/newcss, plabs/python-mods, python3.11, qt5new, rahul/power-profiles-daemon, renodr/vulkan-addition, trunk, xry111/intltool, xry111/llvm18, xry111/soup3, xry111/xf86-video-removal

Children:

a463b76e

Parents:

4dfe93eb

Message:

Fix some entities in general.ent for releases

Two entities downloads-root-systemd and patch-root were not
modified when switching to release:

• change the name of downloads-root-systemd to downloads-root since

the aim is to not have "-systemd" entities, and use "&blfs-version;"
for it

• create a patch-version entity (this one does not change for

systemd), and use it in patch-root

Files:

• general.ent (modified) (4 diffs)
• introduction/important/systemd-units.xml (modified) (1 diff)

general.ent

@@ -21 +21 @@
 %version-entities;
 <![ %sysv; [
-<!ENTITY lfs-version  "development">
-<!ENTITY blfs-version "svn">
+<!ENTITY lfs-version   "development">
+<!ENTITY blfs-version  "svn">
+<!ENTITY patch-version "svn">
 ]]>
 <![ %systemd; [
-<!ENTITY lfs-version  "systemd">
-<!ENTITY blfs-version "systemd">
+<!ENTITY lfs-version   "systemd">
+<!ENTITY blfs-version  "systemd">
+<!ENTITY patch-version "svn">
 ]]>
 ]]><!-- End %development -->
@@ -32 +34 @@
 <![ %release; [
 <![ %sysv; [
-<!ENTITY lfs-version  "%relnum;">
-<!ENTITY blfs-version "%relnum;">
+<!ENTITY lfs-version   "%relnum;">
+<!ENTITY blfs-version  "%relnum;">
+<!ENTITY patch-version "%relnum;">
 ]]>
 <![ %systemd; [
-<!ENTITY lfs-version  "%relnum;-systemd">
-<!ENTITY blfs-version "%relnum;-systemd">
+<!ENTITY lfs-version   "%relnum;-systemd">
+<!ENTITY blfs-version  "%relnum;-systemd">
+<!ENTITY patch-version "%relnum;">
 ]]>
 
@@ -60 +64 @@
      Update 'downloads-root-systemd' to x.y-systemd
      -->
-<!ENTITY downloads-root       "https://www.linuxfromscratch.org/blfs/downloads/svn">
-<!ENTITY downloads-root-systemd "https://www.linuxfromscratch.org/blfs/downloads/systemd">
-<!--<!ENTITY downloads-project    "https://downloads.&lfs-domainname;">-->
+<!ENTITY downloads-root       "&lfs-website;/blfs/downloads/&blfs-version;">
+<!--<!ENTITY downloads-root-systemd "https://www.linuxfromscratch.org/blfs/downloads/systemd">
+<!ENTITY downloads-project    "https://downloads.&lfs-domainname;">-->
 
 <!ENTITY sources-anduin-http  "https://anduin.linuxfromscratch.org/BLFS">
@@ -69 +73 @@
 <!ENTITY hints-root           "https://www.&lfs-domainname;/hints">
 <!ENTITY patch-downloads      "https://www.linuxfromscratch.org/patches/downloads">
-<!ENTITY patch-root           "https://www.&lfs-domainname;/patches/blfs/svn">
+<!ENTITY patch-root           "https://www.&lfs-domainname;/patches/blfs/&patch-version;">
 <!ENTITY errata               "https://www.&lfs-domainname;/blfs/errata/&blfs-version;/">
 <!ENTITY blfs-ticket-root     "https://wiki.&lfs-domainname;/blfs/ticket/">

introduction/important/systemd-units.xml

@@ -32 +32 @@
     <listitem>
       <para>
-        Download: <ulink url="&downloads-root-systemd;/blfs-systemd-units-&systemd-units-version;.tar.xz"/>
+        Download: <ulink url="&downloads-root;/blfs-systemd-units-&systemd-units-version;.tar.xz"/>
       </para>
     </listitem>