summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/classes/archiver.bbclass4
-rw-r--r--meta/classes/core-image.bbclass34
-rw-r--r--meta/classes/insane.bbclass2
-rw-r--r--meta/classes/package.bbclass2
-rw-r--r--meta/classes/packagegroup.bbclass30
-rw-r--r--meta/classes/populate_sdk_base.bbclass4
-rw-r--r--meta/classes/task.bbclass32
-rw-r--r--meta/conf/bitbake.conf4
-rw-r--r--meta/recipes-bsp/qemu-config/qemu-config.bb2
-rw-r--r--meta/recipes-core/images/build-appliance-image.bb2
-rw-r--r--meta/recipes-core/images/core-image-minimal.bb2
-rw-r--r--meta/recipes-core/meta/meta-toolchain-gmae.bb2
-rw-r--r--meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb (renamed from meta/recipes-core/tasks/nativesdk-task-sdk-host.bb)0
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-base.bb359
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-boot.bb (renamed from meta/recipes-core/tasks/task-core-boot.bb)10
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-console.bb (renamed from meta/recipes-core/tasks/task-core-console.bb)8
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-nfs.bb (renamed from meta/recipes-core/tasks/task-core-nfs.bb)10
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-sdk.bb (renamed from meta/recipes-core/tasks/task-core-sdk.bb)18
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb17
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb (renamed from meta/recipes-core/tasks/task-core-ssh-openssh.bb)12
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb (renamed from meta/recipes-core/tasks/task-core-standalone-sdk-target.bb)0
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb (renamed from meta/recipes-core/tasks/task-core-tools-debug.bb)0
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb (renamed from meta/recipes-core/tasks/task-core-tools-profile.bb)0
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb (renamed from meta/recipes-core/tasks/task-core-tools-testapps.bb)0
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb (renamed from meta/recipes-core/tasks/task-cross-canadian.bb)2
-rw-r--r--meta/recipes-core/packagegroups/packagegroup-self-hosted.bb (renamed from meta/recipes-core/tasks/task-self-hosted.bb)34
-rw-r--r--meta/recipes-core/tasks/task-base.bb359
-rw-r--r--meta/recipes-core/tasks/task-core-ssh-dropbear.bb17
-rw-r--r--meta/recipes-extended/images/core-image-basic.bb4
-rw-r--r--meta/recipes-extended/images/core-image-lsb-dev.bb4
-rw-r--r--meta/recipes-extended/images/core-image-lsb-sdk.bb4
-rw-r--r--meta/recipes-extended/images/core-image-lsb.bb4
-rw-r--r--meta/recipes-extended/libzypp/libzypp/config-release.patch4
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-basic.bb156
-rw-r--r--meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb (renamed from meta/recipes-extended/tasks/task-core-lsb.bb)94
-rw-r--r--meta/recipes-extended/tasks/task-core-basic.bb156
-rw-r--r--meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb (renamed from meta/recipes-gnome/tasks/task-core-sdk-gmae.bb)4
-rw-r--r--meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb (renamed from meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb)4
-rw-r--r--meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc (renamed from meta/recipes-gnome/tasks/task-sdk-gmae.inc)0
-rw-r--r--meta/recipes-graphics/images/core-image-clutter.bb6
-rw-r--r--meta/recipes-graphics/images/core-image-gtk-directfb.bb8
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb37
-rw-r--r--meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb (renamed from meta/recipes-graphics/tasks/task-core-gtk-directfb.bb)2
-rw-r--r--meta/recipes-graphics/tasks/task-core-clutter.bb37
-rw-r--r--meta/recipes-qt/images/qt4e-demo-image.bb6
-rw-r--r--meta/recipes-qt/meta/meta-toolchain-qte.bb4
-rw-r--r--meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb (renamed from meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb)2
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-core-qt.bb (renamed from meta/recipes-qt/tasks/task-core-qt.bb)8
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qt4e.bb (renamed from meta/recipes-qt/tasks/task-qt4e.bb)2
-rw-r--r--meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb (renamed from meta/recipes-qt/tasks/task-qte-toolchain-target.bb)2
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb (renamed from meta/recipes-sato/tasks/task-core-x11-mini.bb)8
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb (renamed from meta/recipes-sato/tasks/task-core-x11-sato.bb)8
-rw-r--r--meta/recipes-sato/packagegroups/packagegroup-core-x11.bb (renamed from meta/recipes-sato/tasks/task-core-x11.bb)24
-rwxr-xr-xscripts/contrib/documentation-audit.sh2
54 files changed, 781 insertions, 775 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass
index 3146d02b3c..160a3aad52 100644
--- a/meta/classes/archiver.bbclass
+++ b/meta/classes/archiver.bbclass
@@ -188,11 +188,11 @@ def get_applying_patches(d):
188 188
189def not_tarball(d): 189def not_tarball(d):
190 """ 190 """
191 packages including key words 'work-shared', 'native', 'task-' will be passed 191 packages including key words 'work-shared', 'native', 'packagegroup-' will be passed
192 """ 192 """
193 workdir = d.getVar('WORKDIR', True) 193 workdir = d.getVar('WORKDIR', True)
194 s = d.getVar('S', True) 194 s = d.getVar('S', True)
195 if 'work-shared' in s or 'task-' in workdir or 'native' in workdir: 195 if 'work-shared' in s or 'packagegroup-' in workdir or 'native' in workdir:
196 return True 196 return True
197 else: 197 else:
198 return False 198 return False
diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass
index a37cdfc463..a85a9ea456 100644
--- a/meta/classes/core-image.bbclass
+++ b/meta/classes/core-image.bbclass
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
7 7
8# IMAGE_FEATURES control content of the core reference images 8# IMAGE_FEATURES control content of the core reference images
9# 9#
10# By default we install task-core-boot and task-base packages - this gives us 10# By default we install packagegroup-core-boot and packagegroup-base packages - this gives us
11# working (console only) rootfs. 11# working (console only) rootfs.
12# 12#
13# Available IMAGE_FEATURES: 13# Available IMAGE_FEATURES:
@@ -27,21 +27,21 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
27# - ssh-server-openssh - SSH server (openssh) 27# - ssh-server-openssh - SSH server (openssh)
28# - debug-tweaks - makes an image suitable for development 28# - debug-tweaks - makes an image suitable for development
29# 29#
30PACKAGE_GROUP_apps-console-core = "task-core-apps-console" 30PACKAGE_GROUP_apps-console-core = "packagegroup-core-apps-console"
31PACKAGE_GROUP_x11-mini = "task-core-x11-mini" 31PACKAGE_GROUP_x11-mini = "packagegroup-core-x11-mini"
32PACKAGE_GROUP_x11-base = "task-core-x11-base" 32PACKAGE_GROUP_x11-base = "packagegroup-core-x11-base"
33PACKAGE_GROUP_x11-sato = "task-core-x11-sato" 33PACKAGE_GROUP_x11-sato = "packagegroup-core-x11-sato"
34PACKAGE_GROUP_apps-x11-core = "task-core-apps-x11-core" 34PACKAGE_GROUP_apps-x11-core = "packagegroup-core-apps-x11-core"
35PACKAGE_GROUP_apps-x11-games = "task-core-apps-x11-games" 35PACKAGE_GROUP_apps-x11-games = "packagegroup-core-apps-x11-games"
36PACKAGE_GROUP_tools-debug = "task-core-tools-debug" 36PACKAGE_GROUP_tools-debug = "packagegroup-core-tools-debug"
37PACKAGE_GROUP_tools-profile = "task-core-tools-profile" 37PACKAGE_GROUP_tools-profile = "packagegroup-core-tools-profile"
38PACKAGE_GROUP_tools-testapps = "task-core-tools-testapps" 38PACKAGE_GROUP_tools-testapps = "packagegroup-core-tools-testapps"
39PACKAGE_GROUP_tools-sdk = "task-core-sdk task-core-standalone-sdk-target" 39PACKAGE_GROUP_tools-sdk = "packagegroup-core-sdk packagegroup-core-standalone-sdk-target"
40PACKAGE_GROUP_nfs-server = "task-core-nfs-server" 40PACKAGE_GROUP_nfs-server = "packagegroup-core-nfs-server"
41PACKAGE_GROUP_ssh-server-dropbear = "task-core-ssh-dropbear" 41PACKAGE_GROUP_ssh-server-dropbear = "packagegroup-core-ssh-dropbear"
42PACKAGE_GROUP_ssh-server-openssh = "task-core-ssh-openssh" 42PACKAGE_GROUP_ssh-server-openssh = "packagegroup-core-ssh-openssh"
43PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}" 43PACKAGE_GROUP_package-management = "${ROOTFS_PKGMANAGE}"
44PACKAGE_GROUP_qt4-pkgs = "task-core-qt-demos" 44PACKAGE_GROUP_qt4-pkgs = "packagegroup-core-qt-demos"
45 45
46 46
47# IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2' 47# IMAGE_FEATURES_REPLACES_foo = 'bar1 bar2'
@@ -52,8 +52,8 @@ IMAGE_FEATURES_REPLACES_ssh-server-openssh = "ssh-server-dropbear"
52# An error exception would be raised if both image features foo and bar1(or bar2) are included 52# An error exception would be raised if both image features foo and bar1(or bar2) are included
53 53
54CORE_IMAGE_BASE_INSTALL = '\ 54CORE_IMAGE_BASE_INSTALL = '\
55 task-core-boot \ 55 packagegroup-core-boot \
56 task-base-extended \ 56 packagegroup-base-extended \
57 \ 57 \
58 ${CORE_IMAGE_EXTRA_INSTALL} \ 58 ${CORE_IMAGE_EXTRA_INSTALL} \
59 ' 59 '
diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass
index 6de14e0cac..e74eb3f3f6 100644
--- a/meta/classes/insane.bbclass
+++ b/meta/classes/insane.bbclass
@@ -591,7 +591,7 @@ def package_qa_check_rdepends(pkg, pkgdest, skip, d):
591 return True 591 return True
592 592
593 sane = True 593 sane = True
594 if not "-dbg" in pkg and not "task-" in pkg and not "-image" in pkg: 594 if not "-dbg" in pkg and not "packagegroup-" in pkg and not "-image" in pkg:
595 # Copied from package_ipk.bbclass 595 # Copied from package_ipk.bbclass
596 # boiler plate to update the data 596 # boiler plate to update the data
597 localdata = bb.data.createCopy(d) 597 localdata = bb.data.createCopy(d)
diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 78af693551..c8aafc9752 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1763,7 +1763,7 @@ python package_depchains() {
1763 for dep in pkglibdeps[pkg]: 1763 for dep in pkglibdeps[pkg]:
1764 add_dep(pkglibdeplist, dep) 1764 add_dep(pkglibdeplist, dep)
1765 # FIXME this should not look at PN once all task recipes inherit from task.bbclass 1765 # FIXME this should not look at PN once all task recipes inherit from task.bbclass
1766 dbgdefaultdeps = ((d.getVar('DEPCHAIN_DBGDEFAULTDEPS', True) == '1') or (d.getVar('PN', True) or '').startswith('task-')) 1766 dbgdefaultdeps = ((d.getVar('DEPCHAIN_DBGDEFAULTDEPS', True) == '1') or (d.getVar('PN', True) or '').startswith('packagegroup-'))
1767 1767
1768 for suffix in pkgs: 1768 for suffix in pkgs:
1769 for pkg in pkgs[suffix]: 1769 for pkg in pkgs[suffix]:
diff --git a/meta/classes/packagegroup.bbclass b/meta/classes/packagegroup.bbclass
new file mode 100644
index 0000000000..6ec154a033
--- /dev/null
+++ b/meta/classes/packagegroup.bbclass
@@ -0,0 +1,30 @@
1# Task packages are only used to pull in other packages
2# via their dependencies. They are empty.
3ALLOW_EMPTY = "1"
4
5# By default, only the task package itself is in PACKAGES.
6# -dbg and -dev flavours are handled by the anonfunc below.
7# This means that task recipes used to build multiple task
8# packages have to modify PACKAGES after inheriting task.bbclass.
9PACKAGES = "${PN}"
10
11# By default, task packages do not depend on a certain architecture.
12# Only if dependencies are modified by MACHINE_FEATURES, packages
13# need to be set to MACHINE_ARCH after inheriting task.bbclass
14PACKAGE_ARCH = "all"
15
16# This automatically adds -dbg and -dev flavours of all PACKAGES
17# to the list. Their dependencies (RRECOMMENDS) are handled as usual
18# by package_depchains in a following step.
19python () {
20 packages = d.getVar('PACKAGES', True).split()
21 genpackages = []
22 for pkg in packages:
23 for postfix in ['-dbg', '-dev']:
24 genpackages.append(pkg+postfix)
25 d.setVar('PACKAGES', ' '.join(packages+genpackages))
26}
27
28# We don't want to look at shared library dependencies for the
29# dbg packages
30DEPCHAIN_DBGDEFAULTDEPS = "1"
diff --git a/meta/classes/populate_sdk_base.bbclass b/meta/classes/populate_sdk_base.bbclass
index c9fb00de48..1c151d7186 100644
--- a/meta/classes/populate_sdk_base.bbclass
+++ b/meta/classes/populate_sdk_base.bbclass
@@ -7,9 +7,9 @@ SDK_DEPLOY = "${TMPDIR}/deploy/sdk"
7 7
8SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}" 8SDKTARGETSYSROOT = "${SDKPATH}/sysroots/${MULTIMACH_TARGET_SYS}"
9 9
10TOOLCHAIN_HOST_TASK ?= "nativesdk-task-sdk-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" 10TOOLCHAIN_HOST_TASK ?= "nativesdk-packagegroup-sdk-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
11TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= "" 11TOOLCHAIN_HOST_TASK_ATTEMPTONLY ?= ""
12TOOLCHAIN_TARGET_TASK ?= "task-core-standalone-sdk-target task-core-standalone-sdk-target-dbg" 12TOOLCHAIN_TARGET_TASK ?= "packagegroup-core-standalone-sdk-target packagegroup-core-standalone-sdk-target-dbg"
13TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= "" 13TOOLCHAIN_TARGET_TASK_ATTEMPTONLY ?= ""
14TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}" 14TOOLCHAIN_OUTPUTNAME ?= "${SDK_NAME}-toolchain-${DISTRO_VERSION}"
15 15
diff --git a/meta/classes/task.bbclass b/meta/classes/task.bbclass
index 6ec154a033..28db50008f 100644
--- a/meta/classes/task.bbclass
+++ b/meta/classes/task.bbclass
@@ -1,30 +1,6 @@
1# Task packages are only used to pull in other packages 1python __anonymous() {
2# via their dependencies. They are empty. 2 bb.warn("%s: task.bbclass is deprecated, please inherit packagegroup instead" % d.getVar("PN", True))
3ALLOW_EMPTY = "1"
4
5# By default, only the task package itself is in PACKAGES.
6# -dbg and -dev flavours are handled by the anonfunc below.
7# This means that task recipes used to build multiple task
8# packages have to modify PACKAGES after inheriting task.bbclass.
9PACKAGES = "${PN}"
10
11# By default, task packages do not depend on a certain architecture.
12# Only if dependencies are modified by MACHINE_FEATURES, packages
13# need to be set to MACHINE_ARCH after inheriting task.bbclass
14PACKAGE_ARCH = "all"
15
16# This automatically adds -dbg and -dev flavours of all PACKAGES
17# to the list. Their dependencies (RRECOMMENDS) are handled as usual
18# by package_depchains in a following step.
19python () {
20 packages = d.getVar('PACKAGES', True).split()
21 genpackages = []
22 for pkg in packages:
23 for postfix in ['-dbg', '-dev']:
24 genpackages.append(pkg+postfix)
25 d.setVar('PACKAGES', ' '.join(packages+genpackages))
26} 3}
27 4
28# We don't want to look at shared library dependencies for the 5inherit packagegroup
29# dbg packages 6
30DEPCHAIN_DBGDEFAULTDEPS = "1"
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 1d56813a6b..702fc50991 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -691,7 +691,7 @@ SSTATE_DIR ?= "${TOPDIR}/sstate-cache"
691IMAGE_FSTYPES ?= "tar.gz" 691IMAGE_FSTYPES ?= "tar.gz"
692INITRAMFS_FSTYPES ?= "cpio.gz" 692INITRAMFS_FSTYPES ?= "cpio.gz"
693PCMCIA_MANAGER ?= "pcmciautils" 693PCMCIA_MANAGER ?= "pcmciautils"
694DEFAULT_TASK_PROVIDER ?= "task-base" 694DEFAULT_TASK_PROVIDER ?= "packagegroup-base"
695MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}" 695MACHINE_TASK_PROVIDER ?= "${DEFAULT_TASK_PROVIDER}"
696IMAGE_ROOTFS_SIZE ?= "65536" 696IMAGE_ROOTFS_SIZE ?= "65536"
697 697
@@ -705,7 +705,7 @@ CACHE := "${CACHE}"
705OES_BITBAKE_CONF = "1" 705OES_BITBAKE_CONF = "1"
706 706
707################################################################## 707##################################################################
708# Machine properties and task-base stuff 708# Machine properties and packagegroup-base stuff
709################################################################## 709##################################################################
710 710
711DISTRO_FEATURES ?= "" 711DISTRO_FEATURES ?= ""
diff --git a/meta/recipes-bsp/qemu-config/qemu-config.bb b/meta/recipes-bsp/qemu-config/qemu-config.bb
index 8305f3a965..5f7be28a44 100644
--- a/meta/recipes-bsp/qemu-config/qemu-config.bb
+++ b/meta/recipes-bsp/qemu-config/qemu-config.bb
@@ -37,7 +37,7 @@ pkg_postinst_${PN} () {
37 sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/' 37 sed -i $D${datadir}/applications/shutdown.desktop -e 's/^Exec=halt/Exec=reboot/'
38} 38}
39 39
40RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} task-core-nfs-server oprofileui-server rsync bash" 40RDEPENDS_${PN} = "distcc ${@base_contains('DISTRO_FEATURES', 'x11', 'dbus-x11', '', d)} packagegroup-core-nfs-server oprofileui-server rsync bash"
41 41
42inherit update-rc.d allarch 42inherit update-rc.d allarch
43 43
diff --git a/meta/recipes-core/images/build-appliance-image.bb b/meta/recipes-core/images/build-appliance-image.bb
index 95909c4b82..42d643634d 100644
--- a/meta/recipes-core/images/build-appliance-image.bb
+++ b/meta/recipes-core/images/build-appliance-image.bb
@@ -1,5 +1,5 @@
1DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation. For more information, see the<a href='http://www.yoctoproject.org/documentation/build-appliance'>Build Appliance page</a>." 1DESCRIPTION = "An image you can boot and run using either the VMware Player or VMware Workstation. For more information, see the<a href='http://www.yoctoproject.org/documentation/build-appliance'>Build Appliance page</a>."
2IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" 2IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-apps-console packagegroup-core-ssh-openssh packagegroup-self-hosted"
3 3
4LICENSE = "MIT" 4LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
diff --git a/meta/recipes-core/images/core-image-minimal.bb b/meta/recipes-core/images/core-image-minimal.bb
index 089a728f88..0d2613e327 100644
--- a/meta/recipes-core/images/core-image-minimal.bb
+++ b/meta/recipes-core/images/core-image-minimal.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "A small image just capable of allowing a device to boot." 1DESCRIPTION = "A small image just capable of allowing a device to boot."
2 2
3IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" 3IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}"
4 4
5IMAGE_LINGUAS = " " 5IMAGE_LINGUAS = " "
6 6
diff --git a/meta/recipes-core/meta/meta-toolchain-gmae.bb b/meta/recipes-core/meta/meta-toolchain-gmae.bb
index 512810b365..5d805742ac 100644
--- a/meta/recipes-core/meta/meta-toolchain-gmae.bb
+++ b/meta/recipes-core/meta/meta-toolchain-gmae.bb
@@ -1,4 +1,4 @@
1TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg" 1TOOLCHAIN_TARGET_GMAETASK ?= "packagegroup-core-standalone-gmae-sdk-target packagegroup-core-standalone-gmae-sdk-target-dbg"
2TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}" 2TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}"
3TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" 3TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}"
4PROVIDES = "meta-toolchain-sdk" 4PROVIDES = "meta-toolchain-sdk"
diff --git a/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
index ea054bc9c9..ea054bc9c9 100644
--- a/meta/recipes-core/tasks/nativesdk-task-sdk-host.bb
+++ b/meta/recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb
new file mode 100644
index 0000000000..ea894b2e2b
--- /dev/null
+++ b/meta/recipes-core/packagegroups/packagegroup-base.bb
@@ -0,0 +1,359 @@
1DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r75"
6
7inherit packagegroup
8
9PROVIDES = "${PACKAGES}"
10PACKAGES = ' \
11 packagegroup-base \
12 packagegroup-base-extended \
13 packagegroup-distro-base \
14 packagegroup-machine-base \
15 \
16 ${@base_contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \
17 ${@base_contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \
18 ${@base_contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \
19 ${@base_contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \
20 ${@base_contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \
21 ${@base_contains("MACHINE_FEATURES", "irda", "packagegroup-base-irda", "",d)} \
22 ${@base_contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \
23 ${@base_contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \
24 ${@base_contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \
25 ${@base_contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \
26 ${@base_contains("MACHINE_FEATURES", "screen", "packagegroup-base-screen", "", d)} \
27 ${@base_contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \
28 ${@base_contains("MACHINE_FEATURES", "touchscreen", "packagegroup-base-touchscreen", "", d)} \
29 ${@base_contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \
30 ${@base_contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \
31 \
32 ${@base_contains("MACHINE_FEATURES", "uboot", "packagegroup-base-uboot", "",d)} \
33 ${@base_contains("MACHINE_FEATURES", "redboot", "packagegroup-base-redboot", "",d)} \
34 ${@base_contains("MACHINE_FEATURES", "apex", "packagegroup-base-apex", "",d)} \
35 \
36 ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \
37 ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \
38 ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \
39 ${@base_contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \
40 ${@base_contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \
41 ${@base_contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \
42 ${@base_contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \
43 ${@base_contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \
44 ${@base_contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \
45 ${@base_contains("DISTRO_FEATURES", "raid", "packagegroup-base-raid", "",d)} \
46 ${@base_contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \
47 \
48 '
49
50ALLOW_EMPTY = "1"
51
52#
53# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
54#
55PACKAGE_ARCH = "${MACHINE_ARCH}"
56
57#
58# those ones can be set in machine config to supply packages needed to get machine booting
59#
60MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
61MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
62
63#
64# packagegroup-base contain stuff needed for base system (machine related)
65#
66RDEPENDS_packagegroup-base = "\
67 packagegroup-distro-base \
68 packagegroup-machine-base \
69 \
70 sysfsutils \
71 module-init-tools \
72 ${@base_contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \
73 ${@base_contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \
74 ${@base_contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \
75 ${@base_contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \
76 \
77 ${@base_contains('COMBINED_FEATURES', 'alsa', 'packagegroup-base-alsa', '',d)} \
78 ${@base_contains('COMBINED_FEATURES', 'ext2', 'packagegroup-base-ext2', '',d)} \
79 ${@base_contains('COMBINED_FEATURES', 'vfat', 'packagegroup-base-vfat', '',d)} \
80 ${@base_contains('COMBINED_FEATURES', 'irda', 'packagegroup-base-irda', '',d)} \
81 ${@base_contains('COMBINED_FEATURES', 'pci', 'packagegroup-base-pci', '',d)} \
82 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'packagegroup-base-pcmcia', '',d)} \
83 ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \
84 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'packagegroup-base-usbhost', '',d)} \
85 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \
86 ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \
87 ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \
88 ${@base_contains('COMBINED_FEATURES', 'uboot', 'packagegroup-base-uboot', '',d)} \
89 ${@base_contains('COMBINED_FEATURES', 'redboot', 'packagegroup-base-redboot', '',d)} \
90 ${@base_contains('COMBINED_FEATURES', 'apex', 'packagegroup-base-apex', '',d)} \
91 \
92 ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \
93 ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \
94 ${@base_contains('DISTRO_FEATURES', 'smbfs', 'packagegroup-base-smbfs', '',d)} \
95 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \
96 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \
97 ${@base_contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \
98 ${@base_contains('DISTRO_FEATURES', 'raid', 'packagegroup-base-raid', '',d)} \
99 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \
100 "
101
102
103RRECOMMENDS_packagegroup-base = "\
104 kernel-module-nls-utf8 \
105 kernel-module-input \
106 kernel-module-uinput \
107 kernel-module-rtc-dev \
108 kernel-module-rtc-proc \
109 kernel-module-rtc-sysfs \
110 kernel-module-unix"
111
112RDEPENDS_packagegroup-base-extended = "\
113 packagegroup-base \
114 ${ADD_WIFI} \
115 ${ADD_BT} \
116 ${ADD_3G} \
117 "
118
119ADD_WIFI = ""
120ADD_BT = ""
121ADD_3G = ""
122
123python __anonymous () {
124 # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
125 # then include packagegroup-base-wifi in packagegroup-base
126
127 distro_features = set(d.getVar("DISTRO_FEATURES", True).split())
128 machine_features= set(d.getVar("MACHINE_FEATURES", True).split())
129
130 if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
131 d.setVar("ADD_BT", "packagegroup-base-bluetooth")
132
133 if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
134 d.setVar("ADD_WIFI", "packagegroup-base-wifi")
135
136 if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
137 d.setVar("ADD_3G", "packagegroup-base-3g")
138}
139
140#
141# packages added by distribution
142#
143DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}"
144RDEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
145RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
146
147#
148# packages added by machine config
149#
150RDEPENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
151RRECOMMENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
152
153RDEPENDS_packagegroup-base-keyboard = "\
154 keymaps"
155
156RDEPENDS_packagegroup-base-pci = "\
157 pciutils"
158
159RDEPENDS_packagegroup-base-acpi = "\
160 acpid \
161 libacpi "
162
163RDEPENDS_packagegroup-base-apm = "\
164 ${VIRTUAL-RUNTIME_apm} \
165 apmd"
166
167RDEPENDS_packagegroup-base-ext2 = "\
168 hdparm \
169 e2fsprogs \
170 e2fsprogs-e2fsck \
171 e2fsprogs-mke2fs"
172
173RRECOMMENDS_packagegroup-base-vfat = "\
174 kernel-module-msdos \
175 kernel-module-vfat \
176 kernel-module-nls-iso8859-1 \
177 kernel-module-nls-cp437"
178
179RDEPENDS_packagegroup-base-alsa = "\
180 alsa-utils-alsactl \
181 alsa-utils-alsamixer \
182 ${VIRTUAL-RUNTIME_alsa-state}"
183
184RRECOMMENDS_packagegroup-base-alsa = "\
185 kernel-module-snd-mixer-oss \
186 kernel-module-snd-pcm-oss"
187
188RDEPENDS_packagegroup-base-pcmcia = "\
189 pcmciautils \
190 "
191#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)}
192#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)}
193
194
195RRECOMMENDS_packagegroup-base-pcmcia = "\
196 kernel-module-pcmcia \
197 kernel-module-airo-cs \
198 kernel-module-pcnet-cs \
199 kernel-module-serial-cs \
200 kernel-module-ide-cs \
201 kernel-module-ide-disk \
202 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
203 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
204 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
205
206# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
207
208RDEPENDS_packagegroup-base-bluetooth = "\
209 bluez4 \
210 ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
211 "
212
213RRECOMMENDS_packagegroup-base-bluetooth = "\
214 kernel-module-bluetooth \
215 kernel-module-l2cap \
216 kernel-module-rfcomm \
217 kernel-module-hci-vhci \
218 kernel-module-bnep \
219 kernel-module-hidp \
220 kernel-module-hci-uart \
221 kernel-module-sco \
222 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \
223 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \
224 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
225 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
226 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
227 "
228
229RDEPENDS_packagegroup-base-irda = "\
230 irda-utils"
231
232RRECOMMENDS_packagegroup-base-irda = "\
233 kernel-module-pxaficp-ir \
234 kernel-module-irda \
235 kernel-module-ircomm \
236 kernel-module-ircomm-tty \
237 kernel-module-irlan \
238 ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \
239 kernel-module-irport \
240 kernel-module-irtty \
241 kernel-module-irtty-sir \
242 kernel-module-sir-dev \
243 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} "
244
245RRECOMMENDS_packagegroup-base-usbgadget = "\
246 kernel-module-pxa27x_udc \
247 kernel-module-gadgetfs \
248 kernel-module-g-file-storage \
249 kernel-module-g-serial \
250 kernel-module-g-ether"
251
252RDEPENDS_packagegroup-base-usbhost = "\
253 usbutils "
254
255RRECOMMENDS_packagegroup-base-usbhost = "\
256 kernel-module-uhci-hcd \
257 kernel-module-ohci-hcd \
258 kernel-module-ehci-hcd \
259 kernel-module-usbcore \
260 kernel-module-usbhid \
261 kernel-module-usbnet \
262 kernel-module-sd-mod \
263 kernel-module-scsi-mod \
264 kernel-module-usbmouse \
265 kernel-module-mousedev \
266 kernel-module-usbserial \
267 kernel-module-usb-storage "
268
269RDEPENDS_packagegroup-base-ppp = "\
270 ppp \
271 ppp-dialin"
272
273RRECOMMENDS_packagegroup-base-ppp = "\
274 kernel-module-ppp-async \
275 kernel-module-ppp-deflate \
276 kernel-module-ppp-generic \
277 kernel-module-ppp-mppe \
278 kernel-module-slhc"
279
280RDEPENDS_packagegroup-base-ipsec = "\
281 openswan"
282
283RRECOMMENDS_packagegroup-base-ipsec = "\
284 kernel-module-ipsec"
285
286#
287# packagegroup-base-wifi contain everything needed to get WiFi working
288# WEP/WPA connection needs to be supported out-of-box
289#
290RDEPENDS_packagegroup-base-wifi = "\
291 wireless-tools \
292 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
293 ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
294 wpa-supplicant"
295
296RRECOMMENDS_packagegroup-base-wifi = "\
297 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
298 kernel-module-ieee80211-crypt \
299 kernel-module-ieee80211-crypt-ccmp \
300 kernel-module-ieee80211-crypt-tkip \
301 kernel-module-ieee80211-crypt-wep \
302 kernel-module-ecb \
303 kernel-module-arc4 \
304 kernel-module-crypto_algapi \
305 kernel-module-cryptomgr \
306 kernel-module-michael-mic \
307 kernel-module-aes-generic \
308 kernel-module-aes"
309
310RDEPENDS_packagegroup-base-3g = "\
311 ofono"
312
313RRECOMMENDS_packagegroup-base-3g = "\
314 kernel-module-cdc-acm \
315 kernel-module-cdc-wdm"
316
317RRECOMMENDS_packagegroup-base-smbfs = "\
318 kernel-module-cifs \
319 kernel-module-smbfs"
320
321RRECOMMENDS_packagegroup-base-cramfs = "\
322 kernel-module-cramfs"
323
324#
325# packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package
326#
327RDEPENDS_packagegroup-base-nfs = "\
328 portmap"
329
330RRECOMMENDS_packagegroup-base-nfs = "\
331 kernel-module-nfs "
332
333RDEPENDS_packagegroup-base-zeroconf = "\
334 avahi-daemon"
335
336RDEPENDS_packagegroup-base-raid = "\
337 "
338
339RDEPENDS_packagegroup-base-screen = "\
340 "
341
342#
343# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
344#
345RDEPENDS_packagegroup-base-touchscreen = "\
346 "
347
348RDEPENDS_packagegroup-base-ipv6 = "\
349 "
350
351RRECOMMENDS_packagegroup-base-ipv6 = "\
352 kernel-module-ipv6 "
353
354RDEPENDS_packagegroup-base-serial = "\
355 setserial \
356 lrzsz "
357
358RDEPENDS_packagegroup-base-phone = "\
359 ofono"
diff --git a/meta/recipes-core/tasks/task-core-boot.bb b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
index 2947509bf5..7e80fffe4a 100644
--- a/meta/recipes-core/tasks/task-core-boot.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-boot.bb
@@ -25,12 +25,12 @@ VIRTUAL-RUNTIME_initscripts ?= "initscripts"
25VIRTUAL-RUNTIME_keymaps ?= "keymaps" 25VIRTUAL-RUNTIME_keymaps ?= "keymaps"
26 26
27PACKAGES = "\ 27PACKAGES = "\
28 task-core-boot \ 28 packagegroup-core-boot \
29 task-core-boot-dbg \ 29 packagegroup-core-boot-dbg \
30 task-core-boot-dev \ 30 packagegroup-core-boot-dev \
31" 31"
32 32
33RDEPENDS_task-core-boot = "\ 33RDEPENDS_packagegroup-core-boot = "\
34 base-files \ 34 base-files \
35 base-passwd \ 35 base-passwd \
36 busybox \ 36 busybox \
@@ -45,5 +45,5 @@ RDEPENDS_task-core-boot = "\
45 ${VIRTUAL-RUNTIME_update-alternatives} \ 45 ${VIRTUAL-RUNTIME_update-alternatives} \
46 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" 46 ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
47 47
48RRECOMMENDS_task-core-boot = "\ 48RRECOMMENDS_packagegroup-core-boot = "\
49 ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" 49 ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
diff --git a/meta/recipes-core/tasks/task-core-console.bb b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
index cb2273294f..fd8eb252db 100644
--- a/meta/recipes-core/tasks/task-core-console.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-console.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r35" 9PR = "r35"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-apps-console \ 12 packagegroup-core-apps-console \
13 task-core-apps-console-dbg \ 13 packagegroup-core-apps-console-dbg \
14 task-core-apps-console-dev \ 14 packagegroup-core-apps-console-dev \
15 " 15 "
16 16
17PACKAGE_ARCH = "${MACHINE_ARCH}" 17PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -20,7 +20,7 @@ ALLOW_EMPTY = "1"
20 20
21SPLASH ?= "psplash" 21SPLASH ?= "psplash"
22 22
23RDEPENDS_task-core-apps-console = "\ 23RDEPENDS_packagegroup-core-apps-console = "\
24 avahi-daemon \ 24 avahi-daemon \
25 dbus \ 25 dbus \
26 portmap \ 26 portmap \
diff --git a/meta/recipes-core/tasks/task-core-nfs.bb b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
index 5c7f45562a..e63753b3e2 100644
--- a/meta/recipes-core/tasks/task-core-nfs.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-nfs.bb
@@ -9,14 +9,14 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r1" 9PR = "r1"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-nfs-server \ 12 packagegroup-core-nfs-server \
13 task-core-nfs-server-dbg \ 13 packagegroup-core-nfs-server-dbg \
14 task-core-nfs-server-dev \ 14 packagegroup-core-nfs-server-dev \
15 " 15 "
16 16
17ALLOW_EMPTY = "1" 17ALLOW_EMPTY = "1"
18 18
19RDEPENDS_task-core-nfs-server = "\ 19RDEPENDS_packagegroup-core-nfs-server = "\
20 nfs-utils \ 20 nfs-utils \
21 nfs-utils-client \ 21 nfs-utils-client \
22 " 22 "
@@ -24,5 +24,5 @@ RDEPENDS_task-core-nfs-server = "\
24# rpcinfo can be useful but only with glibc images 24# rpcinfo can be useful but only with glibc images
25GLIBC_DEPENDENCIES = "glibc-utils" 25GLIBC_DEPENDENCIES = "glibc-utils"
26 26
27RRECOMMENDS_task-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}" 27RRECOMMENDS_packagegroup-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}"
28 28
diff --git a/meta/recipes-core/tasks/task-core-sdk.bb b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
index fe952367e4..663f7057de 100644
--- a/meta/recipes-core/tasks/task-core-sdk.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-sdk.bb
@@ -6,18 +6,18 @@ DESCRIPTION = "Software Development Tasks for OpenedHand Poky"
6LICENSE = "MIT" 6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9DEPENDS = "task-core-console" 9DEPENDS = "packagegroup-core-console"
10PR = "r8" 10PR = "r8"
11 11
12ALLOW_EMPTY = "1" 12ALLOW_EMPTY = "1"
13#PACKAGEFUNCS =+ 'generate_sdk_pkgs' 13#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
14 14
15PACKAGES = "\ 15PACKAGES = "\
16 task-core-sdk \ 16 packagegroup-core-sdk \
17 task-core-sdk-dbg \ 17 packagegroup-core-sdk-dbg \
18 task-core-sdk-dev" 18 packagegroup-core-sdk-dev"
19 19
20RDEPENDS_task-core-sdk = "\ 20RDEPENDS_packagegroup-core-sdk = "\
21 autoconf \ 21 autoconf \
22 automake \ 22 automake \
23 binutils \ 23 binutils \
@@ -48,15 +48,15 @@ RDEPENDS_task-core-sdk = "\
48 file \ 48 file \
49 tcl" 49 tcl"
50 50
51RRECOMMENDS_task-core-sdk = "\ 51RRECOMMENDS_packagegroup-core-sdk = "\
52 libgomp \ 52 libgomp \
53 libgomp-dev" 53 libgomp-dev"
54 54
55#python generate_sdk_pkgs () { 55#python generate_sdk_pkgs () {
56# poky_pkgs = read_pkgdata('task-core', d)['PACKAGES'] 56# poky_pkgs = read_pkgdata('packagegroup-core', d)['PACKAGES']
57# pkgs = d.getVar('PACKAGES', True).split() 57# pkgs = d.getVar('PACKAGES', True).split()
58# for pkg in poky_pkgs.split(): 58# for pkg in poky_pkgs.split():
59# newpkg = pkg.replace('task-core', 'task-core-sdk') 59# newpkg = pkg.replace('packagegroup-core', 'packagegroup-core-sdk')
60# 60#
61# # for each of the task packages, add a corresponding sdk task 61# # for each of the task packages, add a corresponding sdk task
62# pkgs.append(newpkg) 62# pkgs.append(newpkg)
@@ -91,4 +91,4 @@ RRECOMMENDS_task-core-sdk = "\
91# d.setVar('PACKAGES', ' '.join(pkgs)) 91# d.setVar('PACKAGES', ' '.join(pkgs))
92#} 92#}
93# 93#
94#PACKAGES_DYNAMIC = "task-core-sdk-*" 94#PACKAGES_DYNAMIC = "packagegroup-core-sdk-*"
diff --git a/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
new file mode 100644
index 0000000000..9dcc342dc4
--- /dev/null
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-dropbear.bb
@@ -0,0 +1,17 @@
1DESCRIPTION = "Dropbear SSH task for Poky"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r0"
6
7PACKAGES = "\
8 packagegroup-core-ssh-dropbear \
9 packagegroup-core-ssh-dropbear-dbg \
10 packagegroup-core-ssh-dropbear-dev \
11 "
12
13ALLOW_EMPTY = "1"
14
15RDEPENDS_packagegroup-core-ssh-dropbear = "dropbear"
16RDEPENDS_packagegroup-core-ssh-dropbear-dbg = "dropbear-dbg"
17RDEPENDS_packagegroup-core-ssh-dropbear-dev = "dropbear-dev"
diff --git a/meta/recipes-core/tasks/task-core-ssh-openssh.bb b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
index 794399a2b8..7e85b29ad8 100644
--- a/meta/recipes-core/tasks/task-core-ssh-openssh.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-ssh-openssh.bb
@@ -5,13 +5,13 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
5PR = "r0" 5PR = "r0"
6 6
7PACKAGES = "\ 7PACKAGES = "\
8 task-core-ssh-openssh \ 8 packagegroup-core-ssh-openssh \
9 task-core-ssh-openssh-dbg \ 9 packagegroup-core-ssh-openssh-dbg \
10 task-core-ssh-openssh-dev \ 10 packagegroup-core-ssh-openssh-dev \
11 " 11 "
12 12
13ALLOW_EMPTY = "1" 13ALLOW_EMPTY = "1"
14 14
15RDEPENDS_task-core-ssh-openssh = "openssh" 15RDEPENDS_packagegroup-core-ssh-openssh = "openssh"
16RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg" 16RDEPENDS_packagegroup-core-ssh-openssh-dbg = "openssh-dbg"
17RDEPENDS_task-core-ssh-openssh-dev = "openssh-dev" 17RDEPENDS_packagegroup-core-ssh-openssh-dev = "openssh-dev"
diff --git a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
index 03628a167d..03628a167d 100644
--- a/meta/recipes-core/tasks/task-core-standalone-sdk-target.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-standalone-sdk-target.bb
diff --git a/meta/recipes-core/tasks/task-core-tools-debug.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
index b7eff21622..b7eff21622 100644
--- a/meta/recipes-core/tasks/task-core-tools-debug.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-debug.bb
diff --git a/meta/recipes-core/tasks/task-core-tools-profile.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
index 30776ef658..30776ef658 100644
--- a/meta/recipes-core/tasks/task-core-tools-profile.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-profile.bb
diff --git a/meta/recipes-core/tasks/task-core-tools-testapps.bb b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
index bdd0d058f9..bdd0d058f9 100644
--- a/meta/recipes-core/tasks/task-core-tools-testapps.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-core-tools-testapps.bb
diff --git a/meta/recipes-core/tasks/task-cross-canadian.bb b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
index 1840301892..6ab4a95846 100644
--- a/meta/recipes-core/tasks/task-cross-canadian.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-cross-canadian.bb
@@ -1,5 +1,5 @@
1DESCRIPTION = "Host SDK package for cross canadian toolchain" 1DESCRIPTION = "Host SDK package for cross canadian toolchain"
2PN = "task-cross-canadian-${TRANSLATED_TARGET_ARCH}" 2PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
3PR = "r0" 3PR = "r0"
4LICENSE = "MIT" 4LICENSE = "MIT"
5ALLOW_EMPTY = "1" 5ALLOW_EMPTY = "1"
diff --git a/meta/recipes-core/tasks/task-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
index 4d6ab07964..118ff7d48b 100644
--- a/meta/recipes-core/tasks/task-self-hosted.bb
+++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb
@@ -9,25 +9,25 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-self-hosted \ 12 packagegroup-self-hosted \
13 task-self-hosted-debug \ 13 packagegroup-self-hosted-debug \
14 task-self-hosted-sdk \ 14 packagegroup-self-hosted-sdk \
15 task-self-hosted-extended \ 15 packagegroup-self-hosted-extended \
16 task-self-hosted-graphics \ 16 packagegroup-self-hosted-graphics \
17 task-self-hosted-host-tools \ 17 packagegroup-self-hosted-host-tools \
18 " 18 "
19 19
20ALLOW_EMPTY = "1" 20ALLOW_EMPTY = "1"
21 21
22RDEPENDS_task-self-hosted = "\ 22RDEPENDS_packagegroup-self-hosted = "\
23 task-self-hosted-debug \ 23 packagegroup-self-hosted-debug \
24 task-self-hosted-sdk \ 24 packagegroup-self-hosted-sdk \
25 task-self-hosted-extended \ 25 packagegroup-self-hosted-extended \
26 task-self-hosted-graphics \ 26 packagegroup-self-hosted-graphics \
27 task-self-hosted-host-tools \ 27 packagegroup-self-hosted-host-tools \
28 " 28 "
29 29
30RDEPENDS_task-self-hosted-host-tools = "\ 30RDEPENDS_packagegroup-self-hosted-host-tools = "\
31 connman \ 31 connman \
32 connman-plugin-ethernet \ 32 connman-plugin-ethernet \
33 dhcp-client \ 33 dhcp-client \
@@ -52,7 +52,7 @@ RDEPENDS_task-self-hosted-host-tools = "\
52 " 52 "
53 53
54# eglibc-utils: for rpcgen 54# eglibc-utils: for rpcgen
55RDEPENDS_task-self-hosted-sdk = "\ 55RDEPENDS_packagegroup-self-hosted-sdk = "\
56 autoconf \ 56 autoconf \
57 automake \ 57 automake \
58 binutils \ 58 binutils \
@@ -85,7 +85,7 @@ RDEPENDS_task-self-hosted-sdk = "\
85 sed \ 85 sed \
86 " 86 "
87 87
88RDEPENDS_task-self-hosted-debug = " \ 88RDEPENDS_packagegroup-self-hosted-debug = " \
89 gdb \ 89 gdb \
90 gdbserver \ 90 gdbserver \
91 rsync \ 91 rsync \
@@ -93,7 +93,7 @@ RDEPENDS_task-self-hosted-debug = " \
93 tcf-agent" 93 tcf-agent"
94 94
95 95
96RDEPENDS_task-self-hosted-extended = "\ 96RDEPENDS_packagegroup-self-hosted-extended = "\
97 bzip2 \ 97 bzip2 \
98 chkconfig \ 98 chkconfig \
99 chrpath \ 99 chrpath \
@@ -186,7 +186,7 @@ RDEPENDS_task-self-hosted-extended = "\
186 " 186 "
187 187
188 188
189RDEPENDS_task-self-hosted-graphics = "\ 189RDEPENDS_packagegroup-self-hosted-graphics = "\
190 builder \ 190 builder \
191 libgl \ 191 libgl \
192 libgl-dev \ 192 libgl-dev \
diff --git a/meta/recipes-core/tasks/task-base.bb b/meta/recipes-core/tasks/task-base.bb
deleted file mode 100644
index d5dd14079f..0000000000
--- a/meta/recipes-core/tasks/task-base.bb
+++ /dev/null
@@ -1,359 +0,0 @@
1DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r75"
6
7inherit task
8
9PROVIDES = "${PACKAGES}"
10PACKAGES = ' \
11 task-base \
12 task-base-extended \
13 task-distro-base \
14 task-machine-base \
15 \
16 ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \
17 ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \
18 ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \
19 ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \
20 ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \
21 ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \
22 ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \
23 ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \
24 ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \
25 ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \
26 ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \
27 ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \
28 ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \
29 ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \
30 ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \
31 \
32 ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \
33 ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \
34 ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \
35 \
36 ${@base_contains("DISTRO_FEATURES", "bluetooth", "task-base-bluetooth", "", d)} \
37 ${@base_contains("DISTRO_FEATURES", "wifi", "task-base-wifi", "", d)} \
38 ${@base_contains("DISTRO_FEATURES", "3g", "task-base-3g", "", d)} \
39 ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \
40 ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \
41 ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \
42 ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \
43 ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \
44 ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \
45 ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \
46 ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \
47 \
48 '
49
50ALLOW_EMPTY = "1"
51
52#
53# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
54#
55PACKAGE_ARCH = "${MACHINE_ARCH}"
56
57#
58# those ones can be set in machine config to supply packages needed to get machine booting
59#
60MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= ""
61MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= ""
62
63#
64# task-base contain stuff needed for base system (machine related)
65#
66RDEPENDS_task-base = "\
67 task-distro-base \
68 task-machine-base \
69 \
70 sysfsutils \
71 module-init-tools \
72 ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \
73 ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \
74 ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \
75 ${@base_contains('MACHINE_FEATURES', 'phone', 'task-base-phone', '',d)} \
76 \
77 ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \
78 ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \
79 ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \
80 ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \
81 ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \
82 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \
83 ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \
84 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \
85 ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \
86 ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \
87 ${@base_contains('COMBINED_FEATURES', '3g', 'task-base-3g', '',d)} \
88 ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \
89 ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \
90 ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \
91 \
92 ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \
93 ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \
94 ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \
95 ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \
96 ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \
97 ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \
98 ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \
99 ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \
100 "
101
102
103RRECOMMENDS_task-base = "\
104 kernel-module-nls-utf8 \
105 kernel-module-input \
106 kernel-module-uinput \
107 kernel-module-rtc-dev \
108 kernel-module-rtc-proc \
109 kernel-module-rtc-sysfs \
110 kernel-module-unix"
111
112RDEPENDS_task-base-extended = "\
113 task-base \
114 ${ADD_WIFI} \
115 ${ADD_BT} \
116 ${ADD_3G} \
117 "
118
119ADD_WIFI = ""
120ADD_BT = ""
121ADD_3G = ""
122
123python __anonymous () {
124 # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them)
125 # then include task-base-wifi in task-base
126
127 distro_features = set(d.getVar("DISTRO_FEATURES", True).split())
128 machine_features= set(d.getVar("MACHINE_FEATURES", True).split())
129
130 if "bluetooth" in distro_features and not "bluetooth" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
131 d.setVar("ADD_BT", "task-base-bluetooth")
132
133 if "wifi" in distro_features and not "wifi" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
134 d.setVar("ADD_WIFI", "task-base-wifi")
135
136 if "3g" in distro_features and not "3g" in machine_features and ("pcmcia" in machine_features or "pci" in machine_features or "usbhost" in machine_features):
137 d.setVar("ADD_3G", "task-base-3g")
138}
139
140#
141# packages added by distribution
142#
143DEPENDS_task-distro-base = "${DISTRO_EXTRA_DEPENDS}"
144RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}"
145RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}"
146
147#
148# packages added by machine config
149#
150RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}"
151RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}"
152
153RDEPENDS_task-base-keyboard = "\
154 keymaps"
155
156RDEPENDS_task-base-pci = "\
157 pciutils"
158
159RDEPENDS_task-base-acpi = "\
160 acpid \
161 libacpi "
162
163RDEPENDS_task-base-apm = "\
164 ${VIRTUAL-RUNTIME_apm} \
165 apmd"
166
167RDEPENDS_task-base-ext2 = "\
168 hdparm \
169 e2fsprogs \
170 e2fsprogs-e2fsck \
171 e2fsprogs-mke2fs"
172
173RRECOMMENDS_task-base-vfat = "\
174 kernel-module-msdos \
175 kernel-module-vfat \
176 kernel-module-nls-iso8859-1 \
177 kernel-module-nls-cp437"
178
179RDEPENDS_task-base-alsa = "\
180 alsa-utils-alsactl \
181 alsa-utils-alsamixer \
182 ${VIRTUAL-RUNTIME_alsa-state}"
183
184RRECOMMENDS_task-base-alsa = "\
185 kernel-module-snd-mixer-oss \
186 kernel-module-snd-pcm-oss"
187
188RDEPENDS_task-base-pcmcia = "\
189 pcmciautils \
190 "
191#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)}
192#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)}
193
194
195RRECOMMENDS_task-base-pcmcia = "\
196 kernel-module-pcmcia \
197 kernel-module-airo-cs \
198 kernel-module-pcnet-cs \
199 kernel-module-serial-cs \
200 kernel-module-ide-cs \
201 kernel-module-ide-disk \
202 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \
203 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \
204 ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}"
205
206# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware!
207
208RDEPENDS_task-base-bluetooth = "\
209 bluez4 \
210 ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \
211 "
212
213RRECOMMENDS_task-base-bluetooth = "\
214 kernel-module-bluetooth \
215 kernel-module-l2cap \
216 kernel-module-rfcomm \
217 kernel-module-hci-vhci \
218 kernel-module-bnep \
219 kernel-module-hidp \
220 kernel-module-hci-uart \
221 kernel-module-sco \
222 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \
223 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \
224 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \
225 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \
226 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \
227 "
228
229RDEPENDS_task-base-irda = "\
230 irda-utils"
231
232RRECOMMENDS_task-base-irda = "\
233 kernel-module-pxaficp-ir \
234 kernel-module-irda \
235 kernel-module-ircomm \
236 kernel-module-ircomm-tty \
237 kernel-module-irlan \
238 ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \
239 kernel-module-irport \
240 kernel-module-irtty \
241 kernel-module-irtty-sir \
242 kernel-module-sir-dev \
243 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} "
244
245RRECOMMENDS_task-base-usbgadget = "\
246 kernel-module-pxa27x_udc \
247 kernel-module-gadgetfs \
248 kernel-module-g-file-storage \
249 kernel-module-g-serial \
250 kernel-module-g-ether"
251
252RDEPENDS_task-base-usbhost = "\
253 usbutils "
254
255RRECOMMENDS_task-base-usbhost = "\
256 kernel-module-uhci-hcd \
257 kernel-module-ohci-hcd \
258 kernel-module-ehci-hcd \
259 kernel-module-usbcore \
260 kernel-module-usbhid \
261 kernel-module-usbnet \
262 kernel-module-sd-mod \
263 kernel-module-scsi-mod \
264 kernel-module-usbmouse \
265 kernel-module-mousedev \
266 kernel-module-usbserial \
267 kernel-module-usb-storage "
268
269RDEPENDS_task-base-ppp = "\
270 ppp \
271 ppp-dialin"
272
273RRECOMMENDS_task-base-ppp = "\
274 kernel-module-ppp-async \
275 kernel-module-ppp-deflate \
276 kernel-module-ppp-generic \
277 kernel-module-ppp-mppe \
278 kernel-module-slhc"
279
280RDEPENDS_task-base-ipsec = "\
281 openswan"
282
283RRECOMMENDS_task-base-ipsec = "\
284 kernel-module-ipsec"
285
286#
287# task-base-wifi contain everything needed to get WiFi working
288# WEP/WPA connection needs to be supported out-of-box
289#
290RDEPENDS_task-base-wifi = "\
291 wireless-tools \
292 ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \
293 ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \
294 wpa-supplicant"
295
296RRECOMMENDS_task-base-wifi = "\
297 ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \
298 kernel-module-ieee80211-crypt \
299 kernel-module-ieee80211-crypt-ccmp \
300 kernel-module-ieee80211-crypt-tkip \
301 kernel-module-ieee80211-crypt-wep \
302 kernel-module-ecb \
303 kernel-module-arc4 \
304 kernel-module-crypto_algapi \
305 kernel-module-cryptomgr \
306 kernel-module-michael-mic \
307 kernel-module-aes-generic \
308 kernel-module-aes"
309
310RDEPENDS_task-base-3g = "\
311 ofono"
312
313RRECOMMENDS_task-base-3g = "\
314 kernel-module-cdc-acm \
315 kernel-module-cdc-wdm"
316
317RRECOMMENDS_task-base-smbfs = "\
318 kernel-module-cifs \
319 kernel-module-smbfs"
320
321RRECOMMENDS_task-base-cramfs = "\
322 kernel-module-cramfs"
323
324#
325# task-base-nfs provides ONLY client support - server is in nfs-utils package
326#
327RDEPENDS_task-base-nfs = "\
328 portmap"
329
330RRECOMMENDS_task-base-nfs = "\
331 kernel-module-nfs "
332
333RDEPENDS_task-base-zeroconf = "\
334 avahi-daemon"
335
336RDEPENDS_task-base-raid = "\
337 "
338
339RDEPENDS_task-base-screen = "\
340 "
341
342#
343# GPE/OPIE/OpenMoko provide own touchscreen calibration utils
344#
345RDEPENDS_task-base-touchscreen = "\
346 "
347
348RDEPENDS_task-base-ipv6 = "\
349 "
350
351RRECOMMENDS_task-base-ipv6 = "\
352 kernel-module-ipv6 "
353
354RDEPENDS_task-base-serial = "\
355 setserial \
356 lrzsz "
357
358RDEPENDS_task-base-phone = "\
359 ofono"
diff --git a/meta/recipes-core/tasks/task-core-ssh-dropbear.bb b/meta/recipes-core/tasks/task-core-ssh-dropbear.bb
deleted file mode 100644
index 1e7402e11f..0000000000
--- a/meta/recipes-core/tasks/task-core-ssh-dropbear.bb
+++ /dev/null
@@ -1,17 +0,0 @@
1DESCRIPTION = "Dropbear SSH task for Poky"
2LICENSE = "MIT"
3LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
4 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
5PR = "r0"
6
7PACKAGES = "\
8 task-core-ssh-dropbear \
9 task-core-ssh-dropbear-dbg \
10 task-core-ssh-dropbear-dev \
11 "
12
13ALLOW_EMPTY = "1"
14
15RDEPENDS_task-core-ssh-dropbear = "dropbear"
16RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg"
17RDEPENDS_task-core-ssh-dropbear-dev = "dropbear-dev"
diff --git a/meta/recipes-extended/images/core-image-basic.bb b/meta/recipes-extended/images/core-image-basic.bb
index f801346376..9aa880ec4f 100644
--- a/meta/recipes-extended/images/core-image-basic.bb
+++ b/meta/recipes-extended/images/core-image-basic.bb
@@ -4,8 +4,8 @@ reasonably used for customization."
4IMAGE_FEATURES += "apps-console-core ssh-server-openssh" 4IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
5 5
6IMAGE_INSTALL = "\ 6IMAGE_INSTALL = "\
7 task-core-boot \ 7 packagegroup-core-boot \
8 task-core-basic \ 8 packagegroup-core-basic \
9 " 9 "
10 10
11# ${CORE_IMAGE_BASE_INSTALL} 11# ${CORE_IMAGE_BASE_INSTALL}
diff --git a/meta/recipes-extended/images/core-image-lsb-dev.bb b/meta/recipes-extended/images/core-image-lsb-dev.bb
index 3bb78003af..557259b1b6 100644
--- a/meta/recipes-extended/images/core-image-lsb-dev.bb
+++ b/meta/recipes-extended/images/core-image-lsb-dev.bb
@@ -6,8 +6,8 @@ IMAGE_FEATURES += "apps-console-core dev-pkgs ssh-server-openssh"
6 6
7IMAGE_INSTALL = "\ 7IMAGE_INSTALL = "\
8 ${CORE_IMAGE_BASE_INSTALL} \ 8 ${CORE_IMAGE_BASE_INSTALL} \
9 task-core-basic \ 9 packagegroup-core-basic \
10 task-core-lsb \ 10 packagegroup-core-lsb \
11 " 11 "
12 12
13inherit core-image 13inherit core-image
diff --git a/meta/recipes-extended/images/core-image-lsb-sdk.bb b/meta/recipes-extended/images/core-image-lsb-sdk.bb
index 7601410828..d07f90d527 100644
--- a/meta/recipes-extended/images/core-image-lsb-sdk.bb
+++ b/meta/recipes-extended/images/core-image-lsb-sdk.bb
@@ -8,8 +8,8 @@ IMAGE_FEATURES += "apps-console-core tools-sdk dev-pkgs ssh-server-openssh \
8 8
9IMAGE_INSTALL = "\ 9IMAGE_INSTALL = "\
10 ${CORE_IMAGE_BASE_INSTALL} \ 10 ${CORE_IMAGE_BASE_INSTALL} \
11 task-core-basic \ 11 packagegroup-core-basic \
12 task-core-lsb \ 12 packagegroup-core-lsb \
13 kernel-dev \ 13 kernel-dev \
14 " 14 "
15 15
diff --git a/meta/recipes-extended/images/core-image-lsb.bb b/meta/recipes-extended/images/core-image-lsb.bb
index b370d49c58..8435596da1 100644
--- a/meta/recipes-extended/images/core-image-lsb.bb
+++ b/meta/recipes-extended/images/core-image-lsb.bb
@@ -6,8 +6,8 @@ IMAGE_FEATURES += "apps-console-core ssh-server-openssh"
6 6
7IMAGE_INSTALL = "\ 7IMAGE_INSTALL = "\
8 ${CORE_IMAGE_BASE_INSTALL} \ 8 ${CORE_IMAGE_BASE_INSTALL} \
9 task-core-basic \ 9 packagegroup-core-basic \
10 task-core-lsb \ 10 packagegroup-core-lsb \
11 " 11 "
12 12
13inherit core-image 13inherit core-image
diff --git a/meta/recipes-extended/libzypp/libzypp/config-release.patch b/meta/recipes-extended/libzypp/libzypp/config-release.patch
index b4e7ab02fb..26c7307deb 100644
--- a/meta/recipes-extended/libzypp/libzypp/config-release.patch
+++ b/meta/recipes-extended/libzypp/libzypp/config-release.patch
@@ -5,7 +5,7 @@ Configure distro version package
5We need to configure a package that the system can use to determine the 5We need to configure a package that the system can use to determine the
6system distribution version. 6system distribution version.
7 7
8Hack: for now set to task-core-rpm. 8Hack: for now set to packagegroup-core-rpm.
9 9
10Signed-off-by: Mark Hatle <mark.hatle@windriver.com> 10Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
11 11
@@ -17,7 +17,7 @@ diff -ur git.orig/zypp/ZConfig.cc git/zypp/ZConfig.cc
17 17
18 std::string ZConfig::distroverpkg() const 18 std::string ZConfig::distroverpkg() const
19- { return "redhat-release"; } 19- { return "redhat-release"; }
20+ { return "task-core-rpm"; } 20+ { return "packagegroup-core-rpm"; }
21 21
22 /////////////////////////////////////////////////////////////////// 22 ///////////////////////////////////////////////////////////////////
23 23
diff --git a/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
new file mode 100644
index 0000000000..a7e3eb75c5
--- /dev/null
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-basic.bb
@@ -0,0 +1,156 @@
1#
2# Copyright (C) 2010 Intel Corporation
3#
4
5DESCRIPTION = "Create Basic Image Tasks"
6PR = "r4"
7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10
11PACKAGES = "\
12 packagegroup-core-basic \
13 packagegroup-core-base-utils \
14 packagegroup-core-base-utils-dbg \
15 packagegroup-core-base-utils-dev \
16 packagegroup-core-basic-libs \
17 packagegroup-core-basic-libs-dbg \
18 packagegroup-core-basic-libs-dev \
19 packagegroup-core-basic-utils \
20 packagegroup-core-basic-utils-dbg \
21 packagegroup-core-basic-utils-dev \
22 packagegroup-core-basic-extended \
23 packagegroup-core-basic-extended-dbg \
24 packagegroup-core-basic-extended-dev \
25 packagegroup-core-dev-utils \
26 packagegroup-core-dev-utils-dbg \
27 packagegroup-core-dev-utils-dev \
28 packagegroup-core-multiuser \
29 packagegroup-core-multiuser-dbg \
30 packagegroup-core-multiuser-dev \
31 packagegroup-core-initscripts \
32 packagegroup-core-initscripts-dbg \
33 packagegroup-core-initscripts-dev \
34 packagegroup-core-rpm \
35 packagegroup-core-rpm-dbg \
36 packagegroup-core-rpm-dev \
37 packagegroup-core-sys-services \
38 packagegroup-core-sys-services-dbg \
39 packagegroup-core-sys-services-dev \
40 "
41
42ALLOW_EMPTY = "1"
43
44RDEPENDS_packagegroup-core-basic = "\
45 packagegroup-core-base-utils \
46 packagegroup-core-basic-libs \
47 packagegroup-core-basic-utils \
48 packagegroup-core-basic-extended \
49 packagegroup-core-dev-utils \
50 packagegroup-core-multiuser \
51 packagegroup-core-initscripts \
52 packagegroup-core-rpm \
53 packagegroup-core-sys-services \
54 "
55
56RDEPENDS_packagegroup-core-base-utils = "\
57 busybox \
58 "
59
60RDEPENDS_packagegroup-core-basic-libs = "\
61 glib-2.0 \
62 "
63
64RDEPENDS_packagegroup-core-basic-utils = "\
65 bash \
66 acl \
67 attr \
68 bc \
69 coreutils \
70 cpio \
71 e2fsprogs \
72 ed \
73 file \
74 findutils \
75 gawk \
76 gmp \
77 grep \
78 makedevs \
79 mc \
80 mktemp \
81 ncurses \
82 net-tools \
83 pax \
84 popt \
85 procps \
86 psmisc \
87 sed \
88 tar \
89 time \
90 udev \
91 util-linux \
92 zlib \
93 "
94
95RDEPENDS_packagegroup-core-basic-extended = "\
96 iproute2 \
97 iputils \
98 iptables \
99 module-init-tools \
100 openssl \
101 "
102
103RDEPENDS_packagegroup-core-dev-utils = "\
104 byacc \
105 diffutils \
106 m4 \
107 make \
108 patch \
109 "
110
111RDEPENDS_packagegroup-core-initscripts = "\
112 initscripts \
113 sysvinit \
114 ethtool \
115 mingetty \
116 sysklogd \
117 "
118
119RDEPENDS_packagegroup-core-multiuser = "\
120 cracklib \
121 gzip \
122 libuser \
123 libpam \
124 shadow \
125 sudo \
126 "
127
128RDEPENDS_packagegroup-core-rpm = "\
129 beecrypt \
130 rpm \
131 zypper \
132 "
133
134RDEPENDS_packagegroup-core-sys-services = "\
135 at \
136 bzip2 \
137 cronie \
138 dbus \
139 dbus-glib \
140 python-dbus \
141 elfutils \
142 gzip \
143 less \
144 libcap \
145 libevent \
146 lighttpd \
147 logrotate \
148 nfs-utils \
149 pciutils \
150 libpcre \
151 rpcbind \
152 sysfsutils \
153 tcp-wrappers \
154 tzdata \
155 "
156
diff --git a/meta/recipes-extended/tasks/task-core-lsb.bb b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
index be9eac2954..984ed36940 100644
--- a/meta/recipes-extended/tasks/task-core-lsb.bb
+++ b/meta/recipes-extended/packagegroups/packagegroup-core-lsb.bb
@@ -9,50 +9,50 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-lsb \ 12 packagegroup-core-lsb \
13 task-core-sys-extended \ 13 packagegroup-core-sys-extended \
14 task-core-sys-extended-dbg \ 14 packagegroup-core-sys-extended-dbg \
15 task-core-sys-extended-dev \ 15 packagegroup-core-sys-extended-dev \
16 task-core-db \ 16 packagegroup-core-db \
17 task-core-db-dbg \ 17 packagegroup-core-db-dbg \
18 task-core-db-dev \ 18 packagegroup-core-db-dev \
19 task-core-misc \ 19 packagegroup-core-misc \
20 task-core-misc-dbg \ 20 packagegroup-core-misc-dbg \
21 task-core-misc-dev \ 21 packagegroup-core-misc-dev \
22 task-core-perl \ 22 packagegroup-core-perl \
23 task-core-perl-dbg \ 23 packagegroup-core-perl-dbg \
24 task-core-perl-dev \ 24 packagegroup-core-perl-dev \
25 task-core-python \ 25 packagegroup-core-python \
26 task-core-python-dbg \ 26 packagegroup-core-python-dbg \
27 task-core-python-dev \ 27 packagegroup-core-python-dev \
28 task-core-tcl \ 28 packagegroup-core-tcl \
29 task-core-tcl-dbg \ 29 packagegroup-core-tcl-dbg \
30 task-core-tcl-dev \ 30 packagegroup-core-tcl-dev \
31 task-core-lsb-perl-add \ 31 packagegroup-core-lsb-perl-add \
32 task-core-lsb-python-add \ 32 packagegroup-core-lsb-python-add \
33 task-core-lsb-graphic-add \ 33 packagegroup-core-lsb-graphic-add \
34 task-core-lsb-runtime-add \ 34 packagegroup-core-lsb-runtime-add \
35 task-core-lsb-command-add \ 35 packagegroup-core-lsb-command-add \
36 " 36 "
37 37
38 38
39ALLOW_EMPTY = "1" 39ALLOW_EMPTY = "1"
40 40
41RDEPENDS_task-core-lsb = "\ 41RDEPENDS_packagegroup-core-lsb = "\
42 task-core-sys-extended \ 42 packagegroup-core-sys-extended \
43 task-core-db \ 43 packagegroup-core-db \
44 task-core-misc \ 44 packagegroup-core-misc \
45 task-core-perl \ 45 packagegroup-core-perl \
46 task-core-python \ 46 packagegroup-core-python \
47 task-core-tcl \ 47 packagegroup-core-tcl \
48 task-core-lsb-perl-add \ 48 packagegroup-core-lsb-perl-add \
49 task-core-lsb-python-add \ 49 packagegroup-core-lsb-python-add \
50 task-core-lsb-graphic-add \ 50 packagegroup-core-lsb-graphic-add \
51 task-core-lsb-runtime-add \ 51 packagegroup-core-lsb-runtime-add \
52 task-core-lsb-command-add \ 52 packagegroup-core-lsb-command-add \
53 " 53 "
54 54
55RDEPENDS_task-core-sys-extended = "\ 55RDEPENDS_packagegroup-core-sys-extended = "\
56 binutils \ 56 binutils \
57 binutils-symlinks \ 57 binutils-symlinks \
58 chkconfig \ 58 chkconfig \
@@ -83,19 +83,19 @@ RDEPENDS_task-core-sys-extended = "\
83 lsbinitscripts \ 83 lsbinitscripts \
84 " 84 "
85 85
86RDEPENDS_task-core-db = "\ 86RDEPENDS_packagegroup-core-db = "\
87 db \ 87 db \
88 sqlite3 \ 88 sqlite3 \
89 " 89 "
90 90
91RDEPENDS_task-core-perl = "\ 91RDEPENDS_packagegroup-core-perl = "\
92 gdbm \ 92 gdbm \
93 perl \ 93 perl \
94 zlib \ 94 zlib \
95 " 95 "
96 96
97 97
98RDEPENDS_task-core-python = "\ 98RDEPENDS_packagegroup-core-python = "\
99 expat \ 99 expat \
100 gdbm \ 100 gdbm \
101 gmp \ 101 gmp \
@@ -106,11 +106,11 @@ RDEPENDS_task-core-python = "\
106 zip \ 106 zip \
107 " 107 "
108 108
109RDEPENDS_task-core-tcl = "\ 109RDEPENDS_packagegroup-core-tcl = "\
110 tcl \ 110 tcl \
111 " 111 "
112 112
113RDEPENDS_task-core-misc = "\ 113RDEPENDS_packagegroup-core-misc = "\
114 elfutils \ 114 elfutils \
115 gettext \ 115 gettext \
116 gettext-runtime \ 116 gettext-runtime \
@@ -128,7 +128,7 @@ RDEPENDS_task-core-misc = "\
128 zlib \ 128 zlib \
129 " 129 "
130 130
131RDEPENDS_task-core-lsb-command-add = "\ 131RDEPENDS_packagegroup-core-lsb-command-add = "\
132 localedef \ 132 localedef \
133 fontconfig-utils \ 133 fontconfig-utils \
134 mailx \ 134 mailx \
@@ -140,18 +140,18 @@ RDEPENDS_task-core-lsb-command-add = "\
140 ghostscript \ 140 ghostscript \
141" 141"
142 142
143RDEPENDS_task-core-lsb-perl-add = "\ 143RDEPENDS_packagegroup-core-lsb-perl-add = "\
144 perl-modules \ 144 perl-modules \
145 perl-misc \ 145 perl-misc \
146 perl-pod \ 146 perl-pod \
147" 147"
148 148
149RDEPENDS_task-core-lsb-python-add = "\ 149RDEPENDS_packagegroup-core-lsb-python-add = "\
150 python-modules \ 150 python-modules \
151 python-misc \ 151 python-misc \
152" 152"
153 153
154RDEPENDS_task-core-lsb-graphic-add = "\ 154RDEPENDS_packagegroup-core-lsb-graphic-add = "\
155 libqtcore4 \ 155 libqtcore4 \
156 libqtgui4 \ 156 libqtgui4 \
157 libqtsql4 \ 157 libqtsql4 \
@@ -178,7 +178,7 @@ RDEPENDS_task-core-lsb-graphic-add = "\
178 ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \ 178 ${@base_contains("DISTRO_FEATURES", "opengl", "libqtopengl4", "", d)} \
179" 179"
180 180
181RDEPENDS_task-core-lsb-runtime-add = "\ 181RDEPENDS_packagegroup-core-lsb-runtime-add = "\
182 ldd \ 182 ldd \
183 pam-plugin-wheel \ 183 pam-plugin-wheel \
184 e2fsprogs-mke2fs \ 184 e2fsprogs-mke2fs \
diff --git a/meta/recipes-extended/tasks/task-core-basic.bb b/meta/recipes-extended/tasks/task-core-basic.bb
deleted file mode 100644
index a810d3785b..0000000000
--- a/meta/recipes-extended/tasks/task-core-basic.bb
+++ /dev/null
@@ -1,156 +0,0 @@
1#
2# Copyright (C) 2010 Intel Corporation
3#
4
5DESCRIPTION = "Create Basic Image Tasks"
6PR = "r4"
7LICENSE = "MIT"
8LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
9 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
10
11PACKAGES = "\
12 task-core-basic \
13 task-core-base-utils \
14 task-core-base-utils-dbg \
15 task-core-base-utils-dev \
16 task-core-basic-libs \
17 task-core-basic-libs-dbg \
18 task-core-basic-libs-dev \
19 task-core-basic-utils \
20 task-core-basic-utils-dbg \
21 task-core-basic-utils-dev \
22 task-core-basic-extended \
23 task-core-basic-extended-dbg \
24 task-core-basic-extended-dev \
25 task-core-dev-utils \
26 task-core-dev-utils-dbg \
27 task-core-dev-utils-dev \
28 task-core-multiuser \
29 task-core-multiuser-dbg \
30 task-core-multiuser-dev \
31 task-core-initscripts \
32 task-core-initscripts-dbg \
33 task-core-initscripts-dev \
34 task-core-rpm \
35 task-core-rpm-dbg \
36 task-core-rpm-dev \
37 task-core-sys-services \
38 task-core-sys-services-dbg \
39 task-core-sys-services-dev \
40 "
41
42ALLOW_EMPTY = "1"
43
44RDEPENDS_task-core-basic = "\
45 task-core-base-utils \
46 task-core-basic-libs \
47 task-core-basic-utils \
48 task-core-basic-extended \
49 task-core-dev-utils \
50 task-core-multiuser \
51 task-core-initscripts \
52 task-core-rpm \
53 task-core-sys-services \
54 "
55
56RDEPENDS_task-core-base-utils = "\
57 busybox \
58 "
59
60RDEPENDS_task-core-basic-libs = "\
61 glib-2.0 \
62 "
63
64RDEPENDS_task-core-basic-utils = "\
65 bash \
66 acl \
67 attr \
68 bc \
69 coreutils \
70 cpio \
71 e2fsprogs \
72 ed \
73 file \
74 findutils \
75 gawk \
76 gmp \
77 grep \
78 makedevs \
79 mc \
80 mktemp \
81 ncurses \
82 net-tools \
83 pax \
84 popt \
85 procps \
86 psmisc \
87 sed \
88 tar \
89 time \
90 udev \
91 util-linux \
92 zlib \
93 "
94
95RDEPENDS_task-core-basic-extended = "\
96 iproute2 \
97 iputils \
98 iptables \
99 module-init-tools \
100 openssl \
101 "
102
103RDEPENDS_task-core-dev-utils = "\
104 byacc \
105 diffutils \
106 m4 \
107 make \
108 patch \
109 "
110
111RDEPENDS_task-core-initscripts = "\
112 initscripts \
113 sysvinit \
114 ethtool \
115 mingetty \
116 sysklogd \
117 "
118
119RDEPENDS_task-core-multiuser = "\
120 cracklib \
121 gzip \
122 libuser \
123 libpam \
124 shadow \
125 sudo \
126 "
127
128RDEPENDS_task-core-rpm = "\
129 beecrypt \
130 rpm \
131 zypper \
132 "
133
134RDEPENDS_task-core-sys-services = "\
135 at \
136 bzip2 \
137 cronie \
138 dbus \
139 dbus-glib \
140 python-dbus \
141 elfutils \
142 gzip \
143 less \
144 libcap \
145 libevent \
146 lighttpd \
147 logrotate \
148 nfs-utils \
149 pciutils \
150 libpcre \
151 rpcbind \
152 sysfsutils \
153 tcp-wrappers \
154 tzdata \
155 "
156
diff --git a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
index 29a4f56898..a00ca36901 100644
--- a/meta/recipes-gnome/tasks/task-core-sdk-gmae.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-sdk-gmae.bb
@@ -10,12 +10,12 @@ PR = "r12"
10 10
11ALLOW_EMPTY = "1" 11ALLOW_EMPTY = "1"
12 12
13require task-sdk-gmae.inc 13require packagegroup-sdk-gmae.inc
14 14
15PACKAGES = "${PN}" 15PACKAGES = "${PN}"
16 16
17RDEPENDS_${PN} = "\ 17RDEPENDS_${PN} = "\
18 task-core-sdk \ 18 packagegroup-core-sdk \
19 libglade-dev \ 19 libglade-dev \
20 ${SDK-GMAE} \ 20 ${SDK-GMAE} \
21 ${SDK-EXTRAS}" 21 ${SDK-EXTRAS}"
diff --git a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
index 45b502fe62..3b2abddcdc 100644
--- a/meta/recipes-gnome/tasks/task-core-standalone-gmae-sdk-target.bb
+++ b/meta/recipes-gnome/packagegroups/packagegroup-core-standalone-gmae-sdk-target.bb
@@ -10,12 +10,12 @@ PR = "r14"
10 10
11ALLOW_EMPTY = "1" 11ALLOW_EMPTY = "1"
12 12
13require task-sdk-gmae.inc 13require packagegroup-sdk-gmae.inc
14 14
15PACKAGES = "${PN} ${PN}-dbg" 15PACKAGES = "${PN} ${PN}-dbg"
16 16
17RDEPENDS_${PN} = "\ 17RDEPENDS_${PN} = "\
18 task-core-standalone-sdk-target \ 18 packagegroup-core-standalone-sdk-target \
19 libglade-dev \ 19 libglade-dev \
20 ${SDK-GMAE} \ 20 ${SDK-GMAE} \
21 ${SDK-EXTRAS}" 21 ${SDK-EXTRAS}"
diff --git a/meta/recipes-gnome/tasks/task-sdk-gmae.inc b/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc
index f9e373d40a..f9e373d40a 100644
--- a/meta/recipes-gnome/tasks/task-sdk-gmae.inc
+++ b/meta/recipes-gnome/packagegroups/packagegroup-sdk-gmae.inc
diff --git a/meta/recipes-graphics/images/core-image-clutter.bb b/meta/recipes-graphics/images/core-image-clutter.bb
index aa6e2a2bdd..4c5adee48e 100644
--- a/meta/recipes-graphics/images/core-image-clutter.bb
+++ b/meta/recipes-graphics/images/core-image-clutter.bb
@@ -7,8 +7,8 @@ LICENSE = "MIT"
7 7
8IMAGE_INSTALL = "\ 8IMAGE_INSTALL = "\
9 ${CORE_IMAGE_BASE_INSTALL} \ 9 ${CORE_IMAGE_BASE_INSTALL} \
10 task-core-clutter-core \ 10 packagegroup-core-clutter-core \
11 task-core-clutter-tests \ 11 packagegroup-core-clutter-tests \
12 task-core-clutter-apps" 12 packagegroup-core-clutter-apps"
13 13
14inherit core-image 14inherit core-image
diff --git a/meta/recipes-graphics/images/core-image-gtk-directfb.bb b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
index dcf5165b2e..868b3097f2 100644
--- a/meta/recipes-graphics/images/core-image-gtk-directfb.bb
+++ b/meta/recipes-graphics/images/core-image-gtk-directfb.bb
@@ -6,18 +6,18 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8 8
9DEPENDS += "task-core-gtk-directfb" 9DEPENDS += "packagegroup-core-gtk-directfb"
10 10
11RDEPENDS_${PN} += " \ 11RDEPENDS_${PN} += " \
12 task-core-gtk-directfb-base \ 12 packagegroup-core-gtk-directfb-base \
13 " 13 "
14 14
15inherit core-image 15inherit core-image
16 16
17IMAGE_INSTALL += "\ 17IMAGE_INSTALL += "\
18 ${CORE_IMAGE_BASE_INSTALL} \ 18 ${CORE_IMAGE_BASE_INSTALL} \
19 task-core-basic \ 19 packagegroup-core-basic \
20 task-core-gtk-directfb-base \ 20 packagegroup-core-gtk-directfb-base \
21" 21"
22 22
23python __anonymous () { 23python __anonymous () {
diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
new file mode 100644
index 0000000000..039f5c6914
--- /dev/null
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb
@@ -0,0 +1,37 @@
1#
2# Copyright (C) 2007 OpenedHand Ltd.
3#
4
5DESCRIPTION = "Clutter Tasks for OpenedHand Poky"
6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9
10PR = "r4"
11
12PACKAGES = "\
13 packagegroup-core-clutter-core \
14 packagegroup-core-clutter-core-dbg \
15 packagegroup-core-clutter-core-dev \
16 packagegroup-core-clutter-apps \
17 packagegroup-core-clutter-apps-dbg \
18 packagegroup-core-clutter-apps-dev \
19 packagegroup-core-clutter-tests \
20 packagegroup-core-clutter-tests-dbg \
21 packagegroup-core-clutter-tests-dev \
22 "
23
24ALLOW_EMPTY = "1"
25
26RDEPENDS_packagegroup-core-clutter-core = "\
27 clutter-1.8 \
28 clutter-gst-1.8 \
29 clutter-gtk-1.8 \
30 "
31
32#RDEPENDS_packagegroup-core-clutter-tests = "\
33# clutter-gst-1.8-examples \
34# clutter-gtk-1.8-examples"
35
36#RDEPENDS_packagegroup-core-clutter-apps = "\
37# clutter-box2d "
diff --git a/meta/recipes-graphics/tasks/task-core-gtk-directfb.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
index 239e0c1984..8609013e9e 100644
--- a/meta/recipes-graphics/tasks/task-core-gtk-directfb.bb
+++ b/meta/recipes-graphics/packagegroups/packagegroup-core-gtk-directfb.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8inherit task 8inherit packagegroup
9 9
10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
11 11
diff --git a/meta/recipes-graphics/tasks/task-core-clutter.bb b/meta/recipes-graphics/tasks/task-core-clutter.bb
deleted file mode 100644
index 4044131cc2..0000000000
--- a/meta/recipes-graphics/tasks/task-core-clutter.bb
+++ /dev/null
@@ -1,37 +0,0 @@
1#
2# Copyright (C) 2007 OpenedHand Ltd.
3#
4
5DESCRIPTION = "Clutter Tasks for OpenedHand Poky"
6LICENSE = "MIT"
7LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9
10PR = "r4"
11
12PACKAGES = "\
13 task-core-clutter-core \
14 task-core-clutter-core-dbg \
15 task-core-clutter-core-dev \
16 task-core-clutter-apps \
17 task-core-clutter-apps-dbg \
18 task-core-clutter-apps-dev \
19 task-core-clutter-tests \
20 task-core-clutter-tests-dbg \
21 task-core-clutter-tests-dev \
22 "
23
24ALLOW_EMPTY = "1"
25
26RDEPENDS_task-core-clutter-core = "\
27 clutter-1.8 \
28 clutter-gst-1.8 \
29 clutter-gtk-1.8 \
30 "
31
32#RDEPENDS_task-core-clutter-tests = "\
33# clutter-gst-1.8-examples \
34# clutter-gtk-1.8-examples"
35
36#RDEPENDS_task-core-clutter-apps = "\
37# clutter-box2d "
diff --git a/meta/recipes-qt/images/qt4e-demo-image.bb b/meta/recipes-qt/images/qt4e-demo-image.bb
index 8f9478d961..205c912168 100644
--- a/meta/recipes-qt/images/qt4e-demo-image.bb
+++ b/meta/recipes-qt/images/qt4e-demo-image.bb
@@ -5,15 +5,15 @@ PR="r2"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8DEPENDS += "task-qt4e" 8DEPENDS += "packagegroup-qt4e"
9 9
10RDEPENDS_${PN} += " \ 10RDEPENDS_${PN} += " \
11 task-qt4e-base \ 11 packagegroup-qt4e-base \
12 " 12 "
13 13
14IMAGE_INSTALL += "\ 14IMAGE_INSTALL += "\
15 ${CORE_IMAGE_BASE_INSTALL} \ 15 ${CORE_IMAGE_BASE_INSTALL} \
16 task-qt4e-base \ 16 packagegroup-qt4e-base \
17" 17"
18 18
19inherit core-image 19inherit core-image
diff --git a/meta/recipes-qt/meta/meta-toolchain-qte.bb b/meta/recipes-qt/meta/meta-toolchain-qte.bb
index 116db914a1..20dd354e17 100644
--- a/meta/recipes-qt/meta/meta-toolchain-qte.bb
+++ b/meta/recipes-qt/meta/meta-toolchain-qte.bb
@@ -1,7 +1,7 @@
1# Qt Embedded toolchain 1# Qt Embedded toolchain
2PR = "r5" 2PR = "r5"
3TOOLCHAIN_HOST_TASK = "nativesdk-task-qte-toolchain-host task-cross-canadian-${TRANSLATED_TARGET_ARCH}" 3TOOLCHAIN_HOST_TASK = "nativesdk-packagegroup-qte-toolchain-host packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}"
4TOOLCHAIN_TARGET_TASK = "task-qte-toolchain-target" 4TOOLCHAIN_TARGET_TASK = "packagegroup-qte-toolchain-target"
5TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}" 5TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-qte-${DISTRO_VERSION}"
6 6
7require recipes-core/meta/meta-toolchain.bb 7require recipes-core/meta/meta-toolchain.bb
diff --git a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
index 5098d11388..1c53a9ce2a 100644
--- a/meta/recipes-qt/tasks/nativesdk-task-qte-toolchain-host.bb
+++ b/meta/recipes-qt/packagegroups/nativesdk-packagegroup-qte-toolchain-host.bb
@@ -1,4 +1,4 @@
1require recipes-core/tasks/nativesdk-task-sdk-host.bb 1require recipes-core/packagegroups/nativesdk-packagegroup-sdk-host.bb
2 2
3DESCRIPTION = "Host packages for Qt Embedded SDK" 3DESCRIPTION = "Host packages for Qt Embedded SDK"
4LICENSE = "MIT" 4LICENSE = "MIT"
diff --git a/meta/recipes-qt/tasks/task-core-qt.bb b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
index 69512a4b9f..4fe07c654e 100644
--- a/meta/recipes-qt/tasks/task-core-qt.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-core-qt.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r3" 9PR = "r3"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-qt-demos \ 12 packagegroup-core-qt-demos \
13 task-core-qt-demos-dbg \ 13 packagegroup-core-qt-demos-dbg \
14 task-core-qt-demos-dev \ 14 packagegroup-core-qt-demos-dev \
15 " 15 "
16 16
17ALLOW_EMPTY = "1" 17ALLOW_EMPTY = "1"
@@ -19,4 +19,4 @@ ALLOW_EMPTY = "1"
19QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall" 19QTDEMOS ?= "quicky ${COMMERCIAL_QT} fotowall"
20#QTDEMOS_disabled = "fotowall" 20#QTDEMOS_disabled = "fotowall"
21 21
22RDEPENDS_task-core-qt-demos = "${QTDEMOS}" 22RDEPENDS_packagegroup-core-qt-demos = "${QTDEMOS}"
diff --git a/meta/recipes-qt/tasks/task-qt4e.bb b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
index c95c898538..4b6d6a70c1 100644
--- a/meta/recipes-qt/tasks/task-qt4e.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qt4e.bb
@@ -5,7 +5,7 @@ LICENSE = "MIT"
5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ 5LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 6 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
7 7
8inherit task 8inherit packagegroup
9 9
10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' 10TOUCH = ' ${@base_contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}'
11 11
diff --git a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
index 7ee575f2eb..abd6a1fcbe 100644
--- a/meta/recipes-qt/tasks/task-qte-toolchain-target.bb
+++ b/meta/recipes-qt/packagegroups/packagegroup-qte-toolchain-target.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" 8 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
9 9
10RDEPENDS_${PN} += " \ 10RDEPENDS_${PN} += " \
11 task-core-standalone-sdk-target \ 11 packagegroup-core-standalone-sdk-target \
12 qt4-embedded-mkspecs \ 12 qt4-embedded-mkspecs \
13 libqt-embeddedmultimedia4-dev \ 13 libqt-embeddedmultimedia4-dev \
14 libqt-embeddedphonon4-dev \ 14 libqt-embeddedphonon4-dev \
diff --git a/meta/recipes-sato/tasks/task-core-x11-mini.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
index 0aed286e5e..4f3bb47000 100644
--- a/meta/recipes-sato/tasks/task-core-x11-mini.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-mini.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r1" 9PR = "r1"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-x11-mini \ 12 packagegroup-core-x11-mini \
13 task-core-x11-mini-dbg \ 13 packagegroup-core-x11-mini-dbg \
14 task-core-x11-mini-dev \ 14 packagegroup-core-x11-mini-dev \
15 " 15 "
16 16
17PACKAGE_ARCH = "${MACHINE_ARCH}" 17PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -29,7 +29,7 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
29VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" 29VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
30 30
31 31
32RDEPENDS_task-core-x11-mini = "\ 32RDEPENDS_packagegroup-core-x11-mini = "\
33 dbus \ 33 dbus \
34 pointercal \ 34 pointercal \
35 matchbox-terminal \ 35 matchbox-terminal \
diff --git a/meta/recipes-sato/tasks/task-core-x11-sato.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
index cf294b302c..380584e223 100644
--- a/meta/recipes-sato/tasks/task-core-x11-sato.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11-sato.bb
@@ -9,9 +9,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r32" 9PR = "r32"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-x11-sato \ 12 packagegroup-core-x11-sato \
13 task-core-x11-sato-dbg \ 13 packagegroup-core-x11-sato-dbg \
14 task-core-x11-sato-dev \ 14 packagegroup-core-x11-sato-dev \
15 " 15 "
16 16
17PACKAGE_ARCH = "${MACHINE_ARCH}" 17PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -24,7 +24,7 @@ NETWORK_MANAGER_libc-uclibc = ""
24WEB ?= "" 24WEB ?= ""
25#WEB = "web-webkit" 25#WEB = "web-webkit"
26 26
27RDEPENDS_task-core-x11-sato = "\ 27RDEPENDS_packagegroup-core-x11-sato = "\
28 matchbox-desktop \ 28 matchbox-desktop \
29 matchbox-session-sato \ 29 matchbox-session-sato \
30 matchbox-keyboard \ 30 matchbox-keyboard \
diff --git a/meta/recipes-sato/tasks/task-core-x11.bb b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
index 764ea026de..4c16c461a3 100644
--- a/meta/recipes-sato/tasks/task-core-x11.bb
+++ b/meta/recipes-sato/packagegroups/packagegroup-core-x11.bb
@@ -9,15 +9,15 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3
9PR = "r36" 9PR = "r36"
10 10
11PACKAGES = "\ 11PACKAGES = "\
12 task-core-apps-x11-core \ 12 packagegroup-core-apps-x11-core \
13 task-core-apps-x11-core-dbg \ 13 packagegroup-core-apps-x11-core-dbg \
14 task-core-apps-x11-core-dev \ 14 packagegroup-core-apps-x11-core-dev \
15 task-core-apps-x11-games \ 15 packagegroup-core-apps-x11-games \
16 task-core-apps-x11-games-dbg \ 16 packagegroup-core-apps-x11-games-dbg \
17 task-core-apps-x11-games-dev \ 17 packagegroup-core-apps-x11-games-dev \
18 task-core-x11-base \ 18 packagegroup-core-x11-base \
19 task-core-x11-base-dbg \ 19 packagegroup-core-x11-base-dbg \
20 task-core-x11-base-dev \ 20 packagegroup-core-x11-base-dev \
21 " 21 "
22 22
23PACKAGE_ARCH = "${MACHINE_ARCH}" 23PACKAGE_ARCH = "${MACHINE_ARCH}"
@@ -37,7 +37,7 @@ VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
37VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init" 37VIRTUAL-RUNTIME_graphical_init_manager ?= "xserver-nodm-init"
38 38
39 39
40RDEPENDS_task-core-x11-base = "\ 40RDEPENDS_packagegroup-core-x11-base = "\
41 dbus \ 41 dbus \
42 pointercal \ 42 pointercal \
43 matchbox-wm \ 43 matchbox-wm \
@@ -57,12 +57,12 @@ RDEPENDS_task-core-x11-base = "\
57 xrandr" 57 xrandr"
58 58
59 59
60RDEPENDS_task-core-apps-x11-core = "\ 60RDEPENDS_packagegroup-core-apps-x11-core = "\
61 leafpad \ 61 leafpad \
62 ${FILEMANAGER} \ 62 ${FILEMANAGER} \
63 matchbox-terminal \ 63 matchbox-terminal \
64 sato-screenshot" 64 sato-screenshot"
65 65
66 66
67RDEPENDS_task-core-apps-x11-games = "\ 67RDEPENDS_packagegroup-core-apps-x11-games = "\
68 oh-puzzles" 68 oh-puzzles"
diff --git a/scripts/contrib/documentation-audit.sh b/scripts/contrib/documentation-audit.sh
index 5b66f0367f..a2c45865aa 100755
--- a/scripts/contrib/documentation-audit.sh
+++ b/scripts/contrib/documentation-audit.sh
@@ -42,7 +42,7 @@ for pkg in `bitbake -s | awk '{ print \$1 }'`; do
42 # Skip native/nativesdk/cross-canadian recipes 42 # Skip native/nativesdk/cross-canadian recipes
43 continue 43 continue
44 fi 44 fi
45 if [[ "$pkg" =~ ^meta- || "$pkg" =~ ^task- || "$pkg" =~ -image ]]; then 45 if [[ "$pkg" =~ ^meta- || "$pkg" =~ ^packagegroup- || "$pkg" =~ -image ]]; then
46 # Skip meta, task and image recipes 46 # Skip meta, task and image recipes
47 continue 47 continue
48 fi 48 fi
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-04-27 16:27:18 +0000