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

LFS changes:

Browse source 
Skip creation of chapters 4 and 9 scripts.
Creating /etc/lfs-release as part af all target.
Removed hardcoded script number.
This commit is contained in:
Manuel Canales Esparcia 2006-12-04 13:48:48 +00:00
parent 5f4982dc54
commit 14eaa9fe7e
2 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
LFS/lfs.xsl
View file

@ -44,8 +44,13 @@
</xsl:template> </xsl:template>
<xsl:template match="sect1"> <xsl:template match="sect1">
<xsl:if test="count(descendant::screen/userinput) &gt; 0 and <xsl:if test="(../@id='chapter-temporary-tools' or
count(descendant::screen/userinput) &gt; count(descendant::screen[@role='nodump'])"> ../@id='chapter-building-system' or
../@id='chapter-bootscripts' or
../@id='chapter-bootable') and
count(descendant::screen/userinput) &gt; 0 and
count(descendant::screen/userinput) &gt;
count(descendant::screen[@role='nodump'])">
<!-- The dirs names --> <!-- The dirs names -->
<xsl:variable name="pi-dir" select="../processing-instruction('dbhtml')"/> <xsl:variable name="pi-dir" select="../processing-instruction('dbhtml')"/>
<xsl:variable name="pi-dir-value" select="substring-after($pi-dir,'dir=')"/> <xsl:variable name="pi-dir-value" select="substring-after($pi-dir,'dir=')"/>

25
LFS/master.sh
View file

@ -281,25 +281,19 @@ chapter6_Makefiles() {
} }
#----------------------------# #----------------------------#
chapter789_Makefiles() { chapter78_Makefiles() {
#----------------------------# #----------------------------#
echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8/9 ( BOOT ) ${R_arrow}" echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter7/8 ( BOOT ) ${R_arrow}"
for file in chapter0{7,8,9}/* ; do for file in chapter0{7,8}/* ; do
# Keep the script file name # Keep the script file name
this_script=`basename $file` this_script=`basename $file`
# Grub must be configured manually. # Grub must be configured manually.
# The filesystems can't be unmounted via Makefile and the user # Handle fstab creation.
# should enter the chroot environment to create the root
# password, edit several files and setup Grub.
#
# If no .config file is supplied, the kernel build is skipped # If no .config file is supplied, the kernel build is skipped
#
case ${this_script} in case ${this_script} in
*grub) continue ;; *grub) continue ;;
*reboot) continue ;;
*console) continue ;; # Use the file generated by lfs-bootscripts
*fstab) [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;; *fstab) [[ ! -z ${FSTAB} ]] && cp ${FSTAB} $BUILDDIR/sources/fstab ;;
*kernel) [[ -z ${CONFIG} ]] && continue *kernel) [[ -z ${CONFIG} ]] && continue
cp ${CONFIG} $BUILDDIR/sources/kernel-config ;; cp ${CONFIG} $BUILDDIR/sources/kernel-config ;;
@ -307,7 +301,7 @@ chapter789_Makefiles() {
# 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
chapter789="$chapter789 ${this_script}" chapter78="$chapter78 ${this_script}"
#--------------------------------------------------------------------# #--------------------------------------------------------------------#
# >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< # # >>>>>>>> START BUILDING A Makefile ENTRY <<<<<<<< #
@ -358,7 +352,7 @@ chapter789_Makefiles() {
# Keep the script file name for Makefile dependencies. # Keep the script file name for Makefile dependencies.
PREV=${this_script} PREV=${this_script}
done # for file in chapter0{7,8,9}/* done # for file in chapter0{7,8}/*
} }
@ -380,7 +374,7 @@ build_Makefile() { #
chapter6_Makefiles chapter6_Makefiles
# Add the iterations targets, if needed # Add the iterations targets, if needed
[[ "$COMPARE" = "y" ]] && wrt_compare_targets [[ "$COMPARE" = "y" ]] && wrt_compare_targets
chapter789_Makefiles chapter78_Makefiles
# Add the BLFS_TOOL targets, if needed # Add the BLFS_TOOL targets, if needed
[[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets [[ "$BLFS_TOOL" = "y" ]] && wrt_blfs_tool_targets
@ -415,6 +409,7 @@ build_Makefile() { #
all: ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL all: ck_UID mk_SETUP mk_LUSER mk_SUDO mk_CHROOT mk_BOOT create-sbu_du-report mk_BLFS_TOOL
@sudo make do_housekeeping @sudo make do_housekeeping
@sudo echo "$VERSION - jhalfs build" > \$(MOUNT_PT)/etc/lfs-release
@\$(call echo_finished,$VERSION) @\$(call echo_finished,$VERSION)
ck_UID: ck_UID:
@ -453,7 +448,7 @@ mk_CHROOT: mk_SUDO
ln -sf /tools/bin/bash bash; ln -sf bash sh; \\ ln -sf /tools/bin/bash bash; ln -sf bash sh; \\
sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\ sudo chown -R 0:0 \$(MOUNT_PT)/bin; \\
fi; fi;
@sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/063-createfiles @sudo sed -e 's|^ln -sv |ln -svf |' -i \$(CMDSDIR)/chapter06/*-createfiles
@\$(call echo_CHROOT_request) @\$(call echo_CHROOT_request)
@( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT") @( sudo \$(CHROOT1) "cd \$(SCRIPT_ROOT) && make CHROOT")
@touch \$@ @touch \$@
@ -476,7 +471,7 @@ SETUP: $chapter4
LUSER: $chapter5 LUSER: $chapter5
SUDO: $runasroot SUDO: $runasroot
CHROOT: $chapter6 CHROOT: $chapter6
BOOT: $chapter789 BOOT: $chapter78
BLFS_TOOL: $blfs_tool BLFS_TOOL: $blfs_tool