Skip to contentSkip to conversation

amd-gpu-x11-bin-mx51: only enable when x11 is in DISTRO_FEATURES

PATCH Superseded Eric Bénard 2 participants 5 messages May 28, 2013 – May 29, 2013

v2 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/3 amd-gpu-x11-bin-mx51: only enable when x11 is in DISTRO_FEATURES

this prevent warnings and parse errors

---
 recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +1 -1
index 2dee47a..8c3557b 100644
@@ -84,5 +84,5 @@ 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)"
+COMPATIBLE_MACHINE = "{@base_contains('DISTRO_FEATURES', 'x11', '(mx5)', '', d)}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH v2 2/3 amd-gpu-x11-bin-mx51: factorize the recipes

this will allow easier addition of non x11 package

---
 recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc  |   82 ++++++++++++++++++++
 .../amd-gpu-x11-bin-mx51_11.09.01.bb               |   75 +-----------------
 .../fix-linux-build-check.patch                    |    0
 3 files changed, 84 insertions(+), 73 deletions(-)
 create mode 100644 recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc
 rename recipes-graphics/amd-gpu-x11-bin/{amd-gpu-x11-bin-mx51 => files}/fix-linux-build-check.patch (100%)
recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc new file +82 -0
new file mode 100644
index 0000000..b081695
@@ -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}"
recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +2 -73

89 lines not on this page · raw message

recipes-graphics/amd-gpu-x11-bin/files/fix-linux-build-check.patch renamed from recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51/fix-linux-build-check.patch +0 -0
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
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH v2 3/3 amd-gpu-bin-mx51: new recipe

In reply to Eric Bénard

this provides the GPU libraries for framebuffer

---
 .../amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb        |   15 +++++++++++++++
 .../amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb    |    2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb
recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb new file +15 -0
new file mode 100644
index 0000000..442bacc
@@ -0,0 +1,15 @@
+# Copyright (C) 2011, 2012 Freescale
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "GPU driver and apps for frambuffer on mx51"
+
+PR = "r0"
+
+RCONFLICTS_${PN} = "amd-gpu-x11-bin-mx51"
+
+include amd-gpu-mx51.inc
+
+SRC_URI[md5sum] = "9f9b5f67b595721a08793aae8bd8fc46"
+SRC_URI[sha256sum] = "f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9"
+
+COMPATIBLE_MACHINE = "(mx5)"
recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +2 -0
index 68f472d..6502c2e 100644
@@ -8,6 +8,8 @@ PR = "r12"
 LIC_FILES_CHKSUM = "file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802"
 DEPENDS = "virtual/libx11 libxrender"
 
+RCONFLICTS_${PN} = "amd-gpu-bin-mx51"
+
 include amd-gpu-mx51.inc
 
 SRC_URI[md5sum] = "54391a4e670b597d06d01253fb217cad"
Signature · 1 line
1.7.10.4
#3 lore raw

Re: [meta-fsl-arm][PATCH v2 3/3] amd-gpu-bin-mx51: new recipe

Quoted 19 lines · Eric Bénard

this provides the GPU libraries for framebuffer

---
 .../amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb        |   15
+++++++++++++++
 .../amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb    |    2 ++
 2 files changed, 17 insertions(+)
 create mode 100644 recipes-graphics/amd-gpu-x11-bin/

amd-gpu-bin-mx51_11.09.01.bb

(quoted diff) +0 -0

amd-gpu-bin-mx51_11.09.01.bb
new file mode 100644
index 0000000..442bacc

recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb line 6

Quoted 6 lines
recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb new file +6 -0
@@ -0,0 +1,15 @@
+# Copyright (C) 2011, 2012 Freescale
+# Released under the MIT license (see COPYING.MIT for the terms)
+
+DESCRIPTION = "GPU driver and apps for frambuffer on mx51"
+
+PR = "r0"

This is not needed anymore as we use PRServer now.

recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb line 8

Quoted 2 lines
recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb new file +1 -0
+RCONFLICTS_${PN} = "amd-gpu-x11-bin-mx51"

This should be moved after SRC_URI as it is a runtime thing.

Quoted 18 lines
recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb new file +4 -0
+include amd-gpu-mx51.inc
+
+SRC_URI[md5sum] = "9f9b5f67b595721a08793aae8bd8fc46"
+SRC_URI[sha256sum] =

"f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9"

recipes-graphics/amd-gpu-x11-bin/amd-gpu-bin-mx51_11.09.01.bb new file +2 -0
+
+COMPATIBLE_MACHINE = "(mx5)"
(quoted diff) +0 -0

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 68f472d..6502c2e 100644

recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +0 -0
@@ -8,6 +8,8 @@ PR = "r12"
 LIC_FILES_CHKSUM =

"file://usr/include/VG/openvg.h;endline=30;md5=b0109611dd76961057d4c45ae6519802"
DEPENDS = "virtual/libx11 libxrender"

Quoted 2 lines

+RCONFLICTS_${PN} = "amd-gpu-bin-mx51"

Same here.

Quoted 11 lines

include amd-gpu-mx51.inc

SRC_URI[md5sum] = "54391a4e670b597d06d01253fb217cad"
--
1.7.10.4

_______________________________________________
meta-freescale mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/meta-freescale

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750
#4 lore raw
In reply to Eric Bénard
Quoted 21 lines · Eric Bénard

this prevent warnings and parse errors

---
 recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb |    2
+-
 1 file changed, 1 insertion(+), 1 deletion(-)
(quoted diff) +0 -0

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 2dee47a..8c3557b 100644

recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +0 -0
@@ -84,5 +84,5 @@ FILES_lib2dz160-mx51-dbg =

"${libdir}/.debug/lib2dz160${SOLIBS}"
FILES_lib2dz430-mx51 = "${libdir}/lib2dz430${SOLIBS}" FILES_lib2dz430-mx51-dbg = "${libdir}/.debug/lib2dz430${SOLIBS}"

recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +1 -1
-COMPATIBLE_MACHINE = "(mx5)"
+COMPATIBLE_MACHINE = "{@base_contains('DISTRO_FEATURES', 'x11', '(mx5)',
Quoted 3 lines

'', d)}"
PACKAGE_ARCH = "${MACHINE_ARCH}"

This is wrong; you need '${@...}' convention for the inline python code to be run.

Signature · 3 lines
Otavio Salvador                             O.S. Systems
http://www.ossystems.com.br        http://projetos.ossystems.com.br
Mobile: +55 (53) 9981-7854            Mobile: +1 (347) 903-9750