diff options
Diffstat (limited to 'meta-oe')
5 files changed, 3 insertions, 29 deletions
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 ?= "" | |||
| 23 | # | 23 | # |
| 24 | TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" | 24 | TASK_BASIC_SSHDAEMON ?= "dropbear openssh-sftp openssh-sftp-server" |
| 25 | 25 | ||
| 26 | RPROVIDES_${PN} += "task-basic" | ||
| 27 | RREPLACES_${PN} += "task-basic" | ||
| 28 | RCONFLICTS_${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 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 ?= "" | |||
| 19 | # Make sure we build the kernel | 19 | # Make sure we build the kernel |
| 20 | DEPENDS = "virtual/kernel" | 20 | DEPENDS = "virtual/kernel" |
| 21 | 21 | ||
| 22 | RPROVIDES_${PN} += "task-boot" | ||
| 23 | RREPLACES_${PN} += "task-boot" | ||
| 24 | RCONFLICTS_${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 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 | |||
| 10 | 10 | ||
| 11 | PACKAGES += "${PN}-debug" | 11 | PACKAGES += "${PN}-debug" |
| 12 | 12 | ||
| 13 | RPROVIDES_${PN} += "task-cli-tools" | ||
| 14 | RPROVIDES_${PN}-debug += "task-cli-tools-debug" | ||
| 15 | RREPLACES_${PN} += "task-cli-tools" | ||
| 16 | RREPLACES_${PN}-debug += "task-cli-tools-debug" | ||
| 17 | RCONFLICTS_${PN} += "task-cli-tools" | ||
| 18 | RCONFLICTS_${PN}-debug += "task-cli-tools-debug" | ||
| 19 | |||
| 20 | RDEPENDS_${PN} = "\ | 13 | RDEPENDS_${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 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" | |||
| 6 | 6 | ||
| 7 | inherit packagegroup allarch | 7 | inherit packagegroup allarch |
| 8 | 8 | ||
| 9 | RPROVIDES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk" | 9 | RPROVIDES_${PN} += "packagegroup-native-sdk" |
| 10 | RREPLACES_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk" | 10 | RREPLACES_${PN} += "packagegroup-native-sdk" |
| 11 | RCONFLICTS_${PN} += "packagegroup-native-sdk task-sdk-target task-native-sdk" | 11 | RCONFLICTS_${PN} += "packagegroup-native-sdk" |
| 12 | RDEPENDS_${PN} = "gcc-symlinks g++-symlinks cpp cpp-symlinks \ | 12 | RDEPENDS_${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 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 += "\ | |||
| 12 | ${PN}-chinese \ | 12 | ${PN}-chinese \ |
| 13 | ${PN}-japanese \ | 13 | ${PN}-japanese \ |
| 14 | " | 14 | " |
| 15 | RPROVIDES_${PN} += "task-fonts-truetype" | ||
| 16 | RPROVIDES_${PN}-core += "task-fonts-truetype-core" | ||
| 17 | RPROVIDES_${PN}-chinese += "task-fonts-truetype-chinese" | ||
| 18 | RPROVIDES_${PN}-japanese += "task-fonts-truetype-japanese" | ||
| 19 | RREPLACES_${PN} += "task-fonts-truetype" | ||
| 20 | RREPLACES_${PN}-core += "task-fonts-truetype-core" | ||
| 21 | RREPLACES_${PN}-chinese += "task-fonts-truetype-chinese" | ||
| 22 | RREPLACES_${PN}-japanese += "task-fonts-truetype-japanese" | ||
| 23 | RCONFLICTS_${PN} += "task-fonts-truetype" | ||
| 24 | RCONFLICTS_${PN}-core += "task-fonts-truetype-core" | ||
| 25 | RCONFLICTS_${PN}-chinese += "task-fonts-truetype-chinese" | ||
| 26 | RCONFLICTS_${PN}-japanese += "task-fonts-truetype-japanese" | ||
| 27 | 15 | ||
| 28 | RRECOMMENDS_${PN} = "\ | 16 | RRECOMMENDS_${PN} = "\ |
| 29 | ${PN}-core \ | 17 | ${PN}-core \ |
