summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2012-09-04 16:43:26 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-09-04 17:03:18 (GMT)
commit29c19460e242c37e2cd12577e5835829ffa16b98 (patch)
treee73dc8ddb7fef074dafd689377ef51a4d262bde5
parent748e48249d1f7817f670d8d00ace34cbf2c11b29 (diff)
downloadpoky-29c19460e242c37e2cd12577e5835829ffa16b98.tar.gz
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 d29dc2b..16ad4e3 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"
6DESCRIPTION = "The minimal set of packages required to boot the system" 6DESCRIPTION = "The minimal set of packages required to boot the system"
7LICENSE = "MIT" 7LICENSE = "MIT"
8DEPENDS = "virtual/kernel" 8DEPENDS = "virtual/kernel"
9PR = "r9" 9PR = "r10"
10 10
11inherit packagegroup 11inherit packagegroup
12 12
@@ -20,6 +20,8 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
20 20
21# For backwards compatibility after rename 21# For backwards compatibility after rename
22RPROVIDES_${PN} = "task-core-boot" 22RPROVIDES_${PN} = "task-core-boot"
23RREPLACES_${PN} = "task-core-boot"
24RCONFLICTS_${PN} = "task-core-boot"
23 25
24# Distro can override the following VIRTUAL-RUNTIME providers: 26# Distro can override the following VIRTUAL-RUNTIME providers:
25VIRTUAL-RUNTIME_dev_manager ?= "udev" 27VIRTUAL-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 03f9c12..531eceb 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -4,7 +4,7 @@
4 4
5DESCRIPTION = "NFS package groups" 5DESCRIPTION = "NFS package groups"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r1" 7PR = "r2"
8 8
9inherit packagegroup 9inherit packagegroup
10 10
@@ -12,6 +12,8 @@ PACKAGES = "${PN}-server"
12 12
13# For backwards compatibility after rename 13# For backwards compatibility after rename
14RPROVIDES_${PN}-server = "task-core-nfs-server" 14RPROVIDES_${PN}-server = "task-core-nfs-server"
15RREPLACES_${PN}-server = "task-core-nfs-server"
16RCONFLICTS_${PN}-server = "task-core-nfs-server"
15 17
16SUMMARY_${PN}-server = "NFS server" 18SUMMARY_${PN}-server = "NFS server"
17RDEPENDS_${PN}-server = "\ 19RDEPENDS_${PN}-server = "\
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index f05e099..b00bf07 100644
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -4,7 +4,7 @@
4 4
5SUMMARY = "Software development tools" 5SUMMARY = "Software development tools"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r8" 7PR = "r9"
8 8
9inherit packagegroup 9inherit packagegroup
10 10
@@ -12,6 +12,8 @@ inherit packagegroup
12 12
13# For backwards compatibility after rename 13# For backwards compatibility after rename
14RPROVIDES_packagegroup-core-sdk = "task-core-sdk" 14RPROVIDES_packagegroup-core-sdk = "task-core-sdk"
15RREPLACES_packagegroup-core-sdk = "task-core-sdk"
16RCONFLICTS_packagegroup-core-sdk = "task-core-sdk"
15 17
16RDEPENDS_packagegroup-core-sdk = "\ 18RDEPENDS_packagegroup-core-sdk = "\
17 autoconf \ 19 autoconf \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index 7fa06e9..458d8fa 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 @@
1SUMMARY = "Dropbear SSH client/server" 1SUMMARY = "Dropbear SSH client/server"
2LICENSE = "MIT" 2LICENSE = "MIT"
3PR = "r0" 3PR = "r1"
4 4
5inherit packagegroup 5inherit packagegroup
6 6
7# For backwards compatibility after rename 7# For backwards compatibility after rename
8RPROVIDES_${PN} = "task-core-ssh-dropbear" 8RPROVIDES_${PN} = "task-core-ssh-dropbear"
9RREPLACES_${PN} = "task-core-ssh-dropbear"
10RCONFLICTS_${PN} = "task-core-ssh-dropbear"
9 11
10RDEPENDS_${PN} = "dropbear" 12RDEPENDS_${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 3221e8b..df70962 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 @@
1SUMMARY = "OpenSSH SSH client/server" 1SUMMARY = "OpenSSH SSH client/server"
2LICENSE = "MIT" 2LICENSE = "MIT"
3PR = "r0" 3PR = "r1"
4 4
5inherit packagegroup 5inherit packagegroup
6 6
7# For backwards compatibility after rename 7# For backwards compatibility after rename
8RPROVIDES_${PN} = "task-core-ssh-openssh" 8RPROVIDES_${PN} = "task-core-ssh-openssh"
9RREPLACES_${PN} = "task-core-ssh-openssh"
10RCONFLICTS_${PN} = "task-core-ssh-openssh"
9 11
10RDEPENDS_${PN} = "openssh" 12RDEPENDS_${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 6af2995..c8b5623 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 @@
1DESCRIPTION = "Target packages for the standalone SDK" 1DESCRIPTION = "Target packages for the standalone SDK"
2PR = "r7" 2PR = "r8"
3LICENSE = "MIT" 3LICENSE = "MIT"
4 4
5inherit packagegroup 5inherit packagegroup
6 6
7# For backwards compatibility after rename 7# For backwards compatibility after rename
8RPROVIDES_${PN} = "task-core-standalone-sdk-target" 8RPROVIDES_${PN} = "task-core-standalone-sdk-target"
9RREPLACES_${PN} = "task-core-standalone-sdk-target"
10RCONFLICTS_${PN} = "task-core-standalone-sdk-target"
9RPROVIDES_${PN}-dbg = "task-core-standalone-sdk-target-dbg" 11RPROVIDES_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
12RREPLACES_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
13RCONFLICTS_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
10 14
11RDEPENDS_${PN} = "\ 15RDEPENDS_${PN} = "\
12 libgcc \ 16 libgcc \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index 6687b32..d49f224 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"
7 7
8inherit packagegroup 8inherit packagegroup
9 9
10PR = "r1" 10PR = "r2"
11 11
12PACKAGE_ARCH = "${MACHINE_ARCH}" 12PACKAGE_ARCH = "${MACHINE_ARCH}"
13 13
14# For backwards compatibility after rename 14# For backwards compatibility after rename
15RPROVIDES_${PN} = "task-core-tools-debug" 15RPROVIDES_${PN} = "task-core-tools-debug"
16RREPLACES_${PN} = "task-core-tools-debug"
17RCONFLICTS_${PN} = "task-core-tools-debug"
16 18
17MTRACE = "" 19MTRACE = ""
18MTRACE_libc-glibc = "libc-mtrace" 20MTRACE_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 931984e..1035036 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 @@
5SUMMARY = "Profiling tools" 5SUMMARY = "Profiling tools"
6LICENSE = "MIT" 6LICENSE = "MIT"
7 7
8PR = "r1"
9
8inherit packagegroup 10inherit packagegroup
9 11
10PACKAGE_ARCH = "${MACHINE_ARCH}" 12PACKAGE_ARCH = "${MACHINE_ARCH}"
11 13
12# For backwards compatibility after rename 14# For backwards compatibility after rename
13RPROVIDES_${PN} = "task-core-tools-profile" 15RPROVIDES_${PN} = "task-core-tools-profile"
16RREPLACES_${PN} = "task-core-tools-profile"
17RCONFLICTS_${PN} = "task-core-tools-profile"
14 18
15RRECOMMENDS_${PN} = "\ 19RRECOMMENDS_${PN} = "\
16 perf \ 20 perf \
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 9720e5a..514e4ec 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 @@
5SUMMARY = "Testing tools/applications" 5SUMMARY = "Testing tools/applications"
6LICENSE = "MIT" 6LICENSE = "MIT"
7 7
8PR = "r1"
9
8inherit packagegroup 10inherit packagegroup
9 11
10PACKAGE_ARCH = "${MACHINE_ARCH}" 12PACKAGE_ARCH = "${MACHINE_ARCH}"
11 13
12# For backwards compatibility after rename 14# For backwards compatibility after rename
13RPROVIDES_${PN} = "task-core-tools-testapps" 15RPROVIDES_${PN} = "task-core-tools-testapps"
16RREPLACES_${PN} = "task-core-tools-testapps"
17RCONFLICTS_${PN} = "task-core-tools-testapps"
14 18
15# kexec-tools doesn't work on Mips 19# kexec-tools doesn't work on Mips
16KEXECTOOLS ?= "kexec" 20KEXECTOOLS ?= "kexec"
diff --git a/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb b/meta/recipes-devtools/packagegroups/packagegroup-core-device-devel.bb
index e55eed5..e831860 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 @@
1SUMMARY = "Provides a small set of tools for development on the device" 1SUMMARY = "Provides a small set of tools for development on the device"
2LICENSE = "MIT" 2LICENSE = "MIT"
3 3
4PR = "r1"
5
4inherit packagegroup 6inherit packagegroup
5 7
6RPROVIDES_${PN} = "qemu-config" 8RPROVIDES_${PN} = "qemu-config"
7RREPLACES_${PN} = "qemu-config" 9RREPLACES_${PN} = "qemu-config"
10RCONFLICTS_${PN} = "qemu-config"
8 11
9RDEPENDS_${PN} = "\ 12RDEPENDS_${PN} = "\
10 distcc-config \ 13 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 e959c5b..d42ea7e 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 @@
4 4
5SUMMARY = "GNOME Mobile And Embedded SDK (host tools)" 5SUMMARY = "GNOME Mobile And Embedded SDK (host tools)"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r12" 7PR = "r13"
8 8
9inherit packagegroup 9inherit packagegroup
10 10
@@ -14,6 +14,8 @@ PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
14 14
15# For backwards compatibility after rename 15# For backwards compatibility after rename
16RPROVIDES_${PN} = "task-core-sdk-gmae" 16RPROVIDES_${PN} = "task-core-sdk-gmae"
17RREPLACES_${PN} = "task-core-sdk-gmae"
18RCONFLICTS_${PN} = "task-core-sdk-gmae"
17 19
18RDEPENDS_${PN} = "\ 20RDEPENDS_${PN} = "\
19 packagegroup-core-sdk \ 21 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 3f322a0..e3b8484 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 @@
4 4
5SUMMARY = "GNOME Mobile And Embedded SDK (target tools)" 5SUMMARY = "GNOME Mobile And Embedded SDK (target tools)"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r15" 7PR = "r16"
8 8
9inherit packagegroup 9inherit packagegroup
10 10
@@ -12,6 +12,8 @@ require packagegroup-sdk-gmae.inc
12 12
13# For backwards compatibility after rename 13# For backwards compatibility after rename
14RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target" 14RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target"
15RREPLACES_${PN} = "task-core-standalone-gmae-sdk-target"
16RCONFLICTS_${PN} = "task-core-standalone-gmae-sdk-target"
15 17
16RDEPENDS_${PN} = "\ 18RDEPENDS_${PN} = "\
17 packagegroup-core-standalone-sdk-target \ 19 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 37e9a87..7b1cedc 100644
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -5,7 +5,7 @@
5SUMMARY = "Clutter package groups" 5SUMMARY = "Clutter package groups"
6LICENSE = "MIT" 6LICENSE = "MIT"
7 7
8PR = "r4" 8PR = "r5"
9 9
10inherit packagegroup 10inherit packagegroup
11 11
@@ -15,6 +15,8 @@ PACKAGES = "\
15 15
16# For backwards compatibility after rename 16# For backwards compatibility after rename
17RPROVIDES_${PN}-core = "task-core-clutter-core" 17RPROVIDES_${PN}-core = "task-core-clutter-core"
18RREPLACES_${PN}-core = "task-core-clutter-core"
19RCONFLICTS_${PN}-core = "task-core-clutter-core"
18 20
19SUMMARY_${PN}-core = "Clutter graphics library" 21SUMMARY_${PN}-core = "Clutter graphics library"
20RDEPENDS_${PN}-core = "\ 22RDEPENDS_${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 d6c2985..55b0b9d 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 @@
1SUMMARY = "GTK+ over DirectFB without X11" 1SUMMARY = "GTK+ over DirectFB without X11"
2PR = "r0" 2PR = "r1"
3LICENSE = "MIT" 3LICENSE = "MIT"
4 4
5inherit packagegroup 5inherit packagegroup
6 6
7# For backwards compatibility after rename 7# For backwards compatibility after rename
8RPROVIDES_${PN} = "task-core-gtk-directfb-base" 8RPROVIDES_${PN} = "task-core-gtk-directfb-base"
9RREPLACES_${PN} = "task-core-gtk-directfb-base"
10RCONFLICTS_${PN} = "task-core-gtk-directfb-base"
9 11
10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 12TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
11 13
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
index ebae741..a5d02ed 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 @@
1SUMMARY = "Basic X11 session" 1SUMMARY = "Basic X11 session"
2DESCRIPTION = "Packages required to set up a basic working X11 session" 2DESCRIPTION = "Packages required to set up a basic working X11 session"
3LICENSE = "MIT" 3LICENSE = "MIT"
4PR = "r0" 4PR = "r1"
5 5
6inherit packagegroup 6inherit packagegroup
7 7
8# For backwards compatibility after rename 8# For backwards compatibility after rename
9RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base" 9RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base"
10RREPLACES_${PN} = "task-core-x11-mini task-core-x11-base"
11RCONFLICTS_${PN} = "task-core-x11-mini task-core-x11-base"
10 12
11RDEPENDS_${PN} = "\ 13RDEPENDS_${PN} = "\
12 packagegroup-core-x11-xserver \ 14 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 ed13354..315df33 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -4,7 +4,7 @@
4 4
5DESCRIPTION = "Qt package groups" 5DESCRIPTION = "Qt package groups"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r3" 7PR = "r4"
8 8
9inherit packagegroup 9inherit packagegroup
10 10
@@ -12,6 +12,8 @@ PACKAGES = "${PN}-demoapps"
12 12
13# For backwards compatibility after rename 13# For backwards compatibility after rename
14RPROVIDES_${PN}-demoapps = "task-core-qt-demos" 14RPROVIDES_${PN}-demoapps = "task-core-qt-demos"
15RREPLACES_${PN}-demoapps = "task-core-qt-demos"
16RCONFLICTS_${PN}-demoapps = "task-core-qt-demos"
15 17
16QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" 18QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
17 19
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index 042efb8..9263828 100644
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -1,11 +1,13 @@
1SUMMARY = "Qt for Embedded Linux (Qt without X11)" 1SUMMARY = "Qt for Embedded Linux (Qt without X11)"
2PR = "r1" 2PR = "r2"
3LICENSE = "MIT" 3LICENSE = "MIT"
4 4
5inherit packagegroup 5inherit packagegroup
6 6
7# For backwards compatibility after rename 7# For backwards compatibility after rename
8RPROVIDES_${PN} = "task-qt4e-base" 8RPROVIDES_${PN} = "task-qt4e-base"
9RREPLACES_${PN} = "task-qt4e-base"
10RCONFLICTS_${PN} = "task-qt4e-base"
9 11
10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 12TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
11 13
diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index 53e15d3..f2997a7 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 @@
4 4
5SUMMARY = "Sato desktop" 5SUMMARY = "Sato desktop"
6LICENSE = "MIT" 6LICENSE = "MIT"
7PR = "r32" 7PR = "r33"
8 8
9inherit packagegroup 9inherit packagegroup
10 10
@@ -14,6 +14,8 @@ PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
14 14
15# For backwards compatibility after rename 15# For backwards compatibility after rename
16RPROVIDES_${PN} = "task-core-x11-sato" 16RPROVIDES_${PN} = "task-core-x11-sato"
17RREPLACES_${PN} = "task-core-x11-sato"
18RCONFLICTS_${PN} = "task-core-x11-sato"
17 19
18RDEPENDS_${PN} = "\ 20RDEPENDS_${PN} = "\
19 ${PN}-base \ 21 ${PN}-base \