diff options
18 files changed, 0 insertions, 94 deletions
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index 16f3a510d8..13a4fe4f0c 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
| @@ -124,13 +124,6 @@ python __anonymous () { | |||
| 124 | 124 | ||
| 125 | if "nfc" in distro_features and not "nfc" in machine_features and ("usbhost" in machine_features): | 125 | if "nfc" in distro_features and not "nfc" in machine_features and ("usbhost" in machine_features): |
| 126 | d.setVar("ADD_NFC", "packagegroup-base-nfc") | 126 | d.setVar("ADD_NFC", "packagegroup-base-nfc") |
| 127 | |||
| 128 | # For backwards compatibility after rename | ||
| 129 | packages = d.getVar("PACKAGES", True).split() | ||
| 130 | for pkg in packages: | ||
| 131 | d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-", "task-")) | ||
| 132 | d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-", "task-")) | ||
| 133 | d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-", "task-")) | ||
| 134 | } | 127 | } |
| 135 | 128 | ||
| 136 | # | 129 | # |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb index c8bc362242..bdc4a1d413 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-boot.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb | |||
| @@ -17,11 +17,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
| 17 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" | 17 | MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" |
| 18 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" | 18 | MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" |
| 19 | 19 | ||
| 20 | # For backwards compatibility after rename | ||
| 21 | RPROVIDES_${PN} = "task-core-boot" | ||
| 22 | RREPLACES_${PN} = "task-core-boot" | ||
| 23 | RCONFLICTS_${PN} = "task-core-boot" | ||
| 24 | |||
| 25 | # Distro can override the following VIRTUAL-RUNTIME providers: | 20 | # Distro can override the following VIRTUAL-RUNTIME providers: |
| 26 | VIRTUAL-RUNTIME_dev_manager ?= "udev" | 21 | VIRTUAL-RUNTIME_dev_manager ?= "udev" |
| 27 | VIRTUAL-RUNTIME_login_manager ?= "busybox" | 22 | VIRTUAL-RUNTIME_login_manager ?= "busybox" |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb index 24c98c4938..247a30e063 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb | |||
| @@ -10,11 +10,6 @@ inherit packagegroup | |||
| 10 | 10 | ||
| 11 | PACKAGES = "${PN}-server" | 11 | PACKAGES = "${PN}-server" |
| 12 | 12 | ||
| 13 | # For backwards compatibility after rename | ||
| 14 | RPROVIDES_${PN}-server = "task-core-nfs-server" | ||
| 15 | RREPLACES_${PN}-server = "task-core-nfs-server" | ||
| 16 | RCONFLICTS_${PN}-server = "task-core-nfs-server" | ||
| 17 | |||
| 18 | SUMMARY_${PN}-server = "NFS server" | 13 | SUMMARY_${PN}-server = "NFS server" |
| 19 | RDEPENDS_${PN}-server = "\ | 14 | RDEPENDS_${PN}-server = "\ |
| 20 | nfs-utils \ | 15 | nfs-utils \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb index 172398929c..a544bbdbdb 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb | |||
| @@ -10,11 +10,6 @@ inherit packagegroup | |||
| 10 | 10 | ||
| 11 | #PACKAGEFUNCS =+ 'generate_sdk_pkgs' | 11 | #PACKAGEFUNCS =+ 'generate_sdk_pkgs' |
| 12 | 12 | ||
| 13 | # For backwards compatibility after rename | ||
| 14 | RPROVIDES_packagegroup-core-sdk = "task-core-sdk" | ||
| 15 | RREPLACES_packagegroup-core-sdk = "task-core-sdk" | ||
| 16 | RCONFLICTS_packagegroup-core-sdk = "task-core-sdk" | ||
| 17 | |||
| 18 | RDEPENDS_packagegroup-core-sdk = "\ | 13 | RDEPENDS_packagegroup-core-sdk = "\ |
| 19 | packagegroup-core-buildessential \ | 14 | packagegroup-core-buildessential \ |
| 20 | coreutils \ | 15 | coreutils \ |
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb index 458d8fa036..e99946f0a7 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb | |||
| @@ -4,9 +4,4 @@ PR = "r1" | |||
| 4 | 4 | ||
| 5 | inherit packagegroup | 5 | inherit packagegroup |
| 6 | 6 | ||
| 7 | # For backwards compatibility after rename | ||
| 8 | RPROVIDES_${PN} = "task-core-ssh-dropbear" | ||
| 9 | RREPLACES_${PN} = "task-core-ssh-dropbear" | ||
| 10 | RCONFLICTS_${PN} = "task-core-ssh-dropbear" | ||
| 11 | |||
| 12 | RDEPENDS_${PN} = "dropbear" | 7 | 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 df70962912..32d20e6214 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb | |||
| @@ -4,9 +4,4 @@ PR = "r1" | |||
| 4 | 4 | ||
| 5 | inherit packagegroup | 5 | inherit packagegroup |
| 6 | 6 | ||
| 7 | # For backwards compatibility after rename | ||
| 8 | RPROVIDES_${PN} = "task-core-ssh-openssh" | ||
| 9 | RREPLACES_${PN} = "task-core-ssh-openssh" | ||
| 10 | RCONFLICTS_${PN} = "task-core-ssh-openssh" | ||
| 11 | |||
| 12 | RDEPENDS_${PN} = "openssh" | 7 | 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 3325ef672e..5d1ce97c2c 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb | |||
| @@ -4,14 +4,6 @@ LICENSE = "MIT" | |||
| 4 | 4 | ||
| 5 | inherit packagegroup | 5 | inherit packagegroup |
| 6 | 6 | ||
| 7 | # For backwards compatibility after rename | ||
| 8 | RPROVIDES_${PN} = "task-core-standalone-sdk-target" | ||
| 9 | RREPLACES_${PN} = "task-core-standalone-sdk-target" | ||
| 10 | RCONFLICTS_${PN} = "task-core-standalone-sdk-target" | ||
| 11 | RPROVIDES_${PN}-dbg = "task-core-standalone-sdk-target-dbg" | ||
| 12 | RREPLACES_${PN}-dbg = "task-core-standalone-sdk-target-dbg" | ||
| 13 | RCONFLICTS_${PN}-dbg = "task-core-standalone-sdk-target-dbg" | ||
| 14 | |||
| 15 | RDEPENDS_${PN} = "\ | 7 | RDEPENDS_${PN} = "\ |
| 16 | libgcc \ | 8 | libgcc \ |
| 17 | libgcc-dev \ | 9 | 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 f72aae4c9d..79bedfb02f 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb | |||
| @@ -11,11 +11,6 @@ PR = "r2" | |||
| 11 | 11 | ||
| 12 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 12 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 13 | 13 | ||
| 14 | # For backwards compatibility after rename | ||
| 15 | RPROVIDES_${PN} = "task-core-tools-debug" | ||
| 16 | RREPLACES_${PN} = "task-core-tools-debug" | ||
| 17 | RCONFLICTS_${PN} = "task-core-tools-debug" | ||
| 18 | |||
| 19 | MTRACE = "" | 14 | MTRACE = "" |
| 20 | MTRACE_libc-glibc = "libc-mtrace" | 15 | MTRACE_libc-glibc = "libc-mtrace" |
| 21 | 16 | ||
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb index 7832c89d23..8c9dd8b6f9 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb | |||
| @@ -11,11 +11,6 @@ inherit packagegroup | |||
| 11 | 11 | ||
| 12 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 12 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 13 | 13 | ||
| 14 | # For backwards compatibility after rename | ||
| 15 | RPROVIDES_${PN} = "task-core-tools-profile" | ||
| 16 | RREPLACES_${PN} = "task-core-tools-profile" | ||
| 17 | RCONFLICTS_${PN} = "task-core-tools-profile" | ||
| 18 | |||
| 19 | PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" | 14 | PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}" |
| 20 | PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" | 15 | PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}" |
| 21 | 16 | ||
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb index c7667540c9..15ed7f92a5 100644 --- a/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb +++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb | |||
| @@ -11,11 +11,6 @@ inherit packagegroup | |||
| 11 | 11 | ||
| 12 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 12 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
| 13 | 13 | ||
| 14 | # For backwards compatibility after rename | ||
| 15 | RPROVIDES_${PN} = "task-core-tools-testapps" | ||
| 16 | RREPLACES_${PN} = "task-core-tools-testapps" | ||
| 17 | RCONFLICTS_${PN} = "task-core-tools-testapps" | ||
| 18 | |||
| 19 | # kexec-tools doesn't work on Mips | 14 | # kexec-tools doesn't work on Mips |
| 20 | KEXECTOOLS ?= "kexec" | 15 | KEXECTOOLS ?= "kexec" |
| 21 | KEXECTOOLS_mips ?= "" | 16 | KEXECTOOLS_mips ?= "" |
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb index 0c9d4dc952..30b6e1545f 100644 --- a/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb +++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb | |||
| @@ -25,7 +25,6 @@ PACKAGES = "\ | |||
| 25 | " | 25 | " |
| 26 | 26 | ||
| 27 | 27 | ||
| 28 | RPROVIDES_packagegroup-core-lsb = "task-core-lsb" | ||
| 29 | RDEPENDS_packagegroup-core-lsb = "\ | 28 | RDEPENDS_packagegroup-core-lsb = "\ |
| 30 | packagegroup-core-sys-extended \ | 29 | packagegroup-core-sys-extended \ |
| 31 | packagegroup-core-db \ | 30 | packagegroup-core-db \ |
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index cb2aba0a5f..7540821c4e 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb | |||
| @@ -13,11 +13,6 @@ PACKAGES = "\ | |||
| 13 | ${PN}-core \ | 13 | ${PN}-core \ |
| 14 | " | 14 | " |
| 15 | 15 | ||
| 16 | # For backwards compatibility after rename | ||
| 17 | RPROVIDES_${PN}-core = "task-core-clutter-core" | ||
| 18 | RREPLACES_${PN}-core = "task-core-clutter-core" | ||
| 19 | RCONFLICTS_${PN}-core = "task-core-clutter-core" | ||
| 20 | |||
| 21 | SUMMARY_${PN}-core = "Clutter graphics library" | 16 | SUMMARY_${PN}-core = "Clutter graphics library" |
| 22 | RDEPENDS_${PN}-core = "\ | 17 | RDEPENDS_${PN}-core = "\ |
| 23 | clutter-1.0 \ | 18 | clutter-1.0 \ |
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb index a5d02ede8e..2eff3713bc 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb | |||
| @@ -5,11 +5,6 @@ PR = "r1" | |||
| 5 | 5 | ||
| 6 | inherit packagegroup | 6 | inherit packagegroup |
| 7 | 7 | ||
| 8 | # For backwards compatibility after rename | ||
| 9 | RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base" | ||
| 10 | RREPLACES_${PN} = "task-core-x11-mini task-core-x11-base" | ||
| 11 | RCONFLICTS_${PN} = "task-core-x11-mini task-core-x11-base" | ||
| 12 | |||
| 13 | RDEPENDS_${PN} = "\ | 8 | RDEPENDS_${PN} = "\ |
| 14 | packagegroup-core-x11-xserver \ | 9 | packagegroup-core-x11-xserver \ |
| 15 | packagegroup-core-x11-utils \ | 10 | packagegroup-core-x11-utils \ |
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb index d58f74384f..f595a54e9d 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb | |||
| @@ -17,8 +17,3 @@ RDEPENDS_${PN} = "\ | |||
| 17 | ${XSERVER} \ | 17 | ${XSERVER} \ |
| 18 | ${XSERVERCODECS} \ | 18 | ${XSERVERCODECS} \ |
| 19 | " | 19 | " |
| 20 | |||
| 21 | # Allow replacing task-x11-server in meta-oe | ||
| 22 | RPROVIDES_${PN} = "task-x11-server task-xserver" | ||
| 23 | RREPLACES_${PN} = "task-x11-server task-xserver" | ||
| 24 | RCONFLICTS_${PN} = "task-x11-server task-xserver" | ||
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index 1a51428eaf..fde5144b46 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb | |||
| @@ -30,11 +30,3 @@ RDEPENDS_${PN}-utils = "\ | |||
| 30 | xset \ | 30 | xset \ |
| 31 | xrandr \ | 31 | xrandr \ |
| 32 | " | 32 | " |
| 33 | |||
| 34 | # Allow replacing task-x11* in meta-oe | ||
| 35 | RPROVIDES_${PN} = "task-x11" | ||
| 36 | RREPLACES_${PN} = "task-x11" | ||
| 37 | RCONFLICTS_${PN} = "task-x11" | ||
| 38 | RPROVIDES_${PN}-utils = "task-x11-utils" | ||
| 39 | RREPLACES_${PN}-utils = "task-x11-utils" | ||
| 40 | RCONFLICTS_${PN}-utils = "task-x11-utils" | ||
diff --git a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb index 15dec8eef2..d28e032293 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb | |||
| @@ -13,11 +13,6 @@ inherit packagegroup | |||
| 13 | 13 | ||
| 14 | PACKAGES = "${PN}-demoapps" | 14 | PACKAGES = "${PN}-demoapps" |
| 15 | 15 | ||
| 16 | # For backwards compatibility after rename | ||
| 17 | RPROVIDES_${PN}-demoapps = "task-core-qt-demos" | ||
| 18 | RREPLACES_${PN}-demoapps = "task-core-qt-demos" | ||
| 19 | RCONFLICTS_${PN}-demoapps = "task-core-qt-demos" | ||
| 20 | |||
| 21 | QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" | 16 | QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" |
| 22 | 17 | ||
| 23 | SUMMARY_${PN}-demoapps = "Qt demo applications" | 18 | 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 02a649bab4..d7a457cff9 100644 --- a/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb +++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt4e.bb | |||
| @@ -7,11 +7,6 @@ COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32" | |||
| 7 | 7 | ||
| 8 | inherit packagegroup | 8 | inherit packagegroup |
| 9 | 9 | ||
| 10 | # For backwards compatibility after rename | ||
| 11 | RPROVIDES_${PN} = "task-qt4e-base" | ||
| 12 | RREPLACES_${PN} = "task-qt4e-base" | ||
| 13 | RCONFLICTS_${PN} = "task-qt4e-base" | ||
| 14 | |||
| 15 | TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' | 10 | TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' |
| 16 | 11 | ||
| 17 | RDEPENDS_${PN} = " \ | 12 | 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 4ec5e8961c..2d23fe48b2 100644 --- a/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb +++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb | |||
| @@ -12,11 +12,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}" | |||
| 12 | 12 | ||
| 13 | PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" | 13 | PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games" |
| 14 | 14 | ||
| 15 | # For backwards compatibility after rename | ||
| 16 | RPROVIDES_${PN} = "task-core-x11-sato" | ||
| 17 | RREPLACES_${PN} = "task-core-x11-sato" | ||
| 18 | RCONFLICTS_${PN} = "task-core-x11-sato" | ||
| 19 | |||
| 20 | RDEPENDS_${PN} = "\ | 15 | RDEPENDS_${PN} = "\ |
| 21 | ${PN}-base \ | 16 | ${PN}-base \ |
| 22 | ${PN}-apps \ | 17 | ${PN}-apps \ |
