Update for new BUILD_DIR and SRC_DIR variables

diff --git a/stage0/pkg/cloog b/stage0/pkg/cloog
index 8e278d25c8a09a155973a9d27228cf54eeecaab4..4891a4ce4383781701ca6db2a2a499c50a900fed 100644 (file)
--- a/stage0/pkg/cloog
+++ b/stage0/pkg/cloog
@@ -3,5 +3,5 @@
 hvconfig_post()
 {
     # Apply a sed which prevents the attempted installation of an invalid file:
-    sed -i '/cmake/d' ${LFS_TMP}/${PACKAGE}-build/Makefile
+    sed -i '/cmake/d' ${BUILD_DIR}/Makefile
 }

diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc
index 489a3f3a6cac5037d18b01759b44e77d2cb5caab..fab1a514723f2f6a6531a8d5930c2dfe86fd93b2 100644 (file)
--- a/stage0/pkg/gcc
+++ b/stage0/pkg/gcc
@@ -75,7 +75,7 @@ hvconfig_pre()
             --enable-libstdcxx-time \
             --enable-threads=posix"
 
-        cd ${LFS_TMP}/${PACKAGE}
+        cd ${SRC_DIR}
 
         # Change the StartFile Spec to point to the correct library location:
         echo -en '\n' >> gcc/config/linux.h

diff --git a/stage0/pkg/glibc b/stage0/pkg/glibc
index 9bccb98d73302ba15f294c870083a40c0e0299e4..32acf8fcb8627213026a1bc0ffa696989d1a16d5 100644 (file)
--- a/stage0/pkg/glibc
+++ b/stage0/pkg/glibc
@@ -28,7 +28,7 @@ hvconfig_pre()
 # For Glibc to support NPTL:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 libc_cv_forced_unwind=yes
 libc_cv_c_cleanup=yes
 libc_cv_gnu89_inline=yes

diff --git a/stage0/pkg/kernel-headers b/stage0/pkg/kernel-headers
index 6a67dad32b24b4d61ede6b4ef07d524fec6b4a5c..7f64ff0aabfeb6e0ae8b7c28e2d53e86aa2ee1e9 100644 (file)
--- a/stage0/pkg/kernel-headers
+++ b/stage0/pkg/kernel-headers
@@ -2,9 +2,6 @@
 
 hvbuild()
 {
-    # Install headers
-    cd ${LFS_TMP}/${PACKAGE}
-
     local DESTDIR=${TOOLS_DIR}/include
     install -dv ${DESTDIR}
 

diff --git a/stage1/pkg/bash b/stage1/pkg/bash
index dc30252cbe7b781bc9913c87294bf013ee2935ae..dd9ae5325af84fbc95a4671244b42994f48a90b8 100644 (file)
--- a/stage1/pkg/bash
+++ b/stage1/pkg/bash
@@ -8,7 +8,7 @@
 # that can not run while cross-compiling or that do not run properly:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 ac_cv_func_mmap_fixed_mapped=yes
 ac_cv_func_strcoll_works=yes
 ac_cv_func_working_mktime=yes

diff --git a/stage1/pkg/bzip2 b/stage1/pkg/bzip2
index 56bd28c5255aadc47ba0be749e690533e3534daf..d81667a2f33fef6fc0a945d5fe4aa6121f005906 100644 (file)
--- a/stage1/pkg/bzip2
+++ b/stage1/pkg/bzip2
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     # Bzip2's default Makefile target automatically runs the testsuite as well.
     # Disable the tests since they won't work on a multi-architecture build:
     sed -e 's@^\(all:.*\) test@\1@g' -i Makefile

diff --git a/stage1/pkg/cloog b/stage1/pkg/cloog
index 8e278d25c8a09a155973a9d27228cf54eeecaab4..4891a4ce4383781701ca6db2a2a499c50a900fed 100644 (file)
--- a/stage1/pkg/cloog
+++ b/stage1/pkg/cloog
@@ -3,5 +3,5 @@
 hvconfig_post()
 {
     # Apply a sed which prevents the attempted installation of an invalid file:
-    sed -i '/cmake/d' ${LFS_TMP}/${PACKAGE}-build/Makefile
+    sed -i '/cmake/d' ${BUILD_DIR}/Makefile
 }

diff --git a/stage1/pkg/coreutils b/stage1/pkg/coreutils
index d8de2a75c64065cffc97a1436857c6414102f205..f04cb86f122f6e10f4211579f045696529773e03 100644 (file)
--- a/stage1/pkg/coreutils
+++ b/stage1/pkg/coreutils
@@ -2,7 +2,7 @@
 
 hvconfig_post()
 {
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${BUILD_DIR}
     sed -e 's/^#\(run_help2man.*dummy-man\)/\1/' \
         -e 's/^\(run_help2man.*PERL.*\)/#\1/' \
         -i Makefile
@@ -16,7 +16,7 @@ hvconfig_post()
 # config.cache  to correct this, and fix various cross-compiling issues:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 fu_cv_sys_stat_statfs2_bsize=yes
 gl_cv_func_working_mkstemp=yes
 EOF

diff --git a/stage1/pkg/findutils b/stage1/pkg/findutils
index 94cc2fcd9bb834d577a8dbd046affe59aed43c59..7a550fecac407aa27555371fba56204bdc807397 100644 (file)
--- a/stage1/pkg/findutils
+++ b/stage1/pkg/findutils
@@ -4,7 +4,7 @@
 # cross-compiling:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 gl_cv_func_wcwidth_works=yes
 ac_cv_func_fnmatch_gnu=yes
 EOF

diff --git a/stage1/pkg/flex b/stage1/pkg/flex
index 63c19d822b6132797172a5b491f0514f29df6c21..b8ce27801cdd79bcb97b289278452b3dba18c5b3 100644 (file)
--- a/stage1/pkg/flex
+++ b/stage1/pkg/flex
@@ -3,14 +3,14 @@
 hvconfig_pre()
 {
     # Make sure that Flex doesn't try to include headers from /usr/include.
-    sed -e "s/-I@includedir@//g" -i ${LFS_TMP}/${PACKAGE}/Makefile.in
+    sed -e "s/-I@includedir@//g" -i ${SRC_DIR}/Makefile.in
 }
 
 # When Cross Compiling the configure script does not determine the correct
 # values for the following, Set the values manually:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 ac_cv_func_malloc_0_nonnull=yes
 ac_cv_func_realloc_0_nonnull=yes
 EOF

diff --git a/stage1/pkg/gawk b/stage1/pkg/gawk
index a3184e1bdca5cd44d5e07e51026c49e615af9343..d9b556f228d1e8b3f931e8ea52b5f29946549e91 100644 (file)
--- a/stage1/pkg/gawk
+++ b/stage1/pkg/gawk
@@ -3,5 +3,5 @@
 hvconfig_pre()
 {
     sed -e 's/check-recursive all-recursive: check-for-shared-lib-support/check-recursive all-recursive:/' \
-        -i ${LFS_TMP}/${PACKAGE}/extension/Makefile.in
+        -i ${SRC_DIR}/extension/Makefile.in
 }

diff --git a/stage1/pkg/gcc b/stage1/pkg/gcc
index c6c4894f2d17116a36ae1f6bb4776d1cf59d38de..c499c06899d4677fa71ba688b0454f0bfb7b05d9 100644 (file)
--- a/stage1/pkg/gcc
+++ b/stage1/pkg/gcc
@@ -16,7 +16,7 @@ hvconfig_pre()
         --enable-libstdcxx-time \
         --enable-languages=c,c++"
 
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     # Change the StartFile Spec to point to the correct library location:
     echo -en '\n' >> gcc/config/linux.h
@@ -49,5 +49,5 @@ hvbuild()
 hvbuild_post()
 {
     # Install the libiberty header file that is needed by some packages:
-    cp -v ${LFS_TMP}/${PACKAGE}/include/libiberty.h ${TOOLS_DIR}/include
+    cp -v ${SRC_DIR}/include/libiberty.h ${TOOLS_DIR}/tools/include
 }

diff --git a/stage1/pkg/gettext b/stage1/pkg/gettext
index 07397585073e3a0e314f15d1fdcb3d9e5507625d..cf4b78d6f688673d226e632d136e6bae4676351e 100644 (file)
--- a/stage1/pkg/gettext
+++ b/stage1/pkg/gettext
@@ -5,7 +5,7 @@
 # errors because of this assumption:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 gl_cv_func_wcwidth_works=yes
 EOF
 }

diff --git a/stage1/pkg/grep b/stage1/pkg/grep
index 1d6dc4ff11ace3d51fd732febc33ea989e4603a3..2ef77c8ca2b457b5c1552e286e68c5869a5b33ab 100644 (file)
--- a/stage1/pkg/grep
+++ b/stage1/pkg/grep
@@ -4,7 +4,7 @@
 # for the following, Set the values manually:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 ac_cv_func_malloc_0_nonnull=yes
 ac_cv_func_realloc_0_nonnull=yes
 EOF

diff --git a/stage1/pkg/m4 b/stage1/pkg/m4
index 38f969cc0c78883a7f7ead5788ef4bd90fb89bb2..93d5abd54abc8eeea0f242045c2db0989dd09e94 100644 (file)
--- a/stage1/pkg/m4
+++ b/stage1/pkg/m4
@@ -3,7 +3,7 @@
 # Configure can not properly determine the results of the following tests:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 gl_cv_func_btowc_eof=yes
 gl_cv_func_mbrtowc_incomplete_state=yes
 gl_cv_func_mbrtowc_sanitycheck=yes

diff --git a/stage1/pkg/patch b/stage1/pkg/patch
index 274267155f173b07e0afc2320840a6bd9e12c686..ef6d3a145be3bdb5134079f75396caf086a8e3da 100644 (file)
--- a/stage1/pkg/patch
+++ b/stage1/pkg/patch
@@ -4,7 +4,7 @@
 # certain features:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 ac_cv_func_strnlen_working=yes
 EOF
 }

