packagegroup-*: add RPROVIDES for backwards compatibility

Allow references to the old task packages to continue to work. This does
not add RPROVIDES for everything, just those packages that are likely to
have been referred to.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>

diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
index f151591f18c17f874db5b20fb7f2eb24387575a1..217830801dec0266105f9f2276215e117777af32 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-base.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -114,6 +114,15 @@ python __anonymous () {
 
     if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
         d.setVar("ADD_3G", "packagegroup-base-3g")
+
+    # For backwards compatibility after rename
+    packages = d.getVar("PACKAGES", True).split()
+    packages.remove("packagegroup-distro-base")
+    packages.remove("packagegroup-machine-base")
+    for pkg in packages:
+        d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-base", "task-base"))
+    d.appendVar("RPROVIDES_packagegroup-distro-base", "task-distro-base")
+    d.appendVar("RPROVIDES_packagegroup-machine-base", "task-machine-base")
 }
 
 #

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 4b1208e5d1bba0df1e351a49c022d91010c7f762..d29dc2befe0541645ea8929ee734c4d4bea3bddd 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -18,6 +18,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
 MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-boot"
+
 # Distro can override the following VIRTUAL-RUNTIME providers:
 VIRTUAL-RUNTIME_dev_manager ?= "udev"
 VIRTUAL-RUNTIME_login_manager ?= "tinylogin"

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 0941406940c3385cbc50cd633b8d793fa3c5d965..03f9c12a24acb4c3df76ac51cf979e0e67a61e34 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -10,6 +10,9 @@ inherit packagegroup
 
 PACKAGES = "${PN}-server"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN}-server = "task-core-nfs-server"
+
 SUMMARY_${PN}-server = "NFS server"
 RDEPENDS_${PN}-server = "\
     nfs-utils \

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index c79f09259ba92ad03bfb7fb5bbf688d199df2c0d..f05e099a5809a7542ed6fdb1161ece76405a3e41 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -10,6 +10,9 @@ inherit packagegroup
 
 #PACKAGEFUNCS =+ 'generate_sdk_pkgs'
 
