summaryrefslogtreecommitdiff
path: root/packages/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'packages/tasks')
-rw-r--r--packages/tasks/task-base.bb75
-rw-r--r--packages/tasks/task-boot.bb2
-rw-r--r--packages/tasks/task-devimage.bb26
-rw-r--r--packages/tasks/task-mipl.bb16
-rw-r--r--packages/tasks/task-native-sdk.bb4
-rw-r--r--packages/tasks/task-openmoko-base.bb29
-rw-r--r--packages/tasks/task-openmoko-examples.bb6
-rw-r--r--packages/tasks/task-openmoko-feed.bb3
-rw-r--r--packages/tasks/task-openmoko-games.bb14
-rw-r--r--packages/tasks/task-openmoko-linux.bb24
-rw-r--r--packages/tasks/task-openmoko-net.bb15
-rw-r--r--packages/tasks/task-openmoko-phone.bb18
-rw-r--r--packages/tasks/task-openmoko-pim.bb23
-rw-r--r--packages/tasks/task-openmoko-ui.bb56
-rw-r--r--packages/tasks/task-openmoko.bb140
-rw-r--r--packages/tasks/task-python-everything.bb12
-rw-r--r--packages/tasks/task-python-sharprom_20060425.bb5
-rw-r--r--packages/tasks/task-slugos.bb29
-rw-r--r--packages/tasks/task-toolchain-openmoko-sdk.bb2
19 files changed, 304 insertions, 195 deletions
diff --git a/packages/tasks/task-base.bb b/packages/tasks/task-base.bb
index 07de84c8c2..da1fdf97cd 100644
--- a/packages/tasks/task-base.bb
+++ b/packages/tasks/task-base.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Merge machine and distro options to create a basic machine task/package"
-PR = "r45"
+PR = "r54"
inherit task
@@ -11,43 +11,44 @@ PACKAGES = ' \
task-distro-base \
task-machine-base \
\
- task-base-acpi \
- task-base-alsa \
- task-base-apm \
+ ${@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)} \
+ \
task-base-bluetooth \
- task-base-ext2 \
- task-base-irda \
- task-base-keyboard \
- task-base-pci \
- task-base-pcmcia \
- task-base-phone \
- task-base-screen \
- task-base-serial \
- task-base-touchscreen \
- task-base-usbgadget \
- task-base-usbhost \
task-base-wifi \
\
- task-base-cramfs \
- task-base-ipsec \
- task-base-ipv6 \
- task-base-nfs \
- task-base-ppp \
- task-base-smbfs \
- \
+ ${@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("MACHINE_FEATURES","kernel26","task-base-kernel26","task-base-kernel24",d)} \
- '
+ '
#
# packages which content depend on MACHINE_FEATURES need to be MACHINE_ARCH
#
-PACKAGE_ARCH_task-base = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-machine-base = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-apm = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-bluetooth = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-irda = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-pcmcia = "${MACHINE_ARCH}"
-PACKAGE_ARCH_task-base-wifi = "${MACHINE_ARCH}"
+PACKAGE_ARCH = "${MACHINE_ARCH}"
#
# linux-hotplug or none
@@ -87,6 +88,7 @@ RDEPENDS_task-base = "\
\
${@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)} \
@@ -96,6 +98,7 @@ RDEPENDS_task-base = "\
${@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)} \
@@ -159,6 +162,7 @@ RRECOMMENDS_task-base-kernel24 = "\
kernel-module-uinput"
RRECOMMENDS_task-base-kernel26 = "\
+ kernel-module-nls-utf8 \
kernel-module-input \
kernel-module-uinput \
kernel-module-rtc-dev \
@@ -186,6 +190,12 @@ RDEPENDS_task-base-ext2 = "\
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"
@@ -293,11 +303,14 @@ RRECOMMENDS_task-base-usbhost = "\
kernel-module-usb-storage "
RDEPENDS_task-base-uboot = "\
- uboot-utils"
+ u-boot"
RDEPENDS_task-base-redboot = "\
fis"
+RDEPENDS_task-base-apex = "\
+ apex-env"
+
RDEPENDS_task-base-ppp = "\
ppp \
ppp-dialin"
diff --git a/packages/tasks/task-boot.bb b/packages/tasks/task-boot.bb
index fb09ad1a83..5663ff5a3d 100644
--- a/packages/tasks/task-boot.bb
+++ b/packages/tasks/task-boot.bb
@@ -1,5 +1,5 @@
DESCRIPTION = "Basic task to get a device booting"
-PR = "r41"
+PR = "r43"
inherit task
diff --git a/packages/tasks/task-devimage.bb b/packages/tasks/task-devimage.bb
new file mode 100644
index 0000000000..9da765ee94
--- /dev/null
+++ b/packages/tasks/task-devimage.bb
@@ -0,0 +1,26 @@
+DESCRIPTION = "Image for development testing"
+PR = "r2"
+LICENSE = "MIT"
+
+inherit task
+
+DEVIMAGE_EXTRA_RDEPENDS ?= ""
+DEVIMAGE_EXTRA_RRECOMMENDS ?= ""
+
+RDEPENDS = "\
+ devimage \
+ busybox dropbear udev \
+ util-linux-mount \
+ module-init-tools pcmciautils \
+ wireless-tools wpa-supplicant \
+ irda-utils acx-firmware \
+ kexec-tools \
+ ${DEVIMAGE_EXTRA_RDEPENDS} \
+ "
+
+RRECOMMENDS = "\
+ kernel-module-msdos \
+ kernel-module-vfat \
+ kernel-modules \
+ ${DEVIMAGE_EXTRA_RRECOMMENDS} \
+ "
diff --git a/packages/tasks/task-mipl.bb b/packages/tasks/task-mipl.bb
new file mode 100644
index 0000000000..9e2dce52f1
--- /dev/null
+++ b/packages/tasks/task-mipl.bb
@@ -0,0 +1,16 @@
+# Tasks for IPv6 Mobility extensions, needs:
+# CONFIG_IPV6_MIP6=y
+# CONFIG_IPV6=y
+# in the kernel .config
+
+DESCRIPTION = "Mobile ipv6 extensions"
+
+inherit task
+
+PACKAGE_ARCH = "all"
+
+RDEPENDS = "mipv6"
+RRECOMMENDS = "kernel-module-ipv6 \
+ kernel-module-mip6 \
+ "
+
diff --git a/packages/tasks/task-native-sdk.bb b/packages/tasks/task-native-sdk.bb
index d27a855c9d..b840254176 100644
--- a/packages/tasks/task-native-sdk.bb
+++ b/packages/tasks/task-native-sdk.bb
@@ -3,8 +3,8 @@ LICENSE = "MIT"
DEPENDS = "gcc binutils make patch patchutils diffstat diffutils automake flex bison gawk sed grep"
RDEPENDS = "gcc-symlinks g++-symlinks binutils-symlinks make libc6-dev \
flex flex-dev bison gawk sed grep autoconf automake make \
- patch patchutils diffstat diffutils libgcc-s-dev libstdc++-dev"
-PR = "r1"
+ patch patchutils diffstat diffutils libstdc++-dev"
+PR = "r2"
ALLOW_EMPTY = "1"
PACKAGES = "${PN}"
diff --git a/packages/tasks/task-openmoko-base.bb b/packages/tasks/task-openmoko-base.bb
new file mode 100644
index 0000000000..a5d13e7e08
--- /dev/null
+++ b/packages/tasks/task-openmoko-base.bb
@@ -0,0 +1,29 @@
+DESCRIPTION = "OpenMoko: Base Task for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-base
+#
+DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
+RDEPENDS_task-openmoko-base = "\
+ matchbox-panel-2 \
+ matchbox-panel-2-applets \
+ matchbox-keyboard-inputmethod \
+ matchbox-keyboard-im \
+ matchbox-keyboard-applet \
+ matchbox-stroke \
+ openmoko-terminal2 \
+# openmoko-keyboard \
+ openmoko-panel-battery \
+ openmoko-panel-bt \
+ openmoko-panel-clock \
+ openmoko-panel-usb \
+ ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
+ \
+ openmoko-today2 \
+# openmoko-appmanager \
+"
diff --git a/packages/tasks/task-openmoko-examples.bb b/packages/tasks/task-openmoko-examples.bb
new file mode 100644
index 0000000000..c5dbfb6f04
--- /dev/null
+++ b/packages/tasks/task-openmoko-examples.bb
@@ -0,0 +1,6 @@
+DESCRIPTION = "OpenMoko: Examples for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task \ No newline at end of file
diff --git a/packages/tasks/task-openmoko-feed.bb b/packages/tasks/task-openmoko-feed.bb
index 1c97a355f1..e1fbbabfde 100644
--- a/packages/tasks/task-openmoko-feed.bb
+++ b/packages/tasks/task-openmoko-feed.bb
@@ -1,7 +1,7 @@
DESCRIPTION = "OpenMoko: Misc. Feed Items"
SECTION = "openmoko/base"
LICENSE = "MIT"
-PR = "r15"
+PR = "r17"
inherit task
@@ -29,7 +29,6 @@ RDEPENDS_task-openmoko-feed = "\
libsdl-x11 libsdl-mixer libsdl-net libsdl-ttf \
synergy \
tzdata \
- timezones \
tor \
vnc \
wxwidgets \
diff --git a/packages/tasks/task-openmoko-games.bb b/packages/tasks/task-openmoko-games.bb
new file mode 100644
index 0000000000..0fdf3cac33
--- /dev/null
+++ b/packages/tasks/task-openmoko-games.bb
@@ -0,0 +1,14 @@
+DESCRIPTION = "OpenMoko: Games for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-games
+#
+DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
+RDEPENDS_task-openmoko-games = "\
+ oh-puzzles \
+"
diff --git a/packages/tasks/task-openmoko-linux.bb b/packages/tasks/task-openmoko-linux.bb
new file mode 100644
index 0000000000..59e6f24094
--- /dev/null
+++ b/packages/tasks/task-openmoko-linux.bb
@@ -0,0 +1,24 @@
+DESCRIPTION = "OpenMoko: Core system for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-core
+#
+DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services"
+RDEPENDS_task-openmoko-linux = "\
+ task-base \
+ netbase \
+ sysfsutils \
+ modutils-initscripts \
+ module-init-tools-depmod \
+ rsync \
+ screen \
+ psplash \
+ fbset \
+ fbset-modes \
+# update-alternatives \
+"
diff --git a/packages/tasks/task-openmoko-net.bb b/packages/tasks/task-openmoko-net.bb
new file mode 100644
index 0000000000..e75dc4b4ff
--- /dev/null
+++ b/packages/tasks/task-openmoko-net.bb
@@ -0,0 +1,15 @@
+DESCRIPTION = "OpenMoko: Networking for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-net
+#
+DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking"
+RDEPENDS_task-openmoko-net = "\
+ bluez-utils \
+ bridge-utils \
+"
diff --git a/packages/tasks/task-openmoko-phone.bb b/packages/tasks/task-openmoko-phone.bb
new file mode 100644
index 0000000000..49e4e66859
--- /dev/null
+++ b/packages/tasks/task-openmoko-phone.bb
@@ -0,0 +1,18 @@
+DESCRIPTION = "OpenMoko: Tasks for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r72"
+
+inherit task
+
+#
+# task-openmoko-phone
+#
+DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services"
+RDEPENDS_task-openmoko-phone = "\
+ gsmd \
+ libgsmd-tools \
+ openmoko-dialer2 \
+ openmoko-panel-gsm \
+# ppp \
+"
diff --git a/packages/tasks/task-openmoko-pim.bb b/packages/tasks/task-openmoko-pim.bb
new file mode 100644
index 0000000000..1eea1a14a1
--- /dev/null
+++ b/packages/tasks/task-openmoko-pim.bb
@@ -0,0 +1,23 @@
+DESCRIPTION = "OpenMoko: PIM for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+#
+# task-openmoko-pim
+#
+DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
+RDEPENDS_task-openmoko-pim = "\
+ eds-dbus \
+ openmoko-calculator2 \
+ openmoko-contacts2 \
+ openmoko-dates2 \
+ openmoko-feedreader2 \
+ openmoko-browser2 \
+ openmoko-appmanager2 \
+ openmoko-tasks2 \
+ openmoko-mediaplayer2 \
+ openmoko-messages2 \
+"
diff --git a/packages/tasks/task-openmoko-ui.bb b/packages/tasks/task-openmoko-ui.bb
new file mode 100644
index 0000000000..e34bb42b2f
--- /dev/null
+++ b/packages/tasks/task-openmoko-ui.bb
@@ -0,0 +1,56 @@
+DESCRIPTION = "OpenMoko: GUI for the OpenMoko Linux Distribution"
+SECTION = "openmoko/base"
+LICENSE = "MIT"
+PR = "r71"
+
+inherit task
+
+XSERVER ?= "xserver-kdrive-fbdev"
+
+#
+# task-openmoko-ui
+#
+DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface"
+PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
+RDEPENDS_task-openmoko-ui = "\
+ gdk-pixbuf-loader-png \
+ gdk-pixbuf-loader-gif \
+ gdk-pixbuf-loader-xpm \
+ gdk-pixbuf-loader-jpeg \
+ pango-module-basic-x \
+ pango-module-basic-fc \
+ gtk+ \
+ matchbox-wm \
+ ${XSERVER} \
+ xserver-kdrive-common \
+ xserver-nodm-init \
+ xauth \
+ xhost \
+ xset \
+ xrandr \
+ \
+ settings-daemon \
+ notification-daemon \
+ neod \
+ libnotify \
+ \
+ openmoko-session2 \
+ openmoko-sound-system2 \
+ openmoko-sound-theme-standard2 \
+ \
+ gpe-scap \
+"
+
+# Handle theming. FIXME: properly use machine database in a smart way,
+# taking into account not only size but also PPI! Ultimately this might
+# need recomputing some theme files and images on-the-fly :/ SVG and logical
+# theme description anyone? Or simply Edje to the rescue! :D
+THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
+THEMES_a780 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_e680 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_a1200 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre2 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_rokre6 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
+
+RDEPENDS_task-openmoko-ui += "${THEMES}"
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index 76e0b843f7..730ea339aa 100644
--- a/packages/tasks/task-openmoko.bb
+++ b/packages/tasks/task-openmoko.bb
@@ -6,158 +6,26 @@ PR = "r71"
inherit task
-XSERVER ?= "xserver-kdrive-fbdev"
+PACKAGES += "\
+ task-openmoko-everything \
+"
-PACKAGES = "\
+RDEPENDS_task-openmoko-everything := "\
task-openmoko-linux \
task-openmoko-ui \
task-openmoko-base \
task-openmoko-phone \
task-openmoko-pim \
task-openmoko-net \
- \
task-openmoko-games \
task-openmoko-examples \
-"
-
-RDEPENDS_task-openmoko-everything := "\
- ${PACKAGES} \
task-openmoko-debug \
task-openmoko-native-sdk \
"
-#
-# task-openmoko-core
-#
-DESCRIPTION_task-openmoko-linux = "OpenMoko: Linux Core Services"
-RDEPENDS_task-openmoko-linux = "\
- task-base \
- netbase \
- sysfsutils \
- modutils-initscripts \
- module-init-tools-depmod \
- rsync \
- screen \
- psplash \
- fbset \
- fbset-modes \
-# update-alternatives \
-"
-
-#
-# task-openmoko-ui
-#
-DESCRIPTION_task-openmoko-ui = "OpenMoko: The X11/Gtk+2 based native User Interface"
-PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
-RDEPENDS_task-openmoko-ui = "\
- gdk-pixbuf-loader-png \
- gdk-pixbuf-loader-gif \
- gdk-pixbuf-loader-xpm \
- gdk-pixbuf-loader-jpeg \
- pango-module-basic-x \
- pango-module-basic-fc \
- gtk+ \
- matchbox-wm \
- ${XSERVER} \
- xserver-kdrive-common \
- xserver-nodm-init \
- xauth \
- xhost \
- xset \
- xrandr \
- \
- settings-daemon \
- notification-daemon \
- neod \
- libnotify \
- \
- openmoko-session2 \
- openmoko-sound-system2 \
- openmoko-sound-theme-standard2 \
- \
- gpe-scap \
-"
-# Handle theming. FIXME: properly use machine database in a smart way,
-# taking into account not only size but also PPI! Ultimately this might
-# need recomputing some theme files and images on-the-fly :/ SVG and logical
-# theme description anyone? Or simply Edje to the rescue! :D
-THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
-THEMES_a780 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_e680 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_a1200 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_rokre2 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_rokre6 = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-THEMES_magician = "openmoko-icon-theme-standard2-qvga openmoko-theme-standard2-qvga"
-RDEPENDS_task-openmoko-ui += "${THEMES}"
-PACKAGE_ARCH_task-openmoko-ui = "${MACHINE_ARCH}"
-#
-# task-openmoko-base
-#
-DESCRIPTION_task-openmoko-base = "OpenMoko: Top Panel, Application Launcher, Application Manager"
-RDEPENDS_task-openmoko-base = "\
- matchbox-panel-2 \
- matchbox-panel-2-applets \
- matchbox-keyboard-inputmethod \
- matchbox-keyboard-im \
- matchbox-keyboard-applet \
- matchbox-stroke \
- openmoko-terminal2 \
-# openmoko-keyboard \
- openmoko-panel-battery \
- openmoko-panel-bt \
- openmoko-panel-clock \
- openmoko-panel-usb \
- ${@base_contains('MACHINE_FEATURES', 'gps', 'openmoko-panel-gps', '',d)} \
- \
- openmoko-today2 \
-# openmoko-appmanager \
-"
-#
-# task-openmoko-phone
-#
-DESCRIPTION_task-openmoko-phone = "OpenMoko: GSM and GPRS Phone Services"
-RDEPENDS_task-openmoko-phone = "\
- gsmd \
- libgsmd-tools \
- openmoko-dialer2 \
- openmoko-panel-gsm \
-# ppp \
-"
-#
-# task-openmoko-pim
-#
-DESCRIPTION_task-openmoko-pim = "OpenMoko: Personal Information Management Suite"
-RDEPENDS_task-openmoko-pim = "\
- eds-dbus \
- openmoko-calculator2 \
- openmoko-contacts2 \
- openmoko-dates2 \
- openmoko-feedreader2 \
- openmoko-browser2 \
- openmoko-appmanager2 \
- openmoko-tasks2 \
- openmoko-mediaplayer2 \
- openmoko-messages2 \
-"
-#
-# task-openmoko-net
-#
-DESCRIPTION_task-openmoko-net = "OpenMoko: Linux Advanced Networking"
-RDEPENDS_task-openmoko-net = "\
- bluez-utils \
- bridge-utils \
-"
-
-#
-# task-openmoko-games
-#
-DESCRIPTION_task-openmoko-games = "OpenMoko: Games"
-RDEPENDS_task-openmoko-games = "\
- oh-puzzles \
-"
diff --git a/packages/tasks/task-python-everything.bb b/packages/tasks/task-python-everything.bb
index 444eb73781..65dc7661c9 100644
--- a/packages/tasks/task-python-everything.bb
+++ b/packages/tasks/task-python-everything.bb
@@ -1,7 +1,7 @@
DESCRIPTION= "Everything Python"
HOMEPAGE = "http://www.vanille.de/projects/python.spy"
LICENSE = "MIT"
-PR = "ml20"
+PR = "ml22"
RDEPENDS = "\
python-ao \
@@ -9,10 +9,8 @@ RDEPENDS = "\
python-constraint \
python-dbus \
python-dialog \
- python-evas \
- python-ecore \
-# python-emotion \
-# python-edje \
+ python-pydirectfb \
+ python-efl \
python-pycurl \
python-fam \
python-fnorb \
@@ -52,6 +50,7 @@ RDEPENDS = "\
python-pyiw \
python-pylinda \
python-pylint \
+ python-pyqt \
python-pyraf \
python-pyreverse \
python-pyrex \
@@ -74,6 +73,7 @@ RDEPENDS = "\
python-spydi \
python-spyro \
python-sqlobject \
+ python-sword \
python-tlslite \
python-urwid \
python-vmaps \
@@ -88,9 +88,7 @@ BROKEN_PACKAGES = "\
python-egenix-mx-base \
python-gammu \
python-m2crypto \
- python-sword \
python-mysqldb \
- python-pyqt \
python-pyqwt \
"
diff --git a/packages/tasks/task-python-sharprom_20060425.bb b/packages/tasks/task-python-sharprom_20060425.bb
index 25841b357a..5dbd59d18a 100644
--- a/packages/tasks/task-python-sharprom_20060425.bb
+++ b/packages/tasks/task-python-sharprom_20060425.bb
@@ -20,7 +20,6 @@ RDEPENDS = "\
python-ao \
python-constraint \
python-dialog \
- python-egenix-mx-base \
python-fnorb \
python-fpconst \
python-gnosis \
@@ -28,7 +27,7 @@ RDEPENDS = "\
python-irclib \
python-itools \
python-libgmail \
- python-logilab \
+ python-logilab-common \
python-lxml \
python-mad \
python-native \
@@ -53,7 +52,6 @@ RDEPENDS = "\
python-pyweather \
python-pyxml \
python-pyxmlrpc \
- python-quicklauncher \
python-scapy \
python-scons \
python-sip \
@@ -70,6 +68,7 @@ RDEPENDS = "\
twisted \
zope"
+#fixme add python-egenix-mx-base if brought in from nonworking
#fixme add python-pycap once libdnet is in again
#fixme add python-pyx once kpathwhich-native is there
#fixme add packages dynamically
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index ecb3189741..4b8fde02c0 100644
--- a/packages/tasks/task-slugos.bb
+++ b/packages/tasks/task-slugos.bb
@@ -20,20 +20,23 @@ ALLOW_EMPTY = "1"
SLUGOS_STANDARD_RDEPENDS = ""
SLUGOS_STANDARD_RRECOMMENDS = ""
-# diff, cpio and find are required for reflash and turnup ram.
-# Removing these probably leaves the system bootable, but standard
-# openslug and ucslugc stuff won't work, so only take these out in
-# very non-standard turnkey slugos builds.
-#
-# udev is the default way of handling devices, there is no guarantee
-# that the static device table is completely correct (it is just
-# known to be sufficient for boot.)
-SLUGOS_STANDARD_RRECOMMENDS += "diffutils cpio findutils"
+# diff, cpio and find are required for turnup and ipkg.
+SLUGOS_STANDARD_RRECOMMENDS += "\
+diffutils \
+cpio \
+findutils \
+"
# These lines add support for formatting ext2 and ext3 file systems
# on a hard disk attached to the NSLU2. ext3 is the standard Linux
# file system.
-SLUGOS_STANDARD_RRECOMMENDS += "e2fsprogs-mke2fs e2fsprogs-fsck e2fsprogs-e2fsck e2fsprogs-badblocks"
+SLUGOS_STANDARD_RRECOMMENDS += "\
+e2fsprogs-mke2fs \
+e2fsprogs-fsck \
+e2fsprogs-e2fsck \
+e2fsprogs-badblocks \
+e2fsprogs-blkid \
+"
# These lines add support for an X/Y/ZModem package called lrzsz
# (this is of use for people with modified NSLU2 hardware which
@@ -66,7 +69,6 @@ kernel-module-nls-cp437 \
kernel-module-nls-utf8 \
"
-
# Add daemon required for HW RNG support
SLUGOS_RNG_TOOLS_PACKAGE = "rng-tools"
SLUGOS_RNG_TOOLS_PACKAGE_linux-uclibc = ""
@@ -93,6 +95,9 @@ kernel-module-ixp4xx-qmgr \
kernel-module-via-velocity \
"
+# Other candidate packages that have been considered and
+# are intentionally excluded from the base flash image.
+#
# portmap \
# kexec-tools \
# kernel-module-nfs \
@@ -118,7 +123,6 @@ RDEPENDS += "\
module-init-tools modutils-initscripts \
ipkg-collateral ipkg ipkg-link \
beep \
- e2fsprogs-blkid \
util-linux-mount \
util-linux-umount \
util-linux-swaponoff \
@@ -126,6 +130,7 @@ RDEPENDS += "\
${SLUGOS_STANDARD_RDEPENDS} \
${DISTRO_EXTRA_RDEPENDS}"
+DISTRO_EXTRA_RRECOMMENDS ?= ""
RRECOMMENDS += "\
openssh \
${SLUGOS_STANDARD_RRECOMMENDS} \
diff --git a/packages/tasks/task-toolchain-openmoko-sdk.bb b/packages/tasks/task-toolchain-openmoko-sdk.bb
index 945b4774f9..bcb2d370a6 100644
--- a/packages/tasks/task-toolchain-openmoko-sdk.bb
+++ b/packages/tasks/task-toolchain-openmoko-sdk.bb
@@ -26,6 +26,6 @@ RDEPENDS_${PN} = "\
libmokoui2-dev \
libmokopanelui2-dev \
libmokojournal2-dev \
- \
openmoko-sample2-src \
+ openmoko-toolchain-scripts \
"
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-30 14:37:36 +0000