diff --git a/stage1/pkg/sysvinit b/stage1/pkg/sysvinit
index 874cc06c2f01274b679e5a246ca0e644052f45f0..7d50115f7efd49bcc40e72bbecac631dc4d8d3df 100644 (file)
--- a/stage1/pkg/sysvinit
+++ b/stage1/pkg/sysvinit
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     sed -e "s@/usr/lib@/tools/lib@" \
         -i src/Makefile
 

diff --git a/stage1/pkg/tar b/stage1/pkg/tar
index 5946e746567e9c0a0408ecdbc69a5d469b100748..d6206ea16d213b57e856a9e71309682394cbe2f4 100644 (file)
--- a/stage1/pkg/tar
+++ b/stage1/pkg/tar
@@ -3,7 +3,7 @@
 # Configure can not properly determine the results of a few tests.
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 gl_cv_func_wcwidth_works=yes
 gl_cv_func_btowc_eof=yes
 ac_cv_func_malloc_0_nonnull=yes

diff --git a/stage1/pkg/util-linux b/stage1/pkg/util-linux
index 5778f601713c009833d24920923f827fe30c7880..3b57fa905270c0bccbd74dd94b65239eded44f12 100644 (file)
--- a/stage1/pkg/util-linux
+++ b/stage1/pkg/util-linux
@@ -4,7 +4,7 @@
 # cross-compiling:
 hvconfig_cache()
 {
-cat > ${LFS_TMP}/${PACKAGE}-build/config.cache << EOF
+cat > ${BUILD_DIR}/config.cache << EOF
 scanf_cv_type_modifier=as
 EOF
 }

diff --git a/stage2/pkg/bzip2 b/stage2/pkg/bzip2
index dae769178f280f2937722a2640a781115b3fa6b5..f1568721a3ec569bf8e622958c8d57bbd7c75102 100644 (file)
--- a/stage2/pkg/bzip2
+++ b/stage2/pkg/bzip2
@@ -2,12 +2,14 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make -f Makefile-libbz2_so
     make clean
     make -j ${MAKEJOBS}
     make PREFIX=/usr install
+}
 
+hvbuild_post()
+{
     cp -fv bzip2-shared /bin/bzip2
     cp -afv libbz2.so* /lib
     ln -sfvT ../../lib/libbz2.so.1.0 /usr/lib/libbz2.so

diff --git a/stage2/pkg/cloog b/stage2/pkg/cloog
index 8e278d25c8a09a155973a9d27228cf54eeecaab4..4891a4ce4383781701ca6db2a2a499c50a900fed 100644 (file)
--- a/stage2/pkg/cloog
+++ b/stage2/pkg/cloog
@@ -3,5 +3,5 @@
 hvconfig_post()
 {
     # Apply a sed which prevents the attempted installation of an invalid file:
-    sed -i '/cmake/d' ${LFS_TMP}/${PACKAGE}-build/Makefile
+    sed -i '/cmake/d' ${BUILD_DIR}/Makefile
 }

diff --git a/stage2/pkg/dhcp b/stage2/pkg/dhcp
index a25fe74cd81da14f238dd0ea7f38a4436383131f..0c781764f37d4fbf7eda68f62a83be1c4dcfb63a 100644 (file)
--- a/stage2/pkg/dhcp
+++ b/stage2/pkg/dhcp
@@ -2,8 +2,8 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-    sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' server/Makefile.in
+    sed -i 's%\(^sbindir =\).*%\1 @prefix@@sbindir@%' \
+        ${SRC_DIR}/server/Makefile.in
 
     CONFIGURE_OPTS+=" \
         --localstatedir=/var \
@@ -16,7 +16,8 @@ hvconfig_pre()
 
 hvconfig_post()
 {
-    sed -i 's/-Werror//' {client,common,dst,omapip,relay,server,tests}/Makefile
+    sed -i 's/-Werror//' \
+        ${BUILD_DIR}/{client,common,dst,omapip,relay,server,tests}/Makefile
 }
 
 hvbuild_post()

diff --git a/stage2/pkg/diffutils b/stage2/pkg/diffutils
index 9c919b85c5a1e421390890d202498b0ed809ee31..312753567405fa7ae2bd5ce25b1e88c7b6109102 100644 (file)
--- a/stage2/pkg/diffutils
+++ b/stage2/pkg/diffutils
@@ -4,5 +4,5 @@ hvconfig_pre()
 {
     # A patch will cause the Diffutils build system to attempt to rebuild
     # the diff.1 man page using the unavailable program help2man:
-    touch ${LFS_TMP}/${PACKAGE}/man/diff.1
+    touch ${SRC_DIR}/man/diff.1
 }

diff --git a/stage2/pkg/firmware-b43-lpphy b/stage2/pkg/firmware-b43-lpphy
index fe05de29ef9cef4292184c772385e1b960271441..be56e27d1d4557f28dadbe7f7bc3f0526e9ab331 100644 (file)
--- a/stage2/pkg/firmware-b43-lpphy
+++ b/stage2/pkg/firmware-b43-lpphy
@@ -4,7 +4,7 @@ hvbuild()
 {
     local FIRMWARE_INSTALL_DIR="/lib/firmware"
 
-    cd ${LFS_TMP}/${PACKAGE}/linux
+    cd ${SRC_DIR}/linux
 
     b43-fwcutter -w ${FIRMWARE_INSTALL_DIR} wl_apsta.o
 }

diff --git a/stage2/pkg/gcc b/stage2/pkg/gcc
index efde04bdd8b5ee7f44e7078d864f26c232706855..f3b4e73a41545dd3a9d200a8e9220321c02a6b32 100644 (file)
--- a/stage2/pkg/gcc
+++ b/stage2/pkg/gcc
@@ -27,7 +27,7 @@ hvconfig_post()
 hvbuild_post()
 {
     # Install the libiberty header file that is needed by some packages:
-    cp -v ${LFS_TMP}/${PACKAGE}/include/libiberty.h /usr/include
+    cp -v ${SRC_DIR}/include/libiberty.h /usr/include
 
     ln -svf ../usr/bin/cpp /lib
     ln -svf gcc /usr/bin/cc

diff --git a/stage2/pkg/glibc b/stage2/pkg/glibc
index b98c28236193a5137a3db1b57a9dd9227d08c49f..2b51e32356ffe22ddbcef4c5af83f1fe9c36f121 100644 (file)
--- a/stage2/pkg/glibc
+++ b/stage2/pkg/glibc
@@ -11,8 +11,6 @@ hvconfig_pre()
         --enable-obsolete-rpc \
         --libexecdir=/usr/lib/glibc"
 
-    cd ${LFS_TMP}/${PACKAGE}
-
     # When running make install, a script called test-installation.pl performs a
     # small sanity test on our newly installed Glibc. However, because our
     # toolchain still points to the /tools directory, the sanity test would be
@@ -21,15 +19,13 @@ hvconfig_pre()
     LINKER=$(readelf -l /tools/bin/bash | \
         sed -n 's@.*interpret.*/tools\(.*\)]$@\1@p')
     sed -i "s|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=${LINKER} -o|" \
-        scripts/test-installation.pl
+        ${SRC_DIR}/scripts/test-installation.pl
     unset LINKER
 
-    cd ${LFS_TMP}/${PACKAGE}-build
-
     case "${HVL_TARGET}" in
         "x86_64")
             # Tell glibc to install its libraries into /lib:
-            echo "slibdir=/lib" >> configparms
+            echo "slibdir=/lib" >> ${BUILD_DIR}/configparms
             CONFIGURE_OPTS+=" --libdir=/usr/lib"
            ;;
     esac
@@ -73,7 +69,7 @@ hvbuild()
     esac
 
     # Install the configuration file and runtime directory for nscd:
-    cp -v ${LFS_TMP}/${PACKAGE}/nscd/nscd.conf /etc/nscd.conf
+    cp -v ${SRC_DIR}/nscd/nscd.conf /etc/nscd.conf
     mkdir -pv /var/cache/nscd
 
     # The following instructions, instead of the install-locales target

diff --git a/stage2/pkg/gptfdisk b/stage2/pkg/gptfdisk
index 20556f1ebda0690cff24e388d0a386ca21ddcf85..1a1c78d5c2fe1e7d38c8ea02de70d57741e11ecd 100644 (file)
--- a/stage2/pkg/gptfdisk
+++ b/stage2/pkg/gptfdisk
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make gdisk
     install gdisk /usr/bin
 }

