Saul Wold : xserver-xorg: Modify RREPLACES for RCONFLICTS

oe-commits New Martin Jansa 3 participants 7 messages Sep 21, 2012 – Sep 26, 2012 3 messages not in the archive

lore

Share & tools

lore

Martin Jansa

author

2012-09-21 11:34 UTC #1 lore raw

In reply to a message not in the archive

Quoted 35 lines · On Wed, Sep 19, 2012 at 05:03:33PM +0000, [email protected] wrote:

Module: openembedded-core.git
Branch: master
Commit: 467c59495d83748d35846e8b37548182fea99cbf
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=467c59495d83748d35846e8b37548182fea99cbf
Author: Saul Wold <[email protected]>
Date:   Mon Sep 17 09:17:01 2012 -0700
xserver-xorg: Modify RREPLACES for RCONFLICTS
fix bad runtime dependency that was causing -exa to be a suitable candidate for xserver-xorg, thus resulting in no X server in some situations
Signed-off-by Saul Wold <[email protected]>
---
 .../xorg-xserver/xserver-xorg-1.11.2.inc           |    2 +-
 .../recipes-graphics/xorg-xserver/xserver-xorg.inc |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +1 -1
index c71896a..35cb33a 100644
@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \
 SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
 SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
 
-PR = "r7"
+PR = "r8"
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -0
index 210abad..643ca70 100644

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc PACKAGES =+ "${PN}-security-policy \ · line 69

Quoted 5 lines

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1

@@ -66,7 +66,7 @@ PACKAGES =+ "${PN}-security-policy \
 
 RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config"
 RDEPENDS_${PN}-xvfb += "xkeyboard-config"
-RREPLACES_${PN}-module-exa = "${PN}"
+RCONFLICTS_${PN}-module-exa = "${PN} (<${PV})"

Hmm now it fails in do_rootfs for me :/

| Collected errors:
|  * check_conflicts_for: The following packages conflict with xserver-xorg-module-exa:
|  * check_conflicts_for: 	xserver-xorg *
|  * opkg_install_cmd: Cannot install package packagegroup-shr-minimal-x.
| ERROR: Function failed: do_rootfs (see /var/lib/jenkins/jobs/shr-core/workspace/shr-core/tmp-eglibc/work/om_gta02-oe-linux-gnueabi/shr-image-2.0-r20/temp/log.do_rootfs.8716 for further information)

Quoted 9 lines

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -0
 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"
 
_______________________________________________
Openembedded-commits mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-09-22 17:26 UTC #2 lore raw

PATCH 1/1 xserver-xorg: fix RCONFLICTS line

* there needs to be space between '<' and PV, see:

Quoted 1 line

Quoted 1 line
Quoted 1 line
bb.utils.explode_dep_versions('xserver-xorg (<1.11.2)')

{'xserver-xorg': None}

Quoted 1 line

Quoted 1 line
Quoted 1 line
bb.utils.explode_dep_versions('xserver-xorg (< 1.11.2)')

{'xserver-xorg': '< 1.11.2'}

Signed-off-by Martin Jansa <[email protected]>

---
 meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc | 2 +-
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc +1 -1

index 35cb33a..32bd9fd 100644
@@ -8,4 +8,4 @@ SRC_URI += "file://crosscompile.patch \
 SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
 SRC_URI[sha256sum] = "fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
 
-PR = "r8"
+PR = "r9"

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1

index 643ca70..33f59fe 100644
@@ -66,7 +66,7 @@ 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})"
+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"

Signature · 1 line

1.7.12

Martin Jansa

author

2012-09-22 17:26 UTC #3 lore raw

PATCH 1/1 xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa

* it doesn't make much sense with PV, because xserver-xorg-module-exa was introduced in
http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66
so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<= 1.11.2-r4) and (< 1.11.2) is not good enough

* because we don't know how many PRINC are in BSP/DISTRO layers, then it's safer to RCONFLICTS with every older version then current EXTENDPKGV

