diff options
| author |   Ross Burton <ross.burton@intel.com> | 2012-11-28 15:28:48 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-12-03 16:38:28 +0000 |
| commit | 24b954253dd1aa626835352c4dc8d085a19aae35 (patch) | |
| tree | 99a93c467d29fc5cceae648a36520c4cb5f415c5 /meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb | |
| parent | b76878810d39310d1061c637a6bb8f4aa9600054 (diff) | |
| download | openembedded-core-contrib-24b954253dd1aa626835352c4dc8d085a19aae35.tar.gz | |
xserver-xorg: restore packaging for the DRI/DRI2/DBE extensions
Even though the current xserver in oe-core (1.13) doesn't ship these as
standalone extensions, older X servers required by binary drives
(e.g. meta-intel's 1.9) still install them separately. As the packages didn't
exist in xserver-xorg.inc the extensions were not packaged, and X didn't work.
Revolve this by restoring the package definitions, and moving the upgrade path
dependencies to xserver-xorg_1.13.bb.
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb index 8ad87b862a..3b102cb71e 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.13.0.bb @@ -10,3 +10,25 @@ SRC_URI[md5sum] = "bde3d178b756597d2ec2a19ef60d2e1f" SRC_URI[sha256sum] = "548b91cb01087ad4f892428e7ac4955251cf12393e86c70420436b33848ef28a" PR = "${INC_PR}.0" + +# These extensions are now integrated into the server, so declare the migration +# path for in-place upgrades. + +RREPLACES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RPROVIDES_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " +RCONFLICTS_${PN} = "${PN}-extension-dri \ + ${PN}-extension-dri2 \ + ${PN}-extension-record \ + ${PN}-extension-extmod \ + ${PN}-extension-dbe \ + " |