diff --git a/stage2/pkg/icu b/stage2/pkg/icu
index de2fa60e2a75600e5e9e8cfa2a012898d90280dc..dd4a78fa1853b0e7b8c07fae88dc18492eebf44d 100644 (file)
--- a/stage2/pkg/icu
+++ b/stage2/pkg/icu
@@ -2,7 +2,7 @@
 
 hvconfig()
 {
-    cd ${LFS_TMP}/${PACKAGE}/source
+    cd ${SRC_DIR}/source
 
     ./configure ${CONFIGURE_OPTS}
 }

diff --git a/stage2/pkg/iproute2 b/stage2/pkg/iproute2
index 7c937b32d73fdadd52834dff03883fd1b2d7178e..173e5d80d5a2cb1d2ed6dd0cac59ee35b9d28395 100644 (file)
--- a/stage2/pkg/iproute2
+++ b/stage2/pkg/iproute2
@@ -5,13 +5,11 @@ hvconfig_pre()
     # The arpd binary included in this package is dependent on Berkeley DB.
     # Because arpd is not a very common requirement on a base Linux system,
     # remove the dependency on Berkeley DB by applying the sed command below
-    sed -i '/^TARGETS/s@arpd@@g' ${LFS_TMP}/${PACKAGE}/misc/Makefile
+    sed -i '/^TARGETS/s@arpd@@g' ${SRC_DIR}/misc/Makefile
 }
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     # DESTDIR=
     # This ensures that the IPRoute2 binaries will install into the correct
     # directory. By default, DESTDIR is set to /usr.

