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

Merged r3175:3181 from trunk.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-10-14 17:18:59 +00:00
parent 6dc325fe15
commit 0510381d65
4 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
BLFS/gen-makefile.sh
View file

@ -10,7 +10,7 @@ declare PREV_PACKAGE=""
declare BUILD_SCRIPTS=scripts declare BUILD_SCRIPTS=scripts
declare TRACKING_DIR=tracking-dir declare TRACKING_DIR=tracking-dir
HEADER="# This file is automatically generated by jhalfs HEADER="# This file is automatically generated by gen-makefile.sh
# YOU MAY NEED TO EDIT THIS FILE MANUALLY # YOU MAY NEED TO EDIT THIS FILE MANUALLY
# #
# Generated on `date \"+%F %X %Z\"`" # Generated on `date \"+%F %X %Z\"`"
@ -247,6 +247,16 @@ EOF
} }
if [[ -e Config.in ]] ; then
echo -e "\n\tThis script must be run from inside a target package directory.\n"
exit 1
fi
if [[ ! -d scripts ]] ; then
echo -e "\n\tNo ./scripts/ directory has been found.\n"
exit 1
fi
generate_Makefile generate_Makefile
cp ../progress_bar.sh . cp ../progress_bar.sh .

3
HLFS/master.sh
View file

@ -473,9 +473,6 @@ EOF
# 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 chapter07/* done # for file in chapter07/*
# Add SBU-disk_usage report target if required
if [[ "$REPORT" = "y" ]] ; then wrt_report ; fi
} }

10
README.BLFS
View file

@ -104,14 +104,16 @@ $Id$
Next step is to create a book and build scripts in dependencies build order Next step is to create a book and build scripts in dependencies build order
for a target package. A target can be a package or a meta-package. for a target package. A target can be a package or a meta-package.
WARNING:
Only one target (meta-package or individual package) must be
selected on each configuration run.
That is due that there is no way to solve dependencies properly
when more than one target are selected at the same time.
Run <make> to launch the configuration interface. The main menu contains Run <make> to launch the configuration interface. The main menu contains
three block: meta-package selection, individual package selection, and three block: meta-package selection, individual package selection, and
build options. build options.
Only one meta-package or individual package must be selected on each run.
That is due that there is no way to solve dependencies properly when
more than one target are selected at the same time.
When a meta-package is selected is possible to unselect unwanted components. When a meta-package is selected is possible to unselect unwanted components.
That unselected components will be skipped if no other components depends That unselected components will be skipped if no other components depends
on them. on them.

4
jhalfs
View file

@ -127,10 +127,6 @@ case $BRANCH_ID in
LFSVRS=${BRANCH_ID} LFSVRS=${BRANCH_ID}
TREE=branches/${BRANCH_ID#branch-}/BOOK TREE=branches/${BRANCH_ID#branch-}/BOOK
;; ;;
2.4-branch )
LFSVRS=${BRANCH_ID}
TREE=branches/2.4-branch
;;
* ) * )
case $PROGNAME in case $PROGNAME in
lfs | hlfs ) lfs | hlfs )