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

Adapt instructions to new layout for "boot" method, while keeping

Browse source 
compatibility with older layouts. Joint work with W. Harrington
This commit is contained in:
Pierre Labastie 2014-05-12 06:51:20 +00:00
parent ff9938fe50
commit 179ae85718
1 changed files with 96 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

82
CLFS/master.sh
View file

@ -337,6 +337,7 @@ boot_Makefiles() { #
# A little housekeeping on the scripts # A little housekeeping on the scripts
case $this_script in case $this_script in
*grub | *aboot | *colo | *silo | *arcload | *lilo | *introduction ) continue ;; *grub | *aboot | *colo | *silo | *arcload | *lilo | *introduction ) continue ;;
*how-to-view*) continue ;;
*whatnext*) continue ;; *whatnext*) continue ;;
*fstab) [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;; *fstab) [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
*kernel) # if there is no kernel config file do not build the kernel *kernel) # if there is no kernel config file do not build the kernel
@ -347,12 +348,52 @@ boot_Makefiles() { #
esac esac
# #
# First append each name of the script files to a list (this will become # First append each name of the script files to a list (this will become
# the names of the targets in the Makefile # the names of the targets in the Makefile). Those names differ depending
# on the version of the book. What makes the difference between those
# versions is the presence of "how-to-view" in the boot chapter.
if [ -f boot/*how-to-view ]; then
case "${this_script}" in case "${this_script}" in
*changingowner) orphan_scripts="${orphan_scripts} ${this_script}" ;; *changingowner)
*devices) orphan_scripts="${orphan_scripts} ${this_script}" ;; orphan_scripts="${orphan_scripts} ${this_script}"
*) boottools="$boottools $this_script" ;; ;;
*creatingdirs)
orphan_scripts="${orphan_scripts} ${this_script}"
;;
*createfiles)
orphan_scripts="${orphan_scripts} ${this_script}"
;;
*devices)
orphan_scripts="${orphan_scripts} ${this_script}"
;;
*flags)
orphan_scripts="${orphan_scripts} ${this_script}"
;;
*fstab)
orphan_scripts="${orphan_scripts} ${this_script}"
;;
*pwdgroup)
orphan_scripts="${orphan_scripts} ${this_script}"
;;
*settingenvironment)
orphan_scripts="${orphan_scripts} ${this_script}"
;;
*)
boottools="$boottools $this_script"
;;
esac esac
else
case "${this_script}" in
*changingowner)
orphan_scripts="${orphan_scripts} ${this_script}"
;;
*devices)
orphan_scripts="${orphan_scripts} ${this_script}"
;;
*)
boottools="$boottools $this_script"
;;
esac
fi
# #
# Grab the name of the target, strip id number and misc words. # Grab the name of the target, strip id number and misc words.
case $this_script in case $this_script in
@ -387,12 +428,36 @@ boot_Makefiles() { #
[[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" -ge "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name" [[ "$pkg_tarball" != "" ]] && [[ "$OPTIMIZE" -ge "2" ]] && wrt_optimize "$name" && wrt_makeflags "$name"
# #
# Select a script execution method # Select a script execution method
if [ -f boot/*how-to-view ]; then
case $this_script in
# The following 8 scripts are defined in the /boot directory but need
# to be run as a root user. Set them up here but run them in another
# phase
*changingowner) wrt_RunAsRoot "${file}" ;;
*creatingdirs) wrt_RunAsRoot "${file}" ;;
*createfiles) wrt_RunAsRoot "${file}" ;;
*devices) wrt_RunAsRoot "${file}" ;;
*flags) wrt_RunAsRoot "${file}" ;;
*fstab)
if [[ -n "$FSTAB" ]]; then
LUSER_wrt_CopyFstab
else
wrt_RunAsRoot "${file}"
fi
;;
*pwdgroup) wrt_RunAsRoot "${file}" ;;
*settingenvironment) wrt_RunAsRoot "${file}" ;;
*) LUSER_wrt_RunAsUser "${file}" ;;
esac
else
case $this_script in case $this_script in
# The following 2 scripts are defined in the /boot directory but need # The following 2 scripts are defined in the /boot directory but need
# to be run as a root user. Set them up here but run them in another phase # to be run as a root user. Set them up here but run them in another
*changingowner*) wrt_RunAsRoot "${file}" ;; # phase
*devices*) wrt_RunAsRoot "${file}" ;; *changingowner) wrt_RunAsRoot "${file}" ;;
*fstab*) if [[ -n "$FSTAB" ]]; then *devices) wrt_RunAsRoot "${file}" ;;
*fstab)
if [[ -n "$FSTAB" ]]; then
LUSER_wrt_CopyFstab LUSER_wrt_CopyFstab
else else
LUSER_wrt_RunAsUser "${file}" LUSER_wrt_RunAsUser "${file}"
@ -400,6 +465,7 @@ boot_Makefiles() { #
;; ;;
*) LUSER_wrt_RunAsUser "${file}" ;; *) LUSER_wrt_RunAsUser "${file}" ;;
esac esac
fi
# #
# Housekeeping...remove any build directory(ies) except if the package build fails. # Housekeeping...remove any build directory(ies) except if the package build fails.
[[ "$pkg_tarball" != "" ]] && LUSER_RemoveBuildDirs "${name}" [[ "$pkg_tarball" != "" ]] && LUSER_RemoveBuildDirs "${name}"