Merge remote-tracking branch 'origin/next' into thirteen

[ipfire-2.x.git] / lfs / stage2

diff --git a/lfs/stage2 b/lfs/stage2
index 5059923aeb8f16af0ccf2408da39739ab426b98f..beb0abbcb2d4fb0a884080c1856c8c7f3b826092 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -63,9 +63,11 @@ $(TARGET) :
        
        # Symlinks
        # for this reason, stage2 rebuild will broke the iso:perl, grubbatch
-       -ln -sv /tools/bin/{bash,cat,grep,pwd,stty} /bin
+       -ln -sv /tools/bin/{bash,cat,echo,pwd,stty} /bin
        -ln -sv /tools/bin/perl /usr/bin
        -ln -sv /tools/lib/libgcc_s.so{,.1} /usr/lib
+       -ln -sv /tools/lib/libstdc++.so{,.6} /usr/lib
+       sed 's/tools/usr/' /tools/lib/libstdc++.la > /usr/lib/libstdc++.la
        -ln -sv bash /bin/sh
 
        # Config files
@@ -81,7 +83,11 @@ $(TARGET) :
            [ -f $$i ] && cp $$i /etc/profile.d; \
        done
        chmod 755 /etc/bashrc
-       ln -svf ../bashrc /etc/profile.d/bashrc.sh
+
+       # Install root's bash files.
+       for i in $(DIR_SRC)/config/bash/dot_*; do \
+               [ -f $$i ] && cp $$i /root/$$(basename $${i/dot_/\.}); \
+       done
 
        # Scripts
        for i in `find $(DIR_SRC)/src/scripts -maxdepth 1 -type f`; do \