From df540b52c77168d864b0ea9dd10bdf5bc1c9bc47 Mon Sep 17 00:00:00 2001 From: "Robert P. J. Day" Date: Mon, 14 Jul 2014 09:03:09 -0400 Subject: packagegroups: Remove deprecated "task" backward compatibility Signed-off-by: Robert P. J. Day Signed-off-by: Martin Jansa --- meta-efl/recipes-efl/packagegroups/packagegroup-efl-sdk.bb | 3 --- .../packagegroups/packagegroup-efl-standalone-sdk-target.bb | 3 --- .../recipes-efl/packagegroups/packagegroup-x11-illume.bb | 3 --- meta-oe/recipes-core/packagegroups/packagegroup-basic.bb | 3 --- meta-oe/recipes-core/packagegroups/packagegroup-boot.bb | 4 ---- meta-oe/recipes-core/packagegroups/packagegroup-cli-tools.bb | 7 ------- .../packagegroups/packagegroup-sdk-target.bb | 6 +++--- .../packagegroups/packagegroup-fonts-truetype.bb | 12 ------------ .../recipes-xfce/packagegroups/packagegroup-xfce-base.bb | 4 ---- .../recipes-xfce/packagegroups/packagegroup-xfce-extended.bb | 4 ---- 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 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 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 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 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 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 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 ?= "" # 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 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 ?= "" # 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 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 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 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" 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 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 += "\ ${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 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" 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 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 inherit packagegroup -RPROVIDES_${PN} += "task-xfce-extended" -RREPLACES_${PN} += "task-xfce-extended" -RCONFLICTS_${PN} += "task-xfce-extended" - # mandatory RDEPENDS_${PN} = " \ packagegroup-xfce-base \ -- cgit v1.2.3-54-g00ecf