diff options
| -rw-r--r-- | packages/p4/p4.inc | 16 | ||||
| -rw-r--r-- | packages/sphinx/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/sphinx/pocketsphinx/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/sphinx/pocketsphinx/cross-compile.patch | 11 | ||||
| -rw-r--r-- | packages/sphinx/pocketsphinx_0.2.bb | 13 | ||||
| -rw-r--r-- | packages/sphinx/sphinxbase_0.1.bb | 13 | ||||
| -rw-r--r-- | packages/tasks/task-bootstrap-unionroot.bb | 10 | ||||
| -rw-r--r-- | packages/tasks/task-bootstrap.bb | 10 | ||||
| -rw-r--r-- | packages/tasks/task-bootstrap.inc | 9 |
9 files changed, 52 insertions, 30 deletions
diff --git a/packages/p4/p4.inc b/packages/p4/p4.inc index 5a0342f14c..9439f73674 100644 --- a/packages/p4/p4.inc +++ b/packages/p4/p4.inc @@ -2,18 +2,10 @@ # Copyright (C) 2006, Advanced Micro Devices, Inc. All Rights Reserved # Released under the MIT license (see /COPYING) -HOMEPAGE = "http://www.perforce.com" DESCRIPTION = "Perforce client and server binaries" +HOMEPAGE = "http://www.perforce.com" LICENSE = "Perforce" -def get_kernelmajorversion(p): - import re - r = re.compile("([0-9]+\.[0-9]+).*") - m = r.match(p); - if m: - return m.group(1) - return None - def p4_arch(d): import bb, re arch = bb.data.getVar('TARGET_ARCH', d, 1) @@ -35,9 +27,8 @@ def p4_arch(d): return "%s%s" % (os, arch) -P4ARCH="${@p4_arch(d)}" -P4BASEURL="http://filehost.perforce.com/perforce/r${PV}/bin.${P4ARCH}" -S="${WORKDIR}" +P4ARCH = "${@p4_arch(d)}" +P4BASEURL = "http://filehost.perforce.com/perforce/r${PV}/bin.${P4ARCH}" #Because these files are all named the same thing, regardless of version or arch PREMIRRORS="" @@ -50,6 +41,7 @@ SRC_URI="\ ${P4BASEURL}/p4ftpd \ ${P4BASEURL}/p4p \ ${P4BASEURL}/p4web" +S = "${WORKDIR}" PACKAGES += " ${PN}-server" FILES_${PN} = " ${bindir}/p4" diff --git a/packages/sphinx/.mtn2git_empty b/packages/sphinx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sphinx/.mtn2git_empty diff --git a/packages/sphinx/pocketsphinx/.mtn2git_empty b/packages/sphinx/pocketsphinx/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/sphinx/pocketsphinx/.mtn2git_empty diff --git a/packages/sphinx/pocketsphinx/cross-compile.patch b/packages/sphinx/pocketsphinx/cross-compile.patch new file mode 100644 index 0000000000..4392204657 --- /dev/null +++ b/packages/sphinx/pocketsphinx/cross-compile.patch @@ -0,0 +1,11 @@ +--- foo/configure.in.org 2006-08-05 15:42:56.000000000 +0000 ++++ foo/configure.in 2006-10-11 22:53:44.000000000 +0000 +@@ -59,7 +59,7 @@ + dnl FIXME: How do we find the installed headers robustly? + dnl + AC_CHECK_HEADER(sphinxbase/sphinx_config.h, +-CPPFLAGS="-I/usr/include/sphinxbase -I/usr/local/include/sphinxbase",[ ++CPPFLAGS="$CPPFLAGS",[ + if test x$sphinxbase = x; then + # Look for sphinxbase in the parent directory + for sb in ../sphinxbase*; do diff --git a/packages/sphinx/pocketsphinx_0.2.bb b/packages/sphinx/pocketsphinx_0.2.bb new file mode 100644 index 0000000000..6b71d2b265 --- /dev/null +++ b/packages/sphinx/pocketsphinx_0.2.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "CMU PocketSphinx - speech recognition engine for handhelds" +HOMEPAGE = "http://www.speech.cs.cmu.edu/pocketsphinx/" +LICENSE = "BSD" +DEPENDS = "sphinxbase" + +SRC_URI = "${SOURCEFORGE_MIRROR}/cmusphinx/pocketsphinx-0.2.tar.bz2 \ + file://cross-compile.patch;patch=1" + +inherit autotools + +do_configure () { + CPPFLAGS="-I${STAGING_INCDIR}/sphinxbase" oe_runconf +} diff --git a/packages/sphinx/sphinxbase_0.1.bb b/packages/sphinx/sphinxbase_0.1.bb new file mode 100644 index 0000000000..1ee41cc485 --- /dev/null +++ b/packages/sphinx/sphinxbase_0.1.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Base library for CMU Sphinx speech recognition engines" +HOMEPAGE = "http://www.speech.cs.cmu.edu/pocketsphinx/" +LICENSE = "BSD" + +SRC_URI = "${SOURCEFORGE_MIRROR}/cmusphinx/sphinxbase-0.1.tar.bz2" + +inherit autotools + +EXTRA_OECONF = "--enable-fixed" + +do_stage () { + autotools_stage_all +} diff --git a/packages/tasks/task-bootstrap-unionroot.bb b/packages/tasks/task-bootstrap-unionroot.bb index 4efa52e00a..5fa26df7dd 100644 --- a/packages/tasks/task-bootstrap-unionroot.bb +++ b/packages/tasks/task-bootstrap-unionroot.bb @@ -13,15 +13,7 @@ PACKAGES = "${PN}" MODUTILS ?= "24 26" -def bootstrap_modutils_rdepends(d): - import bb - m = bb.data.getVar('MODUTILS', d, 1) - r = [] - if '24' in m: - r.append('modutils-depmod') - if '26' in m: - r.append('module-init-tools-depmod') - return ' '.join(r) +require task-bootstrap.inc HOTPLUG ?= "linux-hotplug" diff --git a/packages/tasks/task-bootstrap.bb b/packages/tasks/task-bootstrap.bb index 5f625354d1..a684714418 100644 --- a/packages/tasks/task-bootstrap.bb +++ b/packages/tasks/task-bootstrap.bb @@ -10,15 +10,7 @@ PACKAGES = "${PN}" MODUTILS ?= "24 26" -def bootstrap_modutils_rdepends(d): - import bb - m = bb.data.getVar('MODUTILS', d, 1) - r = [] - if '24' in m: - r.append('modutils-depmod') - if '26' in m: - r.append('module-init-tools-depmod') - return ' '.join(r) +require task-bootstrap.inc HOTPLUG ?= "linux-hotplug" diff --git a/packages/tasks/task-bootstrap.inc b/packages/tasks/task-bootstrap.inc new file mode 100644 index 0000000000..073da7055f --- /dev/null +++ b/packages/tasks/task-bootstrap.inc @@ -0,0 +1,9 @@ +def bootstrap_modutils_rdepends(d): + import bb + m = bb.data.getVar('MODUTILS', d, 1) + r = [] + if '24' in m: + r.append('modutils-depmod') + if '26' in m: + r.append('module-init-tools-depmod') + return ' '.join(r) |