Author: pierre
Date: Mon Feb 27 09:33:46 2017
New Revision: 3889
Log:
merge new_features revision 3888
Modified:
jhalfs/trunk/common/libs/func_install_blfs
Modified: jhalfs/trunk/common/libs/func_install_blfs
==============================================================================
--- jhalfs/trunk/common/libs/func_install_blfs Mon Feb 27 09:32:14 2017
(r3888)
+++ jhalfs/trunk/common/libs/func_install_blfs Mon Feb 27 09:33:46 2017
(r3889)
@@ -124,12 +124,6 @@
sudo rm -rf $BUILDDIR$BLFS_ROOT/scripts
mv scripts $BUILDDIR$BLFS_ROOT
-# The book instructions for CA certificates contains downloading
-# instructions, which should not be used here, so:
-if test -f $BUILDDIR$BLFS_ROOT/scripts/*cacerts; then
- sed -i '/URL=/,/^wget/d' $BUILDDIR$BLFS_ROOT/scripts/*cacerts
-fi
-
# Generates a list containing download and copying instructions for tarballs
echo -e '#!/bin/bash\nset -e\n' > $BUILDDIR$BLFS_ROOT/download_script
sed -n -e '/PACKAGE=/,/^fi/p' \
@@ -144,7 +138,13 @@
pushd $BUILDDIR/sources
# Remove `unpacked' files if some have been left
sudo find . -name unpacked -exec rm \{\} \;
-FTP_SERVER=$SERVER/pub/blfs/ SRC_ARCHIVE=$SRC_ARCHIVE
$BUILDDIR$BLFS_ROOT/download_script
+if [ "$GETPKG" = "y" ]; then
+ FTP_SERVER=$SERVER/pub/blfs/ \
+ SRC_ARCHIVE=$SRC_ARCHIVE \
+ $BUILDDIR$BLFS_ROOT/download_script
+else # Save the download script in case the user wants to run it later
+ cp $BUILDDIR$BLFS_ROOT/download_script .
+fi
popd
rm -v $BUILDDIR$BLFS_ROOT/download_script
@@ -175,11 +175,16 @@
fi
if [ "$DEP_LYNX" = y ]; then
if [ "$DEP_OPENSSL" = y -o "$DEP_WGET" = y ]; then
- sed -i -e 's/configure/& --with-ssl/' \
- -e '/make$/i echo "#define USE_OPENSSL_INCL 1" >> lynx_cfg.h &&' \
- $BUILDDIR$BLFS_ROOT/scripts/*lynx
+ sed -e 's/configure/& --with-ssl/' \
+ -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-<version>. 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
--
http://lists.linuxfromscratch.org/listinfo/alfs-log
Unsubscribe: See the above information page
