From 29d6678fd546377459ef75cf54abeef5b969b5cf Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 27 Aug 2010 15:14:24 +0100 Subject: Major layout change to the packages directory Having one monolithic packages directory makes it hard to find things and is generally overwhelming. This commit splits it into several logical sections roughly based on function, recipes.txt gives more information about the classifications used. The opportunity is also used to switch from "packages" to "recipes" as used in OpenEmbedded as the term "packages" can be confusing to people and has many different meanings. Not all recipes have been classified yet, this is just a first pass at separating things out. Some packages are moved to meta-extras as they're no longer actively used or maintained. Signed-off-by: Richard Purdie --- meta/packages/tasks/task-base.bb | 385 ---------------------- meta/packages/tasks/task-poky-apps-x11-pimlico.bb | 31 -- meta/packages/tasks/task-poky-boot.bb | 33 -- meta/packages/tasks/task-poky-x11-netbook.bb | 28 -- meta/packages/tasks/task-poky-x11-sato.bb | 30 -- 5 files changed, 507 deletions(-) delete mode 100644 meta/packages/tasks/task-base.bb delete mode 100644 meta/packages/tasks/task-poky-apps-x11-pimlico.bb delete mode 100644 meta/packages/tasks/task-poky-boot.bb delete mode 100644 meta/packages/tasks/task-poky-x11-netbook.bb delete mode 100644 meta/packages/tasks/task-poky-x11-sato.bb (limited to 'meta/packages/tasks') diff --git a/meta/packages/tasks/task-base.bb b/meta/packages/tasks/task-base.bb deleted file mode 100644 index 9873c060cc..0000000000 --- a/meta/packages/tasks/task-base.bb +++ /dev/null @@ -1,385 +0,0 @@ -DESCRIPTION = "Merge machine and distro options to create a basic machine task/package" -LICENSE = "MIT" -PR = "r69" - -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", "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)} \ - \ - ${@base_contains("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \ - ' - -ALLOW_EMPTY = "1" - -# -# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH -# -PACKAGE_ARCH = "${MACHINE_ARCH}" - -# -# linux-hotplug or none -# -HOTPLUG ?= "${@base_contains("MACHINE_FEATURES", "kernel24", "linux-hotplug","",d)} " - -# -# dropbear, openssh or none -# -DISTRO_SSH_DAEMON ?= "dropbear" - -# -# pcmciautils for >= 2.6.13-rc1, pcmcia-cs for others -# -PCMCIA_MANAGER ?= "${@base_contains('MACHINE_FEATURES', 'kernel26','pcmciautils','pcmcia-cs',d)} " - -# -# 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 \ - ${DISTRO_SSH_DAEMON} \ - ${HOTPLUG} \ - \ - ${@base_contains('MACHINE_FEATURES', 'kernel26','task-base-kernel26','task-base-kernel24',d)} \ - ${@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', 'pcmcia', 'bluez-dtl1-workaround', '',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', '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)} \ - " -# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in - -RDEPENDS_task-base-extended = "\ - task-base \ - ${ADD_WIFI} \ - ${ADD_BT} \ - " - -ADD_WIFI = "" -ADD_BT = "" - -python __anonymous () { - # If Distro want wifi and machine feature wifi/pci/pcmcia/usbhost (one of them) - # then include task-base-wifi in task-base - - import bb - - distro_features = set(bb.data.getVar("DISTRO_FEATURES", d, 1).split()) - machine_features= set(bb.data.getVar("MACHINE_FEATURES", d, 1).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): - bb.data.setVar("ADD_BT", "task-base-bluetooth", d) - - 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): - bb.data.setVar("ADD_WIFI", "task-base-wifi", d) -} - -# -# 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-kernel24 = "\ - modutils-depmod" - -RDEPENDS_task-base-kernel26 = "\ - sysfsutils \ - module-init-tools" - -RRECOMMENDS_task-base-kernel24 = "\ - kernel-module-input \ - kernel-module-uinput" - -RRECOMMENDS_task-base-kernel26 = "\ - kernel-module-nls-utf8 \ - kernel-module-input \ - kernel-module-uinput \ - kernel-module-rtc-dev \ - kernel-module-rtc-proc \ - kernel-module-rtc-sysfs \ - kernel-module-rtc-sa1100 \ - kernel-module-unix" - -RDEPENDS_task-base-keyboard = "\ - keymaps" - -RDEPENDS_task-base-pci = "\ - pciutils" - -RDEPENDS_task-base-acpi = "\ - acpid \ - libacpi " - -RDEPENDS_task-base-apm = "\ - 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" - -RRECOMMENDS_task-base-alsa = "\ - kernel-module-snd-mixer-oss \ - kernel-module-snd-pcm-oss" - -RDEPENDS_task-base-pcmcia = "\ - ${PCMCIA_MANAGER} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'prism-firmware', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'spectrum-fw', '',d)} \ - " - -RRECOMMENDS_task-base-pcmcia = "\ - ${@base_contains('MACHINE_FEATURES', 'kernel26', '${task-base-pcmcia26}', '${task-base-pcmcia24}',d)} \ - kernel-module-pcmcia \ - kernel-module-airo-cs \ - kernel-module-pcnet-cs \ - kernel-module-serial-cs \ - kernel-module-ide-cs \ - kernel-module-ide-disk \ - " - -task-base-pcmcia24 = "\ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'hostap-modules-cs', '',d)} \ - ${@base_contains('DISTRO_FEATURES', 'wifi', 'orinoco-modules-cs', '',d)} \ - " - -task-base-pcmcia26 = "\ - ${@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 \ - " - -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)} \ - ${@base_contains('COMBINED_FEATURES', 'pcmcia', 'bluez-dtl1-workaround', '',d)} \ - " -# bluez-dtl1-workaround above is workaround for bitbake not handling DEPENDS on it in -# kernel.bbclass. It should be there as long as kernel-module-dtl1-cs is, but not longer. - -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" - -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 = "\ - gsmd \ - libgsmd-tools" diff --git a/meta/packages/tasks/task-poky-apps-x11-pimlico.bb b/meta/packages/tasks/task-poky-apps-x11-pimlico.bb deleted file mode 100644 index 651d481893..0000000000 --- a/meta/packages/tasks/task-poky-apps-x11-pimlico.bb +++ /dev/null @@ -1,31 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenedHand Ltd. -# - -DESCRIPTION = "X11 Pimlico Appications List" -LICENSE = "MIT" -PR = "r27" - -PACKAGES = "\ - task-poky-apps-x11-pimlico \ - task-poky-apps-x11-pimlico-dbg \ - task-poky-apps-x11-pimlico-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" - -WEB = "web-webkit" -# WebKit takes too much space to fit on some devices -# List here for now... -WEB_c7x0 = "" -WEB_mx31ads = "" - -RDEPENDS_task-poky-apps-x11-pimlico = "\ - eds-dbus \ - contacts \ - dates \ - tasks \ - gaku \ - ${WEB}" diff --git a/meta/packages/tasks/task-poky-boot.bb b/meta/packages/tasks/task-poky-boot.bb deleted file mode 100644 index 4143369cd3..0000000000 --- a/meta/packages/tasks/task-poky-boot.bb +++ /dev/null @@ -1,33 +0,0 @@ -# -# Copyright (C) 2007 OpenedHand Ltd. -# - -DESCRIPTION = "Task for OpenedHand Poky - minimal bootable image" -LICENSE = "MIT" -PACKAGE_ARCH = "${MACHINE_ARCH}" -DEPENDS = "virtual/kernel" -ALLOW_EMPTY = "1" -PR = "r7" - -# -# Set by the machine configuration with packages essential for device bootup -# -MACHINE_ESSENTIAL_EXTRA_RDEPENDS ?= "" -MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= "" - -RDEPENDS_task-poky-boot = "\ - base-files \ - base-passwd \ - busybox \ - initscripts \ - ${@base_contains("MACHINE_FEATURES", "keyboard", "keymaps", "", d)} \ - modutils-initscripts \ - netbase \ - sysvinit \ - tinylogin \ - udev \ - ${VIRTUAL-RUNTIME_update-alternatives} \ - ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" - -RRECOMMENDS_task-poky-boot = "\ - ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}" diff --git a/meta/packages/tasks/task-poky-x11-netbook.bb b/meta/packages/tasks/task-poky-x11-netbook.bb deleted file mode 100644 index a5ebb54073..0000000000 --- a/meta/packages/tasks/task-poky-x11-netbook.bb +++ /dev/null @@ -1,28 +0,0 @@ -# -# Copyright (C) 2008 Intel. -# - -DESCRIPTION = "Netbook Tasks for Poky" -PR = "r1" - -PACKAGES = "\ - task-poky-x11-netbook \ - task-poky-x11-netbook-dbg \ - task-poky-x11-netbook-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" - -NETWORK_MANAGER ?= "networkmanager-applet" -RDEPENDS_task-poky-x11-netbook = "\ - mutter \ - matchbox-desktop \ - matchbox-session-netbook \ - matchbox-config-gtk \ - xcursor-transparent-theme \ - sato-icon-theme \ - settings-daemon \ - gtk-sato-engine \ - ${NETWORK_MANAGER}" diff --git a/meta/packages/tasks/task-poky-x11-sato.bb b/meta/packages/tasks/task-poky-x11-sato.bb deleted file mode 100644 index 1b344edb54..0000000000 --- a/meta/packages/tasks/task-poky-x11-sato.bb +++ /dev/null @@ -1,30 +0,0 @@ -# -# Copyright (C) 2007-2008 OpenedHand Ltd. -# - -DESCRIPTION = "Sato Tasks for Poky" -LICENSE = "MIT" -PR = "r29" - -PACKAGES = "\ - task-poky-x11-sato \ - task-poky-x11-sato-dbg \ - task-poky-x11-sato-dev \ - " - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -ALLOW_EMPTY = "1" - -NETWORK_MANAGER ?= "networkmanager-applet" -RDEPENDS_task-poky-x11-sato = "\ - matchbox-desktop \ - matchbox-session-sato \ - matchbox-keyboard \ - matchbox-stroke \ - matchbox-config-gtk \ - xcursor-transparent-theme \ - sato-icon-theme \ - settings-daemon \ - gtk-sato-engine \ - ${NETWORK_MANAGER}" -- cgit v1.2.3