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

Removed unneeded true commands.

Browse source
This commit is contained in:
Manuel Canales Esparcia 2006-04-28 16:53:14 +00:00
parent d9a53e03ac
commit 15537d521d
4 changed files with 12 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
CLFS/master.sh
View file

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

10
HLFS/master.sh
View file

@ -235,14 +235,16 @@ chapter5_Makefiles() { # Bootstrap or temptools phase
case $this_script in case $this_script in
*binutils* ) # Dump the path to sources directory for later removal *binutils* ) # Dump the path to sources directory for later removal
echo -e '\techo "$(MOUNT_PT)$(SRC)/$$ROOT" >> sources-dir' >> $MKFILE.tmp (
cat << EOF
@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
echo "\$(MOUNT_PT)\$(SRC)/\$\$ROOT" >> sources-dir
EOF
) >> $MKFILE.tmp
;; ;;
*adjusting* ) # For the Adjusting phase we must to cd to the binutils-build directory. *adjusting* ) # For the Adjusting phase we must to cd to the binutils-build directory.
echo -e '\t@echo "export PKGDIR=$(MOUNT_PT)$(SRC)/binutils-build" > envars' >> $MKFILE.tmp echo -e '\t@echo "export PKGDIR=$(MOUNT_PT)$(SRC)/binutils-build" > envars' >> $MKFILE.tmp
;; ;;
* ) # Everything else, add a true statment so we don't confuse make
echo -e '\ttrue' >> $MKFILE.tmp
;;
esac esac
# 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

1
LFS/master.sh
View file

@ -112,7 +112,6 @@ chapter5_Makefiles() {
# Insert instructions for unpacking the package and to set the PKGDIR variable. # Insert instructions for unpacking the package and to set the PKGDIR variable.
wrt_unpack "$FILE" wrt_unpack "$FILE"
echo -e '\ttrue' >> $MKFILE.tmp
fi fi
# 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

2
common/common-functions
View file

@ -216,7 +216,7 @@ cat << EOF
@\$(call unpack,$FILE) @\$(call unpack,$FILE)
@ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\ @ROOT=\`head -n1 /tmp/unpacked | sed 's@^./@@;s@/.*@@'\` && \\
echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\ echo "export PKGDIR=\$(MOUNT_PT)\$(SRC)/\$\$ROOT" > envars && \\
chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT && \\ chown -R lfs \$(MOUNT_PT)\$(SRC)/\$\$ROOT
EOF EOF
) >> $MKFILE.tmp ) >> $MKFILE.tmp
} }