Changeset b179a81

Timestamp:

08/30/2006 10:46:21 PM (18 years ago)

Author:

George Boudreau <georgeb@…>

Branches:

experimental

Children:

d14903f

Parents:

0cc18f7

Message:

Last corrections to HLFS makefile generation

File:

• HLFS/master.sh (modified) (3 diffs)

HLFS/master.sh

@@ -361 +361 @@
     # 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}"
         ;;
@@ -522 +522 @@
 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
@@ -570 +570 @@
         @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 \$@