[OE-core] [PATCH] xserver-xorg: restore packaging for the DRI/DRI2/DBE extensions
Kamble, Nitin A
nitin.a.kamble at intel.com
Wed Nov 28 17:01:15 UTC 2012
Ross,
I have a similar patch, which stays in meta-intel. I am testing it now. Because there is no 1.9 Xserver recipe in the oecore, so I think it is meta-intel specific problem. In my patch for the older xserver recipes from meta-intel I am avoiding inclusion of xserver-xorg.inc from oecore. And I am providing another xserver-xorg.inc for them in the meta-intel layer to fix the issues. Technically both these approaches are achieving same thing, just the location of changes is different.
So far in my testing my patch has fixed the X issue for emenlow. And I will be testing the X on crownbay today. BTW my patch is also fixing some additional packaging warnings.
So if this patch goes in oecore, I will redo my fixes in meta-intel. Or I can add Ross'es signed off to my meta-intel patches.
Thanks,
Nitin
> -----Original Message-----
> From: Ross Burton [mailto:ross.burton at intel.com]
> Sent: Wednesday, November 28, 2012 7:29 AM
> To: openembedded-core at lists.openembedded.org
> Cc: Zanussi, Tom; Kamble, Nitin A
> Subject: [PATCH] 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 at intel.com>
> ---
> .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 30 +++++++-------------
> .../xorg-xserver/xserver-xorg_1.13.0.bb | 22 ++++++++++++++
> 2 files changed, 33 insertions(+), 19 deletions(-)
>
> diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> index d410707..cea4c26 100644
> --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc
> @@ -13,7 +13,7 @@ PROVIDES = "virtual/xserver-xf86"
> PROVIDES += "virtual/xserver"
>
> PE = "2"
> -INC_PR = "r6"
> +INC_PR = "r7"
>
> XORG_PN = "xorg-server"
> SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-
> ${PV}.tar.bz2"
> @@ -48,7 +48,12 @@ PACKAGES =+ "${PN}-security-policy \
> ${PN}-utils \
> ${PN}-xephyr \
> ${PN}-multimedia-modules \
> + ${PN}-extension-dri \
> + ${PN}-extension-dri2 \
> ${PN}-extension-glx \
> + ${PN}-extension-record \
> + ${PN}-extension-extmod \
> + ${PN}-extension-dbe \
> ${PN}-module-libint10 \
> ${PN}-module-libafb \
> ${PN}-module-libwfb \
> @@ -62,24 +67,6 @@ PACKAGES =+ "${PN}-security-policy \
> RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb
> xserver-xf86-config"
> RDEPENDS_${PN}-xvfb += "xkeyboard-config"
> RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})"
> -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 \
> - "
>
> FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards
> ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so
> ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt
> ${datadir}/X11/xorg.conf.d"
> FILES_${PN}-dev += "${libdir}/xorg/modules/*.la
> ${libdir}/xorg/modules/*/*.la"
> @@ -95,7 +82,12 @@ FILES_${PN}-xvfb = "${bindir}/Xvfb"
> FILES_${PN}-utils = "${bindir}/scanpci ${bindir}/pcitweak ${bindir}/ioport
> ${bindir}/in[bwl] ${bindir}/out[bwl] ${bindir}/mmap[rw] ${bindir}/gtf
> ${bindir}/getconfig ${bindir}/getconfig.pl"
> FILES_${PN}-xephyr = "${bindir}/Xephyr"
> FILES_${PN}-multimedia-modules =
> "${libdir}/xorg/modules/multimedia/*drv*"
> +FILES_${PN}-extension-dri = "${libdir}/xorg/modules/extensions/libdri.so"
> +FILES_${PN}-extension-dri2 =
> "${libdir}/xorg/modules/extensions/libdri2.so"
> FILES_${PN}-extension-glx = "${libdir}/xorg/modules/extensions/libglx.so"
> +FILES_${PN}-extension-record =
> "${libdir}/xorg/modules/extensions/librecord.so"
> +FILES_${PN}-extension-extmod =
> "${libdir}/xorg/modules/extensions/libextmod.so"
> +FILES_${PN}-extension-dbe =
> "${libdir}/xorg/modules/extensions/libdbe.so"
> FILES_${PN}-module-libint10 = "${libdir}/xorg/modules/libint10.so"
> FILES_${PN}-module-libafb = "${libdir}/xorg/modules/libafb.so"
> FILES_${PN}-module-libwfb = "${libdir}/xorg/modules/libwfb.so"
> 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 8ad87b8..3b102cb 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 \
> + "
> --
> 1.7.10
More information about the Openembedded-core
mailing list