[oe-commits] org.oe.dev bash: unified, bumped PR

[hrw commit]

bash: unified, bumped PR

Author: hrw at openembedded.org
Branch: org.openembedded.dev
Revision: 8443ed9b025cfb5d5ec77c591f236b1227a47c5f
ViewMTN: http://monotone.openembedded.org/revision.psp?id=8443ed9b025cfb5d5ec77c591f236b1227a47c5f
Files:
1
packages/bash/bash.inc
packages/bash/bash_3.0.bb
packages/bash/bash_3.2.bb
Diffs:

#
# mt diff -ra1525fff1e593fda2912c4e94cf13f76074249e0 -r8443ed9b025cfb5d5ec77c591f236b1227a47c5f
#
# 
# 
# add_file "packages/bash/bash.inc"
#  content [bf00237c2f502119d09ac1aef2d72c87b26adae2]
# 
# patch "packages/bash/bash_3.0.bb"
#  from [48de4a6d031cc4d6918f31c704c403be5fff4b4f]
#    to [a144ffb9fe330926ad4418e417a6c166ca2d26d2]
# 
# patch "packages/bash/bash_3.2.bb"
#  from [f98209f0fc4e7b5bb0b89433949527e7d14f208b]
#    to [8c159b76d706e4868425c200897f29f7df2c8f22]
# 
============================================================
--- packages/bash/bash.inc	bf00237c2f502119d09ac1aef2d72c87b26adae2
+++ packages/bash/bash.inc	bf00237c2f502119d09ac1aef2d72c87b26adae2
@@ -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
+}
============================================================
--- packages/bash/bash_3.0.bb	48de4a6d031cc4d6918f31c704c403be5fff4b4f
+++ packages/bash/bash_3.0.bb	a144ffb9fe330926ad4418e417a6c166ca2d26d2
@@ -1,31 +1,6 @@
-DESCRIPTION = "An sh-compatible command language interpreter."
-HOMEPAGE = "http://cnswww.cns.cwru.edu/~chet/bash/bashtop.html"
-DEPENDS = "ncurses"
-SECTION = "base/shell"
-LICENSE = "GPL"
-PR = "r7"
+require bash.inc
+PR = "r8"
 
 SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz \
         file://bash-3.0-fixes.patch;patch=1 \
 	file://signames-mipsel.diff;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 () {
-	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
-}
============================================================
--- packages/bash/bash_3.2.bb	f98209f0fc4e7b5bb0b89433949527e7d14f208b
+++ packages/bash/bash_3.2.bb	8c159b76d706e4868425c200897f29f7df2c8f22
@@ -1,29 +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 () {
-	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
-}