From e18f80a34aeac88993332692ba87cb3a5e951ccf Mon Sep 17 00:00:00 2001
From: Pierre Labastie <pierre@linuxfromscratch.org>
Date: Wed, 6 Nov 2013 20:55:27 +0000
Subject: [PATCH] Fix BLFS tool inclusion for CLFS: -fix a typo in Makefile (8
 spaces to tab...) -fix permission problems (hopefully)

---
 CLFS/master.sh                | 14 +++++++-------
 common/libs/func_install_blfs |  5 +++++
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/CLFS/master.sh b/CLFS/master.sh
index 5c97e8f..b6bb2f0 100644
--- a/CLFS/master.sh
+++ b/CLFS/master.sh
@@ -69,9 +69,9 @@ cat << EOF
 	echo "export CLFS_TARGET32=\"${TARGET32}\"" >> \$(LUSER_HOME)/.bashrc && \\
 	echo "source $JHALFSDIR/envars" >> \$(LUSER_HOME)/.bashrc
 	@chown \$(LUSER):\$(LGROUP) \$(LUSER_HOME)/.bashrc && \\
+	chmod a+wt \$(MOUNT_PT) && \\
 	touch envars && \\
-	chmod -R a+wt \$(MOUNT_PT) && \\
-	chown -R \$(LUSER) \$(MOUNT_PT)/\$(SCRIPT_ROOT)
+	chown \$(LUSER):\$(LGROUP) envars
 	@\$(call housekeeping)
 EOF
 ) >> $MKFILE.tmp
@@ -1056,11 +1056,11 @@ mk_FINAL:
 	@touch \$@
 
 mk_BLFS_TOOL: mk_FINAL
-        @if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
-          \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
-          ( make -C $BLFS_ROOT/work ); \\
-        fi;
-        @touch \$@
+	@if [ "\$(ADD_BLFS_TOOLS)" = "y" ]; then \\
+	  \$(call sh_echo_PHASE,Building BLFS_TOOL); \\
+	  ( make -C $BLFS_ROOT/work ); \\
+	fi;
+	@touch \$@
 
 mk_CUSTOM_TOOLS: mk_BLFS_TOOL
 	@if [ "\$(ADD_CUSTOM_TOOLS)" = "y" ]; then \\
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs
index 3f34915..8cd47d8 100644
--- a/common/libs/func_install_blfs
+++ b/common/libs/func_install_blfs
@@ -32,6 +32,11 @@ sed -i s@trunk/BOOK@$BLFS_TREE@ \
 sudo make -j1 -C $BUILDDIR$BLFS_ROOT TRACKING_DIR=$BUILDDIR$TRACKING_DIR \
     $BUILDDIR$BLFS_ROOT/packages.xml
 
+# Now /var and /var/lib are owned by root. This is an issue when building
+# CLFS with method=boot, because system dirs creation is made by user, who
+# then cannot create /var/lock and the such.
+sudo chown -R $LUSER $BUILDDIR/var
+
 # Because the BLFS Makefile is supposed to be used in chroot (or booted)
 # mode, the tracking file has wrong path for DTD. Change it:
 sudo sed -i s@$BUILDDIR@@ $BUILDDIR$TRACKING_DIR/instpkg.xml