From 47bc8046cedff5662ae4fa8cbd6d482bc5dde151 Mon Sep 17 00:00:00 2001 From: Max Krummenacher Date: Sun, 8 Jun 2014 15:04:17 +0200 Subject: Use generic bbappend files This uses the % wildcard for recipe matching. remove the deprecated PRINC variable while at it. --- .../gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend | 14 ++++++++ .../gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend | 14 -------- recipes-graphics/mesa/mesa_%.bbappend | 38 ++++++++++++++++++++++ recipes-graphics/mesa/mesa_9.1.6.bbappend | 38 ---------------------- 4 files changed, 52 insertions(+), 52 deletions(-) create mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend delete mode 100644 recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend create mode 100644 recipes-graphics/mesa/mesa_%.bbappend delete mode 100644 recipes-graphics/mesa/mesa_9.1.6.bbappend (limited to 'recipes-graphics') diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend new file mode 100644 index 0000000..690f420 --- /dev/null +++ b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_%.bbappend @@ -0,0 +1,14 @@ +# meta package to pull in the libries, but not the (huge) samples +PACKAGES =+ "gpu-viv-bin-mx6q-libraries " +FILES_gpu-viv-bin-mx6q-libraries = "" +ALLOW_EMPTY_gpu-viv-bin-mx6q-libraries = "1" +RDEPENDS_gpu-viv-bin-mx6q-libraries = " \ + libclc-mx6 \ + libegl-mx6 \ + libgles-mx6 \ + libgles2-mx6 \ + libglslc-mx6 \ + libopencl-mx6 \ + libopenvg-mx6 \ + libvdk-mx6 \ +" \ No newline at end of file diff --git a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend b/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend deleted file mode 100644 index 690f420..0000000 --- a/recipes-graphics/gpu-viv-bin-mx6q/gpu-viv-bin-mx6q_3.10.9-1.0.0-hfp.bbappend +++ /dev/null @@ -1,14 +0,0 @@ -# meta package to pull in the libries, but not the (huge) samples -PACKAGES =+ "gpu-viv-bin-mx6q-libraries " -FILES_gpu-viv-bin-mx6q-libraries = "" -ALLOW_EMPTY_gpu-viv-bin-mx6q-libraries = "1" -RDEPENDS_gpu-viv-bin-mx6q-libraries = " \ - libclc-mx6 \ - libegl-mx6 \ - libgles-mx6 \ - libgles2-mx6 \ - libglslc-mx6 \ - libopencl-mx6 \ - libopenvg-mx6 \ - libvdk-mx6 \ -" \ No newline at end of file diff --git a/recipes-graphics/mesa/mesa_%.bbappend b/recipes-graphics/mesa/mesa_%.bbappend new file mode 100644 index 0000000..9481604 --- /dev/null +++ b/recipes-graphics/mesa/mesa_%.bbappend @@ -0,0 +1,38 @@ +# we use binary only EGL, GL ES1, GL ES2 drivers (package trdx-nv-binaries) +# adapted from meta-fsl-arm/recipes-graphics/mesa/ +# FIXME: We may need to disable EGL, GL ES1 and GL ES2 +python __anonymous () { + import re + + # SoC families to work on + families = ['tegra'] + cur_soc_families = d.getVar('SOC_FAMILY', True) + if cur_soc_families and \ + any(map(lambda x: x in cur_soc_families.split(':'), families)): + # Remove egl gles1 and gles2 configure options + extra_oeconf = d.getVar('EXTRA_OECONF', True).split() + take_out = ['--enable-egl', '--enable-gles1', '--enable-gles2'] + put_in = ['--disable-egl', '--disable-gles1', '--disable-gles2'] + pattern = re.compile("--with-egl-platforms") + new_extra_oeconf = [] + for i in extra_oeconf: + if i not in take_out and not pattern.match(i): + new_extra_oeconf.append(i) + for i in put_in: + new_extra_oeconf.append(i) + + d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) + + # Remove itens from provides + provides = d.getVar('PROVIDES', True).split() + take_out = ['virtual/libgles1', 'virtual/libgles2', 'virtual/egl'] + new_provides = [] + for i in provides: + if i not in take_out: + new_provides.append(i) + + d.setVar('PROVIDES', ' '.join(new_provides)) + + # We are now machine specific + d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH')) +} diff --git a/recipes-graphics/mesa/mesa_9.1.6.bbappend b/recipes-graphics/mesa/mesa_9.1.6.bbappend deleted file mode 100644 index 9481604..0000000 --- a/recipes-graphics/mesa/mesa_9.1.6.bbappend +++ /dev/null @@ -1,38 +0,0 @@ -# we use binary only EGL, GL ES1, GL ES2 drivers (package trdx-nv-binaries) -# adapted from meta-fsl-arm/recipes-graphics/mesa/ -# FIXME: We may need to disable EGL, GL ES1 and GL ES2 -python __anonymous () { - import re - - # SoC families to work on - families = ['tegra'] - cur_soc_families = d.getVar('SOC_FAMILY', True) - if cur_soc_families and \ - any(map(lambda x: x in cur_soc_families.split(':'), families)): - # Remove egl gles1 and gles2 configure options - extra_oeconf = d.getVar('EXTRA_OECONF', True).split() - take_out = ['--enable-egl', '--enable-gles1', '--enable-gles2'] - put_in = ['--disable-egl', '--disable-gles1', '--disable-gles2'] - pattern = re.compile("--with-egl-platforms") - new_extra_oeconf = [] - for i in extra_oeconf: - if i not in take_out and not pattern.match(i): - new_extra_oeconf.append(i) - for i in put_in: - new_extra_oeconf.append(i) - - d.setVar('EXTRA_OECONF', ' '.join(new_extra_oeconf)) - - # Remove itens from provides - provides = d.getVar('PROVIDES', True).split() - take_out = ['virtual/libgles1', 'virtual/libgles2', 'virtual/egl'] - new_provides = [] - for i in provides: - if i not in take_out: - new_provides.append(i) - - d.setVar('PROVIDES', ' '.join(new_provides)) - - # We are now machine specific - d.setVar('PACKAGE_ARCH', d.getVar('MACHINE_ARCH')) -} -- cgit v1.2.3