[PATCH 1/2] bash: enable parallel build

[PATCH 1/2] bash: enable parallel build

[Otavio Salvador]

I've build it several times in a 8 core machine without problem so it
seems safe to use parallel build now.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-extended/bash/bash.inc    |    2 --
 meta/recipes-extended/bash/bash_4.2.bb |    2 +-
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index ff9b0ce..6d7e930 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -9,8 +9,6 @@ DEPENDS = "ncurses bison-native"
 
 inherit autotools gettext update-alternatives
 
-PARALLEL_MAKE = ""
-
 bindir = "/bin"
 sbindir = "/sbin"
 
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 \
-- 
1.7.2.5

[PATCH 2/2] bash: fix warning about bashbug reference /usr/bin when installed in /bin

[Otavio Salvador]

Change the installation process so we have bashbug in ${bindir} and
bash at ${base_bindir}.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
 meta/recipes-extended/bash/bash.inc    |   11 ++++++++---
 meta/recipes-extended/bash/bash_4.2.bb |    2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index 6d7e930..a7f5f8f 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -9,9 +9,6 @@ DEPENDS = "ncurses bison-native"
 
 inherit autotools gettext update-alternatives
 
-bindir = "/bin"
-sbindir = "/sbin"
-
 EXTRA_OECONF = "--enable-job-control"
 export CC_FOR_BUILD = "${BUILD_CC}"
 
@@ -28,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 a28279e..50f2ff6 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 = "r3"
+PR = "r4"
 
 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 \
-- 
1.7.2.5

Re: [PATCH 2/2] bash: fix warning about bashbug reference /usr/bin when installed in /bin

[Saul Wold]

On 07/20/2012 10:12 AM, Otavio Salvador wrote:
> Change the installation process so we have bashbug in ${bindir} and
> bash at ${base_bindir}.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>   meta/recipes-extended/bash/bash.inc    |   11 ++++++++---
>   meta/recipes-extended/bash/bash_4.2.bb |    2 +-
>   2 files changed, 9 insertions(+), 4 deletions(-)
>
> diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
> index 6d7e930..a7f5f8f 100644
> --- a/meta/recipes-extended/bash/bash.inc
> +++ b/meta/recipes-extended/bash/bash.inc
> @@ -9,9 +9,6 @@ DEPENDS = "ncurses bison-native"
>
>   inherit autotools gettext update-alternatives
>
> -bindir = "/bin"
> -sbindir = "/sbin"
> -
>   EXTRA_OECONF = "--enable-job-control"
>   export CC_FOR_BUILD = "${BUILD_CC}"
>
> @@ -28,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 a28279e..50f2ff6 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 = "r3"
> +PR = "r4"
>
>   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 \
>

Took this patch into OE-Core, the parallel build is still failing.

Thanks
	Sau!

Re: [PATCH 1/2] bash: enable parallel build

[Richard Purdie]

On Fri, 2012-07-20 at 14:12 -0300, Otavio Salvador wrote:
> I've build it several times in a 8 core machine without problem so it
> seems safe to use parallel build now.

Sadly its not:

http://autobuilder.yoctoproject.org:8010/builders/nightly-multilib/builds/174/steps/shell_23/logs/stdio

Cheers,

Richard

> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>  meta/recipes-extended/bash/bash.inc    |    2 --
>  meta/recipes-extended/bash/bash_4.2.bb |    2 +-
>  2 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
> index ff9b0ce..6d7e930 100644
> --- a/meta/recipes-extended/bash/bash.inc
> +++ b/meta/recipes-extended/bash/bash.inc
> @@ -9,8 +9,6 @@ DEPENDS = "ncurses bison-native"
>  
>  inherit autotools gettext update-alternatives
>  
> -PARALLEL_MAKE = ""
> -
>  bindir = "/bin"
>  sbindir = "/sbin"
>  
> 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 \

Re: [PATCH 1/2] bash: enable parallel build

[Otavio Salvador]

On Wed, Jul 25, 2012 at 5:51 AM, Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
> On Fri, 2012-07-20 at 14:12 -0300, Otavio Salvador wrote:
>> I've build it several times in a 8 core machine without problem so it
>> seems safe to use parallel build now.
>
> Sadly its not:
>
> http://autobuilder.yoctoproject.org:8010/builders/nightly-multilib/builds/174/steps/shell_23/logs/stdio

Good that it has been catch but I am pondering why this worked fine here...

Please drop this patch then ... if it has been applied, I can send a
reversing patch if you want.

-- 
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br