On 04/22/2013 11:25 AM, Darren Hart wrote: > I'm testing for FRI2 and Minnow now.
I've built for FRI2 (with my linux-firmware-dev patch applied as well) for ipk and rpm with core-image-sato-sdk and everything completes successfully. I can boot test tomorrow morning, but I suspect we're good with this fix. -- Darren > > On 04/22/2013 11:13 AM, [email protected] wrote: >> From: Nitin A Kamble <[email protected]> >> >> 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 <[email protected]> >> --- >> .../xorg-driver/emgd-driver-bin/gl.pc | 13 ------------- >> .../xorg-driver/emgd-driver-bin_1.16.bb | 1 - >> 2 files changed, 0 insertions(+), 14 deletions(-) >> delete mode 100644 common/recipes-graphics/xorg-driver/emgd-driver-bin/gl.pc >> >> 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 @@ >> -prefix=/usr >> -exec_prefix=${prefix} >> -libdir=/usr/lib >> -includedir=/usr/include >> - >> -Name: gl >> -Description: EMGD OpenGL library >> -Requires.private: >> -Version: 1.16 >> -Libs: -L${libdir} -lGL >> -Libs.private: -lm -lpthread -ldl >> -Cflags: -I${includedir} >> -glx_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() { >> >> SRC_URI = >> "https://edc.intel.com/App_Shared/Downloads/LIN_IEMGD_1_16_GOLD_3228.tgz \ >> file://egl.pc \ >> - file://gl.pc \ >> file://gles_cm.pc \ >> file://glesv2.pc \ >> " >> > -- Darren Hart Intel Open Source Technology Center Yocto Project - Technical Lead - Linux Kernel _______________________________________________ meta-intel mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-intel
