Fix two bugs:
- LFS_XML variable was forgotten in Config.in - All customization to $JHALFSDIR have to be done before getting the {H,C,}LFS book, so that custom/config/* has to be copied before getting the book.
This commit is contained in:
parent
2cef19fddd
commit
f73377282f
2 changed files with 17 additions and 6 deletions
|
@ -562,6 +562,15 @@ menu "BOOK Settings"
|
||||||
book sources will be copied or checked out. Do not change that
|
book sources will be copied or checked out. Do not change that
|
||||||
unless you know what you are doing...
|
unless you know what you are doing...
|
||||||
|
|
||||||
|
config LFS_XML
|
||||||
|
string "LFS sources directory (internal parameter)"
|
||||||
|
default "lfs-xml"
|
||||||
|
depends BLFS_TOOL || BOOK_BLFS
|
||||||
|
help
|
||||||
|
The directory name under $BLFS_ROOT where the LFS
|
||||||
|
book sources will be copied or checked out. Do not change that
|
||||||
|
unless you know what you are doing...
|
||||||
|
|
||||||
choice
|
choice
|
||||||
prompt "LFS Release"
|
prompt "LFS Release"
|
||||||
default LFS_SVN
|
default LFS_SVN
|
||||||
|
|
14
jhalfs
14
jhalfs
|
@ -416,12 +416,6 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
|
||||||
cp extras/* $JHALFSDIR/extras
|
cp extras/* $JHALFSDIR/extras
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Download or updates the book source
|
|
||||||
get_book
|
|
||||||
extract_commands
|
|
||||||
echo "${SD_BORDER}${nl_}"
|
|
||||||
cd $CWD # the functions above change directory
|
|
||||||
|
|
||||||
# Copy custom tools config files, if requested
|
# Copy custom tools config files, if requested
|
||||||
if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
|
if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
|
||||||
echo "Copying custom tool scripts to $JHALFSDIR"
|
echo "Copying custom tool scripts to $JHALFSDIR"
|
||||||
|
@ -429,6 +423,14 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
|
||||||
cp -f custom/config/* $JHALFSDIR/custom-commands
|
cp -f custom/config/* $JHALFSDIR/custom-commands
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# Download or updates the book source
|
||||||
|
# Note that all customization to $JHALFSDIR have to be done before this.
|
||||||
|
# But the LFS book is needed for BLFS tools.
|
||||||
|
get_book
|
||||||
|
extract_commands
|
||||||
|
echo "${SD_BORDER}${nl_}"
|
||||||
|
cd $CWD # the functions above change directory
|
||||||
|
|
||||||
# Install blfs-tool, if requested.
|
# Install blfs-tool, if requested.
|
||||||
if [[ "${BLFS_TOOL}" = "y" ]] ; then
|
if [[ "${BLFS_TOOL}" = "y" ]] ; then
|
||||||
echo Installing BLFS book and tools
|
echo Installing BLFS book and tools
|
||||||
|
|
Reference in a new issue