diff --git a/stage2/pkg/kernel b/stage2/pkg/kernel
index d2e8fe170c58def71d914e1cdc32c7028013abc0..403377b5d0186a903764f53df4f63e1f96b5ae5b 100644 (file)
--- a/stage2/pkg/kernel
+++ b/stage2/pkg/kernel
@@ -3,7 +3,7 @@
 hvbuild()
 {
     rm -rf /usr/src/${PACKAGE}
-    mv ${LFS_TMP}/${PACKAGE} /usr/src
+    mv ${SRC_DIR} /usr/src
 
     cd /usr/src/${PACKAGE}
 

diff --git a/stage2/pkg/kernel-headers b/stage2/pkg/kernel-headers
index 35810b3c3fe812cca2878da9f7b806ba63e32ce6..95caa3080a0fcf8d2be1756762cdb732b75c7fd6 100644 (file)
--- a/stage2/pkg/kernel-headers
+++ b/stage2/pkg/kernel-headers
@@ -2,9 +2,6 @@
 
 hvbuild()
 {
-    # Install headers
-    cd ${LFS_TMP}/${PACKAGE}
-
     local DESTDIR=/usr/include
 
     ${HVMAKE} mrproper

diff --git a/stage2/pkg/perl b/stage2/pkg/perl
index b4530e25d5a4ebc598aec28acc7efd7141982550..d1f11cf6a82a959bcf468321542fe51df95d6321 100644 (file)
--- a/stage2/pkg/perl
+++ b/stage2/pkg/perl
@@ -8,7 +8,7 @@ hvconfig_pre()
     sed -e '/^BUILD_ZLIB/s/True/False/' \
         -e '/^INCLUDE/s,\./zlib-src,/usr/include,' \
         -e '/^LIB/s,\./zlib-src,/usr/lib,' \
-        -i ${LFS_TMP}/${PACKAGE}/cpan/Compress-Raw-Zlib/config.in
+        -i ${SRC_DIR}/cpan/Compress-Raw-Zlib/config.in
 
     CONFIGURE_OPTS="\
         --prefix=/usr \
@@ -22,6 +22,6 @@ hvconfig_pre()
 
 hvconfig()
 {
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
     ./configure.gnu ${CONFIGURE_OPTS}
 }

diff --git a/stage2/pkg/procps b/stage2/pkg/procps
index fcd1afc72e55495c7eb20cdc7dee837863045c59..00ed609a1a1c3a8212a4a1daa6dff8b19315220f 100644 (file)
--- a/stage2/pkg/procps
+++ b/stage2/pkg/procps
@@ -3,5 +3,5 @@
 hvconfig_pre()
 {
     # The following fixes an issue with Make 3.82:
-    sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' ${LFS_TMP}/${PACKAGE}/Makefile
+    sed -i -r '/^-include/s/\*(.*)/proc\1 ps\1/' ${SRC_DIR}/Makefile
 }

diff --git a/stage2/pkg/readline b/stage2/pkg/readline
index 452be2f8c6417e59364d8ba75c379f8ed9d5a2c5..da4b0af2d8872d8d437e4e1590995a1112012d9e 100644 (file)
--- a/stage2/pkg/readline
+++ b/stage2/pkg/readline
@@ -4,14 +4,12 @@ hvconfig_pre()
 {
     CONFIGURE_OPTS+=" --libdir=/lib"
 
-    cd ${LFS_TMP}/${PACKAGE}
-
     # Reinstalling Readline will cause the old libraries to be moved to
     # <libraryname>.old. While this is normally not a problem, in some
     # cases it can trigger a linking bug in ldconfig. This can be
     # avoided by issuing the following two seds:
-    sed -i '/MV.*old/d' Makefile.in
-    sed -i '/{OLDSUFF}/c:' support/shlib-install
+    sed -i '/MV.*old/d' ${SRC_DIR}/Makefile.in
+    sed -i '/{OLDSUFF}/c:' ${SRC_DIR}/support/shlib-install
 }
 
 hvbuild()

diff --git a/stage2/pkg/shadow b/stage2/pkg/shadow
index 11d9ba9bd59574bfc69095ac731bf0f26af3f6f1..fb083b125b6a1248e495af07fe815eab86396dfc 100644 (file)
--- a/stage2/pkg/shadow
+++ b/stage2/pkg/shadow
@@ -4,7 +4,7 @@ hvconfig_pre()
 {
     CONFIGURE_OPTS+=" --without-selinux"
 
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     # Disable the installation of the groups program and its man page, as
     # Coreutils provides a better version.

diff --git a/stage2/pkg/sysklogd b/stage2/pkg/sysklogd
index dcd22d9aa72b4332bb1a94ceb3fa0afb9dcba5ee..ab133ede1b71ce5eefe1af131d052aa26c917d40 100644 (file)
--- a/stage2/pkg/sysklogd
+++ b/stage2/pkg/sysklogd
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     make
     make BINDIR=/sbin install
 }

diff --git a/stage2/pkg/tzdata b/stage2/pkg/tzdata
index 7785f23c944b57e34029a970204894025e84e70f..bed72b531f16ccaf635d8bc1966728bf64668348 100644 (file)
--- a/stage2/pkg/tzdata
+++ b/stage2/pkg/tzdata
@@ -2,10 +2,10 @@
 
 hvbuild()
 {
-    mkdir -pv ${LFS_TMP}/${PACKAGE}
-    decompress_package ${TZDATA} ${LFS_TMP}/${PACKAGE}
+    mkdir -pv ${SRC_DIR}
+    decompress_package ${TZDATA} ${SRC_DIR}
 
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     ZONEINFO=/usr/share/zoneinfo
 

diff --git a/stage2/pkg/wireless-tools b/stage2/pkg/wireless-tools
index 19ad589017921f99c4e2e8281c047ebf5f2487f0..9747dbe72fd6e28808163840c0fe1678fb962a7a 100644 (file)
--- a/stage2/pkg/wireless-tools
+++ b/stage2/pkg/wireless-tools
@@ -3,7 +3,7 @@
 hvconfig_pre()
 {
     sed -e "s!^\(INSTALL_DIR=\).*!\1/sbin!" \
-        -e "s!^\(INSTALL_LIB=\).*!\1/lib!" -i ${LFS_TMP}/${PACKAGE}/Makefile
+        -e "s!^\(INSTALL_LIB=\).*!\1/lib!" -i ${SRC_DIR}/Makefile
 }
 
 hvbuild_post()

diff --git a/stage2/pkg/wpa_supplicant b/stage2/pkg/wpa_supplicant
index 331324914a5d3e7e5a72222bdaed2c673fa47f66..2419f3496118194e69da8e1d5071b1daa9936fd9 100644 (file)
--- a/stage2/pkg/wpa_supplicant
+++ b/stage2/pkg/wpa_supplicant
@@ -2,7 +2,7 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}/wpa_supplicant
+    cd ${SRC_DIR}/wpa_supplicant
 
     cat > .config << "EOF"
 CONFIG_BACKEND=file

diff --git a/stage3/hv-install-1 b/stage3/hv-install-1
index d93620027dec2b42819145b213a0fce428d98474..376956545f7b9021aea98a9b7f77ba0514a180a5 100755 (executable)
--- a/stage3/hv-install-1
+++ b/stage3/hv-install-1
@@ -172,7 +172,7 @@ else
     ipkg ${MSMTP}
 fi
 
-ipkg ${PTH} "\
+ipkg -m acnb ${PTH} "\
     --disable-static \
     --mandir=/usr/share/man"
 ipkg ${LIBASSUAN}

diff --git a/stage3/pkg/OpenSP b/stage3/pkg/OpenSP
index 8f899f2007b94eba92f0c49fa841aa1dfb9f82cf..e4d49b38efd25ab34fadea91b3b03ab3884f083e 100644 (file)
--- a/stage3/pkg/OpenSP
+++ b/stage3/pkg/OpenSP
@@ -20,7 +20,7 @@ hvconfig_pre()
         fi
     fi
 
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
     sed -i 's:32,:253,:' lib/Syntax.cxx
     sed -i 's:LITLEN          240 :LITLEN          8092:' \
         unicode/{gensyntax.pl,unicode.syn}

diff --git a/stage3/pkg/SGMLSpm b/stage3/pkg/SGMLSpm
index d03e850f5685f22098538659ece2e4fd04e28aa1..49c9a3c328335f0dfd90243ff950aba4a98056b8 100644 (file)
--- a/stage3/pkg/SGMLSpm
+++ b/stage3/pkg/SGMLSpm
@@ -2,9 +2,8 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     sed -i -e "s@/usr/local/bin@/usr/bin@" \
         -e "s@/usr/local/lib/perl5@/usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL})@" \
         -e "s@/usr/local/lib/www/docs@/usr/share/doc/perl5@" \
-        Makefile
+        ${SRC_DIR}/Makefile
 }

diff --git a/stage3/pkg/ack b/stage3/pkg/ack
index a421df9d160869be475b7c48e6f3c7d971ccf643..20aafc33b33fd3eaf140718193f8648925dcc733 100644 (file)
--- a/stage3/pkg/ack
+++ b/stage3/pkg/ack
@@ -2,6 +2,6 @@
 
 hvbuild()
 {
-    install -v -m 755 ${LFS_TMP}/${PACKAGE}/ack /usr/bin
+    install -v -m 755 ${SRC_DIR}/ack /usr/bin
     string_add  "alias ack='ack --pager=\"less -RFX\"'" /etc/bashrc
 }

diff --git a/stage3/pkg/bash-completion b/stage3/pkg/bash-completion
index 3512b5dd9285e598ebe184defecefd7bed4bf824..19dd3ae34ab2fec05b3bdac26dab535339cb1bde 100644 (file)
--- a/stage3/pkg/bash-completion
+++ b/stage3/pkg/bash-completion
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     install -m644 bash_completion.sh /etc/profile.d/70-bash_completion.sh
     cp -v bash_completion /etc/
     install -d /etc/bash_completion.d

diff --git a/stage3/pkg/ckermit b/stage3/pkg/ckermit
index 92d9276ccc4f7b174b5e90547a97dc570797e8d0..efd2397d847726daa7e80eb07892f5bb0c326f6f 100644 (file)
--- a/stage3/pkg/ckermit
+++ b/stage3/pkg/ckermit
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make linux
     make prefix=/usr install
 }

