diff options
author | Chong Lu <Chong.Lu@windriver.com> | 2014-09-09 09:22:22 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-29 12:12:43 +0100 |
commit | 8ff856a75e6cac329106fd80b3919619cefa56ae (patch) | |
tree | 19ef3ca47d50cd3b62c35dc2e7cf866c6aa10191 | |
parent | cf558b4782b17ae8dd1f8a1e05637801d777c2cb (diff) | |
download | poky-8ff856a75e6cac329106fd80b3919619cefa56ae.tar.gz |
perf: fix issue about package splitting
Currently, perf can't split to perf-archive, perf-tests, perf-python and
perf-perl. All files are included in perf package. Change the perfexecdir
variable to make split successfull. Add python to RDEPENDS_perf-tests.
(From OE-Core rev: 32fcc621401e7761d9b96bc5b7bef143c1c29695)
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-kernel/perf/perf.bb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 8112986a08..ea7571aa8e 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb | |||
@@ -129,7 +129,8 @@ do_configure_prepend () { | |||
129 | # config/Makefile. | 129 | # config/Makefile. |
130 | if [ -e "${S}/tools/perf/config/Makefile" ]; then | 130 | if [ -e "${S}/tools/perf/config/Makefile" ]; then |
131 | # Match $(prefix)/$(lib) and $(prefix)/lib | 131 | # Match $(prefix)/$(lib) and $(prefix)/lib |
132 | sed -i 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ | 132 | sed -i -e 's,^libdir = \($(prefix)/.*lib\),libdir ?= \1,' \ |
133 | -e 's,^perfexecdir = \(.*\),perfexecdir ?= \1,' \ | ||
133 | ${S}/tools/perf/config/Makefile | 134 | ${S}/tools/perf/config/Makefile |
134 | fi | 135 | fi |
135 | # We need to ensure the --sysroot option in CC is preserved | 136 | # We need to ensure the --sysroot option in CC is preserved |
@@ -163,6 +164,7 @@ RDEPENDS_${PN} += "elfutils" | |||
163 | RDEPENDS_${PN}-archive =+ "bash" | 164 | RDEPENDS_${PN}-archive =+ "bash" |
164 | RDEPENDS_${PN}-python =+ "bash python" | 165 | RDEPENDS_${PN}-python =+ "bash python" |
165 | RDEPENDS_${PN}-perl =+ "bash perl perl-modules" | 166 | RDEPENDS_${PN}-perl =+ "bash perl perl-modules" |
167 | RDEPENDS_${PN}-tests =+ "python" | ||
166 | 168 | ||
167 | RSUGGESTS_SCRIPTING = "${@perf_feature_enabled('perf-scripting', '${PN}-perl ${PN}-python', '',d)}" | 169 | RSUGGESTS_SCRIPTING = "${@perf_feature_enabled('perf-scripting', '${PN}-perl ${PN}-python', '',d)}" |
168 | RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" | 170 | RSUGGESTS_${PN} += "${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING}" |