zeroday0619/MahiroOS-jhalfs
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Last corrections to HLFS makefile generation

Browse source
This commit is contained in:
George Boudreau 2006-08-30 22:46:21 +00:00
parent 0cc18f7ec1
commit b179a81c81
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
HLFS/master.sh
View file

@ -360,7 +360,7 @@ chapter6_Makefiles() { # sysroot or chroot build phase
# In the mount of kernel filesystems we need to set HLFS and not to use chroot. # In the mount of kernel filesystems we need to set HLFS and not to use chroot.
case "${this_script}" in case "${this_script}" in
*kernfs*) *kernfs* | *changingowner*)
wrt_RunAsRoot "${this_script}" "${file}" wrt_RunAsRoot "${this_script}" "${file}"
;; ;;
*) # The rest of Chapter06 *) # The rest of Chapter06
@ -521,7 +521,7 @@ crTESTLOGDIR = /\$(SCRIPT_ROOT)/test-logs
SU_LUSER = su - \$(LUSER) -c SU_LUSER = su - \$(LUSER) -c
LUSER_HOME = /home/\$(LUSER) LUSER_HOME = /home/\$(LUSER)
PRT_DU = echo -e "\nKB: \`du -skx --exclude=jhalfs \$(MOUNT_PT)\`\n" 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 include makefile-functions
@ -569,13 +569,13 @@ mk_LUSER: mk_SETUP
@( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" ) @( \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
@touch \$@ @touch \$@
mk_CHROOT: mk_LUSER 057-changingowner 059-kernfs mk_CHROOT: mk_LUSER 060-kernfs 062-changingowner
@mkdir \$(MOUNT_PT)/bin && \ @mkdir \$(MOUNT_PT)/bin && \
cd \$(MOUNT_PT)/bin && \ cd \$(MOUNT_PT)/bin && \
ln -sf /tools/bin/bash bash; ln -sf bash sh 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) @\$(call echo_CHROOT_request)
@( sudo \$(CHROOT1) "env && cd \$(SCRIPT_ROOT) && make CHROOT") @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
@touch \$@ @touch \$@
mk_BOOT: mk_CHROOT mk_BOOT: mk_CHROOT