| Submitter | Otavio Salvador |
|---|---|
| Date | July 19, 2012, 3:16 p.m. |
| Message ID | <1342710998-15446-1-git-send-email-otavio@ossystems.com.br> |
| Download | mbox | patch |
| Permalink | /patch/32539/ |
| State | New |
| Headers | show |
Comments
On 19 July 2012 16:16, Otavio Salvador <otavio@ossystems.com.br> wrote: > We change the installation process so we have bashbug in ${bindir} and > bash at ${base_bindir}; we also build tested it many times in a 8 CPU > machine and had no problem building it in parallel so we dropped > PARALLEL_MAKE override. I'd really like to see those split out as separate commits... Ross
On Thu, Jul 19, 2012 at 12:20 PM, Burton, Ross <ross.burton@intel.com> wrote: > On 19 July 2012 16:16, Otavio Salvador <otavio@ossystems.com.br> wrote: >> We change the installation process so we have bashbug in ${bindir} and >> bash at ${base_bindir}; we also build tested it many times in a 8 CPU >> machine and had no problem building it in parallel so we dropped >> PARALLEL_MAKE override. > > I'd really like to see those split out as separate commits... Ok; I will rework it and send it once again.
Patch
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc index ff9b0ce..a7f5f8f 100644 --- a/meta/recipes-extended/bash/bash.inc +++ b/meta/recipes-extended/bash/bash.inc @@ -9,11 +9,6 @@ DEPENDS = "ncurses bison-native" inherit autotools gettext update-alternatives -PARALLEL_MAKE = "" - -bindir = "/bin" -sbindir = "/sbin" - EXTRA_OECONF = "--enable-job-control" export CC_FOR_BUILD = "${BUILD_CC}" @@ -30,6 +25,14 @@ do_configure_prepend () { fi } +do_install_append () { + # Move /usr/bin/bash to /bin/bash, if need + if [ "${base_bindir}" != "${bindir}" ]; then + mkdir -p ${D}${base_bindir} + mv ${D}${bindir}/bash ${D}${base_bindir} + fi +} + pkg_postinst_${PN} () { touch $D${sysconfdir}/shells grep -q "bin/bash" $D${sysconfdir}/shells || echo /bin/bash >> $D${sysconfdir}/shells diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb index e96709a..a28279e 100644 --- a/meta/recipes-extended/bash/bash_4.2.bb +++ b/meta/recipes-extended/bash/bash_4.2.bb @@ -1,6 +1,6 @@ require bash.inc -PR = "r2" +PR = "r3" 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 \
We change the installation process so we have bashbug in ${bindir} and bash at ${base_bindir}; we also build tested it many times in a 8 CPU machine and had no problem building it in parallel so we dropped PARALLEL_MAKE override. Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> --- meta/recipes-extended/bash/bash.inc | 13 ++++++++----- meta/recipes-extended/bash/bash_4.2.bb | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-)