r3771 - jhalfs/trunk/common/libs

pierre at higgs.linuxfromscratch.org pierre at higgs.linuxfromscratch.org
Wed Dec 25 03:26:55 PST 2013


Author: pierre
Date: Wed Dec 25 03:26:55 2013
New Revision: 3771

Log:
Further changes to BLFS tools installation

Modified:
   jhalfs/trunk/common/libs/func_install_blfs

Modified: jhalfs/trunk/common/libs/func_install_blfs
==============================================================================
--- jhalfs/trunk/common/libs/func_install_blfs	Tue Dec 24 10:52:24 2013	(r3770)
+++ jhalfs/trunk/common/libs/func_install_blfs	Wed Dec 25 03:26:55 2013	(r3771)
@@ -147,9 +147,13 @@
 
 # Suppresses unneeded parts of the scriptlets
 if [ "$DEP_LIBXSLT" = y ]; then
-  # libxslt pulls docbook-xsl in. Sorry for sed synthax.
-  # I do not know how to delete lines between 2 addresses excluding those
-  # two lines.
+  # libxslt pulls docbook-xsl in, which populates the catalog with annoying
+  # **EDITME** references. Fortunately, those lines are regognizable because
+  # they occur between lines containing '/etc/xml/catalog' at the end of the
+  # line (without '&&'). I  have not found a simple way to delete lines
+  # between 2 addresses, excluding either the first or the last one. So use
+  # a loop for accumulating lines and deleting at the end.
+  # Sorry for sed synthax.
   sed -i '\@^[[:space:]]*/etc/xml/catalog$@{
 n
 :a
@@ -161,7 +165,7 @@
       $BUILDDIR$BLFS_ROOT/scripts/*docbook-xsl
 fi
 if [ "$DEP_SUDO" = y ]; then
-  sed -i '/pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
+  sed -i '/cat.*pam.d/i mkdir -p /etc/pam.d' $BUILDDIR$BLFS_ROOT/scripts/*sudo
 fi
 if [ "$DEP_SVN" = y ]; then
   sed -i -e /javahl/d -e /swig/d $BUILDDIR$BLFS_ROOT/scripts/*subversion
@@ -177,6 +181,9 @@
 mkdir -p $BUILDDIR$BLFS_ROOT/work
 pushd $BUILDDIR$BLFS_ROOT/work
 ../gen-makefile.sh
+# The generated Makefile updates the tracking file after each package
+# installation, using libxslt, which is not installed yet. So move
+# updating to the end of the process, adding an 'update' target
 sed -i -e '/xsltproc/,+6d' \
        -e '/^all/s@$@ update@' \
        -e 's/touch/@touch/' Makefile



More information about the alfs-log mailing list