diff options
| author | Martin Ertsaas <mertsas@cisco.com> | 2012-09-19 09:16:55 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-09-24 11:10:55 +0100 |
| commit | e7b82cb4d107bfbfa5c939d406dd6ce6615b24e1 (patch) | |
| tree | 0128ceba2abbf0c3ad01952ab7fb3e4a09e83d3b /meta | |
| parent | 28823486ba8ce4d88bbad3cea696ce9fba0cc165 (diff) | |
| download | openembedded-core-e7b82cb4d107bfbfa5c939d406dd6ce6615b24e1.tar.gz openembedded-core-e7b82cb4d107bfbfa5c939d406dd6ce6615b24e1.tar.bz2 openembedded-core-e7b82cb4d107bfbfa5c939d406dd6ce6615b24e1.zip | |
bash: Make it possible to run bash 3.2.48 instead of 4.2.
bash-3.2.48 did not provide the linking from sh to bash, making it unusable.
Moving the license part out of the bash.inc file, and into bash_4.2.bb file makes
us able to use that file also for bash_3.2.48.bb, which makes maintaining both
at the same time a lot easier.
Signed-off-by: Martin Ertsaas <mertsas@cisco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-extended/bash/bash.inc | 3 | ||||
| -rw-r--r-- | meta/recipes-extended/bash/bash_3.2.48.bb | 31 | ||||
| -rw-r--r-- | meta/recipes-extended/bash/bash_4.2.bb | 6 |
3 files changed, 7 insertions, 33 deletions
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index 3684191d03..ae4b681000 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -2,9 +2,6 @@ DESCRIPTION = "An sh-compatible command language interpreter." HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" SECTION = "base/shell" -# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "ncurses bison-native" inherit autotools gettext update-alternatives diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb index 509d7a092e..828d629469 100644 --- a/meta/recipes-extended/bash/bash_3.2.48.bb +++ b/meta/recipes-extended/bash/bash_3.2.48.bb @@ -1,12 +1,9 @@ -DESCRIPTION = "An sh-compatible command language interpreter." -HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" -SECTION = "base/shell" +require bash.inc LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a" -DEPENDS = "ncurses" -PR = "r10" +PR = "r11" SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0;name=patch001 \ @@ -24,27 +21,3 @@ SRC_URI[patch003.sha256sum] = "354886097cd95b4def77028f32ee01e2e088d58a98184fede SRC_URI[md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" SRC_URI[sha256sum] = "128d281bd5682ba5f6953122915da71976357d7a76490d266c9173b1d0426348" - -inherit autotools gettext - -PARALLEL_MAKE = "" - -bindir = "/bin" -sbindir = "/sbin" - -EXTRA_OECONF = "--with-ncurses" -export CC_FOR_BUILD = "${BUILD_CC}" - -export AUTOHEADER = "true" - -do_configure_prepend () { - if [ ! -e acinclude.m4 ]; then - cat aclocal.m4 > acinclude.m4 - fi -} - -pkg_postinst_${PN} () { - touch $D${sysconfdir}/shells - grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells - grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells -} diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb index 384eb6265d..5a0f015c79 100644 --- a/meta/recipes-extended/bash/bash_4.2.bb +++ b/meta/recipes-extended/bash/bash_4.2.bb @@ -1,6 +1,10 @@ require bash.inc -PR = "r4" +# GPLv2+ (< 4.0), GPLv3+ (>= 4.0) +LICENSE = "GPLv3+" +LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" + +PR = "r5" SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \ ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \ |