OpenEmbedded June 2016

openembedded@lists.linaro.org

4 participants
5 discussions

[PATCH v3] mali-userland-drm: add support for mali450 binaries for hikey

by Andrey Konovalov

Greetings, Have to call it "v3" as I've sent a different patch with "v2" earlier. This is a reworked version of "[PATCH] mali-userland-drm: add support for mali450 binaries for hikey": - the __anonymous() function (inspired by mesa.inc) removed, as I doubt that it adds value in this case, and am not sure it handles the package names correctly. - recipe file name changed. Tried to minimize the use of non-default values where possible. All in all, it now looks more similar to [1]. - using the mesa_%.bbappend looks unavoidable for me, and it should match the files included into the driver tarball (from SRC_URI), so the mesa_%.bbappend has been added to this patch. - more comments added. Regarding the PACKAGE_ARCH = "${MACHINE_ARCH}", the driver is indeed specific for HiKey (would not fit other boards with mali450), but I don't know the details. Thanks, Andrey [1] https://github.com/ARM-software/meta-mali/blob/master/recipes-graphics/mali… From: Andrey Konovalov <andrey.konovalov(a)linaro.org> Date: Wed, 8 Jun 2016 00:07:21 +0300 Subject: [PATCH 1/4] Add public Mali450 driver for wayland Signed-off-by: Andrey Konovalov <andrey.konovalov(a)linaro.org> --- .../mali-userland/mali450-userland_r6p0_01rel0.bb | 55 ++++++++++++++++++++++ recipes-graphics/mesa/mesa_%.bbappend | 11 +++++ 2 files changed, 66 insertions(+) create mode 100644 recipes-graphics/mali-userland/mali450-userland_r6p0_01rel0.bb create mode 100644 recipes-graphics/mesa/mesa_%.bbappend diff --git a/recipes-graphics/mali-userland/mali450-userland_r6p0_01rel0.bb b/recipes-graphics/mali-userland/mali450-userland_r6p0_01rel0.bb new file mode 100644 index 0000000..63bcf51 --- /dev/null +++ b/recipes-graphics/mali-userland/mali450-userland_r6p0_01rel0.bb @@ -0,0 +1,55 @@ +SUMMARY = "Mali450 libraries (drm backend)" + +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://${WORKDIR}/END_USER_LICENCE_AGREEMENT.txt;md5=3918cc9836ad038c5a090a0280233eea" + +SRC_URI[md5sum] = "36f39e86ccfe5a6a4cb2090865c339ba" +SRC_URI[sha256sum] = "dd136931cdbb309c0ce30297c06f7c6b0a48450f51acbbbc10529d341977f728" + +PROVIDES += "virtual/egl virtual/libgles1 virtual/libgles2 virtual/libdrm" + +DEPENDS = "virtual/mesa" + +BACKEND="drm" + +SRC_URI = " http://malideveloper.arm.com/downloads/drivers/binary/utgard/r6p0-01rel0/ma…" + +S = "${WORKDIR}/wayland-drm" + +# The SRC is just a set of binaries to install - nothing to configure and to +# compile +do_configure[noexec] = "1" +do_compile[noexec] = "1" + +do_install() { + install -m 755 -d ${D}/${libdir} + install ${S}/libMali.so ${D}/${libdir} + ln -sf libMali.so ${D}/${libdir}/libEGL.so.1.4 + ln -sf libEGL.so.1.4 ${D}/${libdir}/libEGL.so.1 + ln -sf libEGL.so.1 ${D}/${libdir}/libEGL.so + ln -sf libMali.so ${D}/${libdir}/libGLESv1_CM.so.1.1 + ln -sf libGLESv1_CM.so.1.1 ${D}/${libdir}/libGLESv1_CM.so.1 + ln -sf libGLESv1_CM.so.1 ${D}/${libdir}/libGLESv1_CM.so + ln -sf libMali.so ${D}/${libdir}/libGLESv2.so.2.0 + ln -sf libGLESv2.so.2.0 ${D}/${libdir}/libGLESv2.so.2 + ln -sf libGLESv2.so.2 ${D}/${libdir}/libGLESv2.so + ln -sf libMali.so ${D}/${libdir}/libgbm.so.1 + ln -sf libgbm.so.1 ${D}/${libdir}/libgbm.so + ln -sf libMali.so ${D}/${libdir}/libwayland-egl.so +} + +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# The mali-450 driver tarball has only *.so files, so all the packages +# except the ${PN} one would be empty +PACKAGES = "${PN}" +FILES_${PN} += "${libdir}/*.so* " + +INSANE_SKIP_${PN} = "ldflags dev-so" + +# To get the egl/gles headers and the packageconfig files (missing from this +# mali-450 driver tarball) we have to build mesa, and to handle the conflicts +# due to both mali450-userland, and mesa providing the same libraries. +RREPLACES_${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm" +RPROVIDES_${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm" +RCONFLICTS_${PN} = "libegl libegl1 libgles1 libglesv1-cm1 libgles2 libglesv2-2 libgbm" diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend new file mode 100644 index 0000000..3020b2b --- /dev/null +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -0,0 +1,11 @@ +# Remove the *.so libraries - the ones provided by mali-450 driver are to +# be used for HiKey +do_install_append() { + rm -f ${D}/${libdir}/libEGL.so* + rm -f ${D}/${libdir}/libGLESv1_CM.so* + rm -f ${D}/${libdir}/libGLESv2.so* + rm -f ${D}/${libdir}/libgbm.so* + rm -f ${D}/${libdir}/libwayland-egl.so* +} + +PROVIDES_remove = "virtual/libgles1 virtual/libgles2 virtual/egl" -- 1.9.1

