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

corrections to hlfs group, build makefile

Browse source
This commit is contained in:
George Boudreau 2006-03-18 03:46:54 +00:00
parent 28fd555361
commit 7d018d160e
4 changed files with 18 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
CLFS/master.sh
View file

@ -287,7 +287,7 @@ cross_tools_Makefiles() { #
#
# If $vrs isn't empty, we've got a package...
#
[[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar"
[[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar" && echo -e '\ttrue' >> $MKFILE.tmp
#
wrt_run_as_lfs "${this_script}" "${file}"
#
@ -339,7 +339,7 @@ temptools_Makefiles() { #
# If $vrs isn't empty, we've got a package...
# Insert instructions for unpacking the package and to set the PKGDIR variable.
#
[[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar"
[[ "$vrs" != "" ]] && wrt_unpack "$name-$vrs.tar" && echo -e '\ttrue' >> $MKFILE.tmp
#
wrt_run_as_lfs "${this_script}" "${file}"
#
@ -488,8 +488,11 @@ chroot_Makefiles() { #
#
if [ "$vrs" != "" ] ; then
case $this_script in
*util-linux) wrt_unpack "$name-$vrs.tar" ;;
*) wrt_unpack2 "$name-$vrs.tar.*" ;;
*util-linux) wrt_unpack "$name-$vrs.tar"
echo -e '\ttrue' >> $MKFILE.tmp
;;
*) wrt_unpack2 "$name-$vrs.tar.*"
;;
esac
fi
#

10
HLFS/master.sh
View file

@ -176,6 +176,8 @@ chapter5_Makefiles() { # Bootstrap or temptools phase
*tcl* ) [[ "$TEST" = "0" ]] && continue; ;;
*expect* ) [[ "$TEST" = "0" ]] && continue; ;;
*dejagnu* ) [[ "$TEST" = "0" ]] && continue; ;;
# Nothing interestin in this script
*introduction* ) continue ;;
# Test if the stripping phase must be skipped
*stripping* ) [[ "$STRIP" = "0" ]] && continue ;;
# Select the appropriate library
@ -500,7 +502,7 @@ chapter7_Makefiles() { # Create a bootable system.. kernel, bootscripts..e
wrt_unpack2 "$FILE"
(
cat << EOF
echo "\$(MOUNT_PT)\$(SRC)/blfs-bootscripts-$vrs" > sources-dir
@echo "\$(MOUNT_PT)\$(SRC)/blfs-bootscripts-$vrs" > sources-dir
EOF
) >> $MKFILE.tmp
fi
@ -648,10 +650,10 @@ clean-chapter7:
restore-hlfs-env:
@\$(call echo_message, Building)
@if [ -f /home/lfs/.bashrc.XXX ]; then \\
mv -fv /home/lfs/.bashrc.XXX /home/hlfs/.bashrc; \\
mv -fv /home/lfs/.bashrc.XXX /home/lfs/.bashrc; \\
fi;
@if [ -f /home/hlfs/.bash_profile.XXX ]; then \\
mv -v /home/lfs/.bash_profile.XXX /home/hlfs/.bash_profile; \\
@if [ -f /home/lfs/.bash_profile.XXX ]; then \\
mv -v /home/lfs/.bash_profile.XXX /home/lfs/.bash_profile; \\
fi;
@chown lfs:lfs /home/lfs/.bash* && \\
touch \$@

5
common/common-functions
View file

@ -222,7 +222,7 @@ cat << EOF
@\$(call unpack,$FILE)
@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\
EOF
) >> $MKFILE.tmp
}
@ -237,7 +237,6 @@ cat << EOF
@\$(call unpack3,$FILE)
@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
EOF
) >> $MKFILE.tmp
@ -278,7 +277,7 @@ wrt_target_vars() { # Target vars for hlfs (cross-build method)
#----------------------------------#
(
cat << EOF
echo "export target=$(uname -m)-${TARGET}" >> envars && \\
@echo "export target=$(uname -m)-${TARGET}" >> envars && \\
echo "export ldso=/lib/${LOADER}" >> envars
EOF
) >> $MKFILE.tmp

6
common/config
View file

@ -13,7 +13,7 @@ BUILDDIR=/mnt/SourceFiles
#--- The local repository for packages/file
# Any downloaded files will be archived here
SRC_ARCHIVE=
SRC_ARCHIVE=/mnt/SourceFiles/Source_Warehouse
#--- Download the source packages 0(no)/1(yes)
HPKG=0
@ -26,10 +26,10 @@ RUNMAKE=0
# 1 = only chapter06 Glibc, GCC and Binutils testsuites
# 2 = all chapter06 testsuites
# 3 = all chapter05 and chapter06 testsuites
TEST=1
TEST=0
#--- Run the stripping phases 0(no)/1(yes)
STRIP=1
STRIP=0
#--- page definition for groff letter/A4
PAGE=letter