diff --git a/LFS/lfs.xsl b/LFS/lfs.xsl
index 1fbf968..10b1de7 100644
--- a/LFS/lfs.xsl
+++ b/LFS/lfs.xsl
@@ -118,102 +118,9 @@
cd $PKGDIR
-
-
- mkdir -pv $PKG_DEST/{boot,etc,lib,bin,sbin}
-mkdir -pv $PKG_DEST/usr/{lib,bin,sbin,include}
-mkdir -pv $PKG_DEST/usr/share/{doc,info,man}
-mkdir -pv $PKG_DEST/usr/share/man/man{1..8}
-ln -sv share/{man,doc,info} $PKG_DEST/usr
-case $(uname -m) in
- x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
-esac
-
-
-
- mkdir -pv $PKG_DEST/usr/include/{rpc,rpcsvc}
-
-
-
-
-
-
- rm -fv $PKG_DEST/usr/share/man/{man3/getspnam.3,man5/passwd.5}
-
-
- rm -fv $PKG_DEST/{,usr/}lib64
-rm -fv $PKG_DEST/usr/{man,doc,info}
-for dir in $PKG_DEST/usr/share/man/man{1..8}; do
- [[ -z $(ls $dir) ]] && rmdir -v $dir
-done
-for dir in $PKG_DEST/usr/share/{doc,info,man}; do
- [[ -z $(ls $dir) ]] && rmdir -v $dir
-done
-for dir in $PKG_DEST/usr/{lib,bin,sbin,include}; do
- [[ -z $(ls $dir) ]] && rmdir -v $dir
-done
-for dir in $PKG_DEST/{boot,etc,lib,bin,sbin}; do
- [[ -z $(ls $dir) ]] && rmdir -v $dir
-done
-packInstall
-rm -rf $PKG_DEST
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- if LOCALE=`grep "
-
- /" $PKGDIR/localedata/SUPPORTED`; then
- CHARMAP=`echo $LOCALE | sed 's,[^/]*/\([^ ]*\) [\],\1,'`
- INPUT=`echo $LOCALE | sed 's,[/.].*,,'`
- LOCALE=`echo $LOCALE | sed 's,/.*,,'`
- localedef -i $INPUT -f $CHARMAP $LOCALE
-fi
-
-
-
-
-
-
+
+
+
+ mkdir -pv $PKG_DEST/{boot,etc,lib,bin,sbin}
+mkdir -pv $PKG_DEST/usr/{lib,bin,sbin,include}
+mkdir -pv $PKG_DEST/usr/share/{doc,info,man}
+mkdir -pv $PKG_DEST/usr/share/man/man{1..8}
+ln -sv share/{man,doc,info} $PKG_DEST/usr
+case $(uname -m) in
+ x86_64) ln -sv lib $PKG_DEST/lib64 && ln -sv lib $PKG_DEST/usr/lib64 ;;
+esac
+
+
+
+ mkdir -pv $PKG_DEST/usr/include/{rpc,rpcsvc}
+
+
+
+
+
+
+ rm -fv $PKG_DEST/usr/share/man/{man3/getspnam.3,man5/passwd.5}
+
+
+ rm -fv $PKG_DEST/{,usr/}lib64
+rm -fv $PKG_DEST/usr/{man,doc,info}
+for dir in $PKG_DEST/usr/share/man/man{1..8}; do
+ [[ -z $(ls $dir) ]] && rmdir -v $dir
+done
+for dir in $PKG_DEST/usr/share/{doc,info,man}; do
+ [[ -z $(ls $dir) ]] && rmdir -v $dir
+done
+for dir in $PKG_DEST/usr/{lib,bin,sbin,include}; do
+ [[ -z $(ls $dir) ]] && rmdir -v $dir
+done
+for dir in $PKG_DEST/{boot,etc,lib,bin,sbin}; do
+ [[ -z $(ls $dir) ]] && rmdir -v $dir
+done
+packInstall
+rm -rf $PKG_DEST
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ if LOCALE=`grep "
+
+ /" $PKGDIR/localedata/SUPPORTED`; then
+ CHARMAP=`echo $LOCALE | sed 's,[^/]*/\([^ ]*\) [\],\1,'`
+ INPUT=`echo $LOCALE | sed 's,[/.].*,,'`
+ LOCALE=`echo $LOCALE | sed 's,/.*,,'`
+ localedef -i $INPUT -f $CHARMAP $LOCALE
+fi
+
+
+
+
+
+
+
+
diff --git a/common/libs/func_book_parser b/common/libs/func_book_parser
index a14c44a..61cef28 100644
--- a/common/libs/func_book_parser
+++ b/common/libs/func_book_parser
@@ -137,7 +137,9 @@ extract_commands() { #
lfs)
echo -n " ${L_arrow}${BOLD}LFS${R_arrow} build... "
pushd $BOOK > /dev/null
- bash process-scripts.sh >> $LOGDIR/$LOG 2>&1
+ if [ -f process.scripts.sh ]; then
+ bash process-scripts.sh >> $LOGDIR/$LOG 2>&1
+ fi
popd > /dev/null
xsltproc --nonet \
--xinclude \
diff --git a/common/libs/func_wrt_Makefile b/common/libs/func_wrt_Makefile
index 8c5fe23..3624e12 100644
--- a/common/libs/func_wrt_Makefile
+++ b/common/libs/func_wrt_Makefile
@@ -96,6 +96,8 @@ get_package_tarball_name() { #
;;
e2fsprogs-libs) echo $(grep "^e2fsprogs" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
+ libcap) echo $(grep "^libcap" $JHALFSDIR/pkg_tarball_list | head -n1 )
+ ;;
util-linux-libs) echo $(grep "^util-linux" $JHALFSDIR/pkg_tarball_list | head -n1 )
;;
xz-utils) echo $(grep "^xz" $JHALFSDIR/pkg_tarball_list | head -n1 )
diff --git a/common/makefile-functions b/common/makefile-functions
index e63ac66..89b93b4 100644
--- a/common/makefile-functions
+++ b/common/makefile-functions
@@ -182,7 +182,7 @@ define echo_report
echo $(BOLD) The report file $(BLUE)$(1)$(BOLD) has been created ; \
echo ; \
echo $(WHITE)Please send the $(BOLD)$(MOUNT_PT)/jhalfs/$(1)$(WHITE) ; \
- echo file to $(BOLD)manuel@linuxfromscratch.org$(WHITE) ; \
+ echo file to $(BOLD)jhalfs-reports@linuxfromscratch.org$(WHITE) ; \
echo ; \
echo That will help us to keep more accurate SBU and ; \
echo disk usage values into the book. Thanks. ; \
@@ -200,26 +200,30 @@ define echo_finished
@echo To be able to boot your new system you need to follow
@echo the next steps:$(WHITE)
@echo
+ @echo $(tab_)- Mount the virtual kernel file systems.
+ @echo
@echo $(tab_)- Enter to the chroot using the command found
@echo $(tab_)in the section -Entering the Chroot Environment-
@echo $(tab_)except if building CLFS with METHOD=boot.
@echo
@echo $(tab_)- Set a password for the root user.
@echo
- @echo $(tab_)- Edit or create /etc/fstab, /etc/hosts, /etc/sysconfig/clock,
- @echo $(tab_)/etc/sysconfig/console, /etc/sysconfig/network,
- @echo $(tab_)/etc/sysconfig//network-devices/ifconfig.eth0/ipv4 and
- @echo $(tab_)any other configuration file required to suit your needs.
- @echo
- @echo $(tab_)- Exit from the chroot.
+ @echo $(tab_)- Edit or create /etc/fstab,
+ @echo $(tab_) " /etc/hosts,"
+ @echo $(tab_) " /etc/sysconfig/clock,"
+ @echo $(tab_) " /etc/sysconfig/console,"
+ @echo $(tab_) " /etc/sysconfig/network,"
+ @echo $(tab_) " /etc/sysconfig/ifconfig.eth0"
+ @echo $(tab_)and any other configuration file required to suit your needs.
@echo
@echo $(tab_)- Set-up the boot loader, except if building CLFS with METHOD=boot.
- @echo $(tab_)You can set-up the host bootloader or the new boot-loader
- @echo $(tab_)installed on the new system.
- @echo $(tab_)If the last, you must to mount the virtual filesystems, re-enter
- @echo $(tab_)the chroot and be sure that /dev is populated with the
- @echo $(tab_)required devices before configure the boot-loader. When ready,
- @echo $(tab_)exit from the chroot and umount the filesystems
+ @echo
+ @echo $(tab_)You can set-up the new boot-loader installed on the new system
+ @echo $(tab_)or the host bootloader.
+ @echo
+ @echo $(tab_)If the last, it is better to exit first from the chroot.
+ @echo
+ @echo $(tab_)- Exit from the chroot and umount the filesystems.
@echo
@echo If you are an experienced LFS user, several of those steps can be
@echo skipped or done in a different way. But then, that is something