Changeset f852e706


Ignore:
Timestamp:
06/02/2016 05:39:31 AM (6 years ago)
Author:
DJ Lucas <dj@…>
Branches:
10.0, 10.1, 11.0, 11.1, 7.10, 8.0, 8.1, 8.2, 8.3, 8.4, 9.0, 9.1, basic, bdubbs/svn, elogind, lazarus, nosym, perl-modules, qt5new, trunk, upgradedb, xry111/intltool, xry111/test-20220226
Children:
39045922
Parents:
9377577
Message:

Initial systemd import, update to blfs-sytemd-units-20160602, makefile changes for building both books and systemd-units

git-svn-id: svn://svn.linuxfromscratch.org/BLFS/trunk/BOOK@17424 af4574ff-66df-0310-9fd7-8a98e5e911e0

Files:
2 added
7 edited

Legend:

Unmodified
Added
Removed
  • Makefile

    r9377577 rf852e706  
    3636  NOCHUNKS_OUTPUT ?= blfs-book.html
    3737  DUMPDIR         ?= ~/blfs-commands
     38  BLFSHTML        ?= blfs-html.xml
     39  BLFSHTML2       ?= blfs-html2.xml
     40  BLFSFULL        ?= blfs-full.xml
    3841else
    3942  BASEDIR         ?= $(HOME)/public_html/blfs-systemd
    4043  NOCHUNKS_OUTPUT ?= blfs-sysd-book.html
    4144  DUMPDIR         ?= ~/blfs-sysd-commands
     45  BLFSHTML        ?= blfs-systemd-html.xml
     46  BLFSHTML2       ?= blfs-systemd-html2.xml
     47  BLFSFULL        ?= blfs-systemd-full.xml
     48
    4249endif
    4350
     
    4956
    5057html: $(BASEDIR)/index.html
    51 $(BASEDIR)/index.html: $(RENDERTMP)/blfs-html.xml
     58$(BASEDIR)/index.html: $(RENDERTMP)/$(BLFSHTML)
    5259        @echo "Generating chunked XHTML files..."
    5360        $(Q)xsltproc --nonet                                    \
     
    5663                --stringparam base.dir $(BASEDIR)/         \
    5764                stylesheets/blfs-chunked.xsl               \
    58                 $(RENDERTMP)/blfs-html.xml
     65                $(RENDERTMP)/$(BLFSHTML)
    5966
    6067        @echo "Copying CSS code and images..."
     
    8390
    8491nochunks: $(BASEDIR)/$(NOCHUNKS_OUTPUT)
    85 $(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/blfs-html.xml
     92$(BASEDIR)/$(NOCHUNKS_OUTPUT): $(RENDERTMP)/$(BLFSHTML)
    8693        @echo "Generating non-chunked XHTML file..."
    8794        $(Q)xsltproc --nonet                                \
     
    8996                --output $(BASEDIR)/$(NOCHUNKS_OUTPUT) \
    9097                stylesheets/blfs-nochunks.xsl          \
    91                 $(RENDERTMP)/blfs-html.xml
     98                $(RENDERTMP)/$(BLFSHTML)
    9299
    93100        @echo "Running Tidy and obfuscate.sh on non-chunked XHTML..."
     
    103110clean:
    104111        @echo "Cleaning $(RENDERTMP)"
    105         $(Q)rm -f $(RENDERTMP)/blfs-{full,html}.xml
    106         $(Q)rm -f $(RENDERTMP)/blfs-{patch-list,patches}
    107 
    108 validate: $(RENDERTMP)/blfs-full.xml
    109 $(RENDERTMP)/blfs-full.xml: general.ent $(ALLXML) $(ALLXSL)
     112        $(Q)rm -f $(RENDERTMP)/blfs*
     113
     114validate: $(RENDERTMP)/$(BLFSFULL)
     115$(RENDERTMP)/$(BLFSFULL): general.ent $(ALLXML) $(ALLXSL)
    110116        $(Q)[ -d $(RENDERTMP) ] || mkdir -p $(RENDERTMP)
    111117
     
    113119        $(Q)xsltproc --nonet                               \
    114120                --xinclude                            \
    115                 --output $(RENDERTMP)/blfs-html2.xml  \
     121                --output $(RENDERTMP)/$(BLFSHTML2)  \
    116122                --stringparam profile.revision $(REV) \
    117123                stylesheets/lfs-xsl/profile.xsl       \
     
    122128               --noent                             \
    123129               --postvalid                         \
    124                --output $(RENDERTMP)/blfs-full.xml \
    125                $(RENDERTMP)/blfs-html2.xml
    126 
    127 profile-html: $(RENDERTMP)/blfs-html.xml
    128 $(RENDERTMP)/blfs-html.xml: $(RENDERTMP)/blfs-full.xml
     130               --output $(RENDERTMP)/$(BLFSFULL) \
     131               $(RENDERTMP)/$(BLFSHTML2)
     132
     133profile-html: $(RENDERTMP)/$(BLFSHTML)
     134$(RENDERTMP)/$(BLFSHTML): $(RENDERTMP)/$(BLFSFULL)
    129135        @echo "Generating profiled XML for XHTML..."
    130136        $(Q)xsltproc --nonet                              \
    131137                --stringparam profile.condition html \
    132                 --output $(RENDERTMP)/blfs-html.xml  \
     138                --output $(RENDERTMP)/$(BLFSHTML)  \
    133139                stylesheets/lfs-xsl/profile.xsl      \
    134                 $(RENDERTMP)/blfs-full.xml
     140                $(RENDERTMP)/$(BLFSFULL)
    135141
    136142blfs-patch-list: blfs-patches.sh
     
    139145          blfs-patches.sh > blfs-patch-list
    140146
    141 blfs-patches.sh: $(RENDERTMP)/blfs-full.xml
     147blfs-patches.sh: $(RENDERTMP)/$(BLFSFULL)
    142148        @echo "Generating blfs patch script..."
    143149        $(Q)xsltproc --nonet                     \
    144150                --output blfs-patches.sh    \
    145151                stylesheets/patcheslist.xsl \
    146                 $(RENDERTMP)/blfs-full.xml
     152                $(RENDERTMP)/$(BLFSFULL)
    147153
    148154wget-list: $(BASEDIR)/wget-list
    149 $(BASEDIR)/wget-list: $(RENDERTMP)/blfs-full.xml
     155$(BASEDIR)/wget-list: $(RENDERTMP)/$(BLFSFULL)
    150156        @echo "Generating wget list for $(REV) at $(BASEDIR)/wget-list ..."
    151157        $(Q)mkdir -p $(BASEDIR)
     
    153159                --output $(BASEDIR)/wget-list \
    154160                stylesheets/wget-list.xsl     \
    155                 $(RENDERTMP)/blfs-full.xml
     161                $(RENDERTMP)/$(BLFSFULL)
    156162
    157163test-links: $(BASEDIR)/test-links
    158 $(BASEDIR)/test-links: $(RENDERTMP)/blfs-full.xml
     164$(BASEDIR)/test-links: $(RENDERTMP)/$(BLFSFULL)
    159165        @echo "Generating test-links file..."
    160166        $(Q)mkdir -p $(BASEDIR)
     
    163169                --output $(BASEDIR)/test-links \
    164170                stylesheets/wget-list.xsl      \
    165                 $(RENDERTMP)/blfs-full.xml
     171                $(RENDERTMP)/$(BLFSFULL)
    166172
    167173        @echo "Checking URLs, first pass..."
     
    197203   fi
    198204
     205systemd-units:
     206        @VERSION=`grep "systemd-units-version " general.ent | cut -d\" -f2`; \
     207   UNITS="blfs-systemd-units-$$VERSION";                        \
     208   if [ ! -e $$UNITS.tar.xz ]; then                             \
     209     rm -rf $(RENDERTMP)/$$UNITS;                               \
     210     mkdir $(RENDERTMP)/$$UNITS;                                \
     211     cp -a ../systemd-units/* $(RENDERTMP)/$$UNITS;             \
     212     tar -cJhf $$UNITS.tar.xz -C $(RENDERTMP) $$UNITS;          \
     213   fi
     214
    199215dump-commands: $(DUMPDIR)
    200 $(DUMPDIR): $(RENDERTMP)/blfs-full.xml
     216$(DUMPDIR): $(RENDERTMP)/$(BLFSFULL)
    201217        @echo "Dumping book commands..."
    202218        $(Q)xsltproc --output $(DUMPDIR)/          \
    203219                stylesheets/dump-commands.xsl \
    204                 $(RENDERTMP)/blfs-full.xml
     220                $(RENDERTMP)/$(BLFSFULL)
    205221        $(Q)touch $(DUMPDIR)
    206222
    207223.PHONY: blfs all world html nochunks tmpdir clean  \
    208224   validate profile-html blfs-patch-list wget-list test-links \
    209    dump-commands  bootscripts
    210 
    211 
     225   dump-commands  bootscripts systemd-units
     226
     227
  • general.ent

    r9377577 rf852e706  
    11<!-- $LastChangedBy$ $Date$ -->
    22
    3 <!ENTITY day          "01">                   <!-- Always 2 digits -->
     3<!ENTITY day          "02">                   <!-- Always 2 digits -->
    44<!ENTITY month        "06">                   <!-- Always 2 digits -->
    55<!ENTITY year         "2016">
     
    77<!ENTITY copyholder   "The BLFS Development Team">
    88<!ENTITY version      "&year;-&month;-&day;">
    9 <!ENTITY releasedate  "June 1st &year;">
     9<!ENTITY releasedate  "June 2nd &year;">
    1010<!ENTITY pubdate      "&year;-&month;-&day;"> <!-- metadata req. by TLDP -->
    1111<!ENTITY blfs-version "svn">                  <!-- svn|[release #] -->
     
    7171
    7272<!ENTITY blfs-bootscripts-version     "20160415">
     73<!ENTITY systemd-units-version        "20160602">
     74
    7375
    7476<!ENTITY blfs-wiki                    "http://wiki.&lfs-domainname;/blfs/wiki">
  • general/sysutils/sysutils.xml

    r9377577 rf852e706  
    4545<!--  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="strigi.xml"/> -->
    4646  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysstat.xml"/>
     47
     48  <!-- systemd only -->
     49  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd.xml"/>
     50
    4751  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks.xml"/>
    4852  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udisks2.xml"/>
  • introduction/important/bootscripts.xml

    r9377577 rf852e706  
    66]>
    77
    8 <sect1 id="bootscripts" xreflabel="blfs-bootscripts-&blfs-bootscripts-version;">
     8<sect1 id="bootscripts" xreflabel="blfs-bootscripts-&blfs-bootscripts-version;" revision="sysv">
    99  <?dbhtml filename="bootscripts.html"?>
    1010
  • introduction/important/important.xml

    r9377577 rf852e706  
    2626  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="position.xml"/>
    2727  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="patches.xml"/>
     28
     29  <!-- sysv only -->
    2830  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="bootscripts.xml"/>
     31
     32  <!-- systemd only -->
     33  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="systemd-units.xml"/>
     34
    2935  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="libraries.xml"/>
    3036  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="locale-issues.xml"/>
  • introduction/welcome/changelog.xml

    r9377577 rf852e706  
    4444
    4545-->
     46    <listitem revision="systemd">
     47      <para>June 2nd, 2016</para>
     48      <itemizedlist>
     49        <listitem revision="systemd">
     50          <para>[dj] - Update to blfs-systemd-units-20160602.tar.xz.</para>
     51        </listitem>
     52      </itemizedlist>
     53    </listitem>
     54
    4655    <listitem>
    4756      <para>June 1st, 2016</para>
     
    96105          <para>[igor] - Update to curl-7.49.1. Fixes
    97106          <ulink url="&blfs-ticket-root;7898">#7898</ulink>.</para>
     107        </listitem>
     108        <listitem revision="systemd">
     109          <para>[dj] - Update to systemd-230.</para>
    98110        </listitem>
    99111      </itemizedlist>
  • packages.ent

    r9377577 rf852e706  
    243243<!ENTITY strigi-version               "0.7.8">
    244244<!ENTITY sysstat-version              "11.3.4">
     245<!ENTITY systemd-version              "230">
    245246<!ENTITY udisks-version               "1.0.5">    <!-- stable lt .90 micro version -->
    246247<!ENTITY udisks2-version              "2.1.7">    <!-- stable lt .90 micro version -->
Note: See TracChangeset for help on using the changeset viewer.