From 5dd4de086d744c81d2275077ad0e0022204b0a68 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Tue, 4 Sep 2012 17:43:26 +0100 Subject: 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 Signed-off-by: Richard Purdie --- meta/recipes-core/packagegroups/packagegroup-core-boot.bb | 4 +++- meta/recipes-core/packagegroups/packagegroup-core-nfs.bb | 4 +++- meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | 4 +++- meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb | 4 +++- meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb | 4 +++- .../packagegroups/packagegroup-core-standalone-sdk-target.bb | 6 +++++- meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb | 4 +++- meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | 4 ++++ meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | 4 ++++ 9 files changed, 31 insertions(+), 7 deletions(-) (limited to 'meta/recipes-core/packagegroups') 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" -- cgit 1.2.3-korg