From: Michael Lauer Date: Mon, 24 Jan 2005 13:03:22 +0000 (+0000) Subject: fix bash-3.0 and move bash-2.05 into nonworking X-Git-Tag: Release-2010-05/1~15342 X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=1f6c37d392cae491fa443fd2102ae2f2df96b6f7;p=openembedded.git fix bash-3.0 and move bash-2.05 into nonworking BKrev: 41f4f21ale1tSWdmP_YzolbuCedUmw --- diff --git a/packages/bash/bash_2.05b.bb b/packages/bash/bash_2.05b.bb deleted file mode 100644 index 7134e04d5a..0000000000 --- a/packages/bash/bash_2.05b.bb +++ /dev/null @@ -1,77 +0,0 @@ -DESCRIPTION = "An sh-compatible command language interpreter." -HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" -DEPENDS = "ncurses" -PROVIDES = "virtual/sh" -SECTION = "base/shell" -LICENSE = "GPL" -PR = "r4" - -SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \ - file://bashbug-editor.patch;patch=1;pnum=0 \ - file://deb-bash-config.patch;patch=1 \ - file://deb-examples.patch;patch=1;pnum=0 \ - file://man-arithmetic.patch;patch=1;pnum=0 \ - file://man-fignore.patch;patch=1;pnum=0 \ - file://man-bashrc.patch;patch=1 \ - file://privmode.patch;patch=1 \ - file://various.patch;patch=1 \ - file://report-155436.patch;patch=1;pnum=0 \ - file://bash205b-001.patch;patch=1;pnum=0 \ - file://bash205b-002.patch;patch=1;pnum=0 \ - file://bash205b-003.patch;patch=1;pnum=0 \ - file://bash205b-004.patch;patch=1;pnum=0 \ - file://bash205b-005.patch;patch=1;pnum=0 \ - file://bash205b-006.patch;patch=1;pnum=0 \ - file://bash205b-007.patch;patch=1;pnum=0 \ - file://rl-examples.patch;patch=1;pnum=0 \ - file://rl-inputrc.patch;patch=1 \ - file://rl-del-backspace-policy.patch;patch=1;pnum=0 \ - file://rl-8bit-init.patch;patch=1 \ - file://rl-slow-multibyte.patch;patch=1 \ - file://s390-build.patch;patch=1;pnum=0 \ - file://rbash-manpage.patch;patch=1;pnum=0 \ - file://rbash-login-shell.patch;patch=1 \ - file://execute-cmd.patch;patch=1 \ - file://builtins-shift.patch;patch=1;pnum=0 \ - file://suspend-segfault.patch;patch=1 \ - file://mailcheck.patch;patch=1 \ - file://autofoo.patch;patch=1 \ - file://gcc34.patch;patch=1 \ - file://signames-mipsel.diff;patch=1" - -inherit autotools - -bindir = "/bin" -sbindir = "/sbin" - -EXTRA_OECONF = "--with-curses" -BUILD_CPPFLAGS_append = " -I${S} -I${S}/include" -BUILD_CFLAGS_append = " -I${S} -I${S}/include" -export CFLAGS_FOR_BUILD = "${BUILD_CFLAGS}" -export CPPFLAGS_FOR_BUILD = "${BUILD_CPPFLAGS}" -export LDFLAGS_FOR_BUILD = "${BUILD_LDFLAGS}" -export CC_FOR_BUILD = "${BUILD_CC}" - -do_configure () { - if [ ! -e acinclude.m4 ]; then - mv aclocal.m4 acinclude.m4 - fi - autotools_do_configure -} - -# dont use update-alternatives class because since we are dealing with /bin/sh -# we need to do the remove in pkg_prerm where the /bin/sh link still points -# to something (postrm is a shell script) - -ALTERNATIVE_NAME = "sh" -ALTERNATIVE_PATH = "${bindir}/bash" -ALTERNATIVE_PRIORITY = "30" -ALTERNATIVE_LINK = "${bindir}/${ALTERNATIVE_NAME}" - -pkg_postinst() { -update-alternatives --install ${ALTERNATIVE_LINK} ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} ${ALTERNATIVE_PRIORITY} -} - -pkg_prerm() { -update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} -} diff --git a/packages/bash/bash_3.0.bb b/packages/bash/bash_3.0.bb index ba7b080670..b7b40cfdc6 100644 --- a/packages/bash/bash_3.0.bb +++ b/packages/bash/bash_3.0.bb @@ -4,9 +4,7 @@ DEPENDS = "ncurses" SECTION = "base/shell" LICENSE = "GPL" PROVIDES = "virtual/sh" -PR = "r2" - -DEFAULT_PREFERENCE = "-1" +PR = "r3" SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \ file://signames-mipsel.diff;patch=1" @@ -16,7 +14,7 @@ inherit autotools bindir = "/bin" sbindir = "/sbin" -EXTRA_OECONF = "--with-curses" +EXTRA_OECONF = "--with-ncurses" export CC_FOR_BUILD = "${BUILD_CC}" do_configure () { diff --git a/packages/bash/bash-2.05b/autofoo.patch b/packages/nonworking/bash/bash-2.05b/autofoo.patch similarity index 100% rename from packages/bash/bash-2.05b/autofoo.patch rename to packages/nonworking/bash/bash-2.05b/autofoo.patch diff --git a/packages/bash/bash-2.05b/bash205b-001.patch b/packages/nonworking/bash/bash-2.05b/bash205b-001.patch similarity index 100% rename from packages/bash/bash-2.05b/bash205b-001.patch rename to packages/nonworking/bash/bash-2.05b/bash205b-001.patch diff --git a/packages/bash/bash-2.05b/bash205b-002.patch b/packages/nonworking/bash/bash-2.05b/bash205b-002.patch similarity index 100% rename from packages/bash/bash-2.05b/bash205b-002.patch rename to packages/nonworking/bash/bash-2.05b/bash205b-002.patch diff --git a/packages/bash/bash-2.05b/bash205b-003.patch b/packages/nonworking/bash/bash-2.05b/bash205b-003.patch similarity index 100% rename from packages/bash/bash-2.05b/bash205b-003.patch rename to packages/nonworking/bash/bash-2.05b/bash205b-003.patch diff --git a/packages/bash/bash-2.05b/bash205b-004.patch b/packages/nonworking/bash/bash-2.05b/bash205b-004.patch similarity index 100% rename from packages/bash/bash-2.05b/bash205b-004.patch rename to packages/nonworking/bash/bash-2.05b/bash205b-004.patch diff --git a/packages/bash/bash-2.05b/bash205b-005.patch b/packages/nonworking/bash/bash-2.05b/bash205b-005.patch similarity index 100% rename from packages/bash/bash-2.05b/bash205b-005.patch rename to packages/nonworking/bash/bash-2.05b/bash205b-005.patch diff --git a/packages/bash/bash-2.05b/bash205b-006.patch b/packages/nonworking/bash/bash-2.05b/bash205b-006.patch similarity index 100% rename from packages/bash/bash-2.05b/bash205b-006.patch rename to packages/nonworking/bash/bash-2.05b/bash205b-006.patch diff --git a/packages/bash/bash-2.05b/bash205b-007.patch b/packages/nonworking/bash/bash-2.05b/bash205b-007.patch similarity index 100% rename from packages/bash/bash-2.05b/bash205b-007.patch rename to packages/nonworking/bash/bash-2.05b/bash205b-007.patch diff --git a/packages/bash/bash-2.05b/bashbug-editor.patch b/packages/nonworking/bash/bash-2.05b/bashbug-editor.patch similarity index 100% rename from packages/bash/bash-2.05b/bashbug-editor.patch rename to packages/nonworking/bash/bash-2.05b/bashbug-editor.patch diff --git a/packages/bash/bash-2.05b/builtins-shift.patch b/packages/nonworking/bash/bash-2.05b/builtins-shift.patch similarity index 100% rename from packages/bash/bash-2.05b/builtins-shift.patch rename to packages/nonworking/bash/bash-2.05b/builtins-shift.patch diff --git a/packages/bash/bash-2.05b/deb-bash-config.patch b/packages/nonworking/bash/bash-2.05b/deb-bash-config.patch similarity index 100% rename from packages/bash/bash-2.05b/deb-bash-config.patch rename to packages/nonworking/bash/bash-2.05b/deb-bash-config.patch diff --git a/packages/bash/bash-2.05b/deb-examples.patch b/packages/nonworking/bash/bash-2.05b/deb-examples.patch similarity index 100% rename from packages/bash/bash-2.05b/deb-examples.patch rename to packages/nonworking/bash/bash-2.05b/deb-examples.patch diff --git a/packages/bash/bash-2.05b/execute-cmd.patch b/packages/nonworking/bash/bash-2.05b/execute-cmd.patch similarity index 100% rename from packages/bash/bash-2.05b/execute-cmd.patch rename to packages/nonworking/bash/bash-2.05b/execute-cmd.patch diff --git a/packages/bash/bash-2.05b/gcc34.patch b/packages/nonworking/bash/bash-2.05b/gcc34.patch similarity index 100% rename from packages/bash/bash-2.05b/gcc34.patch rename to packages/nonworking/bash/bash-2.05b/gcc34.patch diff --git a/packages/bash/bash-2.05b/mailcheck.patch b/packages/nonworking/bash/bash-2.05b/mailcheck.patch similarity index 100% rename from packages/bash/bash-2.05b/mailcheck.patch rename to packages/nonworking/bash/bash-2.05b/mailcheck.patch diff --git a/packages/bash/bash-2.05b/man-arithmetic.patch b/packages/nonworking/bash/bash-2.05b/man-arithmetic.patch similarity index 100% rename from packages/bash/bash-2.05b/man-arithmetic.patch rename to packages/nonworking/bash/bash-2.05b/man-arithmetic.patch diff --git a/packages/bash/bash-2.05b/man-bashrc.patch b/packages/nonworking/bash/bash-2.05b/man-bashrc.patch similarity index 100% rename from packages/bash/bash-2.05b/man-bashrc.patch rename to packages/nonworking/bash/bash-2.05b/man-bashrc.patch diff --git a/packages/bash/bash-2.05b/man-fignore.patch b/packages/nonworking/bash/bash-2.05b/man-fignore.patch similarity index 100% rename from packages/bash/bash-2.05b/man-fignore.patch rename to packages/nonworking/bash/bash-2.05b/man-fignore.patch diff --git a/packages/bash/bash-2.05b/privmode.patch b/packages/nonworking/bash/bash-2.05b/privmode.patch similarity index 100% rename from packages/bash/bash-2.05b/privmode.patch rename to packages/nonworking/bash/bash-2.05b/privmode.patch diff --git a/packages/bash/bash-2.05b/rbash-login-shell.patch b/packages/nonworking/bash/bash-2.05b/rbash-login-shell.patch similarity index 100% rename from packages/bash/bash-2.05b/rbash-login-shell.patch rename to packages/nonworking/bash/bash-2.05b/rbash-login-shell.patch diff --git a/packages/bash/bash-2.05b/rbash-manpage.patch b/packages/nonworking/bash/bash-2.05b/rbash-manpage.patch similarity index 100% rename from packages/bash/bash-2.05b/rbash-manpage.patch rename to packages/nonworking/bash/bash-2.05b/rbash-manpage.patch diff --git a/packages/bash/bash-2.05b/report-155436.patch b/packages/nonworking/bash/bash-2.05b/report-155436.patch similarity index 100% rename from packages/bash/bash-2.05b/report-155436.patch rename to packages/nonworking/bash/bash-2.05b/report-155436.patch diff --git a/packages/bash/bash-2.05b/rl-8bit-init.patch b/packages/nonworking/bash/bash-2.05b/rl-8bit-init.patch similarity index 100% rename from packages/bash/bash-2.05b/rl-8bit-init.patch rename to packages/nonworking/bash/bash-2.05b/rl-8bit-init.patch diff --git a/packages/bash/bash-2.05b/rl-del-backspace-policy.patch b/packages/nonworking/bash/bash-2.05b/rl-del-backspace-policy.patch similarity index 100% rename from packages/bash/bash-2.05b/rl-del-backspace-policy.patch rename to packages/nonworking/bash/bash-2.05b/rl-del-backspace-policy.patch diff --git a/packages/bash/bash-2.05b/rl-examples.patch b/packages/nonworking/bash/bash-2.05b/rl-examples.patch similarity index 100% rename from packages/bash/bash-2.05b/rl-examples.patch rename to packages/nonworking/bash/bash-2.05b/rl-examples.patch diff --git a/packages/bash/bash-2.05b/rl-inputrc.patch b/packages/nonworking/bash/bash-2.05b/rl-inputrc.patch similarity index 100% rename from packages/bash/bash-2.05b/rl-inputrc.patch rename to packages/nonworking/bash/bash-2.05b/rl-inputrc.patch diff --git a/packages/bash/bash-2.05b/rl-slow-multibyte.patch b/packages/nonworking/bash/bash-2.05b/rl-slow-multibyte.patch similarity index 100% rename from packages/bash/bash-2.05b/rl-slow-multibyte.patch rename to packages/nonworking/bash/bash-2.05b/rl-slow-multibyte.patch diff --git a/packages/bash/bash-2.05b/s390-build.patch b/packages/nonworking/bash/bash-2.05b/s390-build.patch similarity index 100% rename from packages/bash/bash-2.05b/s390-build.patch rename to packages/nonworking/bash/bash-2.05b/s390-build.patch diff --git a/packages/bash/bash-2.05b/signames-mipsel.diff b/packages/nonworking/bash/bash-2.05b/signames-mipsel.diff similarity index 100% rename from packages/bash/bash-2.05b/signames-mipsel.diff rename to packages/nonworking/bash/bash-2.05b/signames-mipsel.diff diff --git a/packages/bash/bash-2.05b/suspend-segfault.patch b/packages/nonworking/bash/bash-2.05b/suspend-segfault.patch similarity index 100% rename from packages/bash/bash-2.05b/suspend-segfault.patch rename to packages/nonworking/bash/bash-2.05b/suspend-segfault.patch diff --git a/packages/bash/bash-2.05b/various.patch b/packages/nonworking/bash/bash-2.05b/various.patch similarity index 100% rename from packages/bash/bash-2.05b/various.patch rename to packages/nonworking/bash/bash-2.05b/various.patch diff --git a/packages/nonworking/bash/bash_2.05b.bb b/packages/nonworking/bash/bash_2.05b.bb new file mode 100644 index 0000000000..e69de29bb2