2 files changed, 3 insertions, 3 deletions

diff --git a/meta/recipes-kernel/oprofile/oprofile.inc b/meta/recipes-kernel/oprofile/oprofile.inc
index 198df30d14..49e6b16c1c 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 ad48ab377c..f4a34b32e6 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"