From a5f52ba47df8735c5027538100b8a5c227eb4d1b Mon Sep 17 00:00:00 2001 From: Manuel Canales Esparcia Date: Sat, 24 Feb 2007 16:35:58 +0000 Subject: [PATCH] The ICA/farce Bzip2 fix is needed only on LFS-6.2 and CLFS-1.0. --- CLFS/master.sh | 2 +- LFS/master.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CLFS/master.sh b/CLFS/master.sh index 9eb72cc..c4be67c 100644 --- a/CLFS/master.sh +++ b/CLFS/master.sh @@ -460,7 +460,7 @@ final_system_Makefiles() { # # Rename the scripts mv ${script} ${script}$N done - # Remove Bzip2 binaries before make install + # Remove Bzip2 binaries before make install (CLFS-1.0 compatibility) sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i final-system$N/*-bzip2$N # Delete *old Readline libraries just after make install sed -e 's@make install@&\nrm -v /lib/lib{history,readline}*old@' -i final-system$N/*-readline$N diff --git a/LFS/master.sh b/LFS/master.sh index 41f956c..327ea7b 100644 --- a/LFS/master.sh +++ b/LFS/master.sh @@ -180,8 +180,8 @@ chapter6_Makefiles() { # Rename the scripts mv ${script} ${script}$N done - # Remove Bzip2 binaries before make install - sed -e 's@make PREFIX=/usr install@rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2$N + # Remove Bzip2 binaries before make install (LFS-6.2 compatibility) + sed -e 's@make install@rm -vf /usr/bin/bz*\n&@' -i chapter06$N/*-bzip2$N fi echo "${tab_}${GREEN}Processing... ${L_arrow}Chapter6$N ( CHROOT ) ${R_arrow}"