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 <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index d29dc2befe0541645ea8929ee734c4d4bea3bddd..16ad4e3ef89ba0a3cf6549eef062f7925e89da00 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -6,7 +6,7 @@ SUMMARY = "Minimal boot requirements"
 DESCRIPTION = "The minimal set of packages required to boot the system"
 LICENSE = "MIT"
 DEPENDS = "virtual/kernel"
-PR = "r9"
+PR = "r10"
 
 inherit packagegroup
 
@@ -20,6 +20,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-boot"
+RREPLACES_${PN} = "task-core-boot"
+RCONFLICTS_${PN} = "task-core-boot"
 
 # Distro can override the following VIRTUAL-RUNTIME providers:
 VIRTUAL-RUNTIME_dev_manager ?= "udev"

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 03f9c12a24acb4c3df76ac51cf979e0e67a61e34..531eceb5af8417c726b7f3be4d8e14892217dd95 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION = "NFS package groups"
 LICENSE = "MIT"
-PR = "r1"
+PR = "r2"
 
 inherit packagegroup
 
@@ -12,6 +12,8 @@ PACKAGES = "${PN}-server"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN}-server = "task-core-nfs-server"
+RREPLACES_${PN}-server = "task-core-nfs-server"
+RCONFLICTS_${PN}-server = "task-core-nfs-server"
 
 SUMMARY_${PN}-server = "NFS server"
 RDEPENDS_${PN}-server = "\

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index f05e099a5809a7542ed6fdb1161ece76405a3e41..b00bf0704cfdd97f520dfc215ade870cc8de8328 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -4,7 +4,7 @@
 
 SUMMARY = "Software development tools"
 LICENSE = "MIT"
-PR = "r8"
+PR = "r9"
 
 inherit packagegroup
 
@@ -12,6 +12,8 @@ inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_packagegroup-core-sdk = "task-core-sdk"
+RREPLACES_packagegroup-core-sdk = "task-core-sdk"
+RCONFLICTS_packagegroup-core-sdk = "task-core-sdk"
 
 RDEPENDS_packagegroup-core-sdk = "\
     autoconf \

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index 7fa06e959e73a2846f1d4d948b9e046cf7b53fce..458d8fa03681e98856dae0ffd13294961745155a 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
@@ -1,10 +1,12 @@
 SUMMARY = "Dropbear SSH client/server"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-ssh-dropbear"
+RREPLACES_${PN} = "task-core-ssh-dropbear"
+RCONFLICTS_${PN} = "task-core-ssh-dropbear"
 
 RDEPENDS_${PN} = "dropbear"

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index 3221e8b57d3bcb947382eb42ebb3688937491cc6..df70962912a86d4f5f708dea9c4f72a1e75ad8b6 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
@@ -1,10 +1,12 @@
 SUMMARY = "OpenSSH SSH client/server"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-ssh-openssh"
+RREPLACES_${PN} = "task-core-ssh-openssh"
+RCONFLICTS_${PN} = "task-core-ssh-openssh"
 
 RDEPENDS_${PN} = "openssh"

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
index 6af299521d8a9ac8750fc73a1839ba3d963d9838..c8b5623bf5016818cf1e1fc7dc1e9083c63f08c5 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
@@ -1,12 +1,16 @@
 DESCRIPTION = "Target packages for the standalone SDK"
-PR = "r7"
+PR = "r8"
 LICENSE = "MIT"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-standalone-sdk-target"
+RREPLACES_${PN} = "task-core-standalone-sdk-target"
+RCONFLICTS_${PN} = "task-core-standalone-sdk-target"
 RPROVIDES_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
+RREPLACES_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
+RCONFLICTS_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
 
 RDEPENDS_${PN} = "\
     libgcc \

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index 6687b32841bcfe454c4d58beabec2287384befa4..d49f2249d8630c321701135a91274c7fc55e64e6 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
@@ -7,12 +7,14 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
-PR = "r1"
+PR = "r2"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-tools-debug"
+RREPLACES_${PN} = "task-core-tools-debug"
+RCONFLICTS_${PN} = "task-core-tools-debug"
 
 MTRACE = ""
 MTRACE_libc-glibc = "libc-mtrace"

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 931984eb179b2783bbac8b95f940ae6288ec9780..103503645d49162942a8b286199fc55e6b15366a 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -5,12 +5,16 @@
 SUMMARY = "Profiling tools"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-tools-profile"
+RREPLACES_${PN} = "task-core-tools-profile"
+RCONFLICTS_${PN} = "task-core-tools-profile"
 
 RRECOMMENDS_${PN} = "\
     perf \

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 9720e5ac62e6cf11c60b60e0c29996662ff1229a..514e4ecf84dcf09e4fd622129fbece7e8b0c954c 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -5,12 +5,16 @@
 SUMMARY = "Testing tools/applications"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-tools-testapps"
+RREPLACES_${PN} = "task-core-tools-testapps"
+RCONFLICTS_${PN} = "task-core-tools-testapps"
 
 # kexec-tools doesn't work on Mips
 KEXECTOOLS ?= "kexec"

