zeroday0619/MahiroOS-jhalfs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

BLFS book: progress_bar.sh, documentation and misc adjustments

Browse source
This commit is contained in:
George Boudreau 2007-07-06 00:59:01 +00:00
parent 615ba88931
commit 52b0d10f27
5 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
BLFS/Makefile
View file

@ -11,10 +11,10 @@ CONFIG = menu
all: menuconfig all: menuconfig
$(CONFIG)/conf: $(CONFIG)/conf:
$(MAKE) -C $(CONFIG) conf $(MAKE) -B -C $(CONFIG) conf
$(CONFIG)/mconf: $(CONFIG)/mconf:
$(MAKE) -C $(CONFIG) ncurses conf mconf $(MAKE) -B -C $(CONFIG) ncurses conf mconf
menuconfig: $(CONFIG)/mconf menuconfig: $(CONFIG)/mconf
@./update_book.sh none @./update_book.sh none

4
BLFS/libs/scripts.xsl
View file

@ -155,7 +155,7 @@ UNPACKDIR=`head -n1 unpacked | sed 's@^./@@;s@/.*@@'`
cd $UNPACKDIR&#xA;</xsl:text> cd $UNPACKDIR&#xA;</xsl:text>
<xsl:apply-templates select=".//screen | .//para/command"/> <xsl:apply-templates select=".//screen | .//para/command"/>
<xsl:if test="$sudo = 'y'"> <xsl:if test="$sudo = 'y'">
<xsl:text>sudo </xsl:text> <xsl:text>sudo /sbin/</xsl:text>
</xsl:if> </xsl:if>
<xsl:text>ldconfig&#xA;&#xA;</xsl:text> <xsl:text>ldconfig&#xA;&#xA;</xsl:text>
</xsl:when> </xsl:when>
@ -187,7 +187,7 @@ cd $UNPACKDIR&#xA;</xsl:text>
rm -rf $packagedir rm -rf $packagedir
done&#xA;</xsl:text> done&#xA;</xsl:text>
<xsl:if test="$sudo = 'y'"> <xsl:if test="$sudo = 'y'">
<xsl:text>sudo </xsl:text> <xsl:text>sudo /sbin/</xsl:text>
</xsl:if> </xsl:if>
<xsl:text>ldconfig&#xA;&#xA;</xsl:text> <xsl:text>ldconfig&#xA;&#xA;</xsl:text>
</xsl:when> </xsl:when>

8
README
View file

@ -79,15 +79,15 @@ $Id$
For books that support it, there is an option to install blfs-tool and its 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 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 builds you may need to adjust that scripts, that are found into the
common/blfs-tool-deps directory in the jhalfs sources tree. 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 you MUST to edit the dependencies scripts to fix the
installation paths. installation paths.
Be sure to make the adjust carefully or you will end Be careful when you modify the scripts as you can
messing your host system. easily disable the host system.
After booting the new xLFS system some steps are needed to finish After booting the new xLFS system some steps are needed to finish
blfs-tool installation: blfs-tool installation:

3
blfs-tool
View file

@ -155,6 +155,7 @@ echo "${nl_}${SD_BORDER}${nl_}"
cp -r BLFS/* $BLFS_ROOT cp -r BLFS/* $BLFS_ROOT
cp -r menu $BLFS_ROOT cp -r menu $BLFS_ROOT
cp $COMMON_DIR/progress_bar.sh $BLFS_ROOT cp $COMMON_DIR/progress_bar.sh $BLFS_ROOT
chmod 777 ${BLFS_ROOT}/progress_bar.sh
cp README.BLFS $BLFS_ROOT cp README.BLFS $BLFS_ROOT
# Start the work # Start the work
@ -178,5 +179,5 @@ else
fi fi
# Run the menuconfig interface # Run the menuconfig interface
make make -B

4
jhalfs
View file

@ -242,10 +242,9 @@ declare -r SVN_2="svn://svn.linuxfromscratch.org"
# Set true internal variables # Set true internal variables
COMMON_DIR="common" 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 MODULE=$PACKAGE_DIR/master.sh
[[ $VERBOSITY > 0 ]] && echo -n "Loading common-functions module..." [[ $VERBOSITY > 0 ]] && echo -n "Loading common-functions module..."
source $COMMON_DIR/common-functions source $COMMON_DIR/common-functions
[[ $? > 0 ]] && echo " $COMMON_DIR/common-functions did not load.." && exit [[ $? > 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 BLFS/* ${BUILDDIR}${BLFS_ROOT}
cp -r menu ${BUILDDIR}${BLFS_ROOT} cp -r menu ${BUILDDIR}${BLFS_ROOT}
cp $COMMON_DIR/progress_bar.sh ${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} cp README.BLFS ${BUILDDIR}${BLFS_ROOT}
# Clean-up # Clean-up
rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn rm -rf ${BUILDDIR}${BLFS_ROOT}/libs/.svn