Remove long-deprecated "task-core" backward compat for packagegroups.
(From OE-Core rev: 7472037569b42386592c060d54196f0c8b9e2d5d) Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
be0fea17ee
commit
5b0762021f
|
@ -124,13 +124,6 @@ python __anonymous () {
|
|||
|
||||
if "nfc" in distro_features and not "nfc" in machine_features and ("usbhost" in machine_features):
|
||||
d.setVar("ADD_NFC", "packagegroup-base-nfc")
|
||||
|
||||
# For backwards compatibility after rename
|
||||
packages = d.getVar("PACKAGES", True).split()
|
||||
for pkg in packages:
|
||||
d.appendVar("RPROVIDES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
|
||||
d.appendVar("RREPLACES_%s" % pkg, pkg.replace("packagegroup-", "task-"))
|
||||
d.appendVar("RCONFLICTS_%s" % pkg, pkg.replace("packagegroup-", "task-"))
|
||||
}
|
||||
|
||||
#
|
||||
|
|
|
@ -17,11 +17,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
|
|||
MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
|
||||
MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-core-boot"
|
||||
RREPLACES_${PN} = "task-core-boot"
|
||||
RCONFLICTS_${PN} = "task-core-boot"
|
||||
|
||||
# Distro can override the following VIRTUAL-RUNTIME providers:
|
||||
VIRTUAL-RUNTIME_dev_manager ?= "udev"
|
||||
VIRTUAL-RUNTIME_login_manager ?= "busybox"
|
||||
|
|
|
@ -10,11 +10,6 @@ inherit packagegroup
|
|||
|
||||
PACKAGES = "${PN}-server"
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN}-server = "task-core-nfs-server"
|
||||
RREPLACES_${PN}-server = "task-core-nfs-server"
|
||||
RCONFLICTS_${PN}-server = "task-core-nfs-server"
|
||||
|
||||
SUMMARY_${PN}-server = "NFS server"
|
||||
RDEPENDS_${PN}-server = "\
|
||||
nfs-utils \
|
||||
|
|
|
@ -10,11 +10,6 @@ inherit packagegroup
|
|||
|
||||
#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_packagegroup-core-sdk = "task-core-sdk"
|
||||
RREPLACES_packagegroup-core-sdk = "task-core-sdk"
|
||||
RCONFLICTS_packagegroup-core-sdk = "task-core-sdk"
|
||||
|
||||
RDEPENDS_packagegroup-core-sdk = "\
|
||||
packagegroup-core-buildessential \
|
||||
coreutils \
|
||||
|
|
|
@ -4,9 +4,4 @@ PR = "r1"
|
|||
|
||||
inherit packagegroup
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-core-ssh-dropbear"
|
||||
RREPLACES_${PN} = "task-core-ssh-dropbear"
|
||||
RCONFLICTS_${PN} = "task-core-ssh-dropbear"
|
||||
|
||||
RDEPENDS_${PN} = "dropbear"
|
||||
|
|
|
@ -4,9 +4,4 @@ PR = "r1"
|
|||
|
||||
inherit packagegroup
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-core-ssh-openssh"
|
||||
RREPLACES_${PN} = "task-core-ssh-openssh"
|
||||
RCONFLICTS_${PN} = "task-core-ssh-openssh"
|
||||
|
||||
RDEPENDS_${PN} = "openssh"
|
||||
|
|
|
@ -4,14 +4,6 @@ LICENSE = "MIT"
|
|||
|
||||
inherit packagegroup
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-core-standalone-sdk-target"
|
||||
RREPLACES_${PN} = "task-core-standalone-sdk-target"
|
||||
RCONFLICTS_${PN} = "task-core-standalone-sdk-target"
|
||||
RPROVIDES_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
|
||||
RREPLACES_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
|
||||
RCONFLICTS_${PN}-dbg = "task-core-standalone-sdk-target-dbg"
|
||||
|
||||
RDEPENDS_${PN} = "\
|
||||
libgcc \
|
||||
libgcc-dev \
|
||||
|
|
|
@ -11,11 +11,6 @@ PR = "r2"
|
|||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-core-tools-debug"
|
||||
RREPLACES_${PN} = "task-core-tools-debug"
|
||||
RCONFLICTS_${PN} = "task-core-tools-debug"
|
||||
|
||||
MTRACE = ""
|
||||
MTRACE_libc-glibc = "libc-mtrace"
|
||||
|
||||
|
|
|
@ -11,11 +11,6 @@ inherit packagegroup
|
|||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-core-tools-profile"
|
||||
RREPLACES_${PN} = "task-core-tools-profile"
|
||||
RCONFLICTS_${PN} = "task-core-tools-profile"
|
||||
|
||||
PROFILE_TOOLS_X = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'sysprof', '', d)}"
|
||||
PROFILE_TOOLS_SYSTEMD = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd-analyze', '', d)}"
|
||||
|
||||
|
|
|
@ -11,11 +11,6 @@ inherit packagegroup
|
|||
|
||||
PACKAGE_ARCH = "${MACHINE_ARCH}"
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-core-tools-testapps"
|
||||
RREPLACES_${PN} = "task-core-tools-testapps"
|
||||
RCONFLICTS_${PN} = "task-core-tools-testapps"
|
||||
|
||||
# kexec-tools doesn't work on Mips
|
||||
KEXECTOOLS ?= "kexec"
|
||||
KEXECTOOLS_mips ?= ""
|
||||
|
|
|
@ -25,7 +25,6 @@ PACKAGES = "\
|
|||
"
|
||||
|
||||
|
||||
RPROVIDES_packagegroup-core-lsb = "task-core-lsb"
|
||||
RDEPENDS_packagegroup-core-lsb = "\
|
||||
packagegroup-core-sys-extended \
|
||||
packagegroup-core-db \
|
||||
|
|
|
@ -13,11 +13,6 @@ PACKAGES = "\
|
|||
${PN}-core \
|
||||
"
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN}-core = "task-core-clutter-core"
|
||||
RREPLACES_${PN}-core = "task-core-clutter-core"
|
||||
RCONFLICTS_${PN}-core = "task-core-clutter-core"
|
||||
|
||||
SUMMARY_${PN}-core = "Clutter graphics library"
|
||||
RDEPENDS_${PN}-core = "\
|
||||
clutter-1.0 \
|
||||
|
|
|
@ -5,11 +5,6 @@ PR = "r1"
|
|||
|
||||
inherit packagegroup
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-core-x11-mini task-core-x11-base"
|
||||
RREPLACES_${PN} = "task-core-x11-mini task-core-x11-base"
|
||||
RCONFLICTS_${PN} = "task-core-x11-mini task-core-x11-base"
|
||||
|
||||
RDEPENDS_${PN} = "\
|
||||
packagegroup-core-x11-xserver \
|
||||
packagegroup-core-x11-utils \
|
||||
|
|
|
@ -17,8 +17,3 @@ RDEPENDS_${PN} = "\
|
|||
${XSERVER} \
|
||||
${XSERVERCODECS} \
|
||||
"
|
||||
|
||||
# Allow replacing task-x11-server in meta-oe
|
||||
RPROVIDES_${PN} = "task-x11-server task-xserver"
|
||||
RREPLACES_${PN} = "task-x11-server task-xserver"
|
||||
RCONFLICTS_${PN} = "task-x11-server task-xserver"
|
||||
|
|
|
@ -30,11 +30,3 @@ RDEPENDS_${PN}-utils = "\
|
|||
xset \
|
||||
xrandr \
|
||||
"
|
||||
|
||||
# Allow replacing task-x11* in meta-oe
|
||||
RPROVIDES_${PN} = "task-x11"
|
||||
RREPLACES_${PN} = "task-x11"
|
||||
RCONFLICTS_${PN} = "task-x11"
|
||||
RPROVIDES_${PN}-utils = "task-x11-utils"
|
||||
RREPLACES_${PN}-utils = "task-x11-utils"
|
||||
RCONFLICTS_${PN}-utils = "task-x11-utils"
|
||||
|
|
|
@ -13,11 +13,6 @@ inherit packagegroup
|
|||
|
||||
PACKAGES = "${PN}-demoapps"
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN}-demoapps = "task-core-qt-demos"
|
||||
RREPLACES_${PN}-demoapps = "task-core-qt-demos"
|
||||
RCONFLICTS_${PN}-demoapps = "task-core-qt-demos"
|
||||
|
||||
QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
|
||||
|
||||
SUMMARY_${PN}-demoapps = "Qt demo applications"
|
||||
|
|
|
@ -7,11 +7,6 @@ COMPATIBLE_HOST_mips64 = "mips64.*-linux-gnun32"
|
|||
|
||||
inherit packagegroup
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-qt4e-base"
|
||||
RREPLACES_${PN} = "task-qt4e-base"
|
||||
RCONFLICTS_${PN} = "task-qt4e-base"
|
||||
|
||||
TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
|
||||
|
||||
RDEPENDS_${PN} = " \
|
||||
|
|
|
@ -12,11 +12,6 @@ PACKAGE_ARCH = "${MACHINE_ARCH}"
|
|||
|
||||
PACKAGES = "${PN} ${PN}-base ${PN}-apps ${PN}-games"
|
||||
|
||||
# For backwards compatibility after rename
|
||||
RPROVIDES_${PN} = "task-core-x11-sato"
|
||||
RREPLACES_${PN} = "task-core-x11-sato"
|
||||
RCONFLICTS_${PN} = "task-core-x11-sato"
|
||||
|
||||
RDEPENDS_${PN} = "\
|
||||
${PN}-base \
|
||||
${PN}-apps \
|
||||
|
|
Loading…
Reference in New Issue