Skip to contentSkip to conversation

Fix use of R* package variables

PATCH In review Paul Eggleton 2 participants 5 messages Feb 4, 2013 – Feb 5, 2013

lore
Share & tools
lore
#0 lore raw

cover Fix use of R* package variables

The package needs to be specified when using R* variables, so fix the few cases where it wasn't.

The following changes since commit 74ec0813562525d02da6ac45eb0237382e98a72f:

xchat: add libsexy to DEPENDS (2013-02-01 17:44:22 +0100)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/pkgvar-fixes
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/pkgvar-fixes

Paul Eggleton (3):
gnome-vfs: use RPROVIDES correctly
tiobench: use RDEPENDS correctly
qconnman: use RCONFLICTS correctly

 meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb |    2 +-
 meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb   |    2 +-
 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb          |    2 +-
 meta-oe/recipes-qt/qconnman/qconnman_git.bb            |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
Signature · 1 line
1.7.10.4
#1 lore raw

PATCH 1/3 gnome-vfs: use RPROVIDES correctly

---
 meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb +1 -1
index 62d63ae..cfe7125 100644
@@ -18,7 +18,7 @@ PR = "r2"
 inherit gnome
 
 # This is to provide compatibility with the gnome-vfs DBus fork
-RPROVIDES = "gnome-vfs-plugin-dbus"
+RPROVIDES_${PN} = "gnome-vfs-plugin-dbus"
 
 SRC_URI += "file://gconftool-lossage.patch \
 	    file://gnome-vfs-no-kerberos.patch;striplevel=0"
Signature · 1 line
1.7.10.4
#2 lore raw

PATCH 2/3 tiobench: use RDEPENDS correctly

In reply to Paul Eggleton
---
 meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb +1 -1
index 5b95ac0..236b913 100644
@@ -19,7 +19,7 @@ do_install() {
     oe_runmake install
 }
 
-RDEPENDS = "\
+RDEPENDS_${PN} = "\
     perl \
     perl-module-exporter-heavy \
     perl-module-getopt-long \
Signature · 1 line
1.7.10.4
#3 lore raw

PATCH 3/3 qconnman: use RCONFLICTS correctly

In reply to Paul Eggleton
---
 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb |    2 +-
 meta-oe/recipes-qt/qconnman/qconnman_git.bb   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
meta-oe/recipes-qt/qconnman/qconnman-e_git.bb +1 -1
index 2fcd3da..1033bf2 100644
@@ -1,6 +1,6 @@
 require qconnman.inc
 
-RCONFLICTS = "qconnman"
+RCONFLICTS_${PN} = "qconnman"
 
 inherit qt4e
 
meta-oe/recipes-qt/qconnman/qconnman_git.bb +1 -1
index 9f03b90..d298cb5 100644
@@ -1,6 +1,6 @@
 require qconnman.inc
 
-RCONFLICTS = "qconnman-e"
+RCONFLICTS_${PN} = "qconnman-e"
 
 inherit qt4x11
 
Signature · 1 line
1.7.10.4
#4 lore raw
In reply to Paul Eggleton
Quoted 2 lines · Paul Eggleton

The package needs to be specified when using R* variables, so fix the few cases where it wasn't.

All 3 merged, thanks.

Quoted 31 lines

The following changes since commit 74ec0813562525d02da6ac45eb0237382e98a72f:

xchat: add libsexy to DEPENDS (2013-02-01 17:44:22 +0100)

are available in the git repository at:

git://git.openembedded.org/meta-openembedded-contrib paule/pkgvar-fixes
http://cgit.openembedded.org/cgit.cgi/meta-openembedded-contrib/log/?h=paule/pkgvar-fixes

Paul Eggleton (3):
gnome-vfs: use RPROVIDES correctly
tiobench: use RDEPENDS correctly
qconnman: use RCONFLICTS correctly

 meta-gnome/recipes-gnome/gnome-vfs/gnome-vfs_2.24.4.bb |    2 +-
 meta-oe/recipes-benchmark/tiobench/tiobench_0.3.3.bb   |    2 +-
 meta-oe/recipes-qt/qconnman/qconnman-e_git.bb          |    2 +-
 meta-oe/recipes-qt/qconnman/qconnman_git.bb            |    2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
Signature · 7 lines
1.7.10.4


_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa     jabber: [email protected]