Remove linking several tools in stage2.

Only glibc needs /bin/pwd, what we link there and
remove after build.

diff --git a/lfs/glibc b/lfs/glibc
index 3654b609a5dfd0f166ba2f06db579ccb98af026d..ee47598c092e884ac3181832c81a03fa32b45149 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -112,6 +112,8 @@ endif
 endif
 
 ifeq "$(STAGE)" "base"
+       if [ ! -e /bin/pwd ]; then ln -sfn $(TOOLS_DIR)/bin/pwd /bin/pwd; fi
+
        tar jxf $(DIR_DL)/glibc-libidn-$(VER).tar.bz2 -C $(DIR_APP)
        cd $(DIR_APP) && mv glibc-libidn-$(VER) libidn
 ifeq "$(SSP)" "1"
@@ -203,6 +205,8 @@ endif
        echo -e "# Begin /etc/ld.so.conf\n"     >> /etc/ld.so.conf
        echo -e "/usr/local/lib\n"              >> /etc/ld.so.conf
        echo    "# End /etc/ld.so.conf"         >> /etc/ld.so.conf
+
+       if [ -h /bin/pwd ]; then rm -f /bin/pwd; fi
 endif
 
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build

diff --git a/lfs/stage2 b/lfs/stage2
index ba2b79f4bbd4c579a65be4d648178816648fc98d..6b2acffe8b7bd6f1aa076877cfabcadd5cab5941 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -62,17 +62,17 @@ $(TARGET) :
        -mkdir -pv /var/{opt,cache,lib/{misc,locate},local}
        
        # Check for some important links and create them if they don't exist
-       if [ ! -e /bin/bash     ]; then ln -sfn $(TOOLS_DIR)/bin/bash   /bin/bash && ln -sf bash /bin/sh; fi
-       if [ ! -e /bin/cat      ]; then ln -sfn $(TOOLS_DIR)/bin/cat    /bin/cat;               fi
-       if [ ! -e /bin/echo     ]; then ln -sfn $(TOOLS_DIR)/bin/echo   /bin/echo;      fi
-       if [ ! -e /bin/grep     ]; then ln -sfn $(TOOLS_DIR)/bin/grep   /bin/grep;      fi
-       if [ ! -e /bin/pwd      ]; then ln -sfn $(TOOLS_DIR)/bin/pwd    /bin/pwd;               fi
-       if [ ! -e /bin/stty     ]; then ln -sfn $(TOOLS_DIR)/bin/stty   /bin/stty;      fi
+       #if [ ! -e /bin/bash ]; then ln -sfn $(TOOLS_DIR)/bin/bash /bin/bash && ln -sf bash /bin/sh; fi
+       #if [ ! -e /bin/cat  ]; then ln -sfn $(TOOLS_DIR)/bin/cat  /bin/cat;  fi
+       #if [ ! -e /bin/echo ]; then ln -sfn $(TOOLS_DIR)/bin/echo /bin/echo; fi
+       #if [ ! -e /bin/grep ]; then ln -sfn $(TOOLS_DIR)/bin/grep /bin/grep; fi
+       #if [ ! -e /bin/pwd  ]; then ln -sfn $(TOOLS_DIR)/bin/pwd  /bin/pwd;  fi
+       #if [ ! -e /bin/stty ]; then ln -sfn $(TOOLS_DIR)/bin/stty /bin/stty; fi
        
-       if [ ! -e /usr/bin/perl ]; then ln -sfn $(TOOLS_DIR)/bin/perl   /usr/bin/perl; fi
+       #if [ ! -e /usr/bin/perl ]; then ln -sfn $(TOOLS_DIR)/bin/perl /usr/bin/perl; fi
        
-       [ ! -e /lib/libgcc_s.so.1               ] && ln -sfn $(TOOLS_DIR)/lib/libgcc_s.so{,.1}  /usr/lib/
-       [ ! -e /lib/libstdc++.so.6      ] && ln -sfn $(TOOLS_DIR)/lib/libstdc++.so{,.6} /usr/lib/
+       #[ ! -e /lib/libgcc_s.so.1 ] && ln -sfn $(TOOLS_DIR)/lib/libgcc_s.so{,.1} /usr/lib/
+       #[ ! -e /lib/libstdc++.so.6 ] && ln -sfn $(TOOLS_DIR)/lib/libstdc++.so{,.6} /usr/lib/
        
        # Creating an empty mtab
        touch /etc/mtab         #ln -sf /proc/mounts /etc/mtab