diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-09-11 17:35:16 +0100 |
---|---|---|
committer | Tom Zanussi <tom.zanussi@linux.intel.com> | 2013-09-11 11:59:36 -0500 |
commit | 4f5c753fb2db0cb1f6989ea3be270eebf3ea3572 (patch) | |
tree | 84d6ef0f207fea877286aaaf6029ba0c48921de4 | |
parent | 78f83fed4fbd6e7f0af0edabf6a90d91d61a4237 (diff) | |
download | meta-intel-4f5c753fb2db0cb1f6989ea3be270eebf3ea3572.tar.gz |
emgd-driver-bin: Fix RDEPENDS and exclude from world1.5_M5.rc1
One of the drivers links to libva so we need to list it as an RDEPENDS
so that when we package, we can ensure any library renaming gets applied
correctly. The bug can be seen if you "bitbake emgd-driver-bin", then
build an image using that library.
Also exclude these recipes from world since they should get built when
needed through the virtual/ mechanism, building them for say a qemux86
world build just corrupts the system due the the multiple shlibs providers.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Reviewed-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
-rw-r--r-- | common/recipes-graphics/xorg-driver/emgd-driver-bin_1.16.bb | 5 | ||||
-rw-r--r-- | common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb | 5 |
2 files changed, 10 insertions, 0 deletions
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 4cb7b8a0..6778ee0d 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 | |||
@@ -18,6 +18,11 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=b54f01caaf | |||
18 | 18 | ||
19 | DEPENDS = "rpm-native xz-native" | 19 | DEPENDS = "rpm-native xz-native" |
20 | RDEPENDS_${PN} = "libxcb-dri2 cairo xserver-xorg" | 20 | RDEPENDS_${PN} = "libxcb-dri2 cairo xserver-xorg" |
21 | RDEPENDS_emgd-gst-plugins-mixvideo = "libva-tpi" | ||
22 | |||
23 | # These libraries shouldn't get installed in world builds unless something | ||
24 | # explicitly depends upon them. | ||
25 | EXCLUDE_FROM_WORLD = "1" | ||
21 | 26 | ||
22 | # Add the ABI dependency at package generation time, as otherwise bitbake will | 27 | # Add the ABI dependency at package generation time, as otherwise bitbake will |
23 | # attempt to find a provider for it (and fail) when it does the parse. | 28 | # attempt to find a provider for it (and fail) when it does the parse. |
diff --git a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb index b659a8b4..ee4a313c 100644 --- a/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb +++ b/common/recipes-graphics/xorg-driver/emgd-driver-bin_1.18.bb | |||
@@ -18,6 +18,11 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=7ce256e6a3 | |||
18 | 18 | ||
19 | DEPENDS = "rpm-native xz-native" | 19 | DEPENDS = "rpm-native xz-native" |
20 | RDEPENDS_${PN} = "libxcb-dri2 cairo xserver-xorg" | 20 | RDEPENDS_${PN} = "libxcb-dri2 cairo xserver-xorg" |
21 | RDEPENDS_emgd-gst-plugins-mixvideo = "libva-tpi" | ||
22 | |||
23 | # These libraries shouldn't get installed in world builds unless something | ||
24 | # explicitly depends upon them. | ||
25 | EXCLUDE_FROM_WORLD = "1" | ||
21 | 26 | ||
22 | # Add the ABI dependency at package generation time, as otherwise bitbake will | 27 | # Add the ABI dependency at package generation time, as otherwise bitbake will |
23 | # attempt to find a provider for it (and fail) when it does the parse. | 28 | # attempt to find a provider for it (and fail) when it does the parse. |