summaryrefslogtreecommitdiff
path: root/packages/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'packages/tasks')
-rw-r--r--packages/tasks/task-base.bb6
-rw-r--r--packages/tasks/task-gpephone.bb4
-rw-r--r--packages/tasks/task-mokogateway.bb77
-rw-r--r--packages/tasks/task-openmoko.bb11
-rw-r--r--packages/tasks/task-slugos.bb10
5 files changed, 98 insertions, 10 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index f74d8f8943..5bc38f6a79 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,8 +1,7 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r19"
+PR = "r20"
PACKAGES = "task-base \
- task-base-minimal \
task-base-oh-minimal \
task-base-core-default"
@@ -99,11 +98,10 @@ RDEPENDS_task-base-oh-minimal = "\
${@base_contains("COMBINED_FEATURES", "pcmcia", "${PCMCIA_MANAGER}", "",d)} \
${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}"
-RRECOMMENDS_task-base-minimal = "\
+RRECOMMENDS_task-base-oh-minimal = "\
${MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS}"
-
HOTPLUG ?= "linux-hotplug"
RDEPENDS_task-base-core-default = '\
diff --git a/packages/tasks/task-gpephone.bb b/packages/tasks/task-gpephone.bb
index 87f8c01749..e03886f0fd 100644
--- a/packages/tasks/task-gpephone.bb
+++ b/packages/tasks/task-gpephone.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Task packages for GPE Palmtop Environment Phone Edition"
-PR = "r2"
+PR = "r3"
LICENSE = "MIT"
ALLOW_EMPTY = "1"
@@ -67,8 +67,8 @@ RDEPENDS_gpephone-task-base := "\
pango-module-basic-x \
pango-module-basic-fc \
detect-stylus \
+ libgtkinput \
${@base_contains("MACHINE_FEATURES", "touchscreen", "libgtkstylus xtscal", "",d)} \
- ${@base_contains("MACHINE_FEATURES", "keyboard", "", "libgtkinput",d)} \
"
RDEPENDS_gpephone-task-pim := "\
diff --git a/packages/tasks/task-mokogateway.bb b/packages/tasks/task-mokogateway.bb
new file mode 100644
index 0000000000..4fbf450cdf
--- /dev/null
+++ b/packages/tasks/task-mokogateway.bb
@@ -0,0 +1,77 @@
+DESCRIPTION = "MokoGateway: Tasks for a companion server for the OpenMoko Linux Distribution"
+ALLOW_EMPTY = "1"
+PACKAGE_ARCH = "all"
+LICENSE = "MIT"
+PROVIDES = "task-mokogateway-everything"
+PR = "1"
+
+PACKAGES = "\
+ task-mokogateway-everything \
+ ${MOKOGATEWAY_PACKAGES} \
+"
+
+MOKOGATEWAY_PACKAGES = "\
+ task-mokogateway-usbnet \
+ task-mokogateway-bluetooth \
+ task-mokogateway-wifi \
+ task-mokogateway-debug \
+"
+
+RDEPENDS_task-mokogateway-everything = "${MOKOGATEWAY_PACKAGES}"
+
+DESCRIPTION_task-mokogateway-usbnet = "MokoGateway: USB Networking"
+RDEPENDS_task-mokogateway-usbnet = "\
+"
+RRECOMMENDS_task-mokogateway-usbnet = "\
+ kernel-module-usbnet \
+ kernel-module-cdc-ether \
+"
+
+DESCRIPTION_task-mokogateway-bluetooth = "MokoGateway: Bluetooth"
+RDEPENDS_task-mokogateway-bluetooth = "\
+ bluez-utils \
+"
+RRECOMMENDS_task-mokogateway-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)} \
+"
+
+DESCRIPTION_task-mokogateway-wifi = "MokoGateway: WiFi"
+RDEPENDS_task-mokogateway-wifi = "\
+ wireless-tools \
+ ${@base_contains("COMBINED_FEATURES", "pcmcia", "hostap-utils", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "pci", "hostap-utils", "",d)} \
+ wpa-supplicant \
+"
+RRECOMMENDS_task-mokogateway-wifi = "\
+ 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 \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "kernel-module-zd1211rw", "",d)} \
+ ${@base_contains("COMBINED_FEATURES", "usbhost", "zd1211-firmware", "",d)} \
+"
+
+DESCRIPTION_task-mokogateway-debug = "MokoGateway: Debug"
+RDEPENDS_task-mokogateway-debug = "\
+ dfu-util \
+ ftdi-eeprom \
+ openocd \
+"
+RRECOMMENDS_task-mokogateway-debug = "\
+"
+
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 1d748f1235..ae705dd387 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -5,7 +5,7 @@ PACKAGE_ARCH = "all"
LICENSE = "MIT"
PROVIDES = "task-openmoko-everything"
-PR = "r28"
+PR = "r29"
PACKAGES = "\
task-openmoko-linux \
@@ -153,16 +153,23 @@ RDEPENDS_task-openmoko-demo = "\
matchbox-keyboard \
matchbox-stroke \
matchbox-config-gtk \
- matchbox-panel-manager \
+ matchbox-panel-2-applets \
matchbox-panel-hacks \
matchbox-themes-extra \
matchbox-themes-gtk \
matchbox-applet-inputmanager \
matchbox-applet-startup-monitor \
+ openmoko-panel-battery \
+ openmoko-panel-clock \
+ openmoko-panel-demo \
+ openmoko-panel-demo-simple \
+ openmoko-panel-gsm \
+ openmoko-panel-mainmenu \
xcursor-transparent-theme \
settings-daemon \
web \
rxvt-unicode \
+ gpe-terminal \
mtpaint \
"
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 3707316c1e..2fd4ad0473 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -6,7 +6,7 @@
DESCRIPTION = "Task packages for the SlugOS distribution"
HOMEPAGE = "http://www.nslu2-linux.org"
LICENSE = "MIT"
-PR = "r3"
+PR = "r4"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -60,13 +60,19 @@ kernel-module-ext2 \
kernel-module-jbd \
kernel-module-ext3 \
kernel-module-vfat \
-kernel-module-ntfs \
kernel-module-isofs \
kernel-module-udf \
+kernel-module-nfs \
kernel-module-nls-cp437 \
kernel-module-nls-utf8 \
"
+# Until it becomes clear which of the ntfs drivers is the better
+# solution, the Linux ntfs driver is commented out.
+#SLUGOS_STANDARD_RDEPENDS += "\
+#kernel-module-ntfs \
+#"
+
# Add daemon required for HW RNG support
SLUGOS_STANDARD_RDEPENDS += "\
rng-tools \