r3096 - jhalfs/branches/experimental/HLFS

georgeb at linuxfromscratch.org georgeb at linuxfromscratch.org
Wed Aug 30 15:46:22 PDT 2006


Author: georgeb
Date: 2006-08-30 16:46:21 -0600 (Wed, 30 Aug 2006)
New Revision: 3096

Modified:
   jhalfs/branches/experimental/HLFS/master.sh
Log:
Last corrections to HLFS makefile generation

Modified: jhalfs/branches/experimental/HLFS/master.sh
===================================================================
--- jhalfs/branches/experimental/HLFS/master.sh	2006-08-30 20:12:11 UTC (rev 3095)
+++ jhalfs/branches/experimental/HLFS/master.sh	2006-08-30 22:46:21 UTC (rev 3096)
@@ -360,7 +360,7 @@
 
     # In the mount of kernel filesystems we need to set HLFS and not to use chroot.
     case "${this_script}" in
-      *kernfs*)
+      *kernfs* | *changingowner*)
         wrt_RunAsRoot "${this_script}" "${file}"
         ;;
       *)   # The rest of Chapter06
@@ -521,7 +521,7 @@
 SU_LUSER     = su - \$(LUSER) -c
 LUSER_HOME   = /home/\$(LUSER)
 PRT_DU       = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n"
-PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) \$(MOUNT_PT)\`\n"
+PRT_DU_CR    = echo -e "\nKB: \`du -skx --exclude=\$(SCRIPT_ROOT) / \`\n"
 
 include makefile-functions
 
@@ -569,13 +569,13 @@
 	@( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
 	@touch \$@
 
-mk_CHROOT: mk_LUSER 057-changingowner 059-kernfs
+mk_CHROOT: mk_LUSER 060-kernfs 062-changingowner
 	@mkdir \$(MOUNT_PT)/bin && \
 	cd \$(MOUNT_PT)/bin && \
 	ln -sf /tools/bin/bash bash; ln -sf bash sh
-	@sed -e 's|^ln -sv|ln -svf|' -i \$(CMDSDIR)/chapter06/064-createfiles
+	@sed -e 's|^ln -vs|ln -svf|' -i \$(CMDSDIR)/chapter06/064-createfiles
 	@\$(call echo_CHROOT_request)
-	@( sudo \$(CHROOT1) "env && cd \$(SCRIPT_ROOT) && make CHROOT")
+	@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
 	@touch \$@
 
 mk_BOOT: mk_CHROOT 




More information about the alfs-log mailing list