r3927 - in jhalfs/trunk: BLFS/xsl common/libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Sun Mar 19 09:17:19 PDT 2017


Author: pierre
Date: Sun Mar 19 09:17:18 2017
New Revision: 3927

Log:
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.

Modified:
   jhalfs/trunk/BLFS/xsl/scripts.xsl
   jhalfs/trunk/common/libs/func_install_blfs

Modified: jhalfs/trunk/BLFS/xsl/scripts.xsl
==============================================================================
--- jhalfs/trunk/BLFS/xsl/scripts.xsl	Sun Mar 19 07:54:28 2017	(r3926)
+++ jhalfs/trunk/BLFS/xsl/scripts.xsl	Sun Mar 19 09:17:18 2017	(r3927)
@@ -145,7 +145,8 @@
   *)
      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


Modified: jhalfs/trunk/common/libs/func_install_blfs
==============================================================================
--- jhalfs/trunk/common/libs/func_install_blfs	Sun Mar 19 07:54:28 2017	(r3926)
+++ jhalfs/trunk/common/libs/func_install_blfs	Sun Mar 19 09:17:18 2017	(r3927)
@@ -187,12 +187,6 @@
         -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


More information about the alfs-log mailing list