diff --git a/stage3/pkg/cmake b/stage3/pkg/cmake
index 5a8da4904236e16625ccff35c3be914332b6ac30..fe8b64b0bc2f1b514d54ef98dd328e7eca6a6a44 100644 (file)
--- a/stage3/pkg/cmake
+++ b/stage3/pkg/cmake
@@ -2,7 +2,7 @@
 
 hvconfig()
 {
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     ./bootstrap --prefix=/usr \
         --system-libs \

diff --git a/stage3/pkg/colordiff b/stage3/pkg/colordiff
index 78c8393c2662a77d0423bdaa92c6408fe933d53a..3a5231c60d908cf1e56396247bb0d907685a46ed 100644 (file)
--- a/stage3/pkg/colordiff
+++ b/stage3/pkg/colordiff
@@ -2,8 +2,10 @@
 
 hvbuild()
 {
-    PREFIX=/usr make -C ${LFS_TMP}/${PACKAGE} install
+    make PREFIX=/usr install
+}
 
+hvbuild_post()
+{
     install -v -m644 ${SCRDIR}/misc/colordiffrc /etc
 }
-

diff --git a/stage3/pkg/cpio b/stage3/pkg/cpio
index 17924784f1fc2e8a597fee626a5cd1e572721f4d..e3d6210e8bba5615d25c5d306e09e122acd498d2 100644 (file)
--- a/stage3/pkg/cpio
+++ b/stage3/pkg/cpio
@@ -2,7 +2,7 @@
 
 hvconfig_pre()
 {
-    sed -i -e '/gets is a/d' ${LFS_TMP}/${PACKAGE}/gnu/stdio.in.h
+    sed -i -e '/gets is a/d' ${SRC_DIR}/gnu/stdio.in.h
 }
 
 hvbuild_post()

diff --git a/stage3/pkg/cyrus-sasl b/stage3/pkg/cyrus-sasl
index 0f6f5bf11686d6316874352988d02d503b797ed6..d1df97d17d8bf802d11677016b9ee61d2494581c 100644 (file)
--- a/stage3/pkg/cyrus-sasl
+++ b/stage3/pkg/cyrus-sasl
@@ -3,7 +3,7 @@
 hvconfig_pre()
 {
     sed -i 's/#elif WITH_DES/#elif defined(WITH_DES)/' \
-        ${LFS_TMP}/${PACKAGE}/plugins/digestmd5.c
+        ${SRC_DIR}/plugins/digestmd5.c
 
     CONFIGURE_OPTS+=" \
         --with-dbpath=/var/lib/sasl/sasldb2 \
@@ -20,8 +20,6 @@ hvconfig_pre()
 hvbuild_post()
 {
     if [ "x${HVLABEL}" = "x${PACKAGE}-pass1" ]; then
-        cd ${LFS_TMP}/${PACKAGE}
-
         install -v -m700 -d /var/lib/sasl
         install -v -m711 -d /var/run/saslauthd
 

diff --git a/stage3/pkg/ddclient b/stage3/pkg/ddclient
index 2a3d29d1eb6062d252aedd17ef1c6bfc31efcca7..2d210d57efec49ed187c4e1f7efdd046addabcc1 100644 (file)
--- a/stage3/pkg/ddclient
+++ b/stage3/pkg/ddclient
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     install ddclient /usr/sbin
     mkdir -p /etc/ddclient
     cp sample-etc_ddclient.conf /etc/ddclient/ddclient.conf

diff --git a/stage3/pkg/docbook-dsssl b/stage3/pkg/docbook-dsssl
index 5382ad235de9ccd947aab8ec287fce545c1ab85e..4d283fd9071cf997702524e027f14fd18c5abfde 100644 (file)
--- a/stage3/pkg/docbook-dsssl
+++ b/stage3/pkg/docbook-dsssl
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     install -v -m755 bin/collateindex.pl /usr/bin
     install -v -m644 bin/collateindex.pl.1 /usr/share/man/man1
     install -v -d -m755 \

diff --git a/stage3/pkg/docbook-utils b/stage3/pkg/docbook-utils
index f822667651b4131473706c961af0b1d2a420b656..158bcfb7721391c855c25e004e2d4c9c7da7c6ec 100644 (file)
--- a/stage3/pkg/docbook-utils
+++ b/stage3/pkg/docbook-utils
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-    sed -i 's:/html::' doc/HTML/Makefile.in
+    sed -i 's:/html::' ${SRC_DIR}/doc/HTML/Makefile.in
 }
 
 hvbuild_post()

diff --git a/stage3/pkg/docbook-xml b/stage3/pkg/docbook-xml
index 7469544640dd80102fa01f9d8995c758f1352a66..d415672afb5f7de213cdcce2af0a69d9d4960a5d 100644 (file)
--- a/stage3/pkg/docbook-xml
+++ b/stage3/pkg/docbook-xml
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     install -v -d -m755 /usr/share/xml/docbook/xml-dtd-${DOCBOOK_XML_VER}
     install -v -d -m755 /etc/xml
     chown -R root:root .

diff --git a/stage3/pkg/docbook-xsl b/stage3/pkg/docbook-xsl
index da1341b715aefa0860b34465fd81b87b23192f29..e409f41f03f62d82fb9ec8db5595b0a6728bd6e9 100644 (file)
--- a/stage3/pkg/docbook-xsl
+++ b/stage3/pkg/docbook-xsl
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     install -v -m 755 -d \
         /usr/share/xml/docbook/xsl-stylesheets-${DOCBOOK_XSL_VER}
     chown -R root:root .

diff --git a/stage3/pkg/dosfstools b/stage3/pkg/dosfstools
index c9e35f25f80a8b737f4fc026aefabaeefd2f1f47..5db98dc3230e01ab7372efbfdd5e3b30dd52c4ba 100644 (file)
--- a/stage3/pkg/dosfstools
+++ b/stage3/pkg/dosfstools
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make
     make PREFIX=/usr SBINDIR=/sbin install
 }

diff --git a/stage3/pkg/ladspa b/stage3/pkg/ladspa
index 9ec50bcbe13a78c14f20686a6f71c5f819eaa6bb..2111b1dd92ed03602cd1aee856f2417e0e5e2ce5 100644 (file)
--- a/stage3/pkg/ladspa
+++ b/stage3/pkg/ladspa
@@ -2,5 +2,5 @@
 
 hvbuild()
 {
-    install -m 644 ${LFS_TMP}/${PACKAGE}/src/ladspa.h /usr/include
+    install -m 644 ${SRC_DIR}/src/ladspa.h /usr/include
 }

diff --git a/stage3/pkg/mysql b/stage3/pkg/mysql
index 75d4a7ea50c7a448a3b16cb68388fccb5686f4d8..deeecd9f0def8650e062b8cd338558b6d1b87adf 100644 (file)
--- a/stage3/pkg/mysql
+++ b/stage3/pkg/mysql
@@ -8,7 +8,7 @@ hvconfig_pre()
 
 hvconfig()
 {
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     mkdir build
     cd build
@@ -39,6 +39,8 @@ hvconfig()
 
 hvbuild()
 {
+    cd ${SRC_DIR}/build
+
     make
 
     SEGMENTS="Client Server IniFiles ManPages SharedLibraries"

diff --git a/stage3/pkg/openssl b/stage3/pkg/openssl
index 863696e4c1c3e5ce7578d52145b1028078d34a2a..b38e9b076767fb9a89319adaca3f0ad1502cd128 100644 (file)
--- a/stage3/pkg/openssl
+++ b/stage3/pkg/openssl
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     MAKEDEPPROG=gcc CC=gcc ./config \
         --prefix=/usr \
         --openssldir=/etc/ssl \

diff --git a/stage3/pkg/pciutils b/stage3/pkg/pciutils
index 429b0dcf9726b7dd2991af96bc05260f221e5ff5..9bddc02090bcdf40c5a6e914b877571bc45ec862 100644 (file)
--- a/stage3/pkg/pciutils
+++ b/stage3/pkg/pciutils
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     # ZLIB=no: Prevents compression of the pci.ids file.
     make PREFIX=/usr             \
         SHAREDIR=/usr/share/misc \

diff --git a/stage3/pkg/rpcbind b/stage3/pkg/rpcbind
index 1c6c0bbf267050f3c2a18278ecefa02d81ef397b..6faf94b77bdb8401b278e37b2178e030a148a833 100644 (file)
--- a/stage3/pkg/rpcbind
+++ b/stage3/pkg/rpcbind
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
+    cd ${SRC_DIR}
     sed -i '/servname/s:rpcbind:sunrpc:' src/rpcbind.c
     sed -i '/error = getaddrinfo/s:rpcbind:sunrpc:' src/rpcinfo.c
 }

diff --git a/stage3/pkg/sendmail b/stage3/pkg/sendmail
index 12fb7f984fc43ed033643d424fb94c7f2563c8b8..85fa3d004b056a72802e05010bd5cf1a8bfd74b8 100644 (file)
--- a/stage3/pkg/sendmail
+++ b/stage3/pkg/sendmail
@@ -9,7 +9,6 @@ hvbuild()
     mkdir -p /var/spool/mqueue
     mkdir -p /etc/mail
 
-    cd ${LFS_TMP}/${PACKAGE}
     cat > devtools/Site/site.config.m4 << "EOF"
 define(`confMANGRP',`root')
 define(`confMANOWN',`root')
@@ -143,14 +142,14 @@ Connect:192.168.0 RELAY
 EOF
     
         cd /etc/mail
-        cp -R ${LFS_TMP}/${PACKAGE}/cf/* .
+        cp -R ${SRC_DIR}/cf/* .
 
         cat > /etc/mail/submit.mc << "EOF"
 dnl
 include(`./m4/cf.m4')dnl
         dnl
         EOF
-    cat ${LFS_TMP}/${PACKAGE}/cf/cf/submit.mc >> /etc/mail/submit.mc
+    cat ${SRC_DIR}/cf/cf/submit.mc >> /etc/mail/submit.mc
     sed -i "s!\(^FEATURE.*\)127.0.0.1\(.*\)!\1${MACHINE_NAME}\.${DOMAIN}\2!" /etc/mail/submit.mc
     newaliases -v
     

diff --git a/stage3/pkg/sgml-common b/stage3/pkg/sgml-common
index 4ab4dd69c8620e499cd4d69865dcad75abb64728..663e6e31526a9a48ae85afccac99840afc0a539c 100644 (file)
--- a/stage3/pkg/sgml-common
+++ b/stage3/pkg/sgml-common
@@ -4,8 +4,8 @@ hvconfig_pre()
 {
     # This package does not distribute some autoconf files, and symlinks them
     # to /usr/share/automake.
-    cd ${LFS_TMP}/${PACKAGE}
-    autoreconf -f -i
+    cd ${SRC_DIR}
+    autoreconf -f -vi
 
     CAT1="/etc/sgml/sgml-ent.cat"
     CAT2="/usr/share/sgml/sgml-iso-entities-8879.1986/catalog"

diff --git a/stage3/pkg/sgml-dtd3 b/stage3/pkg/sgml-dtd3
index 5bdaad24495c5e5d17cb08fa40b8285fd74a2c06..cb92c333b2823addbc06251ab93606e31534bf40 100644 (file)
--- a/stage3/pkg/sgml-dtd3
+++ b/stage3/pkg/sgml-dtd3
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     sed -i -e '/ISO 8879/d' \
         -e 's|DTDDECL "-//OASIS//DTD DocBook V3.1//EN"|SGMLDECL|g' \
         docbook.cat

diff --git a/stage3/pkg/sgml-dtd4 b/stage3/pkg/sgml-dtd4
index cd9c715fa1d87f80d3fbdd5fa8d8a3e173060e42..7114ba31dec0a4b37b99a42f5ab7d57499ec4ba4 100644 (file)
--- a/stage3/pkg/sgml-dtd4
+++ b/stage3/pkg/sgml-dtd4
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     sed -i -e '/ISO 8879/d' \
         -e '/gml/d' docbook.cat
     install -v -d /usr/share/sgml/docbook/sgml-dtd-${SGML_DTD4_VER}

diff --git a/stage3/pkg/shadow b/stage3/pkg/shadow
index c544701f4310a584ed800495f9c0416debb29c38..67459314c7dfb30fc965c5609ac236055c3013b6 100644 (file)
--- a/stage3/pkg/shadow
+++ b/stage3/pkg/shadow
@@ -5,7 +5,7 @@ hvconfig_pre()
     CONFIGURE_OPTS+=" \
         --without-selinux"
 
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     # Disable the installation of the groups program and its man page, as
     # Coreutils provides a better version.

diff --git a/stage3/pkg/tcp_wrappers b/stage3/pkg/tcp_wrappers
index 70ff65f1e21c25d243ff8c46aae6315f93eeed2d..0616a1dfb0a73e33434684dab31c8e2dd9fdc517 100644 (file)
--- a/stage3/pkg/tcp_wrappers
+++ b/stage3/pkg/tcp_wrappers
@@ -2,8 +2,7 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-    sed -i -e "s,^extern char \*malloc();,/* & */," scaffold.c
+    sed -i -e "s,^extern char \*malloc();,/* & */," ${SRC_DIR}/scaffold.c
 }
 
 hvbuild()

diff --git a/stage3/pkg/unrar b/stage3/pkg/unrar
index 6cdfed2ff9f74a3f2b72e7d626c0a8e386c46c8e..70b58b0989f858a52850edba09b7eeb346e0251f 100644 (file)
--- a/stage3/pkg/unrar
+++ b/stage3/pkg/unrar
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make -f makefile
     install -v -m755 unrar /usr/bin
 }

diff --git a/stage3/pkg/unzip b/stage3/pkg/unzip
index d287e08a9e2e5f0ff382936d004dcf044feda236..4e4273db9c279c129bc2704cf40dfa28f6493297 100644 (file)
--- a/stage3/pkg/unzip
+++ b/stage3/pkg/unzip
@@ -10,7 +10,6 @@ hvbuild()
             UNZIP_TARGET=linux
     esac
 
-    cd ${LFS_TMP}/${PACKAGE}
     make -f unix/Makefile LOCAL_UNZIP=-D_FILE_OFFSET_BITS=64 ${UNZIP_TARGET}
     make prefix=/usr install
 }

diff --git a/stage3/pkg/xmltoman b/stage3/pkg/xmltoman
index be7ba06fe7e4b9e29e9cddbce696ca54a15c192d..94103e11150e83477ed2b7bcc413d51326b42ff3 100644 (file)
--- a/stage3/pkg/xmltoman
+++ b/stage3/pkg/xmltoman
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make PREFIX=/usr
-    make install PREFIX=/usr
+    make PREFIX=/usr install
 }

