Changeset 4467b18d

Timestamp:

09/22/2021 09:11:52 PM (2 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, 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/parallelism, xry111/pip3, xry111/rust-wip-20221008

Children:

784fdaed

Parents:

2f14259

git-author:

Pierre Labastie <pierre.labastie@…> (09/01/2021 09:08:49 AM)

git-committer:

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

Message:

Add a conditional entity for sysv/systemd

This removes the need for versiond, and other xxxd entities. Those
entities will be removed in the next commits.

Files:

• .gitignore (modified) (1 diff)
• Makefile (modified) (1 diff)
• general.ent (modified) (3 diffs)
• git-version.sh (modified) (2 diffs)

.gitignore

@@ -1 +1 @@
 lfs-bootscripts-*.tar.xz
+conditional.ent
 version.ent
 appendices/*.script

Makefile

@@ -190 +190 @@
 
 version:
-        $(Q)./git-version.sh
+        $(Q)./git-version.sh $(REV)
 
 #dump-commands: validate

general.ent

@@ +1 @@
+<!-- Automatically generated by git-version.sh -->
+<!ENTITY % conditional-entities SYSTEM "conditional.ent">
+%conditional-entities;
+
 <!-- version info automatically generated by git
-     comment the following two lines for release -->
+     comment out the following two lines for release -->
 <!ENTITY % version-entities SYSTEM "version.ent">
 %version-entities;
@@ -7 +11 @@
      for releases (including -rc) -->
 <!--
+<![ %sysv; [
 <!ENTITY version         "10.2-rc1">
-<!ENTITY versiond        "10.2-systemd-rc1">
+]]>
+<![ %systemd; [
+<!ENTITY version         "10.2-systemd-rc1">
+]]>
 <!ENTITY releasedate     "August 26th, 2021">
 <!ENTITY copyrightdate   "1999-2021">
 -->
 
-<!ENTITY short-version   "svn">  <!-- Used below in &blfs-book;
+<![ %sysv; [
+<!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">
+]]>
+<![ %systemd; [
+<!ENTITY short-version  "systemd">  <!--Change to stable-systemd for release  -->
+<!ENTITY generic-version "systemd"> 
+]]>
 
 <!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 blfs-book       "&blfs-root;view/&short-version;/">
 <!ENTITY faq-root        "&lfs-root;faq/">
 <!ENTITY hints-root      "&lfs-root;hints/downloads/files/">
@@ -34 +45 @@
 <!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/">
 

git-version.sh

@@ -1 +1 @@
 #!/bin/sh
+
+if [ "$1" = sysv ]; then
+        SYSV="INCLUDE"
+        SYSTEMD="IGNORE "
+elif [ "$1" = systemd ]; then
+        SYSV="IGNORE "
+        SYSTEMD="INCLUDE"
+else
+        echo You must provide either \"sysv\" or \"systemd\" as argument
+        exit 1
+fi
+
+echo "<!ENTITY % sysv    \"$SYSV\">"     >  conditional.ent
+echo "<!ENTITY % systemd \"$SYSTEMD\">"  >> conditional.ent
 
 if ! git status > /dev/null; then
         # Either it's not a git repository, or git is unavaliable.
         # Just workaround.
-        echo "<!ENTITY version           \"unknown\">"         >  version.ent
-        echo "<!ENTITY versiond          \"unknown-systemd\">" >> version.ent
+        echo "<![ %sysv; ["                                    >  version.ent
+        echo "<!ENTITY version           \"unknown\">"         >> version.ent
+        echo "]]>"                                             >> version.ent
+        echo "<![ %systemd; ["                                 >> version.ent
+        echo "<!ENTITY version           \"unknown-systemd\">" >> version.ent
+        echo "]]>"                                             >> version.ent
         echo "<!ENTITY releasedate       \"unknown\">"         >> version.ent
         echo "<!ENTITY copyrightdate     \"1999-2021\">"       >> version.ent
@@ -42 +60 @@
 fi
 
-echo "<!ENTITY version           \"$version\">"            >  version.ent
-echo "<!ENTITY versiond          \"$versiond\">"           >> version.ent
+echo "<![ %sysv; ["                                        >  version.ent
+echo "<!ENTITY version           \"$version\">"            >> version.ent
+echo "]]>"                                                 >> version.ent
+echo "<![ %systemd; ["                                     >> version.ent
+echo "<!ENTITY version          \"$versiond\">"            >> version.ent
+echo "]]>"                                                 >> version.ent
 echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent
 echo "<!ENTITY copyrightdate     \"1999-$year\">"          >> version.ent