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

Merged r2481:2485 from trunk.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-04-07 17:27:23 +00:00
parent 3e0594f97a
commit fed975652f
4 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
LFS/master.sh
View file

@ -69,11 +69,14 @@ chapter5_Makefiles() {
this_script=`basename $file` this_script=`basename $file`
# If no testsuites will be run, then TCL, Expect and DejaGNU aren't needed # If no testsuites will be run, then TCL, Expect and DejaGNU aren't needed
# Fix also locales creation when running chapter05 testsuites (ugly)
case "${this_script}" in case "${this_script}" in
*tcl) [[ "${TEST}" = "0" ]] && continue ;; *tcl) [[ "${TEST}" = "0" ]] && continue ;;
*expect) [[ "${TEST}" = "0" ]] && continue ;; *expect) [[ "${TEST}" = "0" ]] && continue ;;
*dejagnu) [[ "${TEST}" = "0" ]] && continue ;; *dejagnu) [[ "${TEST}" = "0" ]] && continue ;;
*stripping) [[ "${STRIP}" = "0" ]] && continue ;; *stripping) [[ "${STRIP}" = "0" ]] && continue ;;
*glibc) [[ "${TEST}" = "3" ]] && \
sed -i 's@/usr/lib/locale@/tools/lib/locale@' $file ;;
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
@ -114,7 +117,11 @@ chapter5_Makefiles() {
# Insert date and disk usage at the top of the log file, the script run # Insert date and disk usage at the top of the log file, the script run
# and date and disk usage again at the bottom of the log file. # and date and disk usage again at the bottom of the log file.
wrt_run_as_su "${this_script}" "$file" # The changingowner script must be run as root.
case "${this_script}" in
*changingowner) wrt_run_as_root "${this_script}" "$file" ;;
*) wrt_run_as_su "${this_script}" "$file" ;;
esac
# Remove the build directory(ies) except if the package build fails # Remove the build directory(ies) except if the package build fails
# (so we can review config.cache, config.log, etc.) # (so we can review config.cache, config.log, etc.)

12
README
View file

@ -77,12 +77,12 @@ $Id$
A. Yes it does.. A. Yes it does..
Q. "What is the function of the SRC_ARCHIVE variable Q. "What is the function of the SRC_ARCHIVE variable
A. When the makefile runs it creates a local copy of the necessary packages A. When then symlinked master.sh runs it creates a local copy of the
in BUILDDIR/sources by downloading the files. If the variable SRC_ARCHIVE necessary packages in BUILDDIR/sources by downloading the files. If
is defined the software will first look in this location for the file and, the variable SRC_ARCHIVE is defined the software will first look in
if found, will copy it to BUILDDIR/sources. If the files are not found in this location for the file and, if found, will copy it to BUILDDIR/sources.
SRC_ARCHIVE _and_ you have write priv to the directory any downloaded If the files are not found in SRC_ARCHIVE _and_ you have write priv to
files will be mirrored there. the directory any downloaded files will be mirrored there.
Q. "Why have 2 copies of the files." Q. "Why have 2 copies of the files."
A. The package files must be visible during the chroot phase and this is a A. The package files must be visible during the chroot phase and this is a

1
common/common-functions
View file

@ -49,7 +49,6 @@ ${BOLD} -V, --version${OFF}
${BOLD} -B, --book VER${OFF} ${BOLD} -B, --book VER${OFF}
checkout VER version of the book. Supported versions at this time are: checkout VER version of the book. Supported versions at this time are:
dev* | trunk | SVN aliases for Development {C,H,B}LFS dev* | trunk | SVN aliases for Development {C,H,B}LFS
alpha* aliases for the LFS alphabetical branch
udev* aliases for the LFS udev_update branch udev* aliases for the LFS udev_update branch
${BOLD} -D --directory DIR${OFF} ${BOLD} -D --directory DIR${OFF}

1
master.sh
View file

@ -113,7 +113,6 @@ while test $# -gt 0 ; do
echo "For stable 6.1.1 book, please use jhalfs-0.2." echo "For stable 6.1.1 book, please use jhalfs-0.2."
exit 0 exit 0
;; ;;
alpha*) LFSVRS=alphabetical ;;
udev*) LFSVRS=udev_update ;; udev*) LFSVRS=udev_update ;;
* ) echo "$1 is an unsupported version at this time." ;; * ) echo "$1 is an unsupported version at this time." ;;
esac esac