diff options
| author | Pierre Labastie <pierre@linuxfromscratch.org> | 2017-08-09 13:49:14 +0000 |
|---|---|---|
| committer | Pierre Labastie <pierre@linuxfromscratch.org> | 2017-08-09 13:49:14 +0000 |
| commit | b99e56a0e913f4495120480d98f67161e293363d (patch) | |
| tree | d6781d223213ffb597ed95bf9d6adc0043bfccfb | |
| parent | 9f6ceb0caf7c31bd3251ee495e98f5ad1cbd8f51 (diff) | |
Merge trunk r3986: common/libs/func_install_blfs:
Honour-variables-set-in-jhalfs
| -rw-r--r-- | common/libs/func_install_blfs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs index faac3ad224..10c5ee69e5 100644 --- a/common/libs/func_install_blfs +++ b/common/libs/func_install_blfs @@ -34,15 +34,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) |