diff options
author | Robert Yang <liezhi.yang@windriver.com> | 2015-01-12 19:08:51 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-16 23:08:26 +0000 |
commit | 0c498a784357f6c27efba25c6232a1d58971e7d3 (patch) | |
tree | 54a0baa302a7cabf97e4ff7935f4141b926279d1 /meta/recipes-kernel | |
parent | 3d0bf25bec5e12908b015f790445a939c39a5c1c (diff) | |
download | poky-0c498a784357f6c27efba25c6232a1d58971e7d3.tar.gz |
oprofile: separate B and S
And bump the PR to avoid:
configure: error: source directory already configured; run "make distclean" there first
(From OE-Core rev: c450175470e66e58095886a9b027a4a77fff38aa)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel')
-rw-r--r-- | meta/recipes-kernel/oprofile/oprofile.inc | 5 | ||||
-rw-r--r-- | 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 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 \ | |||
25 | file://run-ptest \ | 25 | file://run-ptest \ |
26 | file://root-home-dir.patch" | 26 | file://root-home-dir.patch" |
27 | 27 | ||
28 | inherit autotools-brokensep pkgconfig ptest | 28 | inherit autotools pkgconfig ptest |
29 | 29 | ||
30 | EXTRA_OECONF = "--with-kernel=${STAGING_KERNEL_DIR} --without-x ac_cv_prog_XSLTPROC=" | 30 | EXTRA_OECONF = "--with-kernel=${STAGING_KERNEL_DIR} --without-x ac_cv_prog_XSLTPROC=" |
31 | do_configure () { | 31 | do_configure () { |
@@ -40,7 +40,6 @@ do_compile_ptest() { | |||
40 | 40 | ||
41 | do_install_ptest() { | 41 | do_install_ptest() { |
42 | subdirs="libdb/tests libutil++/tests libregex/tests libutil/tests libop/tests libdb/tests " | 42 | subdirs="libdb/tests libutil++/tests libregex/tests libutil/tests libop/tests libdb/tests " |
43 | cd ${S} | ||
44 | for tooltest in ${subdirs} | 43 | for tooltest in ${subdirs} |
45 | do | 44 | do |
46 | find ${tooltest} -perm /u=x -type f| cpio -pvdu ${D}${PTEST_PATH} | 45 | find ${tooltest} -perm /u=x -type f| cpio -pvdu ${D}${PTEST_PATH} |
@@ -54,6 +53,6 @@ do_install_ptest() { | |||
54 | cp libregex/tests/mangled-name ${D}${PTEST_PATH}/libregex/tests | 53 | cp libregex/tests/mangled-name ${D}${PTEST_PATH}/libregex/tests |
55 | 54 | ||
56 | # needed by litutil++ file_manip_tests | 55 | # needed by litutil++ file_manip_tests |
57 | cp libutil++/tests/file_manip_tests.cpp \ | 56 | cp ${S}/libutil++/tests/file_manip_tests.cpp \ |
58 | libutil++/tests/file_manip_tests.o ${D}${PTEST_PATH}/libutil++/tests | 57 | libutil++/tests/file_manip_tests.o ${D}${PTEST_PATH}/libutil++/tests |
59 | } | 58 | } |
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 | |||
10 | 10 | ||
11 | S = "${WORKDIR}/oprofile-${PV}" | 11 | S = "${WORKDIR}/oprofile-${PV}" |
12 | 12 | ||
13 | PR = "r1" | ||