Signed-off-by Martin Jansa <[email protected]>

* I haven't really tested this with IPK, since it was changed from RREPLACES to RCONFLICTS (because of RPM) and all my installed devices are already upgraded

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

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1

index 33f59fe..7513399 100644
@@ -66,7 +66,7 @@ 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})"
+RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})"
 
 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"

Signature · 1 line

1.7.12

Richard Purdie

2012-09-24 10:33 UTC #4 lore raw

Re: [PATCH] xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa

Quoted 26 lines · Martin Jansa

* it doesn't make much sense with PV, because xserver-xorg-module-exa was introduced in
http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66
so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<= 1.11.2-r4) and (< 1.11.2) is not good enough
* because we don't know how many PRINC are in BSP/DISTRO layers, then it's safer to RCONFLICTS with every older version then current EXTENDPKGV
Signed-off-by Martin Jansa <[email protected]>
--
* I haven't really tested this with IPK, since it was changed from RREPLACES to RCONFLICTS (because of RPM) and all my installed devices are already upgraded
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -0
index 33f59fe..7513399 100644

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc PACKAGES =+ "${PN}-security-policy \ · line 72

Quoted 8 lines

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1

@@ -66,7 +66,7 @@ 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})"
+RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})"
 
 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"

The original patch and this patch are wrong, this value should not be "floating". It should be spelt out explicitly so it doesn't change with the recipe version in future.:

RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-r4)"

Cheers,

Richard

Martin Jansa

author

2012-09-24 14:16 UTC #5 lore raw

Re: [PATCH] xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa

Quoted 33 lines · Richard Purdie

Quoted 32 lines · Martin Jansa
* it doesn't make much sense with PV, because xserver-xorg-module-exa was introduced in
http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66
so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<= 1.11.2-r4) and (< 1.11.2) is not good enough
* because we don't know how many PRINC are in BSP/DISTRO layers, then it's safer to RCONFLICTS with every older version then current EXTENDPKGV
Signed-off-by Martin Jansa <[email protected]>
--
* I haven't really tested this with IPK, since it was changed from RREPLACES to RCONFLICTS (because of RPM) and all my installed devices are already upgraded
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1
index 33f59fe..7513399 100644
@@ -66,7 +66,7 @@ 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})"
+RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})"
 

Quoted 8 lines

meta/recipes-graphics/xorg-xserver/xserver-xorg.inc PACKAGES =+ "${PN}-security-policy \ · line 72
Quoted 2 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -0
 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"
The original patch and this patch are wrong, this value should not be "floating". It should be spelt out explicitly so it doesn't change with the recipe version in future.:
RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-r4)"

While testing this I've noticed another (probably just opkg status bug), see Conflicts field in Packages file and then the same package in opkg status:

But both packages were installed fine together (so extra = is probably only shown).

SHR root@gjama ~ $ grep -A 15 "Package: xserver-xorg-module-exa" /var/lib/opkg/jama-armv7a-vfp-neon
Package: xserver-xorg-module-exa
Version: 2:1.11.2-r10
Depends: libc6 (>= 2.16)
Conflicts: xserver-xorg (< 2:1.11.2-r10)
Section: x11/base
Architecture: armv7a-vfp-neon
Maintainer: OE-Core Developers <[email protected]>
MD5Sum: 4082f6813a30480b94921a0e322d2117
Size: 42254
Filename: xserver-xorg-module-exa_1.11.2-r10_armv7a-vfp-neon.ipk
Source: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.2.tar.bz2 file://macro_tweak.patch file://crosscompile.patch file://fix_open_max_preprocessor_error.patch file://gcc-47-warning.patch file://mips64-compiler.patch file://randr-support.patch
Description: xserver-xorg version 1.11.2-r10 The X.Org X server
OE: xserver-xorg
HomePage: http://www.x.org
License: MIT-X
Priority: optional

