aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2014-07-14 09:03:09 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2014-08-15 17:07:02 +0200
commitdf540b52c77168d864b0ea9dd10bdf5bc1c9bc47 (patch)
tree98571f8321fe213f99e362d19d5580b038012a0b
parentc758d15fde6261cf53a723e2689b0ff3c305fee2 (diff)
downloadmeta-openembedded-contrib-df540b52c77168d864b0ea9dd10bdf5bc1c9bc47.tar.gz
packagegroups: Remove deprecated "task" backward compatibility
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r--meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb3
-rw-r--r--meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb3
-rw-r--r--meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb3
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-basic.bb3
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-boot.bb4
-rw-r--r--meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb7
-rw-r--r--meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb6
-rw-r--r--meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb12
-rw-r--r--meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb4
-rw-r--r--meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb4
10 files changed, 3 insertions, 46 deletions
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
index 4e5ce789f2..5ead412ef7 100644
--- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb
@@ -11,9 +11,6 @@ require packagegroup-efl-sdk.inc
PACKAGES = "${PN}"
-RPROVIDES_${PN} += "task-efl-sdk"
-RREPLACES_${PN} += "task-efl-sdk"
-RCONFLICTS_${PN} += "task-efl-sdk"
RDEPENDS_${PN} = "\
packagegroup-core-sdk \
${SDK-EFL} \
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
index 1bcac45f89..6a3f33dc68 100644
--- a/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-efl-standalone-sdk-target.bb
@@ -11,9 +11,6 @@ require packagegroup-efl-sdk.inc
PACKAGES = "${PN} ${PN}-dbg"
-RPROVIDES_${PN} += "task-efl-standalone-sdk-target"
-RREPLACES_${PN} += "task-efl-standalone-sdk-target"
-RCONFLICTS_${PN} += "task-efl-standalone-sdk-target"
RDEPENDS_${PN} = "\
packagegroup-core-standalone-sdk-target \
${SDK-EFL} \
diff --git a/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
index 47f758a820..63ef0f6759 100644
--- a/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
+++ b/meta-efl/recipes-efl/packagegroups/packagegroup-x11-illume.bb
@@ -11,9 +11,6 @@ inherit packagegroup allarch
ETHEME ?= "e-wm-theme-default"
ECONFIG ?= "e-wm-config-mobile"
-RPROVIDES_${PN} += "task-x11-illume"
-RREPLACES_${PN} += "task-x11-illume"
-RCONFLICTS_${PN} += "task-x11-illume"
RDEPENDS_${PN} = "\
packagegroup-core-x11-xserver \
packagegroup-core-x11-utils \
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
index 08db94344e..ad1cd83ae3 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-basic.bb
@@ -23,9 +23,6 @@ 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 3b634f3a74..61a519d8ce 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-boot.bb
@@ -19,10 +19,6 @@ 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 fbba23ca22..2a4b067ba2 100644
--- a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
+++ b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
@@ -10,13 +10,6 @@ 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 \
diff --git a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
index 9b8cc9a257..aafe63acfb 100644
--- a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
+++ b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
@@ -6,9 +6,9 @@ PR = "r1"
inherit packagegroup allarch
-RPROVIDES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
-RREPLACES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
-RCONFLICTS_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk"
+RPROVIDES_${PN} += "packagegroup-native-sdk"
+RREPLACES_${PN} += "packagegroup-native-sdk"
+RCONFLICTS_${PN} += "packagegroup-native-sdk"
RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
binutils-symlinks \
perl-modules \
diff --git a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
index 931564f713..632e7d4334 100644
--- a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
+++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb
@@ -12,18 +12,6 @@ PACKAGES += "\
${PN}-chinese \
${PN}-japanese \
"
-RPROVIDES_${PN} += "task-fonts-truetype"
-RPROVIDES_${PN}-core += "task-fonts-truetype-core"
-RPROVIDES_${PN}-chinese += "task-fonts-truetype-chinese"
-RPROVIDES_${PN}-japanese += "task-fonts-truetype-japanese"
-RREPLACES_${PN} += "task-fonts-truetype"
-RREPLACES_${PN}-core += "task-fonts-truetype-core"
-RREPLACES_${PN}-chinese += "task-fonts-truetype-chinese"
-RREPLACES_${PN}-japanese += "task-fonts-truetype-japanese"
-RCONFLICTS_${PN} += "task-fonts-truetype"
-RCONFLICTS_${PN}-core += "task-fonts-truetype-core"
-RCONFLICTS_${PN}-chinese += "task-fonts-truetype-chinese"
-RCONFLICTS_${PN}-japanese += "task-fonts-truetype-japanese"
RRECOMMENDS_${PN} = "\
${PN}-core \
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
index 7fcb3880e1..28cfc7f0f0 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-base.bb
@@ -6,10 +6,6 @@ PR = "r5"
inherit packagegroup
-RPROVIDES_${PN} += "task-xfce-base"
-RREPLACES_${PN} += "task-xfce-base"
-RCONFLICTS_${PN} += "task-xfce-base"
-
RDEPENDS_${PN} = " \
xfwm4 \
xfce4-session \
diff --git a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
index e91362ecad..0eab1ccc3c 100644
--- a/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
+++ b/meta-xfce/recipes-xfce/packagegroups/packagegroup-xfce-extended.bb
@@ -9,10 +9,6 @@ PNBLACKLIST[packagegroup-xfce-extended] = "BROKEN: rdepends on broken xfce4-powe
inherit packagegroup
-RPROVIDES_${PN} += "task-xfce-extended"
-RREPLACES_${PN} += "task-xfce-extended"
-RCONFLICTS_${PN} += "task-xfce-extended"
-
# mandatory
RDEPENDS_${PN} = " \
packagegroup-xfce-base \