Added readline and bash to installer system.

Removed ash (from busybox).

diff --git a/config/busybox/.config b/config/busybox/.config
index 3d37848cbeca39e6fa876604c565a27869a97f4d..512c15737fae1c7b8a097c4595573aa7196245ed 100644 (file)
--- a/config/busybox/.config
+++ b/config/busybox/.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.10.0
-# Sun May 25 20:43:06 2008
+# Tue Jul  8 21:31:43 2008
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -739,29 +739,25 @@ CONFIG_WATCH=y
 #
 # Shells
 #
-CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_ASH is not set
 # CONFIG_FEATURE_SH_IS_HUSH is not set
 # CONFIG_FEATURE_SH_IS_MSH is not set
-# CONFIG_FEATURE_SH_IS_NONE is not set
-CONFIG_ASH=y
-
-#
-# Ash Shell Options
-#
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_READ_NCHARS=y
-CONFIG_ASH_READ_TIMEOUT=y
-CONFIG_ASH_ALIAS=y
-CONFIG_ASH_MATH_SUPPORT=y
-CONFIG_ASH_MATH_SUPPORT_64=y
-CONFIG_ASH_GETOPTS=y
-CONFIG_ASH_BUILTIN_ECHO=y
-CONFIG_ASH_BUILTIN_TEST=y
-CONFIG_ASH_CMDCMD=y
+CONFIG_FEATURE_SH_IS_NONE=y
+# CONFIG_ASH is not set
+# CONFIG_ASH_JOB_CONTROL is not set
+# CONFIG_ASH_READ_NCHARS is not set
+# CONFIG_ASH_READ_TIMEOUT is not set
+# CONFIG_ASH_ALIAS is not set
+# CONFIG_ASH_MATH_SUPPORT is not set
+# CONFIG_ASH_MATH_SUPPORT_64 is not set
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_BUILTIN_ECHO is not set
+# CONFIG_ASH_BUILTIN_TEST is not set
+# CONFIG_ASH_CMDCMD is not set
 # CONFIG_ASH_MAIL is not set
-CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
-CONFIG_ASH_RANDOM_SUPPORT=y
-CONFIG_ASH_EXPAND_PRMT=y
+# CONFIG_ASH_OPTIMIZE_FOR_SIZE is not set
+# CONFIG_ASH_RANDOM_SUPPORT is not set
+# CONFIG_ASH_EXPAND_PRMT is not set
 # CONFIG_HUSH is not set
 # CONFIG_HUSH_HELP is not set
 # CONFIG_HUSH_INTERACTIVE is not set
@@ -771,11 +767,7 @@ CONFIG_ASH_EXPAND_PRMT=y
 # CONFIG_HUSH_LOOPS is not set
 # CONFIG_LASH is not set
 # CONFIG_MSH is not set
-
-#
-# Bourne Shell Options
-#
-CONFIG_FEATURE_SH_EXTRA_QUIET=y
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 # CONFIG_FEATURE_SH_STANDALONE is not set
 # CONFIG_CTTYHACK is not set
 

diff --git a/config/install/passwd b/config/install/passwd
index 365a8d7f75e30cb018d210911301aa2f8565da4c..233d68fae11b839432dac65bf06c1ba19862cffa 100644 (file)
--- a/config/install/passwd
+++ b/config/install/passwd
@@ -1 +1 @@
-root::0:0:root:/:/bin/ash
+root::0:0:root:/:/bin/sh

diff --git a/lfs/bash b/lfs/bash
index edf47ee403d6771024ddbf97859933b9a82490da..2297644968102ea573dfe0e4e52ea6a3bcf393f3 100644 (file)
--- a/lfs/bash
+++ b/lfs/bash
@@ -83,14 +83,20 @@ ifeq "$(STAGE)" "base"
 endif
 
 ifeq "$(STAGE)" "installer"
-       cd $(DIR_APP) && ./configure --prefix=/usr \
-                                               --target=$(UCLIBC_TARGET) \
-                                               --host=$(UCLIBC_TARGET) \
-                                               --bindir=/bin \
-                                               --without-bash-malloc \
-                                               #--with-installed-readline
-       cd $(DIR_APP) && make $(PARALLELISMFLAGS)
-       cd $(DIR_APP) && make install DESTDIR=$(INSTALLER_DIR)
+       cd $(DIR_APP)/support && touch configure.ac; libtoolize -f
+       cd $(DIR_APP)/support && autoconf --force
+       cd $(DIR_APP) && CCFLAGS_FOR_BUILD="$(CFLAGS)" \
+               ac_cv_func_setvbuf_reversed=no \
+               ./configure --prefix=/usr \
+                       --host=$(UCLIBC_TARGET) \
+                       --bindir=/bin \
+                       --without-bash-malloc \
+                       --with-installed-readline \
+                       --with-curses \
+                       --enable-alias
+       cd $(DIR_APP) && make CC=$(U_CC) CC_FOR_BUILD="$(HOST_GCC)" $(PARALLELISMFLAGS)
+       cd $(DIR_APP) && make CC=$(U_CC) install DESTDIR=$(INSTALLER_DIR)
+       ln -svf bash $(INSTALLER_DIR)/bin/sh
 endif
 
        @rm -rf $(DIR_APP)

