Skip to contentSkip to conversation

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

PATCH Superseded Eric Bénard 1 participant 4 messages May 31, 2013 – Jun 2, 2013

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

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

From: Eric BENARD <[email protected]>

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..70568f9 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)', 'Invalid!', d)}"
 PACKAGE_ARCH = "${MACHINE_ARCH}"
Signature · 1 line
1.7.11.2.249.g31c7954
#1 lore raw

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

this will allow easier addition of non x11 package

---
 ...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%)
recipes-graphics/amd-gpu-x11-bin/amd-gpu-mx51.inc renamed from recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +1 -7
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
@@ -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}"
recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +1 -73

88 lines not on this page · raw message

Signature · 1 line
1.7.11.2.249.g31c7954
#2 lore raw

Re: [meta-fsl-arm][PATCH v5 2/3] amd-gpu-x11-bin-mx51: factorize the recipes

Quoted 9 lines · Eric Bénard

this will allow easier addition of non x11 package

---
 ...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%)

v6 will follow, this one is missing the renaming of the patch directory.

Eric

#3 lore raw

PATCH v5 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            | 13 +++++++++++++
 .../amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb        |  2 ++
 2 files changed, 15 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 +13 -0
new file mode 100644
index 0000000..ecf38f2
@@ -0,0 +1,13 @@
+# 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"
+
+include amd-gpu-mx51.inc
+
+SRC_URI[md5sum] = "9f9b5f67b595721a08793aae8bd8fc46"
+SRC_URI[sha256sum] = "f0db68a764b5fb199729e7435f606b8d12b61ca97990336c647b7e81f4a584d9"
+
+RCONFLICTS_${PN} = "amd-gpu-x11-bin-mx51"
+
+COMPATIBLE_MACHINE = "(mx5)"
recipes-graphics/amd-gpu-x11-bin/amd-gpu-x11-bin-mx51_11.09.01.bb +2 -0
index a041231..886d041 100644
@@ -13,4 +13,6 @@ include amd-gpu-mx51.inc
 SRC_URI[md5sum] = "54391a4e670b597d06d01253fb217cad"
 SRC_URI[sha256sum] = "c7a6fa03b7aa2a375556c59908876554ba720c1e744baba2debb84a408f790db"
 
+RCONFLICTS_${PN} = "amd-gpu-bin-mx51"
+
 COMPATIBLE_MACHINE = "${@base_contains('DISTRO_FEATURES', 'x11', '(mx5)', 'Invalid!', d)}"
Signature · 1 line
1.7.11.2.249.g31c7954