parent
3d7b662116
commit
728955b563
2 changed files with 20 additions and 14 deletions
17
TODO
17
TODO
|
@ -5,21 +5,19 @@
|
||||||
MASTER SCRIPT
|
MASTER SCRIPT
|
||||||
-------------
|
-------------
|
||||||
|
|
||||||
- For CLFS book sources http://svn.cross-lfs.org should be used.
|
|
||||||
|
|
||||||
- Update README to reflect the new work-flow.
|
- Update README to reflect the new work-flow.
|
||||||
|
|
||||||
|
|
||||||
xLFS MODULES
|
xLFS MODULES
|
||||||
------------
|
------------
|
||||||
|
|
||||||
- To create Makefile entries to build blfs-tool dependencies.
|
- Test current BLFS_TOOL Makefile integration in LFS and CLFS.
|
||||||
Test LFS integration and port it to orher books.
|
Port it to CLFS-2 and HLFS, if possible.
|
||||||
|
|
||||||
- To develop a new restart code.
|
- To develop a new "restart" Makefile target code.
|
||||||
|
|
||||||
- To add support for copying to the final system pre-generated
|
- To add support for copying to the final system pre-generated
|
||||||
configuration files created by the user.
|
configuration files created by the user, if that can be implemented.
|
||||||
|
|
||||||
|
|
||||||
BLFS MODULE (See BLFS/TODO)
|
BLFS MODULE (See BLFS/TODO)
|
||||||
|
@ -31,5 +29,8 @@ OTHERS
|
||||||
|
|
||||||
- Add a Customization file discussing how to hack the generated scripts
|
- Add a Customization file discussing how to hack the generated scripts
|
||||||
and Makefiles, using the Cracklib support for Shadow in LFS as an example.
|
and Makefiles, using the Cracklib support for Shadow in LFS as an example.
|
||||||
NOTE: that could require a special command line switch to regenerate the
|
|
||||||
Makefile if additional scripts are manually added to the *-commands/*/ dirs.
|
NOTE:
|
||||||
|
That requires a way to can regenerate the Makefile if additional
|
||||||
|
scripts are manually added to the *-commands/*/ dirs.
|
||||||
|
|
||||||
|
|
15
jhalfs
15
jhalfs
|
@ -90,10 +90,6 @@ source configuration
|
||||||
[[ $? > 0 ]] && echo "file:configuration did not load.." && exit 1
|
[[ $? > 0 ]] && echo "file:configuration did not load.." && exit 1
|
||||||
[[ $VERBOSITY > 0 ]] && echo "OK"
|
[[ $VERBOSITY > 0 ]] && echo "OK"
|
||||||
|
|
||||||
#--- Envars not sourced from configuration
|
|
||||||
declare -r SVN="svn://svn.linuxfromscratch.org"
|
|
||||||
declare -r LOG=000-masterscript.log
|
|
||||||
|
|
||||||
# These are boolean vars generated from Config.in.
|
# These are boolean vars generated from Config.in.
|
||||||
# ISSUE: If a boolean parameter is not set <true> that
|
# ISSUE: If a boolean parameter is not set <true> that
|
||||||
# variable is not defined by the menu app. This can
|
# variable is not defined by the menu app. This can
|
||||||
|
@ -231,6 +227,15 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
|
||||||
GPM_PATCH_2_MD5="bf6cbefe20c6f15b587f19ebc1c8a37a"
|
GPM_PATCH_2_MD5="bf6cbefe20c6f15b587f19ebc1c8a37a"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
#--- Envars not sourced from configuration
|
||||||
|
case $PROGNAME in
|
||||||
|
clfs* ) declare -r SVN="http://svn.cross-lfs.org/svn/repos" ;;
|
||||||
|
* ) declare -r SVN="svn://svn.linuxfromscratch.org" ;;
|
||||||
|
esac
|
||||||
|
declare -r LOG=000-masterscript.log
|
||||||
|
# Needed to can fetch BLFS book sources when building CLFS
|
||||||
|
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])
|
||||||
|
@ -391,7 +396,7 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then
|
||||||
echo -n "Downloading the BLFS document, $BLFS_BRANCH_ID version... "
|
echo -n "Downloading the BLFS document, $BLFS_BRANCH_ID version... "
|
||||||
if [[ ! -d ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} ]] ; then
|
if [[ ! -d ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} ]] ; then
|
||||||
mkdir -p ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML}
|
mkdir -p ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML}
|
||||||
svn co $SVN/BLFS/$BLFS_TREE ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} >>$LOGDIR/$LOG 2>&1
|
svn co $SVN_2/BLFS/$BLFS_TREE ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} >>$LOGDIR/$LOG 2>&1
|
||||||
else
|
else
|
||||||
pushd ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} 1> /dev/null
|
pushd ${BUILDDIR}${BLFS_ROOT}/${BLFS_XML} 1> /dev/null
|
||||||
svn up >>$LOGDIR/$LOG 2>&1
|
svn up >>$LOGDIR/$LOG 2>&1
|
||||||
|
|
Reference in a new issue