summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/bash/bash.inc3
-rw-r--r--meta/recipes-extended/bash/bash_3.2.48.bb31
-rw-r--r--meta/recipes-extended/bash/bash_4.2.bb6
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."
2HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html" 2HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
3SECTION = "base/shell" 3SECTION = "base/shell"
4 4
5# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
6LICENSE = "GPLv3+"
7LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
8DEPENDS = "ncurses bison-native" 5DEPENDS = "ncurses bison-native"
9 6
10inherit autotools gettext update-alternatives 7inherit 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 @@
1DESCRIPTION = "An sh-compatible command language interpreter." 1require bash.inc
2HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
3SECTION = "base/shell"
4 2
5LICENSE = "GPLv2+" 3LICENSE = "GPLv2+"
6LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a" 4LIC_FILES_CHKSUM = "file://COPYING;md5=fd5d9bcabd8ed5a54a01ce8d183d592a"
7DEPENDS = "ncurses"
8 5
9PR = "r10" 6PR = "r11"
10 7
11SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \ 8SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \
12 ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0;name=patch001 \ 9 ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-049;apply=yes;striplevel=0;name=patch001 \
@@ -24,27 +21,3 @@ SRC_URI[patch003.sha256sum] = "354886097cd95b4def77028f32ee01e2e088d58a98184fede
24 21
25SRC_URI[md5sum] = "338dcf975a93640bb3eaa843ca42e3f8" 22SRC_URI[md5sum] = "338dcf975a93640bb3eaa843ca42e3f8"
26SRC_URI[sha256sum] = "128d281bd5682ba5f6953122915da71976357d7a76490d266c9173b1d0426348" 23SRC_URI[sha256sum] = "128d281bd5682ba5f6953122915da71976357d7a76490d266c9173b1d0426348"
27
28inherit autotools gettext
29
30PARALLEL_MAKE = ""
31
32bindir = "/bin"
33sbindir = "/sbin"
34
35EXTRA_OECONF = "--with-ncurses"
36export CC_FOR_BUILD = "${BUILD_CC}"
37
38export AUTOHEADER = "true"
39
40do_configure_prepend () {
41 if [ ! -e acinclude.m4 ]; then
42 cat aclocal.m4 > acinclude.m4
43 fi
44}
45
46pkg_postinst_${PN} () {
47 touch $D${sysconfdir}/shells
48 grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells
49 grep -q "bin/sh" $D${sysconfdir}/shells || echo /bin/sh >> $D${sysconfdir}/shells
50}
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 @@
1require bash.inc 1require bash.inc
2 2
3PR = "r4" 3# GPLv2+ (< 4.0), GPLv3+ (>= 4.0)
4LICENSE = "GPLv3+"
5LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
6
7PR = "r5"
4 8
5SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \ 9SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
6 ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \ 10 ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-001;apply=yes;striplevel=0;name=patch001 \