Changeset bd90b9b for git-version.sh

Timestamp:

09/01/2021 09:08:49 AM (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:

615f5b8

Parents:

3443abb

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.

File:

• git-version.sh (modified) (2 diffs)

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