| Submitter | Ross Burton |
|---|---|
| Date | Sept. 26, 2012, 4:08 p.m. |
| Message ID | <1348675707-24182-1-git-send-email-ross.burton@intel.com> |
| Download | mbox | patch |
| Permalink | /patch/37295/ |
| State | New |
| Headers | show |
Comments
On Wed, Sep 26, 2012 at 05:08:27PM +0100, Ross Burton wrote: > Hopefully for good this time! > > The previous conflict of < ${PV} declares a conflict with all versions older > than the version being built, which isn't right. > > This conflict was being declared in a .inc file which is being included by > multiple recipes (xserver-psb in meta-intel, for example) so knowledge of the > exact version in which this change occured is only known by the .bb file itself. > Recognise this and put the conflict in the .bb file itself. > > Signed-off-by: Ross Burton <ross.burton@intel.com> > --- > meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 4 ++++ > meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 - > 2 files changed, 4 insertions(+), 1 deletion(-) > > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc > index 35cb33a..a2d1bec 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc > @@ -9,3 +9,7 @@ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" > SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" > > PR = "r8" > + > +# This conflict needs to be here and not in the .inc so we know the exact > +# version where the break was > +RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-r5)" This doesn't work if there is layer with PRINC or even more layers which doesn't know about each other, see: http://lists.linuxtogo.org/pipermail/openembedded-core/2012-September/030014.html Cheers, > diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > index 643ca70..3ec38b7 100644 > --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc > @@ -66,7 +66,6 @@ PACKAGES =+ "${PN}-security-policy \ > > RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" > RDEPENDS_${PN}-xvfb += "xkeyboard-config" > -RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})" > > 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" > -- > 1.7.10 > > > _______________________________________________ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc index 35cb33a..a2d1bec 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc @@ -9,3 +9,7 @@ SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24" SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2" PR = "r8" + +# This conflict needs to be here and not in the .inc so we know the exact +# version where the break was +RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-r5)" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 643ca70..3ec38b7 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -66,7 +66,6 @@ PACKAGES =+ "${PN}-security-policy \ RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config" RDEPENDS_${PN}-xvfb += "xkeyboard-config" -RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})" 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"
Hopefully for good this time! The previous conflict of < ${PV} declares a conflict with all versions older than the version being built, which isn't right. This conflict was being declared in a .inc file which is being included by multiple recipes (xserver-psb in meta-intel, for example) so knowledge of the exact version in which this change occured is only known by the .bb file itself. Recognise this and put the conflict in the .bb file itself. Signed-off-by: Ross Burton <ross.burton@intel.com> --- meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 4 ++++ meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 - 2 files changed, 4 insertions(+), 1 deletion(-)