diff --git a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb b/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
index e55eed52e33661702d972f8f9f6c05eee417d419..e831860051adff248b0b583291e52d350fa81610 100644 (file)
--- a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
+++ b/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
@@ -1,10 +1,13 @@
 SUMMARY = "Provides a small set of tools for development on the device"
 LICENSE = "MIT"
 
+PR = "r1"
+
 inherit packagegroup
 
 RPROVIDES_${PN} = "qemu-config"
 RREPLACES_${PN} = "qemu-config"
+RCONFLICTS_${PN} = "qemu-config"
 
 RDEPENDS_${PN} = "\
     distcc-config \

diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index e959c5be6c56aad2d82e9d4ed3c45f439364f030..d42ea7ea1d8c5b329457eb64b340ee0f7d1e5a31 100644 (file)
--- 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 3f322a08f60bd0f0327a9118a1558559a8a2680d..e3b8484b74e474cf1c5a733d011f6e78e7bdd409 100644 (file)
--- 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 \

diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 37e9a877e12529f350d6918aef3f1bb10c252bab..7b1cedc7f56e531250ac619a075811615d331f21 100644 (file)
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -5,7 +5,7 @@
 SUMMARY = "Clutter package groups"
 LICENSE = "MIT"
 
-PR = "r4"
+PR = "r5"
 
 inherit packagegroup
 
@@ -15,6 +15,8 @@ PACKAGES = "\
 
 # For backwards compatibility after rename
 RPROVIDES_${PN}-core = "task-core-clutter-core"
+RREPLACES_${PN}-core = "task-core-clutter-core"
+RCONFLICTS_${PN}-core = "task-core-clutter-core"
 
 SUMMARY_${PN}-core = "Clutter graphics library"
 RDEPENDS_${PN}-core = "\

diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index d6c29853ebf9bdd511e7ec7c0839e193ff4877d3..55b0b9d02082a661866f1ca03c0b1cc483d5caad 100644 (file)
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -1,11 +1,13 @@
 SUMMARY = "GTK+ over DirectFB without X11"
-PR = "r0"
+PR = "r1"
 LICENSE = "MIT"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-gtk-directfb-base"
+RREPLACES_${PN} = "task-core-gtk-directfb-base"
+RCONFLICTS_${PN} = "task-core-gtk-directfb-base"
 
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 

diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
index ebae741832e2e206e7c4b0c7b655ea7172418634..a5d02ede8eb40906f3e0ce47d7c9ab76f81530ba 100644 (file)
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
@@ -1,12 +1,14 @@
 SUMMARY = "Basic X11 session"
 DESCRIPTION = "Packages required to set up a basic working X11 session"
 LICENSE = "MIT"
-PR = "r0"
+PR = "r1"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base"
+RREPLACES_${PN} = "task-core-x11-mini task-core-x11-base"
+RCONFLICTS_${PN} = "task-core-x11-mini task-core-x11-base"
 
 RDEPENDS_${PN} = "\
     packagegroup-core-x11-xserver \

diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index ed13354e46a7fb08d4d09acf1e80e701674bb91b..315df3388d80c16c4ffc4f0d9725d14f4f805e19 100644 (file)
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -4,7 +4,7 @@
 
 DESCRIPTION = "Qt package groups"
 LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
 
 inherit packagegroup
 
@@ -12,6 +12,8 @@ PACKAGES = "${PN}-demoapps"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN}-demoapps = "task-core-qt-demos"
+RREPLACES_${PN}-demoapps = "task-core-qt-demos"
+RCONFLICTS_${PN}-demoapps = "task-core-qt-demos"
 
 QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
 

diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index 042efb86d1dff738ba6027da557165d12ab729ec..9263828a1a3f92e89629c13ca07919d7f0d4d0d6 100644 (file)
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -1,11 +1,13 @@
 SUMMARY = "Qt for Embedded Linux (Qt without X11)"
-PR = "r1"
+PR = "r2"
 LICENSE = "MIT"
 
 inherit packagegroup
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-qt4e-base"
+RREPLACES_${PN} = "task-qt4e-base"
+RCONFLICTS_${PN} = "task-qt4e-base"
 
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 

diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 53e15d3550899665dd6fa75f5281ce22ece9391e..f2997a74edfd1193b844ccc8500ee21df8c7712a 100644 (file)
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -4,7 +4,7 @@
 
 SUMMARY = "Sato desktop"
 LICENSE = "MIT"
-PR = "r32"
+PR = "r33"
 
 inherit packagegroup
 
@@ -14,6 +14,8 @@ PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
 
 # For backwards compatibility after rename
 RPROVIDES_${PN} = "task-core-x11-sato"
+RREPLACES_${PN} = "task-core-x11-sato"
+RCONFLICTS_${PN} = "task-core-x11-sato"
 
 RDEPENDS_${PN} = "\
     ${PN}-base \