1 files changed, 24 insertions, 28 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index b8e2c718e6..b3a24b71de 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -4,22 +4,17 @@
 SUMMARY = "Profiling tools"
-PR = "r3"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 inherit packagegroup
-PROFILE_TOOLS_X = ""
 # sysprof doesn't support aarch64 and nios2
-PROFILE_TOOLS_X_aarch64 = ""
-PROFILE_TOOLS_X_nios2 = ""
 PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}"
-RRECOMMENDS_${PN} = "\
+RRECOMMENDS:${PN} = "\
    ${PERF} \
    blktrace \
-    ${PROFILE_TOOLS_X} \
    ${PROFILE_TOOLS_SYSTEMD} \
    "
@@ -27,19 +22,19 @@ PROFILETOOLS = "\
    powertop \
    "
 PERF = "perf"
-PERF_libc-musl = ""
+PERF:libc-musl = ""
-PERF_libc-musl_arm = "perf"
+PERF:libc-musl:arm = "perf"
-PERF_riscv32 = ""
+PERF:riscv32 = ""
 # systemtap needs elfutils which is not fully buildable on some arches/libcs
 SYSTEMTAP = "systemtap"
-SYSTEMTAP_libc-musl = ""
+SYSTEMTAP:libc-musl = ""
-SYSTEMTAP_nios2 = ""
+SYSTEMTAP:nios2 = ""
-SYSTEMTAP_riscv64 = ""
+SYSTEMTAP:riscv32 = ""
 LTTNGTOOLS = "lttng-tools"
-LTTNGTOOLS_arc = ""
+LTTNGTOOLS:arc = ""
-LTTNGTOOLS_riscv32 = ""
+LTTNGTOOLS:riscv32 = ""
 BABELTRACE = "babeltrace"
 BABELTRACE2 = "babeltrace2"
@@ -47,21 +42,22 @@ BABELTRACE2 = "babeltrace2"
 # valgrind does not work on the following configurations/architectures
 VALGRIND = "valgrind"
