bpftool: don't build under musl
PATCH 1/3 bpftool: don't build under musl
uses FTW_SKIP_SUBTREE which is GNU extentions, available in glibc but not in musl
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-kernel/bpftool/bpftool.bb | 2 ++ 1 file changed, 2 insertions(+)
meta-oe/recipes-kernel/bpftool/bpftool.bb +2 -0
@@ -14,6 +14,8 @@ EXTRA_OEMAKE = "-C ${S}/tools/bpf/bpftool O=${B} CROSS=${TARGET_PREFIX} CC="${CC do_configure[depends] += "virtual/kernel:do_shared_workdir" +COMPATIBLE_HOST_libc-musl = 'null' + do_compile() { oe_runmake }
Signature · 1 line
2.19.2
PATCH v2 2/3 packagegroup-meta-oe: Remove arch specific packages as needed
Some packages are not supported on all architectures, therefore they can not be included unconditionally.
Signed-off-by Khem Raj <[email protected]>
---
V2: Add more non-x86 arch specific removals
.../packagegroups/packagegroup-meta-oe.bb | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +26 -2
@@ -1,5 +1,6 @@ SUMMARY = "Meta-oe ptest packagegroups" +PACKAGE_ARCH = "${MACHINE_ARCH}" inherit packagegroup PROVIDES = "${PACKAGES}"
@@ -52,6 +53,8 @@ RDEPENDS_packagegroup-meta-oe-benchmarks = "\ ${@bb.utils.contains("DISTRO_FEATURES", "x11 wayland opengl", "glmark2", "", d)} \ " +RDEPENDS_packagegroup-meta-oe-benchmarks_remove_mipsarch = "libhugetlbfs" + RDEPENDS_packagegroup-meta-oe-connectivity ="\ gammu hostapd irssi krb5 libev libimobiledevice \ libmbim libmtp libndp libqmi libtorrent \
@@ -83,6 +86,9 @@ RDEPENDS_packagegroup-meta-oe-bsp ="\ efivar flashrom lmsensors lmsensors-config \ lsscsi nvme-cli pcmciautils pointercal \ " +RDEPENDS_packagegroup-meta-oe-bsp_remove_mipsarch = "efivar efibootmgr" +RDEPENDS_packagegroup-meta-oe-bsp_remove_powerpc = "efivar efibootmgr" + RDEPENDS_packagegroup-meta-oe-dbs ="\ leveldb libdbi mariadb mariadb-native \ mysql-python postgresql psqlodbc rocksdb soci \
@@ -106,6 +112,10 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \ " +RDEPENDS_packagegroup-meta-oe-devtools_remove_armv5 = "uftrace nodejs" +RDEPENDS_packagegroup-meta-oe-devtools_remove_mipsarch = "uftrace lshw" +RDEPENDS_packagegroup-meta-oe-devtools_remove_powerpc = "uftrace lshw" + RDEPENDS_packagegroup-meta-oe-extended ="\ byacc cfengine cfengine-masterfiles cmpi-bindings \ ddrescue dialog dumb-init enscript fluentbit \
@@ -130,6 +140,8 @@ RDEPENDS_packagegroup-meta-oe-extended ="\ ${@bb.utils.contains("DISTRO_FEATURES", "pam", "pam-ssh-agent-auth openwsman sblim-sfcb ", "", d)} \ ${@bb.utils.contains("BBPATH", "meta-python", "openlmi-tools", "", d)} \ " +RDEPENDS_packagegroup-meta-oe-extended_remove_mipsarch = "upm mraa tiptop" +RDEPENDS_packagegroup-meta-oe-extended_remove_powerpc = "upm mraa" RDEPENDS_packagegroup-meta-oe-gnome ="\ atkmm gnome-common gnome-doc-utils-stub gtkmm \
@@ -223,6 +235,9 @@ RDEPENDS_packagegroup-meta-oe-support ="\ ${NE10} \ " +RDEPENDS_packagegroup-meta-oe-support_remove_arm ="numactl" +RDEPENDS_packagegroup-meta-oe-support_remove_mipsarch_libc-glibc = "gperftools" + RDEPENDS_packagegroup-meta-oe-support-egl ="\ freerdp libnice opencv \ "
@@ -232,6 +247,10 @@ RDEPENDS_packagegroup-meta-oe-test ="\ fwts gtest pm-qa stress-ng testfloat \ " +RDEPENDS_packagegroup-meta-oe-test_remove_arm = "fwts" +RDEPENDS_packagegroup-meta-oe-test_remove_mipsarch = "fwts" +RDEPENDS_packagegroup-meta-oe-test_remove_powerpc = "fwts" + RDEPENDS_packagegroup-meta-oe-ptest-packages = "\ zeromq-ptest \ leveldb-ptest \
@@ -242,8 +261,13 @@ RDEPENDS_packagegroup-meta-oe-ptest-packages = "\ oprofile-ptest \ libteam-ptest \ uthash-ptest \ - mcelog-ptest \ libee-ptest \ - numactl-ptest \ poco-ptest \ " +RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86 = "\ + mcelog-ptest \ +" +RDEPENDS_packagegroup-meta-oe-ptest-packages_append_x86-64 = "\ + mcelog-ptest \ +" +RDEPENDS_packagegroup-meta-oe-ptest-packages_remove_arm = "numactl-ptest"
Signature · 1 line
2.19.2
PATCH 3/3 packagegroup-meta-oe: Remove packages which don't build for musl
In reply to Khem RajSigned-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +3 -1
@@ -171,6 +171,7 @@ RDEPENDS_packagegroup-meta-oe-kernel ="\ agent-proxy bpftool broadcom-bt-firmware cpupower \ crash ipmitool minicoredumper oprofile \ " +RDEPENDS_packagegroup-meta-oe-kerne_remove_libc-musl = "bpftool crash minicoredumper" RDEPENDS_packagegroup-meta-oe-multimedia ="\ alsa-oss audiofile cdrkit esound id3lib \
@@ -182,6 +183,7 @@ RDEPENDS_packagegroup-meta-oe-multimedia ="\ ${@bb.utils.contains("DISTRO_FEATURES", "pulseadio bluez4", "libmikmod", "", d)} \ ${@bb.utils.contains("LICENSE_FLAGS_WHITELIST", "commercial", "libmad faad2 mpv", "", d)} \ " +RDEPENDS_packagegroup-meta-oe-multimedia_remove_libc-musl = "alsa-oss" RDEPENDS_packagegroup-meta-oe-navigation ="\ geoclue geos libspatialite proj \
@@ -246,7 +248,7 @@ RDEPENDS_packagegroup-meta-oe-test ="\ catch2 cppunit cunit cxxtest evtest fb-test \ fwts gtest pm-qa stress-ng testfloat \ " - +RDEPENDS_packagegroup-meta-oe-test_remove_libc-musl = "pm-qa" RDEPENDS_packagegroup-meta-oe-test_remove_arm = "fwts" RDEPENDS_packagegroup-meta-oe-test_remove_mipsarch = "fwts" RDEPENDS_packagegroup-meta-oe-test_remove_powerpc = "fwts"
Signature · 1 line
2.19.2