r2569 - jhalfs/branches/experimental/LFS

manuel at linuxfromscratch.org manuel at linuxfromscratch.org
Mon Apr 17 16:05:11 PDT 2006


Author: manuel
Date: 2006-04-17 17:05:08 -0600 (Mon, 17 Apr 2006)
New Revision: 2569

Modified:
   jhalfs/branches/experimental/LFS/master.sh
Log:
Simplified Readline reinstallation.

Modified: jhalfs/branches/experimental/LFS/master.sh
===================================================================
--- jhalfs/branches/experimental/LFS/master.sh	2006-04-17 18:03:09 UTC (rev 2568)
+++ jhalfs/branches/experimental/LFS/master.sh	2006-04-17 23:05:08 UTC (rev 2569)
@@ -161,13 +161,10 @@
     done
     # Remove Bzip2 binaries before make install
     sed -e 's at make install at rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2
-    # Tell Module-Init-Tools that we are reinstalling it
+    # 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 and regenerate two links after make install
-    sed -e 's at make install@&\nln -sfv libreadline.so.5.1 /lib/libreadline.so.5@' \
-        -e 's at make install@&\nln -sfv libhistory.so.5.1 /lib/libhistory.so.5@' \
-        -e 's at make install@&\nrm -v /lib/lib{history,readline}*old@' \
-        -e 's at make install@&\nrm -v /lib/lib{history,readline}.so.5@' -i chapter06$N/*-readline
+    # 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




More information about the alfs-log mailing list