diff --git a/stage3/pkg/zip b/stage3/pkg/zip
index 8cc76960414ed81ab6d902e1910bda8668bb2b24..2fbd8dad132fb13e5320ecc3001cf4e35c650843 100644 (file)
--- a/stage3/pkg/zip
+++ b/stage3/pkg/zip
@@ -2,9 +2,8 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     sed -i -e 's@$(INSTALL) man/zip.1@$(INSTALL_PROGRAM) man/zip.1@' \
-        unix/Makefile
+        ${SRC_DIR}/unix/Makefile
 }
 
 hvbuild()

diff --git a/stage4/pkg/MesaLib b/stage4/pkg/MesaLib
index de43784a1f3f0c759aff9e513aa0ffc7d5856365..38b5af0b4beea8aae88f7059a939f958d27ed456 100644 (file)
--- a/stage4/pkg/MesaLib
+++ b/stage4/pkg/MesaLib
@@ -32,5 +32,5 @@ hvconfig_pre()
 
     # Mesa builds with debugging symbols. Remove the -g switch from both CFLAGS
     # and CXXFLAGS with this command:
-    sed 's@FLAGS=\"-g@FLAGS=\"@' -i ${LFS_TMP}/${PACKAGE}/configure
+    sed 's@FLAGS=\"-g@FLAGS=\"@' -i ${SRC_DIR}/configure
 }

diff --git a/stage4/pkg/xterm b/stage4/pkg/xterm
index 32e85e4df38c4b59985d2fbe3d35cce47873af85..067eab5908608ae7a9356fd2ecd62963cfd421b6 100644 (file)
--- a/stage4/pkg/xterm
+++ b/stage4/pkg/xterm
@@ -2,8 +2,8 @@
 
 hvconfig_pre()
 {
-    sed -i '/v0/,+1s/new:/new:kb=^?:/' ${LFS_TMP}/${PACKAGE}/termcap
-    echo -e '\tkbs=\\177,' >> ${LFS_TMP}/${PACKAGE}/terminfo
+    sed -i '/v0/,+1s/new:/new:kb=^?:/' ${SRC_DIR}/termcap
+    echo -e '\tkbs=\\177,' >> ${SRC_DIR}/terminfo
 
     export TERMINFO=/usr/share/terminfo
     CONFIGURE_OPTS+=" \

diff --git a/stage5/pkg/FontForge b/stage5/pkg/FontForge
index 49caba8286c17d1910c7817c694106f29cf5db3e..e10067bb0482bf9c334368ad04bc79f96a6c690d 100644 (file)
--- a/stage5/pkg/FontForge
+++ b/stage5/pkg/FontForge
@@ -2,7 +2,7 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     rm -rf libltdl
     ./bootstrap

diff --git a/stage5/pkg/apache b/stage5/pkg/apache
index 4e8c1dc677e25a98ffb80e8de392eb4b713970c5..99b7de6dca4f453952be5987f13dd45773de244a 100644 (file)
--- a/stage5/pkg/apache
+++ b/stage5/pkg/apache
@@ -4,9 +4,7 @@ CONFDIR=/etc/httpd
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
-    cat >> config.layout << "EOF" &&
+    cat >> ${SRC_DIR}/config.layout << "EOF" &&
 # BLFS FHS layout
 <Layout FHS>
     prefix:          /usr

diff --git a/stage5/pkg/boost b/stage5/pkg/boost
index b7351bb88a4e89c39fe3cb0ea33a623e241c4478..4172c0d1a9c9b6bdf010388cf7bccb4521ac086b 100644 (file)
--- a/stage5/pkg/boost
+++ b/stage5/pkg/boost
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     ./bootstrap.sh --prefix=/usr
     ./b2 stage threading=multi link=shared
     ./b2 install threading=multi link=shared

diff --git a/stage5/pkg/cdrtools b/stage5/pkg/cdrtools
index 37228ad0490b5b0506bada6e7d192bfb5098462b..8442f8382d5859bda7185ecc795e065080ab5802 100644 (file)
--- a/stage5/pkg/cdrtools
+++ b/stage5/pkg/cdrtools
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root
     make INS_BASE=/usr DEFINSUSR=root DEFINSGRP=root install
 

diff --git a/stage5/pkg/chordpack b/stage5/pkg/chordpack
index f68713f8f0cb1e01d9379826fa1de337eda2635b..80a200d137b21461cd283e1bea5475da8685b159 100644 (file)
--- a/stage5/pkg/chordpack
+++ b/stage5/pkg/chordpack
@@ -7,8 +7,8 @@ hvbuild()
 
 hvbuild_post()
 {
-    install -v -m755 ${LFS_TMP}/${PACKAGE}/chordpack /usr/local/bin
+    install -v -m755 ${SRC_DIR}/chordpack /usr/local/bin
 
     # Install Emacs Chordpro mode
-    install -v -m644 ${LFS_TMP}/${PACKAGE}/chordpro-mode.el ${EMACS_LOCAL_SITE_LISP}
+    install -v -m644 ${SRC_DIR}/chordpro-mode.el ${EMACS_LOCAL_SITE_LISP}
 }

diff --git a/stage5/pkg/cups-pdf b/stage5/pkg/cups-pdf
index 269137e85c18e3b2cab735f676d49e03f77d520e..926577efab0bda8ef2fcfce475d2059e605e1929 100644 (file)
--- a/stage5/pkg/cups-pdf
+++ b/stage5/pkg/cups-pdf
@@ -2,11 +2,11 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}/src
+    cd ${SRC_DIR}/src
     gcc -O9 -s -o cups-pdf cups-pdf.c
     install -v -m 0700 cups-pdf /usr/lib/cups/backend
 
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
     cp extra/cups-pdf.conf /etc/cups
     cp extra/CUPS-PDF.ppd /usr/share/cups/model
 }

