aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-core
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2012-09-04 14:33:50 +0200
committerKoen Kooi <koen@dominion.thruhere.net>2012-09-05 10:05:06 +0200
commit49e269ecc66adda341922cbd86167bbfa97c54ca (patch)
treec8a49f67708832dc9aa613bb45ef62c06d9a0c62 /meta-oe/recipes-core
parent21a4be0e36bb1ee6c3c469c83a623c5d9a45257a (diff)
downloadmeta-openembedded-49e269ecc66adda341922cbd86167bbfa97c54ca.tar.gz
meta-openembedded-49e269ecc66adda341922cbd86167bbfa97c54ca.tar.bz2
meta-openembedded-49e269ecc66adda341922cbd86167bbfa97c54ca.zip
packagegroup: add RPROVIDES/RREPLACES/RCONFLICTS and bump PR to get some upgrade path
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-core')
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-basic.bb5
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-boot.bb6
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb9
3 files changed, 17 insertions, 3 deletions
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index e46afc278..493ef5e33 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -5,7 +5,7 @@ DESCRIPTION = "Basic task to get a device online"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r9"
+PR = "r10"
inherit packagegroup
@@ -23,6 +23,9 @@ MACHINE_EXTRA_RRECOMMENDS ?= ""
#
TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server"
+RPROVIDES_${PN} += "task-basic"
+RREPLACES_${PN} += "task-basic"
+RCONFLICTS_${PN} += "task-basic"
#
# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom
# when writing image recipes.
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
index ac3111834..1d6ae9eda 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Basic task to get a device booting"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58"
-PR = "r57"
+PR = "r58"
inherit packagegroup
@@ -19,6 +19,10 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
# Make sure we build the kernel
DEPENDS = "virtual/kernel"
+RPROVIDES_${PN} += "task-boot"
+RREPLACES_${PN} += "task-boot"
+RCONFLICTS_${PN} += "task-boot"
+
#
# minimal set of packages - needed to boot
#
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
index 0ab3703bd..07fb056f6 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
@@ -4,12 +4,19 @@ SECTION = "console"
LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
PV = "1.0"
-PR = "r19"
+PR = "r20"
inherit packagegroup allarch
PACKAGES += "${PN}-debug"
+RPROVIDES_${PN} += "task-cli-tools"
+RPROVIDES_${PN}-debug += "task-cli-tools-debug"
+RREPLACES_${PN} += "task-cli-tools"
+RREPLACES_${PN}-debug += "task-cli-tools-debug"
+RCONFLICTS_${PN} += "task-cli-tools"
+RCONFLICTS_${PN}-debug += "task-cli-tools-debug"
+
RDEPENDS_${PN} = "\
dbus-daemon-proxy \
dosfstools \