Changeset e576789 for jhalfs


Ignore:
Timestamp:
10/29/2013 03:42:03 PM (11 years ago)
Author:
Pierre Labastie <pierre@…>
Branches:
2.4, ablfs-more, legacy, new_features, trunk
Children:
5795ad7
Parents:
2e64c47
Message:

Merge ablfs branch. Normally, jhalfs should not perform differently
for building LFS

File:
1 edited

Legend:

Unmodified
Added
Removed

  • jhalfs

    r2e64c47 re576789  
    190190BOOK=${BOOK:=$JHALFSDIR/$PROGNAME-$LFSVRS}
    191191
     192
     193#--- Envars not sourced from configuration
     194case $PROGNAME in
     195# TODO: clfs is now on git
     196      clfs ) declare -r GIT="git://git.cross-lfs.org/cross-lfs" ;;
     197      clfs2 ) declare -r GIT="git://git.cross-lfs.org/clfs-sysroot" ;;
     198      clfs3 ) declare -r GIT="git://git.cross-lfs.org/clfs-embedded" ;;
     199      *) declare -r SVN="svn://svn.linuxfromscratch.org" ;;
     200esac
     201declare -r LOG=000-masterscript.log
     202  # Needed for fetching BLFS book sources when building CLFS
     203declare -r SVN_2="svn://svn.linuxfromscratch.org"
     204
     205# Set true internal variables
     206COMMON_DIR="common"
     207PACKAGE_DIR=$(echo $PROGNAME | tr '[a-z]' '[A-Z]')
     208MODULE=$PACKAGE_DIR/master.sh
     209PKGMNGTDIR="pkgmngt"
     210# The name packageManager.xml is hardcoded in *.xsl, so no variable.
     211
     212[[ $VERBOSITY > 0 ]] && echo -n "Loading common-functions module..."
     213source $COMMON_DIR/common-functions
     214[[ $? > 0 ]] && echo " $COMMON_DIR/common-functions did not load.." && exit
     215[[ $VERBOSITY > 0 ]] && echo "OK"
     216[[ $VERBOSITY > 0 ]] && echo -n "Loading code module <$MODULE>..."
     217source $MODULE
     218[[ $? > 0 ]] && echo "$MODULE did not load.." && exit 2
     219[[ $VERBOSITY > 0 ]] && echo "OK"
     220#
     221[[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
     222
     223
     224#*******************************************************************#
     225[[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_check_version.sh>..."
     226source $COMMON_DIR/libs/func_check_version.sh
     227[[ $? > 0 ]] && echo " function module did not load.." && exit 2
     228[[ $VERBOSITY > 0 ]] && echo "OK"
     229
     230[[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_validate_configs.sh>..."
     231source $COMMON_DIR/libs/func_validate_configs.sh
     232[[ $? > 0 ]] && echo " function module did not load.." && exit 2
     233[[ $VERBOSITY > 0 ]] && echo "OK"
     234
     235[[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_custom_pkgs>..."
     236source $COMMON_DIR/libs/func_custom_pkgs
     237[[ $? > 0 ]] && echo " function module did not load.." && exit 2
     238[[ $VERBOSITY > 0 ]] && echo "OK"
     239
     240
     241[[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
     242
    192243# blfs-tool envars
    193244BLFS_TOOL=${BLFS_TOOL:-n}
    … …  
    202253              * )  BLFS_TREE=tags/${BLFS_BRANCH_ID} ;;
    203254  esac
    204   # Dependencies envars, easier to update.
    205   # Tidy and Unzip version are harcoded also in wrt_blfs_tool_targets()
    206     # libxml2
    207   LIBXML_PKG="libxml2-2.7.8.tar.gz"
    208   LIBXML_URL="ftp://xmlsoft.org/libxml2/${LIBXML_PKG}"
    209   LIBXML_MD5="8127a65e8c3b08856093099b52599c86"
    210     # libxslt
    211   LIBXSLT_PKG="libxslt-1.1.26.tar.gz"
    212   LIBXSLT_URL="ftp://xmlsoft.org/libxslt/${LIBXSLT_PKG}"
    213   LIBXSLT_MD5="e61d0364a30146aaa3001296f853b2b9"
    214     # tidy
    215   TIDY_PKG="tidy-cvs_20101110.tar.bz2"
    216   TIDY_URL="http://anduin.linuxfromscratch.org/sources/BLFS/svn/t/${TIDY_PKG}"
    217   TIDY_MD5="dd1fe109b4259ad3f364b175787ad5e9"
    218     # unzip
    219   UNZIP_PKG="unzip60.tar.gz"
    220   UNZIP_URL="http://downloads.sourceforge.net/infozip/${UNZIP_PKG}"
    221   UNZIP_MD5="62b490407489521db863b523a7f86375"
    222     # DocBook XML DTD
    223   DBXML_PKG="docbook-xml-4.5.zip"
    224   DBXML_URL="http://www.docbook.org/xml/4.5/${DBXML_PKG}"
    225   DBXML_MD5="03083e288e87a7e829e437358da7ef9e"
    226     # DocBook XSL
    227 #   DBXSL_PKG="docbook-xsl-1.69.1.tar.bz2"
    228 #   DBXSL_URL="http://prdownloads.sourceforge.net/docbook/${DBXSL_PKG}"
    229 #   DBXSL_MD5="6ebd29a67f2dcc3f2220f475ee6f6552"
    230     # Lynx
    231   LYNX_PKG="lynx2.8.8dev.10.tar.bz2"
    232   LYNX_URL="http://lynx.isc.org/current/${LYNX_PKG}"
    233   LYNX_MD5="1c9ef3746520c69914b461f88de6b12e"
    234     # sudo
    235   SUDO_PKG="sudo-1.8.2.tar.gz"
    236   SUDO_URL="http://www.sudo.ws/sudo/dist/${SUDO_PKG}"
    237   SUDO_MD5="000f458e7391be9fdf459a9ad6a4912a"
    238     # wget
    239   WGET_PKG="wget-1.13.4.tar.xz"
    240   WGET_URL="ftp://ftp.gnu.org/gnu/wget/${WGET_PKG}"
    241   WGET_MD5="7f518b3a71e9efd330e9a0c3714f8463"
    242     # SQLite (for subversion)
    243   SQLITE_PKG="sqlite-autoconf-3071000.tar.gz"
    244   SQLITE_URL="http://sqlite.org/${SQLITE_PKG}"
    245   SQLITE_MD5="9ed2ca93577b58cfa0d01f64b9312ab9"
    246     # Apache Portable Runtime (for subversion)
    247   APR_PKG="apr-1.4.5.tar.bz2"
    248   APR_URL="http://mirror.speednetwork.de/apache/apr/$APR_PKG"
    249   APR_MD5="8b53f5a5669d0597f2da889a2f576eb6"
    250     # APR config patch
    251   APR_PATCH_1="apr-1.4.5-config.patch"
    252   APR_PATCH_1_URL="file:///sources/local-patches/${APR_PATCH_1}"
    253   APR_PATCH_1_MD5="fff6eddf998f4e956915f8053c15e41e"
    254     # Apache Portable Runtime Utilities (for subversion)
    255   APR_U_PKG="apr-util-1.4.1.tar.bz2"
    256   APR_U_URL="http://mirrors.ircam.fr/pub/apache/apr/$APR_U_PKG"
    257   APR_U_MD5="52b31b33fb1aa16e65ddaefc76e41151"
    258     # APR-util config patch
    259   APR_U_PATCH_1="apr-util-1.4.1-config.patch"
    260   APR_U_PATCH_1_URL="file:///sources/local-patches/${APR_U_PATCH_1}"
    261   APR_U_PATCH_1_MD5="4c07cb0d298ae9ddc75cd2d5acdedb2b"
    262     # Subversion
    263   SVN_PKG="subversion-1.7.1.tar.bz2"
    264   SVN_URL="http://archive.apache.org/dist/subversion/${SVN_PKG}"
    265   SVN_MD5="8a4fa74385df85a9702141b6b68b8307"
    266     # GPM
    267   GPM_PKG="gpm-1.20.6.tar.bz2"
    268   GPM_URL="http://www.nico.schottelius.org/software/gpm/archives/$GPM_PKG"
    269   GPM_MD5="6b534da16dc1b28ba828dea89e520f6f"
    270 fi
    271 
    272 #--- Envars not sourced from configuration
    273 case $PROGNAME in
    274 # TODO: clfs is now on git
    275       clfs ) declare -r GIT="git://git.cross-lfs.org/cross-lfs" ;;
    276       clfs2 ) declare -r GIT="git://git.cross-lfs.org/clfs-sysroot" ;;
    277       clfs3 ) declare -r GIT="git://git.cross-lfs.org/clfs-embedded" ;;
    278       *) declare -r SVN="svn://svn.linuxfromscratch.org" ;;
    279 esac
    280 declare -r LOG=000-masterscript.log
    281   # Needed for fetching BLFS book sources when building CLFS
    282 declare -r SVN_2="svn://svn.linuxfromscratch.org"
    283 
    284 # Set true internal variables
    285 COMMON_DIR="common"
    286 PACKAGE_DIR=$(echo $PROGNAME | tr '[a-z]' '[A-Z]')
    287 MODULE=$PACKAGE_DIR/master.sh
    288 PKGMNGTDIR="pkgmngt"
    289 # The name packageManager.xml is hardcoded in *.xsl, so no variable.
    290 
    291 [[ $VERBOSITY > 0 ]] && echo -n "Loading common-functions module..."
    292 source $COMMON_DIR/common-functions
    293 [[ $? > 0 ]] && echo " $COMMON_DIR/common-functions did not load.." && exit
    294 [[ $VERBOSITY > 0 ]] && echo "OK"
    295 [[ $VERBOSITY > 0 ]] && echo -n "Loading code module <$MODULE>..."
    296 source $MODULE
    297 [[ $? > 0 ]] && echo "$MODULE did not load.." && exit 2
    298 [[ $VERBOSITY > 0 ]] && echo "OK"
    299 #
    300 [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
    301 
    302 
    303 #*******************************************************************#
    304 [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_check_version.sh>..."
    305 source $COMMON_DIR/libs/func_check_version.sh
    306 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
    307 [[ $VERBOSITY > 0 ]] && echo "OK"
    308 
    309 [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_validate_configs.sh>..."
    310 source $COMMON_DIR/libs/func_validate_configs.sh
    311 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
    312 [[ $VERBOSITY > 0 ]] && echo "OK"
    313 
    314 [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_custom_pkgs>..."
    315 source $COMMON_DIR/libs/func_custom_pkgs
    316 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
    317 [[ $VERBOSITY > 0 ]] && echo "OK"
    318 
    319 
    320 [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
    321 
     255  [[ $VERBOSITY > 0 ]] && echo -n "Loading blfs tools installation function..."
     256  source $COMMON_DIR/libs/func_install_blfs
     257  [[ $? > 0 ]] && echo "function module did not load.." && exit 1
     258  [[ $VERBOSITY > 0 ]] && echo "OK"
     259fi
    322260
    323261###################################
    … …  
    364302if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
    365303
    366   # If $BUILDDIR has subdirectories like tools/ or bin/, stop the run
    367   # and notify the user about that.
    368   if [ -d $BUILDDIR/tools -o -d $BUILDDIR/bin ] && [ -z $CLEAN ] ; then
    369     eval "$no_empty_builddir"
    370   fi
    371 
    372304  # If requested, clean the build directory
    373305  clean_builddir
    … …  
    408340  [[ "$GETPKG" = "y" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
    409341  #
    410   # Copy APR patches, if needed
    411   [[ "$DEP_SVN" = "y" ]] &&
    412          cp $COMMON_DIR/blfs-tool-deps/apr*.patch  $BUILDDIR/sources
    413   #
    414342  # Create the test-log directory, if needed
    415343  [[ "$TEST" != "0" ]] && [[ ! -d $TESTLOGDIR ]] && install -d -m 1777 $TESTLOGDIR
    … …  
    435363  fi
    436364  #
    437 
    438365  # Copy custom tools config files, if requested
    439366  if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
    … …  
    445372  # Install blfs-tool, if requested.
    446373  if [[ "${BLFS_TOOL}" = "y" ]] ; then
    447     # Install the files
    448     [[ ! -d ${BUILDDIR}${BLFS_ROOT} ]] && mkdir -p ${BUILDDIR}${BLFS_ROOT}
    449     cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT}
    450     cp -r menu ${BUILDDIR}${BLFS_ROOT}
    451     cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT}
    452     cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
    453     # Clean-up
    454     rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
    455     rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/.svn
    456     rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/lxdialog/.svn
    457     # Set some harcoded envars to their proper values
    458     sed -i 's,blfs-xml,'$BLFS_XML',' ${BUILDDIR}${BLFS_ROOT}/{update_book.sh,libs/book.xsl}
    459     sed -i 's,tracking-dir,'$TRACKING_DIR',' ${BUILDDIR}${BLFS_ROOT}/{update_book.sh,gen-makefile.sh}
    460     # Copy the dependencies build scripts
    461     cp -r $COMMON_DIR/blfs-tool-deps $JHALFSDIR/
    462     rm -rf $JHALFSDIR/blfs-tool-deps/.svn
     374    echo Downloading and validating the BLFS book
     375    echo '(may take some time...)'
     376    install_blfs_tools 2>&1 | tee -a $LOGDIR/$LOG
    463377  fi
    464378  #
    … …  
    469383  echo "${SD_BORDER}${nl_}"
    470384
    471   # Get the BLFS book, if requested.
    472   if [[ "${BLFS_TOOL}" = "y" ]] ; then
    473     echo -n "Downloading the BLFS document, $BLFS_BRANCH_ID version... "
    474     if [[ ! -d ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} ]] ; then
    475       mkdir -p ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML}
    476       svn co $SVN_2/BLFS/$BLFS_TREE ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} >>$LOGDIR/$LOG 2>&1
    477     else
    478       pushd ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} 1> /dev/null
    479         svn up >>$LOGDIR/$LOG 2>&1
    480       popd 1> /dev/null
    481     fi
    482     echo -ne "done\n"
    483     echo "${SD_BORDER}${nl_}"
    484   fi
    485 
    486 fi
    487 
    488 # When regenerating the Makefile, we need to know also the canonical book version
     385fi
     386
     387# When regenerating the Makefile, we need to know also the
     388# canonical book version
    489389if [[ "$REBUILD_MAKEFILE" = "y" ]] ; then
    490390  case $PROGNAME in
Note: See TracChangeset for help on using the changeset viewer.