summaryrefslogtreecommitdiffstats
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
parent748e48249d1f7817f670d8d00ace34cbf2c11b29 (diff)
downloadpoky-29c19460e242c37e2cd12577e5835829ffa16b98.tar.gz
poky-29c19460e242c37e2cd12577e5835829ffa16b98.tar.bz2
poky-29c19460e242c37e2cd12577e5835829ffa16b98.zip
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>
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-nfs.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-sdk.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb6
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb4
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb4
-rw-r--r--meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb3
-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
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb4
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb4
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb4
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-core-qt.bb4
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb4
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb4
18 files changed, 58 insertions, 15 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index d29dc2befe..16ad4e3ef8 100644
--- 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 03f9c12a24..531eceb5af 100644
--- 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 f05e099a58..b00bf0704c 100644
--- 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 7fa06e959e..458d8fa036 100644
--- 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 3221e8b57d..df70962912 100644
--- 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 6af299521d..c8b5623bf5 100644
--- 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 6687b32841..d49f2249d8 100644
--- 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 931984eb17..103503645d 100644
--- 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 9720e5ac62..514e4ecf84 100644
--- 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 e55eed52e3..e831860051 100644
--- 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 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 \
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 37e9a877e1..7b1cedc7f5 100644
--- 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 d6c29853eb..55b0b9d020 100644
--- 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 ebae741832..a5d02ede8e 100644
--- 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 ed13354e46..315df3388d 100644
--- 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 042efb86d1..9263828a1a 100644
--- 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 53e15d3550..f2997a74ed 100644
--- 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 \