fix for emenlow lsb bug 1395
cover fix for emenlow lsb bug 1395
this patch fix the bug 1395 http://bugzilla.yoctoproject.org/show_bug.cgi?id=1395
the root cause is that: lsb image rdepends on libglu, and xpsb does not provide it. so mesa-dri will be built for libglu. then there will be warning message because both mesa-dri and xpsb will provide virtual/libgl, and cause conflict.
to fix it, xpsb should also provide split package libglu.
The following changes since commit dc00302411d9384deb0c61b34240aa43f108a736:
Tom Zanussi (1):
meta-intel: update meta-emenlow kernel SRCREVs
are available in the git repository at:
git://git.pokylinux.org/poky-contrib kyu3/bug1395-libglu
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=kyu3/bug1395-libglu
Yu Ke (1):
emenlow xpsb-glx: add package libglu to fix lsb image build warning
.../recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
PATCH 1/1 emenlow xpsb-glx: add package libglu to fix lsb image build warning
lsb image requires libglu, so split the xpsb-glx to provide the libglu package. mesa-dri also do in the same way. so this patch make xpsb-glx in sync with mesa-dri.
Fix [YOCTO #1395]
--- .../recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)
meta-emenlow/recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb +6 -1
@@ -4,7 +4,7 @@ DESCRIPTION = "X11 drivers for Poulsbo (psb) 3D acceleration" # not Intel proprietary, but it has no obvious license attached to it. LICENSE = "Intel-binary-only" LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=02c597a2f082b4581596065bb5a521a8" -PR = "r7" +PR = "r8" inherit autotools
@@ -41,6 +41,11 @@ DEPENDS += "libxfixes libxdamage libdrm-poulsbo libxxf86vm dri2proto libxmu libx FILES_${PN} = "${libdir}/* ${libdir}/xorg/modules/dri/* \ ${libdir}/xorg/modules/drivers/*" +PACKAGES =+ "libglu libglu-dev" + +FILES_libglu = "${libdir}/libGLU.so.*" +FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h" + # Multiple virtual/gl providers being built breaks staging EXCLUDE_FROM_WORLD = "1"
Signature · 1 line
1.7.0.4
Re: [PATCH 1/1] emenlow xpsb-glx: add package libglu to fix lsb image build warning
Quoted 6 lines · Yu Ke
lsb image requires libglu, so split the xpsb-glx to provide the libglu package. mesa-dri also do in the same way. so this patch make xpsb-glx in sync with mesa-dri.
Fix [YOCTO #1395]
Thanks, Yu Ke. Pulled into meta-intel/master.
Quoted 30 lines
Signed-off-by Yu Ke <[email protected]>--- .../recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-)meta-emenlow/recipes-graphics/xpsb-glx/xpsb-glx_0.18.bb +6
-1@@ -4,7 +4,7 @@ DESCRIPTION = "X11 drivers for Poulsbo (psb) 3D acceleration" # not Intel proprietary, but it has no obvious license attached to it. LICENSE = "Intel-binary-only" LIC_FILES_CHKSUM = "file://${WORKDIR}/${PN}-${PV}/COPYING;md5=02c597a2f082b4581596065bb5a521a8" -PR = "r7" +PR = "r8" inherit autotools@@ -41,6 +41,11 @@ DEPENDS += "libxfixes libxdamage libdrm-poulsbo libxxf86vm dri2proto libxmu libx FILES_${PN} = "${libdir}/* ${libdir}/xorg/modules/dri/* \ ${libdir}/xorg/modules/drivers/*" +PACKAGES =+ "libglu libglu-dev" + +FILES_libglu = "${libdir}/libGLU.so.*" +FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h" + # Multiple virtual/gl providers being built breaks staging EXCLUDE_FROM_WORLD = "1"