summaryrefslogtreecommitdiffstats
path: root/meta/recipes-gnome/packagegroups
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-04 17:43:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 18:03:18 +0100
commit29c19460e242c37e2cd12577e5835829ffa16b98 (patch)
treee73dc8ddb7fef074dafd689377ef51a4d262bde5 /meta/recipes-gnome/packagegroups
parent748e48249d1f7817f670d8d00ace34cbf2c11b29 (diff)
downloadpoky-29c19460e242c37e2cd12577e5835829ffa16b98.tar.gz
packagegroup-*: add RREPLACES/RCONFLICTS
These are needed to support upgrading from task-* to packagegroup-* within existing target images at runtime. Note: these settings will very likely be moved out to a separate inc file at some point in the future. (From OE-Core rev: 5dd4de086d744c81d2275077ad0e0022204b0a68) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/packagegroups')
-rw-r--r--meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb4
-rw-r--r--meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb4
2 files changed, 6 insertions, 2 deletions
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index e959c5be6c..d42ea7ea1d 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
@@ -4,7 +4,7 @@
4 4
5SUMMARY = "GNOME Mobile And Embedded SDK (host tools)" 5SUMMARY = "GNOME Mobile And Embedded SDK (host tools)"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r12" 7PR = "r13"
8 8
9inherit packagegroup 9inherit packagegroup
10 10
@@ -14,6 +14,8 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
14 14
15# For backwards compatibility after rename 15# For backwards compatibility after rename
16RPROVIDES_${PN} = "task-core-sdk-gmae" 16RPROVIDES_${PN} = "task-core-sdk-gmae"
17RREPLACES_${PN} = "task-core-sdk-gmae"
18RCONFLICTS_${PN} = "task-core-sdk-gmae"
17 19
18RDEPENDS_${PN} = "\ 20RDEPENDS_${PN} = "\
19 packagegroup-core-sdk \ 21 packagegroup-core-sdk \
diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
index 3f322a08f6..e3b8484b74 100644
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
@@ -4,7 +4,7 @@
4 4
5SUMMARY = "GNOME Mobile And Embedded SDK (target tools)" 5SUMMARY = "GNOME Mobile And Embedded SDK (target tools)"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r15" 7PR = "r16"
8 8
9inherit packagegroup 9inherit packagegroup
10 10
@@ -12,6 +12,8 @@ require packagegroup-sdk-gmae.inc
12 12
13# For backwards compatibility after rename 13# For backwards compatibility after rename
14RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target" 14RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target"
15RREPLACES_${PN} = "task-core-standalone-gmae-sdk-target"
16RCONFLICTS_${PN} = "task-core-standalone-gmae-sdk-target"
15 17
16RDEPENDS_${PN} = "\ 18RDEPENDS_${PN} = "\
17 packagegroup-core-standalone-sdk-target \ 19 packagegroup-core-standalone-sdk-target \