Changeset af63ee2


Ignore:
Timestamp:
01/01/2014 09:49:25 AM (10 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
ablfs
Parents:
f5337a9
Message:

Merge trunk r3767-3773

Files:
5 edited

Legend:

Unmodified
Added
Removed

  • BLFS/xsl/dependencies.xsl

    rf5337a9 raf63ee2  
    4343    <xsl:variable name="depname">
    4444      <xsl:choose>
     45        <xsl:when test="@name='xorg-env'"/>
    4546        <xsl:when test="@name='x-window-system'">xinit</xsl:when>
    4647        <xsl:when test="@name='xorg7'">xinit</xsl:when>

  • BLFS/xsl/gen_pkg_list.xsl

    rf5337a9 raf63ee2  
    201201          </xsl:if>
    202202<!-- Dependencies -->
    203 <!-- If in Xorg or KDE chapter, consider that the preceding package is
    204      the first dependency (not always noted in the book) -->
    205           <xsl:if test="ancestor::chapter[@id='kde4-core'] or
    206                        (ancestor::chapter[@id='x-window-system'] and
    207                         preceding-sibling::sect1[@id != 'xorg7'])">
     203<!-- If in Xorg (not anymore) or KDE chapter, consider that the preceding
     204     package is the first dependency (not always noted in the book)-->
     205          <xsl:if test="ancestor::chapter[@id='kde4-core']">
    208206            <xsl:text>
    209207            </xsl:text>
    210             <xsl:choose>
    211               <xsl:when test="contains(preceding-sibling::sect1[1]/@id,
    212                                        'xorg7-') and
    213                               not(contains(preceding-sibling::sect1[1]/@id,
    214                                        'driver'))">
    215                 <xsl:call-template name="expand-deps">
    216                   <xsl:with-param name="section">
    217                     <xsl:value-of select="preceding-sibling::sect1[1]/@id"/>
    218                   </xsl:with-param>
    219                   <xsl:with-param name="status" select="'required'"/>
    220                 </xsl:call-template>
    221               </xsl:when>
    222               <xsl:otherwise>
    223                 <xsl:element name="dependency">
    224                   <xsl:attribute name="status">required</xsl:attribute>
    225                   <xsl:attribute name="name">
    226                     <xsl:choose>
    227                       <xsl:when test="@id='printproto'">xorg-server</xsl:when>
    228                       <xsl:otherwise>
    229                         <xsl:value-of
    230                           select="preceding-sibling::sect1[1]/@id"/>
    231                       </xsl:otherwise>
    232                     </xsl:choose>
    233                   </xsl:attribute>
    234                   <xsl:attribute name="type">ref</xsl:attribute>
    235                 </xsl:element>
    236               </xsl:otherwise>
    237             </xsl:choose>
     208            <xsl:element name="dependency">
     209              <xsl:attribute name="status">required</xsl:attribute>
     210              <xsl:attribute name="name">
     211                <xsl:value-of select="preceding-sibling::sect1[1]/@id"/>
     212              </xsl:attribute>
     213              <xsl:attribute name="type">ref</xsl:attribute>
     214            </xsl:element>
    238215          </xsl:if>
    239216          <xsl:apply-templates select=".//para[@role='required' or

  • common/libs/func_check_version.sh

    rf5337a9 raf63ee2  
    100100
    101101  # LFS/HLFS/CLFS prerequisites
    102   check_version "$MIN_Linux_VER"     "`uname -r`"          "KERNEL"
    103   check_version "$MIN_Bash_VER"      "$BASH_VERSION"       "BASH"
     102  if [ -n "$MIN_Linux_VER" ]; then
     103    check_version "$MIN_Linux_VER"     "`uname -r`"          "KERNEL"
     104  fi
     105  if [ -n "$MIN_Bash_VER" ]; then
     106    check_version "$MIN_Bash_VER"      "$BASH_VERSION"       "BASH"
     107  fi
    104108  if [ ! -z $MIN_GCC_VER ]; then
    105109    check_version "$MIN_GCC_VER"     "`gcc -dumpversion`"  "GCC"
    … …  
    108112    check_version "$MIN_Gcc_VER"     "`gcc -dumpversion`"  "GCC"
    109113  fi
    110   check_version "$MIN_Glibc_VER"     "$(ldd --version  | head -n1 | awk '{print $NF}')"   "GLIBC"
    111   check_version "$MIN_Binutils_VER"  "$(ld --version  | head -n1 | awk '{print $NF}')"    "BINUTILS"
    112   check_version "$MIN_Tar_VER"       "$(tar --version | head -n1 | cut -d" " -f4)"        "TAR"
     114  if [ -n "$MIN_Glibc_VER" ]; then
     115    check_version "$MIN_Glibc_VER"     "$(ldd --version  | head -n1 | awk '{print $NF}')"   "GLIBC"
     116  fi
     117  if [ -n "$MIN_Binutils_VER" ]; then
     118    check_version "$MIN_Binutils_VER"  "$(ld --version  | head -n1 | awk '{print $NF}')"    "BINUTILS"
     119  fi
     120  if [ -n "$MIN_Tar_VER" ]; then
     121    check_version "$MIN_Tar_VER"       "$(tar --version | head -n1 | cut -d" " -f4)"        "TAR"
     122  fi
     123  if [ -n "$MIN_Bzip2_VER" ]; then
    113124  bzip2Ver="$(bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f8)"
    114   check_version "$MIN_Bzip2_VER"     "${bzip2Ver%%,*}"     "BZIP2"
    115   check_version "$MIN_Bison_VER"     "$(bison --version | head -n1 | cut -d" " -f4)"      "BISON"
    116   check_version "$MIN_Coreutils_VER" "$(chown --version | head -n1 | cut -d")" -f2)"      "COREUTILS"
    117   check_version "$MIN_Diffutils_VER" "$(diff --version  | head -n1 | cut -d" " -f4)"      "DIFF"
    118   check_version "$MIN_Findutils_VER" "$(find --version  | head -n1 | cut -d" " -f4)"      "FIND"
    119   check_version "$MIN_Gawk_VER"      "$(gawk --version  | head -n1 | awk -F'[ ,]+' '{print $3}')" "GAWK"
    120   check_version "$MIN_Grep_VER"      "$(grep --version  | head -n1 | awk '{print $NF}')"  "GREP"
    121   check_version "$MIN_Gzip_VER"      "$(gzip --version 2>&1 | head -n1 | cut -d" " -f2)"  "GZIP"
    122   check_version "$MIN_M4_VER"        "$(m4 --version 2>&1 | head -n1 | awk '{print $NF}')" "M4"
    123   check_version "$MIN_Make_VER"      "$(make --version  | head -n1 | cut -d " " -f3 | cut -c1-4)" "MAKE"
    124   check_version "$MIN_Patch_VER"     "$(patch --version | head -n1 | sed 's/.*patch //')" "PATCH"
    125   check_version "$MIN_Perl_VER"      "$(perl -V:version | cut -f2 -d\')"                  "PERL"
    126   check_version "$MIN_Sed_VER"       "$(sed --version   | head -n1 | cut -d" " -f4)"      "SED"
    127   check_version "$MIN_Texinfo_VER"   "$(makeinfo --version | head -n1 | awk '{ print$NF }')" "TEXINFO"
    128   check_version "$MIN_Xz_VER"        "$(xz --version | head -n1 | cut -d" " -f4)"         "XZ"
     125    check_version "$MIN_Bzip2_VER"     "${bzip2Ver%%,*}"     "BZIP2"
     126  fi
     127  if [ -n "$MIN_Bison_VER" ]; then
     128    check_version "$MIN_Bison_VER"     "$(bison --version | head -n1 | cut -d" " -f4)"      "BISON"
     129  fi
     130  if [ -n "$MIN_Coreutils_VER" ]; then
     131    check_version "$MIN_Coreutils_VER" "$(chown --version | head -n1 | cut -d" " -f4)"      "COREUTILS"
     132  fi
     133  if [ -n "$MIN_Diffutils_VER" ]; then
     134    check_version "$MIN_Diffutils_VER" "$(diff --version  | head -n1 | cut -d" " -f4)"      "DIFF"
     135  fi
     136  if [ -n "$MIN_Findutils_VER" ]; then
     137    check_version "$MIN_Findutils_VER" "$(find --version  | head -n1 | cut -d" " -f4)"      "FIND"
     138  fi
     139  if [ -n "$MIN_Gawk_VER" ]; then
     140    check_version "$MIN_Gawk_VER"      "$(gawk --version  | head -n1 | awk -F'[ ,]+' '{print $3}')" "GAWK"
     141  fi
     142  if [ -n "$MIN_Grep_VER" ]; then
     143    check_version "$MIN_Grep_VER"      "$(grep --version  | head -n1 | awk '{print $NF}')"  "GREP"
     144  fi
     145  if [ -n "$MIN_Gzip_VER" ]; then
     146    check_version "$MIN_Gzip_VER"      "$(gzip --version 2>&1 | head -n1 | cut -d" " -f2)"  "GZIP"
     147  fi
     148  if [ -n "$MIN_M4_VER" ]; then
     149    check_version "$MIN_M4_VER"        "$(m4 --version 2>&1 | head -n1 | awk '{print $NF}')" "M4"
     150  fi
     151  if [ -n "$MIN_Make_VER" ]; then
     152    check_version "$MIN_Make_VER"      "$(make --version  | head -n1 | cut -d " " -f3 | cut -c1-4)" "MAKE"
     153  fi
     154  if [ -n "$MIN_Patch_VER" ]; then
     155    check_version "$MIN_Patch_VER"     "$(patch --version | head -n1 | sed 's/.*patch //')" "PATCH"
     156  fi
     157  if [ -n "$MIN_Perl_VER" ]; then
     158    check_version "$MIN_Perl_VER"      "$(perl -V:version | cut -f2 -d\')"                  "PERL"
     159  fi
     160  if [ -n "$MIN_Sed_VER" ]; then
     161    check_version "$MIN_Sed_VER"       "$(sed --version   | head -n1 | cut -d" " -f4)"      "SED"
     162  fi
     163  if [ -n "$MIN_Texinfo_VER" ]; then
     164    check_version "$MIN_Texinfo_VER"   "$(makeinfo --version | head -n1 | awk '{ print$NF }')" "TEXINFO"
     165  fi
     166  if [ -n "$MIN_Xz_VER" ]; then
     167    check_version "$MIN_Xz_VER"        "$(xz --version | head -n1 | cut -d" " -f4)"         "XZ"
     168  fi
    129169}
    130170

  • common/libs/func_install_blfs

    rf5337a9 raf63ee2  
    6464  LINE_TIDY='#CONFIG_html-tidy is not set'
    6565fi
    66 if [ "$DEP_DBXML" = y ]; then
    67   LINE_DBXML='CONFIG_DocBook=y'
    68 else
    69   LINE_DBXML='#CONFIG_DocBook is not set'
    70 fi
     66# DocBook is a rec dep of libxslt
     67# if [ "$DEP_DBXML" = y ]; then
     68#   LINE_DBXML='CONFIG_DocBook=y'
     69# else
     70#   LINE_DBXML='#CONFIG_DocBook is not set'
     71# fi
    7172if [ "$DEP_LYNX" = y ]; then
    7273  LINE_LYNX='CONFIG_lynx=y'
    … …  
    110111$LINE_LIBXSLT
    111112$LINE_TIDY
    112 $LINE_DBXML
    113113$LINE_OPENSSL
    114114$LINE_WGET
    … …  
    147147
    148148# Suppresses unneeded parts of the scriptlets
     149if [ "$DEP_LIBXSLT" = y ]; then
     150  # libxslt pulls docbook-xsl in, which populates the catalog with annoying
     151  # **EDITME** references. Fortunately, those lines are regognizable because
     152  # they occur between lines containing '/etc/xml/catalog' at the end of the
     153  # line (without '&&'). I  have not found a simple way to delete lines
     154  # between 2 addresses, excluding either the first or the last one. So use
     155  # a loop for accumulating lines and deleting at the end.
     156  # Sorry for sed synthax.
     157  sed -i '\@^[[:space:]]*/etc/xml/catalog$@{
     158n
     159:a
     160\@/etc/xml/catalog$@bb
     161N
     162ba
     163:b
     164d}' \
     165      $BUILDDIR$BLFS_ROOT/scripts/*docbook-xsl
     166fi
    149167if [ "$DEP_SUDO" = y ]; then
    150   sed -i '/pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
     168  sed -i '/cat.*pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
    151169fi
    152170if [ "$DEP_SVN" = y ]; then
    … …  
    164182pushd $BUILDDIR$BLFS_ROOT/work
    165183../gen-makefile.sh
     184# The generated Makefile updates the tracking file after each package
     185# installation, using libxslt, which is not installed yet. So move
     186# updating to the end of the process, adding an 'update' target
    166187sed -i -e '/xsltproc/,+6d' \
    167188       -e '/^all/s@$@ update@' \

  • install-blfs-tools.sh

    rf5337a9 raf63ee2  
    22# $Id$
    33set -e
     4
     5: << inline_doc
     6Installs a set-up to build BLFS packages.
     7You can set these variables:
     8TRACKING_DIR  : where the installed package file is kept.
     9                 (default /var/lib/jhalfs/BLFS)
     10BLFS_ROOT     : where the installed tools will be installed, relative to $HOME.
     11                Must start with a '/' (default /blfs_root)
     12BLFS_BRANCH_ID: development, branch-xxx, xxx (where xxx is a valid tag)
     13                (default development)
     14Examples:
     151 - If you plan to use the tools to build BLFS on top of LFS, but you did not
     16use jhalfs, or forgot to include the jhalfs-blfs tools:
     17(as root) mkdir -p /var/lib/jhalfs/BLFS && chown -R user /var/lib/jhalfs
     18(as user) ./install-blfs-tools
     192 - To install with only user privileges:
     20TRACKING_DIR=/home/user/blfs_root/trackdir ./install-blfs-tools
     21inline_doc
     22
    423
    524# VT100 colors
    … …  
    3655BLFS_TOOL='y'
    3756BUILDDIR=$(cd ~;pwd)
    38 BLFS_ROOT="/blfs_root"
    39 TRACKING_DIR="/var/lib/jhalfs/BLFS"
     57BLFS_ROOT="${BLFS_ROOT:=/blfs_root}"
     58TRACKING_DIR="${TRACKING_DIR:=/var/lib/jhalfs/BLFS}"
    4059
    4160[[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
    … …  
    5978# Check for build prerequisites.
    6079echo
    61   check_prerequisites
     80  check_alfs_tools
     81  check_blfs_tools
    6282echo "${SD_BORDER}${nl_}"
    6383
    … …  
    82102sed -i s@tracking-dir@$TRACKING_DIR@ \
    83103    ${BUILDDIR}${BLFS_ROOT}/{Makefile,gen-makefile.sh}
     104
     105# Ensures the tracking directory exists.
     106# Throws an error if it does not exist and the user does not
     107# have write permission to create it.
     108# If it exists, does nothing.
     109mkdir -p $TRACKING_DIR
    84110[[ $VERBOSITY > 0 ]] && echo "... OK"
    85111
Note: See TracChangeset for help on using the changeset viewer.