[meta-intel] [PATCH 1/1] Revert "emgd-driver-bin: add xorg-abi-video- dependency"
tom.zanussi at intel.com
tom.zanussi at intel.com
Sun Dec 2 15:19:33 PST 2012
From: Tom Zanussi <tom.zanussi at intel.com>
This reverts commit fa655a783bc1e41109f408ff49b785d664f64106.
The above commit is causing build problems that this revert fixes
e.g.:
| error: Failed dependencies:
| xorg-abi-video-8 is needed by emgd-driver-1.14-r4.core2
Fixes [YOCTO #3507].
There's no explanation of what the actual problem was that this commit
fixes - likely it was in response to the packaging problems causing
YOCTO #3501 and YOCTO #3502. In any case, nothing should cause a
regression like this since xserver-xorg is pinned at 1.9.3 and its
contents shouldn't change to cause something like 'xorg-abi-video' to
disappear.
Also there doesn't appear to any xorg-abi-video-8, so it's doubtful
that this commit actually fixed the problem it was trying to fix -
should it instead be xorg-video-abi-8 which does exist?
Also this adds a PR bump for the revert.
Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
.../xorg-driver/emgd-driver-bin_1.14.bb | 11 +----------
1 files changed, 1 insertions(+), 10 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 fccb65e..111429e 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 \
local.conf in order to enable it in a build."
LICENSE = "Intel-software-license-emgd-1.14 & Intel-user-space-graphics-driver-binary-license-emgd-1.14"
LICENSE_FLAGS = "license_${PN}_${PV}"
-PR = "r4"
+PR = "r5"
EMGD_LIC_DIR = "IEMGD_HEAD_Linux/License"
EMGD_RPM_DIR = "IEMGD_HEAD_Linux/MeeGo1.2"
@@ -19,15 +19,6 @@ LIC_FILES_CHKSUM = "file://${WORKDIR}/${EMGD_LIC_DIR}/License.txt;md5=b54f01caaf
DEPENDS = "rpm-native xz-native"
RDEPENDS = "libxcb-dri2"
-# Add the ABI dependency at package generation time, as otherwise bitbake will
-# attempt to find a provider for it (and fail) when it does the parse.
-#
-# This version *must* be kept correct.
-python populate_packages_prepend() {
- pn = d.getVar("PN", True)
- d.appendVar("RDEPENDS_" + pn, " xorg-abi-video-8")
-}
-
SRC_URI = "https://edc.intel.com/Download.aspx?id=6190;downloadfilename=LIN_IEMGD_1_14_GOLD_2443.tgz"
SRC_URI[md5sum] = "733a7f237ffce21238ce2c9956df4fd6"
--
1.7.4.1
More information about the meta-intel
mailing list