[oe-commits] [openembedded-core] 78/82: packagegroup: Disable packages not available on musl
git at git.openembedded.org
git at git.openembedded.org
Sun Mar 20 07:53:28 UTC 2016
rpurdie pushed a commit to branch master-next
in repository openembedded-core.
commit 3cab0c00eba74d7f89bcc0495f78ce3c84e34d1c
Author: Khem Raj <raj.khem at gmail.com>
AuthorDate: Sat Mar 19 09:13:41 2016 +0000
packagegroup: Disable packages not available on musl
They otherwise get pulled into world builds via dependencies
even when they are excluded from world globally
Signed-off-by: Khem Raj <raj.khem at gmail.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
.../recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 8 +++++++-
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 6173c9c..ff2b577 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 68949b7..225204d 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 \
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Openembedded-commits
mailing list