diff options
author | Otavio Salvador <otavio@ossystems.com.br> | 2016-04-29 14:12:23 -0300 |
---|---|---|
committer | Otavio Salvador <otavio@ossystems.com.br> | 2016-05-07 10:07:46 -0300 |
commit | 257ba68ad8688efb8c390c3a4dd541e0ce3a9adf (patch) | |
tree | 4a0bb245ca8a141cadd1e153bf997c43c55b0ac5 | |
parent | 751b838954ca58710c12564d0a358f055450deb0 (diff) | |
download | meta-freescale-257ba68ad8688efb8c390c3a4dd541e0ce3a9adf.tar.gz |
imx-gpu-viv: Rework code so it is easier to read
Instead of using USE_X11 and USE_WL, we now use HAS_X11 and
HAS_WL. The variable does not imply that the backend is actually used
but if the distribution has, or not, the support for the backend.
Change-Id: I8630b54ed0a80f2877e5e97f71ae14e78ed5aeea
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
-rw-r--r-- | recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc index d7a42923..38099cd3 100644 --- a/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc +++ b/recipes-graphics/imx-gpu-viv/imx-gpu-viv.inc | |||
@@ -53,8 +53,8 @@ python __anonymous () { | |||
53 | raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.') | 53 | raise bb.parse.SkipPackage('The kernel of machine needs to have Vivante kernel driver support for this recipe to be used.') |
54 | } | 54 | } |
55 | 55 | ||
56 | USE_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" | 56 | HAS_X11 = "${@base_contains("DISTRO_FEATURES", "x11", "yes", "no", d)}" |
57 | USE_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" | 57 | HAS_WL = "${@base_contains("DISTRO_FEATURES", "wayland", "yes", "no", d)}" |
58 | 58 | ||
59 | # Inhibit warnings about files being stripped. | 59 | # Inhibit warnings about files being stripped. |
60 | INHIBIT_PACKAGE_STRIP = "1" | 60 | INHIBIT_PACKAGE_STRIP = "1" |
@@ -112,7 +112,7 @@ do_install () { | |||
112 | install -d ${D}${libdir}/pkgconfig | 112 | install -d ${D}${libdir}/pkgconfig |
113 | 113 | ||
114 | # The preference order, based in DISTRO_FEATURES, is x11, wayland and fb | 114 | # The preference order, based in DISTRO_FEATURES, is x11, wayland and fb |
115 | if [ "${USE_X11}" = "yes" ]; then | 115 | if [ "${HAS_X11}" = "yes" ]; then |
116 | cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} | 116 | cp -r ${S}/gpu-core/usr/lib/dri ${D}${libdir} |
117 | cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir} | 117 | cp -r ${S}/apitrace/x11/usr/lib/* ${D}${libdir} |
118 | cp -r ${S}/apitrace/x11/usr/bin/* ${D}${bindir} | 118 | cp -r ${S}/apitrace/x11/usr/bin/* ${D}${bindir} |
@@ -123,7 +123,7 @@ do_install () { | |||
123 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc | 123 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv1_cm_x11.pc ${D}${libdir}/pkgconfig/glesv1_cm.pc |
124 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc | 124 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/glesv2_x11.pc ${D}${libdir}/pkgconfig/glesv2.pc |
125 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc | 125 | install -m 0644 ${S}/gpu-core/usr/lib/pkgconfig/vg_x11.pc ${D}${libdir}/pkgconfig/vg.pc |
126 | elif [ "${USE_WL}" = "yes" ]; then | 126 | elif [ "${HAS_WL}" = "yes" ]; then |
127 | cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} | 127 | cp -r ${S}/apitrace/non-x11/usr/lib/* ${D}${libdir} |
128 | cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} | 128 | cp -r ${S}/apitrace/non-x11/usr/bin/* ${D}${bindir} |
129 | 129 | ||
@@ -171,7 +171,7 @@ do_install () { | |||
171 | ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so | 171 | ln -sf libGLESv2.so.2.0.0 ${D}${libdir}/libGLESv2.so |
172 | 172 | ||
173 | # skip packaging wayland libraries if no support is requested | 173 | # skip packaging wayland libraries if no support is requested |
174 | if [ "${USE_WL}" = "no" ]; then | 174 | if [ "${HAS_WL}" = "no" ]; then |
175 | rm ${D}${libdir}/libgc_wayland_protocol.* | 175 | rm ${D}${libdir}/libgc_wayland_protocol.* |
176 | rm ${D}${libdir}/libwayland-viv.* | 176 | rm ${D}${libdir}/libwayland-viv.* |
177 | fi | 177 | fi |