summaryrefslogtreecommitdiffstats
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-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 4e5ce789f..5ead412ef 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
11 11
12PACKAGES = "${PN}" 12PACKAGES = "${PN}"
13 13
14RPROVIDES_${PN} += "task-efl-sdk"
15RREPLACES_${PN} += "task-efl-sdk"
16RCONFLICTS_${PN} += "task-efl-sdk"
17RDEPENDS_${PN} = "\ 14RDEPENDS_${PN} = "\
18 packagegroup-core-sdk \ 15 packagegroup-core-sdk \
19 ${SDK-EFL} \ 16 ${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 1bcac45f8..6a3f33dc6 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
11 11
12PACKAGES = "${PN} ${PN}-dbg" 12PACKAGES = "${PN} ${PN}-dbg"
13 13
14RPROVIDES_${PN} += "task-efl-standalone-sdk-target"
15RREPLACES_${PN} += "task-efl-standalone-sdk-target"
16RCONFLICTS_${PN} += "task-efl-standalone-sdk-target"
17RDEPENDS_${PN} = "\ 14RDEPENDS_${PN} = "\
18 packagegroup-core-standalone-sdk-target \ 15 packagegroup-core-standalone-sdk-target \
19 ${SDK-EFL} \ 16 ${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 47f758a82..63ef0f675 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
11ETHEME ?= "e-wm-theme-default" 11ETHEME ?= "e-wm-theme-default"
12ECONFIG ?= "e-wm-config-mobile" 12ECONFIG ?= "e-wm-config-mobile"
13 13
14RPROVIDES_${PN} += "task-x11-illume"
15RREPLACES_${PN} += "task-x11-illume"
16RCONFLICTS_${PN} += "task-x11-illume"
17RDEPENDS_${PN} = "\ 14RDEPENDS_${PN} = "\
18 packagegroup-core-x11-xserver \ 15 packagegroup-core-x11-xserver \
19 packagegroup-core-x11-utils \ 16 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 08db94344..ad1cd83ae 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 ?= ""
23# 23#
24TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" 24TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server"
25 25
26RPROVIDES_${PN} += "task-basic"
27RREPLACES_${PN} += "task-basic"
28RCONFLICTS_${PN} += "task-basic"
29# 26#
30# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom 27# The section below is designed to match with packagegroup-boot, but doesn't depend on it to allow for more freedom
31# when writing image recipes. 28# 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 3b634f3a7..61a519d8c 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 ?= ""
19# Make sure we build the kernel 19# Make sure we build the kernel
20DEPENDS = "virtual/kernel" 20DEPENDS = "virtual/kernel"
21 21
22RPROVIDES_${PN} += "task-boot"
23RREPLACES_${PN} += "task-boot"
24RCONFLICTS_${PN} += "task-boot"
25
26# 22#
27# minimal set of packages - needed to boot 23# minimal set of packages - needed to boot
28# 24#
diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb b/meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb
index fbba23ca2..2a4b067ba 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
10 10
11PACKAGES += "${PN}-debug" 11PACKAGES += "${PN}-debug"
12 12
13RPROVIDES_${PN} += "task-cli-tools"
14RPROVIDES_${PN}-debug += "task-cli-tools-debug"
15RREPLACES_${PN} += "task-cli-tools"
16RREPLACES_${PN}-debug += "task-cli-tools-debug"
17RCONFLICTS_${PN} += "task-cli-tools"
18RCONFLICTS_${PN}-debug += "task-cli-tools-debug"
19
20RDEPENDS_${PN} = "\ 13RDEPENDS_${PN} = "\
21 dbus-daemon-proxy \ 14 dbus-daemon-proxy \
22 dosfstools \ 15 dosfstools \
diff --git a/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb b/meta-oe/recipes-devtools/packagegroups/packagegroup-sdk-target.bb
index 9b8cc9a25..aafe63acf 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"
6 6
7inherit packagegroup allarch 7inherit packagegroup allarch
8 8
9RPROVIDES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk" 9RPROVIDES_${PN} += "packagegroup-native-sdk"
10RREPLACES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk" 10RREPLACES_${PN} += "packagegroup-native-sdk"
11RCONFLICTS_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk" 11RCONFLICTS_${PN} += "packagegroup-native-sdk"
12RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \ 12RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \
13 binutils-symlinks \ 13 binutils-symlinks \
14 perl-modules \ 14 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 931564f71..632e7d433 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 += "\
12 ${PN}-chinese \ 12 ${PN}-chinese \
13 ${PN}-japanese \ 13 ${PN}-japanese \
14" 14"
15RPROVIDES_${PN} += "task-fonts-truetype"
16RPROVIDES_${PN}-core += "task-fonts-truetype-core"
17RPROVIDES_${PN}-chinese += "task-fonts-truetype-chinese"
18RPROVIDES_${PN}-japanese += "task-fonts-truetype-japanese"
19RREPLACES_${PN} += "task-fonts-truetype"
20RREPLACES_${PN}-core += "task-fonts-truetype-core"
21RREPLACES_${PN}-chinese += "task-fonts-truetype-chinese"
22RREPLACES_${PN}-japanese += "task-fonts-truetype-japanese"
23RCONFLICTS_${PN} += "task-fonts-truetype"
24RCONFLICTS_${PN}-core += "task-fonts-truetype-core"
25RCONFLICTS_${PN}-chinese += "task-fonts-truetype-chinese"
26RCONFLICTS_${PN}-japanese += "task-fonts-truetype-japanese"
27 15
28RRECOMMENDS_${PN} = "\ 16RRECOMMENDS_${PN} = "\
29 ${PN}-core \ 17 ${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 7fcb3880e..28cfc7f0f 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"
6 6
7inherit packagegroup 7inherit packagegroup
8 8
9RPROVIDES_${PN} += "task-xfce-base"
10RREPLACES_${PN} += "task-xfce-base"
11RCONFLICTS_${PN} += "task-xfce-base"
12
13RDEPENDS_${PN} = " \ 9RDEPENDS_${PN} = " \
14 xfwm4 \ 10 xfwm4 \
15 xfce4-session \ 11 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 e91362eca..0eab1ccc3 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
9 9
10inherit packagegroup 10inherit packagegroup
11 11
12RPROVIDES_${PN} += "task-xfce-extended"
13RREPLACES_${PN} += "task-xfce-extended"
14RCONFLICTS_${PN} += "task-xfce-extended"
15
16# mandatory 12# mandatory
17RDEPENDS_${PN} = " \ 13RDEPENDS_${PN} = " \
18 packagegroup-xfce-base \ 14 packagegroup-xfce-base \