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>
This commit is contained in:
Paul Eggleton 2012-09-04 17:43:26 +01:00 committed by Richard Purdie
parent 748e48249d
commit 29c19460e2
18 changed files with 58 additions and 15 deletions

View File

@ -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"

View File

@ -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 = "\

View File

@ -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 \

View File

@ -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"

View File

@ -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"

View File

@ -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 \

View File

@ -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"

View File

@ -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 \

View File

@ -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"

View File

@ -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 \

View File

@ -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 \

View File

@ -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 \

View File

@ -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 = "\

View File

@ -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)}'

View File

@ -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 \

View File

@ -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"

View File

@ -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)}'

View File

@ -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 \