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
This commit is contained in:
Pierre Labastie 2022-03-01 10:07:36 +01:00
parent 4dfe93eba6
commit 4c0df5c4d9
2 changed files with 17 additions and 13 deletions

View File

@ -20,23 +20,27 @@
<!ENTITY % version-entities SYSTEM "version.ent">
%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 -->
<![ %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;">
]]>
<!ENTITY year "%relyear;">
@ -59,16 +63,16 @@
change svn to x.y for release. Note: s/_/-/ in comment to avoid grep error
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">
<!ENTITY sources-anduin-ftp "ftp://anduin.linuxfromscratch.org/BLFS">
<!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/">

View File

@ -31,7 +31,7 @@
<title>Package Information</title>
<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>
</itemizedlist>