diff --git a/stage5/pkg/dvd-rw-tools b/stage5/pkg/dvd-rw-tools
index c29ee3bfe11fa08cbd16ef79b75c6d84e6885748..bf7de187f90a834bc30e5beeb58bffebb5e80293 100644 (file)
--- a/stage5/pkg/dvd-rw-tools
+++ b/stage5/pkg/dvd-rw-tools
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make all rpl8 btcflash
     make prefix=/usr install
     install -v -m644 -D index.html /usr/share/doc/${PACKAGE}/index.html

diff --git a/stage5/pkg/firefox b/stage5/pkg/firefox
index ba7940f2aef2786cb18b77e4377900831d11ce0d..cc08c0bb8a2b513bf7218961577bca5574f991a0 100644 (file)
--- a/stage5/pkg/firefox
+++ b/stage5/pkg/firefox
@@ -6,7 +6,7 @@ hvbuild()
     FIREFOX_VERSION="$(get_pkg_ver ${PACKAGE})"
     FIREFOX_PKG_VERSION="firefox-$(get_pkg_ver ${PACKAGE})"
 
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     # Use the default settings specified in the source tree.
     echo '. $topsrcdir/browser/config/mozconfig' > .mozconfig

diff --git a/stage5/pkg/foo2zjs b/stage5/pkg/foo2zjs
index 618e09c1634d239ba1537a01df70778d96bf5b6d..712811fcfb0b59a02ed6593642fcb93fd60b7051 100644 (file)
--- a/stage5/pkg/foo2zjs
+++ b/stage5/pkg/foo2zjs
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     make
     ./getweb 1020
     make install

diff --git a/stage5/pkg/ghostscript b/stage5/pkg/ghostscript
index 39563671e66537a077c4496f13acf7cec28d49ec..17f519cbb3fb1b18867c5eda6407ad3019850126 100644 (file)
--- a/stage5/pkg/ghostscript
+++ b/stage5/pkg/ghostscript
@@ -4,7 +4,7 @@ hvconfig_pre()
 {
     export GS_FONTS_PATH="${HV_FONTS_PATH}/ghostscript"
 
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     # To use the system-installed version of JasPer:
     rm -rf jasper

diff --git a/stage5/pkg/guitartex b/stage5/pkg/guitartex
index 009532324caa101df3a5520ceab1a7ca8b8ed2d3..b9d0bbcbe848956a3dcf8ab398baa34979f433cd 100644 (file)
--- a/stage5/pkg/guitartex
+++ b/stage5/pkg/guitartex
@@ -7,8 +7,6 @@ hvbuild()
 
 hvbuild_post()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     install -v -m755 -d /usr/share/texmf-local/gchords-guitartex
     install -v -m644 gchords/gchords.sty /usr/share/texmf-local/gchords-guitartex
 

diff --git a/stage5/pkg/i2c-tools b/stage5/pkg/i2c-tools
index 792674191bb2fa3d22d25aeb57671e742290fef6..26b846ad0d9c8f5782f5ba7229211802dd2841e4 100644 (file)
--- a/stage5/pkg/i2c-tools
+++ b/stage5/pkg/i2c-tools
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     ${HVMAKE}
     ${HVMAKE} prefix=/usr install
 }

diff --git a/stage5/pkg/lighttpd b/stage5/pkg/lighttpd
index 33ab3c7c372e901b3d878bcb51da9a3609b66ea7..786de3c0014c8ec03659b5cb34b2e5b257529d13 100644 (file)
--- a/stage5/pkg/lighttpd
+++ b/stage5/pkg/lighttpd
@@ -9,8 +9,6 @@ hvconfig_pre()
 
 hvbuild_post()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     install -dv \
         /etc/lighttpd \
         /var/log/lighttpd \
@@ -18,8 +16,7 @@ hvbuild_post()
         /var/lib/lighttpd/sockets \
         /var/cache/lighttpd
 
-    cp -R doc/config/conf.d/ doc/config/*.conf doc/config/vhosts.d/ \
-        /etc/lighttpd/
+    cp -R ${SRC_DIR}/doc/config/{conf.d/,*.conf,vhosts.d/} /etc/lighttpd/
 
     chown -R www.www \
         /etc/lighttpd \
@@ -58,7 +55,7 @@ EOF
     chown -v -R ${HTTPD_USER}:${HTTPD_USER} /srv/www
 
     # Bootscript
-    cp -p doc/initscripts/sysconfig.lighttpd /etc/sysconfig/lighttpd
+    cp -p ${SRC_DIR}/doc/initscripts/sysconfig.lighttpd /etc/sysconfig/lighttpd
 
     install -v -m740 ${SCRDIR}/bootscripts/lighttpd /etc/rc.d/init.d
 

diff --git a/stage5/pkg/ltsp-utils b/stage5/pkg/ltsp-utils
index da7159ca10a60aa121f42fb2d099b5c04e656138..876d7c2ee006c78fd5191d6ebb7bd3035ace8045 100644 (file)
--- a/stage5/pkg/ltsp-utils
+++ b/stage5/pkg/ltsp-utils
@@ -2,6 +2,5 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     ./install.sh
 }

diff --git a/stage5/pkg/lua b/stage5/pkg/lua
index b0cebae225b5f5aaca284af25085b550c170c6fb..4cc871dfc6c1a8432dc9cb6857b7884d8d41d03e 100644 (file)
--- a/stage5/pkg/lua
+++ b/stage5/pkg/lua
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make linux
     make INSTALL_TOP=/usr \
          TO_LIB="liblua.so liblua.so.5.2 liblua.so.5.2.3" \

diff --git a/stage5/pkg/mercurial b/stage5/pkg/mercurial
index 22dbcdee202534ca54e0bcc401b17447f5cad09c..3d3dcdfef9fa8329b72f95939ee852cd78685d1b 100644 (file)
--- a/stage5/pkg/mercurial
+++ b/stage5/pkg/mercurial
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     make build
     make PREFIX=/usr install-bin
 }

diff --git a/stage5/pkg/milter-spf b/stage5/pkg/milter-spf
index e5de87fe9eb52847c0c230dfe0674d738acdd8d4..4d3ed7d1b80b14d21274eea81003f78dce09b0fb 100644 (file)
--- a/stage5/pkg/milter-spf
+++ b/stage5/pkg/milter-spf
@@ -2,7 +2,6 @@
 
 hvbuil()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make
     make PREFIX=/usr install
 }

diff --git a/stage5/pkg/nss b/stage5/pkg/nss
index 4a88ef429f8f273eec0e81ed84165aabddb72cd6..cddbc5e24f85b0d5826890189866f6ee97af58d3 100644 (file)
--- a/stage5/pkg/nss
+++ b/stage5/pkg/nss
@@ -2,7 +2,7 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}/nss
+    cd ${SRC_DIR}/nss
 
     # This package does not support parallel build
     make BUILD_OPT=1 \
@@ -15,7 +15,7 @@ hvbuild()
 
 hvbuild_post()
 {
-    cd ${LFS_TMP}/${PACKAGE}/dist
+    cd ${SRC_DIR}/dist
 
     install -v -m755 Linux*/lib/*.so /usr/lib
     install -v -m644 Linux*/lib/{*.chk,libcrmf.a} /usr/lib

