Patchwork bash ptest: Sed away the Makefile dependency to remove error messages.

login
register
mail settings
Submitter Sona Sarmadi
Date June 20, 2013, 8:27 a.m.
Message ID <1371716874-42538-1-git-send-email-sona.sarmadi@enea.com>
Download mbox | patch
Permalink /patch/52085/
State Accepted
Commit b5fe8c9ff330105337b003be0de2f970545d13ef
Headers show

Comments

Sona Sarmadi - June 20, 2013, 8:27 a.m.
From: Björn Stenberg <bjst@enea.com>

Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
---
 meta/recipes-extended/bash/bash-4.2/run-ptest |    2 +-
 meta/recipes-extended/bash/bash.inc           |    1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
Richard Purdie - June 20, 2013, 8:45 a.m.
On Thu, 2013-06-20 at 10:27 +0200, Sona Sarmadi wrote:
> From: Björn Stenberg <bjst@enea.com>
> 
> Signed-off-by: Sona Sarmadi <sona.sarmadi@enea.com>
> ---
>  meta/recipes-extended/bash/bash-4.2/run-ptest |    2 +-
>  meta/recipes-extended/bash/bash.inc           |    1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)

I'm sure this is a good change but could you expand a little on what it
does and why? Which error message is getting fixed? As well as the
summary, commit messages should have a description.

Cheers,

Richard

> diff --git a/meta/recipes-extended/bash/bash-4.2/run-ptest b/meta/recipes-extended/bash/bash-4.2/run-ptest
> index 66f1eee..8dd3b99 100644
> --- a/meta/recipes-extended/bash/bash-4.2/run-ptest
> +++ b/meta/recipes-extended/bash/bash-4.2/run-ptest
> @@ -1,2 +1,2 @@
>  #!/bin/sh
> -echo Makefile: | make -f Makefile -f - -k THIS_SH=/bin/bash BUILD_DIR=. runtest
> +make -k THIS_SH=/bin/bash BUILD_DIR=. runtest
> diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
> index c619f82..2f4519c 100644
> --- a/meta/recipes-extended/bash/bash.inc
> +++ b/meta/recipes-extended/bash/bash.inc
> @@ -40,6 +40,7 @@ do_install_append () {
>  do_install_ptest () {
>  	make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test
>  	cp ${B}/Makefile ${D}${PTEST_PATH}
> +        sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile
>  }
>  
>  pkg_postinst_${PN} () {

Patch

diff --git a/meta/recipes-extended/bash/bash-4.2/run-ptest b/meta/recipes-extended/bash/bash-4.2/run-ptest
index 66f1eee..8dd3b99 100644
--- a/meta/recipes-extended/bash/bash-4.2/run-ptest
+++ b/meta/recipes-extended/bash/bash-4.2/run-ptest
@@ -1,2 +1,2 @@ 
 #!/bin/sh
-echo Makefile: | make -f Makefile -f - -k THIS_SH=/bin/bash BUILD_DIR=. runtest
+make -k THIS_SH=/bin/bash BUILD_DIR=. runtest
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index c619f82..2f4519c 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -40,6 +40,7 @@  do_install_append () {
 do_install_ptest () {
 	make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test
 	cp ${B}/Makefile ${D}${PTEST_PATH}
+        sed -i 's/^Makefile/_Makefile/' ${D}${PTEST_PATH}/Makefile
 }
 
 pkg_postinst_${PN} () {