Author: pierre
Date: Thu Aug 10 01:10:43 2017
New Revision: 3996
Log:
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.
Modified:
jhalfs/trunk/Config.in
jhalfs/trunk/jhalfs
Modified: jhalfs/trunk/Config.in
==============================================================================
--- jhalfs/trunk/Config.in Wed Aug 9 07:20:25 2017 (r3995)
+++ jhalfs/trunk/Config.in Thu Aug 10 01:10:43 2017 (r3996)
@@ -562,6 +562,15 @@
book sources will be copied or checked out. Do not change that
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
prompt "LFS Release"
default LFS_SVN
Modified: jhalfs/trunk/jhalfs
==============================================================================
--- jhalfs/trunk/jhalfs Wed Aug 9 07:20:25 2017 (r3995)
+++ jhalfs/trunk/jhalfs Thu Aug 10 01:10:43 2017 (r3996)
@@ -416,12 +416,6 @@
cp extras/* $JHALFSDIR/extras
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
if [[ "${CUSTOM_TOOLS}" = "y" ]]; then
echo "Copying custom tool scripts to $JHALFSDIR"
@@ -429,6 +423,14 @@
cp -f custom/config/* $JHALFSDIR/custom-commands
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.
if [[ "${BLFS_TOOL}" = "y" ]] ; then
echo Installing BLFS book and tools
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
