Changeset 50836740


Ignore:
Timestamp:
10/16/2021 08:17:34 PM (7 months ago)
Author:
Xi Ruoyao <xry111@…>
Branches:
11.1, lazarus, qt5new, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
82b7eff2
Parents:
49661ec
git-author:
Xi Ruoyao <xry111@…> (10/16/2021 07:53:42 PM)
git-committer:
Xi Ruoyao <xry111@…> (10/16/2021 08:17:34 PM)
Message:

merge conditional XML from LFS

There was some consistency issues in URLs to LFS. For example, in
systemd revision the URL to LFS "General Network Configuration" points
to the sysv book, this can be really troubling to new readers.

Instead of fixing them one by one, merge conditional XML developed by
Pierre from LFS.

Files:
6 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r49661ec r50836740  
    270270
    271271version:
    272         $(Q)./git-version.sh
     272        $(Q)./git-version.sh $(REV)
  • general.ent

    r49661ec r50836740  
    1 <!-- version info generated from git commit,
    2      comment out the following two lines for release. -->
     1<!-- Editing  up to the line of ==== should be enough
     2     to generate a book for development, release, or rc-->
     3<!ENTITY % development "INCLUDE"><!-- set to INCLUDE for development,
     4                                      set to IGNORE for release or rc -->
     5<!ENTITY % release     "IGNORE"> <!-- set to INCLUDE for release,
     6                                      set to IGNORE for development or rc -->
     7<!ENTITY % relyear    "2022">
     8<!ENTITY % relnum     "11.1">
     9<!ENTITY % reldate    "March 1st, 2022">
     10<!ENTITY % relpubdate "2022-03-01">
     11<!-- ================================================================== -->
     12<!-- Do not change anything below unless the www or book layouts change -->
     13
     14<!-- Automatically generated by git-version.sh. Used for release or dev -->
     15<!ENTITY % conditional-entities SYSTEM "conditional.ent">
     16%conditional-entities;
     17
     18<![ %development; [
     19<!-- version info automatically generated by git -->
    320<!ENTITY % version-entities SYSTEM "version.ent">
    421%version-entities;
     22<![ %sysv; [
     23<!ENTITY lfs-version  "development">
     24<!ENTITY blfs-version "svn">
     25]]>
     26<![ %systemd; [
     27<!ENTITY lfs-version  "systemd">
     28<!ENTITY blfs-version "systemd">
     29]]>
     30]]><!-- End %development -->
    531
    6 <!-- uncomment the following entities and modify them for release,
    7      month and year should be always 2 digits. -->
    8 <!--
    9 <!ENTITY day            "01">
    10 <!ENTITY month          "09">
    11 <!ENTITY year           "2021">
    12 <!ENTITY copyrightdate  "2001-2021">
    13 <!ENTITY version        "11.0">
    14 <!ENTITY releasedate    "September 1st, &year;">
    15 <!ENTITY pubdate        "&year;-&month;-&day;">
    16 -->
     32<![ %release; [
     33<![ %sysv; [
     34<!ENTITY lfs-version  "%relnum;">
     35<!ENTITY blfs-version "%relnum;">
     36]]>
     37<![ %systemd; [
     38<!ENTITY lfs-version  "%relnum;-systemd">
     39<!ENTITY blfs-version "%relnum;-systemd">
     40]]>
    1741
    18 <!ENTITY copyholder   "The BLFS Development Team">
    19 <!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
    20 <!ENTITY lfs-version  "development">          <!-- x.y|development -->
    21 <!ENTITY lfs-versiond "systemd">              <!-- x.y-systemd|systemd -->
    22 <!ENTITY lfs-domainname       "linuxfromscratch.org">
     42<!ENTITY year           "%relyear;">
     43<!ENTITY version        "%relnum">
     44<!ENTITY releasedate    "%reldate;">
     45<!ENTITY pubdate        "%relpubdate;">
     46]]><!-- End %release -->
     47
     48<!ENTITY copyrightdate  "1999-&year;">
     49<!ENTITY copyholder     "The BLFS Development Team">
     50<!ENTITY lfs-domainname "linuxfromscratch.org">
    2351
    2452<!ENTITY maintainer-fullname  "The BLFS Team">
     
    4674
    4775<!ENTITY lfs-root             "../../../../lfs/view/&lfs-version;">
    48 <!ENTITY lfs-rootd            "../../../../lfs/view/&lfs-versiond;">
    4976<!ENTITY lfs-dev              "../../../../lfs/view/development">
    5077<!ENTITY gnu-http             "https://ftp.gnu.org/gnu">
  • general/sysutils/dbus.xml

    r49661ec r50836740  
    690690        A list of the installed files, along with their short
    691691        descriptions can be found at
    692         <ulink url="&lfs-rootd;/chapter08/dbus.html#contents-dbus"/>.
     692        <ulink url="&lfs-root;/chapter08/dbus.html#contents-dbus"/>.
    693693      </para>
    694694
  • git-version.sh

    r49661ec r50836740  
    11#!/bin/sh
     2
     3if [ "$1" = sysv ]; then
     4        SYSV="INCLUDE"
     5        SYSTEMD="IGNORE "
     6elif [ "$1" = systemd ]; then
     7        SYSV="IGNORE "
     8        SYSTEMD="INCLUDE"
     9else
     10        echo You must provide either \"sysv\" or \"systemd\" as argument
     11        exit 1
     12fi
     13
     14echo "<!ENTITY % sysv    \"$SYSV\">"     >  conditional.ent
     15echo "<!ENTITY % systemd \"$SYSTEMD\">"  >> conditional.ent
    216
    317if ! git status > /dev/null; then
    418        # Either it's not a git repository, or git is unavaliable.
    519        # Just workaround.
    6         echo "<!ENTITY day               \"??\">"              >  version.ent
    7         echo "<!ENTITY month             \"??\">"              >> version.ent
    8         echo "<!ENTITY year              \"????\">"            >> version.ent
    9         echo "<!ENTITY copyrightdate     \"1999-2021\">"       >> version.ent
     20        echo "<!ENTITY year              \"????\">"            >  version.ent
    1021        echo "<!ENTITY version           \"unknown\">"         >> version.ent
    1122        echo "<!ENTITY releasedate       \"unknown\">"         >> version.ent
     
    2233year=$(date --date "$commit_date" "+%Y")
    2334month=$(date --date "$commit_date" "+%B")
    24 month_digit=$(date --date "$commit_date" "+%m")
    2535day_digit=$(date --date "$commit_date" "+%d")
    2636day=$(echo $day_digit | sed 's/^0//')
     
    4252fi
    4353
    44 echo "<!ENTITY day               \"$day_digit\">"          >  version.ent
    45 echo "<!ENTITY month             \"$month_digit\">"        >> version.ent
    46 echo "<!ENTITY year              \"$year\">"               >> version.ent
    47 echo "<!ENTITY copyrightdate     \"2001-$year\">"          >> version.ent
     54echo "<!ENTITY year              \"$year\">"               >  version.ent
    4855echo "<!ENTITY version           \"$version\">"            >> version.ent
    4956echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent
  • postlfs/config/console-fonts.xml

    r49661ec r50836740  
    5252      <literal>root=/dev/sda2 video=1024x768 ro</literal> based on the
    5353      example in LFS section 10.4.4 :
    54       <phrase revision="sysv">
    55       <ulink url="&lfs-root;/chapter10/grub.html"/></phrase>
    56       <phrase revision="systemd">
    57       <ulink url="&lfs-rootd;/chapter10/grub.html"/></phrase>.
     54      <ulink url="&lfs-root;/chapter10/grub.html"/>.
    5855    </para>
    5956
     
    160157      <filename>/etc/vconsole.conf</filename> as described in
    161158      LFS section 9.6
    162       <ulink url="&lfs-rootd;/chapter09/console.html"/>.</phrase>.
     159      <ulink url="&lfs-root;/chapter09/console.html"/>.</phrase>.
    163160    </para>
    164161
  • postlfs/security/shadow.xml

    r49661ec r50836740  
    563563      A list of the installed files, along with their short descriptions can be
    564564      found at
    565       <phrase revision="sysv">
    566       <ulink url="&lfs-root;/chapter08/shadow.html#contents-shadow"/></phrase>
    567       <phrase revision="systemd">
    568       <ulink url="&lfs-rootd;/chapter08/shadow.html#contents-shadow"/></phrase>.
     565      <ulink url="&lfs-root;/chapter08/shadow.html#contents-shadow"/>.
    569566    </para>
    570567
Note: See TracChangeset for help on using the changeset viewer.