Changeset 7072e1f for common/libs


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/libs
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • 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
Note: See TracChangeset for help on using the changeset viewer.