Changeset 7b6ecc5 for jhalfs

Timestamp:

10/18/2006 07:28:47 PM (18 years ago)

Author:

Manuel Canales Esparcia <manuel@…>

Branches:

2.3, 2.3.x, 2.4, ablfs, ablfs-more, legacy, new_features, trunk

Children:

a16f769

Parents:

e7655b2

Message:

Started support to customize de base system build allowing Makefile regeneration.

File:

• jhalfs (modified) (2 diffs)

jhalfs

@@ -109 +109 @@
 GRSECURITY_HOST=${GRSECURITY_HOST:-n}
 CUSTOM_TOOLS=${CUSTOM_TOOLS:-n}
+RE_MAKE=${RE_MAKE:-n}
 
 # Book surces envars
@@ -317 +318 @@
 #
 
-# If $BUILDDIR has subdirectories like tools/ or bin/, stop the run
-# and notify the user about that.
-if [ -d $BUILDDIR/tools -o -d $BUILDDIR/bin ] && [ -z $CLEAN ] ; then
-  eval "$no_empty_builddir"
-fi
-
-# If requested, clean the build directory
-clean_builddir
-
-if [[ ! -d $JHALFSDIR ]]; then
-  mkdir -p $JHALFSDIR
-fi
-#
-# Create $BUILDDIR/sources even though it could be created by get_sources()
-if [[ ! -d $BUILDDIR/sources ]]; then
-  mkdir -p $BUILDDIR/sources
-fi
-#
-# Create the log directory
-if [[ ! -d $LOGDIR ]]; then
-  mkdir $LOGDIR
-fi
->$LOGDIR/$LOG
-#
-[[ "$TEST" != "0" ]] && [[ ! -d $TESTLOGDIR ]] && install -d -m 1777 $TESTLOGDIR
-#
-cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
-#
-[[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
-#
-if [[ "$COMPARE" = "y" ]]; then
-  mkdir -p $JHALFSDIR/extras
-  cp extras/* $JHALFSDIR/extras
-fi
-#
-if [[ -n "$FILES" ]]; then
-  # pushd/popd necessary to deal with multiple files
-  pushd $PACKAGE_DIR 1> /dev/null
-    cp $FILES $JHALFSDIR/
-  popd 1> /dev/null
-fi
-#
-if [[ "${PROGNAME}" = "lfs" ]]; then
-  if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
-    echo "Copying custom tool scripts to $JHALFSDIR"
-    mkdir -p $JHALFSDIR/custom-commands/config
-    mkdir -p $JHALFSDIR/custom-commands/scripts
-   cp -Rf custom/* $JHALFSDIR/custom-commands
-  fi
-fi
-
-#
-if [[ "$REPORT" = "y" ]]; then
-  cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
-  # After being sure that all looks sane, dump the settings to a file
-  # This file will be used to create the REPORT header
-  validate_config > $JHALFSDIR/jhalfs.config
-fi
-#
-[[ "$GETPKG" = "y" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
-#
-cp $COMMON_DIR/packages.xsl  $JHALFSDIR/
-#
-sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
-export XSL=$JHALFSDIR/${XSL}
-
-# Install blfs-tool, if requested.
-if [[ "${BLFS_TOOL}" = "y" ]] ; then
-  # Install the files
-  [[ ! -d ${BUILDDIR}${BLFS_ROOT} ]] && mkdir -p ${BUILDDIR}${BLFS_ROOT}
-  cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT}
-  cp -r menu ${BUILDDIR}${BLFS_ROOT}
-  cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT}
-  cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
-  # Clean-up
-  rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
-  rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/.svn
-  rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/lxdialog/.svn
-  # Set some harcoded envars to their proper values
-  sed -i 's,blfs-xml,'$BLFS_XML',' ${BUILDDIR}${BLFS_ROOT}/{update_book.sh,libs/book.xsl}
-  sed -i 's,tracking-dir,'$TRACKING_DIR',' ${BUILDDIR}${BLFS_ROOT}/{update_book.sh,gen-makefile.sh}
-  # Copy the dependencies build scripts
-  cp -r $COMMON_DIR/blfs-tool-deps $JHALFSDIR/
-  rm -rf $JHALFSDIR/blfs-tool-deps/.svn
-fi
-
-get_book
-echo "${SD_BORDER}${nl_}"
-
-# Get the BLFS book, if requested.
-if [[ "${BLFS_TOOL}" = "y" ]] ; then
-  echo -n "Downloading the BLFS document, $BLFS_BRANCH_ID version... "
-  if [[ ! -d ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} ]] ; then
-    mkdir -p ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML}
-    svn co $SVN_2/BLFS/$BLFS_TREE ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} >>$LOGDIR/$LOG 2>&1
-  else
-    pushd ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} 1> /dev/null
-      svn up >>$LOGDIR/$LOG 2>&1
+if [[ "$RE_MAKE" = "n" ]] ; then
+
+  # If $BUILDDIR has subdirectories like tools/ or bin/, stop the run
+  # and notify the user about that.
+  if [ -d $BUILDDIR/tools -o -d $BUILDDIR/bin ] && [ -z $CLEAN ] ; then
+    eval "$no_empty_builddir"
+  fi
+
+  # If requested, clean the build directory
+  clean_builddir
+
+  if [[ ! -d $JHALFSDIR ]]; then
+    mkdir -p $JHALFSDIR
+  fi
+  #
+  # Create $BUILDDIR/sources even though it could be created by get_sources()
+  if [[ ! -d $BUILDDIR/sources ]]; then
+    mkdir -p $BUILDDIR/sources
+  fi
+  #
+  # Create the log directory
+  if [[ ! -d $LOGDIR ]]; then
+    mkdir $LOGDIR
+  fi
+  >$LOGDIR/$LOG
+  #
+  [[ "$TEST" != "0" ]] && [[ ! -d $TESTLOGDIR ]] && install -d -m 1777 $TESTLOGDIR
+  #
+  cp $COMMON_DIR/{makefile-functions,progress_bar.sh} $JHALFSDIR/
+  #
+  [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
+  #
+  if [[ "$COMPARE" = "y" ]]; then
+    mkdir -p $JHALFSDIR/extras
+    cp extras/* $JHALFSDIR/extras
+  fi
+  #
+  if [[ -n "$FILES" ]]; then
+    # pushd/popd necessary to deal with multiple files
+    pushd $PACKAGE_DIR 1> /dev/null
+      cp $FILES $JHALFSDIR/
     popd 1> /dev/null
   fi
-  echo -ne "done\n"
+  #
+  if [[ "${PROGNAME}" = "lfs" ]]; then
+    if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
+      echo "Copying custom tool scripts to $JHALFSDIR"
+      mkdir -p $JHALFSDIR/custom-commands/config
+      mkdir -p $JHALFSDIR/custom-commands/scripts
+    cp -Rf custom/* $JHALFSDIR/custom-commands
+    fi
+  fi
+
+  #
+  if [[ "$REPORT" = "y" ]]; then
+    cp $COMMON_DIR/create-sbu_du-report.sh  $JHALFSDIR/
+    # After being sure that all looks sane, dump the settings to a file
+    # This file will be used to create the REPORT header
+    validate_config > $JHALFSDIR/jhalfs.config
+  fi
+  #
+  [[ "$GETPKG" = "y" ]] && cp $COMMON_DIR/urls.xsl  $JHALFSDIR/
+  #
+  cp $COMMON_DIR/packages.xsl  $JHALFSDIR/
+  #
+  sed 's,FAKEDIR,'$BOOK',' $PACKAGE_DIR/$XSL > $JHALFSDIR/${XSL}
+  export XSL=$JHALFSDIR/${XSL}
+
+  # Install blfs-tool, if requested.
+  if [[ "${BLFS_TOOL}" = "y" ]] ; then
+    # Install the files
+    [[ ! -d ${BUILDDIR}${BLFS_ROOT} ]] && mkdir -p ${BUILDDIR}${BLFS_ROOT}
+    cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT}
+    cp -r menu ${BUILDDIR}${BLFS_ROOT}
+    cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT}
+    cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
+    # Clean-up
+    rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn
+    rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/.svn
+    rm -rf ${BUILDDIR}${BLFS_ROOT}/menu/lxdialog/.svn
+    # Set some harcoded envars to their proper values
+    sed -i 's,blfs-xml,'$BLFS_XML',' ${BUILDDIR}${BLFS_ROOT}/{update_book.sh,libs/book.xsl}
+    sed -i 's,tracking-dir,'$TRACKING_DIR',' ${BUILDDIR}${BLFS_ROOT}/{update_book.sh,gen-makefile.sh}
+    # Copy the dependencies build scripts
+    cp -r $COMMON_DIR/blfs-tool-deps $JHALFSDIR/
+    rm -rf $JHALFSDIR/blfs-tool-deps/.svn
+  fi
+
+  get_book
   echo "${SD_BORDER}${nl_}"
+
+  # Get the BLFS book, if requested.
+  if [[ "${BLFS_TOOL}" = "y" ]] ; then
+    echo -n "Downloading the BLFS document, $BLFS_BRANCH_ID version... "
+    if [[ ! -d ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} ]] ; then
+      mkdir -p ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML}
+      svn co $SVN_2/BLFS/$BLFS_TREE ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} >>$LOGDIR/$LOG 2>&1
+    else
+      pushd ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} 1> /dev/null
+        svn up >>$LOGDIR/$LOG 2>&1
+      popd 1> /dev/null
+    fi
+    echo -ne "done\n"
+    echo "${SD_BORDER}${nl_}"
+  fi
+
 fi