diff --git a/LFS/master.sh b/LFS/master.sh index ba556fd..db9385e 100755 --- a/LFS/master.sh +++ b/LFS/master.sh @@ -548,7 +548,7 @@ EOF ( cat << EOF @\$(call echo_CHROOT_request) - @ sudo mkdir $BUILDDIR$TRACKING_DIR + @ sudo mkdir -p $BUILDDIR$TRACKING_DIR @( sudo \$(CHROOT2) "cd \$(SCRIPT_ROOT) && make BLFS_TOOL") @touch \$@ diff --git a/README b/README index 5d0af11..2a2d995 100644 --- a/README +++ b/README @@ -8,9 +8,8 @@ $Id$ The usage of this script assumes you have read and are familiar with the book(s) and, therefore, the configuration variables found in config - files will have meaning to you. There are a number of command line switches - which, if used, will override the config file settings. - + files will have meaning to you. + NOTES:: *. The resulting Makefile takes considerable time to run to completion. Lay in a supply of caffeine beverages. diff --git a/README.HLFS b/README.HLFS index 6df4d28..a9076cf 100644 --- a/README.HLFS +++ b/README.HLFS @@ -14,5 +14,4 @@ $Id$ Automation failures: 1.Directory /dev and devices nodes /dev/null, /dev/console needed to be created in kernfs - 2.Linux-headers does not contain /net. 3.Remove the creation of /null and /console node from the devices script. \ No newline at end of file diff --git a/common/blfs-tool-deps/901-libxml2 b/common/blfs-tool-deps/901-libxml2 index 7fead12..e2c2222 100644 --- a/common/blfs-tool-deps/901-libxml2 +++ b/common/blfs-tool-deps/901-libxml2 @@ -3,7 +3,7 @@ # $Id$ set -e - +cd $PKGDIR ./configure --prefix=/usr make make install diff --git a/common/blfs-tool-deps/902-libxslt b/common/blfs-tool-deps/902-libxslt index 7fead12..e2c2222 100644 --- a/common/blfs-tool-deps/902-libxslt +++ b/common/blfs-tool-deps/902-libxslt @@ -3,7 +3,7 @@ # $Id$ set -e - +cd $PKGDIR ./configure --prefix=/usr make make install diff --git a/common/blfs-tool-deps/903-tidy b/common/blfs-tool-deps/903-tidy index 49fd979..158dd2b 100644 --- a/common/blfs-tool-deps/903-tidy +++ b/common/blfs-tool-deps/903-tidy @@ -3,6 +3,7 @@ # $Id$ set -e +cd $PKGDIR patch -Np1 -i ../tidy-051026-prevent_PRE_newlines-1.patch sh build/gnuauto/setup.sh diff --git a/common/blfs-tool-deps/904-unzip b/common/blfs-tool-deps/904-unzip index b11acca..28dcf1f 100644 --- a/common/blfs-tool-deps/904-unzip +++ b/common/blfs-tool-deps/904-unzip @@ -3,6 +3,7 @@ # $Id$ set -e +cd $PKGDIR make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 linux make prefix=/usr install diff --git a/common/blfs-tool-deps/907-gpm b/common/blfs-tool-deps/907-gpm index 67190be..cd977b5 100644 --- a/common/blfs-tool-deps/907-gpm +++ b/common/blfs-tool-deps/907-gpm @@ -3,6 +3,7 @@ # $Id$ set -e +cd $PKGDIR patch -Np1 -i ../gpm-1.20.1-segfault-1.patch patch -Np1 -i ../gpm-1.20.1-silent-1.patch diff --git a/common/blfs-tool-deps/908-links b/common/blfs-tool-deps/908-links index c6129b8..310e617 100644 --- a/common/blfs-tool-deps/908-links +++ b/common/blfs-tool-deps/908-links @@ -3,6 +3,7 @@ # $Id$ set -e +cd $PKGDIR ./configure --prefix=/usr make CFLAGS="-O2 -Wno-sign-compare -Wno-pointer-sign" diff --git a/common/blfs-tool-deps/909-sudo b/common/blfs-tool-deps/909-sudo index 96f276a..bfc84ff 100644 --- a/common/blfs-tool-deps/909-sudo +++ b/common/blfs-tool-deps/909-sudo @@ -3,6 +3,7 @@ # $Id$ set -e +cd $PKGDIR patch -Np1 -i ../sudo-1.6.8p12-envvar_fix-1.patch ./configure --prefix=/usr --libexecdir=/usr/lib \ diff --git a/common/blfs-tool-deps/910-wget b/common/blfs-tool-deps/910-wget index cd09409..357a6ca 100644 --- a/common/blfs-tool-deps/910-wget +++ b/common/blfs-tool-deps/910-wget @@ -3,6 +3,7 @@ # $Id$ set -e +cd $PKGDIR ./configure --prefix=/usr --sysconfdir=/etc make diff --git a/common/blfs-tool-deps/911-subversion b/common/blfs-tool-deps/911-subversion index 9892ae6..d02703f 100644 --- a/common/blfs-tool-deps/911-subversion +++ b/common/blfs-tool-deps/911-subversion @@ -3,6 +3,7 @@ # $Id$ set -e +cd $PKGDIR ./configure --prefix=/usr \ --without-berkeley-db \ diff --git a/common/common-functions b/common/common-functions index 0996b4d..fc36517 100644 --- a/common/common-functions +++ b/common/common-functions @@ -813,6 +813,7 @@ add_blfs_deps_urls() { # No easy way to extract it. if [[ "${DEP_TIDY}" = "y" ]] ; then echo "${TIDY_URL} ${BLFS_SERVER}tidy/${TIDY_PKG} ${TIDY_MD5}" >> urls.lst echo "${TIDY_PATCH_URL} ${BLFS_SERVER}tidy/${TIDY_PATCH} ${TIDY_PATCH_MD5}" >> urls.lst + echo "${TIDY_DOCS_URL} ${BLFS_SERVER}tidy/${TIDY_DOCS} ${TIDY_DOCS_MD5}" >> urls.lst fi if [[ "${DEP_UNZIP}" = "y" ]] ; then diff --git a/jhalfs b/jhalfs index dc2a101..0e24ab2 100755 --- a/jhalfs +++ b/jhalfs @@ -177,6 +177,10 @@ if [[ "${BLFS_TOOL}" = "y" ]] ; then TIDY_PATCH="tidy-051026-prevent_PRE_newlines-1.patch" TIDY_PATCH_URL="http://www.linuxfromscratch.org/patches/blfs/svn/${TIDY_PATCH}" TIDY_PATCH_MD5="82f67f7af58fc2c945b3410ae655cc1a" + # tidy docs + TIDY_DOCS="tidy_docs_051020.tgz" + TIDY_DOCS_URL="http://tidy.sourceforge.net/docs/${TIDY_DOCS}" + TIDY_DOCS_MD5="86de2f198e57399c063d2567b2a25628" # unzip UNZIP_PKG="unzip552.tar.gz" UNZIP_URL="ftp://ftp.info-zip.org/pub/infozip/src/${UNZIP_PKG}"