[oe-commits] =?UTF-8?Q?Bj=C3=B6rn=20Stenberg=20?=: bash ptest: Sed away the Makefile dependency to remove error messages.

git at git.openembedded.org git at git.openembedded.org
Tue Jun 25 16:38:03 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: b5fe8c9ff330105337b003be0de2f970545d13ef
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b5fe8c9ff330105337b003be0de2f970545d13ef

Author: Björn Stenberg <bjst at enea.com>
Date:   Mon Jun 24 09:45:52 2013 +0200

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

The bash Makefile defines a dependency on itself and tries to run configure,
causing error messages when running ptest on target:

make: *** No rule to make target `configure.in', needed by `configure'.
make: *** No rule to make target `aclocal.m4', needed by `configure'.
make: *** No rule to make target `config.h.in', needed by `configure'.
make: *** No rule to make target `Makefile.in', needed by `Makefile'.
make: Failed to remake makefile `Makefile'.

This patch edits out this dependency in the Makefile installed for ptest,
to get rid of these messages.

Signed-off-by: Sona Sarmadi <sona.sarmadi at enea.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-extended/bash/bash-4.2/run-ptest |    2 +-
 meta/recipes-extended/bash/bash.inc           |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

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} () {



More information about the Openembedded-commits mailing list