diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2012-09-04 14:33:50 +0200 |
---|---|---|
committer | Koen Kooi <koen@dominion.thruhere.net> | 2012-09-05 10:05:06 +0200 |
commit | 49e269ecc66adda341922cbd86167bbfa97c54ca (patch) | |
tree | c8a49f67708832dc9aa613bb45ef62c06d9a0c62 /meta-oe/recipes-core/packagegroups | |
parent | 21a4be0e36bb1ee6c3c469c83a623c5d9a45257a (diff) | |
download | meta-openembedded-49e269ecc66adda341922cbd86167bbfa97c54ca.tar.gz |
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/packagegroups')
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" | |||
5 | LICENSE = "MIT" | 5 | LICENSE = "MIT" |
6 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 6 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
7 | 7 | ||
8 | PR = "r9" | 8 | PR = "r10" |
9 | 9 | ||
10 | inherit packagegroup | 10 | inherit packagegroup |
11 | 11 | ||
@@ -23,6 +23,9 @@ MACHINE_EXTRA_RRECOMMENDS ?= "" | |||
23 | # | 23 | # |
24 | TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" | 24 | TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" |
25 | 25 | ||
26 | RPROVIDES_${PN} += "task-basic" | ||
27 | RREPLACES_${PN} += "task-basic" | ||
28 | RCONFLICTS_${PN} += "task-basic" | ||
26 | # | 29 | # |
27 | # The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom | 30 | # The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom |
28 | # when writing image recipes. | 31 | # 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" | |||
2 | LICENSE = "MIT" | 2 | LICENSE = "MIT" |
3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" | 3 | LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58" |
4 | 4 | ||
5 | PR = "r57" | 5 | PR = "r58" |
6 | 6 | ||
7 | inherit packagegroup | 7 | inherit packagegroup |
8 | 8 | ||
@@ -19,6 +19,10 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" | |||
19 | # Make sure we build the kernel | 19 | # Make sure we build the kernel |
20 | DEPENDS = "virtual/kernel" | 20 | DEPENDS = "virtual/kernel" |
21 | 21 | ||
22 | RPROVIDES_${PN} += "task-boot" | ||
23 | RREPLACES_${PN} += "task-boot" | ||
24 | RCONFLICTS_${PN} += "task-boot" | ||
25 | |||
22 | # | 26 | # |
23 | # minimal set of packages - needed to boot | 27 | # minimal set of packages - needed to boot |
24 | # | 28 | # |
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" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" | 5 | LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" |
6 | PV = "1.0" | 6 | PV = "1.0" |
7 | PR = "r19" | 7 | PR = "r20" |
8 | 8 | ||
9 | inherit packagegroup allarch | 9 | inherit packagegroup allarch |
10 | 10 | ||
11 | PACKAGES += "${PN}-debug" | 11 | PACKAGES += "${PN}-debug" |
12 | 12 | ||
13 | RPROVIDES_${PN} += "task-cli-tools" | ||
14 | RPROVIDES_${PN}-debug += "task-cli-tools-debug" | ||
15 | RREPLACES_${PN} += "task-cli-tools" | ||
16 | RREPLACES_${PN}-debug += "task-cli-tools-debug" | ||
17 | RCONFLICTS_${PN} += "task-cli-tools" | ||
18 | RCONFLICTS_${PN}-debug += "task-cli-tools-debug" | ||
19 | |||
13 | RDEPENDS_${PN} = "\ | 20 | RDEPENDS_${PN} = "\ |
14 | dbus-daemon-proxy \ | 21 | dbus-daemon-proxy \ |
15 | dosfstools \ | 22 | dosfstools \ |