From 3dd906f4dc3c8c3decfc5601fea3bd84fe0e4111 Mon Sep 17 00:00:00 2001 From: Dimitar Zhekov Date: Fri, 19 Dec 2003 14:40:01 +0000 Subject: [PATCH] Dimitar Zhekov : Written by me to link bash against libreadline.so, this option worked while both libreadline.{a,so*} were in /lib (well it never actually worked, ncurses failed). Now that .so is in /lib and .a in /usr/lib, bash is always linked against .a, so the option desn't make any sense - the .a included in bash works just as well. git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@2001 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- Documentation/Developers/CHANGELOG-RENE | 1 + package/base/bash/bash.conf | 7 +-- package/base/bash/config.hlp | 6 --- package/base/bash/config.in | 1 - package/base/bash/dont-link-history.diff | 37 -------------- package/base/ncurses/one-step-install.patch | 53 --------------------- package/base/readline/readline.conf | 13 +---- target/bootdisk/config.in | 8 +++- 8 files changed, 10 insertions(+), 116 deletions(-) delete mode 100644 package/base/bash/dont-link-history.diff delete mode 100644 package/base/ncurses/one-step-install.patch diff --git a/Documentation/Developers/CHANGELOG-RENE b/Documentation/Developers/CHANGELOG-RENE index 1f4f48183..e93d98dad 100644 --- a/Documentation/Developers/CHANGELOG-RENE +++ b/Documentation/Developers/CHANGELOG-RENE @@ -2,6 +2,7 @@ *) 2003-12-19 (2.0.0-rc3 - 2.0.0-rc4) - updated koffice + - Dimitar Zhekov: remove bash '--with-installed-readline' *) 2003-12-17 (2.0.0-rc3 - 2.0.0-rc4) diff --git a/package/base/bash/bash.conf b/package/base/bash/bash.conf index 22bc5fc6b..ace211081 100644 --- a/package/base/bash/bash.conf +++ b/package/base/bash/bash.conf @@ -37,12 +37,7 @@ pkg_bash_postmake() { premake="cat /dev/null > lib/malloc/malloc.c" confopt="$confopt --without-gnu-malloc" -if [ $stagelevel -le 1 ] ; then - confopt="$confopt --disable-readline" -elif [ "$ROCKCFG_PKG_BASH_INST_RLL" = 1 ] ; then - preconf="patch -p0 < $confdir/dont-link-history.diff" - confopt="$confopt --with-installed-readline" -fi +[ $stagelevel -le 1 ] && confopt="$confopt --disable-readline" [ "$ROCKCFG_PKG_BASH_PROGCOMP" = 0 ] && confopt="$confopt --disable-progcomp" [ "$ROCKCFG_PKG_BASH_HELP_CMD" = 0 ] && confopt="$confopt --disable-help-builtin" diff --git a/package/base/bash/config.hlp b/package/base/bash/config.hlp index 35cd58bed..a8df2c2dd 100644 --- a/package/base/bash/config.hlp +++ b/package/base/bash/config.hlp @@ -35,9 +35,3 @@ ROCKCFG_PKG_BASH_HELP_CMD but if your target contains no bash documentation, as for example bootdisk, you will not have any help for the shell commands. If you are not terribly low of disk space, leave the builtin help enabled. - -ROCKCFG_PKG_BASH_INST_RLL - Build bash with the (already) installed readline library, not with - the one included in bash. Note that bash will be linked against the - shared readline library (if any), which will be moved from /usr/lib - to /lib. Don't change this option after readline has been build. diff --git a/package/base/bash/config.in b/package/base/bash/config.in index 7ed4b0b26..f9d061c01 100644 --- a/package/base/bash/config.in +++ b/package/base/bash/config.in @@ -24,6 +24,5 @@ menu_begin MENU_PKG_BASH 'Bash Options' bool 'Enable programmable completion' ROCKCFG_PKG_BASH_PROGCOMP 1 bool 'Enable help builtin command' ROCKCFG_PKG_BASH_HELP_CMD 1 -bool 'Build with installed readline' ROCKCFG_PKG_BASH_INST_RLL 0 menu_end diff --git a/package/base/bash/dont-link-history.diff b/package/base/bash/dont-link-history.diff deleted file mode 100644 index b538401fa..000000000 --- a/package/base/bash/dont-link-history.diff +++ /dev/null @@ -1,37 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/bash/dont-link-history.diff -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./Makefile.in.orig 2002-05-31 20:44:23.000000000 +0300 -+++ ./Makefile.in 2003-09-22 14:53:13.000000000 +0300 -@@ -340,10 +340,10 @@ - $(BASHINCDIR)/shtty.h $(BASHINCDIR)/typemax.h \ - $(BASHINCDIR)/ocache.h - --LIBRARIES = $(SHLIB_LIB) $(READLINE_LIB) $(HISTORY_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \ -+LIBRARIES = $(SHLIB_LIB) $(READLINE_LIB) $(TERMCAP_LIB) $(GLOB_LIB) \ - $(TILDE_LIB) $(MALLOC_LIB) $(LOCAL_LIBS) - --LIBDEP = $(SHLIB_DEP) $(READLINE_DEP) $(HISTORY_DEP) $(TERMCAP_DEP) $(GLOB_DEP) \ -+LIBDEP = $(SHLIB_DEP) $(READLINE_DEP) $(TERMCAP_DEP) $(GLOB_DEP) \ - $(TILDE_DEP) $(MALLOC_DEP) - - LIBRARY_LDFLAGS = $(READLINE_LDFLAGS) $(HISTORY_LDFLAGS) $(GLOB_LDFLAGS) \ diff --git a/package/base/ncurses/one-step-install.patch b/package/base/ncurses/one-step-install.patch deleted file mode 100644 index f841834ca..000000000 --- a/package/base/ncurses/one-step-install.patch +++ /dev/null @@ -1,53 +0,0 @@ -# --- ROCK-COPYRIGHT-NOTE-BEGIN --- -# -# This copyright note is auto-generated by ./scripts/Create-CopyPatch. -# Please add additional copyright information _after_ the line containing -# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by -# the ./scripts/Create-CopyPatch script. Do not edit this copyright text! -# -# ROCK Linux: rock-src/package/base/ncurses/one-step-install.patch -# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or -# (at your option) any later version. A copy of the GNU General Public -# License can be found at Documentation/COPYING. -# -# Many people helped and are helping developing ROCK Linux. Please -# have a look at http://www.rocklinux.org/ and the Documentation/TEAM -# file for details. -# -# --- ROCK-COPYRIGHT-NOTE-END --- - ---- ./mk-1st.awk.orig 2002-04-20 19:32:47.000000000 +0200 -+++ ./mk-1st.awk 2003-11-10 09:04:39.651894512 +0100 -@@ -52,8 +52,7 @@ - # - function symlink(src,dst) { - if ( src != dst ) { -- printf "rm -f %s; ", dst -- printf "$(LN_S) %s %s; ", src, dst -+ printf "$(LN_S) -f %s %s; ", src, dst - } - } - function rmlink(directory, dst) { -@@ -224,8 +223,7 @@ - src_name = sprintf("../lib/%s", end_name); - dst_name = sprintf("$(DESTDIR)$(libdir)/%s", end_name); - printf "\t@echo installing %s as %s\n", src_name, dst_name -- printf "\t-@rm -f %s\n", dst_name -- printf "\t$(INSTALL_LIB) %s %s\n", src_name, dst_name -+ printf "\tinstall %s %s\n", src_name, dst_name - - sharedlinks("$(DESTDIR)$(libdir)") - -@@ -235,7 +233,7 @@ - { - ovr_name = sprintf("libcurses%s", suffix) - printf "\t@echo linking %s to %s\n", end_name, ovr_name -- printf "\tcd $(DESTDIR)$(libdir) && (rm -f %s; $(LN_S) %s %s; )\n", ovr_name, end_name, ovr_name -+ printf "\t$(LN_S) -f %s $(DESTDIR)$(libdir)/%s\n", end_name, ovr_name - } - if ( ldconfig != "" ) { - printf "\t- test -z \"$(DESTDIR)\" && %s\n", ldconfig diff --git a/package/base/readline/readline.conf b/package/base/readline/readline.conf index 5e307d47a..4e29a6bd5 100644 --- a/package/base/readline/readline.conf +++ b/package/base/readline/readline.conf @@ -20,16 +20,7 @@ # # --- ROCK-COPYRIGHT-NOTE-END --- - -readline_postmake() { - eval $MAKE shared ; eval $MAKE install-shared - if [ "$ROCKCFG_PKG_BASH_INST_RLL" = 1 ] ; then - echo "readline libraries may be needed by bash, moving them ..." - mv -fv $root/usr/lib/lib{readline,history}.* $root/lib - fi - cp -rv examples/ $docdir -} - +var_remove confopt " " "--disable-shared" var_remove confopt " " "--disable-static" -postmake=readline_postmake +postmake="cp -rv examples/ $docdir" diff --git a/target/bootdisk/config.in b/target/bootdisk/config.in index 083a35b2c..e34f43255 100644 --- a/target/bootdisk/config.in +++ b/target/bootdisk/config.in @@ -21,6 +21,11 @@ # --- ROCK-COPYRIGHT-NOTE-END --- bool 'Include the kiss shell into the initrd' ROCKCFG_BOOTDISK_USEKISS 1 +choice ROCKCFG_BOOTDISK_COMPLEV 2 \ + 2 'Minimal compression, 550K/900K required to decompress' \ + 5 'Average compression, 1300K/2100K required to decompress' \ + 9 'Maximum compression, 2300K/3700K required to decompress' +bool 'Reduce memory usage on decompression' ROCKCFG_BOOTDISK_SMALLMEM 1 pkgfilter sed ' @@ -69,7 +74,7 @@ ROCKCFGSET_DIETLIBC_modutils=1 ROCKCFGSET_DIETLIBC_module_init_tools=1 ROCKCFGSET_DIETLIBC_kiss=1 ROCKCFGSET_DIETLIBC_tar=1 -ROCKCFGSET_DIETLIBC_gzip=1 +ROCKCFGSET_DIETLIBC_bzip2=1 ROCKCFGSET_DIETLIBC_wget=1 ROCKCFGSET_DIETLIBC_gawk=1 ROCKCFGSET_DIETLIBC_iproute2=1 @@ -79,7 +84,6 @@ ROCKCFGSET_PKG_GCC2_NO_CHILL=1 ROCKCFGSET_PKG_GCC3_NO_JAVA=1 ROCKCFGSET_PKG_GCC33_NO_JAVA=1 ROCKCFGSET_PKG_BASH_PROGCOMP=0 -ROCKCFGSET_PKG_BASH_INST_RLL=0 ROCKCFGSET_DO_REBUILD_STAGE=0 ROCKCFGSET_CREATE_DOCS=0