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

Fixed create-sbu_du-report target run (I think)

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-09-16 17:45:58 +00:00
parent 80f0ea1a8e
commit 621f01f197
5 changed files with 78 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
CLFS/master.sh
View file

@ -1000,9 +1000,6 @@ chroot_bootable_Makefiles() { #
done
# Add SBU-disk_usage report target if required
if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
}
#--------------------------------------#
@ -1076,10 +1073,6 @@ boot_bootable_Makefiles() { #
PREV=$this_script
done
# Add SBU-disk_usage report target if required
if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
}
@ -1184,7 +1177,7 @@ if [[ "${METHOD}" = "chroot" ]]; then
(
cat << EOF
all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS
all: ck_UID mk_SETUP mk_CROSS mk_SUDO mk_SYSTOOLS create-sbu_du-report
@sudo make do-housekeeping
@\$(call echo_finished,$VERSION)
@ -1206,6 +1199,7 @@ mk_SETUP:
mk_CROSS: mk_SETUP
@\$(call echo_PHASE,Cross and Temporary Tools)
@(sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make AS_LUSER" )
@sudo make restore-luser-env
@touch \$@
mk_SUDO: mk_CROSS
@ -1238,8 +1232,35 @@ AS_LUSER: $cross_tools $temptools
SUDO: $orphan_scripts
CHROOT_JAIL: ${chroottools}${boottools} $testsuitetools $basicsystem $bootscripttools $bootabletools
do-housekeeping:
@-umount \$(MOUNT_PT)/dev/pts
@-umount \$(MOUNT_PT)/dev/shm
@-umount \$(MOUNT_PT)/dev
@-umount \$(MOUNT_PT)/sys
@-umount \$(MOUNT_PT)/proc
@-rm /tools /cross-tools
@-if [ ! -f luser-exist ]; then \\
userdel \$(LUSER); \\
rm -rf /home/\$(LUSER); \\
fi;
EOF
) >> $MKFILE
# Add SBU-disk_usage report target
echo "create-sbu_du-report:" >> $MKFILE
if [[ "$REPORT" = "y" ]] ; then
(
cat << EOF
@\$(call echo_message, Building)
@./create-sbu_du-report.sh logs $VERSION
@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
@touch \$@
EOF
) >> $MKFILE
else echo -e "\t@true\n" >> $MKFILE; fi
fi
################### BOOT #####################
@ -1322,18 +1343,6 @@ restore-luser-env:
echo " "\$(BOLD)Target \$(BLUE)\$@ \$(BOLD)OK && \\
echo --------------------------------------------------------------------------------\$(WHITE)
do-housekeeping:
@-umount \$(MOUNT_PT)/dev/pts
@-umount \$(MOUNT_PT)/dev/shm
@-umount \$(MOUNT_PT)/dev
@-umount \$(MOUNT_PT)/sys
@-umount \$(MOUNT_PT)/proc
@-rm /tools /cross-tools
@-if [ ! -f luser-exist ]; then \\
userdel \$(LUSER); \\
rm -rf /home/\$(LUSER); \\
fi;
########################################################

20
CLFS2/master.sh
View file

@ -412,9 +412,6 @@ bootable_Makefiles() { #
done
# Add SBU-disk_usage report target if required
if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
}
@ -468,7 +465,7 @@ EOF
(
cat << EOF
all: ck_UID mk_SETUP mk_LUSER mk_ROOT
all: ck_UID mk_SETUP mk_LUSER mk_ROOT create-sbu_du-report
@sudo make do-housekeeping
@\$(call echo_finished,$VERSION)
@ -527,6 +524,21 @@ do-housekeeping:
EOF
) >> $MKFILE
# Add SBU-disk_usage report target
echo "create-sbu_du-report:" >> $MKFILE
if [[ "$REPORT" = "y" ]] ; then
(
cat << EOF
@\$(call echo_message, Building)
@./create-sbu_du-report.sh logs $VERSION
@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
@touch \$@
EOF
) >> $MKFILE
else echo -e "\t@true\n\n" >> $MKFILE; fi
# Bring over the items from the Makefile.tmp
cat $MKFILE.tmp >> $MKFILE
rm $MKFILE.tmp

17
HLFS/master.sh
View file

@ -558,7 +558,7 @@ EOF
(
cat << EOF
all: ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT
all: ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-repor
@sudo make do-housekeeping
@\$(call echo_finished,$VERSION)
@ -684,6 +684,21 @@ restart_code:
EOF
) >> $MKFILE
# Add SBU-disk_usage report target
echo "create-sbu_du-report:" >> $MKFILE
if [[ "$REPORT" = "y" ]] ; then
(
cat << EOF
@\$(call echo_message, Building)
@./create-sbu_du-report.sh logs $VERSION
@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
@touch \$@
EOF
) >> $MKFILE
else echo -e "\t@true\n\n" >> $MKFILE; fi
# Bring over the items from the Makefile.tmp
cat $MKFILE.tmp >> $MKFILE
rm $MKFILE.tmp

22
LFS/master.sh
View file

@ -351,8 +351,6 @@ chapter789_Makefiles() {
PREV=${this_script}
done # for file in chapter0{7,8,9}/*
# Add SBU-disk_usage report target if required
if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
}
@ -436,7 +434,7 @@ EOF
(
cat << EOF
all: ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT
all: ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report
@sudo make do_housekeeping
@\$(call echo_finished,$VERSION)
@ -456,6 +454,7 @@ mk_SETUP:
mk_LUSER: mk_SETUP
@\$(call echo_SULUSER_request)
@( sudo \$(SU_LUSER) "source .bashrc && cd \$(MOUNT_PT)/\$(SCRIPT_ROOT) && make LUSER" )
@sudo make restore-luser-env
@touch \$@
mk_SUDO: mk_LUSER
@ -477,7 +476,6 @@ mk_CHROOT: mk_SUDO
@sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/063-createfiles
@\$(call echo_CHROOT_request)
@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
@sudo make restore-luser-env
@touch \$@
mk_BOOT: mk_CHROOT
@ -564,16 +562,26 @@ restart_code:
fi;\\
fi;
EOF
) >> $MKFILE
# Add SBU-disk_usage report target
echo "create-sbu_du-report:" >> $MKFILE
if [[ "$REPORT" = "y" ]] ; then
(
cat << EOF
@\$(call echo_message, Building)
@./create-sbu_du-report.sh logs $VERSION
@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
@touch \$@
EOF
) >> $MKFILE
else echo -e "\t@true\n\n" >> $MKFILE; fi
# Bring over the items from the Makefile.tmp
cat $MKFILE.tmp >> $MKFILE
rm $MKFILE.tmp
echo "Creating Makefile... ${BOLD}DONE${OFF}"
}

20
common/common-functions
View file

@ -66,7 +66,7 @@ wrt_RunAsRoot() { # Some scripts must be run as root..
clfs ) MOUNT_ENV="CLFS" ;;
clfs2 ) MOUNT_ENV="CLFS" ;;
hlfs ) MOUNT_ENV="HLFS" ;;
*) echo "undefined progname $PROGNAME"; exit 1
*) echo "undefined progname $PROGNAME"; exit 1 ;;
esac
(
@ -78,22 +78,6 @@ EOF
}
#----------------------------------#
wrt_report() { #
#----------------------------------#
(
cat << EOF
create-sbu_du-report: $PREV
@\$(call echo_message, Building)
@./create-sbu_du-report.sh logs $VERSION
@\$(call echo_report,$VERSION-SBU_DU-$(date --iso-8601).report)
@touch \$@
EOF
) >> $MKFILE.tmp
}
#------------------------------------------------------#
#------------------------------------------------------#
@ -343,7 +327,7 @@ run_make() { #
# Test if make must be run.
if [ "$RUNMAKE" = "y" ] ; then
# Test to make sure we're running the build as root
if [ "$UID" = "0" ] ; then
if [ "$UID" = "0" ] ; then
echo "You must not be logged in as root to build the system."
exit 1
fi