bash: sync with OE (no package changes)

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2959 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 28 insertions, 25 deletions

diff --git a/meta/packages/bash/bash.inc b/meta/packages/bash/bash.inc
new file mode 100644
index 0000000000..80aedfa1c8
--- /dev/null
+++ b/meta/packages/bash/bash.inc
@@ -0,0 +1,26 @@
+DESCRIPTION = "An sh-compatible command language interpreter."
+HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
+DEPENDS = "ncurses"
+SECTION = "base/shell"
+LICENSE = "GPL"
+
+inherit autotools gettext
+
+PARALLEL_MAKE = ""
+
+bindir = "/bin"
+sbindir = "/sbin"
+
+EXTRA_OECONF = "--with-ncurses"
+export CC_FOR_BUILD = "${BUILD_CC}"
+
+do_configure () {
+        gnu-configize
+        oe_runconf
+}
+
+pkg_postinst () {
+        touch ${sysconfdir}/shells
+        grep -q "bin/bash" ${sysconfdir}/shells || echo /bin/bash >> ${sysconfdir}/shells
+        grep -q "bin/sh" ${sysconfdir}/shells || echo /bin/sh >> ${sysconfdir}/shells
+}
diff --git a/meta/packages/bash/bash_3.2.bb b/meta/packages/bash/bash_3.2.bb
index e3d6b0560c..8e0293e001 100644
--- a/meta/packages/bash/bash_3.2.bb
+++ b/meta/packages/bash/bash_3.2.bb
@@ -1,28 +1,5 @@
-DESCRIPTION = "An sh-compatible command language interpreter."
-HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
-DEPENDS = "ncurses"
-SECTION = "base/shell"
-LICENSE = "GPL"
+require bash.inc
+PR = "r1"
 
 SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
            file://001-005.patch;patch=1"
-
-inherit autotools gettext
-
-PARALLEL_MAKE = ""
-
-bindir = "/bin"
-sbindir = "/sbin"
-
-EXTRA_OECONF = "--with-ncurses"
-export CC_FOR_BUILD = "${BUILD_CC}"
-
-do_configure () {
-        gnu-configize
-        oe_runconf
-}
-
-pkg_postinst () {
-        grep -q "bin/bash" ${sysconfdir}/shells || echo /bin/bash >> ${sysconfdir}/shells
-        grep -q "bin/sh" ${sysconfdir}/shells || echo /bin/sh >> ${sysconfdir}/shells
-}