-VALGRIND_libc-musl = ""
+VALGRIND:libc-musl = ""
-VALGRIND_mipsarch = ""
+VALGRIND:mipsarch = ""
-VALGRIND_nios2 = ""
+VALGRIND:nios2 = ""
-VALGRIND_arc = ""
+VALGRIND:arc = ""
-VALGRIND_armv4 = ""
+VALGRIND:armv4 = ""
-VALGRIND_armv5 = ""
+VALGRIND:armv5 = ""
-VALGRIND_armv6 = ""
+VALGRIND:armv6 = ""
-VALGRIND_armeb = ""
+VALGRIND:armeb = ""
-VALGRIND_aarch64 = ""
+VALGRIND:aarch64 = ""
-VALGRIND_riscv64 = ""
+VALGRIND:riscv64 = ""
-VALGRIND_powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}"
+VALGRIND:riscv32 = ""
-VALGRIND_linux-gnux32 = ""
+VALGRIND:powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}"
-VALGRIND_linux-gnun32 = ""
+VALGRIND:linux-gnux32 = ""
+VALGRIND:linux-gnun32 = ""
-RDEPENDS_${PN} = "\
+RDEPENDS:${PN} = "\
    ${PROFILETOOLS} \
    ${LTTNGTOOLS} \
    ${BABELTRACE} \

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index b8e2c718e6..b3a24b71de 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -4,22 +4,17 @@
4		4
5	SUMMARY = "Profiling tools"	5	SUMMARY = "Profiling tools"
6		6
7	PR = "r3"
8		7
9	PACKAGE_ARCH = "${MACHINE_ARCH}"	8	PACKAGE_ARCH = "${MACHINE_ARCH}"
10		9
11	inherit packagegroup	10	inherit packagegroup
12		11
13	PROFILE_TOOLS_X = ""
14	# sysprof doesn't support aarch64 and nios2	12	# sysprof doesn't support aarch64 and nios2
15	PROFILE_TOOLS_X_aarch64 = ""
16	PROFILE_TOOLS_X_nios2 = ""
17	PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}"	13	PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}"
18		14
19	RRECOMMENDS_${PN} = "\	15	RRECOMMENDS:${PN} = "\
20	${PERF} \	16	${PERF} \
21	blktrace \	17	blktrace \
22	${PROFILE_TOOLS_X} \
23	${PROFILE_TOOLS_SYSTEMD} \	18	${PROFILE_TOOLS_SYSTEMD} \
24	"	19	"
25		20
@@ -27,19 +22,19 @@ PROFILETOOLS = "\
27	powertop \	22	powertop \
28	"	23	"
29	PERF = "perf"	24	PERF = "perf"
30	PERF_libc-musl = ""	25	PERF:libc-musl = ""
31	PERF_libc-musl_arm = "perf"	26	PERF:libc-musl:arm = "perf"
32	PERF_riscv32 = ""	27	PERF:riscv32 = ""
33		28
34	# systemtap needs elfutils which is not fully buildable on some arches/libcs	29	# systemtap needs elfutils which is not fully buildable on some arches/libcs
35	SYSTEMTAP = "systemtap"	30	SYSTEMTAP = "systemtap"
36	SYSTEMTAP_libc-musl = ""	31	SYSTEMTAP:libc-musl = ""
37	SYSTEMTAP_nios2 = ""	32	SYSTEMTAP:nios2 = ""
38	SYSTEMTAP_riscv64 = ""	33	SYSTEMTAP:riscv32 = ""
39		34
40	LTTNGTOOLS = "lttng-tools"	35	LTTNGTOOLS = "lttng-tools"
41	LTTNGTOOLS_arc = ""	36	LTTNGTOOLS:arc = ""
42	LTTNGTOOLS_riscv32 = ""	37	LTTNGTOOLS:riscv32 = ""
43		38
44	BABELTRACE = "babeltrace"	39	BABELTRACE = "babeltrace"
45	BABELTRACE2 = "babeltrace2"	40	BABELTRACE2 = "babeltrace2"
@@ -47,21 +42,22 @@ BABELTRACE2 = "babeltrace2"
47	# valgrind does not work on the following configurations/architectures	42	# valgrind does not work on the following configurations/architectures
48		43
49	VALGRIND = "valgrind"	44	VALGRIND = "valgrind"
50	VALGRIND_libc-musl = ""	45	VALGRIND:libc-musl = ""
51	VALGRIND_mipsarch = ""	46	VALGRIND:mipsarch = ""
52	VALGRIND_nios2 = ""	47	VALGRIND:nios2 = ""
53	VALGRIND_arc = ""	48	VALGRIND:arc = ""
54	VALGRIND_armv4 = ""	49	VALGRIND:armv4 = ""
55	VALGRIND_armv5 = ""	50	VALGRIND:armv5 = ""
56	VALGRIND_armv6 = ""	51	VALGRIND:armv6 = ""
57	VALGRIND_armeb = ""	52	VALGRIND:armeb = ""
58	VALGRIND_aarch64 = ""	53	VALGRIND:aarch64 = ""
59	VALGRIND_riscv64 = ""	54	VALGRIND:riscv64 = ""
60	VALGRIND_powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}"	55	VALGRIND:riscv32 = ""
61	VALGRIND_linux-gnux32 = ""	56	VALGRIND:powerpc = "${@bb.utils.contains('TARGET_FPU', 'soft', '', 'valgrind', d)}"
62	VALGRIND_linux-gnun32 = ""	57	VALGRIND:linux-gnux32 = ""
		58	VALGRIND:linux-gnun32 = ""
63		59
64	RDEPENDS_${PN} = "\	60	RDEPENDS:${PN} = "\
65	${PROFILETOOLS} \	61	${PROFILETOOLS} \
66	${LTTNGTOOLS} \	62	${LTTNGTOOLS} \
67	${BABELTRACE} \	63	${BABELTRACE} \