Patchwork [meta-fsl-arm,v6,2/5] amd-gpu-x11-bin-mx51: factorize the recipes

login
register
mail settings
Submitter Eric BENARD
Date June 3, 2013, 7:57 a.m.
Message ID <1370246253-2258-2-git-send-email-eric@eukrea.com>
Download mbox | patch
Permalink /patch/51087/
State Changes Requested
Delegated to: Otavio Salvador
Headers show

Comments

Eric BENARD - June 3, 2013, 7:57 a.m.
this will allow easier addition of non x11 package

Signed-off-by: Eric BĂ©nard <eric@eukrea.com>
---
 ...u-x11-bin-mx51_11.09.01.bb => amd-gpu-mx51.inc} |  8 +--
 .../amd-gpu-x11-bin-mx51_11.09.01.bb               | 74 +---------------------
 .../fix-linux-build-check.patch                    |  0
 3 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%)
 rename recipes-graphics/amd-gpu-x11-bin/{amd-gpu-x11-bin-mx51 => files}/fix-linux-build-check.patch (100%)

diff --git a/recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch b/recipes-graphics/amd-gpu-x11-bin/files/fix-linux-build-check.patch
similarity index 100%
rename from recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch
rename to recipes-graphics/amd-gpu-x11-bin/files/fix-linux-build-check.patch

Patch

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}"