r3835 - jhalfs/trunk/common/libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Thu Nov 19 05:13:29 PST 2015


Author: pierre
Date: Thu Nov 19 05:13:29 2015
New Revision: 3835

Log:
Fix the installation of jhalfs for BLFS:
- Remove the download part of the book instruction for cacerts
- Separate download and md5sum instructions in "download-script" generation,
  so that packages with no md5sum can still be downloaded.

Modified:
   jhalfs/trunk/common/libs/func_install_blfs

Modified: jhalfs/trunk/common/libs/func_install_blfs
==============================================================================
--- jhalfs/trunk/common/libs/func_install_blfs	Wed Nov 18 02:54:13 2015	(r3834)
+++ jhalfs/trunk/common/libs/func_install_blfs	Thu Nov 19 05:13:29 2015	(r3835)
@@ -128,9 +128,16 @@
 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=/,/^unset/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=/,/md5sum/p' \
+sed -n -e '/PACKAGE=/,/^fi/p' \
+       -e '/|[ ]*md5sum/p' \
        -e '/PACKAGE1=/,/^fi/p' \
        -e '/PATCH=/,/^fi/p' \
        -e '/URL=/,/^fi/p' \


More information about the alfs-log mailing list