summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--packages/openmoko-apps/openmoko-keyboard_svn.bb19
-rw-r--r--packages/tasks/task-openmoko.bb3
-rw-r--r--packages/tasks/task-slugos.bb7
3 files changed, 26 insertions, 3 deletions
diff --git a/packages/openmoko-apps/openmoko-keyboard_svn.bb b/packages/openmoko-apps/openmoko-keyboard_svn.bb
new file mode 100644
index 0000000000..5bf5bbdd6a
--- /dev/null
+++ b/packages/openmoko-apps/openmoko-keyboard_svn.bb
@@ -0,0 +1,19 @@
+DESCRIPTION = "Matchbox virtual keyboard for X11 - OpenMoko fork"
+LICENSE = "GPL"
+DEPENDS = "libfakekey expat libxft"
+SECTION = "openmoko/input-methods"
+PV = "0.0+svn${SRCDATE}"
+
+inherit openmoko autotools pkgconfig gettext
+
+SRC_URI = "${OPENMOKO_MIRROR}/src/target/${OPENMOKO_RELEASE}/applications;module=${PN};proto=http"
+
+S = "${WORKDIR}/${PN}"
+
+EXTRA_OECONF = "--disable-cairo"
+
+FILES_${PN} = "${bindir}/* \
+ ${datadir}/applications \
+ ${datadir}/pixmaps \
+ ${datadir}/openmoko-keyboard"
+
diff --git a/packages/tasks/task-openmoko.bb b/packages/tasks/task-openmoko.bb
index dc4c7dcb0f..ece303d62a 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 = "r31"
+PR = "r32"
PACKAGES = "\
task-openmoko-linux \
@@ -141,6 +141,7 @@ DESCRIPTION_task-openmoko-demo = "OpenMoko: Demo Applications"
RDEPENDS_task-openmoko-demo = "\
matchbox-desktop \
matchbox-keyboard \
+ openmoko-keyboard \
matchbox-stroke \
matchbox-config-gtk \
matchbox-panel-2-applets \
diff --git a/packages/tasks/task-slugos.bb b/packages/tasks/task-slugos.bb
index 92820e069c..99b9ea44ae 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 = "r5"
+PR = "r6"
PACKAGE_ARCH = "${MACHINE_ARCH}"
ALLOW_EMPTY = "1"
@@ -68,9 +68,12 @@ 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 = ""
SLUGOS_STANDARD_RRECOMMENDS += "\
-rng-tools \
+${SLUGOS_RNG_TOOLS_PACKAGE} \
"
# Add modules required for usb support