From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp2-g21.free.fr (smtp2-g21.free.fr [212.27.42.2]) by yocto-www.yoctoproject.org (Postfix) with ESMTP id 584EDE0151A for ; Mon, 27 May 2013 17:02:25 -0700 (PDT) Received: from buildor.local.eukrea.com (unknown [82.240.38.71]) by smtp2-g21.free.fr (Postfix) with ESMTP id 036E24B0034 for ; Tue, 28 May 2013 02:02:20 +0200 (CEST) From: =?UTF-8?q?Eric=20B=C3=A9nard?= To: meta-freescale@yoctoproject.org Date: Tue, 28 May 2013 02:02:52 +0200 Message-Id: <1369699372-1398-4-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1369699372-1398-1-git-send-email-eric@eukrea.com> References: <1369699372-1398-1-git-send-email-eric@eukrea.com> MIME-Version: 1.0 Subject: [meta-fsl-arm][PATCH RFC 4/4] amd-gpu*: factorize the recipes X-BeenThere: meta-freescale@yoctoproject.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Usage and development list for the meta-fsl-* layers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 28 May 2013 00:02:27 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Eric Bénard --- .../amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb | 78 +------------------ recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc | 82 ++++++++++++++++++++ .../amd-gpu-x11-bin-mx51_11.09.01.bb | 76 +----------------- 3 files changed, 85 insertions(+), 151 deletions(-) create mode 100644 recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb index c207405..442bacc 100644 --- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb +++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb @@ -2,88 +2,14 @@ # Released under the MIT license (see COPYING.MIT for the terms) DESCRIPTION = "GPU driver and apps for frambuffer on mx51" -LICENSE = "Proprietary" -SECTION = "libs" + PR = "r0" RCONFLICTS_${PN} = "amd-gpu-x11-bin-mx51" -# FIXME: Replace for correct AMD license -LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" - -PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" +include amd-gpu-mx51.inc -SRC_URI = "${FSL_MIRROR}/amd-gpu-bin-mx51-${PV}.bin;fsl-eula=true \ - file://fix-linux-build-check.patch" SRC_URI[md5sum] = "9f9b5f67b595721a08793aae8bd8fc46" SRC_URI[sha256sum] = "f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9" -inherit fsl-eula-unpack - -# 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} - install -d ${D}${includedir} - - cp -axr ${S}/usr/bin/* ${D}${bindir} - cp -axf ${S}/usr/lib/* ${D}${libdir} - cp -axr ${S}/usr/include/* ${D}${includedir} - - find ${D}${bindir} -type f -exec chmod 755 {} \; - find ${D}${libdir} -type f -exec chmod 644 {} \; - find ${D}${includedir} -type f -exec chmod 644 {} \; - - # FIXME: Fix sonames of broken libraries - mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0 - mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0 - - # FIXME: Remove unkown files - rm -r ${D}${libdir}/libcsi.a \ - ${D}${libdir}/libres.a -} - -PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \ - libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \ - libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \ - libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \ - libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \ - lib2dz160-mx51 lib2dz160-mx51-dbg \ - lib2dz430-mx51 lib2dz430-mx51-dbg" - -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}" - -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}" - -FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}" -FILES_libgles-mx51-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV}" -FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}" - -FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}" -FILES_libgles2-mx51-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}" -FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" - -FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}" -FILES_libopenvg-mx51-dev = "${includedir}/VG ${libdir}/libOpenVG${SOLIBSDEV}" -FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}" - -FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}" -FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}" - -FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}" -FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}" - COMPATIBLE_MACHINE = "(mx5)" -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc new file mode 100644 index 0000000..b081695 --- /dev/null +++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc @@ -0,0 +1,82 @@ +# Copyright (C) 2011, 2012 Freescale +# Released under the MIT license (see COPYING.MIT for the terms) + +LICENSE = "Proprietary" +SECTION = "libs" + +# FIXME: Replace for correct AMD license +LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" + +PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" + +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ + file://fix-linux-build-check.patch" + +inherit fsl-eula-unpack + +# 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} + install -d ${D}${includedir} + + cp -axr ${S}/usr/bin/* ${D}${bindir} + cp -axf ${S}/usr/lib/* ${D}${libdir} + cp -axr ${S}/usr/include/* ${D}${includedir} + + find ${D}${bindir} -type f -exec chmod 755 {} \; + find ${D}${libdir} -type f -exec chmod 644 {} \; + find ${D}${includedir} -type f -exec chmod 644 {} \; + + # FIXME: Fix sonames of broken libraries + mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0 + mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0 + + # FIXME: Remove unkown files + rm -r ${D}${libdir}/libcsi.a \ + ${D}${libdir}/libres.a +} + +PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \ + libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \ + libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \ + libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \ + libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \ + lib2dz160-mx51 lib2dz160-mx51-dbg \ + lib2dz430-mx51 lib2dz430-mx51-dbg" + +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}" + +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}" + +FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}" +FILES_libgles-mx51-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV}" +FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}" + +FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}" +FILES_libgles2-mx51-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}" +FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" + +FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}" +FILES_libopenvg-mx51-dev = "${includedir}/VG ${libdir}/libOpenVG${SOLIBSDEV}" +FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}" + +FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}" +FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}" + +FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}" +FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}" + +PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb index e50d691..e134882 100644 --- a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +++ b/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb @@ -2,89 +2,15 @@ # Released under the MIT license (see COPYING.MIT for the terms) DESCRIPTION = "GPU driver and apps for x11 on mx51" -LICENSE = "Proprietary" -SECTION = "libs" PR = "r12" RCONFLICTS_${PN} = "amd-gpu-bin-mx51" -# FIXME: Replace for correct AMD license -LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" DEPENDS = "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxrender', '', d)}" -PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" +include amd-gpu-mx51.inc -SRC_URI = "${FSL_MIRROR}/amd-gpu-x11-bin-mx51-${PV}.bin;fsl-eula=true \ - file://fix-linux-build-check.patch" SRC_URI[md5sum] = "54391a4e670b597d06d01253fb217cad" SRC_URI[sha256sum] = "c7a6fa03b7aa2a375556c59908876554ba720c1e744baba2debb84a408f790db" -inherit fsl-eula-unpack - -# 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} - install -d ${D}${includedir} - - cp -axr ${S}/usr/bin/* ${D}${bindir} - cp -axf ${S}/usr/lib/* ${D}${libdir} - cp -axr ${S}/usr/include/* ${D}${includedir} - - find ${D}${bindir} -type f -exec chmod 755 {} \; - find ${D}${libdir} -type f -exec chmod 644 {} \; - find ${D}${includedir} -type f -exec chmod 644 {} \; - - # FIXME: Fix sonames of broken libraries - mv ${D}${libdir}/lib2dz160.so ${D}${libdir}/lib2dz160.so.0 - mv ${D}${libdir}/lib2dz430.so ${D}${libdir}/lib2dz430.so.0 - - # FIXME: Remove unkown files - rm -r ${D}${libdir}/libcsi.a \ - ${D}${libdir}/libres.a -} - -PACKAGES =+ "libgsl-fsl-mx51 libgsl-fsl-mx51-dev libgsl-fsl-mx51-dbg \ - libegl-mx51 libegl-mx51-dev libegl-mx51-dbg \ - libgles-mx51 libgles-mx51-dev libgles-mx51-dbg \ - libgles2-mx51 libgles2-mx51-dev libgles2-mx51-dbg \ - libopenvg-mx51 libopenvg-mx51-dev libopenvg-mx51-dbg \ - lib2dz160-mx51 lib2dz160-mx51-dbg \ - lib2dz430-mx51 lib2dz430-mx51-dbg" - -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}" - -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}" - -FILES_libgles-mx51 = "${libdir}/libGLESv1*${SOLIBS}" -FILES_libgles-mx51-dev = "${includedir}/GLES ${libdir}/libGLESv1*${SOLIBSDEV}" -FILES_libgles-mx51-dbg = "${libdir}/.debug/libGLESv1*${SOLIBS}" - -FILES_libgles2-mx51 = "${libdir}/libGLESv2${SOLIBS}" -FILES_libgles2-mx51-dev = "${includedir}/GLES2 ${libdir}/libGLESv2${SOLIBSDEV}" -FILES_libgles2-mx51-dbg = "${libdir}/.debug/libGLESv2${SOLIBS}" - -FILES_libopenvg-mx51 = "${libdir}/libOpenVG${SOLIBS}" -FILES_libopenvg-mx51-dev = "${includedir}/VG ${libdir}/libOpenVG${SOLIBSDEV}" -FILES_libopenvg-mx51-dbg = "${libdir}/.debug/libOpenVG${SOLIBS}" - -FILES_lib2dz160-mx51 = "${libdir}/lib2dz160${SOLIBS}" -FILES_lib2dz160-mx51-dbg = "${libdir}/.debug/lib2dz160${SOLIBS}" - -FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}" -FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}" - COMPATIBLE_MACHINE = "{@base_contains('DISTRO_FEATURES', 'x11', (mx5), '', d)}" -PACKAGE_ARCH = "${MACHINE_ARCH}" -- 1.7.10.4