diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2016-03-19 09:13:41 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-20 23:12:31 +0000 |
| commit | 42b9bdfd76d88f4155eb46f2b8acdcc4e4192147 (patch) | |
| tree | 06d9a49af58fdc1c182ccf2f0e389b23f1d0251f /meta | |
| parent | f148a2e95e44e8b90a41a53588a8869e0773eed4 (diff) | |
| download | openembedded-core-contrib-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>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 8 | ||||
| -rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 4 |
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 = "" PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" RRECOMMENDS_${PN} = "\ - perf \ + ${PERF} \ trace-cmd \ blktrace \ ${PROFILE_TOOLS_X} \ @@ -28,11 +28,14 @@ PROFILETOOLS = "\ powertop \ latencytop \ " +PERF = "perf" +PERF_libc-musl = "" # systemtap needs elfutils which is not fully buildable on uclibc # hence we exclude it from uclibc based builds SYSTEMTAP = "systemtap" SYSTEMTAP_libc-uclibc = "" +SYSTEMTAP_libc-musl = "" SYSTEMTAP_mips = "" SYSTEMTAP_mips64 = "" SYSTEMTAP_mips64n32 = "" @@ -47,8 +50,10 @@ SYSTEMTAP_aarch64 = "" LTTNGUST = "lttng-ust" LTTNGUST_libc-uclibc = "" +LTTNGUST_libc-musl = "" LTTNGTOOLS = "lttng-tools" +LTTNGTOOLS_libc-musl = "" LTTNGMODULES = "lttng-modules" @@ -58,6 +63,7 @@ BABELTRACE = "babeltrace" VALGRIND = "valgrind" VALGRIND_libc-uclibc = "" +VALGRIND_libc-musl = "" VALGRIND_mips = "" VALGRIND_mips64 = "" VALGRIND_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 = "\ mc-helpers-perl \ mc-helpers-python \ parted \ - pseudo \ + ${PSEUDO} \ screen \ " +PSEUDO = "pseudo" +PSEUDO_libc-musl = "" RRECOMMENDS_packagegroup-self-hosted-host-tools = "\ kernel-module-tun \ |