diff --git a/stage5/pkg/php b/stage5/pkg/php
index 5eded9861eb2e23b37acf00e25b8caa613eb7693..083a13fe7d2840d8097f83fcd6c3349c0505ca57 100644 (file)
--- a/stage5/pkg/php
+++ b/stage5/pkg/php
@@ -49,7 +49,7 @@ hvbuild_post()
     if [ -f /etc/php.ini ]; then
         cp /etc/php.ini /etc/php.ini.old
     fi
-    cp ${LFS_TMP}/${PACKAGE}/php.ini-production /etc/php.ini
+    cp ${SRC_DIR}/php.ini-production /etc/php.ini
 
     if [ "x${USE_HTTPD}" = "xyes" ]; then
         # To enable PHP support in the Apache web server, a new AddType

diff --git a/stage5/pkg/procmail b/stage5/pkg/procmail
index 15a8075bab414b62dd183cd4da17da2d9fbf3156..b1f2877699b251499346fa821e4e82c565a73ac3 100644 (file)
--- a/stage5/pkg/procmail
+++ b/stage5/pkg/procmail
@@ -2,7 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make \
         BASENAME=/usr \
         LOCKINGTEST=/tmp \

diff --git a/stage5/pkg/py2cairo b/stage5/pkg/py2cairo
index 140410723243b1658975e2567ce4c166c4c32ad9..e5863031921f92cf7f0cb65c68a096af173c3a8f 100644 (file)
--- a/stage5/pkg/py2cairo
+++ b/stage5/pkg/py2cairo
@@ -2,9 +2,7 @@
 
 hvconfig()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-    pwd
-    ls *
+    cd ${SRC_DIR}
     ./waf configure \
         --prefix=/usr
 }

diff --git a/stage5/pkg/qt b/stage5/pkg/qt
index 60319e9dcb3d1695fcbf820e499bd241bab1ecc3..b7d845c510c35c7328581baa851f014c668ef8c0 100644 (file)
--- a/stage5/pkg/qt
+++ b/stage5/pkg/qt
@@ -2,7 +2,7 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
+    cd ${SRC_DIR}
 
     sed -i -e "/#if/d" -e "/#error/d" -e "/#endif/d" \
         config.tests/unix/libmng/libmng.cpp

diff --git a/stage5/pkg/sane-backends b/stage5/pkg/sane-backends
index 639fc43871f5049c061e5472427b4bfc6a2d2e68..4bcf0188b68bcd282e74f2ff3455841933438d1b 100644 (file)
--- a/stage5/pkg/sane-backends
+++ b/stage5/pkg/sane-backends
@@ -17,7 +17,7 @@ hvconfig_pre()
     hv_useradd --system -c saned -d /dev/null -g saned -s /bin/false saned
 
     # Fixes an obsolete udev parameter:
-    sed -i 's/SYSFS/ATTRS/g' ${LFS_TMP}/${PACKAGE}/tools/sane-desc.c
+    sed -i 's/SYSFS/ATTRS/g' ${SRC_DIR}/tools/sane-desc.c
 
     CONFIGURE_OPTS+=" --with-x=${USE_X_OPTION}"
 }

diff --git a/stage5/pkg/splix b/stage5/pkg/splix
index 52f68b097e5b666f1528c846612f05b69e0545c0..1b1731d8a1b52092f12643a51f18c16dde3d67cd 100644 (file)
--- a/stage5/pkg/splix
+++ b/stage5/pkg/splix
@@ -4,7 +4,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
     make DISABLE_JBIG=1
     make install
 }

diff --git a/stage5/pkg/squirrelmail b/stage5/pkg/squirrelmail
index c9ea8e94f94fafa2452b370253c83267ae9d3f0c..5fec5ce2c0524b57b5e2a803ca20c53ab02d5b03 100644 (file)
--- a/stage5/pkg/squirrelmail
+++ b/stage5/pkg/squirrelmail
@@ -2,7 +2,7 @@
 
 hvbuild()
 {
-    mv ${LFS_TMP}/${PACKAGE} /srv/www/htdocs/squirrelmail
+    mv ${SRC_DIR} /srv/www/htdocs/squirrelmail
     chown -v -R ${HTTPD_USER}:${HTTPD_USER} /srv/www/htdocs/squirrelmail
 
     mkdir -v -p /srv/squirrelmail/{data,attach}

diff --git a/stage5/pkg/stellarium b/stage5/pkg/stellarium
index 2a8a08365a99fc8cdce10a01ba1565d8ce1f8d3f..fb8a7338523a204ed18a6a96bb5bccdee9ee1b39 100644 (file)
--- a/stage5/pkg/stellarium
+++ b/stage5/pkg/stellarium
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     mkdir -p builds/unix
     cd builds/unix
 

diff --git a/stage5/pkg/texlive b/stage5/pkg/texlive
index 17b83e85bdafd8fe2038b0f9b0e43a6e388bc095..b5cbd59ba76d6de7570fadb629cd869cee68de7d 100644 (file)
--- a/stage5/pkg/texlive
+++ b/stage5/pkg/texlive
@@ -15,7 +15,7 @@ hvconfig_pre()
 
     sed -i -e 's|PARENT/\.\./texmf-local|PARENT/texmf-local|' \
         -e 's|\$TEXMFVAR/fonts|/var/lib/livetex/fonts|'    \
-        ${LFS_TMP}/${PACKAGE}/texk/kpathsea/texmf.cnf
+        ${SRC_DIR}/texk/kpathsea/texmf.cnf
 
     CONFIGURE_OPTS+=" \
         --disable-native-texlive-build \
@@ -33,7 +33,8 @@ hvconfig_pre()
 
 hvbuild_post()
 {
-    cp -a ${LFS_TMP}/${PACKAGE}/utils/biber/TeXLive /usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL})
+    cp -a ${SRC_DIR}/utils/biber/TeXLive \
+        /usr/lib/perl5/site_perl/$(get_pkg_ver ${PERL})
 
     rm -v /usr/texmf{,-dist}
     install -v -m1777 -d /var/lib/livetex/fonts

diff --git a/stage5/pkg/uw-imap b/stage5/pkg/uw-imap
index 37eee8a4f70ed8c3e4882a84dfe22201becf4c1c..acaaad529f0a16d14174b758f509906d53621e8b 100644 (file)
--- a/stage5/pkg/uw-imap
+++ b/stage5/pkg/uw-imap
@@ -2,8 +2,6 @@
 
 hvbuild()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-
     # Setting default mailbox format for imapd
     sed -i -e "s!^\(CREATEPROTO=\)unixproto!\1${MAILBOX_FORMAT}proto!" \
         src/osdep/unix/Makefile
@@ -27,7 +25,10 @@ hvbuild()
     ln -sf /usr/lib/uw-imap/lib/c-client.a /usr/lib/uw-imap/lib/libc-client.a
     install -v -m 644 c-client/*.h /usr/lib/uw-imap/include
     install -v -m 644 src/osdep/tops-20/shortsym.h /usr/lib/uw-imap/include
+}
 
+hvbuild_post()
+{
     # Addition to xinetd
     cat > /etc/xinetd.d/imapd << "EOF"
 service imap

diff --git a/stage5/pkg/vobcopy b/stage5/pkg/vobcopy
index e6269aa22bfb90a8995903aba815d050bccd8f35..290eacc59cf5d7b8758a151a610cd4c2b7f3fe1a 100644 (file)
--- a/stage5/pkg/vobcopy
+++ b/stage5/pkg/vobcopy
@@ -2,6 +2,5 @@
 
 hvconfig_pre()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-    mv configure.sh configure
+    mv ${SRC_DIR}/configure{.sh,}
 }

diff --git a/stage5/pkg/xsane b/stage5/pkg/xsane
index 4e1db05766ac0e6ca860e02e54e7e51d27023751..9356feda95b2778abfbaa3b31000e02bd4b61f68 100644 (file)
--- a/stage5/pkg/xsane
+++ b/stage5/pkg/xsane
@@ -2,7 +2,8 @@
 
 hvconfig_pre()
 {
-    sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' ${LFS_TMP}/${PACKAGE}/src/xsane-save.c
+    sed -i -e 's/png_ptr->jmpbuf/png_jmpbuf(png_ptr)/' \
+        ${SRC_DIR}/src/xsane-save.c
 }
 
 hvbuild_post()