aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-05 09:53:14 +0100
committerPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-09 16:24:51 +0100
commit94d151708f4ff6946bf80cb11c6b740871a251c7 (patch)
treec20d7391a3a88236c0d6a665dec2a9104c539ac4
parent235eb64b210937e359398ddbaf1ea495e58d5c9f (diff)
downloadmeta-opie-94d151708f4ff6946bf80cb11c6b740871a251c7.tar.gz
meta-opie-94d151708f4ff6946bf80cb11c6b740871a251c7.tar.bz2
meta-opie-94d151708f4ff6946bf80cb11c6b740871a251c7.zip
packagegroup-*: add RPROVIDES/RREPLACES/RCONFLICTS
Allow upgrades from previous task packages. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--recipes-opie/packagegroups/packagegroup-opie-16mb.bb13
-rw-r--r--recipes-opie/packagegroups/packagegroup-opie-all.bb11
-rw-r--r--recipes-opie/packagegroups/packagegroup-opie-apps.bb12
-rw-r--r--recipes-opie/packagegroups/packagegroup-opie-games.bb11
-rw-r--r--recipes-opie/packagegroups/packagegroup-opie.bb12
-rw-r--r--recipes-opie/packagegroups/packagegroup-xqtlauncher.bb10
6 files changed, 63 insertions, 6 deletions
diff --git a/recipes-opie/packagegroups/packagegroup-opie-16mb.bb b/recipes-opie/packagegroups/packagegroup-opie-16mb.bb
index cefc1bd..2855766 100644
--- a/recipes-opie/packagegroups/packagegroup-opie-16mb.bb
+++ b/recipes-opie/packagegroups/packagegroup-opie-16mb.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tasks for small OPIE image"
SECTION = "opie/base"
LICENSE = "MIT"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r5"
+PR = "r6"
inherit packagegroup
@@ -54,3 +54,14 @@ RDEPENDS_packagegroup-opie-16mb-apps = "opie-console opie-clock opie-backup opie
RDEPENDS_packagegroup-opie-16mb-pim = "opie-addressbook opie-datebook opie-drawpad \
opie-search opie-textedit opie-today opie-todo"
+
+
+python __anonymous() {
+ # For backwards compatibility after rename
+ packages = d.getVar("PACKAGES", True).split()
+ for pkg in packages:
+ d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+}
+
diff --git a/recipes-opie/packagegroups/packagegroup-opie-all.bb b/recipes-opie/packagegroups/packagegroup-opie-all.bb
index 17541da..144642d 100644
--- a/recipes-opie/packagegroups/packagegroup-opie-all.bb
+++ b/recipes-opie/packagegroups/packagegroup-opie-all.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Tasks for OPIE stuff"
SECTION = "opie/base"
LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
inherit packagegroup
@@ -68,3 +68,12 @@ RDEPENDS_packagegroup-opie-todayplugins = "opie-today-addressbookplugin opie-tod
RDEPENDS_packagegroup-opie-wlan = "wireless-tools opie-wellenreiter opie-networksettings-wlanplugin"
+python __anonymous() {
+ # For backwards compatibility after rename
+ packages = d.getVar("PACKAGES", True).split()
+ for pkg in packages:
+ d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+}
+
diff --git a/recipes-opie/packagegroups/packagegroup-opie-apps.bb b/recipes-opie/packagegroups/packagegroup-opie-apps.bb
index 12cd4b3..d2825fb 100644
--- a/recipes-opie/packagegroups/packagegroup-opie-apps.bb
+++ b/recipes-opie/packagegroups/packagegroup-opie-apps.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Tasks for OPIE stuff"
SECTION = "opie/base"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
inherit packagegroup
@@ -28,3 +28,13 @@ RDEPENDS_packagegroup-opie-extra-apps = "opie-calculator opie-checkbook opie-mai
opie-mediaplayer2 \
qpdf2"
# konqueror-embedded
+
+python __anonymous() {
+ # For backwards compatibility after rename
+ packages = d.getVar("PACKAGES", True).split()
+ for pkg in packages:
+ d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+}
+
diff --git a/recipes-opie/packagegroups/packagegroup-opie-games.bb b/recipes-opie/packagegroups/packagegroup-opie-games.bb
index 437bd10..cfb4083 100644
--- a/recipes-opie/packagegroups/packagegroup-opie-games.bb
+++ b/recipes-opie/packagegroups/packagegroup-opie-games.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Tasks for OPIE stuff"
SECTION = "opie/base"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
inherit packagegroup
@@ -22,3 +22,12 @@ RDEPENDS_packagegroup-opie-games = "opie-backgammon opie-bounce opie-buzzword op
RDEPENDS_packagegroup-opie-extra-games = "opie-parashoot opie-mindbreaker opie-fifteen opie-tictac \
opie-tetrix"
+python __anonymous() {
+ # For backwards compatibility after rename
+ packages = d.getVar("PACKAGES", True).split()
+ for pkg in packages:
+ d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+}
+
diff --git a/recipes-opie/packagegroups/packagegroup-opie.bb b/recipes-opie/packagegroups/packagegroup-opie.bb
index 6acf081..ca21fa5 100644
--- a/recipes-opie/packagegroups/packagegroup-opie.bb
+++ b/recipes-opie/packagegroups/packagegroup-opie.bb
@@ -3,7 +3,7 @@ SECTION = "opie/base"
LICENSE = "MIT"
PACKAGE_ARCH = "${MACHINE_ARCH}"
-PR = "r16"
+PR = "r17"
inherit packagegroup
@@ -96,3 +96,13 @@ RDEPENDS_packagegroup-opie-bluetooth = "bluez4 obexftp obexpush libopieobex0 \
opie-bluetoothmanager opie-bluetoothapplet"
RDEPENDS_packagegroup-opie-irda = "irda-utils libopieobex0 obexftp obexpush"
+
+python __anonymous() {
+ # For backwards compatibility after rename
+ packages = d.getVar("PACKAGES", True).split()
+ for pkg in packages:
+ d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+}
+
diff --git a/recipes-opie/packagegroups/packagegroup-xqtlauncher.bb b/recipes-opie/packagegroups/packagegroup-xqtlauncher.bb
index 16da41e..2344464 100644
--- a/recipes-opie/packagegroups/packagegroup-xqtlauncher.bb
+++ b/recipes-opie/packagegroups/packagegroup-xqtlauncher.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "Tasks for xqtlauncher stuff"
SECTION = "opie/base"
LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
inherit packagegroup
@@ -20,4 +20,12 @@ RDEPENDS_packagegroup-xqtlauncher = "xqtlauncher \
RDEPENDS_packagegroup-xqtlauncher-blackbox = "xqtlauncher-blackbox-config \
"
+python __anonymous() {
+ # For backwards compatibility after rename
+ packages = d.getVar("PACKAGES", True).split()
+ for pkg in packages:
+ d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+ d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-", "task-"))
+}