diff --git a/BLFS/Makefile b/BLFS/Makefile index 1f75180..ac87c82 100644 --- a/BLFS/Makefile +++ b/BLFS/Makefile @@ -11,10 +11,10 @@ CONFIG = menu all: menuconfig $(CONFIG)/conf: - $(MAKE) -C $(CONFIG) conf + $(MAKE) -B -C $(CONFIG) conf $(CONFIG)/mconf: - $(MAKE) -C $(CONFIG) ncurses conf mconf + $(MAKE) -B -C $(CONFIG) ncurses conf mconf menuconfig: $(CONFIG)/mconf @./update_book.sh none diff --git a/BLFS/libs/scripts.xsl b/BLFS/libs/scripts.xsl index ccdc489..3e139c2 100644 --- a/BLFS/libs/scripts.xsl +++ b/BLFS/libs/scripts.xsl @@ -155,7 +155,7 @@ UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'` cd $UNPACKDIR - sudo + sudo /sbin/ ldconfig @@ -187,7 +187,7 @@ cd $UNPACKDIR rm -rf $packagedir done - sudo + sudo /sbin/ ldconfig diff --git a/README b/README index d5d6c95..c0c5715 100644 --- a/README +++ b/README @@ -79,15 +79,15 @@ $Id$ For books that support it, there is an option to install blfs-tool and its dependencies on the final system. The pre-made build dependencies - scripts has been written thinking on a LFS build. For CLFS and HLFS + scripts has been written based on a LFS build. For CLFS and HLFS builds you may need to adjust that scripts, that are found into the common/blfs-tool-deps directory in the jhalfs sources tree. - WARNING:: If adding blfs-tool support on a CLFS Sysroot build + WARNING:: If you add blfs-tool support on a CLFS Sysroot build you MUST to edit the dependencies scripts to fix the installation paths. - Be sure to make the adjust carefully or you will end - messing your host system. + Be careful when you modify the scripts as you can + easily disable the host system. After booting the new xLFS system some steps are needed to finish blfs-tool installation: diff --git a/blfs-tool b/blfs-tool index 80515f3..18f0262 100755 --- a/blfs-tool +++ b/blfs-tool @@ -155,6 +155,7 @@ echo "${nl_}${SD_BORDER}${nl_}" cp -r BLFS/* $BLFS_ROOT cp -r menu $BLFS_ROOT cp $COMMON_DIR/progress_bar.sh $BLFS_ROOT +chmod 777 ${BLFS_ROOT}/progress_bar.sh cp README.BLFS $BLFS_ROOT # Start the work @@ -178,5 +179,5 @@ else fi # Run the menuconfig interface -make +make -B diff --git a/jhalfs b/jhalfs index b8b1381..29a79cb 100755 --- a/jhalfs +++ b/jhalfs @@ -242,10 +242,9 @@ declare -r SVN_2="svn://svn.linuxfromscratch.org" # Set true internal variables COMMON_DIR="common" -PACKAGE_DIR=$(echo $PROGNAME | tr [a-z] [A-Z]) +PACKAGE_DIR=$(echo $PROGNAME | tr '[a-z]' '[A-Z]') MODULE=$PACKAGE_DIR/master.sh - [[ $VERBOSITY > 0 ]] && echo -n "Loading common-functions module..." source $COMMON_DIR/common-functions [[ $? > 0 ]] && echo " $COMMON_DIR/common-functions did not load.." && exit @@ -398,6 +397,7 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT} cp -r menu ${BUILDDIR}${BLFS_ROOT} cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT} + chmod 777 ${BUILDDIR}${BLFS_ROOT}/progress_bar.sh cp README.BLFS ${BUILDDIR}${BLFS_ROOT} # Clean-up rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn