summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-03-19 09:13:41 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-20 23:12:31 +0000
commit42b9bdfd76d88f4155eb46f2b8acdcc4e4192147 (patch)
tree06d9a49af58fdc1c182ccf2f0e389b23f1d0251f
parentf148a2e95e44e8b90a41a53588a8869e0773eed4 (diff)
downloadpoky-42b9bdfd76d88f4155eb46f2b8acdcc4e4192147.tar.gz
packagegroup: Disable packages not available on musl
They otherwise get pulled into world builds via dependencies even when they are excluded from world globally (From OE-Core rev: d758a4445a42405cb3f317c07ad48456cdc4d9f4) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb8
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-self-hosted.bb4
2 files changed, 10 insertions, 2 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 6173c9cb44..ff2b5779a2 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -17,7 +17,7 @@ PROFILE_TOOLS_X_aarch64 = ""
17PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" 17PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}"
18 18
19RRECOMMENDS_${PN} = "\ 19RRECOMMENDS_${PN} = "\
20 perf \ 20 ${PERF} \
21 trace-cmd \ 21 trace-cmd \
22 blktrace \ 22 blktrace \
23 ${PROFILE_TOOLS_X} \ 23 ${PROFILE_TOOLS_X} \
@@ -28,11 +28,14 @@ PROFILETOOLS = "\
28 powertop \ 28 powertop \
29 latencytop \ 29 latencytop \
30 " 30 "
31PERF = "perf"
32PERF_libc-musl = ""
31 33
32# systemtap needs elfutils which is not fully buildable on uclibc 34# systemtap needs elfutils which is not fully buildable on uclibc
33# hence we exclude it from uclibc based builds 35# hence we exclude it from uclibc based builds
34SYSTEMTAP = "systemtap" 36SYSTEMTAP = "systemtap"
35SYSTEMTAP_libc-uclibc = "" 37SYSTEMTAP_libc-uclibc = ""
38SYSTEMTAP_libc-musl = ""
36SYSTEMTAP_mips = "" 39SYSTEMTAP_mips = ""
37SYSTEMTAP_mips64 = "" 40SYSTEMTAP_mips64 = ""
38SYSTEMTAP_mips64n32 = "" 41SYSTEMTAP_mips64n32 = ""
@@ -47,8 +50,10 @@ SYSTEMTAP_aarch64 = ""
47 50
48LTTNGUST = "lttng-ust" 51LTTNGUST = "lttng-ust"
49LTTNGUST_libc-uclibc = "" 52LTTNGUST_libc-uclibc = ""
53LTTNGUST_libc-musl = ""
50 54
51LTTNGTOOLS = "lttng-tools" 55LTTNGTOOLS = "lttng-tools"
56LTTNGTOOLS_libc-musl = ""
52 57
53LTTNGMODULES = "lttng-modules" 58LTTNGMODULES = "lttng-modules"
54 59
@@ -58,6 +63,7 @@ BABELTRACE = "babeltrace"
58 63
59VALGRIND = "valgrind" 64VALGRIND = "valgrind"
60VALGRIND_libc-uclibc = "" 65VALGRIND_libc-uclibc = ""
66VALGRIND_libc-musl = ""
61VALGRIND_mips = "" 67VALGRIND_mips = ""
62VALGRIND_mips64 = "" 68VALGRIND_mips64 = ""
63VALGRIND_mips64n32 = "" 69VALGRIND_mips64n32 = ""
diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 68949b76da..225204df15 100644
--- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -45,9 +45,11 @@ RDEPENDS_packagegroup-self-hosted-host-tools = "\
45 mc-helpers-perl \ 45 mc-helpers-perl \
46 mc-helpers-python \ 46 mc-helpers-python \
47 parted \ 47 parted \
48 pseudo \ 48 ${PSEUDO} \
49 screen \ 49 screen \
50 " 50 "
51PSEUDO = "pseudo"
52PSEUDO_libc-musl = ""
51 53
52RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ 54RRECOMMENDS_packagegroup-self-hosted-host-tools = "\
53 kernel-module-tun \ 55 kernel-module-tun \