mirror of
https://git.yoctoproject.org/poky
synced 2026-07-16 03:47:03 +00:00
Rename task to packagegroup
"Package group" is a much more appropriate name for these than task, since we use the word task to describe units of work executed by BitBake. (From OE-Core rev: 424dcf7046e4ad09dcc664eb1992201195247fcf) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Paul Eggleton
committed by
Richard Purdie
Richard Purdie
parent
f1df3f828b
commit
272cb74d70
@@ -188,11 +188,11 @@ def get_applying_patches(d):
|
||||
|
||||
def not_tarball(d):
|
||||
"""
|
||||
packages including key words 'work-shared', 'native', 'task-' will be passed
|
||||
packages including key words 'work-shared', 'native', 'packagegroup-' will be passed
|
||||
"""
|
||||
workdir = d.getVar('WORKDIR', True)
|
||||
s = d.getVar('S', True)
|
||||
if 'work-shared' in s or 'task-' in workdir or 'native' in workdir:
|
||||
if 'work-shared' in s or 'packagegroup-' in workdir or 'native' in workdir:
|
||||
return True
|
||||
else:
|
||||
return False
|
||||
|
||||
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
|
||||
|
||||
# IMAGE_FEATURES control content of the core reference images
|
||||
#
|
||||
# By default we install task-core-boot and task-base packages - this gives us
|
||||
# By default we install packagegroup-core-boot and packagegroup-base packages - this gives us
|
||||
# working (console only) rootfs.
|
||||
#
|
||||
# Available IMAGE_FEATURES:
|
||||
@@ -27,21 +27,21 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
|
||||
# - ssh-server-openssh - SSH server (openssh)
|
||||
# - debug-tweaks - makes an image suitable for development
|
||||
#
|
||||
PACKAGE_GROUP_apps-console-core = "task-core-apps-console"
|
||||
PACKAGE_GROUP_x11-mini = "task-core-x11-mini"
|
||||
PACKAGE_GROUP_x11-base = "task-core-x11-base"
|
||||
PACKAGE_GROUP_x11-sato = "task-core-x11-sato"
|
||||
PACKAGE_GROUP_apps-x11-core = "task-core-apps-x11-core"
|
||||
PACKAGE_GROUP_apps-x11-games = "task-core-apps-x11-games"
|
||||
PACKAGE_GROUP_tools-debug = "task-core-tools-debug"
|
||||
PACKAGE_GROUP_tools-profile = "task-core-tools-profile"
|
||||
PACKAGE_GROUP_tools-testapps = "task-core-tools-testapps"
|
||||
PACKAGE_GROUP_tools-sdk = "task-core-sdk task-core-standalone-sdk-target"
|
||||
PACKAGE_GROUP_nfs-server = "task-core-nfs-server"
|
||||
PACKAGE_GROUP_ssh-server-dropbear = "task-core-ssh-dropbear"
|
||||
PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh"
|
||||
PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
|
||||
PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
|
||||
PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
|
||||
PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
|
||||
PACKAGE_GROUP_apps-x11-core = "packagegroup-core-apps-x11-core"
|
||||
PACKAGE_GROUP_apps-x11-games = "packagegroup-core-apps-x11-games"
|
||||
PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"
|
||||
PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile"
|
||||
PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps"
|
||||
PACKAGE_GROUP_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target"
|
||||
PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server"
|
||||
PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
|
||||
PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh"
|
||||
PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
|
||||
PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos"
|
||||
PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demos"
|
||||
|
||||
|
||||
# IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2'
|
||||
@@ -52,8 +52,8 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear"
|
||||
# An error exception would be raised if both image features foo and bar1(or bar2) are included
|
||||
|
||||
CORE_IMAGE_BASE_INSTALL = '\
|
||||
task-core-boot \
|
||||
task-base-extended \
|
||||
packagegroup-core-boot \
|
||||
packagegroup-base-extended \
|
||||
\
|
||||
${CORE_IMAGE_EXTRA_INSTALL} \
|
||||
'
|
||||
|
||||
@@ -591,7 +591,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, d):
|
||||
return True
|
||||
|
||||
sane = True
|
||||
if not "-dbg" in pkg and not "task-" in pkg and not "-image" in pkg:
|
||||
if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg:
|
||||
# Copied from package_ipk.bbclass
|
||||
# boiler plate to update the data
|
||||
localdata = bb.data.createCopy(d)
|
||||
|
||||
@@ -1763,7 +1763,7 @@ python package_depchains() {
|
||||
for dep in pkglibdeps[pkg]:
|
||||
add_dep(pkglibdeplist, dep)
|
||||
# FIXME this should not look at PN once all task recipes inherit from task.bbclass
|
||||
dbgdefaultdeps = ((d.getVar('DEPCHAIN_DBGDEFAULTDEPS', True) == '1') or (d.getVar('PN', True) or '').startswith('task-'))
|
||||
dbgdefaultdeps = ((d.getVar('DEPCHAIN_DBGDEFAULTDEPS', True) == '1') or (d.getVar('PN', True) or '').startswith('packagegroup-'))
|
||||
|
||||
for suffix in pkgs:
|
||||
for pkg in pkgs[suffix]:
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
# Task packages are only used to pull in other packages
|
||||
# via their dependencies. They are empty.
|
||||
ALLOW_EMPTY = "1"
|
||||
|
||||
# By default, only the task package itself is in PACKAGES.
|
||||
# -dbg and -dev flavours are handled by the anonfunc below.
|
||||
# This means that task recipes used to build multiple task
|
||||
# packages have to modify PACKAGES after inheriting task.bbclass.
|
||||
PACKAGES = "${PN}"
|
||||
|
||||
# By default, task packages do not depend on a certain architecture.
|
||||
# Only if dependencies are modified by MACHINE_FEATURES, packages
|
||||
# need to be set to MACHINE_ARCH after inheriting task.bbclass
|
||||
PACKAGE_ARCH = "all"
|
||||
|
||||
# This automatically adds -dbg and -dev flavours of all PACKAGES
|
||||
# to the list. Their dependencies (RRECOMMENDS) are handled as usual
|
||||
# by package_depchains in a following step.
|
||||
python () {
|
||||
packages = d.getVar('PACKAGES', True).split()
|
||||
genpackages = []
|
||||
for pkg in packages:
|
||||
for postfix in ['-dbg', '-dev']:
|
||||
genpackages.append(pkg+postfix)
|
||||
d.setVar('PACKAGES', ' '.join(packages+genpackages))
|
||||
}
|
||||
|
||||
# We don't want to look at shared library dependencies for the
|
||||
# dbg packages
|
||||
DEPCHAIN_DBGDEFAULTDEPS = "1"
|
||||
@@ -7,9 +7,9 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
|
||||
|
||||
SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}"
|
||||
|
||||
TOOLCHAIN_HOST_TASK ?= "nativesdk-task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}"
|
||||
TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
|
||||
TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
|
||||
TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg"
|
||||
TOOLCHAIN_TARGET_TASK ?= "packagegroup-core-standalone-sdk-target packagegroup-core-standalone-sdk-target-dbg"
|
||||
TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
|
||||
TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
|
||||
|
||||
|
||||
@@ -1,30 +1,6 @@
|
||||
# Task packages are only used to pull in other packages
|
||||
# via their dependencies. They are empty.
|
||||
ALLOW_EMPTY = "1"
|
||||
|
||||
# By default, only the task package itself is in PACKAGES.
|
||||
# -dbg and -dev flavours are handled by the anonfunc below.
|
||||
# This means that task recipes used to build multiple task
|
||||
# packages have to modify PACKAGES after inheriting task.bbclass.
|
||||
PACKAGES = "${PN}"
|
||||
|
||||
# By default, task packages do not depend on a certain architecture.
|
||||
# Only if dependencies are modified by MACHINE_FEATURES, packages
|
||||
# need to be set to MACHINE_ARCH after inheriting task.bbclass
|
||||
PACKAGE_ARCH = "all"
|
||||
|
||||
# This automatically adds -dbg and -dev flavours of all PACKAGES
|
||||
# to the list. Their dependencies (RRECOMMENDS) are handled as usual
|
||||
# by package_depchains in a following step.
|
||||
python () {
|
||||
packages = d.getVar('PACKAGES', True).split()
|
||||
genpackages = []
|
||||
for pkg in packages:
|
||||
for postfix in ['-dbg', '-dev']:
|
||||
genpackages.append(pkg+postfix)
|
||||
d.setVar('PACKAGES', ' '.join(packages+genpackages))
|
||||
python __anonymous() {
|
||||
bb.warn("%s: task.bbclass is deprecated, please inherit packagegroup instead" % d.getVar("PN", True))
|
||||
}
|
||||
|
||||
# We don't want to look at shared library dependencies for the
|
||||
# dbg packages
|
||||
DEPCHAIN_DBGDEFAULTDEPS = "1"
|
||||
inherit packagegroup
|
||||
|
||||
|
||||
Reference in New Issue
Block a user