r2612 - in jhalfs/trunk: LFS common

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon May 1 11:14:55 PDT 2006


Author: manuel
Date: 2006-05-01 12:14:55 -0600 (Mon, 01 May 2006)
New Revision: 2612

Modified:
   jhalfs/trunk/LFS/master.sh
   jhalfs/trunk/common/urls.xsl
Log:
Few updates to match last LFS book changes.

Modified: jhalfs/trunk/LFS/master.sh
===================================================================
--- jhalfs/trunk/LFS/master.sh	2006-05-01 11:13:29 UTC (rev 2611)
+++ jhalfs/trunk/LFS/master.sh	2006-05-01 18:14:55 UTC (rev 2612)
@@ -161,10 +161,6 @@
     done
     # Remove Bzip2 binaries before make install
     sed -e 's at make install at rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2
-    # Fix how Module-Init-Tools do the install target
-    sed -e 's at make install at make INSTALL=install install@' -i chapter06$N/*-module-init-tools
-    # Delete *old Readline libraries just after make install
-    sed -e 's at make install@&\nrm -v /lib/lib{history,readline}*old@' -i chapter06$N/*-readline
     # Let some Udev pre-installation commands to fail
     sed -e 's@/lib/udev/devices/fd@& || true@' \
         -e 's/mknod -m.*/& || true/' -i chapter06$N/*-udev

Modified: jhalfs/trunk/common/urls.xsl
===================================================================
--- jhalfs/trunk/common/urls.xsl	2006-05-01 11:13:29 UTC (rev 2611)
+++ jhalfs/trunk/common/urls.xsl	2006-05-01 18:14:55 UTC (rev 2612)
@@ -22,7 +22,7 @@
     <xsl:if test="(ancestor::varlistentry[@condition=$model]
                   or not(ancestor::varlistentry[@condition])) and
                   (contains(@url, '.tar.') or contains(@url, '.tgz')
-                  or contains(@url, '.patch') or contains(@url, '.rules')) and
+                  or contains(@url, '.patch')) and
                   not(ancestor-or-self::*/@condition = 'pdf')">
       <!-- Extract the package name -->
       <xsl:variable name="package">




More information about the alfs-log mailing list