[meta-intel] Add Xorg ABI dependencies

[meta-intel] Add Xorg ABI dependencies

[Ross Burton]

Hi,

Following are patches against master (*not* danny) to add runtime dependencies
on the Xorg ABI version to the binary drivers, a symbol that the Xorg server
provides.

This means that mismatching server/driver ABIs becomes a package dependency
issue and thus image-time error, instead of a boot time error.

Note that these ABI versions are calculated from the Xorg server version that
the drivers were compiled against and need to be verified and updated manually
when the driver is upgraded.

Ross

[PATCH 1/3] xserver-xorg: bump PR to get the new xorg-abi- RPROVIDES

[Ross Burton]

---
 common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
index 8c7009f..1c71d7b 100644
--- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
+++ b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
@@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
 SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
 SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
 
-PR = "r1"
+PR = "r2"
-- 
1.7.10

Re: [PATCH 1/3] xserver-xorg: bump PR to get the new xorg-abi- RPROVIDES

[Tom Zanussi]

Missing signed-off-by.

Tom

On Mon, 2012-11-05 at 12:47 +0000, Ross Burton wrote:
> ---
>  common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> index 8c7009f..1c71d7b 100644
> --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> +++ b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> @@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
>  SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
>  SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
>  
> -PR = "r1"
> +PR = "r2"

Re: [PATCH 1/3] xserver-xorg: bump PR to get the new xorg-abi- RPROVIDES

[Tom Zanussi]

On Tue, 2012-11-06 at 14:32 -0600, Tom Zanussi wrote:
> Missing signed-off-by.
> 

Please just reply to this with your Signed-off-by and I can pull all
three in, thanks...

Tom

> Tom
> 
> On Mon, 2012-11-05 at 12:47 +0000, Ross Burton wrote:
> > ---
> >  common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc |    2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> > 
> > diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > index 8c7009f..1c71d7b 100644
> > --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > +++ b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > @@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
> >  SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
> >  SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
> >  
> > -PR = "r1"
> > +PR = "r2"
> 

Re: [PATCH 1/3] xserver-xorg: bump PR to get the new xorg-abi- RPROVIDES

[Ross Burton]