+# For backwards compatibility after rename
+RPROVIDES_packagegroup-core-sdk = "task-core-sdk"
+
 RDEPENDS_packagegroup-core-sdk = "\
     autoconf \
     automake \

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
index 7d71c0cabd1fd3f6daee2ba03556106eb82e656e..7fa06e959e73a2846f1d4d948b9e046cf7b53fce 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
@@ -4,4 +4,7 @@ PR = "r0"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${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 f97b010b1ac19cefced4df9d1b31f5a213c4794d..3221e8b57d3bcb947382eb42ebb3688937491cc6 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
@@ -4,4 +4,7 @@ PR = "r0"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${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 656c45232f7aba9db9ec24537ce917ac7899eb9b..6af299521d8a9ac8750fc73a1839ba3d963d9838 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
@@ -4,6 +4,10 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-standalone-sdk-target"
+RPROVIDES_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
+
 RDEPENDS_${PN} = "\
     libgcc \
     libgcc-dev \

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index a6da660d36e93bb4d4bf13b87976f6e9a49ae99f..6687b32841bcfe454c4d58beabec2287384befa4 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
@@ -11,6 +11,9 @@ PR = "r1"
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+# For backwards compatibility after rename
+RPROVIDES_${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 6a69363cdfef970f74699501a74e790cd063aa84..931984eb179b2783bbac8b95f940ae6288ec9780 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
@@ -9,6 +9,9 @@ inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-tools-profile"
+
 RRECOMMENDS_${PN} = "\
     perf \
     trace-cmd \

diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index 1aca97d4882d196d4c6cf29bb8ac6af8a3a33c93..9720e5ac62e6cf11c60b60e0c29996662ff1229a 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
@@ -9,6 +9,9 @@ inherit packagegroup
 
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-tools-testapps"
+
 # kexec-tools doesn't work on Mips
 KEXECTOOLS ?= "kexec"
 KEXECTOOLS_mips ?= ""

diff --git a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index f8e527b591e74a26b8b86a87bf40d50b00ce11b5..cb2fb1ad666e4beef5f79bf664f0f23243843cda 100644 (file)
--- a/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
@@ -7,6 +7,9 @@ inherit cross-canadian packagegroup
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
+
 RDEPENDS_${PN} = "\
     binutils-cross-canadian-${TRANSLATED_TARGET_ARCH} \
     gdb-cross-canadian-${TRANSLATED_TARGET_ARCH} \

diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
index 4e4bcf59c3a93457d6f423ad12f84f8bbb99e54a..30b66c5b4c072a02307f0b06ae44156e5e84930a 100644 (file)
--- a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -19,6 +19,13 @@ PACKAGES = "\
     packagegroup-core-sys-services \
     "
 
+python __anonymous () {
+    # For backwards compatibility after rename
+    packages = d.getVar("PACKAGES", True).split()
+    for pkg in packages:
+        d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-core", "task-core"))
+}
+
 
 RDEPENDS_packagegroup-core-basic = "\
     packagegroup-core-basic-libs \

diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index 707ccc1201ca6cffa03ca35e1a04365c751f5b5f..120326f2553c9507315ce88e3865ef7c8fcf3730 100644 (file)
--- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -25,6 +25,7 @@ PACKAGES = "\
     "
 
 
+RPROVIDES_packagegroup-core-lsb = "task-core-lsb"
 RDEPENDS_packagegroup-core-lsb = "\
     packagegroup-core-sys-extended \
     packagegroup-core-db \

diff --git a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index 64b572d6d132ef787c18f47d560877b55c917fe5..e959c5be6c56aad2d82e9d4ed3c45f439364f030 100644 (file)
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
@@ -12,6 +12,9 @@ require packagegroup-sdk-gmae.inc
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-sdk-gmae"
+
 RDEPENDS_${PN} = "\
     packagegroup-core-sdk \
     libglade-dev \

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 95067c4637390656c9025c3e4b3641e61c591134..69c534084eee42335e505e7779e6d2982ae5bd4a 100644 (file)
--- a/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
@@ -12,6 +12,9 @@ require packagegroup-sdk-gmae.inc
 
 PACKAGEGROUP_DISABLE_COMPLEMENTARY = "1"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-standalone-gmae-sdk-target"
+
 RDEPENDS_${PN} = "\
     packagegroup-core-standalone-sdk-target \
     libglade-dev \

diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
index 08dd09029cc67eadb62d446670caff8dc6b6baf7..37e9a877e12529f350d6918aef3f1bb10c252bab 100644 (file)
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -13,6 +13,9 @@ PACKAGES = "\
     ${PN}-core \
     "
 
+# For backwards compatibility after rename
+RPROVIDES_${PN}-core = "task-core-clutter-core"
+
 SUMMARY_${PN}-core = "Clutter graphics library"
 RDEPENDS_${PN}-core = "\
     clutter-1.8 \

diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 6d92a38bc5108381e3e1802e111aca7119f4d311..d6c29853ebf9bdd511e7ec7c0839e193ff4877d3 100644 (file)
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -4,6 +4,9 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-gtk-directfb-base"
+
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
 RDEPENDS_${PN} = " \

diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
index 75574c11e10072cdfb5ba13793ed273e7d4bf43c..ebae741832e2e206e7c4b0c7b655ea7172418634 100644 (file)
--- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb
@@ -5,6 +5,9 @@ PR = "r0"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base"
+
 RDEPENDS_${PN} = "\
     packagegroup-core-x11-xserver \
     packagegroup-core-x11-utils \

diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index 623a48fdc2b2ca16da6141694f75dc7bb864360e..ed13354e46a7fb08d4d09acf1e80e701674bb91b 100644 (file)
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -10,6 +10,9 @@ inherit packagegroup
 
 PACKAGES = "${PN}-demoapps"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN}-demoapps = "task-core-qt-demos"
+
 QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
 
 SUMMARY_${PN}-demoapps = "Qt demo applications"

diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
index 74ae7dd37ea3e07546aea3d752b8817dacb62fa8..042efb86d1dff738ba6027da557165d12ab729ec 100644 (file)
--- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb
@@ -4,6 +4,9 @@ LICENSE = "MIT"
 
 inherit packagegroup
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-qt4e-base"
+
 TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
 
 RDEPENDS_${PN} = " \

diff --git a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index b3b84e27d96632f68d06c60122ee864db251b367..5d781ae2fe5ce57629c28002e6f67c5c81330a5d 100644 (file)
--- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -12,6 +12,9 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
 
 PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
 
+# For backwards compatibility after rename
+RPROVIDES_${PN} = "task-core-x11-sato"
+
 RDEPENDS_${PN} = "\
     ${PN}-base \
     ${PN}-apps \