SHR root@gjama ~ $ opkg info xserver-xorg-module-exa
Package: xserver-xorg-module-exa
Version: 2:1.11.2-r10
Depends: libc6 (>= 2.16)
Provides:
Conflicts: xserver-xorg (<= 2:1.11.2-r10)
Status: install user installed
Section: x11/base
Architecture: armv7a-vfp-neon
Maintainer: OE-Core Developers <[email protected]>
MD5Sum: 4082f6813a30480b94921a0e322d2117
Size: 42254
Filename: xserver-xorg-module-exa_1.11.2-r10_armv7a-vfp-neon.ipk
Source: http://xorg.freedesktop.org/releases/individual/xserver/xorg-server-1.11.2.tar.bz2 file://macro_tweak.patch file://crosscompile.patch file://fix_open_max_preprocessor_error.patch file://gcc-47-warning.patch file://mips64-compiler.patch file://randr-support.patch
Description: xserver-xorg version 1.11.2-r10 The X.Org X server
Installed-Time: 1348494842

Signature · 1 line

Martin 'JaMa' Jansa     jabber: [email protected]

Martin Jansa

author

2012-09-26 17:48 UTC #8 lore raw

Re: [PATCH] xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa

In reply to a message not in the archive

Quoted 51 lines · Richard Purdie

Quoted 42 lines · Martin Jansa
Quoted 40 lines · Richard Purdie
Quoted 26 lines · Martin Jansa
* it doesn't make much sense with PV, because xserver-xorg-module-exa was introduced in
http://git.openembedded.org/openembedded-core/commit/meta/recipes-graphics/xorg-xserver?id=1a666ee1cda3c0b74daba5881fc5f62e13deec66
so our xserver-xorg-module-exa RCONFLICTS with xserver-xorg (<= 1.11.2-r4) and (< 1.11.2) is not good enough
* because we don't know how many PRINC are in BSP/DISTRO layers, then it's safer to RCONFLICTS with every older version then current EXTENDPKGV
Signed-off-by Martin Jansa <[email protected]>
--
* I haven't really tested this with IPK, since it was changed from RREPLACES to RCONFLICTS (because of RPM) and all my installed devices are already upgraded
---
 meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +0 -0
index 33f59fe..7513399 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc PACKAGES =+ "${PN}-security-policy \ · line 72
Quoted 8 lines
meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +1 -1
@@ -66,7 +66,7 @@ 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})"
+RCONFLICTS_${PN}-module-exa = "${PN} (< ${EXTENDPKGV})"
 
 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"
The original patch and this patch are wrong, this value should not be "floating". It should be spelt out explicitly so it doesn't change with the recipe version in future.:
Quoted 7 lines
Quoted 1 line
RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-r4)"
So every layer with PRINC in xserver-xorg needs to add RCONFLICTS_${PN}-module-exa = "${PN} (< 1.11.2-rTHEIR_PR_AT_THE_TIME_OF_CHANGE) ?
What if there is more layers then one with PRINC and they don't know about each other?

Quoted 6 lines

There is a problem there, yes and we're on uncharted territory here. If people were using the PR service rather that trying to force package management problems into the core we wouldn't have this kind of problem.
As a solution, how about appending something to PV? I don't like it but an artificial PV step should "resolve" this.

Why not RCONFLICT with every older version then current?

It's true that e.g. 1.11.2-r8 does not really conflict with 1.11.2-r7 (but r4 in most cases), but that should work.

Burton, Ross

2012-09-26 20:43 UTC #9 lore raw

Re: [PATCH] xserver-xorg: use EXTENDPKGV instead of PV in RCONFLICTS_${PN}-module-exa

Quoted 4 lines · Martin Jansa

Why not RCONFLICT with every older version then current?
It's true that e.g. 1.11.2-r8 does not really conflict with 1.11.2-r7 (but r4 in most cases), but that should work.

As much as I don't like this solution as it's overenthusiastic about the conflicts, it isn't demonstrably broken (whereas a bbappend with PRINC breaks my proposal).

So, ignore my patch, I ack this one instead.

Ross