From 9da16d9bf198b1992818b01a4f393763ed7c3a2e Mon Sep 17 00:00:00 2001 From: Pierre Labastie Date: Sun, 19 Mar 2017 16:17:18 +0000 Subject: [PATCH] Fix a bug in the blfs scripts, occuring when the pacakge is neither a tarball nor a zip file: copy the package from $SRC_DIR to the xxx-build dir. And in case they are needed, copy the additional files too. --- BLFS/xsl/scripts.xsl | 3 ++- common/libs/func_install_blfs | 6 ------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/BLFS/xsl/scripts.xsl b/BLFS/xsl/scripts.xsl index 4501514..609b107 100644 --- a/BLFS/xsl/scripts.xsl +++ b/BLFS/xsl/scripts.xsl @@ -145,7 +145,8 @@ case $PACKAGE in *) UNPACKDIR=$PKG_DIR-build mkdir $UNPACKDIR - cp $PACKAGE $UNPACKDIR + cp $SRC_DIR/$PACKAGE $UNPACKDIR + cp $(find . -mindepth 1 -maxdepth 1 -type l) $UNPACKDIR ;; esac cd $UNPACKDIR diff --git a/common/libs/func_install_blfs b/common/libs/func_install_blfs index 5953310..13f2de2 100644 --- a/common/libs/func_install_blfs +++ b/common/libs/func_install_blfs @@ -187,12 +187,6 @@ if [ "$DEP_LYNX" = y ]; then -i $BUILDDIR$BLFS_ROOT/scripts/*lynx fi fi -# The book instructions for CA certificates suppose that the cerdata.txt -# file is in the same directory as make-ca.sh-. This is not the -# case with our default instructions. Just remove the "cd $UNPACKDIR" here. -if test -f $BUILDDIR$BLFS_ROOT/scripts/*cacerts; then - sed -i '/cd \$UNPACKDIR/d' $BUILDDIR$BLFS_ROOT/scripts/*cacerts -fi # At last generates the build Makefile mkdir -p $BUILDDIR$BLFS_ROOT/work pushd $BUILDDIR$BLFS_ROOT/work