From 5dd4de086d744c81d2275077ad0e0022204b0a68 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 4 Sep 2012 17:43:26 +0100 Subject: 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. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb | 4 +++- .../packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'meta/recipes-gnome/packagegroups') 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 @@ SUMMARY = "GNOME Mobile And Embedded SDK (host tools)" LICENSE = "MIT" -PR = "r12" +PR = "r13" inherit packagegroup @@ -14,6 +14,8 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1" # For backwards compatibility after rename RPROVIDES_${PN} = "task-core-sdk-gmae" +RREPLACES_${PN} = "task-core-sdk-gmae" +RCONFLICTS_${PN} = "task-core-sdk-gmae" RDEPENDS_${PN} = "\ 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 @@ SUMMARY = "GNOME Mobile And Embedded SDK (target tools)" LICENSE = "MIT" -PR = "r15" +PR = "r16" inherit packagegroup @@ -12,6 +12,8 @@ require packagegroup-sdk-gmae.inc # For backwards compatibility after rename RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target" +RREPLACES_${PN} = "task-core-standalone-gmae-sdk-target" +RCONFLICTS_${PN} = "task-core-standalone-gmae-sdk-target" RDEPENDS_${PN} = "\ packagegroup-core-standalone-sdk-target \ -- cgit 1.2.3-korg