9 years

[meta-linaro][PATCH] external-linaro-toolchain.bb: stop using base_contains 2nd

by Max Krummenacher

The base_contains function is deprecated and we ought to use bb.utils.contains instead. Signed-off-by: Max Krummenacher <max.krummenacher(a)toradex.com> --- Hi missed that one with my sed script in patch 9d228b1d2dc6e2e3f677c04cb83bbb6e04319e94 Sorry about that. Max .../external-linaro-toolchain/external-linaro-toolchain.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb index 6a72ff7..eb82e96 100644 --- a/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb +++ b/meta-linaro-toolchain/recipes-devtools/external-linaro-toolchain/external-linaro-toolchain.bb @@ -93,7 +93,7 @@ do_install() { fi # fix up the copied symlinks (they are still pointing to the multiarch directory) - linker_name="${(a)bb.utils.contains("TUNE_FEATURES", "aarch64", "ld-linux-aarch64.so.1", base_contains("TUNE_FEATURES", "callconvention-hard", "ld-linux-armhf.so.3", "ld-linux.so.3",d), d)}" + linker_name="${(a)bb.utils.contains("TUNE_FEATURES", "aarch64", "ld-linux-aarch64.so.1", bb.utils.contains("TUNE_FEATURES", "callconvention-hard", "ld-linux-armhf.so.3", "ld-linux.so.3",d), d)}" ln -sf ld-${ELT_VER_LIBC}.so ${D}${base_libdir}/${linker_name} ln -sf ../../lib/libnsl.so.1 ${D}${libdir}/libnsl.so ln -sf ../../lib/librt.so.1 ${D}${libdir}/librt.so -- 2.6.6

9 years

[PATCH] mali-userland-drm: add support for mali450 binaries for hikey

by Koen Kooi

From: Zoltan Kuscsik <zoltan.kuscsik(a)linaro.org> --- .../mali-userland/mali450-userland-drm_binary.bb | 75 ++++++++++++++++++++++ 1 file changed, 75 insertions(+) create mode 100644 recipes-graphics/mali-userland/mali450-userland-drm_binary.bb diff --git a/recipes-graphics/mali-userland/mali450-userland-drm_binary.bb b/recipes-graphics/mali-userland/mali450-userland-drm_binary.bb new file mode 100644 index 0000000..3b1c438 --- /dev/null +++ b/recipes-graphics/mali-userland/mali450-userland-drm_binary.bb @@ -0,0 +1,75 @@ +SUMMARY = "Mali400 libraries (drm backend)" +DESCRIPTION = "Mali400 libraries (opengles, egl...)" +LICENSE = "Proprietary" +LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=6b6d38be6224fa5948bf814d28cc2197" + +PROVIDES = "mali450-userland virtual/egl virtual/libgles1 virtual/libgles2" +PACKAGE_ARCH = "${MACHINE_ARCH}" + +DEPENDS = "libdrm mesa" + +PV_MALI="r6p0" +PR_MALI="01rel0" + +PR="${PR_MALI}.binary" + +BACKEND="drm" + +MALI_DIRECTORY="mali450-userland-${BACKEND}-${PV_MALI}-${PR_MALI}-release" +SRC_URI = "file://${MALI_DIRECTORY}.tgz" + +S = "${WORKDIR}/${MALI_DIRECTORY}" + +#action stubbed +do_configure[noexec] = "1" +do_compile[noexec] = "1" + + +do_install() { + install -m 755 -d ${D}/usr/ + cp -aR ${S}/usr ${D}/ +} + +PACKAGES = "${PN} ${PN}-dev ${PN}-dbg ${PN}-test " + +INSANE_SKIP_${PN} = "dev-so" +FILES_SOLIBSDEV = "" + +FILES_${PN} += "${libdir}/libMali.so* ${libdir}/*.so" +FILES_${PN}-dev += "${includedir} ${libdir}/pkgconfig/" +FILES_${PN}-dbg += "${libdir}/.debug/ ${bindir}/.debug/ " + +FILES_${PN}-test = "${exec_prefix}/share/gles2_test/ ${exec_prefix}/share/egl_test " +FILES_${PN}-test += "${exec_prefix}/bin/platform_test_suite" +FILES_${PN}-test += "${exec_prefix}/bin/egl_api_main_suite_20" +FILES_${PN}-test += "${exec_prefix}/bin/gles2_api_suite" + +RREPLACES_${PN} = "libglesv2-2 " +RPROVIDES_${PN} = "libglesv2-2 " +RCONFLICTS_${PN} = "libglesv2-2 " + + +# For the packages that make up the OpenGL interfaces, inject variables so that +# they don't get Debian-renamed (which would remove the -mali450 suffix), and +# RPROVIDEs/RCONFLICTs on the generic libgl name. +python __anonymous() { + pkgconfig = (d.getVar('PACKAGECONFIG', True) or "").split() + for p in (("libegl"), ("libegl1"), + ("gles"), ("libgles1"), ("libglesv1-cm1"), + ("libgles2"), ("mali450-userland")): + fullp = "mali450-userland" + pkgs = " " + p + " " + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) + + # For -dev, the first element is both the Debian and original name + fullp += "mali450-userland-dev" + pkgs = " " + p + "-dev " + d.setVar("DEBIAN_NOAUTONAME_" + fullp, "1") + d.appendVar("RREPLACES_" + fullp, pkgs) + d.appendVar("RPROVIDES_" + fullp, pkgs) + d.appendVar("RCONFLICTS_" + fullp, pkgs) +} + -- 2.4.3

9 years

Mali recipe

by Zoltan Kuscsik

Hi, here is a proposed recipe for enabling Mali 450 driver in meta-96boards: https://github.com/kuscsik/meta-los/blob/hikey/recipes-graphics/mali-userla… Feedback is welcome, Zoltan -- Zoltan Kuscsik Senior Software Developer, Linaro Digital Home Group email: zoltan.kuscsik(a)linaro.org IRC: zoli_ on irc.linaro.org

9 years

[meta-linaro][PATCH 1/2] gdb_linaro-7.8.bb: stop using base_contains

by Max Krummenacher

The base_contains function is deprecated and we ought to use bb.utils.contains instead. Signed-off-by: Max Krummenacher <max.krummenacher(a)toradex.com> --- meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb b/meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb index 3ce2de4..630d43c 100644 --- a/meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb +++ b/meta-linaro-toolchain/recipes-devtools/gdb/gdb_linaro-7.8.bb @@ -7,7 +7,7 @@ PACKAGECONFIG ??= "" PACKAGECONFIG[python] = "--with-python=${WORKDIR}/python,--without-python,python" do_configure_prepend() { - if [ -n "${@base_contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then + if [ -n "${(a)bb.utils.contains('PACKAGECONFIG', 'python', 'python', '', d)}" ]; then cat > ${WORKDIR}/python << EOF #!/bin/sh case "\$2" in -- 2.6.6

9 years

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

OpenEmbedded June 2016