diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2012-08-29 11:38:34 +0100 |
---|---|---|
committer | Saul Wold <sgw@linux.intel.com> | 2012-09-03 22:52:50 -0700 |
commit | 424dcf7046e4ad09dcc664eb1992201195247fcf (patch) | |
tree | 26640470c5c7865aec06711fae7009304dc8fea0 /meta/recipes-core | |
parent | ecd818f1a7a46aa0eeffe48445f2cf0db5aab67a (diff) | |
download | openembedded-core-424dcf7046e4ad09dcc664eb1992201195247fcf.tar.gz openembedded-core-424dcf7046e4ad09dcc664eb1992201195247fcf.tar.bz2 openembedded-core-424dcf7046e4ad09dcc664eb1992201195247fcf.zip |
Rename task to packagegroup
"Package group" is a much more appropriate name for these than task,
since we use the word task to describe units of work executed by
BitBake.
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Diffstat (limited to 'meta/recipes-core')
19 files changed, 426 insertions, 426 deletions
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 @@ DESCRIPTION = "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>." -IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted" +IMAGE_INSTALL = "packagegroup-core-boot packagegroup-core-apps-console packagegroup-core-ssh-openssh packagegroup-self-hosted" LICENSE = "MIT" LIC_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 @@ DESCRIPTION = "A small image just capable of allowing a device to boot." -IMAGE_INSTALL = "task-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" +IMAGE_INSTALL = "packagegroup-core-boot ${ROOTFS_PKGMANAGE_BOOTSTRAP} ${CORE_IMAGE_EXTRA_INSTALL}" IMAGE_LINGUAS = " " 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 @@ -TOOLCHAIN_TARGET_GMAETASK ?= "task-core-standalone-gmae-sdk-target task-core-standalone-gmae-sdk-target-dbg" +TOOLCHAIN_TARGET_GMAETASK ?= "packagegroup-core-standalone-gmae-sdk-target packagegroup-core-standalone-gmae-sdk-target-dbg" TOOLCHAIN_TARGET_TASK = "${TOOLCHAIN_TARGET_GMAETASK}" TOOLCHAIN_OUTPUTNAME = "${SDK_NAME}-toolchain-gmae-${DISTRO_VERSION}" PROVIDES = "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 @@ +DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r75" + +inherit packagegroup + +PROVIDES = "${PACKAGES}" +PACKAGES = ' \ + packagegroup-base \ + packagegroup-base-extended \ + packagegroup-distro-base \ + packagegroup-machine-base \ + \ + ${@base_contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "irda", "packagegroup-base-irda", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "pci", "packagegroup-base-pci", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "pcmcia", "packagegroup-base-pcmcia", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "phone", "packagegroup-base-phone", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "screen", "packagegroup-base-screen", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "serial", "packagegroup-base-serial", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "touchscreen", "packagegroup-base-touchscreen", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "usbgadget", "packagegroup-base-usbgadget", "", d)} \ + ${@base_contains("MACHINE_FEATURES", "usbhost", "packagegroup-base-usbhost", "", d)} \ + \ + ${@base_contains("MACHINE_FEATURES", "uboot", "packagegroup-base-uboot", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "redboot", "packagegroup-base-redboot", "",d)} \ + ${@base_contains("MACHINE_FEATURES", "apex", "packagegroup-base-apex", "",d)} \ + \ + ${@base_contains("DISTRO_FEATURES", "bluetooth", "packagegroup-base-bluetooth", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "wifi", "packagegroup-base-wifi", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "3g", "packagegroup-base-3g", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "cramfs", "packagegroup-base-cramfs", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "ipsec", "packagegroup-base-ipsec", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "ipv6", "packagegroup-base-ipv6", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "nfs", "packagegroup-base-nfs", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "ppp", "packagegroup-base-ppp", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "smbfs", "packagegroup-base-smbfs", "", d)} \ + ${@base_contains("DISTRO_FEATURES", "raid", "packagegroup-base-raid", "",d)} \ + ${@base_contains("DISTRO_FEATURES", "zeroconf", "packagegroup-base-zeroconf", "", d)} \ + \ + ' + +ALLOW_EMPTY = "1" + +# +# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH +# +PACKAGE_ARCH = "${MACHINE_ARCH}" + +# +# those ones can be set in machine config to supply packages needed to get machine booting +# +MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" +MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" + +# +# packagegroup-base contain stuff needed for base system (machine related) +# +RDEPENDS_packagegroup-base = "\ + packagegroup-distro-base \ + packagegroup-machine-base \ + \ + sysfsutils \ + module-init-tools \ + ${@base_contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \ + ${@base_contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \ + ${@base_contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \ + ${@base_contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \ + \ + ${@base_contains('COMBINED_FEATURES', 'alsa', 'packagegroup-base-alsa', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'ext2', 'packagegroup-base-ext2', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'vfat', 'packagegroup-base-vfat', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'irda', 'packagegroup-base-irda', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pci', 'packagegroup-base-pci', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'packagegroup-base-pcmcia', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'packagegroup-base-usbgadget', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'packagegroup-base-usbhost', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'packagegroup-base-bluetooth', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'wifi', 'packagegroup-base-wifi', '',d)} \ + ${@base_contains('COMBINED_FEATURES', '3g', 'packagegroup-base-3g', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'uboot', 'packagegroup-base-uboot', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'redboot', 'packagegroup-base-redboot', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'apex', 'packagegroup-base-apex', '',d)} \ + \ + ${@base_contains('DISTRO_FEATURES', 'nfs', 'packagegroup-base-nfs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'cramfs', 'packagegroup-base-cramfs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'smbfs', 'packagegroup-base-smbfs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'ipv6', 'packagegroup-base-ipv6', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'ipsec', 'packagegroup-base-ipsec', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'ppp', 'packagegroup-base-ppp', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'raid', 'packagegroup-base-raid', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'packagegroup-base-zeroconf', '',d)} \ + " + + +RRECOMMENDS_packagegroup-base = "\ + kernel-module-nls-utf8 \ + kernel-module-input \ + kernel-module-uinput \ + kernel-module-rtc-dev \ + kernel-module-rtc-proc \ + kernel-module-rtc-sysfs \ + kernel-module-unix" + +RDEPENDS_packagegroup-base-extended = "\ + packagegroup-base \ + ${ADD_WIFI} \ + ${ADD_BT} \ + ${ADD_3G} \ + " + +ADD_WIFI = "" +ADD_BT = "" +ADD_3G = "" + +python __anonymous () { + # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) + # then include packagegroup-base-wifi in packagegroup-base + + distro_features = set(d.getVar("DISTRO_FEATURES", True).split()) + machine_features= set(d.getVar("MACHINE_FEATURES", True).split()) + + 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): + d.setVar("ADD_BT", "packagegroup-base-bluetooth") + + 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): + d.setVar("ADD_WIFI", "packagegroup-base-wifi") + + 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): + d.setVar("ADD_3G", "packagegroup-base-3g") +} + +# +# packages added by distribution +# +DEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_DEPENDS}" +RDEPENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RDEPENDS}" +RRECOMMENDS_packagegroup-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" + +# +# packages added by machine config +# +RDEPENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RDEPENDS}" +RRECOMMENDS_packagegroup-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" + +RDEPENDS_packagegroup-base-keyboard = "\ + keymaps" + +RDEPENDS_packagegroup-base-pci = "\ + pciutils" + +RDEPENDS_packagegroup-base-acpi = "\ + acpid \ + libacpi " + +RDEPENDS_packagegroup-base-apm = "\ + ${VIRTUAL-RUNTIME_apm} \ + apmd" + +RDEPENDS_packagegroup-base-ext2 = "\ + hdparm \ + e2fsprogs \ + e2fsprogs-e2fsck \ + e2fsprogs-mke2fs" + +RRECOMMENDS_packagegroup-base-vfat = "\ + kernel-module-msdos \ + kernel-module-vfat \ + kernel-module-nls-iso8859-1 \ + kernel-module-nls-cp437" + +RDEPENDS_packagegroup-base-alsa = "\ + alsa-utils-alsactl \ + alsa-utils-alsamixer \ + ${VIRTUAL-RUNTIME_alsa-state}" + +RRECOMMENDS_packagegroup-base-alsa = "\ + kernel-module-snd-mixer-oss \ + kernel-module-snd-pcm-oss" + +RDEPENDS_packagegroup-base-pcmcia = "\ + pcmciautils \ + " +#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)} +#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} + + +RRECOMMENDS_packagegroup-base-pcmcia = "\ + kernel-module-pcmcia \ + kernel-module-airo-cs \ + kernel-module-pcnet-cs \ + kernel-module-serial-cs \ + kernel-module-ide-cs \ + kernel-module-ide-disk \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ + ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" + +# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! + +RDEPENDS_packagegroup-base-bluetooth = "\ + bluez4 \ + ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ + " + +RRECOMMENDS_packagegroup-base-bluetooth = "\ + kernel-module-bluetooth \ + kernel-module-l2cap \ + kernel-module-rfcomm \ + kernel-module-hci-vhci \ + kernel-module-bnep \ + kernel-module-hidp \ + kernel-module-hci-uart \ + kernel-module-sco \ + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ + " + +RDEPENDS_packagegroup-base-irda = "\ + irda-utils" + +RRECOMMENDS_packagegroup-base-irda = "\ + kernel-module-pxaficp-ir \ + kernel-module-irda \ + kernel-module-ircomm \ + kernel-module-ircomm-tty \ + kernel-module-irlan \ + ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ + kernel-module-irport \ + kernel-module-irtty \ + kernel-module-irtty-sir \ + kernel-module-sir-dev \ + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " + +RRECOMMENDS_packagegroup-base-usbgadget = "\ + kernel-module-pxa27x_udc \ + kernel-module-gadgetfs \ + kernel-module-g-file-storage \ + kernel-module-g-serial \ + kernel-module-g-ether" + +RDEPENDS_packagegroup-base-usbhost = "\ + usbutils " + +RRECOMMENDS_packagegroup-base-usbhost = "\ + kernel-module-uhci-hcd \ + kernel-module-ohci-hcd \ + kernel-module-ehci-hcd \ + kernel-module-usbcore \ + kernel-module-usbhid \ + kernel-module-usbnet \ + kernel-module-sd-mod \ + kernel-module-scsi-mod \ + kernel-module-usbmouse \ + kernel-module-mousedev \ + kernel-module-usbserial \ + kernel-module-usb-storage " + +RDEPENDS_packagegroup-base-ppp = "\ + ppp \ + ppp-dialin" + +RRECOMMENDS_packagegroup-base-ppp = "\ + kernel-module-ppp-async \ + kernel-module-ppp-deflate \ + kernel-module-ppp-generic \ + kernel-module-ppp-mppe \ + kernel-module-slhc" + +RDEPENDS_packagegroup-base-ipsec = "\ + openswan" + +RRECOMMENDS_packagegroup-base-ipsec = "\ + kernel-module-ipsec" + +# +# packagegroup-base-wifi contain everything needed to get WiFi working +# WEP/WPA connection needs to be supported out-of-box +# +RDEPENDS_packagegroup-base-wifi = "\ + wireless-tools \ + ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ + ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ + wpa-supplicant" + +RRECOMMENDS_packagegroup-base-wifi = "\ + ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ + kernel-module-ieee80211-crypt \ + kernel-module-ieee80211-crypt-ccmp \ + kernel-module-ieee80211-crypt-tkip \ + kernel-module-ieee80211-crypt-wep \ + kernel-module-ecb \ + kernel-module-arc4 \ + kernel-module-crypto_algapi \ + kernel-module-cryptomgr \ + kernel-module-michael-mic \ + kernel-module-aes-generic \ + kernel-module-aes" + +RDEPENDS_packagegroup-base-3g = "\ + ofono" + +RRECOMMENDS_packagegroup-base-3g = "\ + kernel-module-cdc-acm \ + kernel-module-cdc-wdm" + +RRECOMMENDS_packagegroup-base-smbfs = "\ + kernel-module-cifs \ + kernel-module-smbfs" + +RRECOMMENDS_packagegroup-base-cramfs = "\ + kernel-module-cramfs" + +# +# packagegroup-base-nfs provides ONLY client support - server is in nfs-utils package +# +RDEPENDS_packagegroup-base-nfs = "\ + portmap" + +RRECOMMENDS_packagegroup-base-nfs = "\ + kernel-module-nfs " + +RDEPENDS_packagegroup-base-zeroconf = "\ + avahi-daemon" + +RDEPENDS_packagegroup-base-raid = "\ + " + +RDEPENDS_packagegroup-base-screen = "\ + " + +# +# GPE/OPIE/OpenMoko provide own touchscreen calibration utils +# +RDEPENDS_packagegroup-base-touchscreen = "\ + " + +RDEPENDS_packagegroup-base-ipv6 = "\ + " + +RRECOMMENDS_packagegroup-base-ipv6 = "\ + kernel-module-ipv6 " + +RDEPENDS_packagegroup-base-serial = "\ + setserial \ + lrzsz " + +RDEPENDS_packagegroup-base-phone = "\ + 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" VIRTUAL-RUNTIME_keymaps ?= "keymaps" PACKAGES = "\ - task-core-boot \ - task-core-boot-dbg \ - task-core-boot-dev \ + packagegroup-core-boot \ + packagegroup-core-boot-dbg \ + packagegroup-core-boot-dev \ " -RDEPENDS_task-core-boot = "\ +RDEPENDS_packagegroup-core-boot = "\ base-files \ base-passwd \ busybox \ @@ -45,5 +45,5 @@ RDEPENDS_task-core-boot = "\ ${VIRTUAL-RUNTIME_update-alternatives} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" -RRECOMMENDS_task-core-boot = "\ +RRECOMMENDS_packagegroup-core-boot = "\ ${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 PR = "r35" PACKAGES = "\ - task-core-apps-console \ - task-core-apps-console-dbg \ - task-core-apps-console-dev \ + packagegroup-core-apps-console \ + packagegroup-core-apps-console-dbg \ + packagegroup-core-apps-console-dev \ " PACKAGE_ARCH = "${MACHINE_ARCH}" @@ -20,7 +20,7 @@ ALLOW_EMPTY = "1" SPLASH ?= "psplash" -RDEPENDS_task-core-apps-console = "\ +RDEPENDS_packagegroup-core-apps-console = "\ avahi-daemon \ dbus \ 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 PR = "r1" PACKAGES = "\ - task-core-nfs-server \ - task-core-nfs-server-dbg \ - task-core-nfs-server-dev \ + packagegroup-core-nfs-server \ + packagegroup-core-nfs-server-dbg \ + packagegroup-core-nfs-server-dev \ " ALLOW_EMPTY = "1" -RDEPENDS_task-core-nfs-server = "\ +RDEPENDS_packagegroup-core-nfs-server = "\ nfs-utils \ nfs-utils-client \ " @@ -24,5 +24,5 @@ RDEPENDS_task-core-nfs-server = "\ # rpcinfo can be useful but only with glibc images GLIBC_DEPENDENCIES = "glibc-utils" -RRECOMMENDS_task-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}" +RRECOMMENDS_packagegroup-core-nfs-server_append_libc-glibc = " ${GLIBC_DEPENDENCIES}" 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" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -DEPENDS = "task-core-console" +DEPENDS = "packagegroup-core-console" PR = "r8" ALLOW_EMPTY = "1" #PACKAGEFUNCS =+ 'generate_sdk_pkgs' PACKAGES = "\ - task-core-sdk \ - task-core-sdk-dbg \ - task-core-sdk-dev" + packagegroup-core-sdk \ + packagegroup-core-sdk-dbg \ + packagegroup-core-sdk-dev" -RDEPENDS_task-core-sdk = "\ +RDEPENDS_packagegroup-core-sdk = "\ autoconf \ automake \ binutils \ @@ -48,15 +48,15 @@ RDEPENDS_task-core-sdk = "\ file \ tcl" -RRECOMMENDS_task-core-sdk = "\ +RRECOMMENDS_packagegroup-core-sdk = "\ libgomp \ libgomp-dev" #python generate_sdk_pkgs () { -# poky_pkgs = read_pkgdata('task-core', d)['PACKAGES'] +# poky_pkgs = read_pkgdata('packagegroup-core', d)['PACKAGES'] # pkgs = d.getVar('PACKAGES', True).split() # for pkg in poky_pkgs.split(): -# newpkg = pkg.replace('task-core', 'task-core-sdk') +# newpkg = pkg.replace('packagegroup-core', 'packagegroup-core-sdk') # # # for each of the task packages, add a corresponding sdk task # pkgs.append(newpkg) @@ -91,4 +91,4 @@ RRECOMMENDS_task-core-sdk = "\ # d.setVar('PACKAGES', ' '.join(pkgs)) #} # -#PACKAGES_DYNAMIC = "task-core-sdk-*" +#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 @@ +DESCRIPTION = "Dropbear SSH task for Poky" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ + file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" +PR = "r0" + +PACKAGES = "\ + packagegroup-core-ssh-dropbear \ + packagegroup-core-ssh-dropbear-dbg \ + packagegroup-core-ssh-dropbear-dev \ + " + +ALLOW_EMPTY = "1" + +RDEPENDS_packagegroup-core-ssh-dropbear = "dropbear" +RDEPENDS_packagegroup-core-ssh-dropbear-dbg = "dropbear-dbg" +RDEPENDS_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 PR = "r0" PACKAGES = "\ - task-core-ssh-openssh \ - task-core-ssh-openssh-dbg \ - task-core-ssh-openssh-dev \ + packagegroup-core-ssh-openssh \ + packagegroup-core-ssh-openssh-dbg \ + packagegroup-core-ssh-openssh-dev \ " ALLOW_EMPTY = "1" -RDEPENDS_task-core-ssh-openssh = "openssh" -RDEPENDS_task-core-ssh-openssh-dbg = "openssh-dbg" -RDEPENDS_task-core-ssh-openssh-dev = "openssh-dev" +RDEPENDS_packagegroup-core-ssh-openssh = "openssh" +RDEPENDS_packagegroup-core-ssh-openssh-dbg = "openssh-dbg" +RDEPENDS_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 @@ DESCRIPTION = "Host SDK package for cross canadian toolchain" -PN = "task-cross-canadian-${TRANSLATED_TARGET_ARCH}" +PN = "packagegroup-cross-canadian-${TRANSLATED_TARGET_ARCH}" PR = "r0" LICENSE = "MIT" ALLOW_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 file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PACKAGES = "\ - task-self-hosted \ - task-self-hosted-debug \ - task-self-hosted-sdk \ - task-self-hosted-extended \ - task-self-hosted-graphics \ - task-self-hosted-host-tools \ + packagegroup-self-hosted \ + packagegroup-self-hosted-debug \ + packagegroup-self-hosted-sdk \ + packagegroup-self-hosted-extended \ + packagegroup-self-hosted-graphics \ + packagegroup-self-hosted-host-tools \ " ALLOW_EMPTY = "1" -RDEPENDS_task-self-hosted = "\ - task-self-hosted-debug \ - task-self-hosted-sdk \ - task-self-hosted-extended \ - task-self-hosted-graphics \ - task-self-hosted-host-tools \ +RDEPENDS_packagegroup-self-hosted = "\ + packagegroup-self-hosted-debug \ + packagegroup-self-hosted-sdk \ + packagegroup-self-hosted-extended \ + packagegroup-self-hosted-graphics \ + packagegroup-self-hosted-host-tools \ " -RDEPENDS_task-self-hosted-host-tools = "\ +RDEPENDS_packagegroup-self-hosted-host-tools = "\ connman \ connman-plugin-ethernet \ dhcp-client \ @@ -52,7 +52,7 @@ RDEPENDS_task-self-hosted-host-tools = "\ " # eglibc-utils: for rpcgen -RDEPENDS_task-self-hosted-sdk = "\ +RDEPENDS_packagegroup-self-hosted-sdk = "\ autoconf \ automake \ binutils \ @@ -85,7 +85,7 @@ RDEPENDS_task-self-hosted-sdk = "\ sed \ " -RDEPENDS_task-self-hosted-debug = " \ +RDEPENDS_packagegroup-self-hosted-debug = " \ gdb \ gdbserver \ rsync \ @@ -93,7 +93,7 @@ RDEPENDS_task-self-hosted-debug = " \ tcf-agent" -RDEPENDS_task-self-hosted-extended = "\ +RDEPENDS_packagegroup-self-hosted-extended = "\ bzip2 \ chkconfig \ chrpath \ @@ -186,7 +186,7 @@ RDEPENDS_task-self-hosted-extended = "\ " -RDEPENDS_task-self-hosted-graphics = "\ +RDEPENDS_packagegroup-self-hosted-graphics = "\ builder \ libgl \ 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 @@ -DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r75" - -inherit task - -PROVIDES = "${PACKAGES}" -PACKAGES = ' \ - task-base \ - task-base-extended \ - task-distro-base \ - task-machine-base \ - \ - ${@base_contains("MACHINE_FEATURES", "acpi", "task-base-acpi", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "alsa", "task-base-alsa", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "apm", "task-base-apm", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "ext2", "task-base-ext2", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "vfat", "task-base-vfat", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "irda", "task-base-irda", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "keyboard", "task-base-keyboard", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "pci", "task-base-pci", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "pcmcia", "task-base-pcmcia", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "phone", "task-base-phone", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "screen", "task-base-screen", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "serial", "task-base-serial", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "touchscreen", "task-base-touchscreen", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "usbgadget", "task-base-usbgadget", "", d)} \ - ${@base_contains("MACHINE_FEATURES", "usbhost", "task-base-usbhost", "", d)} \ - \ - ${@base_contains("MACHINE_FEATURES", "uboot", "task-base-uboot", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "redboot", "task-base-redboot", "",d)} \ - ${@base_contains("MACHINE_FEATURES", "apex", "task-base-apex", "",d)} \ - \ - ${@base_contains("DISTRO_FEATURES", "bluetooth", "task-base-bluetooth", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "wifi", "task-base-wifi", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "3g", "task-base-3g", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "cramfs", "task-base-cramfs", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "ipsec", "task-base-ipsec", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "ipv6", "task-base-ipv6", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "nfs", "task-base-nfs", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "ppp", "task-base-ppp", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "smbfs", "task-base-smbfs", "", d)} \ - ${@base_contains("DISTRO_FEATURES", "raid", "task-base-raid", "",d)} \ - ${@base_contains("DISTRO_FEATURES", "zeroconf", "task-base-zeroconf", "", d)} \ - \ - ' - -ALLOW_EMPTY = "1" - -# -# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH -# -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# -# those ones can be set in machine config to supply packages needed to get machine booting -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - -# -# task-base contain stuff needed for base system (machine related) -# -RDEPENDS_task-base = "\ - task-distro-base \ - task-machine-base \ - \ - sysfsutils \ - module-init-tools \ - ${@base_contains('MACHINE_FEATURES', 'apm', 'task-base-apm', '',d)} \ - ${@base_contains('MACHINE_FEATURES', 'acpi', 'task-base-acpi', '',d)} \ - ${@base_contains('MACHINE_FEATURES', 'keyboard', 'task-base-keyboard', '',d)} \ - ${@base_contains('MACHINE_FEATURES', 'phone', 'task-base-phone', '',d)} \ - \ - ${@base_contains('COMBINED_FEATURES', 'alsa', 'task-base-alsa', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'ext2', 'task-base-ext2', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'vfat', 'task-base-vfat', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'irda', 'task-base-irda', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pci', 'task-base-pci', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'task-base-pcmcia', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'usbgadget', 'task-base-usbgadget', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'usbhost', 'task-base-usbhost', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'bluetooth', 'task-base-bluetooth', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'wifi', 'task-base-wifi', '',d)} \ - ${@base_contains('COMBINED_FEATURES', '3g', 'task-base-3g', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'uboot', 'task-base-uboot', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'redboot', 'task-base-redboot', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'apex', 'task-base-apex', '',d)} \ - \ - ${@base_contains('DISTRO_FEATURES', 'nfs', 'task-base-nfs', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'cramfs', 'task-base-cramfs', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'smbfs', 'task-base-smbfs', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'ipv6', 'task-base-ipv6', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'ipsec', 'task-base-ipsec', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'ppp', 'task-base-ppp', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'raid', 'task-base-raid', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'zeroconf', 'task-base-zeroconf', '',d)} \ - " - - -RRECOMMENDS_task-base = "\ - kernel-module-nls-utf8 \ - kernel-module-input \ - kernel-module-uinput \ - kernel-module-rtc-dev \ - kernel-module-rtc-proc \ - kernel-module-rtc-sysfs \ - kernel-module-unix" - -RDEPENDS_task-base-extended = "\ - task-base \ - ${ADD_WIFI} \ - ${ADD_BT} \ - ${ADD_3G} \ - " - -ADD_WIFI = "" -ADD_BT = "" -ADD_3G = "" - -python __anonymous () { - # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) - # then include task-base-wifi in task-base - - distro_features = set(d.getVar("DISTRO_FEATURES", True).split()) - machine_features= set(d.getVar("MACHINE_FEATURES", True).split()) - - 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): - d.setVar("ADD_BT", "task-base-bluetooth") - - 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): - d.setVar("ADD_WIFI", "task-base-wifi") - - 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): - d.setVar("ADD_3G", "task-base-3g") -} - -# -# packages added by distribution -# -DEPENDS_task-distro-base = "${DISTRO_EXTRA_DEPENDS}" -RDEPENDS_task-distro-base = "${DISTRO_EXTRA_RDEPENDS}" -RRECOMMENDS_task-distro-base = "${DISTRO_EXTRA_RRECOMMENDS}" - -# -# packages added by machine config -# -RDEPENDS_task-machine-base = "${MACHINE_EXTRA_RDEPENDS}" -RRECOMMENDS_task-machine-base = "${MACHINE_EXTRA_RRECOMMENDS}" - -RDEPENDS_task-base-keyboard = "\ - keymaps" - -RDEPENDS_task-base-pci = "\ - pciutils" - -RDEPENDS_task-base-acpi = "\ - acpid \ - libacpi " - -RDEPENDS_task-base-apm = "\ - ${VIRTUAL-RUNTIME_apm} \ - apmd" - -RDEPENDS_task-base-ext2 = "\ - hdparm \ - e2fsprogs \ - e2fsprogs-e2fsck \ - e2fsprogs-mke2fs" - -RRECOMMENDS_task-base-vfat = "\ - kernel-module-msdos \ - kernel-module-vfat \ - kernel-module-nls-iso8859-1 \ - kernel-module-nls-cp437" - -RDEPENDS_task-base-alsa = "\ - alsa-utils-alsactl \ - alsa-utils-alsamixer \ - ${VIRTUAL-RUNTIME_alsa-state}" - -RRECOMMENDS_task-base-alsa = "\ - kernel-module-snd-mixer-oss \ - kernel-module-snd-pcm-oss" - -RDEPENDS_task-base-pcmcia = "\ - pcmciautils \ - " -#${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)} -#${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} - - -RRECOMMENDS_task-base-pcmcia = "\ - kernel-module-pcmcia \ - kernel-module-airo-cs \ - kernel-module-pcnet-cs \ - kernel-module-serial-cs \ - kernel-module-ide-cs \ - kernel-module-ide-disk \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-hostap-cs', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-orinoco-cs', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'kernel-module-spectrum-cs', '',d)}" - -# Provide bluez-utils-compat utils for the time being, the binaries in that package will vanish soon from upstream releases, so beware! - -RDEPENDS_task-base-bluetooth = "\ - bluez4 \ - ${@base_contains('COMBINED_FEATURES', 'alsa', 'libasound-module-bluez', '',d)} \ - " - -RRECOMMENDS_task-base-bluetooth = "\ - kernel-module-bluetooth \ - kernel-module-l2cap \ - kernel-module-rfcomm \ - kernel-module-hci-vhci \ - kernel-module-bnep \ - kernel-module-hidp \ - kernel-module-hci-uart \ - kernel-module-sco \ - ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-hci-usb', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetooth3c-cs', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluecard-cs', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-bluetoothuart-cs', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'kernel-module-dtl1-cs', '',d)} \ - " - -RDEPENDS_task-base-irda = "\ - irda-utils" - -RRECOMMENDS_task-base-irda = "\ - kernel-module-pxaficp-ir \ - kernel-module-irda \ - kernel-module-ircomm \ - kernel-module-ircomm-tty \ - kernel-module-irlan \ - ${@base_contains('DISTRO_FEATURES', 'ppp', 'kernel-module-irnet', '',d)} \ - kernel-module-irport \ - kernel-module-irtty \ - kernel-module-irtty-sir \ - kernel-module-sir-dev \ - ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-ir-usb', '',d)} " - -RRECOMMENDS_task-base-usbgadget = "\ - kernel-module-pxa27x_udc \ - kernel-module-gadgetfs \ - kernel-module-g-file-storage \ - kernel-module-g-serial \ - kernel-module-g-ether" - -RDEPENDS_task-base-usbhost = "\ - usbutils " - -RRECOMMENDS_task-base-usbhost = "\ - kernel-module-uhci-hcd \ - kernel-module-ohci-hcd \ - kernel-module-ehci-hcd \ - kernel-module-usbcore \ - kernel-module-usbhid \ - kernel-module-usbnet \ - kernel-module-sd-mod \ - kernel-module-scsi-mod \ - kernel-module-usbmouse \ - kernel-module-mousedev \ - kernel-module-usbserial \ - kernel-module-usb-storage " - -RDEPENDS_task-base-ppp = "\ - ppp \ - ppp-dialin" - -RRECOMMENDS_task-base-ppp = "\ - kernel-module-ppp-async \ - kernel-module-ppp-deflate \ - kernel-module-ppp-generic \ - kernel-module-ppp-mppe \ - kernel-module-slhc" - -RDEPENDS_task-base-ipsec = "\ - openswan" - -RRECOMMENDS_task-base-ipsec = "\ - kernel-module-ipsec" - -# -# task-base-wifi contain everything needed to get WiFi working -# WEP/WPA connection needs to be supported out-of-box -# -RDEPENDS_task-base-wifi = "\ - wireless-tools \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'hostap-utils', '',d)} \ - ${@base_contains('COMBINED_FEATURES', 'pci', 'hostap-utils', '',d)} \ - wpa-supplicant" - -RRECOMMENDS_task-base-wifi = "\ - ${@base_contains('COMBINED_FEATURES', 'usbhost', 'kernel-module-zd1211rw', '',d)} \ - kernel-module-ieee80211-crypt \ - kernel-module-ieee80211-crypt-ccmp \ - kernel-module-ieee80211-crypt-tkip \ - kernel-module-ieee80211-crypt-wep \ - kernel-module-ecb \ - kernel-module-arc4 \ - kernel-module-crypto_algapi \ - kernel-module-cryptomgr \ - kernel-module-michael-mic \ - kernel-module-aes-generic \ - kernel-module-aes" - -RDEPENDS_task-base-3g = "\ - ofono" - -RRECOMMENDS_task-base-3g = "\ - kernel-module-cdc-acm \ - kernel-module-cdc-wdm" - -RRECOMMENDS_task-base-smbfs = "\ - kernel-module-cifs \ - kernel-module-smbfs" - -RRECOMMENDS_task-base-cramfs = "\ - kernel-module-cramfs" - -# -# task-base-nfs provides ONLY client support - server is in nfs-utils package -# -RDEPENDS_task-base-nfs = "\ - portmap" - -RRECOMMENDS_task-base-nfs = "\ - kernel-module-nfs " - -RDEPENDS_task-base-zeroconf = "\ - avahi-daemon" - -RDEPENDS_task-base-raid = "\ - " - -RDEPENDS_task-base-screen = "\ - " - -# -# GPE/OPIE/OpenMoko provide own touchscreen calibration utils -# -RDEPENDS_task-base-touchscreen = "\ - " - -RDEPENDS_task-base-ipv6 = "\ - " - -RRECOMMENDS_task-base-ipv6 = "\ - kernel-module-ipv6 " - -RDEPENDS_task-base-serial = "\ - setserial \ - lrzsz " - -RDEPENDS_task-base-phone = "\ - 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 @@ -DESCRIPTION = "Dropbear SSH task for Poky" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" -PR = "r0" - -PACKAGES = "\ - task-core-ssh-dropbear \ - task-core-ssh-dropbear-dbg \ - task-core-ssh-dropbear-dev \ - " - -ALLOW_EMPTY = "1" - -RDEPENDS_task-core-ssh-dropbear = "dropbear" -RDEPENDS_task-core-ssh-dropbear-dbg = "dropbear-dbg" -RDEPENDS_task-core-ssh-dropbear-dev = "dropbear-dev" |