captive: One month is only 30 days instead of 210

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

diff --git a/lfs/bash b/lfs/bash
index 79dce52880edd3f5dd5dee9544f3fe3cabbd17c2..e98b6fdba8a1bc3ce02cabecfc8bac065dc45a6d 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -87,7 +87,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        sed -e "s/filename, RTLD_LAZY/filename, RTLD_NOW/" \
                -i $(DIR_APP)/builtins/enable.def
 
-       for i in $$(seq 1 27); do \
+       for i in $$(seq 1 30); do \
                cd $(DIR_APP) && patch -Np0 < $(DIR_SRC)/src/patches/bash/bash43-$$(printf "%03d" "$${i}") || exit 1; \
        done
 
@@ -99,13 +99,13 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        cd $(DIR_APP) && make $(MAKETUNING)
        cd $(DIR_APP) && make install
 
-       ln -sf bash /bin/sh
+ifeq "$(TOOLCHAIN)" "1"
+       ln -svf bash /tools/bin/sh
 
-ifneq "$(ROOT)" ""
-       -mkdir -p $(ROOT)/bin
-       -mkdir -p $(ROOT)/usr/bin
-       ln -sf bash /tools/bin/sh
-       -ln -sf /tools/bin/bash $(ROOT)/bin/sh
+       mkdir -pv $(ROOT)/bin
+       ln -svf ../tools/bin/bash $(ROOT)/bin/sh
+else
+       ln -svf bash /bin/sh
 endif
 
        @rm -rf $(DIR_APP)