From bcd2be97ad29d575ec36ff5eb8b2a82e70860016 Mon Sep 17 00:00:00 2001 From: Javier Viguera Date: Wed, 6 Feb 2013 13:44:25 +0100 Subject: [PATCH] amd-gpu-bin-mx51: Use a python function to populate INSANE_SKIP While on it, revert PROVIDES to its previous state, not depending on DISTRO_FEATURES. This was tweaked to avoid a bitbake warning. Not it is solved in a conditional BBMASK. Signed-off-by: Javier Viguera --- .../amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb | 32 +++++-------------- meta-digi-del/conf/distro/del.conf | 3 +- 2 files changed, 10 insertions(+), 25 deletions(-) diff --git a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb index db26fa09b..03ffedc49 100644 --- a/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb +++ b/meta-digi-arm/recipes-graphics/amd-gpu-bin/amd-gpu-bin-mx51_11.09.01.bb @@ -11,13 +11,20 @@ PR = "r11" LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" DEPENDS = "libz160" -PROVIDES = "${@base_contains('DISTRO_FEATURES', 'x11', '', 'virtual/egl virtual/libgles1 virtual/libgles2', d)}" +PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" RDEPENDS = "libz160" SRC_URI = "${DIGI_LOG_MIRROR}/amd-gpu-bin-mx51-${PV}.tar.gz" SRC_URI[md5sum] = "15ede91135590fc12cc29a2bba46c12c" SRC_URI[sha256sum] = "c87ad4e0c721a10e9faed9e096e180b326162e342d41cdfc14c5119110bde0f4" +# FIXME: All binaries lack GNU_HASH in elf binary but as we don't have +# the source we cannot fix it. Disable the insane check for now. +python populate_packages_prepend() { + for p in d.getVar('PACKAGES', True).split(): + d.setVar("INSANE_SKIP_%s" % p, "ldflags") +} + do_install () { install -d ${D}${libdir} install -d ${D}${bindir} @@ -48,56 +55,33 @@ PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \ lib2dz160-mx51 lib2dz160-mx51-dbg \ lib2dz430-mx51 lib2dz430-mx51-dbg" -INSANE_SKIP_${PN} = "ldflags" - FILES_${PN}-dbg = "${bindir}/.debug/*" FILES_libgsl-fsl-mx51 = "${libdir}/libgsl-fsl${SOLIBS}" FILES_libgsl-fsl-mx51-dev = "${libdir}/libgsl-fsl${SOLIBSDEV}" FILES_libgsl-fsl-mx51-dbg = "${libdir}/.debug/libgsl-fsl${SOLIBS}" -INSANE_SKIP_libgsl-fsl-mx51 = "ldflags" -INSANE_SKIP_libgsl-fsl-mx51-dev = "ldflags" -INSANE_SKIP_libgsl-fsl-mx51-dbg = "ldflags" - FILES_libegl-mx51 = "${libdir}/libEGL${SOLIBS}" FILES_libegl-mx51-dev = "${includedir}/EGL ${includedir}/KHR ${libdir}/libEGL${SOLIBSDEV}" FILES_libegl-mx51-dbg = "${libdir}/.debug/libEGL${SOLIBS}" -INSANE_SKIP_libegl-mx51 = "ldflags" -INSANE_SKIP_libegl-mx51-dev = "ldflags" -INSANE_SKIP_libegl-mx51-dbg = "ldflags" - FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}" FILES_libgles-mx51-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV}" FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}" -INSANE_SKIP_libgles-mx51 = "ldflags" -INSANE_SKIP_libgles-mx51-dev = "ldflags" -INSANE_SKIP_libgles-mx51-dbg = "ldflags" FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}" FILES_libgles2-mx51-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}" FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" -INSANE_SKIP_libgles2-mx51 = "ldflags" -INSANE_SKIP_libgles2-mx51-dev = "ldflags" -INSANE_SKIP_libgles2-mx51-dbg = "ldflags" FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}" FILES_libopenvg-mx51-dev = "${includedir}/VG ${libdir}/libOpenVG${SOLIBSDEV}" FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}" -INSANE_SKIP_libopenvg-mx51 = "ldflags" -INSANE_SKIP_libopenvg-mx51-dev = "ldflags" -INSANE_SKIP_libopenvg-mx51-dbg = "ldflags" FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}" FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}" -INSANE_SKIP_lib2dz160-mx51 = "ldflags" -INSANE_SKIP_lib2dz160-mx51-dbg = "ldflags" FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}" FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}" -INSANE_SKIP_lib2dz430-mx51 = "ldflags" -INSANE_SKIP_lib2dz430-mx51-dbg = "ldflags" COMPATIBLE_MACHINE = "(mx5)" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta-digi-del/conf/distro/del.conf b/meta-digi-del/conf/distro/del.conf index e99a236e8..f98b41566 100644 --- a/meta-digi-del/conf/distro/del.conf +++ b/meta-digi-del/conf/distro/del.conf @@ -125,4 +125,5 @@ WARN_QA = "" ERROR_QA = "dev-so debug-deps dev-deps debug-files arch la2 pkgconfig la perms useless-rpaths rpaths staticdev ldflags" # Mask openembedded core gst-ffmpeg recipe because it adds a dependency on libav (libgl, libx11) -BBMASK = "meta-openembedded/meta-oe/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bbappend" +BBMASK = "meta-openembedded/meta-oe/recipes-multimedia/gstreamer/gst-ffmpeg_0.10.13.bbappend" +BBMASK .= "${@base_contains('DISTRO_FEATURES', 'x11', '', '|.*amd-gpu-x11-bin-mx51_.*bb', d)}"