[-- Attachment #1: Type: text/plain, Size: 1266 bytes --]

Signed-off-by: Ross Burton <ross.burton@intel.com> 

-- 
Ross Burton
Sent with Sparrow (http://www.sparrowmailapp.com/?sig)


On Tuesday, 6 November 2012 at 23:22, Tom Zanussi wrote:

> On Tue, 2012-11-06 at 14:32 -0600, Tom Zanussi wrote:
> > Missing signed-off-by.
> 
> 
> Please just reply to this with your Signed-off-by and I can pull all
> three in, thanks...
> 
> Tom
> 
> > Tom
> > 
> > On Mon, 2012-11-05 at 12:47 +0000, Ross Burton wrote:
> > > ---
> > > common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc | 2 +-
> > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > 
> > > diff --git a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > > index 8c7009f..1c71d7b 100644
> > > --- a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > > +++ b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > > @@ -17,4 +17,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
> > > SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
> > > SRC_URI[sha256sum] = "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
> > > -PR = "r1"
> > > +PR = "r2"
> > > 
> > 
> > 
> 
> 
> 



[-- Attachment #2: Type: text/html, Size: 1981 bytes --]

Re: [PATCH 1/3] xserver-xorg: bump PR to get the new xorg-abi- RPROVIDES

[Tom Zanussi]

Thanks, Ross!  All three now pulled into meta-intel/master.

Tom

On Wed, 2012-11-07 at 00:03 +0000, Ross Burton wrote:
> Signed-off-by: Ross Burton <ross.burton@intel.com> 
> 
> 
> -- 
> Ross Burton
> Sent with Sparrow
> 
> 
> On Tuesday, 6 November 2012 at 23:22, Tom Zanussi wrote:
> 
> > On Tue, 2012-11-06 at 14:32 -0600, Tom Zanussi wrote:
> > > Missing signed-off-by.
> > 
> > 
> > Please just reply to this with your Signed-off-by and I can pull all
> > three in, thanks...
> > 
> > 
> > Tom
> > 
> > 
> > > Tom
> > > 
> > > 
> > > On Mon, 2012-11-05 at 12:47 +0000, Ross Burton wrote:
> > > > ---
> > > > common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc | 2
> > > > +-
> > > > 1 file changed, 1 insertion(+), 1 deletion(-)
> > > > 
> > > > 
> > > > diff --git
> > > > a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > > > b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > > > index 8c7009f..1c71d7b 100644
> > > > ---
> > > > a/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > > > +++
> > > > b/common/recipes-graphics/xorg-xserver/xserver-xorg-1.9.3.inc
> > > > @@ -17,4 +17,4 @@ LIC_FILES_CHKSUM =
> > > > "file://COPYING;md5=3dd2bbe3563837f80ed8926b06c1c353"
> > > > SRC_URI[md5sum] = "5bef6839a76d029204ab31aa2fcb5201"
> > > > SRC_URI[sha256sum] =
> > > > "864831f51e841ff37f2445d1c85b86b559c8860a435fb496aead4f256a2b141d"
> > > > -PR = "r1"
> > > > +PR = "r2"
> 
> 

[PATCH 2/3] cdv-pvr-driver: add xorg-abi-video- dependency

[Ross Burton]

xserver changes the driver ABI at will, and refuses to load drivers with the
wrong ABI version. So that we know about this error at image build time instead
of when xserver fails to start, RDEPEND on the ABI version we expect.

This dependency is added programmatically so that bitbake doesn't look for a
provider of xorg-abi-video-8 at parse time, which it won't find.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 .../recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb      |    9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb b/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb
index 7bda3b5..ebb5891 100644
--- a/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb
+++ b/meta-cedartrail/recipes-graphics/xorg-driver/cdv-pvr-driver_1.0.3.bb
@@ -88,6 +88,15 @@ FILES_${PN} += "${datadir}/doc/pvr-bin-cdv-${PVR-BIN-REV_LIC}/license.txt"
 
 RDEPENDS_${PN} = "xserver-xorg-module-exa"
 
+# 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")
+}
+
 TARGET_CC_ARCH += "${CFLAGS}{LDFLAGS}"
 INSANE_SKIP_${PN} += "ldflags"
 INSANE_SKIP_${PN}-dbg += "ldflags"
-- 
1.7.10

[PATCH 3/3] emgd-driver-bin: add xorg-abi-video- dependency

[Ross Burton]

xserver changes the driver ABI at will, and refuses to load drivers with the
wrong ABI version. So that we know about this error at image build time instead
of when xserver fails to start, RDEPEND on the ABI version we expect.

This dependency is added programmatically so that bitbake doesn't look for a
provider of xorg-abi-video-8 at parse time, which it won't find.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 common/recipes-graphics/xorg-driver/emgd-driver-bin_1.14.bb |    9 +++++++++
 1 file changed, 9 insertions(+)

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 e068f7a..cc78d61 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
@@ -19,6 +19,15 @@ 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.10

Re: [meta-intel] Add Xorg ABI dependencies

[Tom Zanussi]

On Mon, 2012-11-05 at 12:47 +0000, Ross Burton wrote:
> Hi,
> 
> Following are patches against master (*not* danny) to add runtime dependencies
> on the Xorg ABI version to the binary drivers, a symbol that the Xorg server
> provides.
> 
> This means that mismatching server/driver ABIs becomes a package dependency
> issue and thus image-time error, instead of a boot time error.
> 
> Note that these ABI versions are calculated from the Xorg server version that
> the drivers were compiled against and need to be verified and updated manually
> when the driver is upgraded.

In the future, could you also add a link to the branch (if there is
one)?  I guess these are at:

http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-contrib/log/?h=ross/xorgabi

But would rather not guess (or compare) or have to pull them off the
list.

Thanks,

Tom

> Ross
> 
> _______________________________________________
> yocto mailing list
> yocto@yoctoproject.org
> https://lists.yoctoproject.org/listinfo/yocto

Re: [meta-intel] Add Xorg ABI dependencies

[Burton, Ross]

On 6 November 2012 20:34, Tom Zanussi <tom.zanussi@intel.com> wrote:
> In the future, could you also add a link to the branch (if there is
> one)?  I guess these are at:
>
> http://git.yoctoproject.org/cgit/cgit.cgi/meta-intel-contrib/log/?h=ross/xorgabi
>
> But would rather not guess (or compare) or have to pull them off the
> list.

Of course, apologies for not doing that.  In general with me the
branch is canonical.

Ross