Changeset 7072e1f for common


Ignore:
Timestamp:
02/01/2012 11:29:37 PM (12 years ago)
Author:
Thomas Pegg <thomasp@…>
Branches:
2.4, ablfs, ablfs-more, legacy, new_features, trunk
Children:
2c9a16b
Parents:
f5dc6d7
Message:

Commit Pierre Labastie's patch for including package management support in jhalfs. NOTE: Package management is by default disabled.

Location:
common
Files:
6 added
1 deleted
20 edited

Legend:

Unmodified
Added
Removed

  • common/blfs-tool-deps/901-libxml2

    rf5dc6d7 r7072e1f  
    77./configure --prefix=/usr
    88make
    9 make install
     9if ! [ -z $PKG_DEST ]; then
     10        mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
     11        ln -sv share/{man,doc,info} $PKG_DEST/usr
     12        case $(uname -m) in
     13         x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
     14        esac
     15fi
     16make DESTDIR=$PKG_DEST install
     17if ! [ -z $PKG_DEST ]; then
     18        rm -fv $PKG_DEST/{,usr/}lib64
     19        rm -fv $PKG_DEST/usr/{man,doc,info}
     20        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
     21          [[ -z $(ls $dir) ]] && rmdir -v $dir
     22        done
     23        for dir in $PKG_DEST/usr/{lib,share}; do
     24          [[ -z $(ls $dir) ]] && rmdir -v $dir
     25        done
     26        for dir in $PKG_DEST/{lib,usr}; do
     27          [[ -z $(ls $dir) ]] && rmdir -v $dir
     28        done
     29        packInstall
     30fi
     31rm -rf $PKG_DEST
    1032
    1133exit

  • common/blfs-tool-deps/902-libxslt

    rf5dc6d7 r7072e1f  
    77./configure --prefix=/usr
    88make
    9 make install
     9if ! [ -z $PKG_DEST ]; then
     10        mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
     11        ln -sv share/{man,doc,info} $PKG_DEST/usr
     12        case $(uname -m) in
     13         x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
     14        esac
     15fi
     16make DESTDIR=$PKG_DEST install
     17if ! [ -z $PKG_DEST ]; then
     18        rm -fv $PKG_DEST/{,usr/}lib64
     19        rm -fv $PKG_DEST/usr/{man,doc,info}
     20        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
     21          [[ -z $(ls $dir) ]] && rmdir -v $dir
     22        done
     23        for dir in $PKG_DEST/usr/{lib,share}; do
     24          [[ -z $(ls $dir) ]] && rmdir -v $dir
     25        done
     26        for dir in $PKG_DEST/{lib,usr}; do
     27          [[ -z $(ls $dir) ]] && rmdir -v $dir
     28        done
     29        packInstall
     30fi
     31rm -rf $PKG_DEST
    1032
    1133exit

  • common/blfs-tool-deps/903-tidy

    rf5dc6d7 r7072e1f  
    88./configure --prefix=/usr
    99make
    10 make install
    11 make -C htmldoc install_apidocs
     10if ! [ -z $PKG_DEST ]; then
     11        mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
     12        ln -sv share/{man,doc,info} $PKG_DEST/usr
     13        case $(uname -m) in
     14         x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
     15        esac
     16fi
     17make DESTDIR=$PKG_DEST install
     18install -v -m644 -D htmldoc/tidy.1 \
     19                    $PKG_DEST/usr/share/man/man1/tidy.1
     20install -v -m755 -d $PKG_DEST/usr/share/doc/tidy-cvs_20101110
     21install -v -m644    htmldoc/*.{html,gif,css} \
     22                    $PKG_DEST/usr/share/doc/tidy-cvs_20101110
     23if ! [ -z $PKG_DEST ]; then
     24        rm -fv $PKG_DEST/{,usr/}lib64
     25        rm -fv $PKG_DEST/usr/{man,doc,info}
     26        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
     27          [[ -z $(ls $dir) ]] && rmdir -v $dir
     28        done
     29        for dir in $PKG_DEST/usr/{lib,share}; do
     30          [[ -z $(ls $dir) ]] && rmdir -v $dir
     31        done
     32        for dir in $PKG_DEST/{lib,usr}; do
     33          [[ -z $(ls $dir) ]] && rmdir -v $dir
     34        done
     35        packInstall
     36fi
     37rm -rf $PKG_DEST
    1238
    1339exit

  • common/blfs-tool-deps/904-unzip

    rf5dc6d7 r7072e1f  
    66cd $PKGDIR
    77
    8 patch -Np1 -i ../unzip-5.52-security_fix-1.patch
    9 make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux
    10 make prefix=/usr install
     8case `uname -m` in
     9  i?86)
     10    sed -i -e 's/DASM"/DASM -DNO_LCHMOD"/' unix/Makefile
     11    make -f unix/Makefile linux
     12    ;;
     13  *)
     14    sed -i -e 's/CFLAGS="-O -Wall/& -DNO_LCHMOD/' unix/Makefile
     15    make -f unix/Makefile linux_noasm
     16    ;;
     17esac
     18if ! [ -z $PKG_DEST ]; then
     19        mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
     20        ln -sv share/{man,doc,info} $PKG_DEST/usr
     21        case $(uname -m) in
     22         x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
     23        esac
     24fi
     25make prefix=$PKG_DEST/usr install
     26if ! [ -z $PKG_DEST ]; then
     27        rm -fv $PKG_DEST/{,usr/}lib64
     28        rm -fv $PKG_DEST/usr/{man,doc,info}
     29        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
     30          [[ -z $(ls $dir) ]] && rmdir -v $dir
     31        done
     32        for dir in $PKG_DEST/usr/{lib,share}; do
     33          [[ -z $(ls $dir) ]] && rmdir -v $dir
     34        done
     35        for dir in $PKG_DEST/{lib,usr}; do
     36          [[ -z $(ls $dir) ]] && rmdir -v $dir
     37        done
     38        packInstall
     39fi
     40rm -rf $PKG_DEST
    1141
    1242exit

  • common/blfs-tool-deps/905-docbook-xml

    rf5dc6d7 r7072e1f  
    99cd docbook-xml
    1010unzip ../docbook-xml-4.5.zip
    11 install -v -d -m755 /usr/share/xml/docbook/xml-dtd-4.5
    12 install -v -d -m755 /etc/xml
     11install -v -d -m755 $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5
     12install -v -d -m755 $PKG_DEST/etc/xml
    1313chown -R root:root .
    1414cp -v -af docbook.cat *.dtd ent/ *.mod \
    15     /usr/share/xml/docbook/xml-dtd-4.5
    16 if [ ! -e /etc/xml/docbook ]; then
    17     xmlcatalog --noout --create /etc/xml/docbook
     15    $PKG_DEST/usr/share/xml/docbook/xml-dtd-4.5
     16if [ ! -e $PKG_DEST/etc/xml/docbook ]; then
     17    xmlcatalog --noout --create $PKG_DEST/etc/xml/docbook
    1818fi
    1919xmlcatalog --noout --add "public" \
    2020    "-//OASIS//DTD DocBook XML V4.5//EN" \
    2121    "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" \
    22     /etc/xml/docbook
     22    $PKG_DEST/etc/xml/docbook
    2323xmlcatalog --noout --add "public" \
    2424    "-//OASIS//DTD DocBook XML CALS Table Model V4.5//EN" \
    2525    "file:///usr/share/xml/docbook/xml-dtd-4.5/calstblx.dtd" \
    26     /etc/xml/docbook
     26    $PKG_DEST/etc/xml/docbook
    2727xmlcatalog --noout --add "public" \
    2828    "-//OASIS//DTD XML Exchange Table Model 19990315//EN" \
    2929    "file:///usr/share/xml/docbook/xml-dtd-4.5/soextblx.dtd" \
    30     /etc/xml/docbook
     30    $PKG_DEST/etc/xml/docbook
    3131xmlcatalog --noout --add "public" \
    3232    "-//OASIS//ELEMENTS DocBook XML Information Pool V4.5//EN" \
    3333    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbpoolx.mod" \
    34     /etc/xml/docbook
     34    $PKG_DEST/etc/xml/docbook
    3535xmlcatalog --noout --add "public" \
    3636    "-//OASIS//ELEMENTS DocBook XML Document Hierarchy V4.5//EN" \
    3737    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbhierx.mod" \
    38     /etc/xml/docbook
     38    $PKG_DEST/etc/xml/docbook
    3939xmlcatalog --noout --add "public" \
    4040    "-//OASIS//ELEMENTS DocBook XML HTML Tables V4.5//EN" \
    4141    "file:///usr/share/xml/docbook/xml-dtd-4.5/htmltblx.mod" \
    42     /etc/xml/docbook
     42    $PKG_DEST/etc/xml/docbook
    4343xmlcatalog --noout --add "public" \
    4444    "-//OASIS//ENTITIES DocBook XML Notations V4.5//EN" \
    4545    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbnotnx.mod" \
    46     /etc/xml/docbook
     46    $PKG_DEST/etc/xml/docbook
    4747xmlcatalog --noout --add "public" \
    4848    "-//OASIS//ENTITIES DocBook XML Character Entities V4.5//EN" \
    4949    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbcentx.mod" \
    50     /etc/xml/docbook
     50    $PKG_DEST/etc/xml/docbook
    5151xmlcatalog --noout --add "public" \
    5252    "-//OASIS//ENTITIES DocBook XML Additional General Entities V4.5//EN" \
    5353    "file:///usr/share/xml/docbook/xml-dtd-4.5/dbgenent.mod" \
    54     /etc/xml/docbook
     54    $PKG_DEST/etc/xml/docbook
    5555xmlcatalog --noout --add "rewriteSystem" \
    5656    "http://www.oasis-open.org/docbook/xml/4.5" \
    5757    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
    58     /etc/xml/docbook
     58    $PKG_DEST/etc/xml/docbook
    5959xmlcatalog --noout --add "rewriteURI" \
    6060    "http://www.oasis-open.org/docbook/xml/4.5" \
    6161    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
    62     /etc/xml/docbook
    63 if [ ! -e /etc/xml/catalog ]; then
    64     xmlcatalog --noout --create /etc/xml/catalog
     62    $PKG_DEST/etc/xml/docbook
     63if [ ! -e $PKG_DEST/etc/xml/catalog ]; then
     64    xmlcatalog --noout --create $PKG_DEST/etc/xml/catalog
    6565fi
    6666xmlcatalog --noout --add "delegatePublic" \
    6767    "-//OASIS//ENTITIES DocBook XML" \
    6868    "file:///etc/xml/docbook" \
    69     /etc/xml/catalog
     69    $PKG_DEST/etc/xml/catalog
    7070xmlcatalog --noout --add "delegatePublic" \
    7171    "-//OASIS//DTD DocBook XML" \
    7272    "file:///etc/xml/docbook" \
    73     /etc/xml/catalog
     73    $PKG_DEST/etc/xml/catalog
    7474xmlcatalog --noout --add "delegateSystem" \
    7575    "http://www.oasis-open.org/docbook/" \
    7676    "file:///etc/xml/docbook" \
    77     /etc/xml/catalog
     77    $PKG_DEST/etc/xml/catalog
    7878xmlcatalog --noout --add "delegateURI" \
    7979    "http://www.oasis-open.org/docbook/" \
    8080    "file:///etc/xml/docbook" \
    81     /etc/xml/catalog
     81    $PKG_DEST/etc/xml/catalog
    8282for DTDVERSION in 4.1.2 4.2 4.3 4.4
    8383do
    … …  
    8585    "-//OASIS//DTD DocBook XML V$DTDVERSION//EN" \
    8686    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/docbookx.dtd" \
    87     /etc/xml/docbook
     87    $PKG_DEST/etc/xml/docbook
    8888  xmlcatalog --noout --add "rewriteSystem" \
    8989    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
    9090    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
    91     /etc/xml/docbook
     91    $PKG_DEST/etc/xml/docbook
    9292  xmlcatalog --noout --add "rewriteURI" \
    9393    "http://www.oasis-open.org/docbook/xml/$DTDVERSION" \
    9494    "file:///usr/share/xml/docbook/xml-dtd-4.5" \
    95     /etc/xml/docbook
     95    $PKG_DEST/etc/xml/docbook
    9696  xmlcatalog --noout --add "delegateSystem" \
    9797    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
    9898    "file:///etc/xml/docbook" \
    99     /etc/xml/catalog
     99    $PKG_DEST/etc/xml/catalog
    100100  xmlcatalog --noout --add "delegateURI" \
    101101    "http://www.oasis-open.org/docbook/xml/$DTDVERSION/" \
    102102    "file:///etc/xml/docbook" \
    103     /etc/xml/catalog
     103    $PKG_DEST/etc/xml/catalog
    104104done
     105export PKGDIR=/sources/docbook-xml
     106packInstall
     107rm -rf $PKG_DEST
    105108cd ..
    106109rm -rf docbook-xml

  • common/blfs-tool-deps/907-gpm

    rf5dc6d7 r7072e1f  
    66cd $PKGDIR
    77
    8 patch -Np1 -i ../gpm-1.20.1-segfault-1.patch
    9 patch -Np1 -i ../gpm-1.20.1-silent-1.patch
    108./configure --prefix=/usr --sysconfdir=/etc
    11 LDFLAGS="$LDFLAGS -lm" make
    12 make install
    13 cp -v conf/gpm-root.conf /etc
    14 ldconfig
     9make
     10if ! [ -z $PKG_DEST ]; then
     11        mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
     12        ln -sv share/{man,doc,info} $PKG_DEST/usr
     13        case $(uname -m) in
     14         x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
     15        esac
     16fi
     17make DESTDIR=$PKG_DEST install
     18ln -v -s libgpm.so.2.1.0 $PKG_DEST/usr/lib/libgpm.so
     19mkdir -pv $PKG_DEST/etc
     20install -v -m644 conf/gpm-root.conf $PKG_DEST/etc
     21install -v -m755 -d $PKG_DEST/usr/share/doc/gpm-1.20.6
     22chmod   -v   755    doc/{changes,support}
     23chmod   -v   644    doc/{changes/*,support/*,FAQ,HACK_GPM,README*}
     24cp      -v -R       doc/{FAQ,HACK_GPM,README*,changes,support} \
     25                    $PKG_DEST/usr/share/doc/gpm-1.20.6
     26if ! [ -z $PKG_DEST ]; then
     27        rm -fv $PKG_DEST/{,usr/}lib64
     28        rm -fv $PKG_DEST/usr/{man,doc,info}
     29        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
     30          [[ -z $(ls $dir) ]] && rmdir -v $dir
     31        done
     32        for dir in $PKG_DEST/usr/{lib,share}; do
     33          [[ -z $(ls $dir) ]] && rmdir -v $dir
     34        done
     35        for dir in $PKG_DEST/{lib,usr}; do
     36          [[ -z $(ls $dir) ]] && rmdir -v $dir
     37        done
     38        packInstall
     39fi
     40rm -rf $PKG_DEST
    1541
    1642exit

  • common/blfs-tool-deps/908-lynx

    rf5dc6d7 r7072e1f  
    88./configure --prefix=/usr \
    99            --sysconfdir=/etc/lynx \
    10             --datadir=/usr/share/doc/lynx-2.8.6 \
     10            --datadir=/usr/share/doc/lynx-2.8.7rel.2 \
    1111            --with-zlib \
    1212            --with-bzlib \
    … …  
    1414            --enable-locale-charset
    1515make
    16 make install-full
    17 chgrp -v -R root /usr/share/doc/lynx-2.8.6/lynx_doc
     16if ! [ -z $PKG_DEST ]; then
     17        mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
     18        ln -sv share/{man,doc,info} $PKG_DEST/usr
     19        case $(uname -m) in
     20         x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
     21        esac
     22fi
     23make DESTDIR=$PKG_DEST install-full
     24chgrp -v -R root $PKG_DEST/usr/share/doc/lynx-2.8.7rel.2/lynx_doc
     25if ! [ -z $PKG_DEST ]; then
     26        rm -fv $PKG_DEST/{,usr/}lib64
     27        rm -fv $PKG_DEST/usr/{man,doc,info}
     28        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
     29          [[ -z $(ls $dir) ]] && rmdir -v $dir
     30        done
     31        for dir in $PKG_DEST/usr/{lib,share}; do
     32          [[ -z $(ls $dir) ]] && rmdir -v $dir
     33        done
     34        for dir in $PKG_DEST/{lib,usr}; do
     35          [[ -z $(ls $dir) ]] && rmdir -v $dir
     36        done
     37        packInstall
     38fi
     39rm -rf $PKG_DEST
    1840
    1941exit

  • common/blfs-tool-deps/909-sudo

    rf5dc6d7 r7072e1f  
    66cd $PKGDIR
    77
    8 patch -Np1 -i ../sudo-1.6.8p12-envvar_fix-1.patch
    9 ./configure --prefix=/usr --libexecdir=/usr/lib \
    10     --enable-noargs-shell --with-ignore-dot --with-all-insults \
    11     --enable-shell-sets-home
     8./configure --prefix=/usr \
     9            --libexecdir=/usr/lib \
     10            --with-ignore-dot \
     11            --with-all-insults \
     12            --enable-shell-sets-home \
     13            --disable-root-sudo \
     14            --with-logfac=auth \
     15            --without-pam \
     16            --without-sendmail
    1217make
    13 make install
     18if ! [ -z $PKG_DEST ]; then
     19        mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
     20        ln -sv share/{man,doc,info} $PKG_DEST/usr
     21        case $(uname -m) in
     22         x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
     23        esac
     24fi
     25make DESTDIR=$PKG_DEST install
     26if ! [ -z $PKG_DEST ]; then
     27        rm -fv $PKG_DEST/{,usr/}lib64
     28        rm -fv $PKG_DEST/usr/{man,doc,info}
     29        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
     30          [[ -z $(ls $dir) ]] && rmdir -v $dir
     31        done
     32        for dir in $PKG_DEST/usr/{lib,share}; do
     33          [[ -z $(ls $dir) ]] && rmdir -v $dir
     34        done
     35        for dir in $PKG_DEST/{lib,usr}; do
     36          [[ -z $(ls $dir) ]] && rmdir -v $dir
     37        done
     38        packInstall
     39fi
     40rm -rf $PKG_DEST
    1441
    1542exit

  • common/blfs-tool-deps/910-wget

    rf5dc6d7 r7072e1f  
    66cd $PKGDIR
    77
    8 ./configure --prefix=/usr --sysconfdir=/etc
     8./configure --prefix=/usr \
     9            --sysconfdir=/etc \
     10            --without-ssl
    911make
    10 make install
     12if ! [ -z $PKG_DEST ]; then
     13        mkdir -pv $PKG_DEST/{lib,usr/{share/{man,doc,info},lib}}
     14        ln -sv share/{man,doc,info} $PKG_DEST/usr
     15        case $(uname -m) in
     16         x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
     17        esac
     18fi
     19make DESTDIR=$PKG_DEST install
     20if ! [ -z $PKG_DEST ]; then
     21        rm -fv $PKG_DEST/{,usr/}lib64
     22        rm -fv $PKG_DEST/usr/{man,doc,info}
     23        for dir in $PKG_DEST/usr/share/{doc,info,man}; do
     24          [[ -z $(ls $dir) ]] && rmdir -v $dir
     25        done
     26        for dir in $PKG_DEST/usr/{lib,share}; do
     27          [[ -z $(ls $dir) ]] && rmdir -v $dir
     28        done
     29        for dir in $PKG_DEST/{lib,usr}; do
     30          [[ -z $(ls $dir) ]] && rmdir -v $dir
     31        done
     32        packInstall
     33fi
     34rm -rf $PKG_DEST
    1135
    1236exit

  • common/common-functions

    rf5dc6d7 r7072e1f  
    6161      echo -n "Cleaning $BUILDDIR ..."
    6262      # First delete proc and sys directories, if exist.
    63       # Both should be empty, if not be sure to exit.
     63      # Both should be empty. If not, be sure to exit.
    6464      if [ -d $BUILDDIR/proc ] ; then
    6565        sudo rmdir $BUILDDIR/proc || exit 1
    … …  
    7373      sudo rm -rf $JHALFSDIR
    7474      echo "done"
    75       echo -n "Cleaning remainig extracted sources in $BUILDDIR/sources ..."
     75      echo -n "Cleaning remaining extracted sources in $BUILDDIR/sources ..."
    7676      sudo rm -rf `find $BUILDDIR/sources/* -maxdepth 0 -type d`
    7777      echo "done"

  • common/libs/func_blfs_deps

    rf5dc6d7 r7072e1f  
    2323  if [[ "${DEP_UNZIP}" = "y" ]] ; then
    2424    echo "${UNZIP_URL} ${BLFS_SERVER}unzip/${UNZIP_PKG} ${UNZIP_MD5}" >> urls.lst
    25     echo "${UNZIP_PATCH_URL} ${BLFS_SERVER}unzip/${UNZIP_PATCH} ${UNZIP_PATCH_MD5}" >> urls.lst
    2625  fi
    2726
    … …  
    4039  if [[ "${DEP_SUDO}" = "y" ]] ; then
    4140    echo "${SUDO_URL} ${BLFS_SERVER}sudo/${SUDO_PKG} ${SUDO_MD5}" >> urls.lst
    42     echo "${SUDO_PATCH_URL} ${BLFS_SERVER}sudo/${SUDO_PATCH} ${SUDO_PATCH_MD5}" >> urls.lst
    4341  fi
    4442
    … …  
    4846
    4947  if [[ "${DEP_SVN}" = "y" ]] ; then
     48    echo "${SQLITE_URL} ${BLFS_SERVER}sqlite/${SQLITE_PKG} ${SQLITE_MD5}" >> urls.lst
     49    echo "${APR_URL} ${BLFS_SERVER}apr/${APR_PKG} ${APR_MD5}" >> urls.lst
     50## Cannot use file:// with wget, so cannot download apr patches.
     51## They have been put directly in $BUILDDIR/sources
     52## The next line only for being able to check md5sum
     53    echo "${APR_PATCH_1_URL} ${BLFS_SERVER}apr/${APR_PATCH_1} ${APR_PATCH_1_MD5}" >> urls.lst
     54
     55    echo "${APR_U_URL} ${BLFS_SERVER}apr-util/${APR_U_PKG} ${APR_U_MD5}" >> urls.lst
     56    echo "${APR_U_PATCH_1_URL} ${BLFS_SERVER}apr-util/${APR_U_PATCH_1} ${APR_U_PATCH_1_MD5}" >> urls.lst
    5057    echo "${SVN_URL} ${BLFS_SERVER}subversion/${SVN_PKG} ${SVN_MD5}" >> urls.lst
    5158  fi
    … …  
    5360  if [[ "${DEP_GPM}" = "y" ]] ; then
    5461    echo "${GPM_URL} ${BLFS_SERVER}gpm/${GPM_PKG} ${GPM_MD5}" >> urls.lst
    55     echo "${GPM_PATCH_1_URL} ${BLFS_SERVER}gpm/${GPM_PATCH_1} ${GPM_PATCH_1_MD5}" >> urls.lst
    56     echo "${GPM_PATCH_2_URL} ${BLFS_SERVER}gpm/${GPM_PATCH_2} ${GPM_PATCH_2_MD5}" >> urls.lst
    5762  fi
    5863
    … …  
    102107
    103108  if [[ "${DEP_SVN}" = "y" ]] ; then
    104     mv blfs-tool-deps/911-subversion ${PROGNAME}-commands/blfs-tool-deps
     109    mv blfs-tool-deps/911-sqlite ${PROGNAME}-commands/blfs-tool-deps
     110    mv blfs-tool-deps/912-apr ${PROGNAME}-commands/blfs-tool-deps
     111    mv blfs-tool-deps/913-apr-util ${PROGNAME}-commands/blfs-tool-deps
     112    mv blfs-tool-deps/914-subversion ${PROGNAME}-commands/blfs-tool-deps
    105113  fi
    106114
    … …  
    157165      [[ ! "$name" = "docbook-xml" ]] && LUSER_wrt_unpack "$pkg_tarball"
    158166    else
    159       [[ ! "$name" = "docbook-xml" ]] && CHROOT_Unpack "$pkg_tarball"
     167      case "$name" in
     168        *docbook*)
     169           (
     170           cat << EOF
     171        @if [ "\$(PKGMNGT)" = "y" ]; then \\
     172        echo "export PKG_DEST=\$(SRC)/\$@" > envars; \\
     173        echo "source packInstall.sh" >> envars; \\
     174        echo "export -f packInstall" >> envars; \\
     175        fi;
     176EOF
     177            ) >> $MKFILE.tmp ;;
     178        *) CHROOT_Unpack "$pkg_tarball" ;;
     179      esac
    160180    fi
    161181
    … …  
    177197    case $name in
    178198      docbook-xml )  pkg_ver=DocBook-4.5 ;;
    179       lynx )  pkg_ver=lynx-2.8.6 ;;
    180       tidy )  pkg_ver=html-tidy-cvs_20070326 ;;
    181       unzip ) pkg_ver=unzip-5.52 ;;
     199      lynx )  pkg_ver=lynx-2.8.7 ;;
     200      tidy )  pkg_ver=html-tidy-cvs_20101110 ;;
     201      unzip ) pkg_ver=unzip-6.0 ;;
    182202      * )     pkg_ver=$(echo $pkg_tarball | sed -e 's/.tar.*//;s/.tgz//;s/.zip//') ;;
    183203    esac

  • common/libs/func_book_parser

    rf5dc6d7 r7072e1f  
    145145                 --stringparam page $PAGE \
    146146                 --stringparam lang $LANG \
     147                 --stringparam pkgmngt $PKGMNGT \
    147148                 -o ./${PROGNAME}-commands/ $XSL $BOOK/index.xml >>$LOGDIR/$LOG 2>&1
    148149      ;;
    … …  
    188189      ;;
    189190    lfs)
    190         xsltproc --nonet --xinclude -o pkg_tarball_list packages.xsl \
     191        xsltproc --nonet --xinclude \
     192                 --stringparam pkgmngt $PKGMNGT \
     193                  -o pkg_tarball_list packages.xsl \
    191194                 $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1
    192195      ;;
    … …  
    205208$SUDO_PKG
    206209$WGET_PKG
     210$SQLITE_PKG
     211$APR_PKG
     212$APR_U_PKG
    207213$SVN_PKG
    208214$GPM_PKG

  • common/libs/func_check_version.sh

    rf5dc6d7 r7072e1f  
    2424  declare -i ref_major ref_minor ref_revision ref_change
    2525  declare -r spaceSTR="         "
     26
     27  shopt -s extglob      #needed for ${x##*(0)} below
    2628
    2729  ref_version=$1
    … …  
    5456#  echo -ne "$TXT:\t${L_arrow}${BOLD}${tst_version}${OFF}${R_arrow}"
    5557  IFS=".-(pa"   # Split up w.x.y.z as well as w.x.y-rc  (catch release candidates)
    56   set -- $ref_version # set postional parameters to minimum ver values
     58  set -- $ref_version # set positional parameters to minimum ver values
    5759  ref_major=$1; ref_minor=$2; ref_revision=$3
    5860  #
    59   set -- $tst_version # Set postional parameters to test version values
    60   major=$1; minor=$2; revision=$3
     61  set -- $tst_version # Set positional parameters to test version values
     62  # Values beginning with zero are taken as octal, so that for example
     63  # 2.07.08 gives an error because 08 cannot be octal. The ## stuff supresses
     64  # leading sero's
     65  major=${1##*(0)}; minor=${2##*(0)}; revision=${3##*(0)}
    6166  #
    6267  # Compare against minimum acceptable version..
    … …  
    8388
    8489  # LFS/HLFS/CLFS prerequisites
    85   check_version "2.6.2"   "`uname -r`"          "KERNEL"
    86   check_version "3.0"     "$BASH_VERSION"       "BASH"
    87   check_version "3.0.1"   "`gcc -dumpversion`"  "GCC" 
     90  check_version "2.6.25"  "`uname -r`"          "KERNEL"
     91  check_version "3.2"     "$BASH_VERSION"       "BASH"
     92  check_version "4.1.2"   "`gcc -dumpversion`"  "GCC" 
    8893  libcLib="`find /lib /lib64 -name libc.so.6 -print`"
    8994  libcVer="`/${libcLib} | head -n1`"
    9095  libcVer="${libcVer##*version }"
    91   check_version "2.2.5"   ${libcVer%%,*}        "GLIBC"
    92   check_version "2.12"    "$(ld --version  | head -n1 | awk '{print $NF}')"    "BINUTILS"
    93   check_version "1.15"    "$(tar --version | head -n1 | cut -d" " -f4)"        "TAR"
     96  check_version "2.5.1"   "${libcVer%%,*}"        "GLIBC"
     97  check_version "2.17"    "$(ld --version  | head -n1 | awk '{print $NF}')"    "BINUTILS"
     98  check_version "1.18"    "$(tar --version | head -n1 | cut -d" " -f4)"        "TAR"
    9499  bzip2Ver="$(bzip2 --version 2>&1 < /dev/null | head -n1 | cut -d" " -f8)"
    95   check_version "1.0.2"   "${bzip2Ver%%,*}"                                    "BZIP2"
    96   check_version "1.875"   "$(bison --version | head -n1 | cut -d" " -f4)"      "BISON"
    97   check_version "5.2.1"   "$(chown --version | head -n1 | cut -d")" -f2)"      "COREUTILS"
    98   check_version "2.8"     "$(diff --version  | head -n1 | cut -d" " -f4)"      "DIFF"
    99   check_version "4.1.20"  "$(find --version  | head -n1 | cut -d" " -f4)"      "FIND"
    100   check_version "3.0"     "$(gawk --version  | head -n1 | cut -d" " -f3)"      "GAWK"
    101   check_version "2.5"     "$(grep --version  | head -n1 | awk '{print $NF}')"  "GREP"
    102   check_version "1.2.4"   "$(gzip --version 2>&1 | head -n1 | cut -d" " -f2)"  "GZIP"
    103   check_version "1.4"     "$(m4 --version 2>&1 | head -n1 | awk '{print $NF}')" "M4"
    104   check_version "3.79.1"  "$(make --version  | head -n1 | cut -d " " -f3 | cut -c1-4)"  "MAKE"
    105   check_version "2.5.4"   "$(patch --version | head -n1 | cut -d" " -f2)"      "PATCH"
    106   check_version "5.6.0"   "$(perl -V:version | cut -f2 -d\')"                  "PERL"
    107   check_version "3.0.2"   "$(sed --version   | head -n1 | cut -d" " -f4)"      "SED"
    108   check_version "4.8"     "$(makeinfo --version | head -n1 | awk '{ print$NF }')" "TEXINFO"
    109 
     100  check_version "1.0.4"   "${bzip2Ver%%,*}"                                    "BZIP2"
     101  check_version "2.3"     "$(bison --version | head -n1 | cut -d" " -f4)"      "BISON"
     102  check_version "6.9"     "$(chown --version | head -n1 | cut -d")" -f2)"      "COREUTILS"
     103  check_version "2.8.1"   "$(diff --version  | head -n1 | cut -d" " -f4)"      "DIFF"
     104  check_version "4.2.31"  "$(find --version  | head -n1 | cut -d" " -f4)"      "FIND"
     105  check_version "3.1.5"   "$(gawk --version  | head -n1 | cut -d" " -f3)"      "GAWK"
     106  check_version "2.5.1a"  "$(grep --version  | head -n1 | awk '{print $NF}')"  "GREP"
     107  check_version "1.3.12"  "$(gzip --version 2>&1 | head -n1 | cut -d" " -f2)"  "GZIP"
     108  check_version "1.4.10"  "$(m4 --version 2>&1 | head -n1 | awk '{print $NF}')" "M4"
     109  check_version "3.81"    "$(make --version  | head -n1 | cut -d " " -f3 | cut -c1-4)"  "MAKE"
     110  check_version "2.5.4"   "$(patch --version | head -n1 | sed 's/.*patch //')"      "PATCH"
     111  check_version "5.8.8"   "$(perl -V:version | cut -f2 -d\')"                  "PERL"
     112  check_version "4.1.5"   "$(sed --version   | head -n1 | cut -d" " -f4)"      "SED"
     113  check_version "4.9"     "$(makeinfo --version | head -n1 | awk '{ print$NF }')" "TEXINFO"
     114  check_version "5.0.3"   "$(xz --version | head -n1 | cut -d" " -f4)"         "XZ"
    110115  # Check for minimum sudo version
    111116  SUDO_LOC="$(whereis -b sudo | cut -d" " -f2)"

  • common/libs/func_download_pkgs

    rf5dc6d7 r7072e1f  
    4040      # Skip some packages if they aren't needed
    4141    case $line in
    42         */tcl* | */expect* | */dejagnu* | */tree* | */gcc-testsuite* )
     42      */check* | */tcl* | */expect* | */dejagnu* | */tree* | */gcc-testsuite* )
    4343            [[ "$TEST" = "0" ]] && continue
    4444          ;;
    45         */vim-*-lang* )
     45      */vim-*-lang* )
    4646            [[ "$VIMLANG" = "0" ]] && continue
    4747          ;;
    48         *linux/linux-* )
     48      *linux/linux-* )
    4949            [[ -z "$CONFIG" ]] && [[ -z "$BOOT_CONFIG" ]] && \
    5050            [[ "$GETKERNEL" = "n" ]] && continue
    … …  
    7676      if [ ! -f $FILE ] ; then
    7777        if [[ ! ("$SRC_ARCHIVE" = "") ]] ; then
    78           echo "${BOLD}${YELLOW}$FILE: not found in ${SRC_ARCHIVE} or /sources${OFF}"
     78          echo "${BOLD}${YELLOW}$FILE: not found in ${SRC_ARCHIVE} or ${BUILDDIR}/sources${OFF}"
    7979        else
    80           echo "${BOLD}${YELLOW}$FILE: not found in /sources${OFF}"
     80          echo "${BOLD}${YELLOW}$FILE: not found in ${BUILDDIR}/sources${OFF}"
    8181        fi
    8282        if ! wget $URL1 $WGETPARAM && ! wget $URL2 $WGETPARAM ; then
    … …  
    8484          continue
    8585        fi
    86         else
    87           echo "${BOLD}${YELLOW}$FILE: using cached file in /sources${OFF}"
     86      else
     87          echo "${BOLD}${YELLOW}$FILE: using cached file in ${BUILDDIR}/sources${OFF}"
    8888      fi
    8989    fi
    … …  
    122122
    123123      # Good or bad we write the original md5sum to a file
    124     echo "$MD5" >> MD5SUMS
     124    echo "$MD5" >> MD5SUM
    125125
    126126     # Copy the freshly downloaded file
    … …  
    193193                 --stringparam server $SERVER \
    194194                 --stringparam family lfs \
     195                 --stringparam pkgmngt $PKGMNGT \
    195196                 -o ../sources/urls.lst urls.xsl \
    196197                 $BOOK/chapter03/chapter03.xml >>$LOGDIR/$LOG 2>&1

  • common/libs/func_validate_configs.sh

    rf5dc6d7 r7072e1f  
    4242
    4343  # Build Settings by book
    44   local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common"
     44  local -r   LFS_build="$BUILD_chroot VIMLANG $BUILD_common PKGMNGT"
    4545  local -r  HLFS_build="$BUILD_chroot         $BUILD_common"
    4646  local -r  CLFS_build="$BUILD_chroot VIMLANG $BUILD_common"

  • common/libs/func_wrt_Makefile

    rf5dc6d7 r7072e1f  
    4545ADD_CUSTOM_TOOLS = $CUSTOM_TOOLS
    4646ADD_BLFS_TOOLS   = $BLFS_TOOL
     47PKGMNGT          = $PKGMNGT
    4748
    4849
    … …  
    9394     xz-utils) echo $(grep "^xz" $JHALFSDIR/pkg_tarball_list | head -n1 )
    9495         ;;
    95      *)  echo $(grep "^$script_name-[[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
     96     sqlite) echo $(grep "^sqlite" $JHALFSDIR/pkg_tarball_list | head -n1 )
     97         ;;
     98     *)  echo $(grep "^$script_name[_-][[:digit:]]" $JHALFSDIR/pkg_tarball_list | head -n1 )
    9699         ;;
    97100   esac

  • common/makefile-functions

    rf5dc6d7 r7072e1f  
    2828  echo $(BOLD)--------------------------------------------------------------------------------;\
    2929  echo  $(tab_)$(tab_)Executing $(BLUE)$(1)$(WHITE) scripts; \
    30   echo $(BOLD)--------------------------------------------------------------------------------echo $(WHITE)
     30  echo $(BOLD)--------------------------------------------------------------------------------$(WHITE)
    3131endef
    3232
    … …  
    8080    rm -rf $(SRC)/$${ROOT%-*}-build; \
    8181  fi;
     82  @if [ "$(PKGMNGT)" = "y" ] && [ -d $(SRC)/$@ ]; then \
     83    rm -rf $(SRC)/$@ && rm -f $(SRC)/*.deb; \
     84  fi;
    8285endef
    8386
    … …  
    108111define get_pkg_root2
    109112  @ROOT=`head -n1 $(SRC)/$(PKG_LST) | sed 's@^./@@;s@/.*@@'` && \
    110   echo "export PKGDIR=$(SRC)/$$ROOT" > envars
     113  echo "export PKGDIR=$(SRC)/$$ROOT" > envars; \
     114  if [ "$(PKGMNGT)" = "y" ]; then \
     115    echo "export PKG_DEST=$(SRC)/$@" >> envars; \
     116    echo "source packInstall.sh" >> envars; \
     117    echo "export -f packInstall" >> envars; \
     118  fi;
    111119endef
    112120

  • common/packages.xsl

    rf5dc6d7 r7072e1f  
    1414  <xsl:param name="kernel" select="2.6"/>
    1515
     16  <!-- Should we include a package manager -->
     17  <xsl:param name="pkgmngt" select="n"/>
     18
    1619  <xsl:template match="/">
    1720    <xsl:apply-templates select="//para"/>
     21    <xsl:if test="$pkgmngt='y'">
     22      <xsl:apply-templates
     23        select="document('packageManager.xml')//sect1[@id='package']//para"/>
     24    </xsl:if>
    1825  </xsl:template>
    1926
    … …  
    2734        <xsl:with-param name="url" select="ulink/@url"/>
    2835      </xsl:call-template>
    29       <xsl:text>&#xA;</xsl:text>
    3036    </xsl:if>
    3137  </xsl:template>
    … …  
    3339  <xsl:template name="package_name">
    3440    <xsl:param name="url" select="foo"/>
    35     <xsl:param name="sub-url" select="substring-after($url,'/')"/>
     41    <xsl:variable name="sub-url" select="substring-after($url,'/')"/>
    3642    <xsl:choose>
    3743      <xsl:when test="contains($sub-url,'/')">
    … …  
    4551          <xsl:when test="contains($sub-url,'?')">
    4652            <xsl:value-of select="substring-before($sub-url,'?')"/>
     53            <xsl:text>&#xA;</xsl:text>
    4754          </xsl:when>
    4855          <xsl:otherwise>
    4956            <xsl:value-of select="$sub-url"/>
     57            <xsl:text>&#xA;</xsl:text>
    5058          </xsl:otherwise>
    5159        </xsl:choose>

  • common/progress_bar.sh

    rf5dc6d7 r7072e1f  
    6060      # Detect rollover of the seconds.
    6161    (( PREV_SEC > SEC )) && write_or_exit "${RESET_LINE}"
    62     (( PREV_SEC = SEC ))
     62    PREV_SEC=$SEC
    6363
    6464      # Display the accumulated time. div minutes.. modulo seconds.

  • common/urls.xsl

    rf5dc6d7 r7072e1f  
    2020  <xsl:param name="kernel" select="2.6"/>
    2121
     22  <!-- Do we use a package manager? -->
     23  <xsl:param name="pkgmngt" select="n"/>
     24
    2225  <xsl:template match="/">
    2326    <xsl:apply-templates select="//ulink"/>
     27    <xsl:if test="$pkgmngt='y'">
     28      <xsl:apply-templates
     29        select="document('packageManager.xml')//ulink"/>
     30    </xsl:if>
    2431  </xsl:template>
    2532
    2633  <xsl:template match="ulink">
    27       <!-- If some package don't have the predefined strings in their
     34      <!-- If some package doesn't have the predefined strings in their
    2835      name, the next test must be fixed to match it also. Skip possible
    2936      duplicated URLs due that may be splitted for PDF output -->
Note: See TracChangeset for help on using the changeset viewer.