Changeset 2758d94


Ignore:
Timestamp:
04/11/2019 07:40:50 AM (5 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
ablfs-more, legacy, trunk
Children:
0e4ddfa
Parents:
adbd09b
Message:

Use sect1info for getting informations on LFS packages:

  • add sect1info sections to packagemanager.xml.xxx + various fixes
  • add templates in LFS/lfs.xsl for script start and script end:
    • script start: define variables containing package information

print disk usage
unpack and change dir

  • script end: print disk usage

remove build dir

  • remove the corresponding operations from master.sh
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • LFS/lfs.xsl

    radbd09b r2758d94  
    8484  <xsl:param name='local'     select="'n'"/>
    8585  <xsl:param name='log-level' select="'4'"/>
     86
     87  <!-- The scripts root is needed for printing disk usage -->
     88  <xsl:param name='script-root' select="'jhalfs'"/>
    8689
    8790<!-- End parameters -->
    … …  
    170173      <xsl:text>&#xA;</xsl:text>
    171174      <xsl:if test="sect2[@role='installation']">
    172         <xsl:text>cd $PKGDIR&#xA;</xsl:text>
     175        <xsl:call-template name="start-script">
     176          <xsl:with-param name="order" select="$order"/>
     177        </xsl:call-template>
    173178      </xsl:if>
    174179      <xsl:apply-templates select="sect2[not(@revision) or
    … …  
    193198      </xsl:if>
    194199      <xsl:text>echo -e "\n\nTotalseconds: $SECONDS\n"&#xA;</xsl:text>
     200      <xsl:if test="sect2[@role='installation']">
     201        <xsl:call-template name="end-script"/>
     202      </xsl:if>
    195203      <xsl:text>exit&#xA;</xsl:text>
    196204    </exsl:document>
    … …  
    226234          <xsl:text>mkdir -pv $PKG_DEST/{bin,boot,etc,lib,sbin}
    227235mkdir -pv $PKG_DEST/usr/{bin,include,lib/pkgconfig,sbin}
    228 mkdir -pv $PKG_DEST/usr/share/{doc,info,man}
     236mkdir -pv $PKG_DEST/usr/share/{doc,info,bash-completion/completions}
    229237mkdir -pv $PKG_DEST/usr/share/man/man{1..8}
    230238case $(uname -m) in
    … …  
    296304<!-- remove empty directories -->
    297305          <xsl:text>for dir in $PKG_DEST/usr/share/man/man{1..8} \
    298            $PKG_DEST/usr/share/{doc,info,man} \
     306           $PKG_DEST/usr/share/bash-completion{/completions,} \
     307           $PKG_DEST/usr/share/{doc,info,man,} \
    299308           $PKG_DEST/usr/lib/pkgconfig \
    300309           $PKG_DEST/usr/{lib,bin,sbin,include} \
    … …  
    356365
    357366  <xsl:template match="sect1" mode="pkgmngt">
    358     <xsl:param name="dirname" select="chapter05"/>
     367    <xsl:param name="dirname" select="'chapter05'"/>
    359368    <!-- The build order -->
    360     <xsl:param name="order" select="062"/>
     369    <xsl:param name="order" select="'062'"/>
    361370<!-- The file names -->
    362371    <xsl:variable name="pi-file" select="processing-instruction('dbhtml')"/>
    … …  
    372381set +h
    373382set -e
    374 
    375 cd $PKGDIR
    376 </xsl:text>
     383</xsl:text>
     384        <xsl:call-template name="start-script">
     385          <xsl:with-param name="order" select="concat($order,'-',position())"/>
     386        </xsl:call-template>
    377387        <xsl:apply-templates
    378388           select=".//screen[not(@role) or
    … …  
    395405        <xsl:text>
    396406echo -e "\n\nTotalseconds: $SECONDS\n"
    397 exit
     407</xsl:text>
     408        <xsl:call-template name="end-script"/>
     409        <xsl:text>exit
    398410</xsl:text>
    399411      </exsl:document>
    … …  
    11211133  </xsl:template>
    11221134
     1135  <xsl:template name="basename">
     1136    <xsl:param name="path" select="''"/>
     1137    <xsl:choose>
     1138      <xsl:when test="contains($path,'/') and substring-after($path,'/')!=''">
     1139        <xsl:call-template name="basename">
     1140          <xsl:with-param name="path" select="substring-after($path,'/')"/>
     1141        </xsl:call-template>
     1142      </xsl:when>
     1143      <xsl:when test="contains($path,'/') and substring-after($path,'/')=''">
     1144        <xsl:value-of select="substring-before($path,'/')"/>
     1145      </xsl:when>
     1146      <xsl:otherwise>
     1147        <xsl:value-of select="$path"/>
     1148      </xsl:otherwise>
     1149    </xsl:choose>
     1150  </xsl:template>
     1151
     1152  <xsl:template name="start-script">
     1153    <xsl:param name="order" select="'073'"/>
     1154<!-- get the location of the system root -->
     1155    <xsl:text>
     1156if [ -h /tools ]; then
     1157  ROOT=$(dirname $(readlink /tools))/
     1158else
     1159  ROOT=/
     1160fi
     1161SRC_DIR=${ROOT}sources
     1162<!-- save the timer, so that unpacking, and du is not counted -->
     1163PREV_SEC=${SECONDS}
     1164<!-- Set variables, for use by the Makefile and package manager -->
     1165VERSION=</xsl:text><!-- needed for Makefile, and may be used in PackInstall-->
     1166    <xsl:copy-of select=".//sect1info/productnumber/text()"/>
     1167    <xsl:text>
     1168PKG_DEST=${SRC_DIR}/</xsl:text>
     1169    <xsl:copy-of select="$order"/>
     1170    <xsl:text>-</xsl:text>
     1171    <xsl:copy-of select=".//sect1info/productname/text()"/>
     1172    <xsl:text>
     1173    <!-- Get the tarball name from sect1info -->
     1174PACKAGE=</xsl:text>
     1175    <xsl:call-template name="basename">
     1176      <xsl:with-param name="path" select=".//sect1info/address/text()"/>
     1177    </xsl:call-template>
     1178    <xsl:text>
     1179SCRIPT_ROOT=</xsl:text>
     1180    <xsl:copy-of select="$script-root"/>
     1181    <xsl:text>
     1182</xsl:text>
     1183    <xsl:if test = "( ../@id != 'chapter-temporary-tools' or
     1184                      starts-with(@id,'ch-system') ) and $pkgmngt = 'y'">
     1185      <xsl:text>
     1186source ${ROOT}${SCRIPT_ROOT}/packInstall.sh
     1187export -f packInstall</xsl:text>
     1188      <xsl:if test="$wrap-install='y'">
     1189        <xsl:text>
     1190export -f wrapInstall
     1191</xsl:text>
     1192      </xsl:if>
     1193    </xsl:if>
     1194<!-- Get the build directory name and clean remnants of previous attempts -->
     1195    <xsl:text>
     1196cd $SRC_DIR
     1197PKGDIR=$(tar -tf $PACKAGE | head -n1 | sed 's@^./@@;s@/.*@@')
     1198export PKGDIR VERSION PKG_DEST
     1199
     1200if [ -d "$PKGDIR" ]; then rm -rf $PKGDIR; fi
     1201if [ -d "${PKGDIR%-*}-build" ]; then  rm -rf ${PKGDIR%-*}-build; fi
     1202
     1203echo "KB: $(du -skx --exclude=lost+found --exclude=/var/lib --exclude=$SCRIPT_ROOT $ROOT)"
     1204<!-- At last unpack and change directory -->
     1205tar -xf $PACKAGE
     1206cd $PKGDIR
     1207SECONDS=${PREV_SEC}
     1208
     1209# Start of LFS book script
     1210</xsl:text>
     1211  </xsl:template>
     1212
     1213  <xsl:template name="end-script">
     1214    <xsl:text>
     1215# End of LFS book script
     1216
     1217echo "KB: $(du -skx --exclude=lost+found --exclude=/var/lib --exclude=$SCRIPT_ROOT $ROOT)"
     1218cd $SRC_DIR
     1219rm -rf $PKGDIR
     1220if [ -d "${PKGDIR%-*}-build" ]; then  rm -rf ${PKGDIR%-*}-build; fi
     1221</xsl:text>
     1222  </xsl:template>
     1223
    11231224</xsl:stylesheet>

  • LFS/master.sh

    radbd09b r2758d94  
    117117    #
    118118    # Find the name of the tarball and the version of the package
    119     pkg_tarball=$(get_package_tarball_name $name)
    120     pkg_version=$(get_package_version $pkg_tarball)
     119    pkg_tarball=$(sed -n 's/tar -xf \(.*\)/\1/p' $file)
     120    pkg_version=$(sed -n 's/VERSION=\(.*\)/\1/p' $file)
    121121
    122122    # Drop in the name of the target on a new line, and the previous target
    … …  
    126126    # If $pkg_tarball isn't empty, we've got a package...
    127127    if [ "$pkg_tarball" != "" ] ; then
    128       # Insert instructions for unpacking the package and to set the PKGDIR variable.
    129       LUSER_wrt_unpack "$pkg_tarball"
    130128      # Always initialize the log file, since the test instructions may be
    131129      # "uncommented" by the user
    … …  
    146144      *)               LUSER_wrt_RunAsUser "$file" "$pkg_version" ;;
    147145    esac
    148 
    149     # Remove the build directory(ies) except if the package build fails
    150     # (so we can review config.cache, config.log, etc.)
    151     if [ "$pkg_tarball" != "" ] ; then
    152         case "${name}" in
    153         *xz-utils) LUSER_RemoveBuildDirs "xz" ;;
    154         *) LUSER_RemoveBuildDirs "$name" ;;
    155         esac
    156     fi
    157146
    158147    # Include a touch of the target name so make can check
    … …  
    217206    # Find the tarball corresponding to our script.
    218207    # If it doesn't, we skip it in iterations rebuilds (except stripping).
    219     pkg_tarball=$(get_package_tarball_name $name)
    220     pkg_version=$(get_package_version $pkg_tarball)
     208    pkg_tarball=$(sed -n 's/tar -xf \(.*\)/\1/p' $file)
     209    pkg_version=$(sed -n 's/VERSION=\(.*\)/\1/p' $file)
    221210
    222211    if [[ "$pkg_tarball" = "" ]] && [[ -n "$N" ]] ; then
    … …  
    256245        CHROOT_wrt_TouchTimestamp
    257246      fi
    258       CHROOT_Unpack "$pkg_tarball"
    259247      # Always initialize the log file, so that the use may reinstate a
    260248      # commented out test
    … …  
    274262    # except if the package build fails.
    275263    if [ "$pkg_tarball" != "" ] ; then
    276       case "${name}" in
    277         *xz-utils) CHROOT_wrt_RemoveBuildDirs "xz" ;;
    278         *) CHROOT_wrt_RemoveBuildDirs "$name" ;;
    279       esac
    280264      if [ "${INSTALL_LOG}" = "y" ] && [ "x${N}" = "x" ] ; then
    281265        CHROOT_wrt_LogNewFiles "$name"
    … …  
    337321      *bootscripts)
    338322            name="lfs-bootscripts"
    339             pkg_tarball=$(get_package_tarball_name $name)
    340323            if [ "${INSTALL_LOG}" = "y" ] ; then
    341324              CHROOT_wrt_TouchTimestamp
    342325            fi
    343             CHROOT_Unpack "$pkg_tarball"
    344326        ;;
    345327      *network-scripts)
    346328            name="lfs-network-scripts"
    347             pkg_tarball=$(get_package_tarball_name $name)
    348329            if [ "${INSTALL_LOG}" = "y" ] ; then
    349330              CHROOT_wrt_TouchTimestamp
    350331            fi
    351             CHROOT_Unpack "$pkg_tarball"
    352332        ;;
    353333      *kernel)
    354334            name="linux"
    355             pkg_tarball=$(get_package_tarball_name $name)
    356335            if [ "${INSTALL_LOG}" = "y" ] ; then
    357336              CHROOT_wrt_TouchTimestamp
    358337            fi
    359             CHROOT_Unpack "$pkg_tarball"
    360338            # If using optimizations, use MAKEFLAGS (unless blacklisted)
    361339            # no setting of CFLAGS and friends.
    … …  
    377355
    378356    case "${this_script}" in
    379       *bootscripts)      CHROOT_wrt_RemoveBuildDirs "dummy"
     357      *bootscripts|*network-scripts|*kernel)
    380358                         if [ "${INSTALL_LOG}" = "y" ] ; then
    381359                           CHROOT_wrt_LogNewFiles "$name"
    382360                         fi ;;
    383       *network-scripts)  CHROOT_wrt_RemoveBuildDirs "dummy"
    384                          if [ "${INSTALL_LOG}" = "y" ] ; then
    385                            CHROOT_wrt_LogNewFiles "$name"
    386                          fi ;;
    387       *kernel)           CHROOT_wrt_RemoveBuildDirs "dummy"
    388                          if [ "${INSTALL_LOG}" = "y" ] ; then
    389                            CHROOT_wrt_LogNewFiles "$name"
    390                          fi ;;
    391     esac
    392 
     361    esac
    393362    # Include a touch of the target name so make can check
    394363    # if it's already been made.

  • TODO

    radbd09b r2758d94  
    66-------------
    77
    8   - Add a way to choose the network configuration (ip, gateway, etc).
    98  - [CLFS] Add a switch to choose between static or DHCP network configuration
    109    for CLFS.
    … …  
    1413------------
    1514
    16   - Add a way to choose the network configuration (ip, gateway, etc).
    1715  - [CLFS] Add a switch to choose between static or DHCP network configuration
    1816    for CLFS.

  • common/libs/func_book_parser

    radbd09b r2758d94  
    194194                 --stringparam local          "$LOCAL"        \
    195195                 --stringparam log-level      "$LOG_LEVEL"    \
     196                 --stringparam script-root    "$SCRIPT_ROOT"  \
    196197                 --output ./${PROGNAME}-commands/             \
    197198                 $XSL                                         \

  • common/libs/func_wrt_Makefile

    radbd09b r2758d94  
    181181${NO_PROGRESS}  @export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
    182182        @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@$version
    183         @\$(PRT_DU) >>logs/\$@$version
     183        @ : > envars
    184184EOF
    185185) >> $MKFILE.tmp
    … …  
    202202${NO_PROGRESS}  @export BASHBIN=\$(SHELL) && \$(SHELL) progress_bar.sh \$@ \$\$PPID &
    203203        @echo "\$(nl_)\`date\`\$(nl_)" >logs/\$@$version
    204         @\$(PRT_DU_CR) >>logs/\$@$version
     204        @ : > envars
    205205EOF
    206206) >> $MKFILE.tmp
    … …  
    228228(
    229229cat << EOF
     230        @\$(PRT_DU) >>logs/\$@$version
    230231        @\$(call unpack,$FILE)
    231232        @\$(call get_pkg_root_LUSER)
    … …  
    247248) >> $MKFILE.tmp
    248249  fi
    249 (
    250 cat  << EOF
     250
     251(
     252cat << EOF
     253        @\$(PRT_DU_CR) >>logs/\$@$version
    251254        @\$(call unpack2,$FILE)
    252255        @\$(call get_pkg_root2)
    … …  
    337340cat << EOF
    338341        @source ~/.bashrc && \\
    339         \$(CMDSDIR)/`dirname $file`/\$@ >> logs/\$@$version 2>&1 && \\
    340         \$(PRT_DU) >>logs/\$@$version
     342        \$(CMDSDIR)/`dirname $file`/\$@ >> \$(LOGDIR)/\$@$version 2>&1 && \\
     343        if [ "${PROGNAME}" != lfs ]; then \$(PRT_DU) >>logs/\$@$version; fi
    341344EOF
    342345) >> $MKFILE.tmp
    … …  
    354357cat << EOF
    355358        @source envars && \\
    356         \$(crCMDSDIR)/`dirname $file`/\$@ >>logs/\$@$version 2>&1 && \\
    357         \$(PRT_DU_CR) >>logs/\$@$version
     359        \$(crCMDSDIR)/`dirname $file`/\$@ >>\$(crLOGDIR)/\$@$version 2>&1 && \\
     360        if [ "${PROGNAME}" != lfs ]; then \$(PRT_DU_CR) >>logs/\$@$version; fi
    358361EOF
    359362) >> $MKFILE.tmp

  • pkgmngt/packageManager.xml.pacman

    radbd09b r2758d94  
    99it in html -->
    1010<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    11   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
     11  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     12<!ENTITY libarchive-version "3.1.2">
     13<!ENTITY curl-version       "7.39.0">
     14<!ENTITY pacman-version     "4.1.2">
     15<!ENTITY libarchive-url "http://www.libarchive.org/downloads/libarchive-&libarchive-version;.tar.gz">
     16<!ENTITY curl-url       "http://curl.haxx.se/download/curl-&curl-version;.tar.lzma">
     17<!ENTITY pacman-url     "https://sources.archlinux.org/other/pacman/pacman-&pacman-version;.tar.gz">
     18<!ENTITY curl-md5       "e9aa6dec29920eba8ef706ea5823bad7">
     19<!ENTITY libarchive-md5 "efad5a503f66329bb9d2f4308b5de98a">
     20<!ENTITY pacman-md5     "063c8b0ff6bdf903dc235445525627cd">
     21]>
     22
    1223
    1324<!-- The first markup should be the one defined in the DOCTYPE DECLARATION -->
    … …  
    1930Do not change  anything, except the url and the md5 checksum. -->
    2031<sect1 id="package">
    21         <para>Download: <ulink url="http://curl.haxx.se/download/curl-7.39.0.tar.lzma"/></para>
    22         <para>MD5 sum: <literal>e9aa6dec29920eba8ef706ea5823bad7</literal></para>
    23         <para>Download: <ulink url="http://www.libarchive.org/downloads/libarchive-3.1.2.tar.gz"/></para>
    24         <para>MD5 sum: <literal>efad5a503f66329bb9d2f4308b5de98a</literal></para>
    25         <para>Download: <ulink url="https://sources.archlinux.org/other/pacman/pacman-4.1.2.tar.gz"/></para>
    26         <para>MD5 sum: <literal>063c8b0ff6bdf903dc235445525627cd</literal></para>
     32  <?dbhtml filename="package.html"?>
     33
     34  <title>All Packages</title>
     35        <para>Download: <ulink url="&curl-url;"/></para>
     36        <para>MD5 sum: <literal>&curl-md5;</literal></para>
     37        <para>Download: <ulink url="&libarchive-url;"/></para>
     38        <para>MD5 sum: <literal>&libarchive-md5;</literal></para>
     39        <para>Download: <ulink url="&pacman-url;"/></para>
     40        <para>MD5 sum: <literal>&pacman-md5;</literal></para>
    2741</sect1>
    2842
    … …  
    3650<!-- Do not change the next line. The name of the scriptlet will be taken
    3751from the dbhtml instruction: it is the name of the file less .html, with
    38 xxx-x-added before (x, digits). Furthermore, the tarball name must be in the form
    39 name_x.y.z(.extension) or name-x.y.z(.extension) if the dbhtml
    40 instruction  contains file="name.html" -->
     52xxx-x-added before (x, digits).-->
    4153<sect1 id="ch-tools-libarchive" role="wrap">
    4254  <?dbhtml filename="libarchive.html"?>
    43   <sect2 role="installation">
     55
     56  <sect1info condition="script">
     57    <productname>libarchive</productname>
     58    <productnumber>&libarchive-version;</productnumber>
     59    <address>&libarchive-url;</address>
     60  </sect1info>
     61
     62  <title>Libarchive-&libarchive-version;</title>
     63
     64  <sect2 role="installation">
     65    <title/>
    4466<screen><userinput remap="configure">./configure --prefix=/tools \
    4567            --without-bz2lib \
    … …  
    5274
    5375</sect1>
     76
    5477<sect1 id="ch-tools-curl" role="wrap">
    5578  <?dbhtml filename="curl.html"?>
    56   <sect2 role="installation">
     79
     80  <sect1info condition="script">
     81    <productname>curl</productname>
     82    <productnumber>&curl-version;</productnumber>
     83    <address>&curl-url;</address>
     84  </sect1info>
     85
     86  <title>Curl-&curl-version;</title>
     87
     88  <sect2 role="installation">
     89    <title/>
    5790<screen><userinput remap="configure">./configure --prefix=/tools \
    5891            --disable-static</userinput></screen>
    … …  
    6598<sect1 id="ch-tools-pkgmngt" role="wrap">
    6699  <?dbhtml filename="pacman.html"?>
    67 <!-- next line mandatory without change, but feel free to add any title,
    68 other sect2 (with different role), sectinfo and so on -->
    69   <sect2 role="installation">
     100
     101  <sect1info condition="script">
     102    <productname>pacman</productname>
     103    <productnumber>&pacman-version;</productnumber>
     104    <address>&pacman-url;</address>
     105  </sect1info>
     106
     107  <title>Pacman-&pacman-version;</title>
     108
     109  <sect2 role="installation">
     110    <title/>
    70111<!-- You can use any number of remap="pre", "configure", "make", "test", "install"
    71112<screen><userinput remap="something">Instructions</userinput></screen>.
    … …  
    111152<sect1 id="ch-pkgmngt-creatingdirs">
    112153
    113 <!-- Put the create dir intructions there. feel free to add
    114 any explaining <title>Title</title> and <para>explanations</para> -->
     154  <title>Creating Directories</title>
     155
    115156<screen><userinput>mkdir -pv /var/{lib/{packages,pacman},cache/pkg}</userinput></screen>
    116157
    … …  
    118159<!-- Same for files. Do not change the following line -->
    119160<sect1 id="ch-pkgmngt-createfiles">
     161
     162  <title>Creating Essential Files</title>
    120163
    121164<para>No file?</para>
    … …  
    132175<sect1 id="ch-system-libarchive" role="wrap">
    133176  <?dbhtml filename="libarchive.html"?>
    134   <sect2 role="installation">
     177
     178  <sect1info condition="script">
     179    <productname>libarchive</productname>
     180    <productnumber>&libarchive-version;</productnumber>
     181    <address>&libarchive-url;</address>
     182  </sect1info>
     183
     184  <title>Libarchive-&libarchive-version;</title>
     185
     186  <sect2 role="installation">
     187    <title/>
    135188<screen><userinput remap="configure">./configure --prefix=/usr \
    136189            --disable-static</userinput></screen>
    … …  
    142195<sect1 id="ch-system-curl" role="wrap">
    143196  <?dbhtml filename="curl.html"?>
    144   <sect2 role="installation">
     197
     198  <sect1info condition="script">
     199    <productname>curl</productname>
     200    <productnumber>&curl-version;</productnumber>
     201    <address>&curl-url;</address>
     202  </sect1info>
     203
     204  <title>Curl-&curl-version;</title>
     205
     206  <sect2 role="installation">
     207    <title/>
    145208<screen><userinput remap="configure">./configure --prefix=/usr \
    146209            --disable-static \
    … …  
    149212<screen><userinput remap="install">make DESTDIR=$PKG_DEST install
    150213find docs \( -name "Makefile*" -o -name "*.1" -o -name "*.3" \) -exec rm {} \;
    151 install -v -d -m755 $PKG_DEST/usr/share/doc/curl-7.39.0
    152 cp -v -R docs/*     $PKG_DEST/usr/share/doc/curl-7.39.0</userinput></screen>
     214install -v -d -m755 $PKG_DEST/usr/share/doc/curl-&curl-version;
     215cp -v -R docs/*     $PKG_DEST/usr/share/doc/curl-&curl-version;</userinput></screen>
    153216  </sect2>
    154217
    … …  
    157220  <?dbhtml filename="pacman.html"?>
    158221
    159   <sect2 role="installation">
     222  <sect1info condition="script">
     223    <productname>pacman</productname>
     224    <productnumber>&pacman-version;</productnumber>
     225    <address>&pacman-url;</address>
     226  </sect1info>
     227
     228  <title>Pacman-&pacman-version;</title>
     229
     230  <sect2 role="installation">
     231    <title/>
    160232
    161233<screen><userinput remap="configure">./configure --prefix=/usr \

  • pkgmngt/packageManager.xml.porg

    radbd09b r2758d94  
    11<?xml version="1.0" encoding="UTF-8"?>
    22<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
    3   "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" >
     3  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
     4<!ENTITY porg-version "0.10">
     5<!ENTITY porg-url "https://sourceforge.net/projects/porg/files/porg-&porg-version;.tar.gz">
     6<!ENTITY porg-md5 "2eceb8a73bb188dbb06b12d90cabdbb4">
     7]>
    48
    59<article>
    … …  
    711<sect1 id="package">
    812  <title>Package Information</title>
    9         <para>Download: <ulink url="https://sourceforge.net/projects/porg/files/porg-0.10.tar.gz"/></para>
    10         <para>MD5 sum: <literal>2eceb8a73bb188dbb06b12d90cabdbb4</literal></para>
     13        <para>Download: <ulink url="&porg-url;"/></para>
     14        <para>MD5 sum: <literal>&porg-md5;</literal></para>
    1115</sect1>
    1216
    1317<sect1 id="ch-tools-pkgmngt" role="wrap">
    1418  <?dbhtml filename="porg.html"?>
     19
     20  <sect1info condition="script">
     21    <productname>porg</productname>
     22    <productnumber>&porg-version;</productnumber>
     23    <address>&porg-url;</address>
     24  </sect1info>
     25
    1526  <title>Porg in tools</title>
    1627  <sect2 role="installation">
    … …  
    6071<sect1 id="ch-system-pkgmngt" role="wrap">
    6172  <?dbhtml filename="porg.html"?>
     73
     74  <sect1info condition="script">
     75    <productname>porg</productname>
     76    <productnumber>&porg-version;</productnumber>
     77    <address>&porg-url;</address>
     78  </sect1info>
     79
    6280  <title>Final Porg</title>
    6381  <sect2 role="installation">

  • pkgmngt/packageManager.xml.template

    radbd09b r2758d94  
    3232<!-- Do not change the next line. The name of the scriptlet will be taken
    3333from the dbhtml instruction: it is the name of the file less .html, with
    34 xxx-x-added before (x, digits). Furthermore, the tarball name must be in the form
    35 name_x.y.z(.extension) or name-x.y.z(.extension) if the dbhtml
    36 instruction  contains file="name.html" -->
     34xxx-x-added before (x, digits). -->
    3735<sect1 id="ch-tools-pkgmngt" role="wrap">
    3836  <?dbhtml filename="dpkg.html"?>
     37<!-- the next lines are now mandatory for unpacking the tarball at the
     38     beginning of the scriptlet -->
     39  <sect1info condition="script">
     40    <productname>dpkg</productname>
     41    <productnumber>x.y.z</productnumber><!-- version -->
     42    <address>http://where/is/your/package</address><!-- url -->
     43  </sect1info>
    3944<!-- next line mandatory without change, but feel free to add any title,
    4045other sect2 (with different role), sectinfo and so on -->
    … …  
    101106<!-- Last but not least : Final instructions for installing the
    102107package manager at the end of chapter 6. Again, the scriptlet file name is
    103 taken from the dbhtml instruction, with digits added before and .html cut
    104 and the tarball name is formed from this name + version. So the file
    105 here _must_ be the same as in chapter 5. If rendering in html, both
    106 sets of instructions end up in the same file, which is usually not a problem.
     108taken from the dbhtml instruction, with digits added before and .html cut.
    107109-->
    108110<sect1 id="ch-system-pkgmngt" role="wrap">
    109111  <?dbhtml filename="dpkg.html"?>
     112
     113<!-- the next lines are now mandatory for unpacking the tarball at the
     114     beginning of the scriptlet -->
     115  <sect1info condition="script">
     116    <productname>dpkg</productname><!-- for example -->
     117    <productnumber>x.y.z</productnumber><!-- version -->
     118    <address>http://where/is/your/package</address><!-- url -->
     119  </sect1info>
    110120
    111121  <sect2 role="installation">
Note: See TracChangeset for help on using the changeset viewer.