From 340c27e8ae3e280d1df1d640c89626d238a08829 Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Wed, 9 Aug 2017 13:47:45 +0000 Subject: [PATCH] common/libs/func_install_blfs: Honour-variables-set-in-jhalfs --- common/libs/func_install_blfs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs index ce403ec..46cbf23 100644 --- a/common/libs/func_install_blfs +++ b/common/libs/func_install_blfs @@ -39,15 +39,17 @@ echo "copying the local BLFS working copy (may take some time)" # book has already been validated, tmp is posterior to the others, and # validation will not be done again. cp -ruT --preserve=timestamps $BLFS_WC_LOCATION \ - ${BUILDDIR}${BLFS_ROOT}/blfs-xml + ${BUILDDIR}${BLFS_ROOT}/$BLFS_XML fi # Downloads the book if necessary, initialize the tracking file and the # package database. # sudo is needed if $BUILDDIR/var/lib is owned by root and /var/lib/jhalfs # has to be created -sudo make -j1 -C $BUILDDIR$BLFS_ROOT \ - REV=$INITSYS \ - TRACKING_DIR=$BUILDDIR$TRACKING_DIR \ +sudo make -j1 -C $BUILDDIR$BLFS_ROOT \ + REV=$INITSYS \ + TRACKING_DIR=$BUILDDIR$TRACKING_DIR \ + BLFS_XML=$BUILDDIR$BLFS_ROOT/$BLFS_XML \ + SVN=$SVN_2/BLFS/$BLFS_TREE \ $BUILDDIR$BLFS_ROOT/packages.xml # Because the BLFS Makefile is supposed to be used in chroot (or booted)