summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2013-04-21 02:14:38 (GMT)
committerTom Zanussi <tom.zanussi@linux.intel.com>2013-04-23 03:33:42 (GMT)
commitdaeab7fe6781dc3ddeb0adb98175ad767cde1b7d (patch)
tree566fe37dd9a3e19a58f13560c133deb343c6a1b8 /common
parenta6047946b11c7c24ed669f72a6ef444a93f732e5 (diff)
downloadmeta-intel-daeab7fe6781dc3ddeb0adb98175ad767cde1b7d.tar.gz
emgd-driver-bin: do not provide gl.pc
Remove the previously added gl.pc from the emgd recipe. emgd recipe does not provide libGL, still the associated gl.pc file was provided in the recipe, which causes conflicts with other recipes as seen below. These kind of errors are fixed with this commit. | Collected errors: | * check_data_file_clashes: Package libgl-mesa-dev wants to install file /srv/home/nitin/build-test-bsps/build-emenlow/tmp/work/emenlow-poky-linux/core-image-sato-sdk/1.0-r0/rootfs/usr/lib/pkgconfig/gl.pc | But that file is already provided by package * emgd-driver-dev | * opkg_install_cmd: Cannot install package qt4-x11-free-dev. | * check_data_file_clashes: Package libgl-mesa-dev wants to install file /srv/home/nitin/build-test-bsps/build-emenlow/tmp/work/emenlow-poky-linux/core-image-sato-sdk/1.0-r0/rootfs/usr/lib/pkgconfig/gl.pc | But that file is already provided by package * emgd-driver-dev | * opkg_install_cmd: Cannot install package mesa-demos-dev. | * check_data_file_clashes: Package libgl-mesa-dev wants to install file /srv/home/nitin/build-test-bsps/build-emenlow/tmp/work/emenlow-poky-linux/core-image-sato-sdk/1.0-r0/rootfs/usr/lib/pkgconfig/gl.pc | But that file is already provided by package * emgd-driver-dev | * opkg_install_cmd: Cannot install package libva-egl-dev. | * check_data_file_clashes: Package libgl-mesa-dev wants to install file /srv/home/nitin/build-test-bsps/build-emenlow/tmp/work/emenlow-poky-linux/core-image-sato-sdk/1.0-r0/rootfs/usr/lib/pkgconfig/gl.pc | But that file is already provided by package * emgd-driver-dev | * opkg_install_cmd: Cannot install package libva-glx-dev. | * check_data_file_clashes: Package libgl-mesa-dev wants to install file /srv/home/nitin/build-test-bsps/build-emenlow/tmp/work/emenlow-poky-linux/core-image-sato-sdk/1.0-r0/rootfs/usr/lib/pkgconfig/gl.pc | But that file is already provided by package * emgd-driver-dev | * opkg_install_cmd: Cannot install package libgl-mesa-dev. | ERROR: Function failed: do_rootfs (see | /srv/home/nitin/build-test-bsps/build-emenlow/tmp/work/emenlow-poky-li | nux/core-image-sato-sdk/1.0-r0/temp/log.do_rootfs.49983 for further | information) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Tested-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Diffstat (limited to 'common')
-rw-r--r--common/recipes-graphics/xorg-driver/emgd-driver-bin/gl.pc13
-rw-r--r--common/recipes-graphics/xorg-driver/emgd-driver-bin_1.16.bb1
2 files changed, 0 insertions, 14 deletions
diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin/gl.pc b/common/recipes-graphics/xorg-driver/emgd-driver-bin/gl.pc
deleted file mode 100644
index bf07495..0000000
--- a/common/recipes-graphics/xorg-driver/emgd-driver-bin/gl.pc
+++ /dev/null
@@ -1,13 +0,0 @@
1prefix=/usr
2exec_prefix=${prefix}
3libdir=/usr/lib
4includedir=/usr/include
5
6Name: gl
7Description: EMGD OpenGL library
8Requires.private:
9Version: 1.16
10Libs: -L${libdir} -lGL
11Libs.private: -lm -lpthread -ldl
12Cflags: -I${includedir}
13glx_tls: yes
diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.16.bb b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.16.bb
index c9c1ecc..0dc1de1 100644
--- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.16.bb
+++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.16.bb
@@ -30,7 +30,6 @@ python populate_packages_prepend() {
30 30
31SRC_URI = "https://edc.intel.com/App_Shared/Downloads/LIN_IEMGD_1_16_GOLD_3228.tgz \ 31SRC_URI = "https://edc.intel.com/App_Shared/Downloads/LIN_IEMGD_1_16_GOLD_3228.tgz \
32 file://egl.pc \ 32 file://egl.pc \
33 file://gl.pc \
34 file://gles_cm.pc \ 33 file://gles_cm.pc \
35 file://glesv2.pc \ 34 file://glesv2.pc \
36 " 35 "