summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2012-11-16 02:12:59 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2013-03-20 13:37:48 (GMT)
commitd7dbbcba891c18d5134e4ff8f0c51f44f2a4b1dd (patch)
tree1fd1e92e334a31f9c26779b2306050e8e34486a9
parentb0ac9a20b8b5c189fb04e7a3b8beb5360a38f663 (diff)
downloadmeta-intel-d7dbbcba891c18d5134e4ff8f0c51f44f2a4b1dd.tar.gz
emgd-driver-bin: remove duplicate files & fix soft links
Replace all the duplicate files by soft links, and also fix targets of some of the broken soft links. These changes avoid link issues like following, where detailed library versions included in the .so filenames cause linking issues. [...]/tmp/sysroots/x86_64-linux/usr/libexec/core2-poky-linux/gcc/i586-poky-linux/4.7.2/ld: warning: libEMGDegl.so, needed by [...]/tmp/sysroots/fri2/usr/lib/libGLESv2.so, not found (try using -rpath or -rpath-link) [...]/tmp/sysroots/x86_64-linux/usr/libexec/core2-poky-linux/gcc/i586-poky-linux/4.7.2/ld: warning: libemgdsrv_um.so, needed by [...]/tmp/sysroots/fri2/usr/lib/libGLESv2.so, not found (try using -rpath or -rpath-link) This fixes Bug: [YOCTO #4020] Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb32
1 files changed, 31 insertions, 1 deletions
diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
index e068f7a..4569518 100644
--- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
+++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb
@@ -7,7 +7,7 @@ to LICENSE_FLAGS_WHITELIST += \"license_emgd-driver-bin_1.14\" to your \
7local.conf in order to enable it in a build." 7local.conf in order to enable it in a build."
8LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14" 8LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14"
9LICENSE_FLAGS = "license_${PN}_${PV}" 9LICENSE_FLAGS = "license_${PN}_${PV}"
10PR = "r2" 10PR = "r3"
11 11
12EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License" 12EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
13EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2" 13EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
@@ -91,11 +91,41 @@ do_install () {
91 install -d -m 0755 ${D}${includedir}/VG 91 install -d -m 0755 ${D}${includedir}/VG
92 install -m 0755 ${S}/usr/include/VG/*.h ${D}${includedir}/VG/ 92 install -m 0755 ${S}/usr/include/VG/*.h ${D}${includedir}/VG/
93 93
94 EMGD_SNAPSHOT="1.5.15.3226"
95 ln -sf libEGL.so.${EMGD_SNAPSHOT} ${D}${libdir}/libEGL.so.1
94 ln -sf libEGL.so.1 ${D}${libdir}/libEGL.so 96 ln -sf libEGL.so.1 ${D}${libdir}/libEGL.so
97 ln -sf libGLES_CM.so.${EMGD_SNAPSHOT} ${D}${libdir}/libGLES_CM.so.1
95 ln -sf libGLES_CM.so.1 ${D}${libdir}/libGLES_CM.so 98 ln -sf libGLES_CM.so.1 ${D}${libdir}/libGLES_CM.so
99 ln -sf libGLESv2.so.${EMGD_SNAPSHOT} ${D}${libdir}/libGLESv2.so.2
96 ln -sf libGLESv2.so.2 ${D}${libdir}/libGLESv2.so 100 ln -sf libGLESv2.so.2 ${D}${libdir}/libGLESv2.so
101 ln -sf libOpenVG.so.${EMGD_SNAPSHOT} ${D}${libdir}/libOpenVG.so.1
97 ln -sf libOpenVG.so.1 ${D}${libdir}/libOpenVG.so 102 ln -sf libOpenVG.so.1 ${D}${libdir}/libOpenVG.so
103 ln -sf libOpenVGU.so.${EMGD_SNAPSHOT} ${D}${libdir}/libOpenVGU.so.1
98 ln -sf libOpenVGU.so.1 ${D}${libdir}/libOpenVGU.so 104 ln -sf libOpenVGU.so.1 ${D}${libdir}/libOpenVGU.so
105 ln -sf libEMGD2d.so.${EMGD_SNAPSHOT} ${D}${libdir}/libEMGD2d.so
106 ln -sf libEMGDegl.so.${EMGD_SNAPSHOT} ${D}${libdir}/libEMGDegl.so
107 ln -sf libemgdglslcompiler.so.${EMGD_SNAPSHOT} ${D}${libdir}/libemgdglslcompiler.so
108 ln -sf libEMGDOGL.so.${EMGD_SNAPSHOT} ${D}${libdir}/libEMGDOGL.so
109 ln -sf libemgdPVR2D_DRIWSEGL.so.${EMGD_SNAPSHOT} ${D}${libdir}/libemgdPVR2D_DRIWSEGL.so
110 ln -sf libEMGDScopeServices.so.${EMGD_SNAPSHOT} ${D}${libdir}/libEMGDScopeServices.so
111 ln -sf libemgdsrv_init.so.${EMGD_SNAPSHOT} ${D}${libdir}/libemgdsrv_init.so
112 ln -sf libemgdsrv_um.so.${EMGD_SNAPSHOT} ${D}${libdir}/libemgdsrv_um.so
113
114 #Replace duplicate files with symlinks
115 rm -f ${D}${libdir}/libmixvideo.so.0
116 ln -sf libmixvideo.so.0.10.9 ${D}${libdir}/libmixvideo.so.0
117 rm -f ${D}${libdir}/libmixvbp_h264.so.0
118 ln -sf libmixvbp_h264.so.0.10.8 ${D}${libdir}/libmixvbp_h264.so.0
119 rm -f ${D}${libdir}/libmixvbp.so.0
120 ln -sf libmixvbp.so.0.10.8 ${D}${libdir}/libmixvbp.so.0
121 rm -f ${D}${libdir}/libmixvbp_vc1.so.0
122 ln -sf libmixvbp_vc1.so.0.10.8 ${D}${libdir}/libmixvbp_vc1.so.0
123 rm -f ${D}${libdir}/libmixvbp_mpeg4.so.0
124 ln -sf libmixvbp_mpeg4.so.0.10.8 ${D}${libdir}/libmixvbp_mpeg4.so.0
125 rm -f ${D}${libdir}/libmixcommon.so.0
126 ln -sf libmixcommon.so.0.10.8 ${D}${libdir}/libmixcommon.so.0
127 rm -f ${D}${libdir}/libgstvabuffer.so.0
128 ln -sf libgstvabuffer.so.0.10.8 ${D}${libdir}/libgstvabuffer.so.0
99} 129}
100 130
101LEAD_SONAME = "libEGL.so" 131LEAD_SONAME = "libEGL.so"