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 67BF6E014EC for ; Fri, 31 May 2013 13:54:55 -0700 (PDT) Received: from servor.local.eukrea.com (unknown [82.240.38.71]) by smtp2-g21.free.fr (Postfix) with ESMTP id 30C9A4B0127 for ; Fri, 31 May 2013 22:54:50 +0200 (CEST) From: =?UTF-8?q?Eric=20B=C3=A9nard?= To: meta-freescale@yoctoproject.org Date: Fri, 31 May 2013 22:54:43 +0200 Message-Id: <1370033684-24114-2-git-send-email-eric@eukrea.com> X-Mailer: git-send-email 1.7.11.2.249.g31c7954 In-Reply-To: <1370033684-24114-1-git-send-email-eric@eukrea.com> References: <1370033684-24114-1-git-send-email-eric@eukrea.com> MIME-Version: 1.0 Subject: [meta-fsl-arm][PATCH v5 2/3] amd-gpu-x11-bin-mx51: 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: Fri, 31 May 2013 20:54:58 -0000 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit this will allow easier addition of non x11 package Signed-off-by: Eric Bénard --- ...u-x11-bin-mx51_11.09.01.bb => amd-gpu-mx51.inc} | 8 +-- .../amd-gpu-x11-bin-mx51_11.09.01.bb | 74 +--------------------- 2 files changed, 2 insertions(+), 80 deletions(-) copy recipes-graphics/amd-gpu-x11-bin/{amd-gpu-x11-bin-mx51_11.09.01.bb => amd-gpu-mx51.inc} (88%) 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-mx51.inc similarity index 88% copy from recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb copy to recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc index 70568f9..b081695 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-mx51.inc @@ -1,21 +1,16 @@ # Copyright (C) 2011, 2012 Freescale # 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" # FIXME: Replace for correct AMD license LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" -DEPENDS = "virtual/libx11 libxrender" PROVIDES = "virtual/egl virtual/libgles1 virtual/libgles2" -SRC_URI = "${FSL_MIRROR}/amd-gpu-x11-bin-mx51-${PV}.bin;fsl-eula=true \ +SRC_URI = "${FSL_MIRROR}/${PN}-${PV}.bin;fsl-eula=true \ file://fix-linux-build-check.patch" -SRC_URI[md5sum] = "54391a4e670b597d06d01253fb217cad" -SRC_URI[sha256sum] = "c7a6fa03b7aa2a375556c59908876554ba720c1e744baba2debb84a408f790db" inherit fsl-eula-unpack @@ -84,5 +79,4 @@ 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)', 'Invalid!', d)}" 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 70568f9..a041231 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,87 +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" # FIXME: Replace for correct AMD license LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802" DEPENDS = "virtual/libx11 libxrender" -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)', 'Invalid!', d)}" -PACKAGE_ARCH = "${MACHINE_ARCH}" -- 1.7.11.2.249.g31c7954