[oe-commits] Robert Yang : oprofile: separate B and S

[git at git.openembedded.org]

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

Author: Robert Yang <liezhi.yang at windriver.com>
Date:   Mon Jan 12 19:08:51 2015 -0800

oprofile: separate B and S

And bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first

Signed-off-by: Robert Yang <liezhi.yang at windriver.com>

---

 meta/recipes-kernel/oprofile/oprofile.inc      | 5 ++---
 meta/recipes-kernel/oprofile/oprofile_1.0.0.bb | 1 +
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
index 198df30..49e6b16 100644
--- a/meta/recipes-kernel/oprofile/oprofile.inc
+++ b/meta/recipes-kernel/oprofile/oprofile.inc
@@ -25,7 +25,7 @@ SRC_URI = "file://filemode-fix.patch \
            file://run-ptest \
            file://root-home-dir.patch"
 
-inherit autotools-brokensep pkgconfig ptest
+inherit autotools pkgconfig ptest
 
 EXTRA_OECONF = "--with-kernel=${STAGING_KERNEL_DIR}  --without-x ac_cv_prog_XSLTPROC="
 do_configure () {
@@ -40,7 +40,6 @@ do_compile_ptest() {
 
 do_install_ptest() {
 	subdirs="libdb/tests libutil++/tests libregex/tests libutil/tests libop/tests libdb/tests "
-	cd ${S}
 	for tooltest in ${subdirs}
 	do
 		find ${tooltest} -perm /u=x -type f| cpio -pvdu ${D}${PTEST_PATH}
@@ -54,6 +53,6 @@ do_install_ptest() {
 	cp libregex/tests/mangled-name ${D}${PTEST_PATH}/libregex/tests
 
 	# needed by litutil++ file_manip_tests
-	cp libutil++/tests/file_manip_tests.cpp \
+	cp ${S}/libutil++/tests/file_manip_tests.cpp \
 		libutil++/tests/file_manip_tests.o ${D}${PTEST_PATH}/libutil++/tests
 }
diff --git a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
index ad48ab3..f4a34b3 100644
--- a/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
+++ b/meta/recipes-kernel/oprofile/oprofile_1.0.0.bb
@@ -10,3 +10,4 @@ SRC_URI[sha256sum] = "847110b4ecdcf8c8353cd38f94c1b704aad4bfcd9453e38b88d112cfb7
 
 S = "${WORKDIR}/oprofile-${PV}"
 
+PR = "r1"