diff --git a/lfs/readline b/lfs/readline
index a9b0fad4accd6f52f703dbd4aec9af8607fa4acf..3f80f59d6445dd92c950bafef4c2fd1987585167 100644 (file)
--- a/lfs/readline
+++ b/lfs/readline
@@ -68,8 +68,13 @@ ifeq "$(STAGE)" "base"
 endif
 
 ifeq "$(STAGE)" "installer"
+       cd $(DIR_APP) && libtoolize -f
+       cd $(DIR_APP) && autoconf --force
        cd $(DIR_APP) && $(U_TOOLS) bash_cv_func_sigsetjmp=yes \
-               ./configure --prefix=/usr
+               ./configure \
+                       --prefix=/usr \
+                       --host=$(UCLIBC_TARGET) \
+                       --with-curses
        cd $(DIR_APP) && make $(PARALLELISMFLAGS) SHLIB_LIBS=-lncurses
        cd $(DIR_APP) && make install DESTDIR=$(INSTALLER_DIR)
 endif

diff --git a/make.sh b/make.sh
index a47979d1e4c3d5aca6e0c358be07a8ba6be89f97..45e753fff2e081bcb93c48aabb2fbae3283c35a4 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -437,7 +437,7 @@ installer_build() {
        ipfire_make pcre
        ipfire_make popt
        ipfire_make glib
-       #ipfire_make readline
+       ipfire_make readline
        ipfire_make e2fsprogs
        ipfire_make util-linux-ng
        ipfire_make parted
@@ -450,7 +450,7 @@ installer_build() {
        ipfire_make python-modules
        ipfire_make slang
        ipfire_make newt
-       #ipfire_make bash
+       ipfire_make bash
        ipfire_make strace
        ipfire_make cpio
        ipfire_make lzma

diff --git a/src/rootfiles/installer/bash b/src/rootfiles/installer/bash
new file mode 100644 (file)
index 0000000..30082e2
--- /dev/null
+++ b/src/rootfiles/installer/bash
@@ -0,0 +1,15 @@
+INSTALLER_DIR/bin/sh
+INSTALLER_DIR/bin/bash
+#INSTALLER_DIR/bin/bashbug
+#INSTALLER_DIR/usr/info
+#INSTALLER_DIR/usr/info/bash.info
+#INSTALLER_DIR/usr/info/dir
+#INSTALLER_DIR/usr/man/man1/bash.1
+#INSTALLER_DIR/usr/man/man1/bashbug.1
+#INSTALLER_DIR/usr/share/locale/en@boldquot
+#INSTALLER_DIR/usr/share/locale/en@boldquot/LC_MESSAGES
+#INSTALLER_DIR/usr/share/locale/en@boldquot/LC_MESSAGES/bash.mo
+#INSTALLER_DIR/usr/share/locale/en@quot
+#INSTALLER_DIR/usr/share/locale/en@quot/LC_MESSAGES
+#INSTALLER_DIR/usr/share/locale/en@quot/LC_MESSAGES/bash.mo
+#INSTALLER_DIR/usr/share/locale/ru/LC_MESSAGES/bash.mo

diff --git a/src/rootfiles/installer/readline b/src/rootfiles/installer/readline
new file mode 100644 (file)
index 0000000..b300e08
--- /dev/null
+++ b/src/rootfiles/installer/readline
@@ -0,0 +1,22 @@
+#INSTALLER_DIR/usr/include/readline
+#INSTALLER_DIR/usr/include/readline/chardefs.h
+#INSTALLER_DIR/usr/include/readline/history.h
+#INSTALLER_DIR/usr/include/readline/keymaps.h
+#INSTALLER_DIR/usr/include/readline/readline.h
+#INSTALLER_DIR/usr/include/readline/rlconf.h
+#INSTALLER_DIR/usr/include/readline/rlstdc.h
+#INSTALLER_DIR/usr/include/readline/rltypedefs.h
+#INSTALLER_DIR/usr/include/readline/tilde.h
+#INSTALLER_DIR/usr/lib/libhistory.a
+INSTALLER_DIR/usr/lib/libhistory.so
+INSTALLER_DIR/usr/lib/libhistory.so.5
+INSTALLER_DIR/usr/lib/libhistory.so.5.2
+#INSTALLER_DIR/usr/lib/libreadline.a
+INSTALLER_DIR/usr/lib/libreadline.so
+INSTALLER_DIR/usr/lib/libreadline.so.5
+INSTALLER_DIR/usr/lib/libreadline.so.5.2
+#INSTALLER_DIR/usr/share/info/history.info
+#INSTALLER_DIR/usr/share/info/readline.info
+#INSTALLER_DIR/usr/share/info/rluserman.info
+#INSTALLER_DIR/usr/share/man/man3/history.3
+#INSTALLER_DIR/usr/share/man/man3/readline.3