Merge remote-tracking branch 'origin/kernel-update' into glibc-update2

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

diff --git a/lfs/stage2 b/lfs/stage2
index 59cb947b44b31a7d8fa7835e03b5c546ca3b2a72..04291d6e47cb97b3de78ea497c384bbbf288be41 100644 (file)
--- a/lfs/stage2
+++ b/lfs/stage2
@@ -63,15 +63,15 @@ $(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
-       for i in $(DIR_SRC)/config/etc/*; do \
-           [ -f $$i ] && cp $$i /etc; \
-       done
+       cp -rvf $(DIR_SRC)/config/etc/* /etc;
        touch /etc/mtab
        echo "$(NAME) v$(VERSION) - $(SLOGAN)" >  /etc/issue
        echo "===============================" >> /etc/issue
@@ -110,4 +110,8 @@ $(TARGET) :
        # A small hack to include /root to the iso but not all of it's files.
        touch /root/ipfire
 
+       # License agreement
+       -mkdir -pv /usr/share/doc/licenses/
+       cp -vf $(DIR_SRC)/doc/COPYING /usr/share/doc/licenses/GPLv3
+
        @$(POSTBUILD)