r2147 - trunk/oe/packages/tasks
mickey at sita.openmoko.org
mickey at sita.openmoko.org
Mon Jun 4 17:00:53 CEST 2007
Author: mickey
Date: 2007-06-04 17:00:53 +0200 (Mon, 04 Jun 2007)
New Revision: 2147
Added:
trunk/oe/packages/tasks/task-base.bb
Modified:
trunk/oe/packages/tasks/task-openmoko.bb
Log:
oe/task-base: add to overlay and bump (as per hrw's request)
oe/task-openmoko: bump
Added: trunk/oe/packages/tasks/task-base.bb
===================================================================
--- trunk/oe/packages/tasks/task-base.bb 2007-06-04 13:56:03 UTC (rev 2146)
+++ trunk/oe/packages/tasks/task-base.bb 2007-06-04 15:00:53 UTC (rev 2147)
@@ -0,0 +1,317 @@
+DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
+PR = "r20"
+
+PACKAGES = "task-base \
+ task-base-minimal \
+ task-base-oh-minimal \
+ task-base-core-default"
+
+ALLOW_EMPTY = "1"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
+# Valid only in MACHINE_FEATURES:
+#
+# kernel24
+# kernel26
+# apm
+# keyboard
+# touchscreen
+# screen
+# pci
+# acpi
+# phone
+
+# Valid only in DISTRO_FEATURES:
+#
+# nfs
+# smbfs
+# ipsec
+# wifi
+# ppp
+
+# Valid COMBINED_FEATURES:
+# (These features need to be supported by both the machine and the distro)
+#
+# alsa
+# bluetooth
+# ext2
+# irda
+# pci
+# pcmcia
+# usbgadget
+# usbhost
+
+DISTRO_CORE_PACKAGE ?= "task-base-core-default"
+
+#
+# task-base
+#
+RDEPENDS_task-base = "\
+ ${DISTRO_CORE_PACKAGE} \
+ kernel \
+ ${@base_contains("MACHINE_FEATURES", "kernel24", "${task-base-kernel24-rdepends}", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "acpi", "${task-base-acpi-rdepends}", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "keyboard", "${task-base-keyboard-rdepends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rdepends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "ext2", "${task-base-ext2-rdepends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rdepends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pci", "${task-base-pci-rdepends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rdepends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rdepends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rdepends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "wifi", "${task-distro-wifi-rdepends}", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rdepends}", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rdepends}", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rdepends}", "",d)} \
+ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS} \
+ ${MACHINE_EXTRA_RDEPENDS} \
+ ${DISTRO_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-base = "\
+ ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-extras-rrecommends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "alsa", "${task-base-alsa-rrecommends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "${task-base-pcmcia-rrecommends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "bluetooth", "${task-base-bluetooth-rrecommends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "irda", "${task-base-irda-rrecommends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "usbgadget", "${task-base-usbgadget-rrecommends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "${task-base-usbhost-rrecommends}", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "ppp", "${task-distro-ppp-rrecommends}", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "nfs", "${task-distro-nfs-rrecommends}", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "ipsec", "${task-distro-ipsec-rrecommends}", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "wifi", "${task-distro-wifi-rrecommends}", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "cramfs", "${task-distro-cramfs-rrecommends}", "",d)} \
+ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS} \
+ ${MACHINE_EXTRA_RRECOMMENDS} \
+ ${DISTRO_EXTRA_RRECOMMENDS}"
+
+
+#
+# task-base-oh-minimal
+# An example of a small cut down machine configuration
+#
+RDEPENDS_task-base-oh-minimal = "\
+ kernel \
+ ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-kernel26-rdepends}", "",d)} \
+ ${@base_contains("MACHINE_FEATURES", "apm", "${task-base-apm-rdepends}", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
+ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
+
+RRECOMMENDS_task-base-minimal = "\
+ ${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
+
+
+
+HOTPLUG ?= "linux-hotplug"
+
+RDEPENDS_task-base-core-default = '\
+ base-files \
+ base-passwd \
+ busybox \
+ initscripts \
+ netbase \
+ sysvinit \
+ sysvinit-pidof \
+ tinylogin \
+ modutils-initscripts \
+ fuser \
+ setserial'
+# Lets see if we can kill off hotplug...
+# ${HOTPLUG}
+# ${@bootstrap_modutils_rdepends(d)}
+
+
+RRECOMMENDS_task-base-core-default = '\
+ dropbear '
+
+task-base-kernel24-rdepends = "\
+ modutils-depmod \
+ linux-hotplug "
+
+task-base-kernel26-rdepends = "\
+ udev \
+ sysfsutils \
+ module-init-tools"
+
+task-base-keyboard-rdepends = "\
+ keymaps"
+
+task-base-pci-rdepends = "\
+ pciutils"
+
+task-base-kernel26-extras-rrecommends = "\
+ kernel-module-input \
+ kernel-module-uinput"
+
+task-base-acpi-rdepends = "\
+ acpid"
+
+task-base-apm-rdepends = "\
+ apm \
+ apmd \
+ ${@base_contains("MACHINE_FEATURES", "kernel24", "network-suspend-scripts", "",d)}"
+
+task-base-ext2-rdepends = "\
+ hdparm \
+ e2fsprogs \
+ e2fsprogs-e2fsck \
+ e2fsprogs-mke2fs"
+
+task-base-alsa-rdepends = "\
+ alsa-utils-alsactl \
+ alsa-utils-alsamixer"
+
+task-base-alsa-rrecommends = "\
+ kernel-module-snd-mixer-oss \
+ kernel-module-snd-pcm-oss"
+
+task-base-pcmcia-rdepends = "\
+ ${PCMCIA_MANAGER} \
+ ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-firmware", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "wifi", "prism3-support", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "wifi", "spectrum-fw", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-conf", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-conf", "",d)}"
+
+task-base-pcmcia-rrecommends = "\
+ kernel-module-pcmcia \
+ kernel-module-airo-cs \
+ kernel-module-pcnet-cs \
+ kernel-module-serial-cs \
+ kernel-module-ide-cs \
+ ${@base_contains("MACHINE_FEATURES", "kernel26", "${task-base-pcmcia26-rrecommends}", "${task-base-pcmcia24-rrecommends}",d)} "
+
+task-base-pcmcia24-rrecommends = "\
+ ${@base_contains("DISTRO_FEATURES", "wifi", "hostap-modules-cs", "",d)} \
+ ${@base_contains("DISTRO_FEATURES", "wifi", "orinoco-modules-cs", "",d)}"
+
+task-base-pcmcia26-rrecommends = "\
+ ${@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)}"
+
+task-base-bluetooth-rdepends = "\
+ blueprobe \
+ bluez-utils"
+
+task-base-bluetooth-rrecommends = "\
+ 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)}"
+
+task-base-irda-rdepends = "\
+ irda-utils"
+
+task-base-irda-rrecommends = "\
+ 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 \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-ir-usb", "",d)} "
+
+task-base-usbgadget-rrecommends = "\
+ kernel-module-pxa27x_udc \
+ kernel-module-gadgetfs \
+ kernel-module-g-file-storage \
+ kernel-module-g-serial \
+ kernel-module-g-ether"
+
+task-base-usbhost-rdepends = "\
+ usbutils "
+
+task-base-usbhost-rrecommends = "\
+ 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 "
+
+task-distro-ppp-rdepends = "\
+ ppp \
+ ppp-dialin"
+
+task-distro-ppp-rrecommends = "\
+ kernel-module-ppp-async \
+ kernel-module-ppp-deflate \
+ kernel-module-ppp-mppe"
+
+task-distro-ipsec-rdepends = "\
+ openswan"
+
+task-distro-ipsec-rrecommends = "\
+ kernel-module-ipsec"
+
+task-distro-wifi-rdepends = "\
+ wireless-tools \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \
+ wpa-supplicant"
+
+task-distro-wifi-rrecommends = "\
+ kernel-module-ieee80211-crypt \
+ kernel-module-ieee80211-crypt-ccmp \
+ kernel-module-ieee80211-crypt-tkip \
+ kernel-module-ieee80211-crypt-wep \
+ kernel-module-arc4 \
+ kernel-module-michael-mic \
+ kernel-module-aes"
+
+task-distro-smbfs-rrecommends = "\
+ kernel-module-cifs \
+ kernel-module-smbfs"
+
+task-distro-cramfs-rrecommends = "\
+ kernel-module-cramfs"
+
+task-distro-nfs-rdepends = "\
+ portmap"
+
+task-distro-nfs-rrecommends = "\
+ kernel-module-nfs \
+ kernel-module-lockd \
+ kernel-module-sunrpc"
+
+
+# Tosort
+# kernel-module-ipv6
+# kernel-module-nvrd
+# kernel-module-mip6-mn
+# kernel-module-tun
+# kernel-module-ide-disk
+# kernel-module-ide-probe-mo
+# kernel-module-loop
+# kernel-module-vfat
+# kernel-module-ext2
+# kernel-module-sco
+# kernel-module-af_packet
+# kernel-module-ip-gre
+# kernel-module-ip-tables
+# kernel-module-ipip
+# kernel-module-des
+# kernel-module-md5
+# kernel-module-8250
+# Should be DISTRO_EXTRA_RRECOMMENDS: lrzsz
+
Modified: trunk/oe/packages/tasks/task-openmoko.bb
===================================================================
--- trunk/oe/packages/tasks/task-openmoko.bb 2007-06-04 13:56:03 UTC (rev 2146)
+++ trunk/oe/packages/tasks/task-openmoko.bb 2007-06-04 15:00:53 UTC (rev 2147)
@@ -4,7 +4,7 @@
PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r40"
+PR = "r41"
PACKAGES = "\
task-openmoko-linux \
@@ -79,6 +79,7 @@
openmoko-session \
openmoko-theme-standard \
openmoko-icon-theme-standard \
+ openmoko-sound-theme-standard \
# psplash \
"
More information about the commitlog
mailing list