diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2009-11-18 09:15:55 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2009-11-18 09:15:55 +0000 |
| commit | 15387c72d5cf1a77a5a0afa6750dae73a8dbc12f (patch) | |
| tree | ab55e077002322c8f245c79c87c6a6f2f7b0ed2e | |
| parent | 7f3d2b172af63fc894f80eece075434b2c5fbbc5 (diff) | |
| parent | e4e52ba358c094952ec868d32524a26dfa4bae89 (diff) | |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
416 files changed, 4740 insertions, 465 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 15744b50b8..150d4edbb3 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -189,7 +189,7 @@ Recipes: mini-httpd,dmidecode,mktemp Person: Marcin Juszkiewicz Mail: marcin@juszkiewicz.com.pl Website: http://marcin.juszkiewicz.com.pl/ -Machines: progear, alix, at91sam9263ek +Machines: bug, progear, alix, at91sam9263ek Distros: Poky, Ångström Person: Marco Cavallini diff --git a/classes/autotools.bbclass b/classes/autotools.bbclass index a944f0ec9f..1ea4b6f1d0 100644 --- a/classes/autotools.bbclass +++ b/classes/autotools.bbclass @@ -2,8 +2,6 @@ AUTOTOOLS_NATIVE_STAGE_INSTALL = "1" def autotools_dep_prepend(d): - import bb; - if bb.data.getVar('INHIBIT_AUTOTOOLS_DEPS', d, 1): return '' @@ -34,7 +32,6 @@ acpaths = "default" EXTRA_AUTORECONF = "--exclude=autopoint" def autotools_set_crosscompiling(d): - import bb if not bb.data.inherits_class('native', d): return " cross_compiling=yes" return "" diff --git a/classes/autotools_stage.bbclass b/classes/autotools_stage.bbclass index 3007eef969..ff0f4cd880 100644 --- a/classes/autotools_stage.bbclass +++ b/classes/autotools_stage.bbclass @@ -3,4 +3,3 @@ inherit autotools do_stage () { autotools_stage_all } - diff --git a/classes/base.bbclass b/classes/base.bbclass index 3602801f50..384a67d3d6 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -1072,7 +1072,6 @@ sysroot_stage_all() { } def is_legacy_staging(d): - import bb stagefunc = bb.data.getVar('do_stage', d, True) legacy = True if stagefunc is None: diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass index 2ca01996a9..b2ec8255de 100644 --- a/classes/cpan_build.bbclass +++ b/classes/cpan_build.bbclass @@ -12,7 +12,6 @@ INHIBIT_NATIVE_STAGE_INSTALL = "1" # libmodule-build-perl) # def cpan_build_dep_prepend(d): - import bb; if bb.data.getVar('CPAN_BUILD_DEPS', d, 1): return '' pn = bb.data.getVar('PN', d, 1) diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass index 9f51bc0cde..f55ae2c2ae 100644 --- a/classes/gconf.bbclass +++ b/classes/gconf.bbclass @@ -33,10 +33,9 @@ python populate_packages_append () { import os.path, re packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) - workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - schema_dir = '%s/%s/%s/etc/gconf/schemas' % (workdir, pkgdest, pkg) + schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) schemas = [] schema_re = re.compile(".*\.schemas$") if os.path.exists(schema_dir): diff --git a/classes/gettext.bbclass b/classes/gettext.bbclass index bc0a1dfaba..b2ff2849fa 100644 --- a/classes/gettext.bbclass +++ b/classes/gettext.bbclass @@ -1,6 +1,5 @@ DEPENDS =+ "gettext-native" def gettext_after_parse(d): - import bb # Remove the NLS bits if USE_NLS is no. if bb.data.getVar('USE_NLS', d, 1) == 'no': cfg = oe_filter_out('^--(dis|en)able-nls$', bb.data.getVar('EXTRA_OECONF', d, 1) or "", d) @@ -15,4 +14,3 @@ python () { DEPENDS =+ "gettext-native" EXTRA_OECONF += "--enable-nls" - diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index ce78d1f7c9..524c2f0c46 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -27,13 +27,11 @@ done } python populate_packages_append () { - import os.path packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) - workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - icon_dir = '%s/%s/%s/%s/icons' % (workdir, pkgdest, pkg, bb.data.getVar('datadir', d, 1)) + icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1)) if not os.path.exists(icon_dir): continue diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass index 0eb2d9feee..4962fcb7e6 100644 --- a/classes/icecc.bbclass +++ b/classes/icecc.bbclass @@ -33,10 +33,8 @@ def icc_determine_gcc_version(gcc): 'i686-apple-darwin8-gcc-4.0.1 (GCC) 4.0.1 (Apple Computer, Inc. build 5363)' """ - import os return os.popen("%s --version" % gcc ).readline().split()[2] - def create_cross_env(bb,d): """ Create a tar.bz2 of the current toolchain @@ -47,7 +45,7 @@ def create_cross_env(bb,d): if len(prefix) == 0: return "" - import tarfile, socket, time, os + import tarfile, socket, time ice_dir = bb.data.expand('${CROSS_DIR}', d) prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) @@ -97,7 +95,7 @@ def create_cross_env(bb,d): def create_native_env(bb,d): - import tarfile, socket, time, os + import tarfile, socket, time ice_dir = bb.data.expand('${CROSS_DIR}', d) prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) @@ -144,7 +142,7 @@ def get_cross_kernel_cc(bb,d): def create_cross_kernel_env(bb,d): - import tarfile, socket, time, os + import tarfile, socket, time ice_dir = bb.data.expand('${CROSS_DIR}', d) prefix = bb.data.expand('${HOST_PREFIX}' , d) distro = bb.data.expand('${DISTRO}', d) @@ -210,8 +208,6 @@ def create_path(compilers, type, bb, d): """ Create Symlinks for the icecc in the staging directory """ - import os - staging = os.path.join(bb.data.expand('${STAGING_DIR}', d), "ice", type) #check if the icecc path is set by the user diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 950bb9771e..495c3a53aa 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -181,7 +181,6 @@ def package_qa_get_elf(path, bits32): def package_qa_clean_path(path,d): """ Remove the common prefix from the path. In this case it is the TMPDIR""" - import bb return path.replace(bb.data.getVar('TMPDIR',d,True),"") def package_qa_make_fatal_error(error_class, name, path,d): @@ -196,7 +195,6 @@ def package_qa_write_error(error_class, name, path, d): """ Log the error """ - import bb, os if not bb.data.getVar('QA_LOG', d): bb.note("a QA error occured but will not be logged because QA_LOG is not set") return @@ -221,7 +219,6 @@ def package_qa_write_error(error_class, name, path, d): f.close() def package_qa_handle_error(error_class, error_msg, name, path, d): - import bb bb.error("QA Issue with %s: %s" % (name, error_msg)) package_qa_write_error(error_class, name, path, d) return not package_qa_make_fatal_error(error_class, name, path, d) @@ -258,7 +255,6 @@ def package_qa_check_dev(path, name,d, elf): Check for ".so" library symlinks in non-dev packages """ - import bb, os sane = True # SDK packages are special. @@ -279,7 +275,6 @@ def package_qa_check_dbg(path, name,d, elf): Check for ".debug" files or directories outside of the dbg package """ - import bb, os sane = True if not "-dbg" in name: @@ -304,7 +299,6 @@ def package_qa_check_arch(path,name,d, elf): if not elf: return True - import bb, os sane = True target_os = bb.data.getVar('TARGET_OS', d, True) target_arch = bb.data.getVar('TARGET_ARCH', d, True) @@ -339,7 +333,6 @@ def package_qa_check_desktop(path, name, d, elf): """ Run all desktop files through desktop-file-validate. """ - import bb, os sane = True if path.endswith(".desktop"): output = os.popen("desktop-file-validate %s" % path) @@ -353,7 +346,6 @@ def package_qa_hash_style(path, name, d, elf): """ Check if the binary has the right hash style... """ - import bb, os if not elf: return True @@ -400,7 +392,6 @@ def package_qa_check_staged(path,d): to find the one responsible for the errors easily even if we look at every .pc and .la file """ - import os, bb sane = True tmpdir = bb.data.getVar('TMPDIR', d, True) @@ -440,7 +431,6 @@ def package_qa_check_staged(path,d): # Walk over all files in a directory and call func def package_qa_walk(path, funcs, package,d): - import bb, os sane = True #if this will throw an exception, then fix the dict above @@ -463,14 +453,13 @@ def package_qa_walk(path, funcs, package,d): return sane -def package_qa_check_rdepends(pkg, workdir, d): - import bb +def package_qa_check_rdepends(pkg, pkgdest, d): sane = True if not "-dbg" in pkg and not "task-" in pkg and not "-image" in pkg: # Copied from package_ipk.bbclass # boiler plate to update the data localdata = bb.data.createCopy(d) - root = "%s/install/%s" % (workdir, pkg) + root = "%s/%s" % (pkgdest, pkg) bb.data.setVar('ROOT', '', localdata) bb.data.setVar('ROOT_%s' % pkg, root, localdata) @@ -501,9 +490,8 @@ def package_qa_check_rdepends(pkg, workdir, d): # The PACKAGE FUNC to scan each package python do_package_qa () { - import bb bb.debug(2, "DO PACKAGE QA") - workdir = bb.data.getVar('WORKDIR', d, True) + pkgdest = bb.data.getVar('PKGDEST', d, True) packages = bb.data.getVar('PACKAGES',d, True) # no packages should be scanned @@ -522,10 +510,10 @@ python do_package_qa () { continue bb.debug(1, "Checking Package: %s" % package) - path = "%s/install/%s" % (workdir, package) + path = "%s/%s" % (pkgdest, package) if not package_qa_walk(path, checks, package, d): walk_sane = False - if not package_qa_check_rdepends(package, workdir, d): + if not package_qa_check_rdepends(package, pkgdest, d): rdepends_sane = False if not walk_sane or not rdepends_sane: @@ -547,7 +535,6 @@ python do_qa_staging() { addtask qa_configure after do_configure before do_compile python do_qa_configure() { bb.debug(1, "Checking sanity of the config.log file") - import os for root, dirs, files in os.walk(bb.data.getVar('WORKDIR', d, True)): statement = "grep 'CROSS COMPILE Badness:' %s > /dev/null" % \ os.path.join(root,"config.log") diff --git a/classes/kernel-arch.bbclass b/classes/kernel-arch.bbclass index 65d220063e..8894fa554c 100644 --- a/classes/kernel-arch.bbclass +++ b/classes/kernel-arch.bbclass @@ -15,7 +15,7 @@ valid_archs = "alpha cris ia64 \ avr32 blackfin" def map_kernel_arch(a, d): - import bb, re + import re valid_archs = bb.data.getVar('valid_archs', d, 1).split() diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 0dde2d33ca..fe611ab087 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -8,9 +8,6 @@ KERNEL_IMAGETYPE ?= "zImage" # Add dependency on mkimage for kernels that build a uImage python __anonymous () { - - import bb - kerneltype = bb.data.getVar('KERNEL_IMAGETYPE', d, 1) or '' if kerneltype == 'uImage': depends = bb.data.getVar("DEPENDS", d, 1) @@ -309,8 +306,9 @@ module_conf_sco = "alias bt-proto-2 sco" module_conf_rfcomm = "alias bt-proto-3 rfcomm" python populate_packages_prepend () { + import os def extract_modinfo(file): - import tempfile, os, re + import tempfile, re tempfile.tempdir = bb.data.getVar("WORKDIR", d, 1) tf = tempfile.mkstemp() tmpfile = tf[1] @@ -331,7 +329,7 @@ python populate_packages_prepend () { return vals def parse_depmod(): - import os, re + import re dvar = bb.data.getVar('PKGD', d, 1) if not dvar: @@ -385,7 +383,7 @@ python populate_packages_prepend () { file = file.replace(bb.data.getVar('PKGD', d, 1) or '', '', 1) if module_deps.has_key(file): - import os.path, re + import re dependencies = [] for i in module_deps[file]: m = re.match(pattern, os.path.basename(i)) @@ -463,7 +461,7 @@ python populate_packages_prepend () { do_split_packages(d, root='/lib/firmware', file_regex='^(.*)\.fw$', output_pattern='kernel-firmware-%s', description='Firmware for %s', recursive=True, extra_depends='') do_split_packages(d, root='/lib/modules', file_regex=module_regex, output_pattern=module_pattern, description='%s kernel module', postinst=postinst, postrm=postrm, recursive=True, hook=frob_metadata, extra_depends='%skernel-%s' % (maybe_update_modules, bb.data.getVar("KERNEL_VERSION", d, 1))) - import re, os + import re metapkg = "kernel-modules" bb.data.setVar('ALLOW_EMPTY_' + metapkg, "1", d) bb.data.setVar('FILES_' + metapkg, "", d) diff --git a/classes/linux-kernel-base.bbclass b/classes/linux-kernel-base.bbclass index 4e2e2da373..b3e0fdad7a 100644 --- a/classes/linux-kernel-base.bbclass +++ b/classes/linux-kernel-base.bbclass @@ -1,6 +1,6 @@ # parse kernel ABI version out of <linux/version.h> def get_kernelversion(p): - import re, os + import re fn = p + '/include/linux/utsrelease.h' if not os.path.isfile(fn): @@ -30,7 +30,6 @@ def get_kernelmajorversion(p): return None def linux_module_packages(s, d): - import bb, os.path suffix = "" return " ".join(map(lambda s: "kernel-module-%s%s" % (s.lower().replace('_', '-').replace('@', '+'), suffix), s.split())) diff --git a/classes/mime.bbclass b/classes/mime.bbclass index afba5e79a7..2416c1466f 100644 --- a/classes/mime.bbclass +++ b/classes/mime.bbclass @@ -28,10 +28,9 @@ python populate_packages_append () { import os.path, re packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) - workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - mime_dir = '%s/%s/%s/usr/share/mime/packages' % (workdir, pkgdest, pkg) + mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg) mimes = [] mime_re = re.compile(".*\.xml$") if os.path.exists(mime_dir): diff --git a/classes/openmoko-base.bbclass b/classes/openmoko-base.bbclass index 184477b1c0..8cbf7df884 100644 --- a/classes/openmoko-base.bbclass +++ b/classes/openmoko-base.bbclass @@ -4,7 +4,6 @@ OPENMOKO_RELEASE ?= "OM-2007.2" OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk" def openmoko_base_get_subdir(d): - import bb openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") if section == 'base' or section == 'libs': return "" elif section in 'apps tools pim'.split(): return "applications" diff --git a/classes/openmoko2.bbclass b/classes/openmoko2.bbclass index ef734e4311..233c721ff7 100644 --- a/classes/openmoko2.bbclass +++ b/classes/openmoko2.bbclass @@ -5,12 +5,10 @@ OPENMOKO_RELEASE ?= "OM-2007.2" OPENMOKO_MIRROR ?= "svn://svn.openmoko.org/trunk" def openmoko_two_get_license(d): - import bb openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") return "LGPL GPL".split()[section != "libs"] def openmoko_two_get_subdir(d): - import bb openmoko, section = bb.data.getVar('SECTION', d, 1).split("/") if section == 'base': return "" elif section == 'libs': return "libraries" diff --git a/classes/package.bbclass b/classes/package.bbclass index 1c14908f1a..246ecd4ecc 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -27,7 +27,6 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst Used in .bb files to split up dynamically generated subpackages of a given package, usually plugins or modules. """ - import os, os.path, bb dvar = bb.data.getVar('PKGD', d, True) @@ -130,7 +129,6 @@ def package_stash_hook(func, name, d): f.close() python () { - import bb if bb.data.getVar('PACKAGES', d, True) != '': deps = bb.data.getVarFlag('do_package', 'depends', d) or "" for dep in (bb.data.getVar('PACKAGE_DEPENDS', d, True) or "").split(): @@ -148,7 +146,7 @@ def runstrip(file, d): # A working 'file' (one which works on the target architecture) # is necessary for this stuff to work, hence the addition to do_package[depends] - import bb, os, commands, stat + import commands, stat pathprefix = "export PATH=%s; " % bb.data.getVar('PATH', d, True) @@ -253,8 +251,6 @@ def write_package_md5sums (root, outfile, ignorepaths): # def get_package_mapping (pkg, d): - import bb, os - data = read_subpkgdata(pkg, d) key = "PKG_%s" % pkg @@ -264,8 +260,6 @@ def get_package_mapping (pkg, d): return pkg def runtime_mapping_rename (varname, d): - import bb, os - #bb.note("%s before: %s" % (varname, bb.data.getVar(varname, d, True))) new_depends = [] @@ -287,8 +281,6 @@ def runtime_mapping_rename (varname, d): # python package_do_split_locales() { - import os - if (bb.data.getVar('PACKAGE_NO_LOCALE', d, True) == '1'): bb.debug(1, "package requested not splitting locales") return @@ -335,8 +327,6 @@ python package_do_split_locales() { } python perform_packagecopy () { - import os - dest = bb.data.getVar('D', d, True) dvar = bb.data.getVar('PKGD', d, True) @@ -348,7 +338,7 @@ python perform_packagecopy () { } python populate_packages () { - import os, glob, stat, errno, re + import glob, stat, errno, re,os workdir = bb.data.getVar('WORKDIR', d, True) outdir = bb.data.getVar('DEPLOY_DIR', d, True) @@ -595,7 +585,7 @@ fi SHLIBSDIR = "${STAGING_DIR_HOST}/shlibs" python package_do_shlibs() { - import os, re, os.path + import re exclude_shlibs = bb.data.getVar('EXCLUDE_FROM_SHLIBS', d, 0) if exclude_shlibs: @@ -768,7 +758,7 @@ python package_do_shlibs() { } python package_do_pkgconfig () { - import re, os + import re packages = bb.data.getVar('PACKAGES', d, True) workdir = bb.data.getVar('WORKDIR', d, True) diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 4a17010538..2a9bf76a79 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -17,13 +17,11 @@ DPKG_ARCH_i686 ?= "i386" DPKG_ARCH_pentium ?= "i386" python package_deb_fn () { - from bb import data bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d) } addtask package_deb_install python do_package_deb_install () { - import os, sys pkg = bb.data.getVar('PKG', d, 1) pkgfn = bb.data.getVar('PKGFN', d, 1) rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) @@ -39,6 +37,7 @@ python do_package_deb_install () { os.makedirs(rootfs) os.chdir(rootfs) except OSError: + import sys raise bb.build.FuncFailed(str(sys.exc_value)) # update packages file @@ -69,14 +68,13 @@ python do_package_deb_install () { } python do_package_deb () { - import sys, re, copy + import re, copy workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined, unable to package") return - import os # path manipulations outdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1) if not outdir: bb.error("DEPLOY_DIR_DEB not defined, unable to package") @@ -188,6 +186,7 @@ python do_package_deb () { for (c, fs) in fields: ctrlfile.write(unicode(c % tuple(pullData(fs, localdata)))) except KeyError: + import sys (type, value, traceback) = sys.exc_info() bb.utils.unlockfile(lf) ctrlfile.close() @@ -261,7 +260,6 @@ python do_package_deb () { } python () { - import bb if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split() deps.append('dpkg-native:do_populate_staging') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index b48f8781eb..3582195393 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -17,7 +17,6 @@ python package_ipk_install () { # Warning - this function is not multimachine safe (see stagingdir reference)! # - import os, sys, bb pkg = bb.data.getVar('PKG', d, 1) pkgfn = bb.data.getVar('PKGFN', d, 1) rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) @@ -31,6 +30,7 @@ python package_ipk_install () { bb.mkdirhier(rootfs) os.chdir(rootfs) except OSError: + import sys (type, value, traceback) = sys.exc_info() print value raise bb.build.FuncFailed @@ -135,14 +135,14 @@ package_generate_ipkg_conf () { } python do_package_ipk () { - import sys, re, copy, bb + import re, copy workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined, unable to package") return - import os # path manipulations + outdir = bb.data.getVar('DEPLOY_DIR_IPK', d, 1) if not outdir: bb.error("DEPLOY_DIR_IPK not defined, unable to package") @@ -174,10 +174,9 @@ python do_package_ipk () { pkgname = pkg bb.data.setVar('PKG', pkgname, localdata) - overrides = bb.data.getVar('OVERRIDES', localdata) + overrides = bb.data.getVar('OVERRIDES', localdata, True) if not overrides: raise bb.build.FuncFailed('OVERRIDES not defined') - overrides = bb.data.expand(overrides, localdata) bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) bb.data.update_data(localdata) @@ -194,8 +193,7 @@ python do_package_ipk () { except ValueError: pass if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1": - from bb import note - note("Not creating empty archive for %s-%s" % (pkg, bb.data.expand('${PV}-${PR}${DISTRO_PR}', localdata, True))) + bb.note("Not creating empty archive for %s-%s" % (pkg, bb.data.expand('${PV}-${PR}${DISTRO_PR}', localdata, True))) bb.utils.unlockfile(lf) continue @@ -237,6 +235,7 @@ python do_package_ipk () { raise KeyError(f) ctrlfile.write(c % tuple(pullData(fs, localdata))) except KeyError: + import sys (type, value, traceback) = sys.exc_info() ctrlfile.close() bb.utils.unlockfile(lf) @@ -308,7 +307,6 @@ python do_package_ipk () { } python () { - import bb if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split() deps.append('ipkg-utils-native:do_populate_staging') @@ -317,7 +315,6 @@ python () { } python do_package_write_ipk () { - import bb packages = bb.data.getVar('PACKAGES', d, True) if not packages: bb.debug(1, "No PACKAGES defined, nothing to package") diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass index 13cb8773af..ab09bb24d3 100644 --- a/classes/package_rpm.bbclass +++ b/classes/package_rpm.bbclass @@ -10,9 +10,6 @@ RPMOPTS="--rcfile=${WORKDIR}/rpmrc --target ${TARGET_SYS}" RPM="rpm ${RPMOPTS}" python write_specfile() { - from bb import data, build - import sys - version = bb.data.getVar('PV', d, 1) version = version.replace('-', '+') bb.data.setVar('RPMPV', version, d) @@ -50,9 +47,9 @@ python write_specfile() { del files[files.index(r)] except ValueError: pass + if not files and bb.data.getVar('ALLOW_EMPTY', d) != "1": - from bb import note - note("Not creating empty archive for %s" % (bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}', d, True))) + bb.note("Not creating empty archive for %s" % (bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}', d, True))) return # output .spec using this metadata store @@ -154,7 +151,6 @@ python do_package_rpm () { bb.error("WORKDIR not defined, unable to package") return - import os # path manipulations outdir = bb.data.getVar('DEPLOY_DIR_RPM', d, 1) if not outdir: bb.error("DEPLOY_DIR_RPM not defined, unable to package") @@ -209,7 +205,6 @@ python do_package_rpm () { } python () { - import bb if bb.data.getVar('PACKAGES', d, True) != '' and \ not bb.data.inherits_class('native', d) and \ not bb.data.inherits_class('cross', d): @@ -225,5 +220,7 @@ python do_package_write_rpm () { bb.build.exec_func("rpm_prep", d) bb.build.exec_func("do_package_rpm", d) } + do_package_write_rpm[dirs] = "${D}" addtask package_write_rpm before do_package_write after do_package + diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass index a0eacf27f5..9c9ae4ff0a 100644 --- a/classes/package_tar.bbclass +++ b/classes/package_tar.bbclass @@ -1,14 +1,11 @@ inherit package python package_tar_fn () { - import os - from bb import data fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d, True), bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}.tar.gz', d, True)) bb.data.setVar('PKGFN', fn, d) } python package_tar_install () { - import os, sys pkg = bb.data.getVar('PKG', d, 1) pkgfn = bb.data.getVar('PKGFN', d, 1) rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) @@ -20,6 +17,7 @@ python package_tar_install () { bb.mkdirhier(rootfs) os.chdir(rootfs) except OSError: + import sys (type, value, traceback) = sys.exc_info() print value raise bb.build.FuncFailed @@ -39,7 +37,6 @@ python do_package_tar () { bb.error("WORKDIR not defined, unable to package") return - import os # path manipulations outdir = bb.data.getVar('DEPLOY_DIR_TAR', d, 1) if not outdir: bb.error("DEPLOY_DIR_TAR not defined, unable to package") @@ -91,7 +88,6 @@ python do_package_tar () { } python () { - import bb if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split() deps.append('tar-native:do_populate_staging') diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index d6e01da1ce..3b99e39ed9 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -80,8 +80,6 @@ PSTAGE_LIST_CMD = "${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -o ${TMP PSTAGE_TMPDIR_STAGE = "${WORKDIR}/staging-pkg" def pstage_manualclean(srcname, destvarname, d): - import os, bb - src = os.path.join(bb.data.getVar('PSTAGE_TMPDIR_STAGE', d, True), srcname) dest = bb.data.getVar(destvarname, d, True) @@ -92,7 +90,6 @@ def pstage_manualclean(srcname, destvarname, d): os.system("rm %s" % filepath) def pstage_set_pkgmanager(d): - import bb path = bb.data.getVar("PATH", d, 1) pkgmanager = bb.which(path, 'opkg-cl') if pkgmanager == "": @@ -102,8 +99,6 @@ def pstage_set_pkgmanager(d): def pstage_cleanpackage(pkgname, d): - import os, bb - path = bb.data.getVar("PATH", d, 1) pstage_set_pkgmanager(d) list_cmd = bb.data.getVar("PSTAGE_LIST_CMD", d, True) @@ -164,8 +159,6 @@ PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_loca SCENEFUNCS += "packagestage_scenefunc" python packagestage_scenefunc () { - import os - if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0": return @@ -243,10 +236,7 @@ packagestage_scenefunc[dirs] = "${STAGING_DIR}" addhandler packagedstage_stampfixing_eventhandler python packagedstage_stampfixing_eventhandler() { - from bb.event import getName - import os - - if getName(e) == "StampUpdate": + if bb.event.getName(e) == "StampUpdate": taskscovered = bb.data.getVar("PSTAGE_TASKS_COVERED", e.data, 1).split() for (fn, task) in e.targets: # strip off 'do_' diff --git a/classes/packagehistory.bbclass b/classes/packagehistory.bbclass index b435149d22..492bbac218 100644 --- a/classes/packagehistory.bbclass +++ b/classes/packagehistory.bbclass @@ -4,6 +4,7 @@ PACKAGEFUNCS += "emit_pkghistory" PKGHIST_DIR = "${TMPDIR}/pkghistory/${BASEPKG_TARGET_SYS}/" + # # Called during do_package to write out metadata about this package # for comparision when writing future packages @@ -60,8 +61,6 @@ python emit_pkghistory() { def check_pkghistory(pkg, pe, pv, pr, lastversion): - import bb - (last_pe, last_pv, last_pr) = lastversion bb.debug(2, "Checking package history") @@ -71,7 +70,6 @@ def check_pkghistory(pkg, pe, pv, pr, lastversion): def write_pkghistory(pkg, pe, pv, pr, d): - import bb, os bb.debug(2, "Writing package history") pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True) @@ -81,8 +79,6 @@ def write_pkghistory(pkg, pe, pv, pr, d): os.makedirs(verpath) def write_latestlink(pkg, pe, pv, pr, d): - import bb, os - pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True) def rm_link(path): diff --git a/classes/patch.bbclass b/classes/patch.bbclass index bb49fed7a1..33184df0d0 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -4,8 +4,6 @@ QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc" def patch_init(d): - import os, sys - class NotFoundError(Exception): def __init__(self, path): self.path = path @@ -13,8 +11,6 @@ def patch_init(d): return "Error: %s not found." % self.path def md5sum(fname): - import sys - # when we move to Python 2.5 as minimal supported # we can kill that try/except as hashlib is 2.5+ try: @@ -251,6 +247,7 @@ def patch_init(d): try: output = runcmd(["quilt", "applied"], self.dir) except CmdError: + import sys if sys.exc_value.output.strip() == "No patches applied": return else: @@ -364,6 +361,7 @@ def patch_init(d): try: self.patchset.Push() except Exception: + import sys os.chdir(olddir) raise sys.exc_value @@ -454,7 +452,6 @@ PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_staging" do_patch[depends] = "${PATCHDEPENDENCY}" python patch_do_patch() { - import re patch_init(d) src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split() diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index de892b5413..5844461fb4 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -1,5 +1,3 @@ -inherit base - DEPENDS_prepend = "pkgconfig-native " do_install_prepend () { diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index 094f9167bb..a53d12baf3 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -35,10 +35,7 @@ addtask rm_work_all after do_rm_work addhandler rmwork_stampfixing_eventhandler python rmwork_stampfixing_eventhandler() { - from bb.event import getName - import os - - if getName(e) == "StampUpdate": + if bb.event.getName(e) == "StampUpdate": for (fn, task) in e.targets: if task == 'rm_work_all': continue diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 83c03299bf..f65df61c1d 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -11,8 +11,6 @@ def raise_sanity_error(msg): %s""" % msg) def check_conf_exists(fn, data): - import bb, os - bbpath = [] fn = bb.data.expand(fn, data) vbbpath = bb.data.getVar("BBPATH", data) @@ -26,12 +24,12 @@ def check_conf_exists(fn, data): def check_sanity(e): from bb import note, error, data, __version__ - from bb.event import Handled, NotHandled, getName + try: from distutils.version import LooseVersion except ImportError: def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 - import os, commands + import commands # Check the bitbake version meets minimum requirements minversion = data.getVar('BB_MIN_VERSION', e.data , True) @@ -193,10 +191,8 @@ def check_sanity(e): addhandler check_sanity_eventhandler python check_sanity_eventhandler() { - from bb import note, error, data, __version__ - from bb.event import getName - - if getName(e) == "ConfigParsed": + from bb.event import Handled, NotHandled + if bb.event.getName(e) == "ConfigParsed": check_sanity(e) return NotHandled diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 5c929dffcd..93cee4f890 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -16,8 +16,6 @@ # If 'what' doesn't exist then an empty value is returned # def get_siteinfo_list(d): - import bb - target = bb.data.getVar('HOST_ARCH', d, 1) + "-" + bb.data.getVar('HOST_OS', d, 1) targetinfo = {\ @@ -86,8 +84,6 @@ def get_siteinfo_list(d): # 2) ${FILE_DIRNAME}/site-${PV} - app version specific # def siteinfo_get_files(d): - import bb, os - sitefiles = "" # Determine which site files to look for diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 200ff8c228..5aacf92d10 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -5,8 +5,6 @@ EXCLUDE_FROM ?= ".pc autom4te.cache" DISTRO ?= "openembedded" def get_src_tree(d): - import bb - import os, os.path workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: @@ -56,8 +54,6 @@ sourcepkg_do_archive_bb() { } python sourcepkg_do_dumpdata() { - import os - import os.path workdir = bb.data.getVar('WORKDIR', d, 1) distro = bb.data.getVar('DISTRO', d, 1) diff --git a/classes/src_distribute.bbclass b/classes/src_distribute.bbclass index 7d75c9e16f..22044752ef 100644 --- a/classes/src_distribute.bbclass +++ b/classes/src_distribute.bbclass @@ -3,7 +3,7 @@ SRC_DISTRIBUTECOMMAND[func] = "1" addtask distribute_sources before do_build after do_fetch python do_distribute_sources () { - import os, re, bb + import re bb.build.exec_func("do_fetch", d) diff --git a/classes/task.bbclass b/classes/task.bbclass index f3287ebf73..4edd704829 100644 --- a/classes/task.bbclass +++ b/classes/task.bbclass @@ -17,7 +17,6 @@ PACKAGE_ARCH = "all" # to the list. Their dependencies (RRECOMMENDS) are handled as usual # by package_depchains in a following step. python () { - import bb packages = bb.data.getVar('PACKAGES', d, 1).split() genpackages = [] for pkg in packages: diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index d2b2b33898..6c86d44a21 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,6 +1,5 @@ def tinder_http_post(d, server, selector, content_type, body): import httplib - from bb import data # now post it for i in range(0,5): try: @@ -61,8 +60,7 @@ def tinder_format_http_post(d,status,log): for the tinderbox to be happy. """ - from bb import data, build - import os,random + import random # the variables we will need to send on this form post variables = { diff --git a/classes/update-alternatives.bbclass b/classes/update-alternatives.bbclass index c63581c5d1..ddbf4c1947 100644 --- a/classes/update-alternatives.bbclass +++ b/classes/update-alternatives.bbclass @@ -11,7 +11,6 @@ update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} } def update_alternatives_after_parse(d): - import bb if bb.data.getVar('ALTERNATIVE_NAME', d) == None: raise bb.build.FuncFailed, "%s inherits update-alternatives but doesn't set ALTERNATIVE_NAME" % bb.data.getVar('FILE', d) if bb.data.getVar('ALTERNATIVE_PATH', d) == None: diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index 00ec37cfb8..b6491ed9d6 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -41,7 +41,6 @@ fi def update_rc_after_parse(d): - import bb if bb.data.getVar('INITSCRIPT_PACKAGES', d) == None: if bb.data.getVar('INITSCRIPT_NAME', d) == None: raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % bb.data.getVar('FILE', d) diff --git a/conf/checksums.ini b/conf/checksums.ini index 7ce7a86342..8f9d839afb 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -82,6 +82,10 @@ sha256=02f10b35508cb11908bb908156daad1ea5e653840440d62482231efeb4cbe178 md5=24b0e5bbfe21ea9c5a5c589bcc79c0f2 sha256=ab877846c6caaff32efbf5be6fc5c63b7dec97a2e78c57c525da7705d2052bfc +[http://monto.homelinux.org/89notifier] +md5=6a197a3216abfd21ce2ae37b2be8da38 +sha256=7795a3c6339c35d172ced0e43785ff657c1430f9fab7e2e553411529e177e501 + [ftp://download.dre.vanderbilt.edu/previous_versions/ACE-5.6.8.tar.bz2] md5=81c1ff761c3431cd12c81337aa80d558 sha256=96b70582d931a7e83c3ca31b3bc7e23957391e16dee4ae6ddf938c9574d50b27 @@ -294,6 +298,10 @@ sha256=c54e779a720841126e23d692de85243e23b0d94fb7792a958b96b5bd097a8b85 md5=ce018f681b469a1d72ffc32650304b98 sha256=830a1bd6775d8680523596a88a72fd8e4c6a74bf886d3e169b06d234a5cf7e3e +[http://www.diskohq.org/downloads/disko-1.6.0.tar.gz] +md5=c63bad58524501e367af9842f510b458 +sha256=fe578299be4031d0c2454ff4fd3b3034e332260b9695687adf27a776a61eb2e4 + [http://media.djangoproject.com/releases/1.0.2/Django-1.0.2-final.tar.gz] md5=89353e3749668778f1370d2e444f3adc sha256=50a5d228743a69a682899b20141194bf8fd3fd75eaf33ba5f2932f43ea93ea0d @@ -614,6 +622,10 @@ sha256=3d73988ad3e87f6084a4593cc6b3aac63aca3e893d3e9409d892a6f51558e4c4 md5=02816f10f30b1dc5e069e0f68c177c98 sha256=c3de74d62f925e32030adb3d0edcfb3c7a4129fc92c48181a389eeed8f14b897 +[ftp://ftp.freedesktop.org/pub/mesa/7.6/MesaDemos-7.6.tar.bz2] +md5=0ede7adf217951acd90dbe4551210c07 +sha256=2fdf09fd7967fb1946e7f6af07d39c9fb695c373e1bad3855d3c3fbece5badd0 + [http://downloads.sourceforge.net/mesa3d/MesaGLUT-7.0.2.tar.bz2] md5=3a33f8efc8c58a592a854cfc7a643286 sha256=fa31ca39f00ff92c7da59d9993d0eefb8d901eb8a519743942e523fde120eb6c @@ -678,6 +690,10 @@ sha256=a9cc62ab760afeebcb1319a193508734a2d470cab8effab2776a2d3c65bd9cd2 md5=7ecddb341a2691e0dfdb02f697109834 sha256=6e945389add4e5b41f2c403ced13c343767565f2eacde4b16de2d0f9f8a6aac4 +[ftp://ftp.freedesktop.org/pub/mesa/7.6/MesaLib-7.6.tar.bz2] +md5=8c75f90cd0303cfac9e4b6d54f6759ca +sha256=782a7b2810b1c466b3a994eba96485b59b47cc1120c0caa24de1aecf1e013830 + [http://search.cpan.org/CPAN/authors/id/K/KW/KWILLIAMS/Module-Build-0.2805.tar.gz] md5=598bb59b86c2c4842eeffb03392fab5b sha256=8fd609d1e6b460b5c95ad5612cb823aa863d51360ed55caea987909a9bab50f5 @@ -818,6 +834,18 @@ sha256=4e44eb7be990cb62e57840f4b01b6c9af06c4655869d0cb565fc45749c20b82e md5=955082ee50358b1cc3eddcb438b7fae4 sha256=70e7fb5e8cc3a35a04213230e1e4340ddc8766a2615318086da7d51ec930f6f2 +[http://www.packagekit.org/releases/PackageKit-0.5.1.tar.gz] +md5=8575a23e406fffa8d11ba2ad4b5d99f3 +sha256=d6ccb149de52c76993f0ed9a31f44690fa27254f91fe8b69bbd2f99b714aee29 + +[http://www.packagekit.org/releases/PackageKit-0.5.2.tar.gz] +md5=e406ad5e776e31c99e70c7cf6e7bcdc4 +sha256=8defbfdfe6937fd1d4320f2c2e599b5579fec14404a4e920ff2e5ac68516744b + +[http://www.packagekit.org/releases/PackageKit-0.5.4.tar.gz] +md5=330f52c7576e78b270cd78016bb32dc3 +sha256=9d13f59594f00a1f1d67ab1b34208daadac67f7eba59a2bede35eecc287f7542 + [http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/Params-Util-0.20.tar.gz] md5=33c4466239c97cc3e1063eff0577206c sha256=29f7e05045a5699b211d2a8332d36113c22f9c2e96174f40939e79dbc356905d @@ -874,6 +902,10 @@ sha256=ad82569b809e29c19b8223feaa12923f97bb4bbc942ff985857f9d853db489cf md5=104ad743d4bc999796ceff4f39d1003a sha256=593912fdf122d9a1499767bc305ca7b3b688ace7edcb93f53e07202aa1242c58 +[http://pybluez.googlecode.com/files/PyBluez-0.16.tar.gz] +md5=2ce8ff0dbb94c6be14e92e9968f4c914 +sha256=cbe1f076a4947e29ded08ba9dd6dbbb86b25939fb4e50f508dd02f41681554e2 + [http://www.vanille.de/mirror/PyMP3-0.3.4.tar.gz] md5=28e884057750aa4f0da368678e5b20bd sha256=e534ea5505e2d0a571ca8baa4b34260953e796f6c762013756373f13411ebd6e @@ -982,6 +1014,14 @@ sha256=5318946df77937e0b601c95a198790f9ba52d4afb4eb153480289350182bb739 md5=b3db3d60b0ee83f5f23101d2c3bb99e0 sha256=ea1d3a8141654781a0df31e6607c4722436fa33eb2e9934492770b3b61be8122 +[http://downloads.sourceforge.net/project/pythonwebdavlib/pythonwebdavlib/Python%20WebDAV%20Library%20-%200.1.2/Python_WebDAV_Library-0.1.2.zip] +md5=8e49e0ecc5b4327c4f752a544ee10e1a +sha256=72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23 + +[http://downloads.sourceforge.net/pythonwebdavlib/Python%20WebDAV%20Library%20-%200.1.2/Python_WebDAV_Library-0.1.2.zip] +md5=8e49e0ecc5b4327c4f752a544ee10e1a +sha256=72c029ad1e25de950f59c2f1812d009d2c1691b70e4b5b09f1af9006e8fd5f23 + [http://www.stats.bris.ac.uk/R/src/base/R-2/R-2.0.0.tar.gz] md5=3900bca37cabb4b76b8d736d51cc9251 sha256=a06c3546400503e6d4ca4505c3f838b9bbd03fab6a3cbab7993f6d9115b68b64 @@ -1494,6 +1534,14 @@ sha256=bda8a3c42733853444e1d4bee16e85990b78c2eaafc4b26e0769be2e14dab931 md5=9703f591801c5bbded35c9739d04f81c sha256=68b1d0acd1a6e17d91412635cd4f65ba58d293e62a01475a43f3712c49a46e7d +[http://www.delorie.com/store/ace/ace-1.2.tar.gz] +md5=03e5e7ab8ac3acc59661c6e9c09089b7 +sha256=fcda8bca508490bea642c83fcf718565bf4ed4c50f2d7b34761da61fe2e6bc9d + +[http://downloads.vdm-design.de/aceofpenguins-launcher-0.3.tar.gz] +md5=2fe7dcdbbdbf3b2821f627e02c406caa +sha256=13013cd19cb165825f4ef5cc790b0e103705f68ece470fd12012db97e3e60839 + [http://downloads.sourceforge.net/acpid/acpid-1.0.10.tar.gz] md5=61156ef32015c56dc0f2e3317f4ae09e sha256=22703ce0dd7305aca01bc9ac741659c32b1593f1d6fde492df7f01067a534760 @@ -3038,6 +3086,10 @@ sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764 md5=62edc09c9908107e69391c87f4f3fd40 sha256=b1e6d5912546d2a4b704ec65c2b9664aa3b4663e7d800e06803330335a2cb764 +[http://download.tuxfamily.org/blueman/blueman-1.10.tar.gz] +md5=f9058305c42038678d5023fcabba22a4 +sha256=f4a92834a538dc9dbb93fde76933e849b24639faa1721b24549f209b8b590f71 + [http://gpe.linuxtogo.org/download/source/blueprobe-0.13.tar.gz] md5=33745b0e86603124654773c1361df33e sha256=b4318d0e1ba7422ba4415838448718e037efe4d8236cf12132075ccf36d1803d @@ -3454,6 +3506,10 @@ sha256=5ab58cf5738c144f4d85a4a442c2f33be2c4c502dca6e29e0c570c2a51ae6ae9 md5=41d6a2dfe88693b5ec999d9ae4e97aac sha256=e3ff9a7f6dead90d55f1a4a2b1277e3bf5f0ec44ccb6ba8f375acbbedb1263c1 +[http://handheldshell.com/software/fso/btgps.tgz] +md5=6e0443d09448a5cfdb1d560cfd699a6b +sha256=ca567348c1f8d904f50fe06de83959dcc5b840e12e336251ab216ca5304e3bf0 + [http://www.pentest.co.uk/src/btscanner-1.0.tar.gz] md5=6bfaaad5a3730f10d07500fb3ec8c797 sha256=ca7349c3621c929f9fda0345991b35f8a0d38d4a88b6c89b7ca50a7dbcc08832 @@ -3654,6 +3710,10 @@ sha256=1ea5bd257f755ffcae2c7a1935c37147c7392478922410e0870361eea08b6c27 md5=63220327925ace13756ae334c55a3baa sha256=1dfc4903dc0172286df4f1740fd0f12749ac81d51c602290b47cbe83d51e1d56 +[http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-0.99.4/cacao-0.99.4.tar.gz] +md5=c5e6525c5212ddbb6026e4a7cde37ca6 +sha256=c6090c1d2ed3c60acda0076b62563598267be8dab270ce49ee1035002a2510cf + [http://cairographics.org/releases/cairo-1.2.2.tar.gz] md5=2460487b1257a5583c889b1b9d2033ec sha256=9d53b8dd0bf76dd0da7cdbe65a6c6934be49bd3942dc5f7ef7bbcc7529d9ee02 @@ -3798,6 +3858,10 @@ sha256=015c4237a532b873990aeeecdf351138ce5a811d062d6db73c611a4985de5435 md5=b8c51a2e3cccb381428426c0fc543244 sha256=f1e44d628cc4cbac192bf33f492ad8d1e1988cae576924128df36f3638e9a485 +[http://alioth.debian.org/download.php/2924/ccid-1.3.10.tar.bz2] +md5=92220d7b7b0aae7bc141b09ba529458c +sha256=54610f1a6cd65e8d2b5cb9f7917e509ebcdf130a565e71e06ad4e65ed0dad5ec + [http://alioth.debian.org/download.php/2482/ccid-1.3.8.tar.bz2] md5=ebb5fc927d73cd63737a9114481e8957 sha256=8cb892ef36321069eff7826aa732f1481715fe54bf96346fae1d25565b44c536 @@ -3850,6 +3914,10 @@ sha256=548b5b402ee5fff34fe428eb69de560b56709337cd70c600ad21686c1321dd66 md5=7b19b6f68d2c648296378b784d5f7681 sha256=73de81ea2de2eae64b888e1b2739ef643ccea13c79790569f8e6278369976a21 +[http://ch.omoco.de/cellhunter/files/cellhunter-0.5.0.tar.gz] +md5=1ac5c56a85fb12bea0bf0a4a2ea664de +sha256=1210dab4e3b23c2a5083d12e9c1527bf099a89f06867e1210b7d9992204c24f8 + [http://pub.risujin.org/cellwriter/cellwriter-1.3.3.tar.gz] md5=09b2019e926d5ef42d52edb2dd33ceae sha256=3fb7c11ec5d802338a0bf522b11702c37820597c9a2c36f89b52872c6571e602 @@ -5234,6 +5302,10 @@ sha256=c5d49b39c5998bcecd124c05cc6f096d22ccdc378ad455214611ae41a2f4b7d9 md5=8ce5945be0660bd3152bd9eb0827f945 sha256=e3968765ed916b348fce5e309029d25d068a61e1d422a69a506d0fc80ee6e976 +[http://home.htw-berlin.de/~s0526295/dictator-0.2.tar.gz] +md5=8f5cb1d0b7c7d5437b260d9ba5362c74 +sha256=e43251af443eb72a803a6aac3e984feb1f5df8124c64b55fceac6140ab76161e + [http://didiwiki.org/sources/didiwiki-0.2.tar.gz] md5=a8643526ced64ed066df407e013259e3 sha256=a87cdc67ad367d6bde595811e7869f5c4715e4baeec7261bcfe45ab42621543a @@ -5326,6 +5398,10 @@ sha256=bd72287adedccf493f046f0e6ca29ef47f2cd3741c62a98d5eb82a9068846b73 md5=b65233d368bbd265a55effcf2c17f84b sha256=47e695a5d370eb656f5e41eeb917ad6281b1559bf60172c9eca89b5518a9f9b9 +[http://www.dillo.org/download/dillo-2.0.tar.bz2] +md5=bb9999cabeb4db3d915687de465dbeb0 +sha256=847d1db31bd68ab9ab94b642b0cd40ac8d3cf816900f5d5652124986601df1e9 + [http://dircproxy.securiweb.net/pub/1.1/dircproxy-1.1.0.tar.gz] md5=066bd39d80f286ae5ce69a2adbbd01e4 sha256=f0be78d2c2f0279cce26b0b2e87077bfe568f1da189eef2daec78b1e12699c4e @@ -6126,10 +6202,18 @@ sha256=17c450622752cbda0e41fffd496d3022a533659f3db942e14da8015c47623856 md5=408d3c63f9efa06e93e29a691c28985e sha256=6f40962eb8d76e0e9d76ec9f461d62c6af8561028d194358aed001827cc418fc +[http://downloads.sourceforge.net/project/epydoc/epydoc/3.0.1/epydoc-3.0.1.tar.gz] +md5=cdd6f6c76dd8bab5e653a343a0544294 +sha256=d4e5c8d90937d01b05170f592c1fa9b29e9ed0498dfe7f0eb2a3af61725b6ad1 + [http://www.inf.fu-berlin.de/~rschuste/er-refresh-tools-1.3.1.tar.gz] md5=f100632e67f94ef4fffa4da32d25427a sha256=748359a51e008c179dc5dd5e2974f4b1279c78e09a2613a73d15cd22cb55e8d8 +[https://garage.maemo.org/frs/download.php/4737/erminig_3.0.3-3.tar.gz] +md5=d710853b0559c9919c730e503c0f05e2 +sha256=45490d585d62e2a36d202f7ca9b91883f257c24b51471894bf23b64e76ba89c9 + [http://www.burghardt.pl/files/esekeyd-1.2.4.tar.gz] md5=5eb8d1b02cdd99d0681e946768e529db sha256=7267db1685b04e766b782e4c5aab9729bf3f23b86d568a3a513c77eb91aaed03 @@ -6666,6 +6750,10 @@ sha256=c18e6f23315e0a3526229bd0ba5cf8ce0d747cb5e5ba7cb952ad08c85a1cafac md5=1b84621072b4f906b5686a4fbae0b1d7 sha256=d06e7244dcd2b462c0e7bea0d01edadb54905f4533afc45f971ab9f6ee46497c +[http://projects.openmoko.org/frs/download.php/832/ffalarms-0.2.2.tar.gz] +md5=6f03b9663245b93e8370e43cc556dba1 +sha256=df0561124faa5c2e64038f5efcf39432c4795829115b86819083ae66b001899a + [http://downloads.sourceforge.net/ffmpeg/ffmpeg-0.4.9-pre1.tar.gz] md5=ea5587e3c66d50b1503b82ac4179c303 sha256=0e9e771114a75c461e813538f129eb05a251b8fc6591a5563420700b8e312da0 @@ -6734,6 +6822,10 @@ sha256=21e68eeb291ab5a9f4d618f2985c16c26cdfeb0f0f37d3b88550446678dab30a md5=24e76434ca74ba3c2c6ad621eb64e1ff sha256=1a9ed8db0711f8419156e786b6aecd42dd05df29e53e380d8924e696f7071ae0 +[ftp://ftp.gnu.org/gnu/findutils/findutils-4.4.2.tar.gz] +md5=351cc4adb07d54877fa15f75fb77d39f +sha256=434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a + [http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/1.0.7/source/firefox-1.0.7-source.tar.bz2] md5=5704a8c36de84b408e069afb0c5bc1df sha256=10056021004ae378baed886358dc4468af60eafbaa9fcac93401e4db9b9ef7fd @@ -8146,6 +8238,10 @@ sha256=00f2b73fea5eff79ae26338928187f956427421bc70ddab0ab63fe5a58112b87 md5=1939de5fe43d12884d85fa5d7797e3c2 sha256=243dabf3c45530cac8be092f9a1d838a46b46a92d4138870423006ffd6ae4001 +[http://gdata-python-client.googlecode.com/files/gdata-2.0.1.tar.gz] +md5=d646b8f6e32911df61ea0e7379b4bc35 +sha256=a9dba7645ccda502bfeedd3d15f34672b3dec668d8953188b87df36f17c6b849 + [http://gdata-python-client.googlecode.com/files/gdata.py-1.2.4.tar.gz] md5=521f33a377d64f8a6505ba119415b787 sha256=fc5ddb8f76b17abd728721a0e0177ea35f55a70106f44dc9010b22eceb06abde @@ -11850,6 +11946,10 @@ sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f md5=faa08f321fefd2c61ce4c9355a62fe31 sha256=ca7ef124cde06883fbf28c7e78ce1e4c5526434bbe5672ef0a3e85a61a9d0b5f +[http://isteve.bofh.cz/~isteve/hotplug2/downloads/hotplug2-1.0-beta.tar.gz] +md5=353656ea499d395260c0de143983da4d +sha256=54e2fa375506d92a8ac94b5ed332c4c0bf1b69c252692b332c92702670bba583 + [http://www.porchdogsoft.com/download/howl-0.9.7.tar.gz] md5=85fbe016e2ebad99108b1212ae4b1d6f sha256=f8766c44291aac92b2b4abc762e1b11e3504dd9f2a855fdde371b5abd730fe9f @@ -14230,6 +14330,10 @@ sha256=c3540df46bd9716c6a6f521806c70ae548822a5e62d245900cc28b5fa9fc3eb3 md5=f02bfa27a21b3040089026975b9dc0b8 sha256=5677f32eff184883d7ca402234f92142f35bea7d04d503becdd104ae8343cb1c +[http://www.hyperrealm.com/libconfig/libconfig-1.3.2.tar.gz] +md5=094a82afd382aa2305c6cc3c06025c2d +sha256=2a680bb33e290c3c799e3a90cf2c0fb9f5482dd930ad93d9f83ce39923258c0a + [http://repository.maemo.org/pool/maemo4.0/free/source/libc/libconic/libconic_0.13-0.8.tar.gz] md5=b4078390c459ae4df3acdabca36f53da sha256=1ee5bf796367d27987098f73dad866359e188cafe32f1871c12b4469f262c846 @@ -14686,6 +14790,10 @@ sha256=01cb83ef0e765c9856bed79c18a766eed2027f2b2576e8eaa14e02c15c7658fd md5=1ac35c278299fcbc69b7dde79a642d89 sha256=26c7d9c1b7a41f28fea5213484b274be55dcf2bbf5eac723ad795c0c5fb85df6 +[ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.1/libgee-0.1.6.tar.bz2] +md5=9bf21c1d832fc0313d08829446983fe6 +sha256=d319b87691dfae207d1deeb4ff8bd9e342c1b85d9277be25defb402ae10b496d + [ftp://ftp.gnome.org/pub/GNOME/sources/libgee/0.3/libgee-0.3.0.tar.bz2] md5=1ca2b8a87950ef1b14342fb32db3e558 sha256=fd373e48bbe7a8f4903bd405f6310223321bc1ab22c7c3a7bc6ab0a11256b597 @@ -15190,6 +15298,10 @@ sha256=7f1fa404e5540c880cc747c4a680a89d88b87b10a1c77655f512780fcb0ca5d0 md5=87d48321bff08de08794132d60b55d94 sha256=7f1fa404e5540c880cc747c4a680a89d88b87b10a1c77655f512780fcb0ca5d0 +[http://downloads.sourceforge.net/freeassociation/libical-0.44.tar.gz] +md5=e0403c31e1ed82569325685f8c15959c +sha256=20a4750df8f4dedd718b55117b8351989e0dfa4ad2c966a383550ed43e6a72d8 + [ftp://ftp.gnu.org/pub/gnu/libiconv/libiconv-1.11.tar.gz] md5=b77a17e4a5a817100ad4b2613935055e sha256=fbf5b9a63ea6e3abebfabc04506f0e18a2860071031e34ea4ad4f450b8c43d4b @@ -15218,6 +15330,10 @@ sha256=63da4f6e7997278f8a3fef4c6a372d342f705051d1eeb6a46a86b03610e26151 md5=440835808c577073db7d571357223dce sha256=4f707c189259d7b3dda908d78a995366d388fe051aa3554b82cb324426997a23 +[http://josefsson.org/libidn/releases/libidn-0.5.19.tar.gz] +md5=440835808c577073db7d571357223dce +sha256=4f707c189259d7b3dda908d78a995366d388fe051aa3554b82cb324426997a23 + [ftp://ftp.gnu.org/gnu/libidn/libidn-1.15.tar.gz] md5=482a25b7b223e52f967fafd284a1a992 sha256=db75022eff366bd5646ab1e6d7bcd1c2048473a7dbdf0cd0421de92c88bbdc18 @@ -15850,6 +15966,10 @@ sha256=59ded160b3547d29e37cc9d06359f7f37d94112214e4532430cd65e704c1339a md5=774eabaf33440d534efe108ef9130a7d sha256=004dae11e11598584939d66d26a5ab9b48d08a00ca2d00ae8d38ee3ac7a15d65 +[http://xcb.freedesktop.org/dist/libpthread-stubs-0.2.tar.bz2] +md5=2ba9ce2d46da0a2a1090384ece3387ff +sha256=d4c47c24e5ec07e974a7ef8f55b2907dd7fa8de82e291a02b15f8c4a7028bf48 + [http://gpephone.linuxtogo.org/download/gpephone/librecord-0.1/librecord-0.1.tar.bz2] md5=a9e90187c1dc183f497bcae34718e415 sha256=6fb70d0b8f410f05988e1f3a3e8c86990c3e84c9958041803e6d0658faae91ea @@ -16210,6 +16330,10 @@ sha256=e234d314f0bdfcc54f52111519624fcd3d1ff37a267c39848b5de7a272367976 md5=8c8d1f7378734231fd0458569346b9d4 sha256=9269060f1a8c36c66748520a44d6ffc5059ae736de1e282bb8b6fd65d7890813 +[http://tinymail.org/files/releases/pre-releases/v0.0.9/libtinymail-0.0.9.tar.bz2] +md5=674db3cb4750ba0a3e90aa95ec28bcc7 +sha256=82c4fa4315807af48ed0585b6efd03a42022016364474ead931634e689bce9a5 + [http://gpe.linuxtogo.org/download/source/libtododb-0.07.tar.gz] md5=5df2e1f7564d066dce6ec24344605528 sha256=bc3fb1a20ec97149f6e81285a22bdc48fea9c4fbc9abad6919b87ce2f44acbc3 @@ -16778,6 +16902,10 @@ sha256=9f141c606cc93d0550eeb3532626f26ced56687c2bc9f2b8dad387798b929340 md5=fb345125e23c787df0818ff7caad5515 sha256=ba1c32207fd62d374c9397a81fb1247da93edb859e30d0d855dc65e5457f690b +[http://download.savannah.nongnu.org/releases/linphone/3.1.x/sources/linphone-3.1.0.tar.gz] +md5=ed40cf4088c306400b005bbd63ac36be +sha256=e41e99925e8c81a9e6c7f4cf399da1d9f571927413196898af46ecbebee6a91b + [http://developer.ezaurus.com/sl_j/source/c860/20031107/linux-2.4.18-rmk7-pxa3-embedix-slc860-20031107-rom1_10.bz2] md5=d74fc9ea01384bead3925434b932d6b7 sha256=3dcafe41355fcc688f4a376a5dc71901ea2fbb95698397c87c6a6b12aa058c69 @@ -17154,6 +17282,10 @@ sha256=ee3edf1ea89a90f2b7f82ad09b83c25dc8ea8ca7cf0fce2aa921f897929b2bb9 md5=6f15406664ef31172c68d46567569bb8 sha256=9532b981c9b8974ceedd3d25a8f9a0e167a92c9da0dece47f34a4ec34e34b1cf +[http://www.angstrom-distribution.org/unstable/sources/live.2009.06.02.tar.gz] +md5=088f848b64cef1d54034bc24cfa3c156 +sha256=66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758 + [http://www.live555.com/liveMedia/public/live.2009.06.02.tar.gz] md5=088f848b64cef1d54034bc24cfa3c156 sha256=66c54241bfcc7ea42fe40e1c93739be79a3c065390c4163c0f2647ac45c24758 @@ -18598,6 +18730,10 @@ sha256=ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0 md5=bac989c74ed10f3bf86177fc5b4b89b6 sha256=ab4c9191645f9ffb455ae7c014d8c45339c13a1d0f6914817cfbf30a0bc56bf0 +[http://projects.openmoko.org/frs/download.php/271/mofi.0.02.tar.gz] +md5=3a2efecc54880a6708d7ddfa88df3df9 +sha256=33a25af95a6aa3a810f5fdf0070ba7744988ad8c60cfc38193ed79b8b4059c9f + [http://downloads.sourceforge.net/moin/moin-1.2.2.tar.gz] md5=4032f2305a3393ab18e02efe6550e1aa sha256=8447eb112e0e42db59e490fa98b0a1c9ed90ff3660b99734fe5119061eddce8e @@ -18610,6 +18746,10 @@ sha256=569c9b4f7b2cf411718a3ac5e6427c1babacbaf1b085276f822d8d08040e4a8f md5=4a0dbe4e0cfdc15d30958bdc571bbfd7 sha256=2492f6bd7e2140e62436f11e14b21ec36d17d784fa8271e61f8f06012c83a1d2 +[http://mokomaze.projects.openmoko.org/files/mokomaze-0.5.5+git8.tar.gz] +md5=f4e1dbd444b4049c361f9c1c3d40d32b +sha256=515d842b79a2c34f5789fa10110bc9d7b15c65a7b1fa623131a1e03599fe7362 + [http://www.tildeslash.com/monit/dist/monit-4.10.1.tar.gz] md5=d3143b0bbd79b53f1b019d2fc1dae656 sha256=f6a29300648381538a403f24506e75b94164e26c69c6861ca112d425edc9d193 @@ -19450,6 +19590,14 @@ sha256=a187976c1957a7a0e17014ed97cbb4341f6898d5f60301f1b0c37e52188ebd13 md5=7fa369bff1031acbe4ca41f03bee7d02 sha256=53d2f92c3d14423b49c2ff077855cf3987d38def963c82fd26fba5de379ca540 +[http://monto.homelinux.org/notifier] +md5=24d87301da8843e2dbc3330ece57677f +sha256=896c6942a9a3b0b2d6846eab1de8c471c9fcf860ca182ce18e12f1ce255f42cc + +[http://www.galago-project.org/files/releases/source/notify-python/notify-python-0.1.1.tar.gz] +md5=8f0ef0939cc8edd2efd896ce5ba80cf4 +sha256=8c5ee28017fdc5b110c31cb76503e535e15e0c60b9a1f1e95ff6c018dd806022 + [http://hauppauge.lightpath.net/de/nova-pci218c.exe] md5=139a1ed50a1a12e47b1f7deedf4f40c3 sha256=4310a3a526ae5461e17f57353fc29f71d13820a215eaa62c629190cc2a026173 @@ -19678,6 +19826,10 @@ sha256=b99b6e2c1a0977fbe2f0c19210694ed44ff182d17d3920c485fb6ce725b89816 md5=6b11065c9dbd3c9743d234c2f785fb7b sha256=fb093e267e5b9656f767896a33d664e5ee921e28898a481542bdb4db31f7604e +[http://downloads.sourceforge.net/opende/ode-0.11.1.tar.gz] +md5=5f79628b7b10a7a59092759a5af77775 +sha256=4c225b76d57a5a8094653fba48f3169ac1a99622f3ce98f2be55fbd5a1b76519 + [http://downloads.sourceforge.net/opende/ode-0.5.tgz] md5=b33b21e04ee9661f27802b6b6c8eefd2 sha256=5388c4cd4666f270f18216c90ab6526229c53fdc7e82f93ddb0824e69521df1c @@ -19854,6 +20006,10 @@ sha256=a898b79336c7372c901bcc7e5f83db7b8e79f8e864be6a262f515b3e088bc607 md5=5c9c1639bdff3bd35c63697d398f1a68 sha256=3d6c58830e50373d0dc2a72f6fc65afd7ef30aabf2d1078e6878c911270dec16 +[http://downloads.sourceforge.net/myposition/openbmap-logger-0.3.2.tar.gz] +md5=edeea53ea62d241d472912417b5cc248 +sha256=0a6bf110bf108416d85aabd42f01e52860be26a45bd1f0c7fb76252d47f9b19f + [http://downloads.sourceforge.net/myposition/openbmap-logger-0.4.0.tar.gz] md5=52b71c33ce0d2da8d5c29db293132630 sha256=93820366128b394d84b1b37830344b70f349c2896b60b601e884f9d857ff5d84 @@ -20134,6 +20290,10 @@ sha256=2997613ab33ad42dc8269a63b7c40a6938b3552e196780a4a269cc7340dd23bd md5=9613e6be14ba7a0ca5d42a88e6ed3516 sha256=45145ea27333be1552624065297b4d9d76feadf2a4a89fdf0ddafc830ced3a98 +[http://projects.openmoko.org/frs/download.php/581/orrery_2.4_clean.tar.gz] +md5=03da10cffda64a0927a1d929c20eb8f8 +sha256=0a8fd606d12b98e439a95d608c317849b7fe151dca8e1b8b3dee329a3a75292b + [http://download.savannah.nongnu.org/releases/linphone/ortp/sources/ortp-0.13.1.tar.gz] md5=293f16da6dd434e68652f0f725b7f97c sha256=2ba471a2a4f1d7f10fb70de5b68dbb7d32b43494efcecb88b3bd8445f630494c @@ -21154,6 +21314,10 @@ sha256=a2d8473577c2b3b51ebf29e2c6cb31463158676a5d5b44438ff0db18e8aab949 md5=1d5e267c57b126038689ce3bf26eea24 sha256=468f25a70ef2dac90088caa6599c41ade6768e0cdc328dc3e82ab578903e69d4 +[http://projects.openmoko.org/frs/download.php/907/pisi-src-0.4.7.tar.gz] +md5=8d47a6a2926c635cb4eb633e3ee063ce +sha256=fd4d89c138ef2d1a6f9458cb85363581a205d1c1b69578fe7e0f856668a7fe9a + [http://xorg.freedesktop.org/releases/individual/lib/pixman-0.10.0.tar.bz2] md5=fb23e17a8a0308e8fad6dc153753ba9a sha256=2b841f49b245948b8739e55f1b663687d5b33eb2767833574f9a1f0904a1d1e4 @@ -22030,6 +22194,10 @@ sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1 md5=d2aa74615aa9cf23413975a68613ffc1 sha256=12527f130dd695184c44c6197deb619c26c9b5b31ce7699a5dd97e0ad2dd7bd1 +[http://twhiteman.netfirms.com/pyDES/pyDes-1.3.1.tar.gz] +md5=e499fdde54e98be87324c0322311e034 +sha256=4f1aae18f2aabb3559b8878d95a7228ebe6633fc4a88905935354ccdf2accc32 + [http://downloads.sourceforge.net/pyopenssl/pyOpenSSL-0.6.tar.gz] md5=af67fda6d2125cae9c56ee50430a40c7 sha256=58ee9dd10fbd97d65347626f60a38aafdcb05d19ad90c883c4284266ba7ec959 @@ -22230,6 +22398,10 @@ sha256=03a605f106e30bea448b04007635a21140eeaba4c8844188d661c3b133cbee89 md5=89afe242275a3fce57b4ffb5fadc5888 sha256=ab9ad4481af435894db27e78010f6bbc21c62252dbe7a254121453419edde8f5 +[ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.16/pygtk-2.16.0.tar.bz2] +md5=bd0d437fefd6d5390f5d770a495cd50c +sha256=7fae5e01af217a01738eae41c38ad7f86d1f538f444300d0fa2847aafb7444a8 + [ftp://ftp.gnome.org/pub/gnome/sources/pygtk/2.6/pygtk-2.6.3.tar.bz2] md5=5acd4a4f5807f93a80389c1e9af48808 sha256=1cd8e9bb0a011317862aec90a03e562bebbbf7fcf865a8ff12992548cdda746d @@ -22338,6 +22510,10 @@ sha256=703b204bd1d57b1bfc0ba95246d229a599259b782ee18072d6041656d412073b md5=499cfc69b3cacbdf70a32f253b4a0eb1 sha256=cb5a5855c68743622b1902c7c106b30316c623c265906f2acb2fa2c9d97b3f37 +[http://handheldshell.com/software/pyring_1.1.10.tgz] +md5=d6d2a16ccd1562b2ae63314f30a4ebf9 +sha256=45b73399b8affd1a81ecd370d37e066c046c49e1777b43d0affe6b520082a604 + [http://www.vanille.de/mirror/pyserial-2.0.tar.bz2] md5=a8db6163466c21845faa6ef57af992da sha256=df76084516b34b5e04dd84e54ef38613d87c56bc04de3d0a711f72fb6707ab0b @@ -22386,6 +22562,10 @@ sha256=85bbe7a9fb6617e24bb4dbef528af8ef6eae07f8809dcd05ec926142feca7714 md5=975e5449d6670dd19498bb9ec4856d39 sha256=0d904161351a8e55b272ed9691b12dca4278bed62fde53ba2a36f479996db910 +[http://labix.org/download/python-dateutil/python-dateutil-1.4.1.tar.gz] +md5=2a5f25ab12fcefcf0b21348f2d47595a +sha256=74b615c6a55b4421187feba1633fc233e7c5ebdd7abe9b092447a32946823357 + [http://downloads.sourceforge.net/python-fam/python-fam-1.1.1.tar.gz] md5=f6c760c6d8e5ea69a3fce029f7973558 sha256=139f069a4455560a8c68c4c18569f2cb453eeda33d522862f7a4af13932d9cdc @@ -22426,6 +22606,10 @@ sha256=f1f472a698966b0350857b20fc7f6dd86e4a1f83870edfbe30eb36552b449680 md5=7e4fc4b5382c6b54ede8b6e29270cba8 sha256=f1f472a698966b0350857b20fc7f6dd86e4a1f83870edfbe30eb36552b449680 +[http://pypi.python.org/packages/source/p/python-ldap/python-ldap-2.3.9.tar.gz] +md5=a9f9f16338288d118a1ae6266c993247 +sha256=62f75b21c5ee744408c9d8b59878328b3bdf47899d30e8abf0c09b3ffb893ed4 + [http://opensource.bolloretelecom.eu/files/python-netfilter-0.5.4.tar.gz] md5=2029edea09db0829f16b06042c0004ed sha256=1ef9ca0508159cc63e1cd097a204664b99eedfa596d326866c8fce9b30715379 @@ -22438,6 +22622,10 @@ sha256=bce93266c593d79d7083052a6cae516de3d6c3e5bda277f664785d30157b8ac7 md5=0df3d1c5109bb88d06575d70513a190c sha256=8ff2ec30050803e8b60cfb05d24fa32b3d175bffb81ef5919c3db4ac0f263df8 +[http://pypi.python.org/packages/source/p/python-wifi/python-wifi-0.3.1.tar.gz] +md5=0458e32f82900e03c9fd155442242638 +sha256=a7087ac16ce2d1f146dd76cbfc442ae5b91774f4b8c8eba913c09d0c325eb12f + [http://download.sugarlabs.org/sources/external/python-xklavier/python-xklavier-0.2.tar.gz] md5=5b3cd1832f4d37dfa48490759f3bd3be sha256=b71096448ca9d7933fbc4aff13cef95a5878f49e4c25f20f815dd1f8f635b6d6 @@ -22854,6 +23042,10 @@ sha256=73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc md5=72811b7d7fecfbdca45d5a74394daa4f sha256=c3b9bffd3e27090d4c0623ef61f48257343d0f6ea1cf573f5296250ab7551e5d +[http://download.savannah.nongnu.org/releases/qwo/qwo-0.5.tar.gz] +md5=9e1f7394be0a2eb2891e915f594d5f95 +sha256=fbb416acee1f8fe56394f37074154138f3cf324f48ce611cc2df40eb73b5c9ff + [http://downloads.sourceforge.net/qwt/qwt-4.2.0rc1.tgz] md5=142b10ab27e837c3c4603cf9a7e9343b sha256=3b6db68d53441119dced27e5bad26ec087294cb9d878d37bcea61e1f1e4849a1 @@ -23102,6 +23294,10 @@ sha256=17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae md5=15faef2aba7b99782f3b0b8b5d30f80a sha256=17e1105cddd928adf7d47e050f9bb49557850687f800b3e24cbbf22933ff31ae +[ftp://ftp.debian.org/debian/pool/main/r/resolvconf/resolvconf_1.45.tar.gz] +md5=1f0b0bccb4dc0a762dacf6aca716e71d +sha256=096a0696f925334f4f9fcc87df3305999f4b9f9d630fe6f2fa0179f3d56467f3 + [http://xlibs.freedesktop.org/release/resourceext-1.0.tar.bz2] md5=007713326ca5f1adfd39f3cb587c3b9b sha256=78e0a532bb84d6d85e90244bf3bb0ee9a5246545ebc9b677173e37e231d30cdc @@ -23346,6 +23542,10 @@ sha256=257722380b39e84e700e9f2d2f6600ba724723f1ed59327bfce47a57d293eeee md5=3fbb02294a8ca33d4684055adba5ed6f sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58 +[ftp://ftp.ruby-lang.org/pub/ruby/ruby-1.8.5.tar.gz] +md5=3fbb02294a8ca33d4684055adba5ed6f +sha256=19590e972b80333e26a6514c34d976c2037138361481a16f27b75e5d33f33a58 + [ftp://ftp.ruby-lang.org/pub/ruby/1.8/ruby-1.8.6-p286.tar.gz] md5=797ea136fe43e4286c9362ee4516674e sha256=1774de918b156c360843c1b68690f5f57532ee48ff079d4d05c51dace8d523ed @@ -24150,6 +24350,10 @@ sha256=7b408a4e7eb5c4fa6861e3d5f0b49f5ce872c87775fb302a7d36956b77f1e2b9 md5=baa60d94d99c943b136347a5438ad708 sha256=b1118e32a03c245fe1140f968fc6d045dae66a7c092f2e42274e9bae3b7b96b8 +[http://www.handheldshell.com/software/fso/sms-sentry_1.01.tgz] +md5=4c21f533aebbe17105374ab0fbcfede3 +sha256=e6ea066943305025dd67e200b272f278911f474c30a4d54bb74268ea930f5130 + [http://www.linux-projects.org/downloads/sn9c102-1.32.tar.gz] md5=4d5b5bb9c70e69435a608c73da73b632 sha256=780edfac5a67172a49bc4e8b1bd384fa9184ceaf55bf5ab002fd7b8415db7e3b @@ -25062,6 +25266,10 @@ sha256=d2a107e3a5ceaeeb15ab2e3d7cd308653b4ded8aaf8d3c0e0be3b64ba4e17cfc md5=85755b15099f6071776d6feb67bdbca8 sha256=e56a77325cdea8c274a39fcb79bd47919cbafa15d8009176538ec9a94f5e6e13 +[http://www.tangogps.org/downloads/tangogps-0.9.9.tar.gz] +md5=0ff6bde0f33b712d066cea08934d4808 +sha256=e4f203a3370ef02684a320431cb71c28af3bc9084bd0af2d72889eb36a62da0d + [http://downloads.sourceforge.net/tapioca-voip/tapioca-0.3.9.tar.gz] md5=e88c400394c092c2688bb2d490c80ccb sha256=fb89ac4e8578adc140e19cb4929b200d2898e5a8373230f500c16e59c803cba1 @@ -25850,6 +26058,10 @@ sha256=7b08bb8a98ad8a06e2cafda05ab21f2a69b2d64252dfc9435c93094d979e7c5a md5=75c74b9c8df7c83c8e3c3068fff08a82 sha256=5fbd4053a4eb01b814799855e35a3c01743f98acf9fcd167522e6484a2edd7b7 +[ftp://elsie.nci.nih.gov/pub/tzdata2009r.tar.gz] +md5=c38d977a3f9f4d4646cab902554c519e +sha256=684d23e3ebe825c9db90732534446f4e33f5ad4455980b15fd9eb2e4ba5a6731 + [ftp://elsie.nci.nih.gov/pub/tzdata2009p.tar.gz] md5=e401e284512be17f5cf63ee52e4f3284 sha256=7182ad6f03bfe16ccdbac4a3efb9e765ea7c51afc33c3a7fefb053122aa6da2c @@ -26238,6 +26450,10 @@ sha256=c4bf829816c3e53b0807bb12cfdc8b1f0e0c1eae14a5be2ffb1a59ad71bbb188 md5=261038b0a6890207b68a26be10a37822 sha256=1d645fa76a9482a6630b9a7257d11eabfa94ef4337493ef7075e25cbb8820491 +[http://www.techiem2.net/files/usbmode.tar.gz] +md5=1af56936129a4cf59487f8825cce44b6 +sha256=368b06259170e7e960c8ba4e344e6df45c85ac23476554e84fe9e53667dcfc0e + [http://downloads.sourceforge.net/linux-usb/usbutils-0.70.tar.gz] md5=05276dc307a0297904bc892e9998bf59 sha256=98d29c0c013debc32f1a17fd66f5e9248025959b07d13f1faba91aa5a1a9ba6b @@ -26646,6 +26862,10 @@ sha256=bca8b0073d9527c0293b831c9b8d8f89fc3dc7b5ab30898e7b748843af07a978 md5=511ffbc8ed8d9df82e7c67852164728c sha256=ee1faf72ef745a7d96e44cb4797d92a8cd2c9e290dfe602fae0fd955a11d4f3a +[http://vobject.skyhouseconsulting.com/vobject-0.8.1c.tar.gz] +md5=c9686dd74d39fdae140890d9c694c076 +sha256=594113117f2017ed837c8f3ce727616f9053baa5a5463a7420c8249b8fc556f5 + [http://gpephone.linuxtogo.org/download/gpephone/voicecall-0.1/voicecall-0.1.tar.gz] md5=7fa731310c2f5e334ca4eba9c5482965 sha256=f6ddc993d4890b9500a63345f76acd3eb4a04a9190fcd055f323319627bf104e @@ -26926,6 +27146,10 @@ sha256=e9152e09ff174fc4c4cd5ce00e52a15005c738c2a4c0de87f5ff24ca325f9b85 md5=1fe3c7a2caa6071e071ba34f587e1555 sha256=d78a1efdb62f18674298ad039c5cbdb1edb6e8e149bb3a8e3a01a4750aa3cca9 +[http://trac.hackable1.org/trac/raw-attachment/wiki/WooshBrowser/woosh-0.1.tar.gz] +md5=3a9639e077c3d8f85bb59333ef14015b +sha256=1e8d7eb70f349bfee9eb3f3cb2464c19a4229d0f7faa0a6962a3cd15a460b99f + [http://hostap.epitest.fi/releases/wpa_supplicant-0.2.6.tar.gz] md5=7f83c74bf5e6db7dc564c391a44a9fe7 sha256=f32c5e7607312d3650684977e6d1888a4a53cdb4ba16746225fab66cf345d55a @@ -30646,6 +30870,10 @@ sha256=78b013e2e0bb4c1af1adbd7acca4299cd3d83e96d8da2731f629f562b5f153a6 md5=791e8986c6e16dcd1c9878126725e06b sha256=eba57692dadd21df8d4afaea4daf8db5179c7398e11cd019fd462aa6947f4119 +[ftp://ftp.gnome.org/pub/gnome/sources/zenity/2.20/zenity-2.20.1.tar.bz2] +md5=b9989582ea43f8fd58819d85ef9c9bc5 +sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36 + [http://ftp.gnome.org/pub/GNOME/sources/zenity/2.20/zenity-2.20.1.tar.bz2] md5=b9989582ea43f8fd58819d85ef9c9bc5 sha256=cc3b203acbd745a7c3b6ea3d8e74d7fb07cf8f8aa92bcaa3b2edb023dee02a36 diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc index bca98f1139..68afcd4398 100644 --- a/conf/distro/include/sane-srcrevs.inc +++ b/conf/distro/include/sane-srcrevs.inc @@ -42,10 +42,11 @@ SRCREV_pn-dbus-c++ ?= "13131" SRCREV_pn-dbus-c++-native ?= "13131" SRCREV_pn-dfu-util ?= "4160" SRCREV_pn-dfu-util-native ?= "4160" +SRCREV_pn-disko ?= "f52597b8d5d584811cbe8f9e0bf25ea372526953" SRCREV_pn-diversity-daemon ?= "571" SRCREV_pn-diversity-radar ?= "453" SRCREV_pn-e-tasks ?= "14" -SRCREV_pn-e-wm-config-illume-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" +SRCREV_pn-e-wm-config-illume-shr ?= "cb4159e653d770da8e8f9fc9a65135839533d4c5" SRCREV_pn-e-wm-illume-dict-pl ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-menu-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" SRCREV_pn-e-wm-sysactions-shr ?= "1cc80e26a4558dfc2268b349d9a1f468e515bcfb" @@ -326,6 +327,7 @@ SRCREV_pn-u-boot-openmoko-devel ?= "ba029a1426bfca169572bf80d50a8b190a6b0e19" SRCREV_pn-usbpath ?= "3172" SRCREV_pn-usbpath-native ?= "3172" SRCREV_pn-webkit-efl ?= "3a5ee77664c898ed51a2b2d5759822f8c0a06472" +SRCREV_pn-wesnoth ?= "39828" SRCREV_pn-wlan-ng-modules ?= "1859" SRCREV_pn-wlan-ng-utils ?= "1859" SRCREV_pn-wmiconfig ?= "5394" diff --git a/conf/distro/micro.conf b/conf/distro/micro.conf index a1220ee592..25880dff9d 100644 --- a/conf/distro/micro.conf +++ b/conf/distro/micro.conf @@ -76,11 +76,13 @@ ${TARGET_ARCH}:build-${BUILD_OS}:fail-fast:pn-${PN}" ############################################################################# PREFERRED_PROVIDER_task-bootstrap = "task-bootstrap" PREFERRED_PROVIDER_virtual/libx11 = "libx11" +PREFERRED_PROVIDER_virtual/gail ?= "gtk+" ############################################################################# # PREFERRED VERSIONS ############################################################################# require conf/distro/include/sane-srcdates.inc require conf/distro/include/sane-srcrevs.inc +require conf/distro/include/preferred-xorg-versions-X11R7.5.inc ############################################################################# # NLS @@ -99,6 +101,8 @@ PACKAGE_SNAP_LIB_SYMLINKS = "1" # Collapse /usr into / prefix = "" exec_prefix = "" +prefix_native = "" +exec_prefix_native = "" # Don't install ldconfig and associated gubbins USE_LDCONFIG = "0" diff --git a/conf/machine/bug.conf b/conf/machine/bug.conf index cec3d5b785..3e0389a6ba 100644 --- a/conf/machine/bug.conf +++ b/conf/machine/bug.conf @@ -3,7 +3,7 @@ #@DESCRIPTION: Machine configuration for the BUG base unit. TARGET_ARCH = "arm" -MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw" +MACHINE_EXTRA_RRECOMMENDS = "marvell-gspi-fw marvell-sdio-fw" PREFERRED_PROVIDER_virtual/kernel = "linux-bug" MACHINE_FEATURES = "kernel26 screen touchscreen hotplug alsa wifi usbhost usbgadget" diff --git a/recipes/accelges/accelges_svn.bb b/recipes/accelges/accelges_svn.bb index 838290bf0a..3c3c8ac898 100644 --- a/recipes/accelges/accelges_svn.bb +++ b/recipes/accelges/accelges_svn.bb @@ -4,7 +4,7 @@ AUTHOR = "Paul V. Borza" LICENSE = "GPL" SECTION = "openmoko/utilities" -PV = "0.2+svnr${SRCREV}" +PV = "0.2+svnr${SRCPV}" PR = "r2" PE = "1" DEPENDS = "dbus dbus-glib libxrandr libnotify notification-daemon curl gtk+" diff --git a/recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb b/recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb new file mode 100644 index 0000000000..265b8c6651 --- /dev/null +++ b/recipes/aceofpenguins/aceofpenguins-launcher_0.3.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "EFL launcher for ace-of-penguins" +HOMEPAGE = "http://shr-project.org" +SHR_RELEASE ?= "shr" +LICENSE ?= "GPL" +DEPENDS = "python-native python-elementary" +RDEPENDS = "aceofpenguins" +SECTION = "x11/application" + +PACKAGE_ARCH = "all" + +PR = "r0" + +inherit setuptools + +SRC_URI = "http://downloads.vdm-design.de/aceofpenguins-launcher-${PV}.tar.gz" + +S = "${WORKDIR}/aceofpenguins-launcher" + +FILES_${PN} += "${prefix}/share/pixmaps" +FILES_${PN} += "${prefix}/share/applications" + diff --git a/recipes/aceofpenguins/aceofpenguins_1.2.bb b/recipes/aceofpenguins/aceofpenguins_1.2.bb new file mode 100644 index 0000000000..9410eb9653 --- /dev/null +++ b/recipes/aceofpenguins/aceofpenguins_1.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "The Ace of Penguins is a set of Unix/X solitaire games based on the ones available for Windows(tm) but with a number of enhancements that my wife says make my versions better :-) \ +The latest version includes clones of freecell, golf, mastermind, merlin, minesweeper, pegged, solitaire, taipei (with editor!), and thornq (by Martin Thornquist)." +AUTHOR = "dj@delorie.com" +HOMEPAGE = "http://www.delorie.com/store/ace/" +SECTION = "games" +DEPENDS = "libpng zlib libxpm" +PR = "r1" + +SRC_URI = "\ + http://www.delorie.com/store/ace/ace-${PV}.tar.gz\ + file://gcc4.patch;patch=1\ +" +S = "${WORKDIR}/ace-${PV}" + +inherit autotools + +# Workaround QA issue +TARGET_CC_ARCH += "${LDFLAGS}"
\ No newline at end of file diff --git a/recipes/aceofpenguins/files/gcc4.patch b/recipes/aceofpenguins/files/gcc4.patch new file mode 100644 index 0000000000..431c44e933 --- /dev/null +++ b/recipes/aceofpenguins/files/gcc4.patch @@ -0,0 +1,23 @@ +--- ace-of-penguins-1.2.orig/games/golf.c ++++ ace-of-penguins-1.2/games/golf.c +@@ -31,7 +31,7 @@ + + Stack *deck, *discard, *stacks[7]; + +-static int table_width, table_height; ++int table_width, table_height; + + int supress_arrows = 0; + +--- ace-of-penguins-1.2.orig/games/solitaire.c ++++ ace-of-penguins-1.2/games/solitaire.c +@@ -337,7 +337,7 @@ + return something_moved; + } + +-static void ++void + check_for_end_of_game() + { + while (auto_move()); + diff --git a/recipes/aircrack/aircrack-ng_1.0-svn.bb b/recipes/aircrack/aircrack-ng_1.0-svn.bb index 0f0f7f532d..37af3d5646 100644 --- a/recipes/aircrack/aircrack-ng_1.0-svn.bb +++ b/recipes/aircrack/aircrack-ng_1.0-svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.aircrack-ng.org/" SECTION = "console/network" LICENSE = "GPLv2" DEPENDS = "openssl zlib sqlite3" -PV = "0.9.99+svnr${SRCREV}" +PV = "0.9.99+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://trac.aircrack-ng.org/svn/branch;module=1.0-dev;proto=http" diff --git a/recipes/blipomoko/blipomoko_git.bb b/recipes/blipomoko/blipomoko_git.bb new file mode 100644 index 0000000000..22a34077ce --- /dev/null +++ b/recipes/blipomoko/blipomoko_git.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "python-elementary and python-blipapi based blip.pl client" +AUTHOR = "Sebastian Krzyszkowiak <seba.dos1@gmail.com>" +HOMEPAGE = "http://wiki.github.com/dos1/blipomoko" +LICENSE ?= "GPL" +RDEPENDS = "python-elementary python-dbus python-edbus python-ecore" +SECTION = "x11/applications" + +SRC_URI = "git://github.com/dos1/blipomoko.git;protocol=http" +S = "${WORKDIR}/git" + +PV = "0.0+gitr${SRCPV}" +PR = "r0" + +inherit distutils + +FILES_${PN} += "/usr/share/blipomoko" + diff --git a/recipes/blueman/blueman_1.10.bb b/recipes/blueman/blueman_1.10.bb new file mode 100644 index 0000000000..61309023c5 --- /dev/null +++ b/recipes/blueman/blueman_1.10.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Blueman is a GTK+ Bluetooth Manager" +HOMEPAGE = "http://www.blueman-project.org/" +SECTION = "optional" +DEPENDS = "gtk+ glib-2.0 bluez4 intltool python python-native python-pyrex startup-notification" +RDEPENDS = "python-dbus python-pygobject python dbus bluez4 python-pygtk python-notify obex-data-server \ +" + +PR = "r1" + +inherit autotools pkgconfig + +EXTRA_OECONF += "--with-no-runtime-deps-check" + +BLUEZ_LIBS = "-L${libdir} -lbluetooth" +BLUEZ_CFLAGS = "-I${includedir}" + +SRC_URI = "\ + http://download.tuxfamily.org/blueman/blueman-${PV}.tar.gz\ + " + +FILES_${PN}-dbg += "${libdir}/python2.6/site-packages/.debug" +FILES_${PN} += "${libdir} ${datadir}" + +do_configure_prepend() { + sed -i "s/py_prefix=.*$/py_prefix=\"${@"${STAGING_DIR_TARGET}".replace("/","\/")}\/usr\"/" ${S}/acinclude.m4 + sed -i "s/py_exec_prefix=.*$/py_exec_prefix=\"${@"${STAGING_DIR_TARGET}".replace("/","\/")}\/usr\"/" ${S}/acinclude.m4 +} diff --git a/recipes/bootchart-lite/bootchart-lite_svn.bb b/recipes/bootchart-lite/bootchart-lite_svn.bb index 092aee9dcd..2220560070 100644 --- a/recipes/bootchart-lite/bootchart-lite_svn.bb +++ b/recipes/bootchart-lite/bootchart-lite_svn.bb @@ -3,7 +3,7 @@ AUTHOR = "Fred Chien" LICENSE = "GPLv2" SECTION = "console/utils" HOMEPAGE = "http://code.google.com/p/bootchart-lite/" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://bootchart-lite.googlecode.com/svn/;module=trunk;proto=http" diff --git a/recipes/bt-configure/bt-configure_git.bb b/recipes/bt-configure/bt-configure_git.bb new file mode 100644 index 0000000000..1bc9d8520f --- /dev/null +++ b/recipes/bt-configure/bt-configure_git.bb @@ -0,0 +1,19 @@ +DESCRIPTION = "Python keyring" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python python-pygtk bluez4" + +PV = "1.0.0+gitr${SRCPV}" +PR = "r1" + +ARCH_bt-configure = "all" + +SRC_URI = "git://github.com/nytowl/BT-Configure.git;protocol=http" + +inherit distutils + +S = ${WORKDIR}/git + +FILES_${PN} += "${datadir}" + diff --git a/recipes/bt-gps/bt-gps.bb b/recipes/bt-gps/bt-gps.bb new file mode 100644 index 0000000000..414c37fb80 --- /dev/null +++ b/recipes/bt-gps/bt-gps.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "Turns your Neo Freerunner into a bluetooth GPS" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python python-pygtk gps-utils" + +SRC_URI = "http://handheldshell.com/software/fso/btgps.tgz \ + " + +#inherit autotools + +S = ${WORKDIR}/bluetooth + +do_install() { + install -d ${D}/usr/share/applications + install -d ${D}/usr/bin + install -m 0755 ${S}/BtGPS.py ${D}/usr/bin + install -m 0755 ${S}/btgps.desktop ${D}/usr/share/applications +} + +do_configure() { + exit 0 +} + +do_compile() { + exit 0 +} diff --git a/recipes/calc/calc_0.0.2.bb b/recipes/calc/calc_0.0.2.bb new file mode 100644 index 0000000000..9f15a32ec1 --- /dev/null +++ b/recipes/calc/calc_0.0.2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "A simple calculator which is elementary-themed" +HOMEPAGE = "http://github.com/spaetz/calc" +AUTHOR = "Sebastian Spaeth <Sebastian@SSpaeth.de>" +LICENSE = "MIT" +RDEPENDS = "python-elementary python python-edbus" +SECTION = "x11/application" +PR = "r1" + + +SRC_URI = "git://github.com/spaetz/calc.git;protocol=http;branch=master;tag=${PV}" +S = "${WORKDIR}/git" + +do_install(){ + install -d ${D}${datadir}/applications + install -m 0644 ${S}/data/elementary-calculator.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 ${S}/data/calculator.png ${D}${datadir}/pixmaps/ + install -d ${D}${bindir} + install -m 0744 ${S}/calc ${D}${bindir}/ +} + +FILES_${PN} += "${prefix}/share/pixmaps" +FILES_${PN} += "${prefix}/share/applications" diff --git a/recipes/calc/calc_git.bb b/recipes/calc/calc_git.bb new file mode 100644 index 0000000000..e64bf655a4 --- /dev/null +++ b/recipes/calc/calc_git.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "A dead simple calculator. It's advantage is that it's elementary-themed" +HOMEPAGE = "http://github.com/spaetz/calc" +AUTHOR = "Sebastian Spaeth <Sebastian@SSpaeth.de>" +SHR_RELEASE ?= "shr" +LICENSE = "MIT" +RDEPENDS = "python-elementary python python-edbus" +SECTION = "x11/application" +SRCREV ?= "1c17792094eb" +PV = "0.0.1+gitr${SRCPV}" +PR = "r1" + +DEFAULT_PREFERENCE = "-1" + +SRC_URI = "git://github.com/spaetz/calc.git;protocol=http;branch=master" +S = "${WORKDIR}/git" + +do_install(){ + install -d ${D}${datadir}/applications + install -m 0644 ${S}/data/elementary-calculator.desktop ${D}${datadir}/applications/ + install -d ${D}${datadir}/pixmaps + install -m 0644 ${S}/data/calculator.png ${D}${datadir}/pixmaps/ + install -d ${D}${bindir} + install -m 0744 ${S}/calc ${D}${bindir}/ +} + +FILES_${PN} += "${prefix}/share/pixmaps" +FILES_${PN} += "${prefix}/share/applications" diff --git a/recipes/calibrator/calibrator_svn.bb b/recipes/calibrator/calibrator_svn.bb index 3ac2793932..bd7bb1fc25 100644 --- a/recipes/calibrator/calibrator_svn.bb +++ b/recipes/calibrator/calibrator_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://monetdb.cwi.nl/Calibrator/" LICENSE = "AS IS" SRCREV = "21" -PV = "0.9e+svn${SRCREV}" +PV = "0.9e+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://dev.bec-systems.com/svn/pub;module=calibrator;proto=http" diff --git a/recipes/callrec/callrec_svn.bb b/recipes/callrec/callrec_svn.bb new file mode 100644 index 0000000000..6930648ecc --- /dev/null +++ b/recipes/callrec/callrec_svn.bb @@ -0,0 +1,70 @@ +DESCRIPTION = "a call recording application" +HOMEPAGE = "none" +SECTION = "system/applications" +LICENSE = "GPLv3 or later" +SRCNAME = "callrec" +DEPENDS = "gtk+" +RDEPENDS += "alsa-utils-alsactl alsa-utils-aplay" +PV = "0.2.4+svnr${SRCPV}" +PR = "r0" + +S = "${WORKDIR}/trunk" +inherit autotools + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/callrec;module=trunk" +FILES_${PN} += "${datadir} ${sysconfdir}" + +pkg_postinst_callrec_append() { + #!/bin/sh + #still a bit buggy, if the state path change for instance + files0="gsmhandset.state" + files1="gsmheadset.state" + files2="gsmspeakerout.state" + state_dir=`sed -n "s/^scenario_dir\s*=\s*//p" /etc/frameworkd.conf` + callrec_dir="/usr/share/callrec" + + for index in 0 1 2 + do + eval filename=\${files${index}} + current_file=${state_dir}/${filename} + patched="0" + + if [ -r ${callrec_dir}/${filename} ]; then + echo "Backup of ${filename} already exists" + echo "Replacing ${filename} with callrec-${filename}" + cp ${callrec_dir}/callrec-${filename} ${current_file} + else + echo "Backing up ${filename}" + cp ${current_file} ${callrec_dir}/ + + #fix the patch + sed -i "s!@STATE_PATH@!${current_file}!g" ${callrec_dir}/${filename}.patch + echo "Patching ${filename}" + patch -p0 < ${callrec_dir}/${filename}.patch && patched="1" + fi + + if [ $patched -eq 0 ]; then + echo "Failed patching ${filename}" + echo "Replacing ${filename} with callrec-${filename}" + echo "Backup is at ${callrec_dir}" + cp ${callrec_dir}/callrec-${filename} ${current_file} + fi + done +} +pkg_prerm_callrec_append() { + #!/bin/sh + files0="gsmhandset.state" + files1="gsmheadset.state" + files2="gsmspeakerout.state" + state_dir=`sed -n "s/^scenario_dir\s*=\s*//p" /etc/frameworkd.conf` + + for index in 0 1 2 + do + eval filename=\${files${index}} + current_file=${state_dir}/${filename} + echo "Restoring ${filename} from backup" + cp /usr/share/callrec/${filename} ${current_file} + echo "Removing backups" + rm /usr/share/callrec/${filename} + done +} diff --git a/recipes/cdparanoia/cdparanoia_svn.bb b/recipes/cdparanoia/cdparanoia_svn.bb index d3358a64e3..018e0b9155 100644 --- a/recipes/cdparanoia/cdparanoia_svn.bb +++ b/recipes/cdparanoia/cdparanoia_svn.bb @@ -5,7 +5,7 @@ PR ="r0" LICENSE="GPL" -PV = "10.2+svn${SRCREV}" +PV = "10.2+svnr${SRCPV}" SRC_URI="svn://svn.xiph.org/trunk;module=cdparanoia;proto=http \ file://fixes10.patch;patch=1 \ diff --git a/recipes/cellhunter/cellhunter_0.5.0.bb b/recipes/cellhunter/cellhunter_0.5.0.bb new file mode 100644 index 0000000000..87d126c9bc --- /dev/null +++ b/recipes/cellhunter/cellhunter_0.5.0.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "CellHunter - A game to collect information about mobile phone cells" +SECTION = "x11/utils" +DEPENDS = "python" +RDEPENDS = "python-subprocess python-netclient python-math python-core python-io python-pygtk python-dbus frameworkd" +PR = "r0" + +SRC_URI = "\ + http://ch.omoco.de/cellhunter/files/cellhunter-${PV}.tar.gz \ +" + +do_configure () { + : +} + +do_compile () { + : +} + +do_install () { + install -d ${D}${bindir} + install -m 0755 cellhunter.py ${D}${bindir}/ + install -m 0755 cellhunter_upload.sh ${D}${bindir}/ + install -d ${D}${datadir}/pixmaps + install -d ${D}${datadir}/applications + install -m 0644 cellhunter.desktop ${D}${datadir}/applications/cellhunter.desktop + install -m 0644 cellhunter.png ${D}${datadir}/pixmaps/cellhunter.png +} diff --git a/recipes/chromium/chromium_svn.bb b/recipes/chromium/chromium_svn.bb index ffeae9f15a..0ac8a82d17 100644 --- a/recipes/chromium/chromium_svn.bb +++ b/recipes/chromium/chromium_svn.bb @@ -3,7 +3,7 @@ LICENSE = "BSD" DEPENDS = "perl-native python-native flex-native gperf-native" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" SRCREV = "17935" SRC_URI = "svn://src.chromium.org/svn/trunk/;module=src;proto=http" diff --git a/recipes/clutter/aaina_svn.bb b/recipes/clutter/aaina_svn.bb index 862dfd8933..a8c6cf7c8f 100644 --- a/recipes/clutter/aaina_svn.bb +++ b/recipes/clutter/aaina_svn.bb @@ -1,7 +1,7 @@ require aaina.inc SRCREV = "3597" -PV = "0.3.0+svnr${SRCREV}" +PV = "0.3.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=aaina;proto=http" diff --git a/recipes/clutter/clutter-box2d_svn.bb b/recipes/clutter/clutter-box2d_svn.bb index 24b9b1feae..8ef7a03982 100644 --- a/recipes/clutter/clutter-box2d_svn.bb +++ b/recipes/clutter/clutter-box2d_svn.bb @@ -1,6 +1,6 @@ require clutter-box2d.inc -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r4" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http" diff --git a/recipes/clutter/clutter-cairo_svn.bb b/recipes/clutter/clutter-cairo_svn.bb index 1084c1cc16..f4919ac879 100644 --- a/recipes/clutter/clutter-cairo_svn.bb +++ b/recipes/clutter/clutter-cairo_svn.bb @@ -1,6 +1,6 @@ require clutter-cairo.inc -PV = "0.8.0+svnr${SRCREV}" +PV = "0.8.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ file://enable_examples.patch;patch=1" diff --git a/recipes/clutter/clutter-gst_0.4svn.bb b/recipes/clutter/clutter-gst_0.4svn.bb index 1af797888c..bf74893db6 100644 --- a/recipes/clutter/clutter-gst_0.4svn.bb +++ b/recipes/clutter/clutter-gst_0.4svn.bb @@ -1,6 +1,6 @@ require clutter-gst.inc -PV = "0.4.0+svnr${SRCREV}" +PV = "0.4.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-gst-0-4;proto=http \ file://autofoo-0.4.patch;patch=1" diff --git a/recipes/clutter/clutter-gst_svn.bb b/recipes/clutter/clutter-gst_svn.bb index 8ef87236f7..3e122c7ca4 100644 --- a/recipes/clutter/clutter-gst_svn.bb +++ b/recipes/clutter/clutter-gst_svn.bb @@ -1,6 +1,6 @@ require clutter-gst.inc -PV = "0.8.0+svnr${SRCREV}" +PV = "0.8.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=${PN};proto=http \ file://autofoo.patch;patch=1" diff --git a/recipes/clutter/clutter_0.4svn.bb b/recipes/clutter/clutter_0.4svn.bb index fe1fbc29d3..faf7a8766f 100644 --- a/recipes/clutter/clutter_0.4svn.bb +++ b/recipes/clutter/clutter_0.4svn.bb @@ -1,6 +1,6 @@ require clutter.inc -PV = "0.4.0+svnr${SRCREV}" +PV = "0.4.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-4;proto=http \ file://enable_tests-0.4.patch;patch=1 " diff --git a/recipes/clutter/clutter_0.6svn.bb b/recipes/clutter/clutter_0.6svn.bb index 79882d6ddf..15c87a52a1 100644 --- a/recipes/clutter/clutter_0.6svn.bb +++ b/recipes/clutter/clutter_0.6svn.bb @@ -1,6 +1,6 @@ require clutter.inc -PV = "0.6.0+svnr${SRCREV}" +PV = "0.6.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/clutter/branches;module=clutter-0-6;proto=http \ file://enable_tests-0.6.patch;patch=1 " diff --git a/recipes/clutter/clutter_svn.bb b/recipes/clutter/clutter_svn.bb index cdcb2109e0..55a434c583 100644 --- a/recipes/clutter/clutter_svn.bb +++ b/recipes/clutter/clutter_svn.bb @@ -2,7 +2,7 @@ require clutter.inc DEFAULT_PREFERENCE = "-1" -PV = "0.8.0+svnr${SRCREV}" +PV = "0.8.0+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk;module=clutter;proto=http \ diff --git a/recipes/clutter/table_svn.bb b/recipes/clutter/table_svn.bb index 168ea4dfba..039f903d0c 100644 --- a/recipes/clutter/table_svn.bb +++ b/recipes/clutter/table_svn.bb @@ -1,6 +1,6 @@ require table.inc -PV = "0.3.0+svnr${SRCREV}" +PV = "0.3.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/clutter/trunk/toys;module=table;proto=http \ file://fixes.patch;patch=1" diff --git a/recipes/clutter/tidy_svn.bb b/recipes/clutter/tidy_svn.bb index 348bba0a8e..89d5a5a572 100644 --- a/recipes/clutter/tidy_svn.bb +++ b/recipes/clutter/tidy_svn.bb @@ -1,6 +1,6 @@ require tidy.inc -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "6" SRC_URI = "svn://svn.o-hand.com/repos/tidy;module=trunk;proto=http \ diff --git a/recipes/connman/mokonnect_svn.bb b/recipes/connman/mokonnect_svn.bb new file mode 100644 index 0000000000..dec35e029e --- /dev/null +++ b/recipes/connman/mokonnect_svn.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "mokonnect is an e17 frontend to connmand" +HOMEPAGE = "http://www.assembla.com/wiki/show/shrdev" +AUTHOR = "Fate" +LICENSE = "GPLv2" +SECTION = "e/apps" +RDEPENDS = "python-elementary connman connman-plugin-wifi" + +PV = "0.4+svnr${SRCPV}" +PR = "r2" + +SRC_URI = "svn://subversion.assembla.com/svn/shrdev;module=Mokonnect/trunk;proto=http" + +S = "${WORKDIR}/Mokonnect/trunk" + +do_install() { + install -d ${D}${datadir}/mokonnect + for pyfile in *.py + do + install -m 644 $pyfile ${D}${datadir}/mokonnect/ + done + chmod 755 ${D}${datadir}/mokonnect/mokonnect.py + + install -d ${D}${datadir}/applications + install -m 644 mokonnect.desktop ${D}${datadir}/applications/ + + install -d ${D}${datadir}/pixmaps + install -m 644 mokonnect.png ${D}${datadir}/pixmaps/ + + install -d ${D}${bindir} + ln -sf ${datadir}/mokonnect/mokonnect.py ${D}${bindir}/mokonnect +} + +FILES_${PN} = "\ +${datadir}/mokonnect \ +${datadir}/applications/* \ +${datadir}/pixmaps/* \ +${bindir}/mokonnect \ +" + diff --git a/recipes/cwiid/cwiid_svn.bb b/recipes/cwiid/cwiid_svn.bb index 8d134f3f36..180e06ab97 100644 --- a/recipes/cwiid/cwiid_svn.bb +++ b/recipes/cwiid/cwiid_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" HOMEPAGE = "http://abstrakraft.org/cwiid/" SRCREV = "192" -PV = "0.6.00+svnr${SRCREV}" +PV = "0.6.00+svnr${SRCPV}" inherit autotools inherit distutils-base diff --git a/recipes/dasher/dasher-gpe_0.0-svn.bb b/recipes/dasher/dasher-gpe_0.0-svn.bb index 297aa9ac4f..d4f9b20f48 100644 --- a/recipes/dasher/dasher-gpe_0.0-svn.bb +++ b/recipes/dasher/dasher-gpe_0.0-svn.bb @@ -1,5 +1,5 @@ LICENSE="GPL" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r1" DEPENDS = "libxsettings-client libglade libxtst gconf gtk+" SECTION = "gpe" diff --git a/recipes/detect-stylus/detect-stylus_svn.bb b/recipes/detect-stylus/detect-stylus_svn.bb index fa315bea07..cc778c6f3e 100644 --- a/recipes/detect-stylus/detect-stylus_svn.bb +++ b/recipes/detect-stylus/detect-stylus_svn.bb @@ -3,7 +3,7 @@ SECTION = "gpe" LICENSE = "GPL" DEPENDS = "virtual/libx11 xcursor-transparent-theme xrdb" RDEPENDS = "xrdb" -PV = "0.13+svnr${SRCREV}" +PV = "0.13+svnr${SRCPV}" PR = "r0" inherit gpe pkgconfig diff --git a/recipes/dfu-util/dfu-util_svn.bb b/recipes/dfu-util/dfu-util_svn.bb index 17329b3cd4..e4d7783a0c 100644 --- a/recipes/dfu-util/dfu-util_svn.bb +++ b/recipes/dfu-util/dfu-util_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "USB Device Firmware Upgrade utility" SECTION = "devel" AUTHOR = "Harald Welte <laforge@openmoko.org>" LICENSE = "GPL" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r2" DEPENDS = "virtual/libusb0 usbpath" diff --git a/recipes/dictator/dictator_0.2.bb b/recipes/dictator/dictator_0.2.bb new file mode 100644 index 0000000000..663b376ea7 --- /dev/null +++ b/recipes/dictator/dictator_0.2.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Call recodering program for Neo Smartphones" +SECTION = "utils" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python python-pygtk python-xml python-netclient pydes python-audio" +PR="r2" + +ARCH_pyring = "all" + +SRC_URI = "http://home.htw-berlin.de/~s0526295/dictator-0.2.tar.gz" + +inherit distutils + +S = ${WORKDIR}/dictator-${PV} + +FILES_${PN} += " ${sysconfdir}/dictator.conf ${datadir}" + + diff --git a/recipes/disko/disko_1.6.0.bb b/recipes/disko/disko_1.6.0.bb new file mode 100644 index 0000000000..f8741e9c1c --- /dev/null +++ b/recipes/disko/disko_1.6.0.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "Disko is an application framework, that can be used to develop GUI applications for embedded devices. It is closely connected to the DirectFB" +LICENSE = "LGPL" +PR = "r0" + +require disko.inc + +DEPENDS += "taglib directfb virtual/libx11 hal libxv libxxf86vm" + +SRC_URI = "http://www.diskohq.org/downloads/${PN}-${PV}.tar.gz \ + file://pkgconfig.patch;patch=1 \ + " + +do_compile() { + ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} graphics=all prefix=${prefix}/ || \ + oefatal "scons build execution failed." +} diff --git a/recipes/disko/disko_git.bb b/recipes/disko/disko_git.bb index 9aa378ee5c..10b57ecbe4 100644 --- a/recipes/disko/disko_git.bb +++ b/recipes/disko/disko_git.bb @@ -1,22 +1,21 @@ DESCRIPTION = "Disko is an application framework, that can be used to develop GUI applications for embedded devices. It is closely connected to the DirectFB" LICENSE = "GPL" -PV = "1.6.0+gitr${SRCREV}" +PV = "1.6.1+gitr${SRCREV}" PR = "r0" +DEFAULT_PREFERENCE = "-1" + require disko.inc DEPENDS += "taglib directfb virtual/libx11 hal libxv libxxf86vm" SRC_URI = "git://www.diskohq.org/disko.git;protocol=git \ - file://linkpath.patch;patch=1 \ file://pkgconfig.patch;patch=1 \ " -SRCREV = "2aa9912fc32fcf24574e5053201e967dd59bceca" - S = "${WORKDIR}/git" do_compile() { - ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} graphics=all PREFIX=${prefix} prefix=${prefix} || \ + ${STAGING_BINDIR_NATIVE}/scons ${PARALLEL_MAKE} graphics=all prefix=${prefix}/ || \ oefatal "scons build execution failed." } diff --git a/recipes/disko/files/linkpath.patch b/recipes/disko/files/linkpath.patch deleted file mode 100644 index e38b0748c4..0000000000 --- a/recipes/disko/files/linkpath.patch +++ /dev/null @@ -1,15 +0,0 @@ -Index: git/SConstruct -=================================================================== ---- git.orig/SConstruct 2009-09-11 01:44:37.000000000 +0200 -+++ git/SConstruct 2009-09-11 01:52:26.265319426 +0200 -@@ -161,8 +161,8 @@ - idir_inc = idir_prefix + '/include/disko' - idir_data = idir_prefix + '/share/disko' - --# link with -rpath --# env['LINKFLAGS'].extend(['-Wl,-rpath=' + env['prefix'] + '/lib/disko']) -+# link with -rpath-link -+# env['LINKFLAGS'].extend(['-Wl,-rpath-link==' + env['prefix'] + '/lib/disko']) - - # extra flags - if env['messages']: diff --git a/recipes/disko/files/pkgconfig.patch b/recipes/disko/files/pkgconfig.patch index 3e4a84bfe8..c405f0200e 100644 --- a/recipes/disko/files/pkgconfig.patch +++ b/recipes/disko/files/pkgconfig.patch @@ -1,8 +1,8 @@ -Index: git/SConstruct +Index: disko-1.6.0/SConstruct =================================================================== ---- git.orig/SConstruct 2009-09-11 01:53:54.000000000 +0200 -+++ git/SConstruct 2009-09-11 02:08:12.789878911 +0200 -@@ -585,6 +585,7 @@ +--- disko-1.6.0.orig/SConstruct 2009-10-14 12:54:36.000000000 +0200 ++++ disko-1.6.0/SConstruct 2009-11-17 18:22:49.656165471 +0100 +@@ -580,6 +580,7 @@ ####################################################################### # TODO: handle disko_pc_libs # if 'install' in BUILD_TARGETS: @@ -10,7 +10,7 @@ Index: git/SConstruct disko_pc = open('disko.pc', 'w') disko_pc_requires = 'libxml-2.0 >= 2.6, sigc++-2.0, libpng >= 1.2, freetype2' if env['LIBPATH']: -@@ -610,30 +611,43 @@ +@@ -602,50 +603,76 @@ if env.has_key('libdl'): disko_pc_libs += ' -ldl' @@ -54,17 +54,17 @@ Index: git/SConstruct if env['enable_sip']: disko_pc_requires += ', libpj' -@@ -641,18 +655,32 @@ + if not env['big_lib'] and not env['static_lib']: disko_pc_libs += ' -lmmssip' ++ PKG_CCFLAGS += '-D__HAVE_MMSSIP__ ' if('uuid' in env['LIBS']): disko_pc_requires += ', uuid' -+ PKG_CCFLAGS += '-D__HAVE_MMSSIP__ ' if env['enable_mail']: disko_pc_requires += ', vmime' + PKG_CCFLAGS += '-D__HAVE_VMIME__ ' - if env['mmscrypt']: + if env['enable_crypt']: disko_pc_requires += ', openssl' + PKG_CCFLAGS += '-D__HAVE_MMSCRYPT__ ' @@ -74,20 +74,20 @@ Index: git/SConstruct if 'mysql' in env['database']: disko_pc_requires += ', mysql' -+ PKG_CCFLAGS += '-D__ENABLE_MYSQL__ ' -+ + + if 'odbc' in env['database']: + PKG_CCFLAGS += '-D__ENABLE_FREETDS__ ' + + if env['messages']: -+ PKG_CCFLAGS += '-D__ENABLE_LOG__ ' ++ PKG_CCFLAGS += '-D__ENABLE_LOG__ ' + + if env['debug']: -+ PKG_CCFLAGS += '-D__ENABLE_DEBUG__ ' - ++ PKG_CCFLAGS += '-D__ENABLE_DEBUG__ ' ++ disko_pc.write('prefix=' + env['prefix'] + '\n') disko_pc.write('exec_prefix=${prefix}\n') -@@ -664,13 +692,7 @@ + disko_pc.write('libdir=${exec_prefix}/lib/disko\n') +@@ -656,13 +683,7 @@ disko_pc.write('Requires: ' + disko_pc_requires + '\n') disko_pc.write('Libs: -L${libdir} ' + disko_pc_libs + '\n') disko_pc.write('Cflags: -I${includedir}/ ') diff --git a/recipes/duke3d/duke3d_svn.bb b/recipes/duke3d/duke3d_svn.bb index 36e46df513..23a8804488 100644 --- a/recipes/duke3d/duke3d_svn.bb +++ b/recipes/duke3d/duke3d_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" DEPENDS = "virtual/libsdl libsdl-mixer" SRCREV = "185" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" SRC_URI = "svn://svn.icculus.org/duke3d/;module=trunk \ file://duke3d.desktop" diff --git a/recipes/e17/bubble-keyboard_svn.bb b/recipes/e17/bubble-keyboard_svn.bb index c47c8fb12d..202771ccf0 100644 --- a/recipes/e17/bubble-keyboard_svn.bb +++ b/recipes/e17/bubble-keyboard_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple dialpad keyboard" SECTION = "x11" LICENSE = "GPLv2" DEPENDS = "ecore evas edje libfakekey" -PV = "0.1.4+svnr${SRCREV}" +PV = "0.1.4+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=bubble-keyboard" diff --git a/recipes/e17/diskio_svn.bb b/recipes/e17/diskio_svn.bb index 3c0a8c7e71..0e854ba39f 100644 --- a/recipes/e17/diskio_svn.bb +++ b/recipes/e17/diskio_svn.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" require e-module.inc diff --git a/recipes/e17/e-tasks_svn.bb b/recipes/e17/e-tasks_svn.bb new file mode 100644 index 0000000000..4f27744717 --- /dev/null +++ b/recipes/e17/e-tasks_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "tasks app for openmoko phones based on elementary" +HOMEPAGE = "http://code.google.com/p/e-tasks/" +AUTHOR = "cchandel" +LICENSE = "GPLv2" +SECTION = "e/apps" +#DEPENDS = "elementary eina edbus" + +PV = "0.0.1+svnr${SRCPV}" +PR = "r0" + +SRC_URI = "svn://e-tasks.googlecode.com/svn/trunk;module=.;proto=http" +S = "${WORKDIR}" + +inherit autotools + diff --git a/recipes/e17/e-wm_svn.bb b/recipes/e17/e-wm_svn.bb index 97426fb535..de0f48f059 100644 --- a/recipes/e17/e-wm_svn.bb +++ b/recipes/e17/e-wm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment Window Manager Version 17" DEPENDS = "eet evas ecore edje efreet edbus" LICENSE = "MIT BSD" SRCNAME = "e" -PV = "0.16.999.060+svnr${SRCREV}" +PV = "0.16.999.060+svnr${SRCPV}" PR = "r6" inherit e update-alternatives diff --git a/recipes/e17/edje-editor_svn.bb b/recipes/e17/edje-editor_svn.bb index 44e0158d6b..4978fa76dd 100644 --- a/recipes/e17/edje-editor_svn.bb +++ b/recipes/e17/edje-editor_svn.bb @@ -4,7 +4,7 @@ LICENSE = "MIT BSD" DEPENDS = "etk" SRCNAME = "edje_editor" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r1" inherit e diff --git a/recipes/e17/edje-player_svn.bb b/recipes/e17/edje-player_svn.bb index 7cddee41a0..847483517c 100644 --- a/recipes/e17/edje-player_svn.bb +++ b/recipes/e17/edje-player_svn.bb @@ -3,7 +3,7 @@ SECTION = "x11/devel" LICENSE = "MIT BSD" DEPENDS = "etk" SRCNAME = "edje_editor" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r0" inherit e diff --git a/recipes/e17/edje-viewer_svn.bb b/recipes/e17/edje-viewer_svn.bb index bf3ab00e10..257d97a2ae 100644 --- a/recipes/e17/edje-viewer_svn.bb +++ b/recipes/e17/edje-viewer_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Edje_Viewer is just that." DEPENDS = "etk" LICENSE = "MIT BSD" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r2" inherit e diff --git a/recipes/e17/elementary-alarm_svn.bb b/recipes/e17/elementary-alarm_svn.bb index 4294f2fad1..2123f486db 100644 --- a/recipes/e17/elementary-alarm_svn.bb +++ b/recipes/e17/elementary-alarm_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "An Elementary based Alarm app" LICENSE = "GPL" DEPENDS = "elementary" SECTION = "x11" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r1" inherit e diff --git a/recipes/e17/elementary-sms_svn.bb b/recipes/e17/elementary-sms_svn.bb index 2f0eec3a85..a6730365c1 100644 --- a/recipes/e17/elementary-sms_svn.bb +++ b/recipes/e17/elementary-sms_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "An Elementary based SMS app" LICENSE = "GPL" DEPENDS = "ecore edbus elementary libefso" SECTION = "x11" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r1" inherit e diff --git a/recipes/e17/elmdentica_svn.bb b/recipes/e17/elmdentica_svn.bb new file mode 100644 index 0000000000..5988d904ed --- /dev/null +++ b/recipes/e17/elmdentica_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A indenti.ca client for E" +DEPENDS = "glib-2.0 gconf libxml2 curl elementary sqlite3-native" +LICENSE = "GPLv3+" +SECTION = "e/apps" +HOMEPAGE = "http://elmdentica.googlecode.com" +AUTHOR = "seabra" +PV = "0.7.0+svnr${SRCPV}" +PR = "r0" + + +SRC_URI = "svn://elmdentica.googlecode.com/svn;module=trunk;proto=http" + +S = "${WORKDIR}/trunk" + +inherit autotools pkgconfig diff --git a/recipes/e17/enna_svn.bb b/recipes/e17/enna_svn.bb index d365d63435..8f4ddc4da6 100644 --- a/recipes/e17/enna_svn.bb +++ b/recipes/e17/enna_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "curl dbus eet evas edje ecore edbus emotion" DEPENDS += "libmusicbrainz lightmediascanner libxml2 taglib" SECTION = "x11/multimedia" -PV = "0.2.0+svnr${SRCREV}" +PV = "0.2.0+svnr${SRCPV}" PR = "r1" inherit e diff --git a/recipes/e17/essential-dialer_svn.bb b/recipes/e17/essential-dialer_svn.bb index bd16282b41..ff7d4db9ad 100644 --- a/recipes/e17/essential-dialer_svn.bb +++ b/recipes/e17/essential-dialer_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple Dialer based on Elementary and FSO" SECTION = "x11" LICENSE = "GPLv2" DEPENDS = "ecore edbus elementary libefso" -PV = "0.1.0.0+svnr${SRCREV}" +PV = "0.1.0.0+svnr${SRCPV}" SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=essential-dialer" S = "${WORKDIR}/essential-dialer" diff --git a/recipes/e17/eve_svn.bb b/recipes/e17/eve_svn.bb new file mode 100644 index 0000000000..95daab69c6 --- /dev/null +++ b/recipes/e17/eve_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = " Enlightenment webbrowser" +LICENSE = "GPL" +DEPENDS = "webkit-efl evas ecore edje" +PV = "0.0.1+svnr${SRCPV}" +PR = "r2" + +LDFLAGS += "-lstdc++" + +inherit e + +SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/PROTO;module=eve;proto=http\ +" + +S = "${WORKDIR}/eve" diff --git a/recipes/e17/exalt-client_svn.bb b/recipes/e17/exalt-client_svn.bb index 469a95554a..c5219b7be2 100644 --- a/recipes/e17/exalt-client_svn.bb +++ b/recipes/e17/exalt-client_svn.bb @@ -1,5 +1,5 @@ LICENSE = "LGPLv2" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" require e-module.inc diff --git a/recipes/e17/exalt_svn.bb b/recipes/e17/exalt_svn.bb index 8868296736..d024d758e2 100644 --- a/recipes/e17/exalt_svn.bb +++ b/recipes/e17/exalt_svn.bb @@ -5,7 +5,7 @@ LICENSE = "LGPLv2" DEPENDS = "elementary vpnc wpa-supplicant ecore eet edbus" RDEPENDS = "vpnc wpa-supplicant" -PV = "0.9+svnr${SRCREV}" +PV = "0.9+svnr${SRCPV}" inherit e diff --git a/recipes/e17/exhibit_svn.bb b/recipes/e17/exhibit_svn.bb index 2035bc193e..ac2b67de35 100644 --- a/recipes/e17/exhibit_svn.bb +++ b/recipes/e17/exhibit_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Exhibit is the ETK picture viewer" LICENSE = "MIT BSD" DEPENDS = "evas ecore epsilon edje eet etk efreet" -PV = "0.1.1+svnr${SRCREV}" +PV = "0.1.1+svnr${SRCPV}" PR = "r1" inherit e diff --git a/recipes/e17/expedite_svn.bb b/recipes/e17/expedite_svn.bb index 2bcc6d9877..800e586761 100644 --- a/recipes/e17/expedite_svn.bb +++ b/recipes/e17/expedite_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Expedite is a comprehensive benchmarking suite for Evas" DEPENDS = "eet evas" RDEPENDS = "expedite-themes evas-engine-buffer evas-engine-fb evas-engine-software-generic evas-engine-software-x11 evas-loader-png" LICENSE = "MIT BSD" -PV = "0.6.0+svnr${SRCREV}" +PV = "0.6.0+svnr${SRCPV}" PR = "r3" inherit e diff --git a/recipes/e17/exquisite-theme-illume.bb b/recipes/e17/exquisite-theme-illume.bb index 242ef5a3bf..49be863a3f 100644 --- a/recipes/e17/exquisite-theme-illume.bb +++ b/recipes/e17/exquisite-theme-illume.bb @@ -2,7 +2,7 @@ DDESCRIPTION = "A theme for exquisite" HOMEPAGE = "http://www.enlightenment.org" LICENSE = "MIT/BSD" SECTION = "x11" -PV = "1.0+svnr${SRCREV}" +PV = "1.0+svnr${SRCPV}" PR = "r6" inherit update-alternatives diff --git a/recipes/e17/exquisite_svn.bb b/recipes/e17/exquisite_svn.bb index b6b6441107..9c1bc2ca38 100644 --- a/recipes/e17/exquisite_svn.bb +++ b/recipes/e17/exquisite_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A psplash replacement for display" LICENSE = "MIT BSD" DEPENDS = "eet evas ecore embryo edje" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" PR = "r9" RDEPENDS = "initscripts" RRECOMMENDS_${PN} = "exquisite-themes" diff --git a/recipes/e17/flame_svn.bb b/recipes/e17/flame_svn.bb index 2a4f82ed33..c46314cb00 100644 --- a/recipes/e17/flame_svn.bb +++ b/recipes/e17/flame_svn.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -PV = "0.0.3+svnr${SRCREV}" +PV = "0.0.3+svnr${SRCPV}" require e-module.inc diff --git a/recipes/e17/gridpad_svn.bb b/recipes/e17/gridpad_svn.bb index 40dfa11da5..82be81670d 100644 --- a/recipes/e17/gridpad_svn.bb +++ b/recipes/e17/gridpad_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Gridpad handstroke recognition" SECTION = "x11" LICENSE = "GPLv2" DEPENDS = "ecore evas edje libfakekey" -PV = "2.0+svnr${SRCREV}" +PV = "2.0+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=GridPad" diff --git a/recipes/e17/intuition_svn.bb b/recipes/e17/intuition_svn.bb index d40dae9f43..caa0fdd528 100644 --- a/recipes/e17/intuition_svn.bb +++ b/recipes/e17/intuition_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Intuition a prototype context dependent mobile search engine" SECTION = "x11" LICENSE = "GPLv2" DEPENDS = "elementary sqlite" -PV = "0.2.0+svnr${SRCREV}" +PV = "0.2.0+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=intuition" diff --git a/recipes/e17/news_svn.bb b/recipes/e17/news_svn.bb index daef22a0f4..c72fbb58dd 100644 --- a/recipes/e17/news_svn.bb +++ b/recipes/e17/news_svn.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" require e-module.inc diff --git a/recipes/e17/places_svn.bb b/recipes/e17/places_svn.bb index 4aeaed2339..7bcaf99e80 100644 --- a/recipes/e17/places_svn.bb +++ b/recipes/e17/places_svn.bb @@ -1,5 +1,5 @@ LICENSE = "GPLv3 LGPLv3" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r3" diff --git a/recipes/e17/rage_svn.bb b/recipes/e17/rage_svn.bb index 526744e681..7a176054f2 100644 --- a/recipes/e17/rage_svn.bb +++ b/recipes/e17/rage_svn.bb @@ -4,6 +4,6 @@ HOMEPAGE = "http://www.rasterman.com" LICENSE = "MIT BSD" DEPENDS = "evas ecore edje" SECTION = "x11/multimedia" -PV = "0.3.0.042+svnr${SRCREV}" +PV = "0.3.0.042+svnr${SRCPV}" inherit e diff --git a/recipes/e17/rain_svn.bb b/recipes/e17/rain_svn.bb index a3e58de299..e9ab9de296 100644 --- a/recipes/e17/rain_svn.bb +++ b/recipes/e17/rain_svn.bb @@ -1,5 +1,5 @@ LICENSE = "MIT" -PV = "0.0.3+svnr${SRCREV}" +PV = "0.0.3+svnr${SRCPV}" require e-module.inc diff --git a/recipes/e17/waker_svn.bb b/recipes/e17/waker_svn.bb index aba6187ad4..1b8b39ec5f 100644 --- a/recipes/e17/waker_svn.bb +++ b/recipes/e17/waker_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "An EFL base at/alarm wakeup daemon" LICENSE = "LGPL" DEPENDS = "ecore edbus" SECTION = "console" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/ebrainy/ebrainy_svn.bb b/recipes/ebrainy/ebrainy_svn.bb new file mode 100644 index 0000000000..699aa1bdff --- /dev/null +++ b/recipes/ebrainy/ebrainy_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "Store knowledge in form of questions and answers and train them." +HOMEPAGE = "http://code.google.com/p/ebrainy/" +AUTHOR = "quickdev" +LICENSE = "GPL" +SECTION = "e/apps" +RDEPENDS = "elementary sqlite3 python-sqlalchemy python-mysqldb python-netserver" + +PV = "0.0.1+svnr${SRCPV}" +PR = "r1" +SRC_URI = "svn://ebrainy.googlecode.com/svn/trunk;module=.;proto=http" +S = "${WORKDIR}" + +inherit distutils +FILES_${PN} += "${datadir}/applications/ebrainy.desktop" + diff --git a/recipes/eds/eds-dbus_svn.bb b/recipes/eds/eds-dbus_svn.bb index a131bd0d9c..6bccb3d89b 100644 --- a/recipes/eds/eds-dbus_svn.bb +++ b/recipes/eds/eds-dbus_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://projects.o-hand.com/eds" LICENSE = "LGPL" DEPENDS = "intltool-native libglade glib-2.0 gtk+ gconf dbus db gnome-common virtual/libiconv zlib intltool" -PV = "1.4.0+svnr${SRCREV}" +PV = "1.4.0+svnr${SRCPV}" PR = "r7" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ diff --git a/recipes/efl1/ecore.inc b/recipes/efl1/ecore.inc index 0ebddd56dc..25603087de 100644 --- a/recipes/efl1/ecore.inc +++ b/recipes/efl1/ecore.inc @@ -1,9 +1,10 @@ DESCRIPTION = "Ecore is the Enlightenment application framework library" LICENSE = "MIT BSD" -DEPENDS = "curl eet evas tslib libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil" +DEPENDS = "virtual/libiconv curl eet evas tslib \ + libxtst libxcomposite libxinerama libxscrnsaver libxdamage libxrandr libxcursor libxprintutil" # optional # DEPENDS += "directfb libsdl-x11 openssl virtual/libiconv" -PV = "0.9.9.060+svnr${SRCREV}" +PV = "0.9.9.060+svnr${SRCPV}" PR = "r3" inherit efl diff --git a/recipes/efl1/ecore/exit_uclibc.patch b/recipes/efl1/ecore/exit_uclibc.patch new file mode 100644 index 0000000000..dea010c116 --- /dev/null +++ b/recipes/efl1/ecore/exit_uclibc.patch @@ -0,0 +1,26 @@ +Index: ecore/src/lib/ecore_con/ecore_con_dns.c +=================================================================== +--- ecore.orig/src/lib/ecore_con/ecore_con_dns.c 2009-11-14 00:12:04.279051754 +0100 ++++ ecore/src/lib/ecore_con/ecore_con_dns.c 2009-11-14 00:14:41.685708230 +0100 +@@ -135,7 +135,7 @@ + write(fd[1], "", 1); + } + close(fd[1]); +-# ifdef __USE_ISOC99 ++# if defined(__USE_ISOC99) && !defined(__UCLIBC__) + _Exit(0); + # else + _exit(0); +Index: ecore/src/lib/ecore_con/ecore_con_info.c +=================================================================== +--- ecore.orig/src/lib/ecore_con/ecore_con_info.c 2009-11-14 00:14:56.056955719 +0100 ++++ ecore/src/lib/ecore_con/ecore_con_info.c 2009-11-14 00:16:40.035696191 +0100 +@@ -243,7 +243,7 @@ + freeaddrinfo(result); + err = write(fd[1], "", 1); + close(fd[1]); +-# ifdef __USE_ISOC99 ++# if defined(__USE_ISOC99) && !defined(__UCLIBC__) + _Exit(0); + # else + _exit(0); diff --git a/recipes/efl1/ecore/iconv.patch b/recipes/efl1/ecore/iconv.patch new file mode 100644 index 0000000000..bd7f20df3f --- /dev/null +++ b/recipes/efl1/ecore/iconv.patch @@ -0,0 +1,35 @@ +Index: ecore/configure.ac +=================================================================== +--- ecore.orig/configure.ac 2009-11-13 23:33:16.504742218 +0100 ++++ ecore/configure.ac 2009-11-13 23:41:52.360519091 +0100 +@@ -392,6 +392,7 @@ + ] + ) + ++if test "x${LTLIBICONV}" = "x" ; then + if test "x${have_iconv}" = "xno" ; then + AC_CHECK_LIB(c, iconv, + [have_iconv="yes"] ) +@@ -413,6 +414,9 @@ + fi + + fi ++else ++ have_iconv="yes" ++fi + AC_MSG_CHECKING(for explicit iconv link options) + AC_MSG_RESULT($iconv_libs) + +Index: ecore/src/lib/ecore_txt/Makefile.am +=================================================================== +--- ecore.orig/src/lib/ecore_txt/Makefile.am 2009-11-13 23:32:49.374328084 +0100 ++++ ecore/src/lib/ecore_txt/Makefile.am 2009-11-13 23:33:08.383909514 +0100 +@@ -16,7 +16,7 @@ + libecore_txt_la_SOURCES = \ + ecore_txt.c + +-libecore_txt_la_LIBADD = @iconv_libs@ \ ++libecore_txt_la_LIBADD = @iconv_libs@ $(LTLIBICONV) \ + @EINA_LIBS@ + + libecore_txt_la_LDFLAGS = -no-undefined @lt_enable_auto_import@ -version-info @version_info@ @ecore_txt_release_info@ diff --git a/recipes/efl1/ecore_svn.bb b/recipes/efl1/ecore_svn.bb index b9f01ba8b3..5be2dc80f1 100644 --- a/recipes/efl1/ecore_svn.bb +++ b/recipes/efl1/ecore_svn.bb @@ -1,32 +1,35 @@ require ecore.inc -PR = "r5" +PR = "r6" + +SRC_URI += "file://iconv.patch;patch=1 \ + file://exit_uclibc.patch;patch=1 \ + " EXTRA_OECONF = "\ --x-includes=${STAGING_INCDIR}/X11 \ --x-libraries=${STAGING_LIBDIR} \ --enable-simple-x11 \ -\ --enable-ecore-txt \ --enable-ecore-config \ - --disable-ecore-x-xcb \ --enable-ecore-x \ --enable-ecore-job \ - --disable-ecore-directfb \ - --disable-ecore-sdl \ --enable-ecore-fb \ --enable-ecore-evas \ --enable-ecore-evas-software-16-x11 \ - --disable-ecore-evas-x11-gl \ --enable-ecore-evas-xrender \ - --disable-ecore-evas-dfb \ - --disable-ecore-evas-sdl \ - --disable-openssl \ --enable-abstract-sockets \ --enable-ecore-con \ --enable-ecore-ipc \ --enable-ecore-file \ --enable-inotify \ - --disable-poll \ --enable-curl \ --disable-ecore-desktop \ + --disable-ecore-x-xcb \ + --disable-ecore-directfb \ + --disable-ecore-sdl \ + --disable-ecore-evas-x11-gl \ + --disable-ecore-evas-dfb \ + --disable-ecore-evas-sdl \ + --disable-openssl \ + --disable-poll \ " diff --git a/recipes/efl1/edb_svn.bb b/recipes/efl1/edb_svn.bb index a3d2d3d99c..06d1cf7ed2 100644 --- a/recipes/efl1/edb_svn.bb +++ b/recipes/efl1/edb_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Edb is the Enlightenment database library" LICENSE = "MIT BSD" DEPENDS = "zlib" -PV = "1.0.5.050+svnr${SRCREV}" +PV = "1.0.5.050+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/efl1/edbus_svn.bb b/recipes/efl1/edbus_svn.bb index adc6b7fbea..d26b40c14e 100644 --- a/recipes/efl1/edbus_svn.bb +++ b/recipes/efl1/edbus_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "DBus and HAL convenience wrappers for EFL" DEPENDS = "dbus ecore" LICENSE = "MIT BSD" -PV = "0.5.0.060+svnr${SRCREV}" +PV = "0.5.0.060+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/efl1/edje_svn.bb b/recipes/efl1/edje_svn.bb index bfd00ecb96..a4453fc95a 100644 --- a/recipes/efl1/edje_svn.bb +++ b/recipes/efl1/edje_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Edje is the Enlightenment graphical design & layout library" DEPENDS = "lua5.1 eet evas ecore embryo edje-native" LICENSE = "MIT BSD" -PV = "0.9.92.060+svnr${SRCREV}" +PV = "0.9.92.060+svnr${SRCPV}" PR = "r4" inherit efl diff --git a/recipes/efl1/eet_svn.bb b/recipes/efl1/eet_svn.bb index 4af40da984..338cf89163 100644 --- a/recipes/efl1/eet_svn.bb +++ b/recipes/efl1/eet_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "EET is the Enlightenment data storage library" DEPENDS = "zlib jpeg openssl eina" LICENSE = "MIT BSD" -PV = "1.1.0+svnr${SRCREV}" +PV = "1.1.0+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/efl1/eflpp_svn.bb b/recipes/efl1/eflpp_svn.bb index 4942f5c548..c54e8be16c 100644 --- a/recipes/efl1/eflpp_svn.bb +++ b/recipes/efl1/eflpp_svn.bb @@ -3,7 +3,7 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de>" HOMEPAGE = "http://www.vanille-media.de/site/index.php/projects/efl/" LICENSE = "LGPL" DEPENDS = "evas ecore edje emotion esmart etk ewl libsigc++-2.0" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/efl1/efreet_svn.bb b/recipes/efl1/efreet_svn.bb index 7ed8812087..0d0bcdf329 100644 --- a/recipes/efl1/efreet_svn.bb +++ b/recipes/efl1/efreet_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Enlightenment freedesktop.org library" DEPENDS = "ecore" LICENSE = "MIT BSD" -PV = "0.5.0.060+svnr${SRCREV}" +PV = "0.5.0.060+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/efl1/eina_svn.bb b/recipes/efl1/eina_svn.bb index e62cdd2380..4871cd3ce9 100644 --- a/recipes/efl1/eina_svn.bb +++ b/recipes/efl1/eina_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Eina is the Enlightenment data library" LICENSE = "LGPL" -PV = "0.0.2.060+svnr${SRCREV}" +PV = "0.0.2.060+svnr${SRCPV}" PR = "r0" inherit efl diff --git a/recipes/efl1/elementary_svn.bb b/recipes/efl1/elementary_svn.bb index d523cbf1aa..06f98bbed3 100644 --- a/recipes/efl1/elementary_svn.bb +++ b/recipes/efl1/elementary_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "EFL based widget set for mobile devices" LICENSE = "LGPL" DEPENDS = "efreet evas ecore edje eet edbus" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r4" inherit efl diff --git a/recipes/efl1/embryo_svn.bb b/recipes/efl1/embryo_svn.bb index 222d85a7cb..c8d67f9fcb 100644 --- a/recipes/efl1/embryo_svn.bb +++ b/recipes/efl1/embryo_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The Enlightenment C-like scripting language for Edje" LICENSE = "MIT BSD" -PV = "0.9.9.060+svnr${SRCREV}" +PV = "0.9.9.060+svnr${SRCPV}" PR = "r2" inherit efl diff --git a/recipes/efl1/emotion_svn.bb b/recipes/efl1/emotion_svn.bb index 662628d4c2..c5733be8a1 100644 --- a/recipes/efl1/emotion_svn.bb +++ b/recipes/efl1/emotion_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Enlightenment multimedia library" LICENSE = "MIT BSD" # we no longer build the libxine backend, since the gstreamer backend seems more promising DEPENDS = "eet evas ecore edje gstreamer gst-plugins-base" -PV = "0.1.0.042+svnr${SRCREV}" +PV = "0.1.0.042+svnr${SRCPV}" PR = "r4" inherit efl diff --git a/recipes/efl1/engrave_svn.bb b/recipes/efl1/engrave_svn.bb index 3dc5e332a2..d4a00bf6a2 100644 --- a/recipes/efl1/engrave_svn.bb +++ b/recipes/efl1/engrave_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Engrave is an Edje Editing Library" LICENSE = "MIT" # also requires yacc and lex on host DEPENDS = "evas ecore" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/efl1/enhance_svn.bb b/recipes/efl1/enhance_svn.bb index b44cbec75c..ae3405ee4d 100644 --- a/recipes/efl1/enhance_svn.bb +++ b/recipes/efl1/enhance_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Enhance translates between glade .xml files and ETK" LICENSE = "MIT" DEPENDS = "exml" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/efl1/epdf_svn.bb b/recipes/efl1/epdf_svn.bb index 7aeb537268..bc180450a8 100644 --- a/recipes/efl1/epdf_svn.bb +++ b/recipes/efl1/epdf_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Epdf is the glue between EFL and libpoppler" LICENSE = "MIT BSD" DEPENDS = "poppler evas ecore etk ewl" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r2" inherit efl diff --git a/recipes/efl1/epeg_svn.bb b/recipes/efl1/epeg_svn.bb index 25ea7fa0b9..dac7284013 100644 --- a/recipes/efl1/epeg_svn.bb +++ b/recipes/efl1/epeg_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Epeg is a small library for handling thumbnails." LICENSE = "MIT" DEPENDS = "jpeg" -PV = "0.9.0+svnr${SRCREV}" +PV = "0.9.0+svnr${SRCPV}" PR = "r2" inherit efl diff --git a/recipes/efl1/epsilon_svn.bb b/recipes/efl1/epsilon_svn.bb index 1f348d1777..b08e7afc1e 100644 --- a/recipes/efl1/epsilon_svn.bb +++ b/recipes/efl1/epsilon_svn.bb @@ -3,7 +3,7 @@ that is compliant with the freedesktop.org Thumbnail Managing Standard." LICENSE = "MIT BSD" # can also depend on xine for movie thumbnails DEPENDS = "libpng evas ecore edje perl-native" -PV = "0.3.0.012+svnr${SRCREV}" +PV = "0.3.0.012+svnr${SRCPV}" PR = "r4" inherit efl diff --git a/recipes/efl1/esmart_svn.bb b/recipes/efl1/esmart_svn.bb index 1ff75a4a84..4e938753d9 100644 --- a/recipes/efl1/esmart_svn.bb +++ b/recipes/efl1/esmart_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "ESmart is a collection of smart Evas objects" LICENSE = "MIT BSD" DEPENDS = "evas ecore edje imlib2 epsilon libtool" -PV = "0.9.0.050+svnr${SRCREV}" +PV = "0.9.0.050+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/efl1/etk_svn.bb b/recipes/efl1/etk_svn.bb index 4b06590301..bb3e4a14c8 100644 --- a/recipes/efl1/etk_svn.bb +++ b/recipes/efl1/etk_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Etk is an advanced widget toolkit based on the Enlightenment Foundation Libraries." DEPENDS = "evas ecore edje" LICENSE = "MIT" -PV = "0.1.0.042+svnr${SRCREV}" +PV = "0.1.0.042+svnr${SRCPV}" PR = "r5" inherit efl diff --git a/recipes/efl1/evas.inc b/recipes/efl1/evas.inc index 833d38f240..f45fcb8e53 100644 --- a/recipes/efl1/evas.inc +++ b/recipes/efl1/evas.inc @@ -2,7 +2,7 @@ DESCRIPTION = "Evas is the Enlightenment canvas API" LICENSE = "MIT BSD" # can also depend on valgrind, libsdl-x11, directfb DEPENDS = "eina eet freetype jpeg libpng virtual/libx11 libxext libxrender fontconfig libfribidi" -PV = "0.9.9.060+svnr${SRCREV}" +PV = "0.9.9.060+svnr${SRCPV}" PR = "r1" diff --git a/recipes/efl1/evolve_svn.bb b/recipes/efl1/evolve_svn.bb index 24e794b9cd..e11406c3fb 100644 --- a/recipes/efl1/evolve_svn.bb +++ b/recipes/efl1/evolve_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Evolve allows you to write ETK designs using a C-like language" LICENSE = "MIT" DEPENDS = "etk evolve-native" -PV = "0.1.0.001+svnr${SRCREV}" +PV = "0.1.0.001+svnr${SRCPV}" PR = "r2" inherit efl diff --git a/recipes/efl1/ewl_svn.bb b/recipes/efl1/ewl_svn.bb index a1d373b963..a8e0bfaf8d 100644 --- a/recipes/efl1/ewl_svn.bb +++ b/recipes/efl1/ewl_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Enlightened Widget Library" DEPENDS = "evas ecore edje emotion efreet epsilon" LICENSE = "MIT BSD" -PV = "0.5.3.050+svnr${SRCREV}" +PV = "0.5.3.050+svnr${SRCPV}" PR = "r1" inherit efl diff --git a/recipes/efl1/exml_svn.bb b/recipes/efl1/exml_svn.bb index 363a23d7f1..3c505f2e95 100644 --- a/recipes/efl1/exml_svn.bb +++ b/recipes/efl1/exml_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Exml is a generic XML parser wrapper." LICENSE = "MIT" DEPENDS = "libxml2 libxslt ecore" -PV = "0.1.1+svnr${SRCREV}" +PV = "0.1.1+svnr${SRCPV}" PR = "r2" inherit efl diff --git a/recipes/efl1/imlib2_svn.bb b/recipes/efl1/imlib2_svn.bb index 025a36add4..230ba7136b 100644 --- a/recipes/efl1/imlib2_svn.bb +++ b/recipes/efl1/imlib2_svn.bb @@ -3,7 +3,7 @@ LICENSE = "BSD" # can also depend on tiff34, ungif or gif, z, bz2, id3tag DEPENDS = "freetype libpng jpeg virtual/libx11 libxext" PROVIDES = "virtual/imlib2" -PV = "1.4.2.001+svnr${SRCREV}" +PV = "1.4.2.001+svnr${SRCPV}" PR = "r0" inherit efl diff --git a/recipes/efl1/libefso_svn.bb b/recipes/efl1/libefso_svn.bb index 276cd100ef..d9bc651908 100644 --- a/recipes/efl1/libefso_svn.bb +++ b/recipes/efl1/libefso_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "EFL FSO wrapper library" SECTION = "e/libs" LICENSE = "GPLv2" DEPENDS = "ecore edbus" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" SRC_URI = "svn://svn.om.vptt.ch/trunk/;proto=http;module=libefso" S = "${WORKDIR}/libefso" diff --git a/recipes/eglibc/eglibc_svn.bb b/recipes/eglibc/eglibc_svn.bb index 460af5a335..67f13abc95 100644 --- a/recipes/eglibc/eglibc_svn.bb +++ b/recipes/eglibc/eglibc_svn.bb @@ -4,7 +4,7 @@ DEPENDS += "gperf-native" SRCREV = "9241" DEFAULT_PREFERENCE = "-1" FILESPATHPKG =. "eglibc-svn:" -PV = "2.11+svnr${SRCREV}" +PV = "2.11+svnr${SRCPV}" PR = "${INC_PR}.3" EGLIBC_BRANCH="trunk" SRC_URI = "svn://svn.eglibc.org;module=${EGLIBC_BRANCH} \ diff --git a/recipes/enotes/enotes_svn.bb b/recipes/enotes/enotes_svn.bb new file mode 100644 index 0000000000..991f188154 --- /dev/null +++ b/recipes/enotes/enotes_svn.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "todo list manager in EFL" +HOMEPAGE = "http://enotes.googlecode.com" +AUTHOR = "furester" +LICENSE = "GPL" +SECTION = "e/apps" +DEPENDS = "elementary evas sqlite3" + +PV = "0.2.2+svnr${SRCPV}" +PR = "r1" +SRC_URI = "svn://enotes.googlecode.com/svn/trunk;module=.;proto=http" +S = "${WORKDIR}" + +inherit autotools + + diff --git a/recipes/erminig/erminig_3.0.3.bb b/recipes/erminig/erminig_3.0.3.bb new file mode 100644 index 0000000000..b061c321b8 --- /dev/null +++ b/recipes/erminig/erminig_3.0.3.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Erminig is a python application that provides two-way synchronization between Google Calendar and GPE Calendar." +HOMEPAGE = "https://garage.maemo.org/projects/erminig/" +SECTION = "devel/python" +LICENSE = "GPL" +PV="3.0.3" +PR="r0" + +SRC_URI = "https://garage.maemo.org/frs/download.php/4737/erminig_3.0.3-3.tar.gz" +S = "${WORKDIR}/${PN}-${PV}" + +inherit distutils + +RDEPENDS_${PN} = "\ + python-pygtk \ + python-pysqlite2 \ + +" +FILES_${PN} = "${datadir}" + + diff --git a/recipes/exmap-console/exmap-console_svn.bb b/recipes/exmap-console/exmap-console_svn.bb index 6e86214b1c..012bcf009d 100644 --- a/recipes/exmap-console/exmap-console_svn.bb +++ b/recipes/exmap-console/exmap-console_svn.bb @@ -1,6 +1,6 @@ require exmap-console.inc -PV = "0.4+svnr${SRCREV}" +PV = "0.4+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=exmap-console;proto=http" diff --git a/recipes/ezx/ezx-boot-usb-native_svn.bb b/recipes/ezx/ezx-boot-usb-native_svn.bb index 0615686c26..1298cac80c 100644 --- a/recipes/ezx/ezx-boot-usb-native_svn.bb +++ b/recipes/ezx/ezx-boot-usb-native_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "virtual/libusb0-native virtual/kernel" SECTION = "devel" AUTHOR = "Team OpenEZX <openezx-devel@lists.openezx.org>" LICENSE = "GPL" -PV = "0.3.0+svnr${SRCREV}" +PV = "0.3.0+svnr${SRCPV}" SRC_URI = "svn://svn.openezx.org/trunk/src/host;module=boot_usb;proto=http" S = "${WORKDIR}/boot_usb" diff --git a/recipes/ezx/ezxd_svn.bb b/recipes/ezx/ezxd_svn.bb index ce0542fba2..134980f4c0 100644 --- a/recipes/ezx/ezxd_svn.bb +++ b/recipes/ezx/ezxd_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPLv2" SECTION = "devel" AUTHOR = "Daniel Ribeiro" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r4" SRC_URI = "svn://svn.openezx.org/trunk/src/userspace/;module=ezxd;proto=http \ diff --git a/recipes/ffalarms/atd-over-fso/atd-alarm-glue.patch b/recipes/ffalarms/atd-over-fso/atd-alarm-glue.patch new file mode 100644 index 0000000000..66a268ce2b --- /dev/null +++ b/recipes/ffalarms/atd-over-fso/atd-alarm-glue.patch @@ -0,0 +1,14 @@ +--- Makefile-orig 2003-03-23 19:46:26.000000000 +0100 ++++ Makefile 2009-03-16 19:39:39.000000000 +0100 +@@ -10,6 +10,11 @@ + rm -f atq + ln -s atd atq + ++atd.o: atd-alarm-glue.h ++ ++atd-alarm-glue.h: atd-alarm.xml ++ dbus-binding-tool --prefix=atd_alarm --mode=glib-server $< --output=$@ ++ + dist: atd + cp atd dist/usr/sbin/ + rm dist/usr/bin/atq diff --git a/recipes/ffalarms/atd-over-fso/atd-over-fso.conf.patch b/recipes/ffalarms/atd-over-fso/atd-over-fso.conf.patch new file mode 100644 index 0000000000..6b6bebaa0f --- /dev/null +++ b/recipes/ffalarms/atd-over-fso/atd-over-fso.conf.patch @@ -0,0 +1,13 @@ +--- /dev/null 2009-03-26 10:57:36.511814417 +0100 ++++ dist/etc/dbus-1/system.d/atd-over-fso.conf 2009-03-29 03:15:37.000000000 +0200 +@@ -0,0 +1,10 @@ ++<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN" ++ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd"> ++<busconfig> ++ <policy user="root"> ++ <allow own="org.openmoko.projects.ffalarms.atd"/> ++ <allow send_path="/"/> ++ <allow send_destination="org.openmoko.projects.ffalarms.atd"/> ++ <allow receive_sender="org.openmoko.projects.ffalarms.atd"/> ++ </policy> ++</busconfig> diff --git a/recipes/ffalarms/atd-over-fso/atd-startup-restart.patch b/recipes/ffalarms/atd-over-fso/atd-startup-restart.patch new file mode 100644 index 0000000000..adea0e1178 --- /dev/null +++ b/recipes/ffalarms/atd-over-fso/atd-startup-restart.patch @@ -0,0 +1,17 @@ +--- dist/etc/init.d/atd-orig 2009-03-29 14:20:09.000000000 +0200 ++++ dist/etc/init.d/atd 2009-03-29 14:37:31.000000000 +0200 +@@ -20,9 +20,13 @@ + rm -f /var/spool/at/trigger + echo "." + ;; ++ restart) ++ $0 stop ++ $0 start ++ ;; + + *) +- echo "Usage: /etc/init.d/atd {start|stop}" ++ echo "Usage: /etc/init.d/atd {start|stop|restart}" + exit 1 + esac + diff --git a/recipes/ffalarms/atd-over-fso/atd-startup.patch b/recipes/ffalarms/atd-over-fso/atd-startup.patch new file mode 100644 index 0000000000..dc4c1195d1 --- /dev/null +++ b/recipes/ffalarms/atd-over-fso/atd-startup.patch @@ -0,0 +1,39 @@ +? atd-startup.patch +Index: ChangeLog +=================================================================== +RCS file: /cvs/apps/atd/ChangeLog,v +retrieving revision 1.2 +diff -B -b -u -r1.2 ChangeLog +--- ChangeLog 2 Feb 2004 15:30:39 -0000 1.2 ++++ ChangeLog 13 Jan 2006 11:54:00 -0000 +@@ -1,3 +1,8 @@ ++2006-01-13 Florian Boor <florian@kernelconcepts.de> ++ ++ * dist/etc/init.d/atd: Remove obsolete --oknodo and add -m to ++ enable pidfile. ++ + V0.7 + - removed waiting for childpid after having spawned an event + this caused trouble with events rescheduling themselves +Index: dist/etc/init.d/atd +=================================================================== +RCS file: /cvs/apps/atd/dist/etc/init.d/atd,v +retrieving revision 1.3 +diff -B -b -u -r1.3 atd +--- dist/etc/init.d/atd 24 Jan 2003 15:09:03 -0000 1.3 ++++ dist/etc/init.d/atd 13 Jan 2006 11:54:00 -0000 +@@ -11,12 +11,12 @@ + echo -n "Starting at daemon: atd" + mkdir -p /var/spool/at + chmod a+w /var/spool/at +- start-stop-daemon --start --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd /var/spool/at >/dev/null 2>&1 & ++ start-stop-daemon --start --quiet -m --pidfile /var/run/atd.pid --exec /usr/sbin/atd /var/spool/at >/dev/null 2>&1 & + echo "." + ;; + stop) + echo -n "Stopping at daemon: atd" +- start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/atd.pid --exec /usr/sbin/atd ++ start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd + rm -f /var/spool/at/trigger + echo "." + ;; diff --git a/recipes/ffalarms/atd-over-fso/init.d-atd-restart.patch b/recipes/ffalarms/atd-over-fso/init.d-atd-restart.patch new file mode 100644 index 0000000000..11742d9937 --- /dev/null +++ b/recipes/ffalarms/atd-over-fso/init.d-atd-restart.patch @@ -0,0 +1,17 @@ +--- S97atd-orig 2009-03-29 11:59:02.000000000 +0200 ++++ S97atd 2009-03-29 12:03:07.000000000 +0200 +@@ -20,9 +20,13 @@ + rm -f /var/spool/at/trigger + echo "." + ;; ++ restart) ++ $0 stop ++ $0 start ++ ;; + + *) +- echo "Usage: /etc/init.d/atd {start|stop}" ++ echo "Usage: /etc/init.d/atd {start|stop|restart}" + exit 1 + esac + diff --git a/recipes/ffalarms/atd-over-fso/no-oknodo.patch b/recipes/ffalarms/atd-over-fso/no-oknodo.patch new file mode 100644 index 0000000000..e1eb2528ac --- /dev/null +++ b/recipes/ffalarms/atd-over-fso/no-oknodo.patch @@ -0,0 +1,11 @@ +--- atd/dist/etc/init.d/atd.orig 2003-01-24 07:09:03.000000000 -0800 ++++ atd/dist/etc/init.d/atd 2005-09-22 14:50:55.000000000 -0700 +@@ -16,7 +16,7 @@ case "$1" in + ;; + stop) + echo -n "Stopping at daemon: atd" +- start-stop-daemon --stop --quiet --oknodo --pidfile /var/run/atd.pid --exec /usr/sbin/atd ++ start-stop-daemon --stop --quiet --pidfile /var/run/atd.pid --exec /usr/sbin/atd + rm -f /var/spool/at/trigger + echo "." + ;; diff --git a/recipes/ffalarms/atd-over-fso/run-over-fso.patch b/recipes/ffalarms/atd-over-fso/run-over-fso.patch new file mode 100644 index 0000000000..425aca45fb --- /dev/null +++ b/recipes/ffalarms/atd-over-fso/run-over-fso.patch @@ -0,0 +1,505 @@ +--- src/atd.c-orig 2004-02-02 16:30:39.000000000 +0100 ++++ src/atd.c 2009-09-15 22:57:35.000000000 +0200 +@@ -7,10 +7,12 @@ + * Copyright (C) 1996, Paul Gortmaker + * Copyright (C) 2001, Russell Nelson + * Copyright (C) 2002-2004, Nils Faerber <nils@handhelds.org> ++ * Copyright (C) 2009, Łukasz Pankowski <lukpank@o2.pl> + * + * Released under the GNU General Public License, version 2, + * included herein by reference. + * ++ * Łukasz Pankowski: modified to work over org.freesmartphone.otimed + */ + + #include <stdio.h> +@@ -31,6 +33,16 @@ + #include <dirent.h> + #include <pwd.h> + #include <signal.h> ++#include <glib.h> ++#include <dbus/dbus-glib.h> ++#include <dbus/dbus-glib-lowlevel.h> ++#include <dbus/dbus.h> ++#include "atd-alarm.h" ++#include "atd-alarm-glue.h" ++ ++#define DBUS_NAME "org.openmoko.projects.ffalarms.atd" ++#define DBUS_RECONNECT_TIMEOUT 10 ++#define OTIMED "org.freesmartphone.otimed" + + + /* globals... */ +@@ -62,33 +74,23 @@ + } + + +-void waitfor (time_t t) ++void rtc_set_time (void) + { +-int rtcfd, tfd, retval= 0; +-unsigned long data; ++int rtcfd, retval= 0; + struct rtc_time rtc_tm; +-time_t now, then; ++time_t now; + struct tm *tm; +-struct timeval tv; +-int nfds; +-fd_set afds; + + #ifdef DEBUG +- printf("waitfor %ld\n", t); ++ printf("rtc_set_time\n"); + #endif + rtcfd = open ("/dev/rtc", O_RDONLY); + + if (rtcfd == -1) { ++ /* treat it as warning, may be should retry? */ + perror("/dev/rtc"); +- exit(errno); +- } +- +- /* Read the RTC time/date */ +- tfd = open ("trigger", O_RDWR); +- +- if (tfd == -1) { +- perror("trigger"); +- exit(errno); ++ errno = 0; ++ return; + } + + /* Set the RTC time/date */ +@@ -112,112 +114,7 @@ + rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); + #endif + +- tm = gmtime (&t); +- +-#ifdef DEBUG +- printf ("Alarm date/time is %d-%d-%d, %02d:%02d:%02d.\n", +- tm->tm_mday, tm->tm_mon + 1, tm->tm_year + 1900, +- tm->tm_hour, tm->tm_min, tm->tm_sec); +-#endif +- if (t && compare_rtc_to_tm (&rtc_tm, tm) >= 0) { +- close (rtcfd); +- close (tfd); +- return; +- } +- +- if (t) { +- /* set the alarm */ +- rtc_tm.tm_mday = tm->tm_mday; +- rtc_tm.tm_mon = tm->tm_mon; +- rtc_tm.tm_year = tm->tm_year; +- rtc_tm.tm_sec = tm->tm_sec; +- rtc_tm.tm_min = tm->tm_min; +- rtc_tm.tm_hour = tm->tm_hour; +- retval = ioctl (rtcfd, RTC_ALM_SET, &rtc_tm); +- if (retval == -1) { +- perror ("ioctl"); +- exit (errno); +- } +-#ifdef DEBUG +- printf ("Alarm date/time now set to %d-%d-%d, %02d:%02d:%02d.\n", +- rtc_tm.tm_mday, rtc_tm.tm_mon + 1, rtc_tm.tm_year + 1900, +- rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); +-#endif +- +- /* Read the current alarm settings */ +- retval = ioctl (rtcfd, RTC_ALM_READ, &rtc_tm); +- if (retval == -1) { +- perror ("ioctl"); +- exit (errno); +- } +- +-#ifdef DEBUG +- printf ("Alarm date/time now in RTC: %d-%d-%d, %02d:%02d:%02d.\n", +- rtc_tm.tm_mday, rtc_tm.tm_mon + 1, rtc_tm.tm_year + 1900, +- rtc_tm.tm_hour, rtc_tm.tm_min, rtc_tm.tm_sec); +-#endif +- +- /* Enable alarm interrupts */ +- retval = ioctl (rtcfd, RTC_AIE_ON, 0); +- if (retval == -1) { +- perror ("ioctl"); +- exit (errno); +- } +- } +- +-#ifdef DEBUG +- printf ("Waiting for alarm..."); +- fflush (stdout); +-#endif +- /* This blocks until the alarm ring causes an interrupt */ +- FD_ZERO (&afds); +- if (t) +- FD_SET (rtcfd, &afds); +- FD_SET (tfd, &afds); +- nfds = rtcfd+1; +- if (tfd > rtcfd) +- nfds = tfd + 1; +- /* Wait up to ten minutes. */ +- tv.tv_sec = 10 * 60; +- tv.tv_usec = 0; +- then = now; +- if (select (nfds, &afds, (fd_set *) 0, (fd_set *) 0, &tv) < 0) { +- if (errno != EINTR) +- perror ("select"); +- exit (errno); +- } +- now = time (NULL); +-#ifdef DEBUG +- printf ("While we were sleeping, %d seconds elapsed, but %d alarms passed\n", +- (int)(now - then), (int)(tv.tv_sec)); +-#endif +- if (FD_ISSET (rtcfd, &afds)) { +- retval = read (rtcfd, &data, sizeof (unsigned long)); +- if (retval == -1) { +- perror ("read"); +- exit (errno); +- } +- } +- if (FD_ISSET(tfd, &afds)) { +- retval = read (tfd, &data, 1); +- if (retval == -1) { +- perror ("read"); +- exit (errno); +- } +- } +-#ifdef DEBUG +- printf ("Something happened!\n"); +-#endif +- +- /* Disable alarm interrupts */ +- retval = ioctl (rtcfd, RTC_AIE_OFF, 0); +- if (retval == -1) { +- perror ("ioctl"); +- exit (errno); +- } +- + close (rtcfd); +- close (tfd); + } + + +@@ -345,11 +242,223 @@ + } + + ++G_DEFINE_TYPE(AtdAlarm, atd_alarm, G_TYPE_OBJECT); ++ ++ ++static void atd_alarm_finalize (GObject* self) { ++ g_object_unref(((AtdAlarm*) self)->alarm_proxy); ++ G_OBJECT_CLASS (atd_alarm_parent_class)->finalize (self); ++} ++ ++ ++static void atd_alarm_class_init(AtdAlarmClass *cls) ++{ ++ G_OBJECT_CLASS (cls)->finalize = atd_alarm_finalize; ++} ++ ++ ++static void atd_alarm_init(AtdAlarm *self) ++{ ++} ++ ++ ++AtdAlarm* atd_alarm_new (char *spooldir) ++{ ++AtdAlarm *self; ++ ++ self = g_object_new(ATD_TYPE_ALARM, NULL); ++ if (self) { ++ self->bus = NULL; ++ self->alarm_proxy = NULL; ++ self->trigger = NULL; ++ } ++ return self; ++} ++ ++ ++gboolean input_on_trigger(GIOChannel *source, GIOCondition condition, ++ AtdAlarm *obj) ++{ ++char data; ++ ++ if (read (g_io_channel_unix_get_fd(source), &data, 1) == -1) { ++ perror ("read"); ++ exit (errno); ++ } ++ atd_alarm_alarm(obj); ++ ++ return TRUE; ++} ++ ++ ++void display_free_g_error(GError **error) ++{ ++ if ((*error)->domain == DBUS_GERROR && ++ (*error)->code == DBUS_GERROR_REMOTE_EXCEPTION) ++ g_printerr("Remote exception: %s: %s\n", ++ dbus_g_error_get_name(*error), ++ (*error)->message); ++ else ++ g_printerr("Error: %s\n", (*error)->message); ++ g_error_free(*error); ++ *error = NULL; ++} ++ ++ ++static void otimed_destroy(DBusGProxy *alarm_proxy, AtdAlarm *obj) ++{ ++#ifdef DEBUG ++ printf("proxy for " OTIMED " destroyed\n"); ++#endif ++ g_object_unref(obj->alarm_proxy); ++ obj->alarm_proxy = NULL; ++} ++ ++ ++void atd_alarm_connect_otimed(AtdAlarm *self) ++{ ++GError *error; ++int tfd; ++ ++ error = NULL; ++ self->alarm_proxy = dbus_g_proxy_new_for_name_owner ++ (self->bus, OTIMED, "/org/freesmartphone/Time/Alarm", ++ "org.freesmartphone.Time.Alarm", &error); ++ if (error != NULL) { ++ display_free_g_error(&error); ++ return; ++ } ++ g_signal_connect(self->alarm_proxy, "destroy", ++ G_CALLBACK(otimed_destroy), self); ++ ++ /* if we are connected to otimed (so we know it is up and ++ * running) we can open the trigger ++ */ ++ if (self->trigger) ++ return; ++ if (mkfifo ("trigger.new", 0777) < 0) ++ die ("cannot mkfifo trigger.new"); ++ if (rename ("trigger.new","trigger")) ++ die ("cannot rename trigger.new"); ++ chmod ("trigger", S_IWUSR | S_IWGRP | S_IWOTH); ++ tfd = open ("trigger", O_RDWR); ++ if (tfd == -1) { ++ perror("trigger"); ++ exit(errno); ++ } ++ self->trigger = g_io_channel_unix_new(tfd); ++ g_io_add_watch(self->trigger, G_IO_IN, ++ (GIOFunc) input_on_trigger, self); ++} ++ ++ ++void atd_alarm_waitfor(AtdAlarm *self, time_t t) ++{ ++GError *error; ++ ++ if (!t) ++ return; ++ ++ rtc_set_time(); ++ error = NULL; ++ if (self->alarm_proxy == NULL) { ++ g_printerr(OTIMED " not running, could not call SetAlarm\n"); ++ } else if (!dbus_g_proxy_call(self->alarm_proxy, "SetAlarm", &error, ++ G_TYPE_STRING, DBUS_NAME, ++ G_TYPE_INT, t, G_TYPE_INVALID, ++ G_TYPE_INVALID)) { ++ display_free_g_error(&error); ++ } ++#ifdef DEBUG ++ printf("DBus waitfor: %d\n", (int) t); ++#endif ++} ++ ++ ++void name_owner_changed(DBusGProxy *proxy, const char *name, ++ const char *prev_name, const char *new_name, ++ AtdAlarm *obj) ++{ ++ if (!strcmp(name, OTIMED) && *new_name) { ++#ifdef DEBUG ++ printf("DBus NameOwnerChanged: " OTIMED "\n"); ++#endif ++ atd_alarm_connect_otimed(obj); ++ atd_alarm_alarm(obj); ++ } ++} ++ ++ ++static void dbus_disconnected(DBusGProxy *obj, GMainLoop *ml) ++{ ++ g_printerr("DBus disconnected\n"); ++ g_main_loop_quit(ml); ++} ++ ++ ++void atd_alarm_start(AtdAlarm *self) ++//int start_atd_alarm(GIOChannel *trigger, int exit_on_error) ++{ ++GMainLoop *ml; ++GError *error; ++DBusError dbus_error; ++DBusGProxy *proxy; ++int code; ++ ++ error = NULL; ++ self->bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error); ++ if (!self->bus) { ++ g_printerr("failed to connect to DBUS: %s\n", ++ error->message); ++ g_error_free(error); ++ return; ++ } ++ dbus_error_init(&dbus_error); ++ code = dbus_bus_request_name ++ (dbus_g_connection_get_connection(self->bus), ++ DBUS_NAME, DBUS_NAME_FLAG_DO_NOT_QUEUE, &dbus_error); ++ if (code != DBUS_REQUEST_NAME_REPLY_PRIMARY_OWNER) { ++ if (code == -1) ++ g_printerr("Error: %s\n", dbus_error.message); ++ else ++ g_printerr("could not register name (%d): %s\n", ++ code, DBUS_NAME); ++ exit(1); ++ } ++ dbus_g_connection_register_g_object(self->bus, "/", G_OBJECT(self)); ++ proxy = dbus_g_proxy_new_for_name(self->bus, "org.freedesktop.DBus", ++ "/org/freedesktop/DBus", ++ "org.freedesktop.DBus"); ++ dbus_g_proxy_add_signal(proxy, "NameOwnerChanged", G_TYPE_STRING, ++ G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INVALID); ++ dbus_g_proxy_connect_signal(proxy, "NameOwnerChanged", ++ G_CALLBACK(name_owner_changed), self, NULL); ++ atd_alarm_connect_otimed(self); ++ atd_alarm_alarm(self); ++ ++ ml = g_main_loop_new(NULL, FALSE); ++ g_signal_connect(proxy, "destroy", G_CALLBACK(dbus_disconnected), ml); ++ dbus_connection_set_exit_on_disconnect ++ (dbus_g_connection_get_connection(self->bus), FALSE); ++ ++ g_main_loop_run(ml); ++ ++ g_object_unref(proxy); ++ if (self->alarm_proxy) ++ g_object_unref(self->alarm_proxy); ++ self->alarm_proxy = NULL; ++ dbus_g_connection_unref(self->bus); ++ self->bus = NULL; ++ g_main_loop_unref(ml); ++ ++ return; ++} ++ ++ + int main (int argc, char *argv[]) + { +-struct dirent *dirent; +-unsigned long this, next, now; + char *argv0; ++AtdAlarm *obj; + + argv0 = strrchr(argv[0], '/'); + if (!argv0) +@@ -362,17 +471,36 @@ + die("cannot chdir"); + if (!strcmp (argv0, "atq")) + exit_atq(); +- if (mkfifo ("trigger.new", 0777) < 0) +- die ("cannot mkfifo trigger.new"); +- if (rename ("trigger.new","trigger")) +- die ("cannot rename trigger.new"); +- chmod ("trigger", S_IWUSR | S_IWGRP | S_IWOTH); + + /* ignore some signals we get from spawned processes */ + signal (SIGCHLD, SIG_IGN); + signal (SIGPIPE, SIG_IGN); + ++ ++ g_type_init(); ++ dbus_g_object_type_install_info(ATD_TYPE_ALARM, ++ &dbus_glib_atd_alarm_object_info); ++ obj = atd_alarm_new(argv[1]); ++ if (!obj) { ++ g_printerr("Failed to create AtdAlarm object"); ++ exit(1); ++ } + while (1) { ++ atd_alarm_start(obj); ++ sleep(DBUS_RECONNECT_TIMEOUT); ++ } ++} ++ ++ ++gboolean atd_alarm_alarm(AtdAlarm *self) ++{ ++struct dirent *dirent; ++unsigned long this, next, now; ++ ++#ifdef DEBUG ++ printf("atd_alarm_alarm() run at: %d\n", (int) time(NULL)); ++#endif ++ + /* run all the jobs in the past */ + now = time (NULL); + scan_from_top (); +@@ -402,8 +530,7 @@ + #endif + if (next == ULONG_MAX) + next = 0; +- waitfor (next); +- } ++ atd_alarm_waitfor (self, next); + +-return 0; ++ return TRUE; + } +--- /dev/null 2009-09-15 19:51:58.514753360 +0200 ++++ src/atd-alarm.h 2009-09-15 22:45:59.000000000 +0200 +@@ -0,0 +1,26 @@ ++#ifndef ATD_ALARM_H ++#define ATD_ALARM_H ++ ++#include <glib-object.h> ++#include <dbus/dbus-glib.h> ++ ++#define ATD_TYPE_ALARM (atd_alarm_get_type()) ++ ++typedef struct _AtdAlarm ++{ ++ GObject parent; ++ DBusGConnection *bus; ++ DBusGProxy *alarm_proxy; ++ GIOChannel *trigger; ++} AtdAlarm; ++ ++typedef struct _AtdAlarmClass ++{ ++ GObjectClass parent_class; ++} AtdAlarmClass; ++ ++static gboolean atd_alarm_alarm(AtdAlarm *self); ++ ++static void atd_alarm_waitfor(AtdAlarm *self, time_t t); ++ ++#endif +--- /dev/null 2009-09-15 19:51:58.514753360 +0200 ++++ src/atd-alarm.xml 2009-03-16 17:55:48.000000000 +0100 +@@ -0,0 +1,8 @@ ++<?xml version="1.0" encoding="UTF-8" ?> ++ ++<node name="/"> ++ <interface name="org.freesmartphone.Notification"> ++ <annotation name="org.freedesktop.DBus.GLib.CSymbol" value="atd_alarm" /> ++ <method name="Alarm" /> ++ </interface> ++</node> diff --git a/recipes/ffalarms/atd-over-fso_0.70.bb b/recipes/ffalarms/atd-over-fso_0.70.bb new file mode 100644 index 0000000000..951e10c66d --- /dev/null +++ b/recipes/ffalarms/atd-over-fso_0.70.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "Lightweight At Daemon working on top of org.freesmartphone.otimed" +SECTION = "base" +LICENSE = "GPLV2" +RCONFLICTS = "at atd" +RREPLACES = "at atd" +RPROVIDES = "atd" +DEPENDS = "dbus-glib pkgconfig" +RDEPENDS += "dbus dbus-glib frameworkd" + +PR = "r2" + +SRC_URI = "${HANDHELDS_CVS};module=apps/atd;tag=ATD-0_70 \ + file://atd-startup.patch;patch=1;pnum=0 \ + file://atd-startup-restart.patch;patch=2;pnum=0 \ + file://atd-alarm-glue.patch;patch=3;pnum=0 \ + file://atd-over-fso.conf.patch;patch=4;pnum=0 \ + file://run-over-fso.patch;patch=5;pnum=1" +S = "${WORKDIR}/atd" + +inherit update-rc.d + +INITSCRIPT_NAME = "atd" +INITSCRIPT_PARAMS = "defaults 97" + +do_compile() { + export CFLAGS="$CFLAGS `${STAGING_BINDIR_NATIVE}/pkg-config --cflags dbus-glib-1`" + export LDFLAGS="$LDFLAGS `${STAGING_BINDIR_NATIVE}/pkg-config --libs dbus-glib-1`" + oe_runmake +} + +do_install() { + install -d ${D}${sbindir} + install atd ${D}${sbindir}/atd + install -d ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/dbus-1/system.d + install dist/etc/init.d/atd ${D}${sysconfdir}/init.d/atd + install dist/etc/dbus-1/system.d/atd-over-fso.conf ${D}${sysconfdir}/dbus-1/system.d/atd-over-fso.conf +} + +updatercd_postinst_prepend() { +/etc/init.d/dbus-1 reload +} + +updatercd_postrm_append() { +/etc/init.d/dbus-1 reload +} diff --git a/recipes/ffalarms/ffalarms/shr.patch b/recipes/ffalarms/ffalarms/shr.patch new file mode 100644 index 0000000000..77a66d6583 --- /dev/null +++ b/recipes/ffalarms/ffalarms/shr.patch @@ -0,0 +1,11 @@ +--- ffalarms-0.2.4/ffalarms.vala 2009-09-21 14:05:09.000000000 +0200 ++++ ffalarms-0.2.4/ffalarms.vala 2009-09-21 14:05:09.000000000 +0200 +@@ -27,7 +27,7 @@ + "Could not contact atd daemon, the alarm may not work"; + public const string COMMANDS = "alsactl amixer"; + public const string ALSASTATE = +- "/usr/share/openmoko/scenarios/stereoout.state"; ++ "/usr/share/shr/scenarii/stereoout.state"; + + + public errordomain MyError { diff --git a/recipes/ffalarms/ffalarms_0.2.2.bb b/recipes/ffalarms/ffalarms_0.2.2.bb new file mode 100644 index 0000000000..a280779d52 --- /dev/null +++ b/recipes/ffalarms/ffalarms_0.2.2.bb @@ -0,0 +1,23 @@ +DESCRIPTION = "Finger friendly alarms" +HOMEPAGE = "http://ffalarms.projects.openmoko.org/" +LICENSE = "GPLv3" +AUTHOR = "Lukasz Pankowski <lukpank@o2.pl>" +MAINTAINER = "Lukasz Pankowski <lukpank@o2.pl>" +SECTION = "x11/applications" +PRIORITY = "optional" +DEPENDS = "edje-native python-native" + +# Pure Python plus Edje interface +PACKAGE_ARCH = "all" + +SRC_URI = "http://projects.openmoko.org/frs/download.php/832/ffalarms-0.2.2.tar.gz" + +inherit distutils + +FILES_${PN} += "${datadir}/${PN} ${datadir}/applications/ffalarms.desktop ${datadir}/pixmaps" + +RDEPENDS += "python-re python-datetime python-edje python-ecore \ + atd-over-fso alsa-utils-amixer alsa-utils-alsactl \ + ttf-dejavu-sans" + +RSUGGESTS += "mplayer alsa-utils-aplay openmoko-alsa-scenarios" diff --git a/recipes/ffalarms/ffalarms_svn.bb b/recipes/ffalarms/ffalarms_svn.bb new file mode 100644 index 0000000000..a627a96ea6 --- /dev/null +++ b/recipes/ffalarms/ffalarms_svn.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Finger friendly alarms" +HOMEPAGE = "http://ffalarms.projects.openmoko.org/" +LICENSE = "GPLv3" +AUTHOR = "Lukasz Pankowski <lukpank@o2.pl>" +MAINTAINER = "Lukasz Pankowski <lukpank@o2.pl>" +SECTION = "x11/applications" +PRIORITY = "optional" +DEPENDS = "elementary libeflvala libical" + +PV = "0.3.1+svnr${SRCPV}" +PR = "r0" + +# needed because there is do_stage_append in vala.bbclass and do_stage() was removed.. +do_stage() { + +} + +inherit vala + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ffalarms;module=trunk;proto=https" + +S = "${WORKDIR}/trunk" + +FILES_${PN} += "${datadir}/${PN} ${datadir}/applications ${datadir}/pixmaps" + +RDEPENDS = "atd alsa-utils-amixer alsa-utils-alsactl virtual/alsa-scenarios ttf-dejavu-sans libical" + +RSUGGESTS = "mplayer alsa-utils-aplay frameworkd" + +do_compile() { + oe_runmake VAPIDIR=${STAGING_DATADIR}/vala/vapi +} + +do_install() { + oe_runmake install DESTDIR=${D} +} diff --git a/recipes/ffmpeg/ffmpeg_svn.bb b/recipes/ffmpeg/ffmpeg_svn.bb index c797710f70..945fdd4969 100644 --- a/recipes/ffmpeg/ffmpeg_svn.bb +++ b/recipes/ffmpeg/ffmpeg_svn.bb @@ -5,7 +5,7 @@ DEPENDS += "schroedinger libgsm" SRCREV = "20231" PE = "1" -PV = "0.5.0+${PR}+svnr${SRCREV}" +PV = "0.5.0+${PR}+svnr${SRCPV}" PR = "r0" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/flashrom/flashrom_svn.bb b/recipes/flashrom/flashrom_svn.bb index 0c51a5857e..f90b6ee827 100644 --- a/recipes/flashrom/flashrom_svn.bb +++ b/recipes/flashrom/flashrom_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.coreboot.org/Flashrom" LICENSE = "GPL" DEPENDS = "zlib pciutils" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r0" SRC_URI = " \ diff --git a/recipes/freesmartphone/fsoraw_svn.bb b/recipes/freesmartphone/fsoraw_svn.bb index 61c6daeee0..402aea6393 100644 --- a/recipes/freesmartphone/fsoraw_svn.bb +++ b/recipes/freesmartphone/fsoraw_svn.bb @@ -4,7 +4,7 @@ PRIORITY = "optional" HOMEPAGE = "http://noko.sourceforge.net" LICENSE = "GPL" DEPENDS = "dbus" -PV = "0.0.1" +PV = "0.0.1+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://noko.svn.sourceforge.net/svnroot/noko/trunk;module=fsoraw;proto=https" diff --git a/recipes/gabriel/gabriel_svn.bb b/recipes/gabriel/gabriel_svn.bb index 1449311f90..94fdfe99e7 100644 --- a/recipes/gabriel/gabriel_svn.bb +++ b/recipes/gabriel/gabriel_svn.bb @@ -4,7 +4,7 @@ a dbus daemon running on a remote machine." LICENSE = "GPL" DEPENDS = "libssh glib-2.0 dbus glib-dbus" SECTION = "console/network" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" SRC_URI = "svn://gabriel.svn.sourceforge.net/svnroot/gabriel;module=gabriel;proto=https" S = "${WORKDIR}/gabriel" diff --git a/recipes/gcc/gcc-svn.inc b/recipes/gcc/gcc-svn.inc index e2943bd387..ab39a73724 100644 --- a/recipes/gcc/gcc-svn.inc +++ b/recipes/gcc/gcc-svn.inc @@ -7,7 +7,7 @@ require gcc-common.inc DEPENDS = "mpfr gmp" GCC_BASE ?= "4.5" -PV = "${GCC_BASE}+svnr${SRCREV}" +PV = "${GCC_BASE}+svnr${SRCPV}" PR = "r0" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take # precedence. diff --git a/recipes/gimp/babl_svn.bb b/recipes/gimp/babl_svn.bb index 332595ee6b..b9ce3cdf91 100644 --- a/recipes/gimp/babl_svn.bb +++ b/recipes/gimp/babl_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Babl is a dynamic, any to any, pixel format conversion library." LICENSE = "LGPL" SRCREV = "349" -PV = "0.0.23+svnr${SRCREV}" +PV = "0.0.23+svnr${SRCPV}" PR = "r1" PE = "1" diff --git a/recipes/gimp/gegl_svn.bb b/recipes/gimp/gegl_svn.bb index 7f49e785ac..af2e79aaaa 100644 --- a/recipes/gimp/gegl_svn.bb +++ b/recipes/gimp/gegl_svn.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" DEPENDS = "babl librsvg glib-2.0 gtk+ pango cairo expat zlib libpng jpeg virtual/libsdl" SRCREV = "2543" -PV = "0.0.19+svnr${SRCREV}" +PV = "0.0.19+svnr${SRCPV}" PE = "1" PR = "r1" diff --git a/recipes/gnet/gnet_svn.bb b/recipes/gnet/gnet_svn.bb index ea2c92ff1a..f6b27e32fe 100644 --- a/recipes/gnet/gnet_svn.bb +++ b/recipes/gnet/gnet_svn.bb @@ -3,7 +3,7 @@ LICENSE = "LGPL" SECTION = "libs/network" HOMEPAGE = "http://www.gnetlibrary.org" DEPENDS = "glib-2.0" -PV = "2.0.7+svnr${SRCREV}" +PV = "2.0.7+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.gnome.org/svn/${PN}/;module=trunk;proto=http \ diff --git a/recipes/gnome-mplayer/gnome-mplayer_svn.bb b/recipes/gnome-mplayer/gnome-mplayer_svn.bb index 2e847e0ef4..5540f94732 100644 --- a/recipes/gnome-mplayer/gnome-mplayer_svn.bb +++ b/recipes/gnome-mplayer/gnome-mplayer_svn.bb @@ -1,7 +1,7 @@ require gnome-mplayer.inc SRCREV = "1569" -PV = "0.9.8+svn${SRCREV}" +PV = "0.9.8+svnr${SRCPV}" PR = "r0" S = "${WORKDIR}/trunk" diff --git a/recipes/gnome/epiphany_svn.bb b/recipes/gnome/epiphany_svn.bb index 0c9f974f82..12f2bc5905 100644 --- a/recipes/gnome/epiphany_svn.bb +++ b/recipes/gnome/epiphany_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GNOME default webbrowser" DEPENDS = "gnome-desktop gnome-vfs libgnomeui webkit-gtk iso-codes startup-notification" RDEPENDS = "gnome-vfs-plugin-http iso-codes" -PV = "2.20.1+svnr${SRCREV}" +PV = "2.20.1+svnr${SRCPV}" PR = "r1" inherit gnome diff --git a/recipes/gnome/gconf-dbus_svn.bb b/recipes/gnome/gconf-dbus_svn.bb index 074b3015c2..671d9f4c11 100644 --- a/recipes/gnome/gconf-dbus_svn.bb +++ b/recipes/gnome/gconf-dbus_svn.bb @@ -5,7 +5,7 @@ SECTION = "x11/utils" PROVIDES = "gconf" RPROVIDES_${PN} = "gconf" RPROVIDES_${PN}-dev = "gconf-dev" -PV = "2.16.0+svnr${SRCREV}" +PV = "2.16.0+svnr${SRCPV}" PR = "r0" inherit autotools pkgconfig diff --git a/recipes/gnome/goffice/c99math.patch b/recipes/gnome/goffice/c99math.patch new file mode 100644 index 0000000000..24e6c31a72 --- /dev/null +++ b/recipes/gnome/goffice/c99math.patch @@ -0,0 +1,12 @@ +Index: goffice-0.7.14/configure.in +=================================================================== +--- goffice-0.7.14.orig/configure.in 2009-11-14 19:14:37.106109501 +0100 ++++ goffice-0.7.14/configure.in 2009-11-14 19:19:40.907333188 +0100 +@@ -66,6 +66,7 @@ + + AC_ISC_POSIX + AC_PROG_CC ++AC_PROG_CC_C99 + AC_PROG_YACC + AM_PROG_LEX + AC_PROG_LN_S diff --git a/recipes/gnome/goffice_0.7.14.bb b/recipes/gnome/goffice_0.7.14.bb index 77dd39ad79..beb23231db 100644 --- a/recipes/gnome/goffice_0.7.14.bb +++ b/recipes/gnome/goffice_0.7.14.bb @@ -1,12 +1,14 @@ DESCRIPTION="Gnome Office Library" LICENSE="GPLv2" -PR = "r1" +PR = "r2" DEPENDS="glib-2.0 gtk+ pango cairo libgnomeprint libgsf libglade libpcre libxml2 libart-lgpl" inherit gnome pkgconfig +SRC_URI += "file://c99math.patch;patch=1" + do_stage() { autotools_stage_all } diff --git a/recipes/gpe-conf/gpe-conf_svn.bb b/recipes/gpe-conf/gpe-conf_svn.bb index eeac6f9445..e18c8a8724 100644 --- a/recipes/gpe-conf/gpe-conf_svn.bb +++ b/recipes/gpe-conf/gpe-conf_svn.bb @@ -11,7 +11,7 @@ RDEPENDS_gpe-conf-panel = "gpe-conf" inherit autotools gpe -PV = "0.2.8+svnr${SRCREV}" +PV = "0.2.8+svnr${SRCPV}" PR = "r0" SRC_URI = "${GPE_SVN}" diff --git a/recipes/gpe-contacts/gpe-contacts_svn.bb b/recipes/gpe-contacts/gpe-contacts_svn.bb index 9a626572a5..2050b60ca6 100644 --- a/recipes/gpe-contacts/gpe-contacts_svn.bb +++ b/recipes/gpe-contacts/gpe-contacts_svn.bb @@ -3,7 +3,7 @@ SECTION = "gpe" LICENSE = "GPL" DEPENDS = "libcontactsdb libgpewidget libgpepimc libdisplaymigration libgpevtype dbus" RDEPENDS = "gpe-icons" -PV = "0.47+svnr${SRCREV}" +PV = "0.47+svnr${SRCPV}" PR = "r2" inherit autotools gpe diff --git a/recipes/gpe-gallery/gpe-gallery_svn.bb b/recipes/gpe-gallery/gpe-gallery_svn.bb index ea1d23a5be..8d7bf3a4ca 100644 --- a/recipes/gpe-gallery/gpe-gallery_svn.bb +++ b/recipes/gpe-gallery/gpe-gallery_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "GPE image viewer application" SECTION = "gpe" LICENSE = "GPL" DEPENDS = "libgpewidget" -PV = "0.97+svnr${SRCREV}" +PV = "0.97+svnr${SRCPV}" inherit autotools export CVSBUILD = "no" diff --git a/recipes/gpe-mini-browser/gpe-mini-browser2_svn.bb b/recipes/gpe-mini-browser/gpe-mini-browser2_svn.bb index ae3a32c8f5..b919e1af13 100644 --- a/recipes/gpe-mini-browser/gpe-mini-browser2_svn.bb +++ b/recipes/gpe-mini-browser/gpe-mini-browser2_svn.bb @@ -1,5 +1,5 @@ DEPENDS = "gtk+ glib-2.0 libgpewidget webkit-gtk" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" PR = "r0" SRCREV = "9819" diff --git a/recipes/gpe-sketchbook/gpe-sketchbook_svn.bb b/recipes/gpe-sketchbook/gpe-sketchbook_svn.bb index 929d622a51..f52f58d020 100644 --- a/recipes/gpe-sketchbook/gpe-sketchbook_svn.bb +++ b/recipes/gpe-sketchbook/gpe-sketchbook_svn.bb @@ -3,7 +3,7 @@ SECTION = "gpe" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "libgpewidget sqlite" -PV = "0.2.9+svnr${SRCREV}" +PV = "0.2.9+svnr${SRCPV}" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/gsm/gsmd.inc b/recipes/gsm/gsmd.inc index 4ce23d51f5..453a8b3ac8 100644 --- a/recipes/gsm/gsmd.inc +++ b/recipes/gsm/gsmd.inc @@ -4,7 +4,7 @@ LICENSE = "GPL LGPL" SECTION = "libs/gsm" PROVIDES += "gsmd" RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r44" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ diff --git a/recipes/gtk-engines/gtk-sato-engine_svn.bb b/recipes/gtk-engines/gtk-sato-engine_svn.bb index 6fbb7ccdbc..120d3f4a1a 100644 --- a/recipes/gtk-engines/gtk-sato-engine_svn.bb +++ b/recipes/gtk-engines/gtk-sato-engine_svn.bb @@ -1,6 +1,6 @@ require gtk-sato-engine.inc -PV = "0.3.1+svnr${SRCREV}" +PV = "0.3.1+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=gtk-engine;proto=http" diff --git a/recipes/gtk-webcore/midori_git.bb b/recipes/gtk-webcore/midori_git.bb index decc81c365..e1e2ecf99d 100644 --- a/recipes/gtk-webcore/midori_git.bb +++ b/recipes/gtk-webcore/midori_git.bb @@ -6,7 +6,7 @@ DEPENDS += "python-native python-docutils-native" PR = "r2" PV = "0.1.7+${PR}+gitr${SRCREV}" -SRC_URI = "git://git.xfce.org/kalikiana/midori;protocol=git \ +SRC_URI = "git://git.xfce.org/apps/midori;protocol=git \ file://waf \ file://wscript-fix.patch;patch=1" diff --git a/recipes/gtk-webcore/osb-browser_svn.bb b/recipes/gtk-webcore/osb-browser_svn.bb index 912215cfbd..aae279979c 100644 --- a/recipes/gtk-webcore/osb-browser_svn.bb +++ b/recipes/gtk-webcore/osb-browser_svn.bb @@ -5,7 +5,7 @@ PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "osb-nrcit gtk+ glib-2.0 libglade" RRECOMMENDS = "gdk-pixbuf-loader-gif gdk-pixbuf-loader-ico gdk-pixbuf-loader-jpeg gdk-pixbuf-loader-png" -PV = "0.5.0+svnr${SRCREV}" +PV = "0.5.0+svnr${SRCPV}" PR = "r0" inherit autotools diff --git a/recipes/gtk-webcore/osb-jscore_svn.bb b/recipes/gtk-webcore/osb-jscore_svn.bb index 554ab5b96d..52c56f98b5 100644 --- a/recipes/gtk-webcore/osb-jscore_svn.bb +++ b/recipes/gtk-webcore/osb-jscore_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://gtk-webcore.sourceforge.net/" LICENSE = "GPL" PRIORITY = "optional" -PV = "0.5.2+svnr${SRCREV}" +PV = "0.5.2+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=JavaScriptCore;proto=https \ diff --git a/recipes/gtk-webcore/osb-nrcit_svn.bb b/recipes/gtk-webcore/osb-nrcit_svn.bb index 57bb096183..dea075b099 100644 --- a/recipes/gtk-webcore/osb-nrcit_svn.bb +++ b/recipes/gtk-webcore/osb-nrcit_svn.bb @@ -4,7 +4,7 @@ LICENSE = "nokia" PRIORITY = "optional" SECTION = "gpe" -PV = "0.5.2+svnr${SRCREV}" +PV = "0.5.2+svnr${SRCPV}" PR = "r1" DEPENDS = "curl librsvg osb-nrcore pango" diff --git a/recipes/gtk-webcore/osb-nrcore_svn.bb b/recipes/gtk-webcore/osb-nrcore_svn.bb index b85c06e422..e0f7c887df 100644 --- a/recipes/gtk-webcore/osb-nrcore_svn.bb +++ b/recipes/gtk-webcore/osb-nrcore_svn.bb @@ -1,6 +1,6 @@ require osb-nrcore.inc -PV = "0.5.2+svnr${SRCREV}" +PV = "0.5.2+svnr${SRCPV}" PR = "r3" SRC_URI = "svn://gtk-webcore.svn.sourceforge.net/svnroot/gtk-webcore/trunk;module=NRCore;proto=https \ diff --git a/recipes/gtkhtml2/gtkhtml2_svn.bb b/recipes/gtkhtml2/gtkhtml2_svn.bb index 1798fcf1df..18dfdd0036 100644 --- a/recipes/gtkhtml2/gtkhtml2_svn.bb +++ b/recipes/gtkhtml2/gtkhtml2_svn.bb @@ -2,7 +2,7 @@ SECTION = "libs" DEPENDS = "gtk+ glib-2.0 libxml2" DESCRIPTION = "A GTK+ HTML rendering library." LICENSE = "GPL" -PV = "2.11.0+svnr${SRCREV}" +PV = "2.11.0+svnr${SRCPV}" SRC_URI = "svn://anonymous@svn.gnome.org/svn/gtkhtml2/;module=trunk \ http://svn.o-hand.com/repos/web/trunk/patches/at-import_box-pos.patch;patch=1;pnum=0;maxrev=1157 \ diff --git a/recipes/gypsy/gypsy_svn.bb b/recipes/gypsy/gypsy_svn.bb index 1fcc47e828..8dac863a2b 100644 --- a/recipes/gypsy/gypsy_svn.bb +++ b/recipes/gypsy/gypsy_svn.bb @@ -5,5 +5,5 @@ SRC_URI = "svn://svn.o-hand.com/repos/${PN}/trunk;module=${PN};proto=http \ file://docs-reference-am.patch;patch=1;minrev=134" S = "${WORKDIR}/${PN}" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r1" diff --git a/recipes/images/shr-image.bb b/recipes/images/shr-image.bb new file mode 100644 index 0000000000..e889f2dfb9 --- /dev/null +++ b/recipes/images/shr-image.bb @@ -0,0 +1,30 @@ +require shr-image.inc + +IMAGE_BASENAME = "full" + +DEPENDS += "task-shr" +RDEPENDS += "\ + task-shr-apps \ + task-shr-games \ + task-shr-gtk \ +" + +IMAGE_INSTALL += "\ + task-shr-apps \ + task-shr-games \ + task-shr-gtk \ +" + +# perform some SHR convenience tweaks to the rootfs +shr_rootfs_postprocess_append() { + curdir=$PWD + cd ${IMAGE_ROOTFS} + + + #Replace desktop files + echo "Icon=pidgin.png" >> ./usr/share/applications/pidgin.desktop + sed -i "s/^X-Icon-path.*$//g" ./usr/share/applications/vagalume.desktop + + cd $curdir +} + diff --git a/recipes/images/shr-image.inc b/recipes/images/shr-image.inc new file mode 100644 index 0000000000..7f1968ec12 --- /dev/null +++ b/recipes/images/shr-image.inc @@ -0,0 +1,167 @@ +#------------------------------------------------------ +# SHR Image Recipe +#------------------------------------------------------ + +PV = "2.0" +PR = "r7" + + +DEPENDS += "task-shr-minimal" + +RDEPENDS += "\ + ${MACHINE_TASK_PROVIDER} \ + task-base \ + task-shr-minimal-base \ + task-shr-minimal-cli \ + task-shr-minimal-fso \ + task-shr-minimal-apps \ + task-shr-minimal-audio \ + task-shr-minimal-gtk \ + task-shr-minimal-x \ + task-x11-illume \ + task-fso2-compliance \ + task-fonts-truetype-core \ +" + +IMAGE_INSTALL += "\ + ${MACHINE_TASK_PROVIDER} \ + task-base \ + task-shr-minimal-base \ + task-shr-minimal-cli \ + task-shr-minimal-apps \ + task-shr-minimal-audio \ + task-shr-minimal-gtk \ + task-shr-minimal-x \ + task-x11-illume \ + task-fso-compliance \ + task-fonts-truetype-core \ +" + +inherit image + +# perform some SHR convenience tweaks to the rootfs +shr_rootfs_postprocess() { + dirs=`find ${FILESDIR} -type d -printf "%P\n" | grep -v "^.$" | grep -v ".git"` + for dir in $dirs; do + mkdir -p ${IMAGE_ROOTFS}/$dir + done + files=`find ${FILESDIR} -type f -printf "%P\n" | grep -v ".git"` + for file in $files; do + cp -f ${FILESDIR}/$file ${IMAGE_ROOTFS}/$file + done + + curdir=$PWD + cd ${IMAGE_ROOTFS} + # date/time + date "+%m%d%H%M%Y" >./etc/timestamp + # alias foo + echo "alias pico=nano" >>./etc/profile + echo "alias fso='cd /local/pkg/fso'" >>./etc/profile + echo "alias ipkg='opkg'" >>./etc/profile + # dns + echo "nameserver 208.67.222.222" >./etc/resolv.conf + echo "nameserver 208.67.220.220" >>./etc/resolv.conf + # nfs + mkdir -p ./local/pkg + echo >>./etc/fstab + echo "# NFS Host" >>./etc/fstab + echo "192.168.0.200:/local/pkg /local/pkg nfs noauto,nolock,soft,rsize=32768,wsize=32768 0 0" >>./etc/fstab + # fix .desktop files for illume + #desktop=`find ./usr/share/applications -name "*.desktop"` + #for file in $desktop; do + # echo "Categories=Office;" >>$file + #done + + echo "Exec=vala-terminal -e htop" >> ./usr/share/applications/htop.desktop + + # minimal gtk theme foo + # this should be set in postinst phase of installed gtk-theme package + #mkdir -p ./etc/gtk-2.0/ + #echo 'gtk-font-name = "Sans 5"' >> ./etc/gtk-2.0/gtkrc.default + #echo 'gtk-theme-name = "shr-theme-gtk-e17lookalike"' >> ./etc/gtk-2.0/gtkrc.default + #echo 'gtk-icon-theme-name = "openmoko-standard"' >> ./etc/gtk-2.0/gtkrc.default + #echo 'style "treeview"' >> ./etc/gtk-2.0/gtkrc.default + #echo '{ ' >> ./etc/gtk-2.0/gtkrc.default + #echo ' GtkTreeView::expander-size = 40' >> ./etc/gtk-2.0/gtkrc.default + #echo '}' >> ./etc/gtk-2.0/gtkrc.default + #echo 'widget_class "*TreeView*" style "treeview"' >> ./etc/gtk-2.0/gtkrc.default + #update-alternatives --install /etc/gtk-2.0/gtkrc gtk-theme /etc/gtk-2.0/gtkrc.default 1 + + # elementary theme foo + ELM_PROFILE_SCR=./etc/profile.d/elementary.sh + echo 'export ELM_ENGINE=x11' > ${ELM_PROFILE_SCR} + echo 'export ELM_THEME=gry' >> ${ELM_PROFILE_SCR} + echo 'export ELM_SCALE=2' >> ${ELM_PROFILE_SCR} + echo 'export ELM_FINGER_SIZE=70' >> ${ELM_PROFILE_SCR} + chmod +x ${ELM_PROFILE_SCR} + + echo '' >> ./etc/ld.so.conf + # fix strange iconv/gconf bug + ln -s libc.so.6 ./lib/libc.so + + #font cache optimization, persistent cache + sed -i "s/<cachedir>.*\/var\/cache\/\(.*\)<\/cachedir>/<cachedir>\/var\/local\/\1<\/cachedir>/g" ./etc/fonts/fonts.conf + + #set up a nice gentoo-like PS1 + echo "export PS1=\"\[\033[01;32m\]\u@\h\[\033[01;34m\] \w \$\[\033[00m\] \"">> ./etc/profile + + #load modules on boot + [ -d ./etc/modutils ] || mkdir ./etc/modutils + echo "g_ether" > ./etc/modutils/g_ether + echo "ppp_generic" > ./etc/modutils/ppp_generic + # FIXME: Only do this for GTA02 + # FIXME: investigate why module_autoload in machine config doesn't work + echo "snd-soc-neo1973-gta02-wm8753" > ./etc/modutils/snd-soc-neo + + #set up some variables to improve default settings + echo "if [ \"\$DISPLAY\" = \"\" ]" >> ./etc/profile + echo "then" >> ./etc/profile + echo " export DISPLAY=localhost:0" >> ./etc/profile + echo "fi" >> ./etc/profile + echo "export HISTFILESIZE=1000" >> ./etc/profile + echo "export HISTSIZE=1000" >> ./etc/profile + echo "alias rm='rm -i'; alias cp='cp -i'; alias mv='mv -i'" >> ./etc/profile + echo "alias la='ls $LS_OPTIONS -ltrA'; alias lh='ls $LS_OPTIONS -ltrh'; alias lr='ls $LS_OPTIONS -ltr';" >> ./etc/profile + echo "alias lR='ls $LS_OPTIONS -ltrR'" >> ./etc/profile + echo "# set your locale here:" >> ./etc/profile + echo "export LANG=en_US.UTF-8" >> ./etc/profile + + # Add some missing entries to the passwd and group file; but do so carefully + # since this will be fixed upstream at some point. + grep -q '^tss:' ./etc/passwd || echo 'tss:x:93:93:Linux TSS User:/bin:/bin/sh' >>./etc/passwd + grep -q '^scanner:' ./etc/group || echo 'scanner:*:91:' >>./etc/group + grep -q '^nvram:' ./etc/group || echo 'nvram:*:92:' >>./etc/group + grep -q '^tss:' ./etc/group || echo 'tss:*:93:' >>./etc/group + grep -q '^fuse:' ./etc/group || echo 'fuse:*:94:' >>./etc/group + grep -q '^kvm:' ./etc/group || echo 'kvm:*:95:' >>./etc/group + grep -q '^rdma:' ./etc/group || echo 'rdma:*:96:' >>./etc/group + + cd $curdir +} + +shr_rootfs_gta02_postprocess() { + curdir=$PWD + cd ${IMAGE_ROOTFS} + cd ${IMAGE_ROOTFS}/boot + ln -s uImage uImage-GTA02.bin + cd $curdir + #sed -i 's/#SCORouting=PCM/SCORouting=PCM/' ${IMAGE_ROOTFS}/etc/bluetooth/audio.conf +} + +shr_rootfs_gta01_postprocess() { + curdir=$PWD + cd ${IMAGE_ROOTFS} + cd ${IMAGE_ROOTFS}/boot + ln -s uImage uImage-GTA01.bin + cd $curdir + #sed -i 's/#SCORouting=PCM/SCORouting=PCM/' ${IMAGE_ROOTFS}/etc/bluetooth/audio.conf +} + +ROOTFS_POSTPROCESS_COMMAND += " shr_rootfs_postprocess" + +ROOTFS_POSTPROCESS_COMMAND_append_om-gta02 = ";shr_rootfs_gta02_postprocess" +ROOTFS_POSTPROCESS_COMMAND_append_om-gta01 = ";shr_rootfs_gta01_postprocess" + +#do_testlab() { +# : +#} diff --git a/recipes/images/shr-image/boot/append-GTA02 b/recipes/images/shr-image/boot/append-GTA02 new file mode 100644 index 0000000000..4901a091e7 --- /dev/null +++ b/recipes/images/shr-image/boot/append-GTA02 @@ -0,0 +1,2 @@ +loglevel=1 quiet splash + diff --git a/recipes/images/shr-image/etc/htoprc b/recipes/images/shr-image/etc/htoprc new file mode 100644 index 0000000000..e7bb5b7879 --- /dev/null +++ b/recipes/images/shr-image/etc/htoprc @@ -0,0 +1,21 @@ +# Beware! This file is rewritten every time htop exits. +# The parser is also very primitive, and not human-friendly. +# (I know, it's in the todo list). +fields=39 46 47 49 1 +sort_key=46 +sort_direction=1 +hide_threads=0 +hide_kernel_threads=1 +hide_userland_threads=0 +shadow_other_users=0 +highlight_base_name=0 +highlight_megabytes=1 +tree_view=0 +header_margin=0 +detailed_cpu_time=1 +color_scheme=0 +delay=15 +left_meters=AllCPUs Memory +left_meter_modes=1 1 +right_meters=Tasks LoadAverage Uptime +right_meter_modes=2 2 2 diff --git a/recipes/images/shr-image/etc/logrotate.d/50freesmartphone b/recipes/images/shr-image/etc/logrotate.d/50freesmartphone new file mode 100644 index 0000000000..2d3fb8196f --- /dev/null +++ b/recipes/images/shr-image/etc/logrotate.d/50freesmartphone @@ -0,0 +1,11 @@ +/var/log/frameworkd.log { + rotate 5 + weekly + compress +} + +/var/log/ophonekitd.log { + rotate 5 + weekly + compress +} diff --git a/recipes/images/shr-image/etc/profile.d/elementary.sh b/recipes/images/shr-image/etc/profile.d/elementary.sh new file mode 100755 index 0000000000..da435964a7 --- /dev/null +++ b/recipes/images/shr-image/etc/profile.d/elementary.sh @@ -0,0 +1,4 @@ +export ELM_ENGINE=x11 +export ELM_THEME=default +export ELM_SCALE=2 +export ELM_FINGER_SIZE=70 diff --git a/recipes/images/shr-lite-image.bb b/recipes/images/shr-lite-image.bb new file mode 100644 index 0000000000..fa1a7ac71a --- /dev/null +++ b/recipes/images/shr-lite-image.bb @@ -0,0 +1,5 @@ +require shr-image.inc + +IMAGE_BASENAME = "lite" + +IMAGES_LINGUAS="en-us" diff --git a/recipes/images/shr-lite-image/boot/append-GTA02 b/recipes/images/shr-lite-image/boot/append-GTA02 new file mode 100644 index 0000000000..4901a091e7 --- /dev/null +++ b/recipes/images/shr-lite-image/boot/append-GTA02 @@ -0,0 +1,2 @@ +loglevel=1 quiet splash + diff --git a/recipes/images/shr-lite-image/etc/htoprc b/recipes/images/shr-lite-image/etc/htoprc new file mode 100644 index 0000000000..e7bb5b7879 --- /dev/null +++ b/recipes/images/shr-lite-image/etc/htoprc @@ -0,0 +1,21 @@ +# Beware! This file is rewritten every time htop exits. +# The parser is also very primitive, and not human-friendly. +# (I know, it's in the todo list). +fields=39 46 47 49 1 +sort_key=46 +sort_direction=1 +hide_threads=0 +hide_kernel_threads=1 +hide_userland_threads=0 +shadow_other_users=0 +highlight_base_name=0 +highlight_megabytes=1 +tree_view=0 +header_margin=0 +detailed_cpu_time=1 +color_scheme=0 +delay=15 +left_meters=AllCPUs Memory +left_meter_modes=1 1 +right_meters=Tasks LoadAverage Uptime +right_meter_modes=2 2 2 diff --git a/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone b/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone new file mode 100644 index 0000000000..2d3fb8196f --- /dev/null +++ b/recipes/images/shr-lite-image/etc/logrotate.d/50freesmartphone @@ -0,0 +1,11 @@ +/var/log/frameworkd.log { + rotate 5 + weekly + compress +} + +/var/log/ophonekitd.log { + rotate 5 + weekly + compress +} diff --git a/recipes/images/shr-lite-image/etc/profile.d/elementary.sh b/recipes/images/shr-lite-image/etc/profile.d/elementary.sh new file mode 100755 index 0000000000..da435964a7 --- /dev/null +++ b/recipes/images/shr-lite-image/etc/profile.d/elementary.sh @@ -0,0 +1,4 @@ +export ELM_ENGINE=x11 +export ELM_THEME=default +export ELM_SCALE=2 +export ELM_FINGER_SIZE=70 diff --git a/recipes/intone-video/intone-video_svn.bb b/recipes/intone-video/intone-video_svn.bb new file mode 100644 index 0000000000..1047c35748 --- /dev/null +++ b/recipes/intone-video/intone-video_svn.bb @@ -0,0 +1,37 @@ +DESCRIPTION = "intone-video is a mplayer video frontend for openmoko phones" +HOMEPAGE = "http://code.google.com/p/intone-video/" +AUTHOR = "cchandel" +LICENSE = "GPLv2" +SECTION = "e/apps" +DEPENDS = "elementary eina sqlite3 edbus" +RDEPENDS = "mplayer lame libxv libsdl-x11" + +PV = "0.13+svnr${SRCPV}" +PR = "r0" + +SRC_URI = "svn://intone-video.googlecode.com/svn/trunk;module=.;proto=http" +S = "${WORKDIR}" + +inherit autotools + +do_configure_prepend() { + rm -f "${S}/INSTALL" + touch "${S}/INSTALL" + sed -i 's/intone/intone-video/g' ${S}/configure.ac + sed -i 's/\/doc\/intone$/\/share\/doc\/intone-video/g' ${S}/Makefile.am + sed -i '/^EXTRA_DIST = $(glade_DATA)/d' ${S}/src/Makefile.am + sed -i '/^gladedir = $(datadir)\/intone\/glade/d' ${S}/src/Makefile.am + sed -i '/^glade_DATA = intone.glade/d' ${S}/src/Makefile.am +} + +do_install_append() { + mv ${D}/${bindir}/intone ${D}/${bindir}/intone-video + mkdir -p "${D}/${datadir}/pixmaps" + install -m 0644 "${S}/resources/intone-video.png" "${D}/${datadir}/pixmaps" + mkdir -p "${D}/${datadir}/applications" + install -m 0644 "${S}/resources/intone-video.desktop" "${D}/${datadir}/applications" +} + + +FILES_${PN} += "/usr/share/pixmaps/* /usr/share/applications/*" + diff --git a/recipes/intone/intone/vorbis-include-id3tag.patch b/recipes/intone/intone/vorbis-include-id3tag.patch new file mode 100644 index 0000000000..71bd5e7dc8 --- /dev/null +++ b/recipes/intone/intone/vorbis-include-id3tag.patch @@ -0,0 +1,23 @@ +diff -uri intone/src/db_sqlite.c intone.mok/src/db_sqlite.c +--- intone/src/db_sqlite.c 2009-06-30 22:41:23.000000000 +0200 ++++ intone.mok/src/db_sqlite.c 2009-07-05 23:10:01.000000000 +0200 +@@ -17,7 +17,7 @@ + #include "db_sqlite.h" + #include <id3.h> + #include <vorbis/codec.h> +-#include <vorbisfile.h> ++#include <vorbis/vorbisfile.h> + #include <string.h> + + int check_file_exists(char *path) +diff -uri intone/src/Makefile.am intone.mok/src/Makefile.am +--- intone/src/Makefile.am 2009-05-15 16:29:18.000000000 +0200 ++++ intone.mok/src/Makefile.am 2009-07-05 23:54:20.000000000 +0200 +@@ -31,6 +31,6 @@ + intone_LDFLAGS = \ + -Wl,--export-dynamic + +-intone_LDADD = $(INTONE_LIBS) ++intone_LDADD = $(INTONE_LIBS) -lid3 + + EXTRA_DIST = $(glade_DATA) diff --git a/recipes/intone/intone_svn.bb b/recipes/intone/intone_svn.bb new file mode 100644 index 0000000000..5b3f06232f --- /dev/null +++ b/recipes/intone/intone_svn.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "intone is a mplayer frontend for openmoko phones" +HOMEPAGE = "http://code.google.com/p/intone/" +AUTHOR = "cchandel" +LICENSE = "GPLv2" +SECTION = "e/apps" +DEPENDS = "elementary eina sqlite3 edbus libvorbis id3lib" +RDEPENDS = "mplayer lame libxv libsdl-x11" + +PV = "0.66+svnr${SRCPV}" +PR = "r1" + +SRC_URI = "svn://intone.googlecode.com/svn/trunk;module=.;proto=http \ +file://vorbis-include-id3tag.patch;pnum=1;patch=1;maxrev=18" +S = "${WORKDIR}" + +inherit autotools + +do_configure_prepend() { + rm -f "${S}/INSTALL" + touch "${S}/INSTALL" + sed -i 's/{prefix}\/doc\/intone$/{prefix}\/share\/doc\/intone/g' ${S}/Makefile.am +} + +do_install_append() { + mkdir -p "${D}/${datadir}/pixmaps" + install -m 0644 "${S}/resources/intone.png" "${D}/${datadir}/pixmaps" + mkdir -p "${D}/${datadir}/applications" + install -m 0644 "${S}/resources/intone.desktop" "${D}/${datadir}/applications" + mkdir -p "${D}/${datadir}/intone" + for ico in "${S}/resources/"*.png; do + if [ "$(basename $ico)" != "intone.png" ]; then + install -m 0644 $ico "${D}/${datadir}/intone" + fi + done +} + + +FILES_${PN} += "/usr/share/intone/* /usr/share/applications/* /usr/share/pixmaps/*" + diff --git a/recipes/irrlicht/irrlicht-examples-gles.bb b/recipes/irrlicht/irrlicht-examples-gles.bb index 6de692ec0e..7cfab4e343 100644 --- a/recipes/irrlicht/irrlicht-examples-gles.bb +++ b/recipes/irrlicht/irrlicht-examples-gles.bb @@ -3,7 +3,7 @@ LICENSE = "zlib" DEPENDS = "virtual/libx11 libxxf86vm virtual/egl" SRCREV = "2409" -PV = "1.6+svnr${SRCREV}" +PV = "1.6+svnr${SRCPV}" SRC_URI = "svn://irrlicht.svn.sourceforge.net/svnroot/irrlicht/branches;module=ogl-es;proto=https \ file://irrlicht_beagle.diff;patch=1;pnum=0 \ diff --git a/recipes/kde4/kde4.inc b/recipes/kde4/kde4.inc index 5f621c6950..6188c5d512 100644 --- a/recipes/kde4/kde4.inc +++ b/recipes/kde4/kde4.inc @@ -2,7 +2,7 @@ LICENSE = "GPL" inherit qt4x11 cmake mime -PV = "4.1+svnr${SRCREV}" +PV = "4.1+svnr${SRCPV}" SRCREV = "856719" SRC_URI = "svn://anonsvn.kde.org/home/kde/branches/KDE/4.1;module=${PN};proto=svn" diff --git a/recipes/kismet/kismet-newcore_svn.bb b/recipes/kismet/kismet-newcore_svn.bb index 6f3c00bdcb..aaa0727e87 100644 --- a/recipes/kismet/kismet-newcore_svn.bb +++ b/recipes/kismet/kismet-newcore_svn.bb @@ -2,7 +2,7 @@ require kismet.inc DEFAULT_PREFERENCE = "-1" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r3" SRC_URI = "svn://svn.kismetwireless.net/code/branch/;module=kismet-newcore;proto=http" diff --git a/recipes/kismet/kismet_svn.bb b/recipes/kismet/kismet_svn.bb index 878678052a..aa60062a52 100644 --- a/recipes/kismet/kismet_svn.bb +++ b/recipes/kismet/kismet_svn.bb @@ -2,7 +2,7 @@ require kismet.inc DEFAULT_PREFERENCE = "-1" -PV = "2007-10-R1+svnr${SRCREV}" +PV = "2007-10-R1+svnr${SRCPV}" PR = "r2" SRC_URI = "svn://svn.kismetwireless.net/code/;module=trunk;proto=http" diff --git a/recipes/libfakekey/libfakekey_svn.bb b/recipes/libfakekey/libfakekey_svn.bb index 946080cf33..88cada89e7 100644 --- a/recipes/libfakekey/libfakekey_svn.bb +++ b/recipes/libfakekey/libfakekey_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox keyboard" LICENSE = "GPL" DEPENDS = "libxtst" SECTION = "x11/wm" -PV = "0.2+svnr${SRCREV}" +PV = "0.2+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ diff --git a/recipes/libical/libical_0.44.bb b/recipes/libical/libical_0.44.bb new file mode 100644 index 0000000000..e1889bc71b --- /dev/null +++ b/recipes/libical/libical_0.44.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "iCal and scheduling (RFC 2445, 2446, 2447) library" +HOMEPAGE = "http://www.softwarestudio.org/softwarestudio/app.php/libical" +SECTION = "libs" +LICENSE = "LGPL / MPL" +PR = "r0" + +SRC_URI = "${SOURCEFORGE_MIRROR}/freeassociation/${P}.tar.gz \ + " + + +inherit autotools + +do_stage () { + autotools_stage_all +} diff --git a/recipes/libowl/libowl_svn.bb b/recipes/libowl/libowl_svn.bb index d5042b78a1..677a25f2ff 100644 --- a/recipes/libowl/libowl_svn.bb +++ b/recipes/libowl/libowl_svn.bb @@ -12,7 +12,7 @@ HOMEPAGE = "http://www.o-hand.com" LICENSE = "LGPL" SECTION = "libs" DEPENDS = "gtk+" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r3" PACKAGES = "" diff --git a/recipes/librfid/librfid_svn.bb b/recipes/librfid/librfid_svn.bb index f687985c79..7df31eec31 100644 --- a/recipes/librfid/librfid_svn.bb +++ b/recipes/librfid/librfid_svn.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "virtual/libusb0" SRCNAME = "librfid" -PV = "0.2.0+svnr${SRCREV}" +PV = "0.2.0+svnr${SRCPV}" PR = "r5" SRC_URI = "svn://svn.gnumonks.org/trunk;module=${SRCNAME};proto=http \ diff --git a/recipes/libw100/libw100_svn.bb b/recipes/libw100/libw100_svn.bb index 462163e115..9e01a2a9c2 100644 --- a/recipes/libw100/libw100_svn.bb +++ b/recipes/libw100/libw100_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Acceleration library for ATI imageon chipsets (w100 and w3220)" LICENSE = "GPLv2" -PV = "0.0.2+svnr${SRCREV}" +PV = "0.0.2+svnr${SRCPV}" PE = "1" SRC_URI = "svn://libw100.svn.sourceforge.net/svnroot/libw100;module=trunk;proto=https" diff --git a/recipes/libxosd/libxosd_svn.bb b/recipes/libxosd/libxosd_svn.bb index 377f55dc2a..bc40b34895 100644 --- a/recipes/libxosd/libxosd_svn.bb +++ b/recipes/libxosd/libxosd_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A library for displaying a TV-like on-screen display in X." SECTION = "libs/x11" DEPENDS = "virtual/libx11 libxext" LICENSE = "LGPL" -PV = "2.2.15+svnr${SRCREV}" +PV = "2.2.15+svnr${SRCPV}" PR = "r5" SRC_URI = "svn://libxosd.svn.sourceforge.net/svnroot/libxosd/source;module=current;proto=https \ diff --git a/recipes/linphone/linphone-3.1.0/preferences-segv.patch b/recipes/linphone/linphone-3.1.0/preferences-segv.patch new file mode 100644 index 0000000000..529688b68f --- /dev/null +++ b/recipes/linphone/linphone-3.1.0/preferences-segv.patch @@ -0,0 +1,11 @@ +--- linphone-3.1.0/coreapi/linphonecore.c 2009/03/24 22:24:49 366 ++++ linphone-3.1.0/coreapi/linphonecore.c 2009/03/24 22:43:14 367 +@@ -2108,7 +2108,7 @@ + if (olddev!=NULL && olddev!=lc->video_conf.device){ + toggle_video_preview(lc,FALSE);/*restart the video local preview*/ + } +- if (lc->ready){ ++ if (lc->ready && lc->video_conf.device){ + vd=ms_web_cam_get_string_id(lc->video_conf.device); + if (vd && strstr(vd,"Static picture")!=NULL){ + vd=NULL; diff --git a/recipes/linphone/linphone_3.1.0.bb b/recipes/linphone/linphone_3.1.0.bb new file mode 100644 index 0000000000..bebaa169e2 --- /dev/null +++ b/recipes/linphone/linphone_3.1.0.bb @@ -0,0 +1,82 @@ +DESCRIPTION = "SIP-based IP phone (console edition)" +HOMEPAGE = "http://www.linphone.org/?lang=us" +SECTION = "x11/utils" +LICENSE = "GPLv2" + +PR = "r1" + +DEPENDS = "intltool libosip2 speex libogg alsa-lib readline libexosip2" +DEPENDS_${PN} = "liblinphone" +DEPENDS_${PN}c = "liblinphone readline" +DEPENDS_liblinphone = "libmediastreamer libortp libosip2" +#DEPENDS_libquickstream = "speex libmediastreamer alsa-lib" +DEPENDS_libmediastreamer = "speex libogg alsa-lib libortp" + +RDEPENDS_${PN} = "liblinphone" +RDEPENDS_${PN}c = "liblinphone readline" +RDEPENDS_liblinphone = "libmediastreamer libortp libosip2" +#RDEPENDS_libquickstream = "speex libmediastreamer libasound" +RDEPENDS_libmediastreamer = "speex libogg libasound libortp" + +PROVIDES += "linphone linphonec liblinphone" + +SRC_URI = "http://download.savannah.nongnu.org/releases/linphone/3.1.x/sources/linphone-${PV}.tar.gz \ + file://b64_assert.patch;patch=1 \ + file://preferences-segv.patch;patch=1 \ + " + +S = "${WORKDIR}/linphone-${PV}" + +inherit autotools pkgconfig + +export PKG_CONFIG=${STAGING_BINDIR_NATIVE}/pkg-config + +EXTRA_OECONF = "--disable-gtk-doc \ + --without-ffmpeg --disable-video \ + --enable-alsa \ + --with-osip=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-readline=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --with-speex=${STAGING_DIR_HOST}${layout_exec_prefix} \ + --disable-truespeech --disable-manual \ + --enable-console_ui=yes --enable-gtk_ui=yes \ + --with-realprefix=/usr \ + " + +PARALLEL_MAKE = "" + +do_stage () { + install -d ${STAGING_DATADIR}/aclocal + oe_libinstall -a -so liblinphone ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/linphone + install -m 0644 ${S}/coreapi/linphonecore.h ${STAGING_INCDIR}/linphone + install -m 0644 ${S}/coreapi/lpconfig.h ${STAGING_INCDIR}/linphone + oe_libinstall -a -so libmediastreamer ${STAGING_LIBDIR} +# oe_libinstall -a -so libquickstream ${STAGING_LIBDIR} + install -d ${STAGING_INCDIR}/mediastreamer2 + install -m 0644 ${S}/mediastreamer2/include/mediastreamer2/*.h ${STAGING_INCDIR}/mediastreamer2 + install -d ${STAGING_INCDIR}/ortp + oe_libinstall -a -so libortp ${STAGING_LIBDIR}/ + install -m 0644 ${S}/oRTP/include/ortp/*.h ${STAGING_INCDIR}/ortp/ + autotools_stage_all +} + +PACKAGES += "linphonec linphone-rings liblinphone libmediastreamer libortp" + +FILES_${PN} = "${bindir}/linphone-3 \ + ${bindir}/linphone \ + ${datadir}/linphone \ + ${datadir}/pixmaps \ + ${datadir}/applications \ + ${datadir}/gnome/apps \ + ${datadir}/sounds/linphone/hello8000.wav \ + ${datadir}/sounds/linphone/hello16000.wav \ + ${datadir}/images/nowebcamCIF.jpg \ + " +FILES_${PN}c = "${bindir}/linphonec ${bindir}/linphonecsh ${bindir}/sipomatic ${datadir}/sounds/linphone/ringback.wav" +FILES_${PN}-rings = "${datadir}/sounds/linphone/rings" +FILES_liblinphone = "${libdir}/liblinphone.so.*" +#FILES_libquickstream = "${libdir}/libquickstream.so.*" +FILES_libmediastreamer = "${libdir}/libmediastreamer.so.* /usr/libexec/mediastream" +FILES_libortp = "${libdir}/libortp.so.*" +FILES_${PN}-dev += "${libdir}/*.a ${libdir}/*.la ${libdir}/pkgconfig ${includedir}" + diff --git a/recipes/linux/linux-bfin_svn.bb b/recipes/linux/linux-bfin_svn.bb index d7402e606a..9b1b4e1a46 100644 --- a/recipes/linux/linux-bfin_svn.bb +++ b/recipes/linux/linux-bfin_svn.bb @@ -2,7 +2,7 @@ require linux.inc COMPATIBLE_HOST = 'bfin.*-uclinux' -PV = "2.6.22.10+svnr${SRCREV}" +PV = "2.6.22.10+svnr${SRCPV}" SRC_URI = "svn://sources.blackfin.uclinux.org/linux-kernel/;module=trunk \ file://defconfig \ diff --git a/recipes/linux/linux-ixp4xx_2.6.18.bb b/recipes/linux/linux-ixp4xx_2.6.18.bb index 1fb86f15eb..a96768549c 100644 --- a/recipes/linux/linux-ixp4xx_2.6.18.bb +++ b/recipes/linux/linux-ixp4xx_2.6.18.bb @@ -3,7 +3,7 @@ require linux-ixp4xx.inc KERNEL_RELEASE = "2.6.18" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PV = "${KERNEL_RELEASE}+svnr${SRCPV}" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \ diff --git a/recipes/linux/linux-ixp4xx_2.6.19.bb b/recipes/linux/linux-ixp4xx_2.6.19.bb index 550313ca94..666d42daa0 100644 --- a/recipes/linux/linux-ixp4xx_2.6.19.bb +++ b/recipes/linux/linux-ixp4xx_2.6.19.bb @@ -3,7 +3,7 @@ require linux-ixp4xx.inc KERNEL_RELEASE = "2.6.19" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PV = "${KERNEL_RELEASE}+svnr${SRCPV}" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \ diff --git a/recipes/linux/linux-ixp4xx_2.6.20.bb b/recipes/linux/linux-ixp4xx_2.6.20.bb index f70992ea86..7a2faa0e25 100644 --- a/recipes/linux/linux-ixp4xx_2.6.20.bb +++ b/recipes/linux/linux-ixp4xx_2.6.20.bb @@ -3,7 +3,7 @@ require linux-ixp4xx.inc KERNEL_RELEASE = "2.6.20" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PV = "${KERNEL_RELEASE}+svnr${SRCPV}" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${KERNEL_RELEASE}.tar.bz2 \ diff --git a/recipes/linux/linux-ixp4xx_2.6.21.7.bb b/recipes/linux/linux-ixp4xx_2.6.21.7.bb index 4d26621241..60d3d4d1cd 100644 --- a/recipes/linux/linux-ixp4xx_2.6.21.7.bb +++ b/recipes/linux/linux-ixp4xx_2.6.21.7.bb @@ -4,7 +4,7 @@ require linux-ixp4xx.inc VANILLA_VERSION = "2.6.21" KERNEL_RELEASE = "2.6.21.7" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PV = "${KERNEL_RELEASE}+svnr${SRCPV}" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ diff --git a/recipes/linux/linux-ixp4xx_2.6.23.14.bb b/recipes/linux/linux-ixp4xx_2.6.23.14.bb index b7c7682370..50cc46c5c8 100644 --- a/recipes/linux/linux-ixp4xx_2.6.23.14.bb +++ b/recipes/linux/linux-ixp4xx_2.6.23.14.bb @@ -5,9 +5,9 @@ VANILLA_VERSION = "2.6.23" KERNEL_RELEASE = "2.6.23.14" # If you use a rc, you will need to use this: -#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" +#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCPV}" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PV = "${KERNEL_RELEASE}+svnr${SRCPV}" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ diff --git a/recipes/linux/linux-ixp4xx_2.6.24.7.bb b/recipes/linux/linux-ixp4xx_2.6.24.7.bb index c6d035b012..6532cad435 100644 --- a/recipes/linux/linux-ixp4xx_2.6.24.7.bb +++ b/recipes/linux/linux-ixp4xx_2.6.24.7.bb @@ -5,9 +5,9 @@ VANILLA_VERSION = "2.6.24" KERNEL_RELEASE = "2.6.24.7" # If you use a rc, you will need to use this: -#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" +#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCPV}" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PV = "${KERNEL_RELEASE}+svnr${SRCPV}" PR = "r1" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ diff --git a/recipes/linux/linux-ixp4xx_2.6.27.8.bb b/recipes/linux/linux-ixp4xx_2.6.27.8.bb index 68a1482ccb..0d4d715432 100644 --- a/recipes/linux/linux-ixp4xx_2.6.27.8.bb +++ b/recipes/linux/linux-ixp4xx_2.6.27.8.bb @@ -7,9 +7,9 @@ VANILLA_VERSION = "2.6.27" KERNEL_RELEASE = "2.6.27.8" # If you use a rc, you will need to use this: -#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" +#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCPV}" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PV = "${KERNEL_RELEASE}+svnr${SRCPV}" PR = "r2" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ diff --git a/recipes/linux/linux-ixp4xx_2.6.29.bb b/recipes/linux/linux-ixp4xx_2.6.29.bb index f2c697f69f..f13a2b7ee8 100644 --- a/recipes/linux/linux-ixp4xx_2.6.29.bb +++ b/recipes/linux/linux-ixp4xx_2.6.29.bb @@ -7,9 +7,9 @@ VANILLA_VERSION = "2.6.29" KERNEL_RELEASE = "2.6.29" # If you use a rc, you will need to use this: -#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCREV}" +#PV = "${VANILLA_VERSION}+${KERNEL_RELEASE}+svnr${SRCPV}" -PV = "${KERNEL_RELEASE}+svnr${SRCREV}" +PV = "${KERNEL_RELEASE}+svnr${SRCPV}" PR = "r0" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${VANILLA_VERSION}.tar.bz2 \ diff --git a/recipes/linux/linux-openmoko-2.6.31/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch b/recipes/linux/linux-openmoko-2.6.31/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch new file mode 100644 index 0000000000..c6b989f997 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.31/0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch @@ -0,0 +1,27 @@ +From 63b619f9466dc36648d082dc4e4fad714a343d80 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sat, 7 Nov 2009 20:33:06 +0100 +Subject: [PATCH 1/5] wm8753: fix build with gcc-4.4.2, which works ok with 4.1.2 + +--- + sound/soc/codecs/wm8753.c | 4 +++- + 1 files changed, 3 insertions(+), 1 deletions(-) + +diff --git a/sound/soc/codecs/wm8753.c b/sound/soc/codecs/wm8753.c +index d80d414..1e685b2 100644 +--- a/sound/soc/codecs/wm8753.c ++++ b/sound/soc/codecs/wm8753.c +@@ -709,7 +709,9 @@ static void pll_factors(struct _pll_div *pll_div, unsigned int target, + Nmod = target % source; + Kpart = FIXED_PLL_SIZE * (long long)Nmod; + +- do_div(Kpart, source); ++ // with this, gcc-4.4.2 emits the reference to uldivmod, but then optimizes it out ++ //do_div(Kpart, source); ++ __do_div_asm(Kpart, source); + + K = Kpart & 0xFFFFFFFF; + +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-2.6.31/0004-gta02_defconfig-Enable-UBI-support.patch b/recipes/linux/linux-openmoko-2.6.31/0004-gta02_defconfig-Enable-UBI-support.patch new file mode 100644 index 0000000000..4ab88d3672 --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.31/0004-gta02_defconfig-Enable-UBI-support.patch @@ -0,0 +1,67 @@ +From 513b35171de9efbbc0699bff5f2e5a324d2cd8ef Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 8 Nov 2009 11:22:13 +0100 +Subject: [PATCH 4/5] gta02_defconfig: Enable UBI support + +--- + arch/arm/configs/gta02_defconfig | 22 +++++++++++++++++++--- + 1 files changed, 19 insertions(+), 3 deletions(-) + +diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig +index b0a6d72..3f1b60b 100644 +--- a/arch/arm/configs/gta02_defconfig ++++ b/arch/arm/configs/gta02_defconfig +@@ -648,7 +648,15 @@ CONFIG_MTD_NAND_S3C2410=y + # + # UBI - Unsorted block images + # +-# CONFIG_MTD_UBI is not set ++CONFIG_MTD_UBI=y ++CONFIG_MTD_UBI_WL_THRESHOLD=4096 ++CONFIG_MTD_UBI_BEB_RESERVE=1 ++CONFIG_MTD_UBI_GLUEBI=y ++ ++# ++# UBI debugging options ++# ++# CONFIG_MTD_UBI_DEBUG is not set + # CONFIG_PARPORT is not set + CONFIG_BLK_DEV=y + # CONFIG_BLK_DEV_COW_COMMON is not set +@@ -1478,6 +1486,12 @@ CONFIG_JFFS2_ZLIB=y + # CONFIG_JFFS2_LZO is not set + CONFIG_JFFS2_RTIME=y + # CONFIG_JFFS2_RUBIN is not set ++CONFIG_UBIFS_FS=y ++# CONFIG_UBIFS_FS_XATTR is not set ++# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set ++CONFIG_UBIFS_FS_LZO=y ++CONFIG_UBIFS_FS_ZLIB=y ++# CONFIG_UBIFS_FS_DEBUG is not set + # CONFIG_CRAMFS is not set + # CONFIG_SQUASHFS is not set + # CONFIG_VXFS_FS is not set +@@ -1670,9 +1684,9 @@ CONFIG_CRYPTO_MD5=y + # + # Compression + # +-# CONFIG_CRYPTO_DEFLATE is not set ++CONFIG_CRYPTO_DEFLATE=y + CONFIG_CRYPTO_ZLIB=y +-# CONFIG_CRYPTO_LZO is not set ++CONFIG_CRYPTO_LZO=y + + # + # Random Number Generation +@@ -1695,6 +1709,8 @@ CONFIG_CRC7=y + # CONFIG_LIBCRC32C is not set + CONFIG_ZLIB_INFLATE=y + CONFIG_ZLIB_DEFLATE=y ++CONFIG_LZO_COMPRESS=y ++CONFIG_LZO_DECOMPRESS=y + CONFIG_DECOMPRESS_GZIP=y + CONFIG_DECOMPRESS_BZIP2=y + CONFIG_DECOMPRESS_LZMA=y +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-2.6.31/0005-gta02_defconfig-Enable-UBI-debug.patch b/recipes/linux/linux-openmoko-2.6.31/0005-gta02_defconfig-Enable-UBI-debug.patch new file mode 100644 index 0000000000..19c602a15c --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.31/0005-gta02_defconfig-Enable-UBI-debug.patch @@ -0,0 +1,88 @@ +From 5ae14aa9c5eea7178a8de28515b45d600ecb7a13 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 8 Nov 2009 11:24:01 +0100 +Subject: [PATCH 5/5] gta02_defconfig: Enable UBI debug + +--- + arch/arm/configs/gta02_defconfig | 23 +++++++++++++++++++++-- + 1 files changed, 21 insertions(+), 2 deletions(-) + +diff --git a/arch/arm/configs/gta02_defconfig b/arch/arm/configs/gta02_defconfig +index 3f1b60b..0f53baf 100644 +--- a/arch/arm/configs/gta02_defconfig ++++ b/arch/arm/configs/gta02_defconfig +@@ -76,6 +76,7 @@ CONFIG_ANON_INODES=y + CONFIG_UID16=y + CONFIG_SYSCTL_SYSCALL=y + CONFIG_KALLSYMS=y ++CONFIG_KALLSYMS_ALL=y + # CONFIG_KALLSYMS_EXTRA_PASS is not set + CONFIG_HOTPLUG=y + CONFIG_PRINTK=y +@@ -110,6 +111,7 @@ CONFIG_HAVE_CLK=y + # + # GCOV-based kernel profiling + # ++# CONFIG_GCOV_KERNEL is not set + # CONFIG_SLOW_WORK is not set + CONFIG_HAVE_GENERIC_DMA_COHERENT=y + CONFIG_SLABINFO=y +@@ -656,7 +658,21 @@ CONFIG_MTD_UBI_GLUEBI=y + # + # UBI debugging options + # +-# CONFIG_MTD_UBI_DEBUG is not set ++CONFIG_MTD_UBI_DEBUG=y ++CONFIG_MTD_UBI_DEBUG_MSG=y ++# CONFIG_MTD_UBI_DEBUG_PARANOID is not set ++# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set ++# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set ++# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set ++# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set ++ ++# ++# Additional UBI debugging messages ++# ++CONFIG_MTD_UBI_DEBUG_MSG_BLD=y ++CONFIG_MTD_UBI_DEBUG_MSG_EBA=y ++CONFIG_MTD_UBI_DEBUG_MSG_WL=y ++CONFIG_MTD_UBI_DEBUG_MSG_IO=y + # CONFIG_PARPORT is not set + CONFIG_BLK_DEV=y + # CONFIG_BLK_DEV_COW_COMMON is not set +@@ -1238,6 +1254,7 @@ CONFIG_USB_OHCI_LITTLE_ENDIAN=y + # CONFIG_USB_VST is not set + CONFIG_USB_GADGET=y + # CONFIG_USB_GADGET_DEBUG_FILES is not set ++# CONFIG_USB_GADGET_DEBUG_FS is not set + CONFIG_USB_GADGET_VBUS_DRAW=500 + CONFIG_USB_GADGET_SELECTED=y + # CONFIG_USB_GADGET_AT91 is not set +@@ -1419,6 +1436,7 @@ CONFIG_EXT3_FS=y + # CONFIG_EXT3_FS_XATTR is not set + # CONFIG_EXT4_FS is not set + CONFIG_JBD=y ++# CONFIG_JBD_DEBUG is not set + # CONFIG_REISERFS_FS is not set + # CONFIG_JFS_FS is not set + # CONFIG_FS_POSIX_ACL is not set +@@ -1577,7 +1595,7 @@ CONFIG_NLS_DEFAULT="iso8859-1" + CONFIG_FRAME_WARN=1024 + # CONFIG_MAGIC_SYSRQ is not set + # CONFIG_UNUSED_SYMBOLS is not set +-# CONFIG_DEBUG_FS is not set ++CONFIG_DEBUG_FS=y + # CONFIG_HEADERS_CHECK is not set + # CONFIG_DEBUG_KERNEL is not set + CONFIG_DEBUG_BUGVERBOSE=y +@@ -1589,6 +1607,7 @@ CONFIG_FRAME_POINTER=y + CONFIG_HAVE_FUNCTION_TRACER=y + CONFIG_TRACING_SUPPORT=y + # CONFIG_FTRACE is not set ++# CONFIG_DYNAMIC_DEBUG is not set + # CONFIG_SAMPLES is not set + CONFIG_HAVE_ARCH_KGDB=y + # CONFIG_ARM_UNWIND is not set +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-2.6.31_git.bb b/recipes/linux/linux-openmoko-2.6.31_git.bb new file mode 100644 index 0000000000..3d6a84b81d --- /dev/null +++ b/recipes/linux/linux-openmoko-2.6.31_git.bb @@ -0,0 +1,27 @@ +require linux.inc +require linux-openmoko.inc + +DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones" + +KERNEL_RELEASE = "2.6.31" +KERNEL_VERSION = "${KERNEL_RELEASE}" + +OEV = "oe1" +PV = "${KERNEL_RELEASE}-${OEV}+gitr${SRCPV}" +PR = "r1" + +SRC_URI = "\ + git://git.openmoko.org/git/kernel.git;protocol=git;branch=om-2.6.31 \ + file://0001-wm8753-fix-build-with-gcc-4.4.2-which-works-ok-with-.patch;patch=1 \ + file://0004-gta02_defconfig-Enable-UBI-support.patch;patch=1 \ + file://0005-gta02_defconfig-Enable-UBI-debug.patch;patch=1 \ +" + +S = "${WORKDIR}/git" + +CONFIG_NAME_om-gta01 = "gta01_defconfig" +CONFIG_NAME_om-gta02 = "gta02_defconfig" + +do_configure_prepend() { + install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe +} diff --git a/recipes/linux/linux-openmoko-shr-devel/0007-Enable-UBI-UBIFS.patch b/recipes/linux/linux-openmoko-shr-devel/0007-Enable-UBI-UBIFS.patch new file mode 100644 index 0000000000..796a90ff27 --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-devel/0007-Enable-UBI-UBIFS.patch @@ -0,0 +1,81 @@ +From 8f907c17c068beb94264a4a6d40314658a0c1393 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 8 Nov 2009 10:58:28 +0100 +Subject: [PATCH 7/7] Enable UBI/UBIFS + +--- + arch/arm/configs/gta02_packaging_defconfig | 39 ++++++++++++++++++++++++++++++--- + 1 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig +index e17ddc3..7506963 100644 +--- a/arch/arm/configs/gta02_packaging_defconfig ++++ b/arch/arm/configs/gta02_packaging_defconfig +@@ -806,7 +806,30 @@ CONFIG_MTD_NAND_S3C2410_HWECC=y + # + # UBI - Unsorted block images + # +-# CONFIG_MTD_UBI is not set ++CONFIG_MTD_UBI=y ++CONFIG_MTD_UBI_WL_THRESHOLD=4096 ++CONFIG_MTD_UBI_BEB_RESERVE=1 ++CONFIG_MTD_UBI_GLUEBI=y ++ ++# ++# UBI debugging options ++# ++CONFIG_MTD_UBI_DEBUG=y ++CONFIG_MTD_UBI_DEBUG_MSG=y ++# CONFIG_MTD_UBI_DEBUG_PARANOID is not set ++# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set ++# CONFIG_MTD_UBI_DEBUG_USERSPACE_IO is not set ++# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set ++# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set ++# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set ++ ++# ++# Additional UBI debugging messages ++# ++CONFIG_MTD_UBI_DEBUG_MSG_BLD=y ++CONFIG_MTD_UBI_DEBUG_MSG_EBA=y ++CONFIG_MTD_UBI_DEBUG_MSG_WL=y ++CONFIG_MTD_UBI_DEBUG_MSG_IO=y + # CONFIG_PARPORT is not set + CONFIG_BLK_DEV=y + # CONFIG_BLK_DEV_COW_COMMON is not set +@@ -1877,6 +1900,12 @@ CONFIG_JFFS2_ZLIB=y + # CONFIG_JFFS2_LZO is not set + CONFIG_JFFS2_RTIME=y + # CONFIG_JFFS2_RUBIN is not set ++CONFIG_UBIFS_FS=y ++# CONFIG_UBIFS_FS_XATTR is not set ++# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set ++CONFIG_UBIFS_FS_LZO=y ++CONFIG_UBIFS_FS_ZLIB=y ++# CONFIG_UBIFS_FS_DEBUG is not set + CONFIG_CRAMFS=y + CONFIG_SQUASHFS=m + # CONFIG_SQUASHFS_EMBEDDED is not set +@@ -2151,8 +2180,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m + # + # Compression + # +-CONFIG_CRYPTO_DEFLATE=m +-# CONFIG_CRYPTO_LZO is not set ++CONFIG_CRYPTO_DEFLATE=y ++CONFIG_CRYPTO_LZO=y + + # + # Random Number Generation +@@ -2174,6 +2203,8 @@ CONFIG_CRC32=y + CONFIG_LIBCRC32C=m + CONFIG_ZLIB_INFLATE=y + CONFIG_ZLIB_DEFLATE=y ++CONFIG_LZO_COMPRESS=y ++CONFIG_LZO_DECOMPRESS=y + CONFIG_TEXTSEARCH=y + CONFIG_TEXTSEARCH_KMP=m + CONFIG_TEXTSEARCH_BM=m +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-shr-devel/fix-install.patch b/recipes/linux/linux-openmoko-shr-devel/fix-install.patch new file mode 100644 index 0000000000..b14ca7d740 --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-devel/fix-install.patch @@ -0,0 +1,23 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700) +Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70 + +scripts/Makefile.fwinst: add missing space when setting mode in cmd_install + +This was causing build failures on some machines +--- + +diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst +index 6bf8e87..fb20532 100644 +--- a/scripts/Makefile.fwinst ++++ b/scripts/Makefile.fwinst +@@ -37,7 +37,7 @@ + @true + + quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) +- cmd_install = $(INSTALL) -m0644 $< $@ ++ cmd_install = $(INSTALL) -m 0644 $< $@ + + $(installed-fw-dirs): + $(call cmd,mkdir) diff --git a/recipes/linux/linux-openmoko-shr-devel_git.bb b/recipes/linux/linux-openmoko-shr-devel_git.bb new file mode 100644 index 0000000000..4f300ff73a --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-devel_git.bb @@ -0,0 +1,26 @@ +require linux.inc +require linux-openmoko.inc + +DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones" + +KERNEL_RELEASE = "2.6.29" +KERNEL_VERSION = "2.6.29-rc3" + +OMV = "oe11" +PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCPV}" +PR = "r3.5" + +SRC_URI = "\ + git://git.openmoko.org/git/kernel.git;protocol=git;branch=andy-tracking \ + file://fix-install.patch;patch=1 \ + file://0007-Enable-UBI-UBIFS.patch;patch=1 \ +" +S = "${WORKDIR}/git" + +CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig" +CONFIG_NAME_om-gta02 = "gta02_packaging_defconfig" +CONFIG_NAME_om-gta03 = "gta03_defconfig" + +do_configure_prepend() { + install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe +} diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0001-Add-drm-to-Makefile-version.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0001-Add-drm-to-Makefile-version.patch new file mode 100644 index 0000000000..99345f7d54 --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel/0001-Add-drm-to-Makefile-version.patch @@ -0,0 +1,25 @@ +From 153af7f8e784e03401dc103f16741397ce6ca914 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 8 Nov 2009 12:50:40 +0100 +Subject: [PATCH] Add -drm to Makefile version + +--- + Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index ebf0aa4..16b189f 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + VERSION = 2 + PATCHLEVEL = 6 + SUBLEVEL = 29 +-EXTRAVERSION += -rc3 ++EXTRAVERSION += -rc3-drm + NAME = Erotic Pickled Herring + + # *DOCUMENTATION* +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0001-Fix-s3c-adc-suspend.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0001-Fix-s3c-adc-suspend.patch new file mode 100644 index 0000000000..6627e698f0 --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel/0001-Fix-s3c-adc-suspend.patch @@ -0,0 +1,128 @@ +From e22e97d2266d100f501f1e22275595eb68dd3e6f Mon Sep 17 00:00:00 2001 +From: Vasily Khoruzhick <anarsoul@gmail.com> +Date: Thu, 1 Oct 2009 20:58:18 -0500 +Subject: [PATCH 1/7] Fix s3c-adc suspend + +Fix for a bug that shows when the s3c2410 TS driver requests +a conversion from the s3c-adc driver and the machine goes into suspend. +In this case the touchscreen stops working. + +Note: Nelson edited the original patch with a few small changes. + +Reported-by: Radek Polak <psonek2@seznam.cz> +Signed-off-by: Vasily Khoruzhick <anarsoul@gmail.com> +Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net> +--- + arch/arm/plat-s3c24xx/adc.c | 42 +++++++++++++++++++++++++++++++++++++----- + 1 files changed, 37 insertions(+), 5 deletions(-) + +diff --git a/arch/arm/plat-s3c24xx/adc.c b/arch/arm/plat-s3c24xx/adc.c +index 9056bcc..4ce45c5 100644 +--- a/arch/arm/plat-s3c24xx/adc.c ++++ b/arch/arm/plat-s3c24xx/adc.c +@@ -43,6 +43,7 @@ struct s3c_adc_client { + unsigned int nr_samples; + unsigned char is_ts; + unsigned char channel; ++ unsigned selected; + + void (*select_cb)(unsigned selected); + void (*convert_cb)(unsigned val1, unsigned val2, +@@ -68,6 +69,7 @@ static struct adc_device *adc_dev; + static LIST_HEAD(adc_pending); + + #define adc_dbg(_adc, msg...) dev_dbg(&(_adc)->pdev->dev, msg) ++#define adc_info(_adc, msg...) dev_info(&(_adc)->pdev->dev, msg) + + #define AUTOPST (S3C2410_ADCTSC_YM_SEN | S3C2410_ADCTSC_YP_SEN | \ + S3C2410_ADCTSC_XP_SEN | S3C2410_ADCTSC_AUTO_PST | \ +@@ -91,7 +93,10 @@ static inline void s3c_adc_select(struct adc_device *adc, + { + unsigned con = readl(adc->regs + S3C2410_ADCCON); + +- client->select_cb(1); ++ if (!client->selected) { ++ client->selected = 1; ++ client->select_cb(1); ++ } + + con &= ~S3C2410_ADCCON_MUXMASK; + con &= ~S3C2410_ADCCON_STDBM; +@@ -115,12 +120,9 @@ void s3c_adc_try(struct adc_device *adc) + { + struct s3c_adc_client *next = adc->ts_pend; + +- if (!next && !list_empty(&adc_pending)) { ++ if (!next && !list_empty(&adc_pending)) + next = list_first_entry(&adc_pending, + struct s3c_adc_client, pend); +- list_del(&next->pend); +- } else +- adc->ts_pend = NULL; + + if (next) { + adc_dbg(adc, "new client is %p\n", next); +@@ -229,9 +231,16 @@ static irqreturn_t s3c_adc_irq(int irq, void *pw) + /* fire another conversion for this */ + + client->select_cb(1); ++ client->selected = 1; + s3c_adc_convert(adc); + } else { + local_irq_save(flags); ++ client->selected = 0; ++ if (!adc->cur->is_ts) ++ list_del(&adc->cur->pend); ++ else ++ adc->ts_pend = NULL; ++ + (client->select_cb)(0); + adc->cur = NULL; + +@@ -341,20 +350,43 @@ static int s3c_adc_suspend(struct platform_device *pdev, pm_message_t state) + writel(con, adc->regs + S3C2410_ADCCON); + + clk_disable(adc->clk); ++ disable_irq(IRQ_ADC); ++ ++ if (!list_empty(&adc_pending) || adc->ts_pend) ++ adc_info(adc, "%s:We still have clients pending\n", __func__); + + return 0; + } + ++static struct work_struct resume_work; ++ ++static void adc_resume_work(struct work_struct *work) ++{ ++ struct adc_device *adc = platform_get_drvdata(adc_dev->pdev); ++ ++ adc_info(adc, "%s:We still have clients pending\n", __func__); ++ s3c_adc_try(adc_dev); ++} ++ + static int s3c_adc_resume(struct platform_device *pdev) + { + struct adc_device *adc = platform_get_drvdata(pdev); + ++ enable_irq(IRQ_ADC); + clk_enable(adc->clk); + + writel(adc->prescale | S3C2410_ADCCON_PRSCEN, + adc->regs + S3C2410_ADCCON); + writel(adc->delay, adc->regs + S3C2410_ADCDLY); + ++ /* Schedule task if there are clients pending. */ ++ if (!list_empty(&adc_pending) || adc_dev->ts_pend) { ++ INIT_WORK(&resume_work, adc_resume_work); ++ if (!schedule_work(&resume_work)) ++ dev_err(&pdev->dev, ++ "Failed to schedule adc_resume work!\n"); ++ } ++ + return 0; + } + +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0002-GTA01-GTA02-disable-android-drivers-in-default-confi.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0002-GTA01-GTA02-disable-android-drivers-in-default-confi.patch new file mode 100644 index 0000000000..797f2fb27b --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel/0002-GTA01-GTA02-disable-android-drivers-in-default-confi.patch @@ -0,0 +1,154 @@ +From 18713d582b94c7f132f306c01c43fd22a12a1fc5 Mon Sep 17 00:00:00 2001 +From: Radek Polak <psonek2@seznam.cz> +Date: Fri, 2 Oct 2009 20:54:29 +0200 +Subject: [PATCH 2/7] GTA01/GTA02: disable android drivers in default configs + +Android drivers are not needed for standard linux systems. We can save +memory by disabling them. + +Android low memory killer (CONFIG_ANDROID_LOW_MEMORY_KILLER) also +prevents using swap by killing applications before swapping can start +on non android systems. + +Reported-by: Jim Morris <morris@wolfman.com> +Signed-off-by: Radek Polak <psonek2@seznam.cz> +Signed-off-by: Nelson Castillo <arhuaco@freaks-unidos.net> +--- + arch/arm/configs/gta01_moredrivers_defconfig | 21 ++++++++++----------- + arch/arm/configs/gta02_moredrivers_defconfig | 19 ++++++++----------- + arch/arm/configs/gta02_packaging_defconfig | 19 ++++++++----------- + 3 files changed, 26 insertions(+), 33 deletions(-) + +diff --git a/arch/arm/configs/gta01_moredrivers_defconfig b/arch/arm/configs/gta01_moredrivers_defconfig +index 411acab..68b95e7 100644 +--- a/arch/arm/configs/gta01_moredrivers_defconfig ++++ b/arch/arm/configs/gta01_moredrivers_defconfig +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit + # Linux kernel version: 2.6.29-rc3 +-# Tue Feb 24 02:13:21 2009 ++# Fri Oct 2 16:49:49 2009 + # + CONFIG_ARM=y + CONFIG_SYS_SUPPORTS_APM_EMULATION=y +@@ -203,6 +203,7 @@ CONFIG_S3C_GPIO_SPACE=0 + CONFIG_S3C_GPIO_TRACK=y + CONFIG_S3C_DMA=y + CONFIG_S3C_PWM=y ++CONFIG_S3C_DEV_USB_HOST=y + + # + # S3C2400 Machines +@@ -1159,6 +1160,7 @@ CONFIG_WATCHDOG=y + # + # CONFIG_SOFT_WATCHDOG is not set + CONFIG_S3C2410_WATCHDOG=m ++CONFIG_PCF50606_WATCHDOG=y + + # + # USB-based Watchdog Cards +@@ -1686,17 +1688,14 @@ CONFIG_STAGING=y + # + # Android + # +-CONFIG_ANDROID=y +-CONFIG_ANDROID_BINDER_IPC=y +-CONFIG_ANDROID_LOGGER=y +-CONFIG_ANDROID_RAM_CONSOLE=y +-CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y +-# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set +-# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set +-CONFIG_ANDROID_TIMED_GPIO=y +-CONFIG_ANDROID_LOW_MEMORY_KILLER=y ++# CONFIG_ANDROID is not set ++# CONFIG_ANDROID_BINDER_IPC is not set ++# CONFIG_ANDROID_LOGGER is not set ++# CONFIG_ANDROID_RAM_CONSOLE is not set ++# CONFIG_ANDROID_TIMED_GPIO is not set ++# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set + # CONFIG_ANDROID_WAKELOCK is not set +-CONFIG_ANDROID_PARANOID_NETWORK=y ++# CONFIG_ANDROID_PARANOID_NETWORK is not set + + # + # File systems +diff --git a/arch/arm/configs/gta02_moredrivers_defconfig b/arch/arm/configs/gta02_moredrivers_defconfig +index 13b4121..e4fe9a9 100644 +--- a/arch/arm/configs/gta02_moredrivers_defconfig ++++ b/arch/arm/configs/gta02_moredrivers_defconfig +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit + # Linux kernel version: 2.6.29-rc3 +-# Sun Apr 19 23:22:38 2009 ++# Fri Oct 2 20:52:45 2009 + # + CONFIG_ARM=y + CONFIG_HAVE_PWM=y +@@ -1782,17 +1782,14 @@ CONFIG_STAGING=y + # + # Android + # +-CONFIG_ANDROID=y +-CONFIG_ANDROID_BINDER_IPC=y +-CONFIG_ANDROID_LOGGER=y +-CONFIG_ANDROID_RAM_CONSOLE=y +-CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y +-# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set +-# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set +-CONFIG_ANDROID_TIMED_GPIO=y +-CONFIG_ANDROID_LOW_MEMORY_KILLER=y ++# CONFIG_ANDROID is not set ++# CONFIG_ANDROID_BINDER_IPC is not set ++# CONFIG_ANDROID_LOGGER is not set ++# CONFIG_ANDROID_RAM_CONSOLE is not set ++# CONFIG_ANDROID_TIMED_GPIO is not set ++# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set + # CONFIG_ANDROID_WAKELOCK is not set +-CONFIG_ANDROID_PARANOID_NETWORK=y ++# CONFIG_ANDROID_PARANOID_NETWORK is not set + + # + # File systems +diff --git a/arch/arm/configs/gta02_packaging_defconfig b/arch/arm/configs/gta02_packaging_defconfig +index 03c72d5..e2dbbef 100644 +--- a/arch/arm/configs/gta02_packaging_defconfig ++++ b/arch/arm/configs/gta02_packaging_defconfig +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit + # Linux kernel version: 2.6.29-rc3 +-# Sun Apr 19 22:57:25 2009 ++# Fri Oct 2 20:51:57 2009 + # + CONFIG_ARM=y + CONFIG_HAVE_PWM=y +@@ -1785,17 +1785,14 @@ CONFIG_STAGING=y + # + # Android + # +-CONFIG_ANDROID=y +-CONFIG_ANDROID_BINDER_IPC=y +-CONFIG_ANDROID_LOGGER=y +-CONFIG_ANDROID_RAM_CONSOLE=y +-CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y +-# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set +-# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set +-CONFIG_ANDROID_TIMED_GPIO=y +-CONFIG_ANDROID_LOW_MEMORY_KILLER=y ++# CONFIG_ANDROID is not set ++# CONFIG_ANDROID_BINDER_IPC is not set ++# CONFIG_ANDROID_LOGGER is not set ++# CONFIG_ANDROID_RAM_CONSOLE is not set ++# CONFIG_ANDROID_TIMED_GPIO is not set ++# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set + # CONFIG_ANDROID_WAKELOCK is not set +-CONFIG_ANDROID_PARANOID_NETWORK=y ++# CONFIG_ANDROID_PARANOID_NETWORK is not set + + # + # File systems +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0003-glamo-spi-missing-semicolon-after-MODULE_AUTHOR.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0003-glamo-spi-missing-semicolon-after-MODULE_AUTHOR.patch new file mode 100644 index 0000000000..0eed294911 --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel/0003-glamo-spi-missing-semicolon-after-MODULE_AUTHOR.patch @@ -0,0 +1,39 @@ +From cf7ef93a6d5eff863034fade19d7a1d6bc19789a Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Wed, 4 Nov 2009 20:09:03 +0100 +Subject: [PATCH 3/7] glamo-spi: missing semicolon after MODULE_AUTHOR() + +Fix compilation error due to missing semicolon + +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> +Signed-off-by: Paul Fertser <fercerpav@gmail.com> +--- + drivers/mfd/glamo/glamo-lcm-spi.c | 2 +- + drivers/mfd/glamo/glamo-spi-gpio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/drivers/mfd/glamo/glamo-lcm-spi.c b/drivers/mfd/glamo/glamo-lcm-spi.c +index a7129fe..446f058 100644 +--- a/drivers/mfd/glamo/glamo-lcm-spi.c ++++ b/drivers/mfd/glamo/glamo-lcm-spi.c +@@ -236,5 +236,5 @@ module_init(glamo_spi_init); + module_exit(glamo_spi_exit); + + MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver"); +-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>") ++MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>"); + MODULE_LICENSE("GPL"); +diff --git a/drivers/mfd/glamo/glamo-spi-gpio.c b/drivers/mfd/glamo/glamo-spi-gpio.c +index b92e48a..6ebf498 100644 +--- a/drivers/mfd/glamo/glamo-spi-gpio.c ++++ b/drivers/mfd/glamo/glamo-spi-gpio.c +@@ -274,5 +274,5 @@ module_init(glamo_spi_init); + module_exit(glamo_spi_exit); + + MODULE_DESCRIPTION("Smedia Glamo 336x/337x LCM serial command SPI Driver"); +-MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>") ++MODULE_AUTHOR("Harald Welte <laforge@openmoko.org>"); + MODULE_LICENSE("GPL"); +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch new file mode 100644 index 0000000000..adb3ce84e3 --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel/0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch @@ -0,0 +1,129 @@ +From ab6c9baa5cc8ae3a922ae4baef2550d399b41550 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 8 Nov 2009 10:48:28 +0100 +Subject: [PATCH 4/7] gta02_drm_defconfig: start from gta02_packaging_defconfig + +--- + arch/arm/configs/gta02_drm_defconfig | 40 +++++++++++++-------------------- + 1 files changed, 16 insertions(+), 24 deletions(-) + +diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig +index 5349014..e2dbbef 100644 +--- a/arch/arm/configs/gta02_drm_defconfig ++++ b/arch/arm/configs/gta02_drm_defconfig +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit + # Linux kernel version: 2.6.29-rc3 +-# Thu Jul 2 20:40:33 2009 ++# Fri Oct 2 20:51:57 2009 + # + CONFIG_ARM=y + CONFIG_HAVE_PWM=y +@@ -35,7 +35,7 @@ CONFIG_EXPERIMENTAL=y + CONFIG_BROKEN_ON_SMP=y + CONFIG_LOCK_KERNEL=y + CONFIG_INIT_ENV_ARG_LIMIT=32 +-CONFIG_LOCALVERSION="" ++CONFIG_LOCALVERSION="-mokodev" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SWAP=y + CONFIG_SYSVIPC=y +@@ -180,7 +180,7 @@ CONFIG_S3C24XX_PWM=y + CONFIG_S3C24XX_GPIO_EXTRA=0 + CONFIG_S3C2410_DMA=y + # CONFIG_S3C2410_DMA_DEBUG is not set +-# CONFIG_S3C24XX_ADC is not set ++CONFIG_S3C24XX_ADC=y + CONFIG_MACH_SMDK=y + CONFIG_MACH_NEO1973=y + CONFIG_PLAT_S3C=y +@@ -1084,7 +1084,6 @@ CONFIG_I2C=y + CONFIG_I2C_BOARDINFO=y + CONFIG_I2C_CHARDEV=y + CONFIG_I2C_HELPER_AUTO=y +-CONFIG_I2C_ALGOBIT=y + + # + # I2C Hardware Bus support +@@ -1181,7 +1180,7 @@ CONFIG_APM_POWER=y + CONFIG_CHARGER_PCF50633=y + CONFIG_BATTERY_BQ27000_HDQ=y + CONFIG_HDQ_GPIO_BITBANG=y +-# CONFIG_BATTERY_GTA01 is not set ++CONFIG_BATTERY_GTA01=m + CONFIG_HWMON=y + # CONFIG_HWMON_VID is not set + # CONFIG_SENSORS_AD7414 is not set +@@ -1283,14 +1282,11 @@ CONFIG_PCF50633_ADC=y + CONFIG_PCF50633_GPIO=y + # CONFIG_MFD_PCF50606 is not set + CONFIG_MFD_GLAMO=y +- +-# +-# SMedia Glamo 336x/337x engine drivers +-# +-# CONFIG_MFD_GLAMO_FB is not set ++CONFIG_MFD_GLAMO_FB=y ++CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND=y + CONFIG_MFD_GLAMO_SPI_GPIO=y ++CONFIG_MFD_GLAMO_SPI_FB=y + CONFIG_MFD_GLAMO_MCI=y +-CONFIG_MFD_GLAMO_DRM=y + + # + # Multimedia devices +@@ -1312,7 +1308,6 @@ CONFIG_DAB=y + # + # Graphics support + # +-CONFIG_DRM=y + # CONFIG_VGASTATE is not set + CONFIG_VIDEO_OUTPUT_CONTROL=y + CONFIG_FB=y +@@ -1790,17 +1785,14 @@ CONFIG_STAGING=y + # + # Android + # +-CONFIG_ANDROID=y +-CONFIG_ANDROID_BINDER_IPC=y +-CONFIG_ANDROID_LOGGER=y +-CONFIG_ANDROID_RAM_CONSOLE=y +-CONFIG_ANDROID_RAM_CONSOLE_ENABLE_VERBOSE=y +-# CONFIG_ANDROID_RAM_CONSOLE_ERROR_CORRECTION is not set +-# CONFIG_ANDROID_RAM_CONSOLE_EARLY_INIT is not set +-CONFIG_ANDROID_TIMED_GPIO=y +-CONFIG_ANDROID_LOW_MEMORY_KILLER=y ++# CONFIG_ANDROID is not set ++# CONFIG_ANDROID_BINDER_IPC is not set ++# CONFIG_ANDROID_LOGGER is not set ++# CONFIG_ANDROID_RAM_CONSOLE is not set ++# CONFIG_ANDROID_TIMED_GPIO is not set ++# CONFIG_ANDROID_LOW_MEMORY_KILLER is not set + # CONFIG_ANDROID_WAKELOCK is not set +-CONFIG_ANDROID_PARANOID_NETWORK=y ++# CONFIG_ANDROID_PARANOID_NETWORK is not set + + # + # File systems +@@ -1958,7 +1950,7 @@ CONFIG_NLS_CODEPAGE_850=m + # CONFIG_NLS_CODEPAGE_863 is not set + # CONFIG_NLS_CODEPAGE_864 is not set + # CONFIG_NLS_CODEPAGE_865 is not set +-# CONFIG_NLS_CODEPAGE_866 is not set ++CONFIG_NLS_CODEPAGE_866=m + # CONFIG_NLS_CODEPAGE_869 is not set + CONFIG_NLS_CODEPAGE_936=m + CONFIG_NLS_CODEPAGE_950=m +@@ -1967,7 +1959,7 @@ CONFIG_NLS_CODEPAGE_950=m + # CONFIG_NLS_CODEPAGE_874 is not set + # CONFIG_NLS_ISO8859_8 is not set + # CONFIG_NLS_CODEPAGE_1250 is not set +-# CONFIG_NLS_CODEPAGE_1251 is not set ++CONFIG_NLS_CODEPAGE_1251=m + # CONFIG_NLS_ASCII is not set + CONFIG_NLS_ISO8859_1=y + # CONFIG_NLS_ISO8859_2 is not set +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0005-Enable-DRM-and-MFD_GLAMO_DRM.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0005-Enable-DRM-and-MFD_GLAMO_DRM.patch new file mode 100644 index 0000000000..c9d56fa7ab --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel/0005-Enable-DRM-and-MFD_GLAMO_DRM.patch @@ -0,0 +1,51 @@ +From 8fe4cb1bee0c8af760d8911c248e0904e44fa0b3 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 8 Nov 2009 10:49:43 +0100 +Subject: [PATCH 5/7] Enable DRM and MFD_GLAMO_DRM + +--- + arch/arm/configs/gta02_drm_defconfig | 12 ++++++++---- + 1 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig +index e2dbbef..aac2832 100644 +--- a/arch/arm/configs/gta02_drm_defconfig ++++ b/arch/arm/configs/gta02_drm_defconfig +@@ -35,7 +35,7 @@ CONFIG_EXPERIMENTAL=y + CONFIG_BROKEN_ON_SMP=y + CONFIG_LOCK_KERNEL=y + CONFIG_INIT_ENV_ARG_LIMIT=32 +-CONFIG_LOCALVERSION="-mokodev" ++CONFIG_LOCALVERSION="-drm" + # CONFIG_LOCALVERSION_AUTO is not set + CONFIG_SWAP=y + CONFIG_SYSVIPC=y +@@ -1282,11 +1282,14 @@ CONFIG_PCF50633_ADC=y + CONFIG_PCF50633_GPIO=y + # CONFIG_MFD_PCF50606 is not set + CONFIG_MFD_GLAMO=y +-CONFIG_MFD_GLAMO_FB=y +-CONFIG_MFD_GLAMO_FB_XGLAMO_WORKAROUND=y ++ ++# ++# SMedia Glamo 336x/337x engine drivers ++# ++# CONFIG_MFD_GLAMO_FB is not set + CONFIG_MFD_GLAMO_SPI_GPIO=y +-CONFIG_MFD_GLAMO_SPI_FB=y + CONFIG_MFD_GLAMO_MCI=y ++CONFIG_MFD_GLAMO_DRM=y + + # + # Multimedia devices +@@ -1308,6 +1311,7 @@ CONFIG_DAB=y + # + # Graphics support + # ++CONFIG_DRM=y + # CONFIG_VGASTATE is not set + CONFIG_VIDEO_OUTPUT_CONTROL=y + CONFIG_FB=y +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch new file mode 100644 index 0000000000..79305ce317 --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel/0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch @@ -0,0 +1,33 @@ +From 315bd3c8c368cf8097e3b0aecd21907755b617e1 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 8 Nov 2009 10:54:55 +0100 +Subject: [PATCH 6/7] Enable I2C_ALGOBIT, from make oldconfig + +--- + arch/arm/configs/gta02_drm_defconfig | 3 ++- + 1 files changed, 2 insertions(+), 1 deletions(-) + +diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig +index aac2832..e17ddc3 100644 +--- a/arch/arm/configs/gta02_drm_defconfig ++++ b/arch/arm/configs/gta02_drm_defconfig +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit + # Linux kernel version: 2.6.29-rc3 +-# Fri Oct 2 20:51:57 2009 ++# Sun Nov 8 10:53:31 2009 + # + CONFIG_ARM=y + CONFIG_HAVE_PWM=y +@@ -1084,6 +1084,7 @@ CONFIG_I2C=y + CONFIG_I2C_BOARDINFO=y + CONFIG_I2C_CHARDEV=y + CONFIG_I2C_HELPER_AUTO=y ++CONFIG_I2C_ALGOBIT=y + + # + # I2C Hardware Bus support +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/0007-Enable-UBI-UBIFS.patch b/recipes/linux/linux-openmoko-shr-drm-devel/0007-Enable-UBI-UBIFS.patch new file mode 100644 index 0000000000..f7dd7615af --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel/0007-Enable-UBI-UBIFS.patch @@ -0,0 +1,90 @@ +From 8f907c17c068beb94264a4a6d40314658a0c1393 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <Martin.Jansa@gmail.com> +Date: Sun, 8 Nov 2009 10:58:28 +0100 +Subject: [PATCH 7/7] Enable UBI/UBIFS + +--- + arch/arm/configs/gta02_drm_defconfig | 39 ++++++++++++++++++++++++++++++--- + 1 files changed, 35 insertions(+), 4 deletions(-) + +diff --git a/arch/arm/configs/gta02_drm_defconfig b/arch/arm/configs/gta02_drm_defconfig +index e17ddc3..7506963 100644 +--- a/arch/arm/configs/gta02_drm_defconfig ++++ b/arch/arm/configs/gta02_drm_defconfig +@@ -1,7 +1,7 @@ + # + # Automatically generated make config: don't edit + # Linux kernel version: 2.6.29-rc3 +-# Sun Nov 8 10:53:31 2009 ++# Sun Nov 8 10:57:36 2009 + # + CONFIG_ARM=y + CONFIG_HAVE_PWM=y +@@ -806,7 +806,30 @@ CONFIG_MTD_NAND_S3C2410_HWECC=y + # + # UBI - Unsorted block images + # +-# CONFIG_MTD_UBI is not set ++CONFIG_MTD_UBI=y ++CONFIG_MTD_UBI_WL_THRESHOLD=4096 ++CONFIG_MTD_UBI_BEB_RESERVE=1 ++CONFIG_MTD_UBI_GLUEBI=y ++ ++# ++# UBI debugging options ++# ++CONFIG_MTD_UBI_DEBUG=y ++CONFIG_MTD_UBI_DEBUG_MSG=y ++# CONFIG_MTD_UBI_DEBUG_PARANOID is not set ++# CONFIG_MTD_UBI_DEBUG_DISABLE_BGT is not set ++# CONFIG_MTD_UBI_DEBUG_USERSPACE_IO is not set ++# CONFIG_MTD_UBI_DEBUG_EMULATE_BITFLIPS is not set ++# CONFIG_MTD_UBI_DEBUG_EMULATE_WRITE_FAILURES is not set ++# CONFIG_MTD_UBI_DEBUG_EMULATE_ERASE_FAILURES is not set ++ ++# ++# Additional UBI debugging messages ++# ++CONFIG_MTD_UBI_DEBUG_MSG_BLD=y ++CONFIG_MTD_UBI_DEBUG_MSG_EBA=y ++CONFIG_MTD_UBI_DEBUG_MSG_WL=y ++CONFIG_MTD_UBI_DEBUG_MSG_IO=y + # CONFIG_PARPORT is not set + CONFIG_BLK_DEV=y + # CONFIG_BLK_DEV_COW_COMMON is not set +@@ -1877,6 +1900,12 @@ CONFIG_JFFS2_ZLIB=y + # CONFIG_JFFS2_LZO is not set + CONFIG_JFFS2_RTIME=y + # CONFIG_JFFS2_RUBIN is not set ++CONFIG_UBIFS_FS=y ++# CONFIG_UBIFS_FS_XATTR is not set ++# CONFIG_UBIFS_FS_ADVANCED_COMPR is not set ++CONFIG_UBIFS_FS_LZO=y ++CONFIG_UBIFS_FS_ZLIB=y ++# CONFIG_UBIFS_FS_DEBUG is not set + CONFIG_CRAMFS=y + CONFIG_SQUASHFS=m + # CONFIG_SQUASHFS_EMBEDDED is not set +@@ -2151,8 +2180,8 @@ CONFIG_CRYPTO_TWOFISH_COMMON=m + # + # Compression + # +-CONFIG_CRYPTO_DEFLATE=m +-# CONFIG_CRYPTO_LZO is not set ++CONFIG_CRYPTO_DEFLATE=y ++CONFIG_CRYPTO_LZO=y + + # + # Random Number Generation +@@ -2174,6 +2203,8 @@ CONFIG_CRC32=y + CONFIG_LIBCRC32C=m + CONFIG_ZLIB_INFLATE=y + CONFIG_ZLIB_DEFLATE=y ++CONFIG_LZO_COMPRESS=y ++CONFIG_LZO_DECOMPRESS=y + CONFIG_TEXTSEARCH=y + CONFIG_TEXTSEARCH_KMP=m + CONFIG_TEXTSEARCH_BM=m +-- +1.6.5.2 + diff --git a/recipes/linux/linux-openmoko-shr-drm-devel/fix-install.patch b/recipes/linux/linux-openmoko-shr-drm-devel/fix-install.patch new file mode 100644 index 0000000000..b14ca7d740 --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel/fix-install.patch @@ -0,0 +1,23 @@ +From: Steve Sakoman <steve@sakoman.com> +Date: Mon, 18 Aug 2008 16:07:31 +0000 (-0700) +Subject: scripts/Makefile.fwinst: add missing space when setting mode in cmd_install +X-Git-Url: http://www.sakoman.net/cgi-bin/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff_plain;h=f039944bdd491cde7327133e9976881d3133ae70 + +scripts/Makefile.fwinst: add missing space when setting mode in cmd_install + +This was causing build failures on some machines +--- + +diff --git a/scripts/Makefile.fwinst b/scripts/Makefile.fwinst +index 6bf8e87..fb20532 100644 +--- a/scripts/Makefile.fwinst ++++ b/scripts/Makefile.fwinst +@@ -37,7 +37,7 @@ + @true + + quiet_cmd_install = INSTALL $(subst $(srctree)/,,$@) +- cmd_install = $(INSTALL) -m0644 $< $@ ++ cmd_install = $(INSTALL) -m 0644 $< $@ + + $(installed-fw-dirs): + $(call cmd,mkdir) diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb new file mode 100644 index 0000000000..12627cdf43 --- /dev/null +++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb @@ -0,0 +1,35 @@ +require linux.inc +require linux-openmoko.inc + +DESCRIPTION_${PN} = "Linux ${KERNEL_VERSION} kernel for the Openmoko Neo GSM Smartphones" + +DEFAULT_PREFERENCE = "-1" +KERNEL_RELEASE = "2.6.29" +KERNEL_VERSION = "2.6.29-rc3-drm" + +OMV = "oe14" +PV = "${KERNEL_RELEASE}-drm-${OMV}+gitr${SRCPV}" +PR = "r2" + +SRC_URI = "\ +# git://git.openmoko.org/git/kernel.git;protocol=git;branch=drm-tracking \ + git://git.bitwiz.org.uk/kernel.git;protocol=git;branch=kms-tests \ + file://fix-install.patch;patch=1 \ + file://0001-Add-drm-to-Makefile-version.patch;patch=1 \ + file://0001-Fix-s3c-adc-suspend.patch;patch=1 \ + file://0002-GTA01-GTA02-disable-android-drivers-in-default-confi.patch;patch=1 \ + file://0003-glamo-spi-missing-semicolon-after-MODULE_AUTHOR.patch;patch=1 \ + file://0004-gta02_drm_defconfig-start-from-gta02_packaging_defco.patch;patch=1 \ + file://0005-Enable-DRM-and-MFD_GLAMO_DRM.patch;patch=1 \ + file://0006-Enable-I2C_ALGOBIT-from-make-oldconfig.patch;patch=1 \ + file://0007-Enable-UBI-UBIFS.patch;patch=1 \ +" +S = "${WORKDIR}/git" + +CONFIG_NAME_om-gta01 = "gta01_moredrivers_defconfig" +CONFIG_NAME_om-gta02 = "gta02_drm_defconfig" +CONFIG_NAME_om-gta03 = "gta03_defconfig" + +do_configure_prepend() { + install -m 644 ./arch/arm/configs/${CONFIG_NAME} ${WORKDIR}/defconfig-oe +} diff --git a/recipes/llvm/llvm-gcc4-cross_svn.bb b/recipes/llvm/llvm-gcc4-cross_svn.bb index 4cd5ae1db6..5257713dc2 100644 --- a/recipes/llvm/llvm-gcc4-cross_svn.bb +++ b/recipes/llvm/llvm-gcc4-cross_svn.bb @@ -4,7 +4,7 @@ LICENSE = "various" DEPENDS = "llvm2.5-native" -PV = "2.1+svnr${SRCREV}" +PV = "2.1+svnr${SRCPV}" PR = "r1" diff --git a/recipes/llvm/llvm-gcc4_svn.bb b/recipes/llvm/llvm-gcc4_svn.bb index 6a39362080..74ac5807ae 100644 --- a/recipes/llvm/llvm-gcc4_svn.bb +++ b/recipes/llvm/llvm-gcc4_svn.bb @@ -4,7 +4,7 @@ LICENSE = "various" DEPENDS = "llvm2.5-native" -PV = "2.0+svnr${SRCREV}" +PV = "2.0+svnr${SRCPV}" PR = "r1" diff --git a/recipes/llvm/llvm2.6/BX_to_BLX.patch b/recipes/llvm/llvm2.6/BX_to_BLX.patch new file mode 100644 index 0000000000..7cf36766af --- /dev/null +++ b/recipes/llvm/llvm2.6/BX_to_BLX.patch @@ -0,0 +1,13 @@ +Index: llvm/lib/Target/ARM/ARMInstrInfo.td +=================================================================== +--- llvm.orig/lib/Target/ARM/ARMInstrInfo.td 2009-10-06 12:35:26.000000000 +0000 ++++ llvm/lib/Target/ARM/ARMInstrInfo.td 2009-10-06 12:36:03.000000000 +0000 +@@ -645,7 +645,7 @@ + IIC_Br, "mov lr, pc\n\tbx $func", + [(ARMcall_nolink GPR:$func)]>, + Requires<[IsARM, IsNotDarwin]> { +- let Inst{7-4} = 0b0001; ++ let Inst{7-4} = 0b0011; + let Inst{19-8} = 0b111111111111; + let Inst{27-20} = 0b00010010; + } diff --git a/recipes/llvm/llvm2.6_2.6.bb b/recipes/llvm/llvm2.6_2.6.bb index 40dabb4fba..909bb95b00 100644 --- a/recipes/llvm/llvm2.6_2.6.bb +++ b/recipes/llvm/llvm2.6_2.6.bb @@ -1,12 +1,13 @@ require llvm.inc -PR = "r0" +PR = "r1" DEPENDS = "llvm-common llvm2.6-native" SRC_URI += "\ file://fix-build.patch;patch=1 \ file://llvm-debugonly-zeroormore.patch;patch=1;pnum=0 \ + file://BX_to_BLX.patch;patch=1 \ " LLVM_RELEASE = "2.6" diff --git a/recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb b/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb index ab0bbc5aa8..ada81c625d 100644 --- a/recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb +++ b/recipes/llvm/llvm2.7-native_2.6+svnr20091007.bb @@ -1,8 +1,8 @@ require llvm-native.inc -SRCREV = "82130" +SRCREV = "83459" -PV = "2.6+svnr${SRCREV}" +PV = "2.6+svnr${SRCPV}" PR = "r0" diff --git a/recipes/llvm/llvm2.7/BX_to_BLX.patch b/recipes/llvm/llvm2.7/BX_to_BLX.patch new file mode 100644 index 0000000000..7cf36766af --- /dev/null +++ b/recipes/llvm/llvm2.7/BX_to_BLX.patch @@ -0,0 +1,13 @@ +Index: llvm/lib/Target/ARM/ARMInstrInfo.td +=================================================================== +--- llvm.orig/lib/Target/ARM/ARMInstrInfo.td 2009-10-06 12:35:26.000000000 +0000 ++++ llvm/lib/Target/ARM/ARMInstrInfo.td 2009-10-06 12:36:03.000000000 +0000 +@@ -645,7 +645,7 @@ + IIC_Br, "mov lr, pc\n\tbx $func", + [(ARMcall_nolink GPR:$func)]>, + Requires<[IsARM, IsNotDarwin]> { +- let Inst{7-4} = 0b0001; ++ let Inst{7-4} = 0b0011; + let Inst{19-8} = 0b111111111111; + let Inst{27-20} = 0b00010010; + } diff --git a/recipes/llvm/llvm2.7_2.6+svnr20090916.bb b/recipes/llvm/llvm2.7_2.6+svnr20091007.bb index 022657c5ff..142e15ea4f 100644 --- a/recipes/llvm/llvm2.7_2.6+svnr20090916.bb +++ b/recipes/llvm/llvm2.7_2.6+svnr20091007.bb @@ -1,8 +1,8 @@ require llvm.inc -SRCREV = "82130" +SRCREV = "83459" -PV = "2.6+svnr${SRCREV}" +PV = "2.6+svnr${SRCPV}" PR = "r0" @@ -11,7 +11,8 @@ DEPENDS = "llvm-common llvm2.7-native" SRC_URI = "\ svn://llvm.org/svn/llvm-project/llvm/;proto=http;module=trunk \ file://llvm-debugonly-zeroormore.patch;patch=1 \ -" + file://BX_to_BLX.patch;patch=1 \ + " EXTRA_OECMAKE += "\ -DLLVM_TARGET_ARCH:STRING=${LLVM_ARCH} \ diff --git a/recipes/maemo-mapper/maemo-mapper_svn.bb b/recipes/maemo-mapper/maemo-mapper_svn.bb index 39e89fcc98..afc2d93027 100644 --- a/recipes/maemo-mapper/maemo-mapper_svn.bb +++ b/recipes/maemo-mapper/maemo-mapper_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "gdbm libconic sqlite3 gtk+ libhildonfm libosso osso-ic-oss libosso-help gnome-vfs dbus bluez-libs" RDEPENDS = "bluez-utils" RRECOMMENDS = "gpsd flite" -PV = "2.0.3+svnr${SRCREV}" +PV = "2.0.3+svnr${SRCPV}" PR = "r2" SRC_URI = "svn://garage.maemo.org/svn/maemo-mapper;proto=https;module=trunk \ diff --git a/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb b/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb index bc6c0511dd..f791dce58a 100644 --- a/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb +++ b/recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "gconf gtk+" RDEPENDS = "settings-daemon" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" S = "${WORKDIR}/${PN}" diff --git a/recipes/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb b/recipes/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb index 8d1a3e181d..c2527642a5 100644 --- a/recipes/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb +++ b/recipes/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL" DEPENDS = "" CONFLICTS = "matchbox-common" SRCREV = "76" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/sato/trunk;module=desktop-folders;proto=http" S = "${WORKDIR}/desktop-folders" diff --git a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb index 03123d9b8b..37300cbcd9 100644 --- a/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb +++ b/recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" RCONFLICTS_${PN} = "matchbox-keyboard" RPROVIDES_${PN} = "matchbox-keyboard" SECTION = "x11" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r10" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-keyboard;proto=http \ diff --git a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb index 96a621fe75..27d87b7c0f 100644 --- a/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb +++ b/recipes/matchbox-keyboard/matchbox-keyboard_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "libfakekey expat libxft" RCONFLICTS = matchbox-keyboard-inputmethod RPROVIDES_${PN} = matchbox-keyboard-inputmethod SECTION = "x11" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR ="r7" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http \ diff --git a/recipes/matchbox-panel/matchbox-panel_svn.bb b/recipes/matchbox-panel/matchbox-panel_svn.bb index e7fb3e6439..9fff9b43c9 100644 --- a/recipes/matchbox-panel/matchbox-panel_svn.bb +++ b/recipes/matchbox-panel/matchbox-panel_svn.bb @@ -1,5 +1,5 @@ require matchbox-panel.inc -PV = "0.9.2+svnr${SRCREV}" +PV = "0.9.2+svnr${SRCPV}" DEFAULT_PREFERENCE = "-1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/recipes/matchbox-stroke/matchbox-stroke_svn.bb b/recipes/matchbox-stroke/matchbox-stroke_svn.bb index d9f17e9f9d..4c1d20177d 100644 --- a/recipes/matchbox-stroke/matchbox-stroke_svn.bb +++ b/recipes/matchbox-stroke/matchbox-stroke_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox keyboard" LICENSE = "GPL" DEPENDS = "libfakekey expat libxft" SECTION = "x11/wm" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR ="r2" diff --git a/recipes/matchbox-terminal/matchbox-terminal_svn.bb b/recipes/matchbox-terminal/matchbox-terminal_svn.bb index 4d2ddc2eb9..e6263ec561 100644 --- a/recipes/matchbox-terminal/matchbox-terminal_svn.bb +++ b/recipes/matchbox-terminal/matchbox-terminal_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Matchbox Terminal" LICENSE = "GPL" DEPENDS = "gtk+ vte" SECTION = "x11/utils" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=${PN};proto=http" diff --git a/recipes/matchbox-themes-extra/matchbox-theme-sato_svn.bb b/recipes/matchbox-themes-extra/matchbox-theme-sato_svn.bb index 4972444211..5f4b38a7c8 100644 --- a/recipes/matchbox-themes-extra/matchbox-theme-sato_svn.bb +++ b/recipes/matchbox-themes-extra/matchbox-theme-sato_svn.bb @@ -5,7 +5,7 @@ SECTION = "x11/wm" DEFAULT_PREFERENCE = "-1" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r0" PACKAGE_ARCH = "all" diff --git a/recipes/matchbox2/matchbox-desktop-2_svn.bb b/recipes/matchbox2/matchbox-desktop-2_svn.bb index f0261f9ea1..5c3a4686df 100644 --- a/recipes/matchbox2/matchbox-desktop-2_svn.bb +++ b/recipes/matchbox2/matchbox-desktop-2_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" SECTION = "x11/panels" DEPENDS = "gtk+ startup-notification" RDEPENDS = "matchbox-common" -PV = "2.0+svnr${SRCREV}" +PV = "2.0+svnr${SRCPV}" PR = "r1" inherit autotools_stage pkgconfig diff --git a/recipes/matchbox2/matchbox-panel-2-icon-themes_0.0.1.bb b/recipes/matchbox2/matchbox-panel-2-icon-themes_0.0.1.bb index 2d14e0c65b..0dc89e6a67 100644 --- a/recipes/matchbox2/matchbox-panel-2-icon-themes_0.0.1.bb +++ b/recipes/matchbox2/matchbox-panel-2-icon-themes_0.0.1.bb @@ -4,13 +4,14 @@ SECTION = "x11/panels" DEPENDS = "imagemagick-native" RPROVIDES_${PN} = "matchbox-panel-2-icon-theme" PACKAGE_ARCH = "all" -PV = "0.0.1+svnr${SRCREV}" +SRCREV_FORMAT = "startup" +PV = "0.0.1+svnr${SRCPV}" PR = "r0" inherit gtk-icon-cache SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-panel-2/applets/battery/data;proto=http;maxrev=1918 \ - svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-panel-2/applets/startup/data;proto=http \ + svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-panel-2/applets/startup/data;proto=http;name=startup \ svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-panel-2/applets/brightness/data;proto=http \ file://user-desktop.png \ file://task-switcher.png \ diff --git a/recipes/matchbox2/matchbox-panel-2_svn.bb b/recipes/matchbox2/matchbox-panel-2_svn.bb index 667b54967f..a2a807f28a 100644 --- a/recipes/matchbox2/matchbox-panel-2_svn.bb +++ b/recipes/matchbox2/matchbox-panel-2_svn.bb @@ -6,7 +6,7 @@ DEPENDS += " ${@base_contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" DEPENDS += " ${@base_contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" RDEPENDS_${PN} = "matchbox-panel-2-icon-theme" PACKAGE_ARCH = "${MACHINE_ARCH}" -PV = "2.0+svnr${SRCREV}" +PV = "2.0+svnr${SRCPV}" PR = "r0" inherit autotools_stage pkgconfig diff --git a/recipes/matchbox2/matchbox-wm-2_svn.bb b/recipes/matchbox2/matchbox-wm-2_svn.bb index e5aefc02ab..b716cf2c96 100644 --- a/recipes/matchbox2/matchbox-wm-2_svn.bb +++ b/recipes/matchbox2/matchbox-wm-2_svn.bb @@ -1,5 +1,5 @@ DEPENDS = "gtk+ startup-notification dbus dbus-glib" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=matchbox-window-manager-2;proto=http \ diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb index 0129ffce79..2218079369 100644 --- a/recipes/meta/slugos-packages.bb +++ b/recipes/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r64" +PR = "r65" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -177,6 +177,7 @@ SLUGOS_PACKAGES = "\ openobex \ openssh \ openvpn \ + owfs \ patch \ pciutils \ perl \ diff --git a/recipes/mokoko/mokoko_svn.bb b/recipes/mokoko/mokoko_svn.bb index 84e16e576b..f22d445ae8 100644 --- a/recipes/mokoko/mokoko_svn.bb +++ b/recipes/mokoko/mokoko_svn.bb @@ -5,7 +5,7 @@ LICENSE = "GPL" DEPENDS = "gstreamer" RDEPENDS = "gstreamer" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://om-mediaplayer.googlecode.com/svn/;module=trunk;proto=http" diff --git a/recipes/mokomaze/files/fsoraw.patch b/recipes/mokomaze/files/fsoraw.patch new file mode 100644 index 0000000000..e59f0cf6a7 --- /dev/null +++ b/recipes/mokomaze/files/fsoraw.patch @@ -0,0 +1,11 @@ +--- mokomaze-0.5.5+git8/data/mokomaze.desktop 2009-08-22 12:14:31.000000000 +0200 ++++ mokomaze-0.5.5+git8/data/mokomaze.desktop 2009-08-22 12:50:30.000000000 +0200 +@@ -4,7 +4,7 @@ + Encoding=UTF-8 + Version=0.5 + Type=Application +-Exec=mokomaze ++Exec=fsoraw -r Display mokomaze + Terminal=false + Categories=Game; + X-MB-SingleInstance=true diff --git a/recipes/mokomaze/mokomaze_0.5.5.bb b/recipes/mokomaze/mokomaze_0.5.5.bb new file mode 100644 index 0000000000..8c45e620fe --- /dev/null +++ b/recipes/mokomaze/mokomaze_0.5.5.bb @@ -0,0 +1,25 @@ +DESCRIPTION="Classic game where you control a steel ball by tilting a wooden labyrinth" +HOMEPAGE="http://mokomaze.projects.openmoko.org/" +SECTION="x11/games" +PRIORITY="optional" +LICENSE="GPLv3" +DEPENDS="libsdl-ttf libsdl-image ode" +RDEPENDS="ttf-liberation-mono libpng" + +RDEPENDS_shr += "fsoraw" + +PR="r1" +PV="0.5.5+git8" + + +SRC_URI="http://mokomaze.projects.openmoko.org/files/${PN}-${PV}.tar.gz" + +SRC_URI_append_shr = "file://fsoraw.patch;patch=1" + +inherit autotools + +EXTRA_OECONF="FONTDIR=${datadir}/fonts/truetype --enable-rgb-swap" + +# needed for ode +LDFLAGS += "-lstdc++" + diff --git a/recipes/mono/mono_svn.inc b/recipes/mono/mono_svn.inc index 908fd3da70..d369d8bd54 100644 --- a/recipes/mono/mono_svn.inc +++ b/recipes/mono/mono_svn.inc @@ -7,7 +7,7 @@ SRC_URI = "svn://anonsvn.mono-project.com/source/trunk/;module=mcs;rev=${SRCREV} svn://anonsvn.mono-project.com/source/trunk/;module=mono;rev=${SRCREV};name=mono " SRCREV_FORMAT = "rmono" -PV = "1.2.5.1+svnr${SRCREV}" +PV = "1.2.5.1+svnr${SRCPV}" S = "${WORKDIR}/mono" inherit autotools diff --git a/recipes/mplayer/mplayer-maemo_svn.bb b/recipes/mplayer/mplayer-maemo_svn.bb index 4e794d0fbe..af0e7a5277 100644 --- a/recipes/mplayer/mplayer-maemo_svn.bb +++ b/recipes/mplayer/mplayer-maemo_svn.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libsdl xsp libmad zlib libpng jpeg liba52 freetype fontconfig DEFAULT_PREFERENCE_avr32 = "-1" -PV = "0.0+1.0rc1+svnr${SRCREV}" +PV = "0.0+1.0rc1+svnr${SRCPV}" PE = "1" RCONFLICTS_${PN} = "mplayer" diff --git a/recipes/mplayer/mplayer_svn.bb b/recipes/mplayer/mplayer_svn.bb index f9bad67a43..8a34dd2f94 100644 --- a/recipes/mplayer/mplayer_svn.bb +++ b/recipes/mplayer/mplayer_svn.bb @@ -35,7 +35,7 @@ ARM_INSTRUCTION_SET = "ARM" RCONFLICTS_${PN} = "mplayer-atty" RREPLACES_${PN} = "mplayer-atty" -PV = "0.0+1.0rc2+svnr${SRCREV}" +PV = "0.0+1.0rc2+svnr${SRCPV}" PR = "r14" DEFAULT_PREFERENCE = "-1" DEFAULT_PREFERENCE_angstrom = "1" diff --git a/recipes/multitap-pad/multitap-pad_svn.bb b/recipes/multitap-pad/multitap-pad_svn.bb index 7543a44d72..fcc7249f32 100644 --- a/recipes/multitap-pad/multitap-pad_svn.bb +++ b/recipes/multitap-pad/multitap-pad_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "libfakekey gtk+ matchbox-panel-2" RCONFLICTS = matchbox-keyboard-inputmethod SECTION = "x11" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" SRC_URI = "svn://svn.o-hand.com/repos/misc/trunk;module=${PN};proto=http \ file://80multitappad" diff --git a/recipes/mythtv/mythtv_svn.bb b/recipes/mythtv/mythtv_svn.bb index 5fbbc4e354..f0d802a4a2 100644 --- a/recipes/mythtv/mythtv_svn.bb +++ b/recipes/mythtv/mythtv_svn.bb @@ -4,7 +4,7 @@ inherit qmake2 qt4x11 DEFAULT_PREFERENCE = "-1" -PV = "0.21+0.22rc+svnr${SRCREV}" +PV = "0.21+0.22rc+svnr${SRCPV}" PR = "r0" REALPV = "0.22" diff --git a/recipes/netsurf/netsurf_svn.bb b/recipes/netsurf/netsurf_svn.bb index 78f23991d3..c08c8796ac 100644 --- a/recipes/netsurf/netsurf_svn.bb +++ b/recipes/netsurf/netsurf_svn.bb @@ -3,7 +3,7 @@ web standards in use today." HOMEPAGE = "http://www.netsurf-browser.org/" SECTION = "x11/network" LICENSE = "GPLv2" -PV = "1.1+svnr${SRCREV}" +PV = "1.1+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://svn.netsurf-browser.org/trunk;module=netsurf \ diff --git a/recipes/networkmanager/networkmanager-applet_svn.bb b/recipes/networkmanager/networkmanager-applet_svn.bb index 13234af8ed..d4df048083 100644 --- a/recipes/networkmanager/networkmanager-applet_svn.bb +++ b/recipes/networkmanager/networkmanager-applet_svn.bb @@ -11,7 +11,7 @@ SRC_URI = "svn://svn.gnome.org/svn/network-manager-applet/;module=trunk;proto=ht SRCREV = "200" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" S = "${WORKDIR}/trunk" diff --git a/recipes/networkmanager/networkmanager_svn.bb b/recipes/networkmanager/networkmanager_svn.bb index e1936fd221..9d8f22dc7b 100644 --- a/recipes/networkmanager/networkmanager_svn.bb +++ b/recipes/networkmanager/networkmanager_svn.bb @@ -2,7 +2,7 @@ require networkmanager-pre0.7.inc SRCREV = "3202" -PV = "0.7+svnr${SRCREV}" +PV = "0.7+svnr${SRCPV}" PR = "r1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/notifier/notifier_0.2.bb b/recipes/notifier/notifier_0.2.bb new file mode 100644 index 0000000000..2cd999f878 --- /dev/null +++ b/recipes/notifier/notifier_0.2.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "A notifier for new calls and messages" +HOMEPAGE = "http://www.telefoninux.org" +AUTHOR = "Pietro Montorfano" +LICENSE = "GPLv3" +RDEPENDS = "python-elementary python python-edbus" +SECTION = "x11/application" +PR = "r2" + +SRC_URI = "http://monto.homelinux.org/notifier \ +http://monto.homelinux.org/89notifier" + +S = "${WORKDIR}" + +do_install() { + install -d ${D}${bindir} + install -m 0755 ${S}/notifier ${D}${bindir}/ + install -d ${D}${sysconfdir}/X11/Xsession.d + install -m 0755 ${S}/89notifier ${D}${sysconfdir}/X11/Xsession.d/ +} + + diff --git a/recipes/numptyphysics/numptyphysics_svn.bb b/recipes/numptyphysics/numptyphysics_svn.bb index d8247b588a..7ebde5086b 100644 --- a/recipes/numptyphysics/numptyphysics_svn.bb +++ b/recipes/numptyphysics/numptyphysics_svn.bb @@ -5,7 +5,7 @@ RDEPENDS += "libpng" LICENSE = "GPL" HOMEPAGE = "http://numptyphysics.garage.maemo.org/" SECTION = "x11/games" -PV = "0.2+svnr${SRCREV}" +PV = "0.2+svnr${SRCPV}" PR = "r1" inherit autotools diff --git a/recipes/obsolete/wesnoth_svn.bb b/recipes/obsolete/wesnoth_svn.bb index 430abe7d0f..97abc5318e 100644 --- a/recipes/obsolete/wesnoth_svn.bb +++ b/recipes/obsolete/wesnoth_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "fantasy turn-based strategy game" -PV = "0.01+svnr${SRCREV}" +PV = "0.01+svnr${SRCPV}" PR = "r1" SECTION = "games" LICENSE = "GPL" diff --git a/recipes/odcctools/odcctools-cross-sdk_svn.bb b/recipes/odcctools/odcctools-cross-sdk_svn.bb index 5c34783490..c1718418b6 100644 --- a/recipes/odcctools/odcctools-cross-sdk_svn.bb +++ b/recipes/odcctools/odcctools-cross-sdk_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "cctools for darwin (SDK)" HOMEPAGE = "http://code.google.com/p/iphone-dev" DEPENDS = "bison-native" -PV = "0.0+svn${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r2" SRCREV="280" diff --git a/recipes/odcctools/odcctools-cross_svn.bb b/recipes/odcctools/odcctools-cross_svn.bb index 142b01f4b8..37369761c6 100644 --- a/recipes/odcctools/odcctools-cross_svn.bb +++ b/recipes/odcctools/odcctools-cross_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "cctools for darwin" HOMEPAGE = "http://code.google.com/p/iphone-dev" DEPENDS = "cross-linkage bison-native" PROVIDES = "virtual/${TARGET_PREFIX}binutils" -PV = "0.0+svn${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r2" SRCREV="280" diff --git a/recipes/ogre/ogre-egl_svn.bb b/recipes/ogre/ogre-egl_svn.bb index 9ca9e8f54f..82c7862013 100644 --- a/recipes/ogre/ogre-egl_svn.bb +++ b/recipes/ogre/ogre-egl_svn.bb @@ -5,7 +5,7 @@ DEPENDS = "gtk+ wgois cppunit zziplib boost freeimage freetype virtual/libx11 vi PR = "r3" SRCREV = "8310" -PV = "1.6.1+svnr${SRCREV}" +PV = "1.6.1+svnr${SRCPV}" SRC_URI = "svn://ogre.svn.sourceforge.net/svnroot/ogre;module=trunk;proto=https \ file://ogre-egl-update.diff;patch=1;pnum=0 \ diff --git a/recipes/omgps/omgps_svn.bb b/recipes/omgps/omgps_svn.bb new file mode 100644 index 0000000000..e68a9a4a3d --- /dev/null +++ b/recipes/omgps/omgps_svn.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "GPS application for openmoko freerunner" +HOMEPAGE = "http://omgps.googlecode.com" +SECTION = "openmoko/applications" +LICENSE = "GPLv2" +DEPENDS = "gtk+ python-pygobject dbus-glib" +#PACKAGES = "${PN}-dbg ${PN}" +PV = "0.1+svnr${SRCPV}" +PR = "r0" +S = "${WORKDIR}/${PN}" +SRC_URI = "svn://omgps.googlecode.com/svn/trunk;module=omgps;proto=http" + +inherit autotools diff --git a/recipes/omnewrotate/files/correct-sysfs-bl-path.patch b/recipes/omnewrotate/files/correct-sysfs-bl-path.patch new file mode 100644 index 0000000000..6d381649a8 --- /dev/null +++ b/recipes/omnewrotate/files/correct-sysfs-bl-path.patch @@ -0,0 +1,53 @@ +diff -uri omnewrotate.org/src/omnewrotate.c omnewrotate/src/omnewrotate.c +--- omnewrotate.org/src/omnewrotate.c 2009-05-03 20:23:56.000000000 +0200 ++++ omnewrotate/src/omnewrotate.c 2009-05-07 17:46:07.000000000 +0200 +@@ -95,8 +95,8 @@ + #define LONG_TIME 0 + + #define EVENT_PATH "/dev/input/event3" +-#define GET_BRIGHTNESS_PATH "/sys/class/backlight/pcf50633-bl/actual_brightness" +-#define SET_BRIGHTNESS_PATH "/sys/class/backlight/pcf50633-bl/brightness" ++#define GET_BRIGHTNESS_PATH "/sys/class/backlight/gta02-bl/actual_brightness" ++#define SET_BRIGHTNESS_PATH "/sys/class/backlight/gta02-bl/brightness" + + #define NUM_THREADS 1 + +@@ -197,8 +197,8 @@ + #endif + + if (change_brightness && !use_dbus) { +- set_brightness_file = open(SET_BRIGHTNESS_PATH, O_RDWR); +- get_brightness_file = open(GET_BRIGHTNESS_PATH, O_RDWR); ++ set_brightness_file = open(SET_BRIGHTNESS_PATH, O_WRONLY); ++ get_brightness_file = open(GET_BRIGHTNESS_PATH, O_RDONLY); + + if (set_brightness_file < 0 || get_brightness_file < 0) + { +@@ -273,7 +273,7 @@ + rootWindow = RootWindow(display, screen); + XRRRotations(display, screen, &r); + +- char current_brightness[3] = "63\n"; ++ char current_brightness[4] = "255\n"; + char brightness_off[2] = "0\n"; + + +@@ -317,7 +317,7 @@ + else + { + lseek(get_brightness_file, 0, SEEK_SET); +- read(get_brightness_file, ¤t_brightness, 2); ++ read(get_brightness_file, ¤t_brightness, 3); + lseek(set_brightness_file, 0, SEEK_SET); + write(set_brightness_file, &brightness_off, 2); + } +@@ -333,7 +333,7 @@ + if(debug) printf("Recovering screen brightness for nifty effect\n"); + usleep(500000); + lseek(set_brightness_file, 0, SEEK_SET); +- write(set_brightness_file, ¤t_brightness, 3); ++ write(set_brightness_file, ¤t_brightness, 4); + } + + } +Nur in omnewrotate.org/src: .omnewrotate.c.swp. diff --git a/recipes/omnewrotate/omnewrotate_0.5.4.bb b/recipes/omnewrotate/omnewrotate_0.5.4.bb new file mode 100644 index 0000000000..c712efaba0 --- /dev/null +++ b/recipes/omnewrotate/omnewrotate_0.5.4.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "OpenMoko New Rotate is a screen rotation program" +HOMEPAGE = "http://code.google.com/p/omnewrotate/" +AUTHOR = "Rui Seabra" +LICENSE = "GPLv3" +SECTION = "console/network" +DEPENDS = "libframeworkd-glib xrandr" +PV = "0.5.4" +PR = "r4" + +SRC_URI = "svn://omnewrotate.googlecode.com/svn/trunk;module=.;proto=http;rev=HEAD \ +file://correct-sysfs-bl-path.patch;patch=1 \ +" +S = "${WORKDIR}" + +inherit autotools diff --git a/recipes/omoney/omoney_svn.bb b/recipes/omoney/omoney_svn.bb new file mode 100644 index 0000000000..f566c92ada --- /dev/null +++ b/recipes/omoney/omoney_svn.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "OMoney is a bookkeeping application for Openmoko" +HOMEPAGE = "http://omoney.googlecode.com" +AUTHOR = "Bumbl" +LICENSE = "GPLv2" +SECTION = "openmoko/money" +PV = "milestone1+svnr${SRCPV}" +PR = "r0" +SRC_URI = "svn://omoney.googlecode.com/svn/trunk;module=.;proto=http;rev=29" +S = "${WORKDIR}" + +inherit distutils + +RDEPENDS_${PN} = "\ + python \ + python-datetime \ + python-evas \ + python-edje \ + python-ecore \ + python-etk \ + python-sqlite3 \ + python-textutils" + +FILES_${PN} = "\ + /usr/bin/omoney \ + /usr/share/omoney/omgui.edj \ + /usr/share/pixmaps/omoney.png \ + /usr/share/applications/omoney.desktop" + diff --git a/recipes/omview/omview_svn.bb b/recipes/omview/omview_svn.bb new file mode 100644 index 0000000000..8ce0a78160 --- /dev/null +++ b/recipes/omview/omview_svn.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "OMView" +SECTION = "x11/graphics" +PKG_TAGS_${PN} = "group::communication" +DEPENDS += " evas ewl epsilon" +RDEPENDS += " epsilon-thumbd" +PV = "0.0.1+svnr${SRCPV}" +PR = "r2" + +inherit autotools + +SRC_URI += "svn://svn.projects.openmoko.org/svnroot;proto=svn;module=omview" + +S = "${WORKDIR}/${PN}" + diff --git a/recipes/opencv/opencv-samples_svn.bb b/recipes/opencv/opencv-samples_svn.bb index 2a56d0652c..c52f00adf4 100644 --- a/recipes/opencv/opencv-samples_svn.bb +++ b/recipes/opencv/opencv-samples_svn.bb @@ -10,7 +10,7 @@ SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;m " SRCREV = "2219" -PV = "2.0.0+svnr${SRCREV}" +PV = "2.0.0+svnr${SRCPV}" S = "${WORKDIR}/opencv" diff --git a/recipes/opencv/opencv_svn.bb b/recipes/opencv/opencv_svn.bb index 3ed10bc3b1..f502618a31 100644 --- a/recipes/opencv/opencv_svn.bb +++ b/recipes/opencv/opencv_svn.bb @@ -12,7 +12,7 @@ SRC_URI = "svn://opencvlibrary.svn.sourceforge.net/svnroot/opencvlibrary/trunk;m file://acinclude.m4" SRCREV = "2219" -PV = "2.0.0+svnr${SRCREV}" +PV = "2.0.0+svnr${SRCPV}" S = "${WORKDIR}/opencv" diff --git a/recipes/openmoko-3rdparty/advancedcaching_git.bb b/recipes/openmoko-3rdparty/advancedcaching_git.bb new file mode 100644 index 0000000000..2c2e14c61a --- /dev/null +++ b/recipes/openmoko-3rdparty/advancedcaching_git.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "Advanced Geocaching Tool for Linux - Towards paperless geocaching!" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "GPL" +HOMEPAGE = "http://www.opkg.org/package_268.html" +RDEPENDS = "python-pygtk python-html python-image python-netclient python-misc python-sqlite3 python-mime python-json" +PV = "0.1.2+gitr${SRCPV}" + +SRC_URI = "git://github.com/webhamster/advancedcaching.git;protocol=git;branch=master" + +inherit setuptools + +S = "${WORKDIR}/git/files" + +do_install_append() { + mkdir -p "${D}/${datadir}/pixmaps" + install -m 0644 "${S}/advancedcaching.png" "${D}/${datadir}/pixmaps" + mkdir -p "${D}/${datadir}/applications" + install -m 0644 "${S}/advancedcaching.desktop" "${D}/${datadir}/applications" +} + +FILES_${PN} += "/usr/share/applications/* /usr/share/pixmaps/*" diff --git a/recipes/openmoko-3rdparty/om-neon_svn.bb b/recipes/openmoko-3rdparty/om-neon_svn.bb new file mode 100644 index 0000000000..5ecaf14123 --- /dev/null +++ b/recipes/openmoko-3rdparty/om-neon_svn.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "Simple image viewer" +HOMEPAGE = "http://neon.projects.openmoko.org/" +LICENSE = "GPLv3" +AUTHOR = "Valéry Febvre <vfebvre@easter-eggs.com>" +SECTION = "x11/applications" +PRIORITY = "optional" +DEPENDS = "edje-native python-native" + +SRCREV = ${AUTOREV} +PV = "1.0.0+svnr${SRCPV}" +PR = "r2" + +S = "${WORKDIR}/trunk" + +# Pure Python plus Edje interface +PACKAGE_ARCH = "all" + +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/neon;module=trunk" + +inherit distutils + +FILES_${PN} += "${datadir}/neon ${datadir}/applications/neon.desktop ${datadir}/pixmaps" + +RDEPENDS += "python-textutils python-evas python-ecore python-edje" + +do_compile_prepend() { + sed -i "s/\/opt\/bin\/edje_cc -v/${@"${STAGING_BINDIR_NATIVE}".replace('/', '\/')}\/edje_cc/g" ${S}/build_edje.py + sed -i "s/#THEMES_DIR = '\/usr\/share\/neon\/themes'/THEMES_DIR = '\/usr\/share\/neon\/themes'/g" ${S}/neon/neon.py + sed -i "s/THEMES_DIR = '..\/data\/themes'/#THEMES_DIR = '..\/data\/themes'/g" ${S}/neon/neon.py +} diff --git a/recipes/openmoko-3rdparty/pisi_0.4.7.bb b/recipes/openmoko-3rdparty/pisi_0.4.7.bb new file mode 100644 index 0000000000..b3425d2c2e --- /dev/null +++ b/recipes/openmoko-3rdparty/pisi_0.4.7.bb @@ -0,0 +1,33 @@ +DESCRIPTION = "PISI is synchronizing information" +AUTHOR = "Michael Pilgermann" +PRIORITY = "optional" +LICENSE = "GPL" +HOMEPAGE = "http://projects.openmoko.org/projects/pisi/" +SRCNAME = "pisi" +DEPENDS = "python-native python" +RDEPENDS = "python-vobject python python-pygtk python-pygobject python-pycairo\ + python-gdata python-webdav python-ldap python-epydoc python-core\ + python-dateutil python-sqlite3 python-netserver python-netclient\ + python-misc" + +PACKAGE_ARCH = "all" + +PR = "r0" + +SRC_URI = "http://projects.openmoko.org/frs/download.php/907/pisi-src-${PV}.tar.gz" + +FILES_${PN} += "/opt/pisi \ + ${datadir}/pixmaps \ + ${datadir}/applications \ + /home" +CONFFILES_${PN} += "/home/root/.${PN}/conf.default" + +do_compile() { + ${STAGING_BINDIR_NATIVE}/python ${S}/setup.py build ${D} +} + +do_install() { + ${STAGING_BINDIR_NATIVE}/python ${S}/setup.py install ${D} + rm -rf ${D}/opt/pisi/build/ + rm -rf ${D}/opt/pisi/patches/ +} diff --git a/recipes/openmoko-base/openmoko-common_svn.bb b/recipes/openmoko-base/openmoko-common_svn.bb index dc5d24abe1..7f1be74d9e 100644 --- a/recipes/openmoko-base/openmoko-common_svn.bb +++ b/recipes/openmoko-base/openmoko-common_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Common files for the Openmoko distribution" SECTION = "openmoko/base" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r1" inherit openmoko-base diff --git a/recipes/openmoko-base/openmoko-icon-theme-standard_svn.bb b/recipes/openmoko-base/openmoko-icon-theme-standard_svn.bb index 0961d74162..0d8a627cc9 100644 --- a/recipes/openmoko-base/openmoko-icon-theme-standard_svn.bb +++ b/recipes/openmoko-base/openmoko-icon-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko distribution" SECTION = "openmoko/base" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r1" inherit openmoko-base autotools diff --git a/recipes/openmoko-base/openmoko-libs_svn.bb b/recipes/openmoko-base/openmoko-libs_svn.bb index 20b05efb0b..b802dfd681 100644 --- a/recipes/openmoko-base/openmoko-libs_svn.bb +++ b/recipes/openmoko-base/openmoko-libs_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "openmoko-libs is a set of libraries implementing a Gtk+ based app SECTION = "openmoko/libs" LICENSE = "LGPL" DEPENDS += "gtk+ eds-dbus libgsmd libxosd" -PV = "0.4+svnr${SRCREV}" +PV = "0.4+svnr${SRCPV}" PR = "r0" inherit openmoko diff --git a/recipes/openmoko-base/openmoko-session_svn.bb b/recipes/openmoko-base/openmoko-session_svn.bb index 1baa1d68b0..4b5e6e3ff6 100644 --- a/recipes/openmoko-base/openmoko-session_svn.bb +++ b/recipes/openmoko-base/openmoko-session_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Matchbox session files for Openmoko" SECTION = "openmoko/base" RDEPENDS = "matchbox-panel-2 matchbox-wm openmoko-today gconf" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r0" inherit openmoko-base diff --git a/recipes/openmoko-base/openmoko-sound-theme-standard_svn.bb b/recipes/openmoko-base/openmoko-sound-theme-standard_svn.bb index bb500dbeb5..2c61036440 100644 --- a/recipes/openmoko-base/openmoko-sound-theme-standard_svn.bb +++ b/recipes/openmoko-base/openmoko-sound-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard sound theme for the Openmoko distribution" SECTION = "openmoko/base" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r2" inherit openmoko-base autotools diff --git a/recipes/openmoko-base/openmoko-theme-standard-qvga_svn.bb b/recipes/openmoko-base/openmoko-theme-standard-qvga_svn.bb index 5cb7042c92..c7256a9593 100644 --- a/recipes/openmoko-base/openmoko-theme-standard-qvga_svn.bb +++ b/recipes/openmoko-base/openmoko-theme-standard-qvga_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution, qvga version" SECTION = "openmoko/base" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r0" inherit openmoko-base diff --git a/recipes/openmoko-base/openmoko-theme-standard_svn.bb b/recipes/openmoko-base/openmoko-theme-standard_svn.bb index e5e54934dc..606d6a03eb 100644 --- a/recipes/openmoko-base/openmoko-theme-standard_svn.bb +++ b/recipes/openmoko-base/openmoko-theme-standard_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko distribution" SECTION = "openmoko/base" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r5" inherit openmoko-base diff --git a/recipes/openmoko-examples/openmoko-finger-demo_svn.bb b/recipes/openmoko-examples/openmoko-finger-demo_svn.bb index 5d55180aa1..a5c7c6241c 100644 --- a/recipes/openmoko-examples/openmoko-finger-demo_svn.bb +++ b/recipes/openmoko-examples/openmoko-finger-demo_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "An example finger application for Openmoko" SECTION = "openmoko/examples" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" inherit openmoko diff --git a/recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb b/recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb index 2f87b0c41c..ff336be4de 100644 --- a/recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb +++ b/recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "A simple example panel plugin for Openmoko" SECTION = "openmoko/examples" DEPENDS += "libmatchbox" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" PR = "r1" diff --git a/recipes/openmoko-examples/openmoko-panel-demo_svn.bb b/recipes/openmoko-examples/openmoko-panel-demo_svn.bb index bf2d306ca3..c44dc114e5 100644 --- a/recipes/openmoko-examples/openmoko-panel-demo_svn.bb +++ b/recipes/openmoko-examples/openmoko-panel-demo_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "An example panel plugin for Openmoko" SECTION = "openmoko/examples" DEPENDS += "libmatchbox" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" inherit openmoko diff --git a/recipes/openmoko-examples/openmoko-stylus-demo-simple_svn.bb b/recipes/openmoko-examples/openmoko-stylus-demo-simple_svn.bb index 659f0c7636..08b72f8900 100644 --- a/recipes/openmoko-examples/openmoko-stylus-demo-simple_svn.bb +++ b/recipes/openmoko-examples/openmoko-stylus-demo-simple_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A simple stylus application example for Openmoko" SECTION = "openmoko/examples" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" inherit openmoko diff --git a/recipes/openmoko-examples/openmoko-stylus-demo_svn.bb b/recipes/openmoko-examples/openmoko-stylus-demo_svn.bb index 4032cfceb6..550324a339 100644 --- a/recipes/openmoko-examples/openmoko-stylus-demo_svn.bb +++ b/recipes/openmoko-examples/openmoko-stylus-demo_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "An example stylus application for Openmoko" SECTION = "openmoko/examples" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" inherit openmoko diff --git a/recipes/openmoko-projects/assassin-thumbnail.bb b/recipes/openmoko-projects/assassin-thumbnail.bb index b05c65dc1d..2e9afeb2d6 100644 --- a/recipes/openmoko-projects/assassin-thumbnail.bb +++ b/recipes/openmoko-projects/assassin-thumbnail.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Assassin Packages Thumbnails" HOMEPAGE = "http://assassin.projects.openmoko.org/" LICENSE = "GPL" RDEPENDS = "assassin" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.openmoko.org/trunk/src/target/thumbnails/;module=result;proto=https" diff --git a/recipes/openmoko-projects/assassin_svn.bb b/recipes/openmoko-projects/assassin_svn.bb index c2ab9579a3..505a1dacb9 100644 --- a/recipes/openmoko-projects/assassin_svn.bb +++ b/recipes/openmoko-projects/assassin_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://assassin.projects.openmoko.org/" LICENSE = "GPL" DEPENDS = "dbus (>= 1.1.1) glib-2.0 e-wm packagekit etk edbus eet" RDEPENDS = "etk-theme-ninja" -PV = "0.2+svnr${SRCREV}" +PV = "0.2+svnr${SRCPV}" PR = "r6.04" SRC_URI = "svn://om-assassin.googlecode.com/svn/;module=trunk;proto=http" diff --git a/recipes/openmoko-projects/diversity-daemon_svn.bb b/recipes/openmoko-projects/diversity-daemon_svn.bb index 43c1d0a1b9..d78bde23a0 100644 --- a/recipes/openmoko-projects/diversity-daemon_svn.bb +++ b/recipes/openmoko-projects/diversity-daemon_svn.bb @@ -4,7 +4,7 @@ SECTION = "network/misc" LICENSE = "GPL" DEPENDS = "glib-2.0 dbus dbus-glib eds-dbus libjana curl" RDEPENDS_${PN} = "eds-dbus" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r3" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/trunk;module=diversity-daemon;proto=https \ diff --git a/recipes/openmoko-projects/diversity-radar_svn.bb b/recipes/openmoko-projects/diversity-radar_svn.bb index 1d754d23ca..bdc6120b87 100644 --- a/recipes/openmoko-projects/diversity-radar_svn.bb +++ b/recipes/openmoko-projects/diversity-radar_svn.bb @@ -4,7 +4,7 @@ SECTION = "openmoko/applications" LICENSE = "GPL" DEPENDS = "python-evas python-edje python-ecore python-edbus python-dbus python-etk" RDEPENDS_${PN} = "diversity-daemon" -PV = "0.0.4+svnr${SRCREV}" +PV = "0.0.4+svnr${SRCPV}" PR = "r0.01" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/diversity/toys;module=diversity-radar;proto=http" diff --git a/recipes/openmoko-projects/enlazar_svn.bb b/recipes/openmoko-projects/enlazar_svn.bb index 4d86dc6a06..9b2896bced 100644 --- a/recipes/openmoko-projects/enlazar_svn.bb +++ b/recipes/openmoko-projects/enlazar_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://enlazar.projects.openmoko.org/" LICENSE = "GPL" DEPENDS = "evas edje ecore edbus" RDEPENDS = "networkmanager" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r3" PE = "2" diff --git a/recipes/openmoko-projects/etk-theme-ninja_svn.bb b/recipes/openmoko-projects/etk-theme-ninja_svn.bb index a4fb2f3054..38468f5457 100644 --- a/recipes/openmoko-projects/etk-theme-ninja_svn.bb +++ b/recipes/openmoko-projects/etk-theme-ninja_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://ninja.projects.openmoko.org/" SECTION = "openmoko/misc" LICENSE = "GPL" DEPENDS = "edje" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/ninja;module=trunk;proto=http" diff --git a/recipes/openmoko-projects/illume-theme-asu_svn.bb b/recipes/openmoko-projects/illume-theme-asu_svn.bb index e232dbb554..bc4a649c0f 100644 --- a/recipes/openmoko-projects/illume-theme-asu_svn.bb +++ b/recipes/openmoko-projects/illume-theme-asu_svn.bb @@ -4,7 +4,7 @@ LICENSE = "MIT/BSD" DEPENDS = "edje-native eet-native" RPROVIDES_${PN} = "illume-theme" RCONFLICTS = "illume-config" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r9" SRC_URI = "svn://svn.openmoko.org/trunk/src/target/themes/;module=illume-theme-asu;proto=http" diff --git a/recipes/openmoko-projects/om-settings_svn.bb b/recipes/openmoko-projects/om-settings_svn.bb index 579dd3d1be..19ff7cf830 100644 --- a/recipes/openmoko-projects/om-settings_svn.bb +++ b/recipes/openmoko-projects/om-settings_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Exposure all devices on neo1973" DEPENDS = "python-etk python-edbus" RDEPENDS = "python-etk python-re python-codecs python-edbus python-pyxdg" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" PR = "r3" PE = "1" diff --git a/recipes/openmoko-projects/openmoko-agpsui/fix-configure-for-new-autotools.patch b/recipes/openmoko-projects/openmoko-agpsui/fix-configure-for-new-autotools.patch new file mode 100644 index 0000000000..b190cf6096 --- /dev/null +++ b/recipes/openmoko-projects/openmoko-agpsui/fix-configure-for-new-autotools.patch @@ -0,0 +1,11 @@ +diff -uri openmoko-agpsui/trunk/configure.ac openmoko-agpsui-fixed/trunk/configure.ac +--- openmoko-agpsui/trunk/configure.ac 2009-05-30 12:24:11.000000000 +0200 ++++ openmoko-agpsui-fixed/trunk/configure.ac 2009-05-30 12:26:32.000000000 +0200 +@@ -7,6 +7,7 @@ + + AC_ISC_POSIX + AC_PROG_CC ++AC_PROG_CXX + AC_STDC_HEADERS + AC_PROG_LIBTOOL + diff --git a/recipes/openmoko-projects/openmoko-agpsui_svn.bb b/recipes/openmoko-projects/openmoko-agpsui_svn.bb index b9b2de2de7..b341d1b544 100644 --- a/recipes/openmoko-projects/openmoko-agpsui_svn.bb +++ b/recipes/openmoko-projects/openmoko-agpsui_svn.bb @@ -3,10 +3,11 @@ HOMEPAGE = "http://openmoko-agpsui.projects.openmoko.org/" SECTION = "openmoko/apps" LICENSE = "GPL" DEPENDS = "gtk+" -PV = "0.1+svnr${SRCREV}" -PR = "r0" +PV = "0.1+svnr${SRCPV}" +PR = "r1" -SRC_URI = "svn://svn.projects.openmoko.org/svnroot/openmoko-agpsui;module=trunk;proto=https" +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/openmoko-agpsui;module=trunk;proto=http \ +file://fix-configure-for-new-autotools.patch;patch=1;pnum=2" S = "${WORKDIR}/trunk" diff --git a/recipes/openmoko-projects/pyefl-sudoku_svn.bb b/recipes/openmoko-projects/pyefl-sudoku_svn.bb index 0eedc1bf58..ae1a162563 100644 --- a/recipes/openmoko-projects/pyefl-sudoku_svn.bb +++ b/recipes/openmoko-projects/pyefl-sudoku_svn.bb @@ -4,7 +4,7 @@ SECTION = "openmoko/applications" LICENSE = "GPL" DEPENDS = "python-evas python-edje python-ecore" RDEPENDS = "python-evas python-edje python-ecore" -PV = "0.0.2+svnr${SRCREV}" +PV = "0.0.2+svnr${SRCPV}" PR = "r2" SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=pyefl-sudoku;proto=http" diff --git a/recipes/openmoko-system/ompower_svn.bb b/recipes/openmoko-system/ompower_svn.bb index ff16910901..27065235e6 100644 --- a/recipes/openmoko-system/ompower_svn.bb +++ b/recipes/openmoko-system/ompower_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Openmoko Power State handling daemon via DBUS" LICENSE = "MIT BSD" DEPENDS = "ecore edbus" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r3" RDEPENDS = "initscripts" diff --git a/recipes/openmoko-tools/app-restarter_svn.bb b/recipes/openmoko-tools/app-restarter_svn.bb index 61b68b5173..9809d5f88d 100644 --- a/recipes/openmoko-tools/app-restarter_svn.bb +++ b/recipes/openmoko-tools/app-restarter_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "virtual/libx11" SRC_URI="svn://svn.openmoko.org/developers/zecke/;module=app_restarter;proto=http" S = "${WORKDIR}/app_restarter" -PV = "1.0+svnr${SRCREV}" +PV = "1.0+svnr${SRCPV}" PE = "2" inherit pkgconfig diff --git a/recipes/openmoko-tools/openmoko-set-root-password.bb b/recipes/openmoko-tools/openmoko-set-root-password.bb index 55ed090da2..7ea0de55ce 100644 --- a/recipes/openmoko-tools/openmoko-set-root-password.bb +++ b/recipes/openmoko-tools/openmoko-set-root-password.bb @@ -6,7 +6,7 @@ DEPENDS = "gtk+" SRC_URI = "svn://svn.openmoko.org/developers/zecke/;module=root-password;proto=http" S = "${WORKDIR}/root-password" -PV = "1.0+svnr${SRCREV}" +PV = "1.0+svnr${SRCPV}" PE = "1" PR = "r1" diff --git a/recipes/openmoko-tools/openmoko-toolchain-scripts_svn.bb b/recipes/openmoko-tools/openmoko-toolchain-scripts_svn.bb index e30d66b58a..7762e61271 100644 --- a/recipes/openmoko-tools/openmoko-toolchain-scripts_svn.bb +++ b/recipes/openmoko-tools/openmoko-toolchain-scripts_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Convenient scripts to be used with openmoko toolchain." -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PE = "1" PR = "r1" diff --git a/recipes/openmoko2/libjana_svn.bb b/recipes/openmoko2/libjana_svn.bb index 49692b7465..a0b1b9557c 100644 --- a/recipes/openmoko2/libjana_svn.bb +++ b/recipes/openmoko2/libjana_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "O-Hand Jana Library" DEPENDS = "libmokojournal2" DEPENDS = "gtk+ eds-dbus gconf" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r5" inherit autotools_stage pkgconfig lib_package diff --git a/recipes/openmoko2/libmokogsmd2_svn.bb b/recipes/openmoko2/libmokogsmd2_svn.bb index 5625bf809d..fec4d1a3f2 100644 --- a/recipes/openmoko2/libmokogsmd2_svn.bb +++ b/recipes/openmoko2/libmokogsmd2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "libgsmd glib-2.0" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r2" inherit openmoko2 diff --git a/recipes/openmoko2/libmokojournal2_svn.bb b/recipes/openmoko2/libmokojournal2_svn.bb index 354b8e3f26..32da95bf93 100644 --- a/recipes/openmoko2/libmokojournal2_svn.bb +++ b/recipes/openmoko2/libmokojournal2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "eds-dbus" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r2" inherit openmoko2 lib_package diff --git a/recipes/openmoko2/libmokopanelui2_svn.bb b/recipes/openmoko2/libmokopanelui2_svn.bb index 0813111821..21a74053d3 100644 --- a/recipes/openmoko2/libmokopanelui2_svn.bb +++ b/recipes/openmoko2/libmokopanelui2_svn.bb @@ -1,6 +1,6 @@ SECTION = "openmoko/libs" DEPENDS = "gtk+ matchbox-panel-2" -PV = "0.3.0+svnr${SRCREV}" +PV = "0.3.0+svnr${SRCPV}" PR = "r0" inherit openmoko2 diff --git a/recipes/openmoko2/libmokoui2/configure.patch b/recipes/openmoko2/libmokoui2/configure.patch new file mode 100644 index 0000000000..174c598fe1 --- /dev/null +++ b/recipes/openmoko2/libmokoui2/configure.patch @@ -0,0 +1,10 @@ +--- libmokoui.old/configure.ac 2009-06-10 12:42:32.000000000 +0200 ++++ libmokoui2/configure.ac 2009-06-10 12:42:43.000000000 +0200 +@@ -28,7 +28,6 @@ + + if test $enable_python != no ; then + AM_PATH_PYTHON(2.3.5) +- PKG_CHECK_MODULES(GNOME_PYTHON, gnome-python-2.0 >= 2.10.00) + AC_SUBST(PYGDK_CFLAGS) + AC_SUBST(PYGDK_LIBS) + diff --git a/recipes/openmoko2/libmokoui2/makefile.am.patch b/recipes/openmoko2/libmokoui2/makefile.am.patch new file mode 100644 index 0000000000..79f0a48361 --- /dev/null +++ b/recipes/openmoko2/libmokoui2/makefile.am.patch @@ -0,0 +1,19 @@ +--- libmokoui.old/bindings/python/Makefile.am 2009-06-10 12:42:32.000000000 +0200 ++++ libmokoui2/bindings/python/Makefile.am 2009-06-10 12:51:45.000000000 +0200 +@@ -1,13 +1,12 @@ +- +-PY_DEFS=`pkg-config --variable=defsdir pygtk-2.0` +-PYTHON_INCLUDES=-I/usr/include/python${PYTHON_VERSION} ++PY_DEFS=${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=defsdir pygtk-2.0` ++PYTHON_INCLUDES=-I${PKG_CONFIG_SYSROOT_DIR}/usr/include/python${PYTHON_VERSION} + + CLEANFILES = \ + mokoui.defs \ + mokoui.c + + mokoui.defs: ../../libmokoui/moko-finger-scroll.h +- python /usr/share/pygtk/2.0/codegen/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs ++ python ${PKG_CONFIG_SYSROOT_DIR}`pkg-config --variable=codegendir pygtk-2.0`/h2def.py ../../libmokoui/moko-finger-scroll.h > mokoui.defs + + mokoui.c: mokoui.defs mokoui.override + pygtk-codegen-2.0 --prefix mokoui \ diff --git a/recipes/openmoko2/libmokoui2_svn.bb b/recipes/openmoko2/libmokoui2_svn.bb index d52b24737f..176f775c8b 100644 --- a/recipes/openmoko2/libmokoui2_svn.bb +++ b/recipes/openmoko2/libmokoui2_svn.bb @@ -1,12 +1,19 @@ SECTION = "openmoko/libs" -DEPENDS = "gtk+" -PV = "0.1.0+svnr${SRCREV}" -PR = "r2" +DEPENDS = "gtk+ python-pygtk" + +PV = "0.1.0+svnr${SRCPV}" +PR = "r5" inherit openmoko2 +SRC_URI += "\ + file://configure.patch;patch=1 \ + file://makefile.am.patch;patch=1 \ + " LICENSE = "LGPL" +EXTRA_OECONF += " --enable-python" + do_configure_prepend() { touch gtk-doc.make } @@ -14,4 +21,6 @@ do_configure_prepend() { do_stage() { autotools_stage_all } - +FILES_${PN} += "${libdir}/python2.6/site-packages/mokoui.*" +FILES_${PN}-dbg += "${libdir}/python2.6/site-packages/.debug/" +FILES_${PN}-dev += "/usr/share/vala/vapi/" diff --git a/recipes/openmoko2/moko-gtk-engine_svn.bb b/recipes/openmoko2/moko-gtk-engine_svn.bb index 027b3cb22b..0ac4864f19 100644 --- a/recipes/openmoko2/moko-gtk-engine_svn.bb +++ b/recipes/openmoko2/moko-gtk-engine_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Moko GTK+ theme engine" SECTION = "openmoko/libs" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r0" inherit openmoko2 diff --git a/recipes/openmoko2/neod_svn.bb b/recipes/openmoko2/neod_svn.bb index 00fc49fdf9..aeeee871b3 100644 --- a/recipes/openmoko2/neod_svn.bb +++ b/recipes/openmoko2/neod_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Simple Neo1973 Daemon for Button Handling and Power Management" SECTION = "openmoko/daemons" DEPENDS = "gtk+ pulseaudio apmd" RDEPENDS = "gpe-scap xrandr alsa-utils-amixer apm dbus" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r6" inherit openmoko2 gconf diff --git a/recipes/openmoko2/openmoko-alsa-scenarios.bb b/recipes/openmoko2/openmoko-alsa-scenarios.bb index 08531e898e..39a9fcfec0 100644 --- a/recipes/openmoko2/openmoko-alsa-scenarios.bb +++ b/recipes/openmoko2/openmoko-alsa-scenarios.bb @@ -1,7 +1,9 @@ DESCRIPTION = "Package for the different scenarios used by Openmoko" SECTION = "openmoko/base" -PV = "1.0+svnr${SRCREV}" -PR = "r1" +PV = "1.0+svnr${SRCPV}" +PR = "r2" + +PROVIDES = "virtual/alsa-scenarios" COMPATIBLE_MACHINE = "(om-gta01|om-gta02)" diff --git a/recipes/openmoko2/openmoko-appearance_svn.bb b/recipes/openmoko2/openmoko-appearance_svn.bb index a6f5c11171..e277839f0a 100644 --- a/recipes/openmoko2/openmoko-appearance_svn.bb +++ b/recipes/openmoko2/openmoko-appearance_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Openmoko Appearance Editor" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 gconf gtk+" RDEPENDS = "libedata-cal openmoko-today2-folders" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r0" inherit openmoko2 gtk-icon-cache diff --git a/recipes/openmoko2/openmoko-appmanager2_svn.bb b/recipes/openmoko2/openmoko-appmanager2_svn.bb index fe5e227d8f..6ea79a2476 100644 --- a/recipes/openmoko2/openmoko-appmanager2_svn.bb +++ b/recipes/openmoko2/openmoko-appmanager2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Openmoko Application Manager" SECTION = "openmoko/applications" DEPENDS = "libmokoui2 libmokojournal2 startup-notification dbus-glib libice libsm opkg" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r2" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-browser2_svn.bb b/recipes/openmoko2/openmoko-browser2_svn.bb index c6cd49ae87..c1085a0167 100644 --- a/recipes/openmoko2/openmoko-browser2_svn.bb +++ b/recipes/openmoko2/openmoko-browser2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Om Webbrowser using webkit." SECTION = "openmoko/apps" DEPENDS += "intltool libmokoui2 check webkit-gtk" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" PR = "r2" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-calculator2_svn.bb b/recipes/openmoko2/openmoko-calculator2_svn.bb index 13e6948be9..1719ac5138 100644 --- a/recipes/openmoko2/openmoko-calculator2_svn.bb +++ b/recipes/openmoko2/openmoko-calculator2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Legacy Om calculator application." SECTION = "openmoko/tools" DEPENDS = "libmokoui2" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r1" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-common2_svn.bb b/recipes/openmoko2/openmoko-common2_svn.bb index 0ea381437c..63ec9825ad 100644 --- a/recipes/openmoko2/openmoko-common2_svn.bb +++ b/recipes/openmoko2/openmoko-common2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Common files for the Openmoko framework" SECTION = "openmoko/base" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r0" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-contacts2_svn.bb b/recipes/openmoko2/openmoko-contacts2_svn.bb index 65e104e09b..407b59b5c2 100644 --- a/recipes/openmoko2/openmoko-contacts2_svn.bb +++ b/recipes/openmoko2/openmoko-contacts2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Legacy Om address book application." SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 dbus-glib" RDEPENDS = "libedata-book" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r6" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-dates2_svn.bb b/recipes/openmoko2/openmoko-dates2_svn.bb index a3da1716b3..5953460a9c 100644 --- a/recipes/openmoko2/openmoko-dates2_svn.bb +++ b/recipes/openmoko2/openmoko-dates2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Legacy Om calendar application." SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 gtk+ libglade eds-dbus libjana" RDEPENDS = "libedata-cal" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r3" inherit openmoko2 pkgconfig diff --git a/recipes/openmoko2/openmoko-dialer2_svn.bb b/recipes/openmoko2/openmoko-dialer2_svn.bb index f7d019c11c..3aad78e2ef 100644 --- a/recipes/openmoko2/openmoko-dialer2_svn.bb +++ b/recipes/openmoko2/openmoko-dialer2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Legacy Om dialer." SECTION = "openmoko/pim" DEPENDS = "libgsmd libjana libmokoui2 libmokojournal2 pulseaudio libnotify" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r9" PE = "1" diff --git a/recipes/openmoko2/openmoko-feedreader2_svn.bb b/recipes/openmoko2/openmoko-feedreader2_svn.bb index 5fb7dab619..23ada3d255 100644 --- a/recipes/openmoko2/openmoko-feedreader2_svn.bb +++ b/recipes/openmoko2/openmoko-feedreader2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Openmoko Feed Reader" SECTION = "openmoko/apps" DEPENDS += "libmokoui2 libmrss check webkit-gtk" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" PR = "r1" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-firststart2_svn.bb b/recipes/openmoko2/openmoko-firststart2_svn.bb index ce2c181736..a00bd9ed13 100644 --- a/recipes/openmoko2/openmoko-firststart2_svn.bb +++ b/recipes/openmoko2/openmoko-firststart2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Openmoko First Start Wizard" SECTION = "openmoko/apps" DEPENDS += "libmokoui2 libglade" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r0" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb b/recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb index e394547fd5..1f75ce905b 100644 --- a/recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb +++ b/recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework, QVGA edition" SECTION = "openmoko/base" DEPENDS = "imagemagick-native librsvg-native" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r2" EXCLUDE_FROM_WORLD = "1" diff --git a/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb index e145fb2d98..34c3e3b695 100644 --- a/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb +++ b/recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Standard Gtk+ icon theme for the Openmoko framework" SECTION = "openmoko/base" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r1" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-mediaplayer2_svn.bb b/recipes/openmoko2/openmoko-mediaplayer2_svn.bb index 61928be111..fa81c1c446 100644 --- a/recipes/openmoko2/openmoko-mediaplayer2_svn.bb +++ b/recipes/openmoko2/openmoko-mediaplayer2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Om application for playing media files." SECTION = "openmoko/tools" DEPENDS = "libmokoui2 expat gstreamer libspiff curl" RDEPENDS = "gst-meta-audio gconf gst-plugin-alsa" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r6" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-messages2_svn.bb b/recipes/openmoko2/openmoko-messages2_svn.bb index f24a100367..b996b88648 100644 --- a/recipes/openmoko2/openmoko-messages2_svn.bb +++ b/recipes/openmoko2/openmoko-messages2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Legacy Om application for sms." SECTION = "openmoko/pim" DEPENDS = "libmokogsmd2 libmokoui2 libmokojournal2 libjana" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r2" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-sample2_svn.bb b/recipes/openmoko2/openmoko-sample2_svn.bb index b944e79b45..e2104fd086 100644 --- a/recipes/openmoko2/openmoko-sample2_svn.bb +++ b/recipes/openmoko2/openmoko-sample2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "The Openmoko Sample Project" SECTION = "openmoko/applications" DEPENDS = "libmokoui2 intltool gconf" -PV = "0.0.1+svnr${SRCREV}" +PV = "0.0.1+svnr${SRCPV}" PR = "r0" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb index 3096da4813..4a3d8c600f 100644 --- a/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb +++ b/recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Standard sound theme for the Openmoko framework" SECTION = "openmoko/base" RREPLACES = "openmoko-sound-theme-standard" RPROVIDES = "openmoko-sound-theme-standard" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r3" inherit openmoko2 autotools diff --git a/recipes/openmoko2/openmoko-tasks2_svn.bb b/recipes/openmoko2/openmoko-tasks2_svn.bb index b18c269814..0ad5b601e7 100644 --- a/recipes/openmoko2/openmoko-tasks2_svn.bb +++ b/recipes/openmoko2/openmoko-tasks2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Openmoko Agenda" SECTION = "openmoko/pim" DEPENDS = "dbus-glib eds-dbus libmokoui2" RDEPENDS = "libedata-cal" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r1" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb b/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb index 4a41079059..39ced428ea 100644 --- a/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb +++ b/recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework, QVGA edition" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" RPROVIDES = "openmoko-theme-standard-2" -PV = "0.1.1+svnr${SRCREV}" +PV = "0.1.1+svnr${SRCPV}" PR = "r1" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-theme-standard2_svn.bb b/recipes/openmoko2/openmoko-theme-standard2_svn.bb index d4d23d11d6..091391474d 100644 --- a/recipes/openmoko2/openmoko-theme-standard2_svn.bb +++ b/recipes/openmoko2/openmoko-theme-standard2_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Standard Gtk+ theme for the Openmoko framework" SECTION = "openmoko/base" RCONFLICTS = "openmoko-theme-standard" -PV = "0.1.1+svnr${SRCREV}" +PV = "0.1.1+svnr${SRCPV}" PR = "r5" inherit openmoko2 diff --git a/recipes/openmoko2/openmoko-today2-folders_svn.bb b/recipes/openmoko2/openmoko-today2-folders_svn.bb index 4b9f245c3c..3137012a97 100644 --- a/recipes/openmoko2/openmoko-today2-folders_svn.bb +++ b/recipes/openmoko2/openmoko-today2-folders_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "The Openmoko Today2 vfolder files" SECTION = "openmoko/misc" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r3" RCONFLICTS_${PN} = "matchbox-common" diff --git a/recipes/openmoko2/openmoko-today2_svn.bb b/recipes/openmoko2/openmoko-today2_svn.bb index efd281a95e..3466659540 100644 --- a/recipes/openmoko2/openmoko-today2_svn.bb +++ b/recipes/openmoko2/openmoko-today2_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "The Openmoko Application Launcher" SECTION = "openmoko/pim" DEPENDS = "libmokoui2 libmokojournal2 libjana startup-notification dbus-glib libice libsm" RDEPENDS = "libedata-cal openmoko-today2-folders" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r2" inherit openmoko2 gtk-icon-cache diff --git a/recipes/openmoko2/openmoko-worldclock2_svn.bb b/recipes/openmoko2/openmoko-worldclock2_svn.bb index 5b3956ee23..186dce72fa 100644 --- a/recipes/openmoko2/openmoko-worldclock2_svn.bb +++ b/recipes/openmoko2/openmoko-worldclock2_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "A World-Clock for Openmoko" SECTION = "openmoko/tools" DEPENDS = "libmokoui2 libjana" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" inherit openmoko2 diff --git a/recipes/openmoocow/openmoocow/openmoocow.desktop b/recipes/openmoocow/openmoocow/openmoocow.desktop new file mode 100644 index 0000000000..e819c48ba4 --- /dev/null +++ b/recipes/openmoocow/openmoocow/openmoocow.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=MooCow +Comment=Moobox simulator +Type=Application +Exec=openmoocow +Terminal=false +Categories=Games; +Icon=openmoocow/icon.png +X-MB-SingleInstance=true + diff --git a/recipes/openmoocow/openmoocow_git.bb b/recipes/openmoocow/openmoocow_git.bb new file mode 100644 index 0000000000..1071f2afac --- /dev/null +++ b/recipes/openmoocow/openmoocow_git.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "OpenMooCow makes your phone (nearly) become a cow!" +HOMEPAGE = "http://www.srcf.ucam.org/~taw27/openmoko/openmoocow/" +AUTHOR = "Thomas White" +LICENSE = "GPLv3" +SECTION = "applications/games" +PV = "0.0.3+gitr${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.bitwiz.org.uk/openmoocow.git;protocol=git;branch=master" +S = "${WORKDIR}/git" +inherit autotools + + diff --git a/recipes/openocd/openocd_svn.bb b/recipes/openocd/openocd_svn.bb index 6823eabb98..11f5e77edb 100644 --- a/recipes/openocd/openocd_svn.bb +++ b/recipes/openocd/openocd_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Free and Open On-Chip Debugging, In-System Programming and Boundary-Scan Testing" HOMEPAGE = "http://openocd.berlios.de/" LICENSE = "GPL" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r3" inherit autotools diff --git a/recipes/openscada/openscada_svn.bb b/recipes/openscada/openscada_svn.bb index acb700c0d1..dd75e80d1f 100644 --- a/recipes/openscada/openscada_svn.bb +++ b/recipes/openscada/openscada_svn.bb @@ -11,8 +11,7 @@ SRC_URI = "svn://oscada.org.ua/trunk;module=OpenSCADA;rev=;proto=svn \ file://rcc-moc.patch;patch=1 \ " -PV = "0.6.4" -PR = "svn" +PV = "0.6.4+svnr${SRCPV}" S = "${WORKDIR}/OpenSCADA" diff --git a/recipes/opkg/opkg.inc b/recipes/opkg/opkg.inc index aa91955c3a..d744e72223 100644 --- a/recipes/opkg/opkg.inc +++ b/recipes/opkg/opkg.inc @@ -3,7 +3,7 @@ DESCRIPTION_libopkg = "Opkg Package Manager Library" SECTION = "base" LICENSE = "GPL" DEPENDS = "curl gpgme" -PV = "0.1.6+svnr${SRCREV}" +PV = "0.1.6+svnr${SRCPV}" INC_PR = "r16" FILESPATHPKG =. "opkg:" diff --git a/recipes/oprofile/oprofileui-svn.inc b/recipes/oprofile/oprofileui-svn.inc index 6d111d1d59..c2746434a3 100644 --- a/recipes/oprofile/oprofileui-svn.inc +++ b/recipes/oprofile/oprofileui-svn.inc @@ -1,6 +1,6 @@ require oprofileui.inc -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r1" S = "${WORKDIR}/trunk" diff --git a/recipes/orrery/orrery/Makefile.am.patch b/recipes/orrery/orrery/Makefile.am.patch new file mode 100644 index 0000000000..23e7798139 --- /dev/null +++ b/recipes/orrery/orrery/Makefile.am.patch @@ -0,0 +1,67 @@ +Nur in files: aclocal.m4. +Nur in files.fixed: autogen.sh. +Nur in files: autom4te.cache. +Nur in files: configure. +diff -uri files/configure.in files.fixed/configure.in +--- files/configure.in 2008-08-17 05:32:06.000000000 +0200 ++++ files.fixed/configure.in 2009-02-18 16:01:30.102497178 +0100 +@@ -2,4 +2,13 @@ + AM_INIT_AUTOMAKE(orrery,1.1) + AC_PROG_CC + AC_PROG_INSTALL ++ ++PKG_CHECK_MODULES(GTK, gtk+-x11-2.0 gthread-2.0) ++PKG_CHECK_MODULES(X11, x11 xext xau xcursor xfixes xdmcp xrender) ++ ++AC_SUBST(GTK_CFLAGS) ++AC_SUBST(GTK_LIBS) ++AC_SUBST(X11_CFLAGS) ++AC_SUBST(X11_LIBS) ++ + AC_OUTPUT(Makefile) +Nur in files: depcomp. +Nur in files: install-sh. +diff -uri files/Makefile.am files.fixed/Makefile.am +--- files/Makefile.am 2008-09-03 08:54:55.000000000 +0200 ++++ files.fixed/Makefile.am 2009-02-18 16:14:19.574262603 +0100 +@@ -1,36 +1,4 @@ +-CFLAGS = -g -O3 -Wall +-CC = $(OM)/build/tmp/cross/arm-angstrom-linux-gnueabi/bin/gcc +-INCLUDES = -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/gtk-2.0/ \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/cairo/ \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/glib-2.0/ \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/pango-1.0/ \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/gtk-2.0/include \ +- -I$(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/include/atk-1.0/ +-LDADD = $(OM)/build/tmp/rootfs/usr/lib/libgobject-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpangocairo-1.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpango-1.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libcairo.so.2 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgmodule-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libglib-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libfontconfig.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXext.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXrender.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpopt.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgthread-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libX11.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXcursor.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXfixes.so.3 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgdk_pixbuf-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpangoft2-1.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libz.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libpng12.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libfreetype.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libexpat.so.1 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXau.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libXdmcp.so.6 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgtk-x11-2.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libatk-1.0.so.0 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgcrypt.so.11.2.2 \ +- $(OM)/build/tmp/staging/arm-angstrom-linux-gnueabi/lib/libgpg-error.so.0.3.0 + bin_PROGRAMS = orrery + orrery_SOURCES = planetInfo.c orrery.c ++orrery_CFLAGS = -g -O3 -Wall @GTK_CFLAGS@ @X11_CFLAGS@ ++orrery_LDADD = @GTK_LIBS@ @X11_LIBS@ -lpopt -lz -lexpat -lgcrypt -lgpg-error +Nur in files: Makefile.in. +Nur in files: missing. diff --git a/recipes/orrery/orrery/datadir.patch b/recipes/orrery/orrery/datadir.patch new file mode 100644 index 0000000000..7a3c204ad9 --- /dev/null +++ b/recipes/orrery/orrery/datadir.patch @@ -0,0 +1,12 @@ +diff -uri files/orrery.c files.datadir/orrery.c +--- files/orrery.c 2009-01-07 11:28:32.000000000 +0100 ++++ files.datadir/orrery.c 2009-02-18 19:08:44.887262837 +0100 +@@ -70,7 +70,7 @@ + + #define FULL_CIRCLE (23040) /* Full circle in calls to draw_arc */ + +-#define DATA_DIR "/media/card/orrery" ++#define DATA_DIR "/usr/share/orrery" + #define N_PLANETS (9) + #define N_SOLAR_SYSTEM_OBJECTS (10) + diff --git a/recipes/orrery/orrery_2.4.bb b/recipes/orrery/orrery_2.4.bb new file mode 100644 index 0000000000..dc5622946e --- /dev/null +++ b/recipes/orrery/orrery_2.4.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "orrery" +SECTION = "x11/scientific" +PV = "2.4" + +inherit autotools + +SRC_URI = "http://projects.openmoko.org/frs/download.php/581/orrery_2.4_clean.tar.gz \ + file://datadir.patch;patch=1 \ + file://Makefile.am.patch;patch=1" +S = "${WORKDIR}/files" + +do_install_append() { + install -d ${D}${datadir}/applications + install -m 0644 ${S}/orrery.desktop ${D}${datadir}/applications + install -d ${D}${datadir}/orrery + cp -a ${S}/data/* ${D}${datadir}/orrery + rm ${D}${datadir}/orrery/icons/orrery.png + install -d ${D}${datadir}/icons + install ${S}/data/icons/orrery.png ${D}${datadir}/icons +} + +FILES_${PN} += "\ + ${datadir}/applications/orrery.desktop \ + ${datadir}/orrery \ + ${datadir}/icons" + diff --git a/recipes/owfs/owfs_2.7p24.bb b/recipes/owfs/owfs_2.7p24.bb index 44fc878d7b..0cfc36f4b5 100644 --- a/recipes/owfs/owfs_2.7p24.bb +++ b/recipes/owfs/owfs_2.7p24.bb @@ -5,6 +5,8 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS += "fuse virtual/libusb0" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/owfs/owfs-${PV}.tar.gz \ file://owhttpd \ file://owserver " @@ -15,6 +17,7 @@ EXTRA_OECONF = " \ --enable-owhttpd \ --enable-cache \ --enable-mt \ + --disable-swig \ " do_install_prepend() { diff --git a/recipes/pam/libpam_1.0.2.bb b/recipes/pam/libpam_1.0.2.bb index 0151a4691d..b288458e98 100644 --- a/recipes/pam/libpam_1.0.2.bb +++ b/recipes/pam/libpam_1.0.2.bb @@ -23,7 +23,8 @@ S = "${WORKDIR}/${p}" SRC_URI = "${KERNELORG_MIRROR}/pub/linux/libs/pam/library/${p}.tar.bz2 \ file://pam-nodocs.patch;patch=1 " -SRC_URI_append_libc-uclibc = "file://pam-disable-nis-on-uclibc.patch;patch=1" +SRC_URI_append_linux-uclibc = " file://pam-disable-nis-on-uclibc.patch;patch=1" +SRC_URI_append_linux-uclibceabi = " file://pam-disable-nis-on-uclibc.patch;patch=1" inherit autotools @@ -32,6 +33,9 @@ LEAD_SONAME = "libpam.so.*" # maintain the pam default layout EXTRA_OECONF += " --includedir=${includedir}/security" +EXTRA_OECONF_linux-uclibc += "--disable-nls" +EXTRA_OECONF_linux-uclibceabi += "--disable-nls" + PACKAGES_DYNAMIC += " libpam-meta pam-plugin-*" python populate_packages_prepend () { diff --git a/recipes/pimlico/contacts_svn.bb b/recipes/pimlico/contacts_svn.bb index 0257046e88..09c8887f8e 100644 --- a/recipes/pimlico/contacts_svn.bb +++ b/recipes/pimlico/contacts_svn.bb @@ -4,7 +4,7 @@ require contacts.inc #RDEPENDS += "gnome-vfs-plugin-file" #RRECOMMENDS += "gnome-vfs-plugin-http" -PV = "0.8+svnr${SRCREV}" +PV = "0.8+svnr${SRCPV}" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/pimlico/dates_svn.bb b/recipes/pimlico/dates_svn.bb index 0ba1b07dc0..e7ea9c8338 100644 --- a/recipes/pimlico/dates_svn.bb +++ b/recipes/pimlico/dates_svn.bb @@ -2,7 +2,7 @@ require dates.inc DEFAULT_PREFERENCE = "-1" -PV = "0.4.5+svnr${SRCREV}" +PV = "0.4.5+svnr${SRCPV}" S = "${WORKDIR}/trunk" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ diff --git a/recipes/pimlico/tasks_svn.bb b/recipes/pimlico/tasks_svn.bb index dc998d2508..552980dd68 100644 --- a/recipes/pimlico/tasks_svn.bb +++ b/recipes/pimlico/tasks_svn.bb @@ -2,7 +2,7 @@ require tasks.inc DEFAULT_PREFERENCE = "-1" -PV = "0.13+svnr${SRCREV}" +PV = "0.13+svnr${SRCPV}" S = "${WORKDIR}/trunk" SRC_URI = "svn://svn.o-hand.com/repos/${PN};module=trunk;proto=http \ diff --git a/recipes/portaudio/portaudio-v19_svn.bb b/recipes/portaudio/portaudio-v19_svn.bb index 2dbef45d2d..5e3097dea7 100644 --- a/recipes/portaudio/portaudio-v19_svn.bb +++ b/recipes/portaudio/portaudio-v19_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A portable audio library" SECTION = "libs/multimedia" PRIORITY = "optional" LICENSE = "GPL" -PV = "v19+svnr${SRCREV}" +PV = "v19+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://www.portaudio.com/repos/portaudio;module=trunk;proto=http" diff --git a/recipes/psplash/psplash.inc b/recipes/psplash/psplash.inc index 515c830ce1..f2be0b3f6b 100644 --- a/recipes/psplash/psplash.inc +++ b/recipes/psplash/psplash.inc @@ -7,7 +7,7 @@ PROVIDES = "virtual/psplash" RPROVIDES_${PN} = "virtual-psplash" RCONFLICTS_${PN} = "exquisite" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r23" # You can create your own pslash-hand-img.h by doing diff --git a/recipes/puzzles/oh-puzzles_svn.bb b/recipes/puzzles/oh-puzzles_svn.bb index f0e0eade69..f5796e49fc 100644 --- a/recipes/puzzles/oh-puzzles_svn.bb +++ b/recipes/puzzles/oh-puzzles_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Portable Puzzle Collection" LICENSE = "MIT" SECTION = "x11" DEPENDS = "gtk+ gconf intltool-native librsvg libowl" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r5" inherit autotools pkgconfig diff --git a/recipes/pyphonelog/pyphonelog_git.bb b/recipes/pyphonelog/pyphonelog_git.bb new file mode 100644 index 0000000000..fafdffaf88 --- /dev/null +++ b/recipes/pyphonelog/pyphonelog_git.bb @@ -0,0 +1,16 @@ +DESCRIPTION = "PyPhonelog is a phonelog gui that connects to the shr daemon/a custom daemon" +HOMEPAGE = "http://wiki.openmoko.org/wiki/PyPhonelog" +SECTION = "x11/applications" +LICENSE = "GPLv2" +SRCNAME = "pyphonelog" +RDEPENDS += "python python-pygtk python-sqlite3 python-phoneutils" + +inherit distutils + +S = "${WORKDIR}/git" +PV = "0.17.0+gitr${SRCPV}" +PR = "r0" +SRC_URI = "git://shr.bearstech.com/repo/pyphonelog.git;protocol=http" +FILES_${PN} += "${datadir}/applications/phonelog.desktop \ + ${datadir}/phonelog/ \ + ${datadir}/pixmaps/phonelog.png" diff --git a/recipes/pythm/pythm/mplayer-escape-filenames.patch b/recipes/pythm/pythm/mplayer-escape-filenames.patch new file mode 100644 index 0000000000..329f4ef7f4 --- /dev/null +++ b/recipes/pythm/pythm/mplayer-escape-filenames.patch @@ -0,0 +1,19 @@ +diff -ur pythm-org/pythm/mplayer/mplayerbackend.py pythm/pythm/mplayer/mplayerbackend.py +--- pythm-org/pythm/mplayer/mplayerbackend.py 2008-11-22 14:18:13.227163500 +0100 ++++ pythm/pythm/mplayer/mplayerbackend.py 2009-01-15 23:54:50.582429054 +0100 +@@ -96,7 +96,7 @@ + entry = self.current[1] + self.emit(Signals.SONG_CHANGED,entry) + self.songend = time.time() +- fn = entry.id ++ fn = re.escape(entry.id) + array = self.mplayer.innercmd("loadfile '" + fn + "'\n","======",True) + #array = self.mplayer.arraycmd("loadfile","======",fn) + self.fill_entry(array, entry) +@@ -404,4 +404,4 @@ + self.browse() + + +- +\ Kein Zeilenumbruch am Dateiende. ++ diff --git a/recipes/pythm/pythm/pythm.conf b/recipes/pythm/pythm/pythm.conf new file mode 100644 index 0000000000..2fbe3c4997 --- /dev/null +++ b/recipes/pythm/pythm/pythm.conf @@ -0,0 +1,32 @@ +# global pythm settings +# place this file in ~/.pythm/, name it pythm.conf + +[pythm] +# backends to show in backend list +backends=mpd,mplayer +# the default backend to use, can be either +# mpd or mplayer, or omitted +backend=mplayer + +# mpd specific settings +[mpd] +# mpd host +host=localhost +# mpd port +port=6600 +# mpd password, comment out for no password +#password=verysecret + +# mplayer settings +[mplayer] +# renice val for mplayer process +renice=-15 + +# directory containing music (the start folder for the browser) +musicdir=~ +# allowed file endings in browse mode, comma separated +endings=ogg,mp3 +# filters to exclude in file browser. applied to files and directories +# using regular expressions. use filtersN for more entries +# default is to ignore all elements that start with a ".". +filters0=\..* diff --git a/recipes/pythm/pythm/pythm.desktop b/recipes/pythm/pythm/pythm.desktop new file mode 100644 index 0000000000..89f74d50bb --- /dev/null +++ b/recipes/pythm/pythm/pythm.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Version=0.5 +Type=Application +Encoding=UTF-8 +Name=pythm +Comment=pyGTK+ Frontend for MPD and mplayer +TryExec=pythm-bin +Exec=pythm-bin +Icon=bass.png +Categories=Application;AudioVideo;Audio;Player; +Categories=Office; +Terminal=false diff --git a/recipes/pythm/pythm_svn.bb b/recipes/pythm/pythm_svn.bb new file mode 100644 index 0000000000..fdffb21621 --- /dev/null +++ b/recipes/pythm/pythm_svn.bb @@ -0,0 +1,36 @@ +DESCRIPTION = "Pythm is a media player gui designed to work with mplayer or mpd as "slave" players.\ +use mplayer to hear music on the road or mpd control if your are at home." +HOMEPAGE = "http://projects.openmoko.org/projects/pythm/" +SECTION = "application/multimedia" +LICENSE = "GPLv2" +SRCNAME = "pythm" +PV = "0.5.1+svnr${SRCPV}" +PR = "r3" +SRC_URI = "svn://svn.projects.openmoko.org/svnroot/;module=pythm \ + file://mplayer-escape-filenames.patch;patch=0 \ + file://pythm.desktop \ + file://pythm.conf" +S = "${WORKDIR}/pythm" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-pygtk \ + mplayer \ +" +DISTUTILS_INSTALL_ARGS = "--root=${D} \ + --prefix=${prefix} \ + --install-data=${datadir}" + +do_install_append() { + install -d ${D}${sysconfdir} + install -d ${D}/${datadir}/applications + install -m 0644 ../pythm.conf ${D}${sysconfdir} + install -m 0644 ../pythm.desktop ${D}/${datadir}/applications +} + + +FILES_${PN} += "\ + ${sysconfdir}/pythm.conf \ + ${datadir}/applications/pythm.desktop" + diff --git a/recipes/python/pydes_1.3.1.bb b/recipes/python/pydes_1.3.1.bb new file mode 100644 index 0000000000..b266538b42 --- /dev/null +++ b/recipes/python/pydes_1.3.1.bb @@ -0,0 +1,17 @@ +DESCRIPTION = "Python DES implementation" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python" + +PR = "r1" +ARCH_pydes = "all" + +SRC_URI = "http://twhiteman.netfirms.com/pyDES/pyDes-1.3.1.tar.gz" + +inherit distutils + +S = ${WORKDIR}/pyDes-1.3.1 + + + diff --git a/recipes/python/pyring_1.1.10.bb b/recipes/python/pyring_1.1.10.bb new file mode 100644 index 0000000000..211801debf --- /dev/null +++ b/recipes/python/pyring_1.1.10.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "Python keyring" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPL" +RDEPENDS = "python python-pygtk python-xml python-netclient python-numeric pydes" + +ARCH_pyring = "all" + +SRC_URI = "http://handheldshell.com/software/pyring_${PV}.tgz " + +inherit distutils + +S = ${WORKDIR}/pyring-${PV} + +do_configure_prepend() { + cp ${S}/setup_freerunner.py ${S}/setup.py + exit 0 +} + +FILES_${PN} += "${datadir}" + diff --git a/recipes/python/python-blipapi_0.02.04.bb b/recipes/python/python-blipapi_0.02.04.bb new file mode 100644 index 0000000000..bc8ad58800 --- /dev/null +++ b/recipes/python/python-blipapi_0.02.04.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Library to communicate with blip.pl API" +AUTHOR = "Marcin Sztolcman <marcin@urzenia.net>" +HOMEPAGE = "http://blipapi.googlecode.com/" +DEPENDS = "python-setuptools" +LICENSE = "GPL" +RDEPENDS += "python-json" +PR = "r0" +inherit setuptools + +SRC_URI = "http://blipapi.googlecode.com/files/BlipApiPY-0.02.04.tar.bz2" +S = "${WORKDIR}/blipapi" + diff --git a/recipes/python/python-coherence_svn.bb b/recipes/python/python-coherence_svn.bb index 031067672e..46e6e3e7c8 100644 --- a/recipes/python/python-coherence_svn.bb +++ b/recipes/python/python-coherence_svn.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://coherence.beebits.net/wiki" PR = "r1" -PV = "0.6.0+svnr${SRCREV}" +PV = "0.6.0+svnr${SRCPV}" inherit setuptools diff --git a/recipes/python/python-connexion_svn.bb b/recipes/python/python-connexion_svn.bb index ae546f5256..8136fe46f9 100644 --- a/recipes/python/python-connexion_svn.bb +++ b/recipes/python/python-connexion_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.radlinux.org/connexion/" SECTION = "devel/python" LICENSE = "GPL" BV = "0.4.6" -PV = "${BV}+svnr${SRCREV}" +PV = "${BV}+svnr${SRCPV}" PR = "ml1" inherit distutils diff --git a/recipes/python/python-dateutil_1.4.1.bb b/recipes/python/python-dateutil_1.4.1.bb new file mode 100644 index 0000000000..204c48d190 --- /dev/null +++ b/recipes/python/python-dateutil_1.4.1.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Extensions to the standard Python date/time support" +HOMEPAGE = "http://labix.org/python-dateutil" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "PSF" +SRCNAME = "${PN}" +PR = "r1" + +SRC_URI = "http://labix.org/download/python-dateutil/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools + +PACKAGES =+ "${PN}-zoneinfo" +FILES_${PN}-zoneinfo = "${libdir}/${PYTHON_DIR}/site-packages/dateutil/zoneinfo" + +RDEPENDS_${PN} = "\ + python-core \ + python-datetime \ +" diff --git a/recipes/python/python-efl.inc b/recipes/python/python-efl.inc index acd1660f08..9ed7a4cb98 100644 --- a/recipes/python/python-efl.inc +++ b/recipes/python/python-efl.inc @@ -7,7 +7,7 @@ HOMEPAGE = "http://www.enlightenment.org" # the extension modules. DEPENDS = "python-cython-native python-pyrex-native python-numeric eina" RDEPENDS += "python-lang" -PV = "0.3.1+svnr${SRCREV}" +PV = "0.3.1+svnr${SRCPV}" PR = "ml0" inherit setuptools diff --git a/recipes/python/python-elementary_svn.bb b/recipes/python/python-elementary_svn.bb index 44c5613edf..b4e5dbbf48 100644 --- a/recipes/python/python-elementary_svn.bb +++ b/recipes/python/python-elementary_svn.bb @@ -1,7 +1,7 @@ require python-efl.inc DEPENDS += "elementary" RDEPENDS += "python-evas python-ecore python-edje" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "ml0" do_stage() { diff --git a/recipes/python/python-epydoc-native_3.0.1.bb b/recipes/python/python-epydoc-native_3.0.1.bb new file mode 100644 index 0000000000..7f64f64e64 --- /dev/null +++ b/recipes/python/python-epydoc-native_3.0.1.bb @@ -0,0 +1,8 @@ +require python-epydoc_${PV}.bb +DEPENDS = "python-native" +inherit native + +do_stage() { + distutils_stage_all +} + diff --git a/recipes/python/python-epydoc_3.0.1.bb b/recipes/python/python-epydoc_3.0.1.bb new file mode 100644 index 0000000000..36d22ad5a0 --- /dev/null +++ b/recipes/python/python-epydoc_3.0.1.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "Epydoc is a tool for generating API documentation for Python modules, based on their docstrings" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "MIT" +HOMEPAGE = "http://epydoc.sourceforge.net/" +SRCNAME = "epydoc" +DEPENDS = "python" + +SRC_URI = "http://downloads.sourceforge.net/project/${SRCNAME}/${SRCNAME}/${PV}/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/recipes/python/python-etk_svn.bb b/recipes/python/python-etk_svn.bb index 85cb824b2d..ba082d873b 100644 --- a/recipes/python/python-etk_svn.bb +++ b/recipes/python/python-etk_svn.bb @@ -1,7 +1,7 @@ require python-efl.inc DEPENDS += "etk python-evas python-ecore" RDEPENDS += "python-evas python-ecore python-edje python-numeric python-math etk-themes" -PV = "0.1.1+svnr${SRCREV}" +PV = "0.1.1+svnr${SRCPV}" PR = "ml1" SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/OLD/BINDINGS/python;module=${PN};proto=http" diff --git a/recipes/python/python-ldap/setup.cfg.patch b/recipes/python/python-ldap/setup.cfg.patch new file mode 100644 index 0000000000..a703d342e9 --- /dev/null +++ b/recipes/python/python-ldap/setup.cfg.patch @@ -0,0 +1,14 @@ +--- python-ldap-2.3.9/setup.cfg.orig 2009-08-13 11:07:23.000000000 +0200 ++++ python-ldap-2.3.9/setup.cfg 2009-08-13 11:07:37.000000000 +0200 +@@ -1,9 +1,9 @@ + [_ldap] + extra_objects = + extra_compile_args = +-libs = ldap_r lber sasl2 ssl crypto ++libs = ldap_r lber ssl crypto + library_dirs = /opt/openldap-RE24/lib +-include_dirs = /opt/openldap-RE24/include /usr/include/sasl ++include_dirs = /opt/openldap-RE24/include + + [egg_info] + tag_build = diff --git a/recipes/python/python-ldap_2.3.9.bb b/recipes/python/python-ldap_2.3.9.bb new file mode 100644 index 0000000000..8a605e49e4 --- /dev/null +++ b/recipes/python/python-ldap_2.3.9.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "LDAP client API for Python, C wrapper module around OpenLDAP 2.x with an object-oriented API" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "Python-style" +HOMEPAGE = "http://www.python-ldap.org/" +DEPENDS = "python openldap" + +SRC_URI = "http://pypi.python.org/packages/source/p/${PN}/${PN}-${PV}.tar.gz \ + file://setup.cfg.patch;patch=1" + +inherit setuptools diff --git a/recipes/python/python-pybluez_0.16.bb b/recipes/python/python-pybluez_0.16.bb new file mode 100644 index 0000000000..44554d6ff1 --- /dev/null +++ b/recipes/python/python-pybluez_0.16.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "Python bindings for the Linux Bluetooth stack" +SECTION = "devel/python" +DEPENDS = "bluez-libs" +LICENSE = "GPL" +PR = "ml0" + +SRC_URI = "http://pybluez.googlecode.com/files/PyBluez-${PV}.tar.gz" +S = "${WORKDIR}/PyBluez-${PV}" + +inherit distutils diff --git a/recipes/python/python-pygtk_2.10.4.bb b/recipes/python/python-pygtk_2.10.4.bb index 3f0e593c98..bdfebafc7a 100644 --- a/recipes/python/python-pygtk_2.10.4.bb +++ b/recipes/python/python-pygtk_2.10.4.bb @@ -6,7 +6,7 @@ RDEPENDS = "python-shell python-pycairo python-pygobject" PROVIDES = "python-pygtk2" SRCNAME = "pygtk" LICENSE = "LGPL" -PR = "ml10" +PR = "ml11" MAJ_VER = "${@bb.data.getVar('PV',d,1).split('.')[0]}.${@bb.data.getVar('PV',d,1).split('.')[1]}" SRC_URI = "ftp://ftp.gnome.org/pub/gnome/sources/pygtk/${MAJ_VER}/${SRCNAME}-${PV}.tar.bz2 \ @@ -52,7 +52,7 @@ FILES_${PN}-dev += "\ do_stage() { autotools_stage_includes - sed -i s:/usr/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0 + sed -i s:${prefix}/share:${STAGING_DATADIR}: codegen/pygtk-codegen-2.0 install -m 0755 codegen/pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/ # until we have a newer pygobject version, we resue pygtk's codegen ln -sf ./pygtk-codegen-2.0 ${STAGING_BINDIR_NATIVE}/pygobject-codegen-2.0 diff --git a/recipes/python/python-pyyaml_svn.bb b/recipes/python/python-pyyaml_svn.bb index 0aed0b0e62..117eb9b3ff 100644 --- a/recipes/python/python-pyyaml_svn.bb +++ b/recipes/python/python-pyyaml_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.pyyaml.org" SECTION = "devel/python" LICENSE = "MIT" DEPENDS = "libyaml python-cython-native" -PV = "3.08+svnr${SRCREV}" +PV = "3.08+svnr${SRCPV}" PR = "ml0" SRC_URI = "\ diff --git a/recipes/python/python-vobject_0.8.1c.bb b/recipes/python/python-vobject_0.8.1c.bb new file mode 100644 index 0000000000..87ff6b7fdd --- /dev/null +++ b/recipes/python/python-vobject_0.8.1c.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Python package for parsing and generating vCard and vCalendar files" +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "Apache License V2.0" +HOMEPAGE = "http://vobject.skyhouseconsulting.com/" +SRCNAME = "vobject" +RDEPENDS = "python python-dateutil" +PR = "r1" + +SRC_URI = "http://vobject.skyhouseconsulting.com/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools diff --git a/recipes/python/python-webdav_0.1.2.bb b/recipes/python/python-webdav_0.1.2.bb new file mode 100644 index 0000000000..efc74f9183 --- /dev/null +++ b/recipes/python/python-webdav_0.1.2.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "This project aims to provide an object-oriented Python WebDAV client-side library\ + based on Python`s standard httplib and Greg Stein`s davlib.\ + The client shall fully support RFCs 4918 (basic specification),\ + 3744 (access control), and 3253 (versioning)." +SECTION = "devel/python" +PRIORITY = "optional" +LICENSE = "Apache License V2.0" +HOMEPAGE = "http://sourceforge.net/projects/pythonwebdavlib/" +SRCNAME = "Python_WebDAV_Library" +DEPENDS = "python" + +SRC_URI = "${SOURCEFORGE_MIRROR}/pythonwebdavlib/Python%20WebDAV%20Library%20-%20${PV}/${SRCNAME}-${PV}.zip" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit distutils diff --git a/recipes/python/python-wifi_0.3.1.bb b/recipes/python/python-wifi_0.3.1.bb new file mode 100644 index 0000000000..7461a6941e --- /dev/null +++ b/recipes/python/python-wifi_0.3.1.bb @@ -0,0 +1,18 @@ +DESCRIPTION = "Fusil is a Python library used to write fuzzing programs." +HOMEPAGE = "http://fusil.hachoir.org/" +SECTION = "devel/python" +LICENSE = "GPLv2" +SRCNAME = "python-wifi" + +SRC_URI = "http://pypi.python.org/packages/source/p/${SRCNAME}/${SRCNAME}-${PV}.tar.gz" +S = "${WORKDIR}/${SRCNAME}-${PV}" + +inherit setuptools + +RDEPENDS_${PN} = "\ + python-ctypes \ + python-datetime \ +" + + + diff --git a/recipes/python/python-wpactrl_svn.bb b/recipes/python/python-wpactrl_svn.bb index e0e8a05195..88424b2e8e 100644 --- a/recipes/python/python-wpactrl_svn.bb +++ b/recipes/python/python-wpactrl_svn.bb @@ -8,5 +8,5 @@ inherit distutils SRCREV = "383" SRC_URI = "svn://svn.otaku42.de;module=python-wpactrl;proto=http" S = "${WORKDIR}/python-wpactrl/trunk" -PV = "1.0.1+svnr${SRCREV}" +PV = "1.0.1+svnr${SRCPV}" diff --git a/recipes/qemu/qemu_svn.bb b/recipes/qemu/qemu_svn.bb index bae1855c3f..2e78d868bc 100644 --- a/recipes/qemu/qemu_svn.bb +++ b/recipes/qemu/qemu_svn.bb @@ -1,6 +1,6 @@ LICENSE = "GPL" DEPENDS = "zlib" -PV = "0.9.1+svnr${SRCREV}" +PV = "0.9.1+svnr${SRCPV}" PR = "r15" FILESPATH = "${FILE_DIRNAME}/qemu-0.9.1+svn/" diff --git a/recipes/quake/ioquake3_svn.bb b/recipes/quake/ioquake3_svn.bb index 6d79ff1b23..7a020559d2 100644 --- a/recipes/quake/ioquake3_svn.bb +++ b/recipes/quake/ioquake3_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "ioquake3 (or ioq3 for short,) aims to build upon id Software's Qu DEPENDS = "virtual/libsdl" LICENSE = "GPLv2" -PV = "1.34+svnr${SRCREV}" +PV = "1.34+svnr${SRCPV}" SRCREV="1470" SRC_URI = "svn://svn.icculus.org/quake3/;module=trunk" diff --git a/recipes/quake/quake2_svn.bb b/recipes/quake/quake2_svn.bb index a01def898d..426fab1731 100644 --- a/recipes/quake/quake2_svn.bb +++ b/recipes/quake/quake2_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL" DEPENDS = "libsdl-x11 libxxf86dga" SRCREV = "205" -PV = "0.16.1+svnr${SRCREV}" +PV = "0.16.1+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.icculus.org/quake2/;module=trunk \ diff --git a/recipes/qwo/qwo_0.5.bb b/recipes/qwo/qwo_0.5.bb new file mode 100644 index 0000000000..4db4d58182 --- /dev/null +++ b/recipes/qwo/qwo_0.5.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "qwo virtual keyboard" +AUTHOR = "Charles Clement" +HOMEPAGE = "http://www.nongnu.org/qwo/" +SECTION = "x11" +PRIORITY = "optional" +LICENSE = "GPLv2" +DEPENDS = "libxtst libxext virtual/imlib2 libconfig" +RDEPENDS += "imlib2-loaders" + +SRC_URI = "http://download.savannah.nongnu.org/releases/qwo/qwo-${PV}.tar.gz " + +inherit autotools diff --git a/recipes/remoko/remoko-server_svn.bb b/recipes/remoko/remoko-server_svn.bb index 6e24ee126a..1e17a9ec40 100644 --- a/recipes/remoko/remoko-server_svn.bb +++ b/recipes/remoko/remoko-server_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://code.google.com/p/remoko/" AUTHOR = "Valério Valério" LICENSE = "GPL" SECTION = "console/network" -PV = "0.2.1+svnr${SRCREV}" +PV = "0.2.1+svnr${SRCPV}" PE = "1" SRC_URI = "svn://remoko.googlecode.com/svn/trunk;module=BT_HID_Server;proto=http" diff --git a/recipes/remoko/remoko_svn.bb b/recipes/remoko/remoko_svn.bb index dcd152c344..8d209daf14 100644 --- a/recipes/remoko/remoko_svn.bb +++ b/recipes/remoko/remoko_svn.bb @@ -4,7 +4,7 @@ AUTHOR = "Valério Valério" LICENSE = "GPL" SECTION = "console/network" DEPENDS = "edje-native" -PV = "0.3.2+svnr${SRCREV}" +PV = "0.3.2+svnr${SRCPV}" PE = "1" SRC_URI = "svn://remoko.googlecode.com/svn/trunk;module=BT_HID_UI;proto=http" diff --git a/recipes/samsung-soc-utils/s3c2410-boot-usb-native_svn.bb b/recipes/samsung-soc-utils/s3c2410-boot-usb-native_svn.bb index d839bb81e7..b8381a2bd4 100644 --- a/recipes/samsung-soc-utils/s3c2410-boot-usb-native_svn.bb +++ b/recipes/samsung-soc-utils/s3c2410-boot-usb-native_svn.bb @@ -3,7 +3,7 @@ DEPENDS = "virtual/libusb0-native" SECTION = "devel" AUTHOR = "Harald Welte <laforge@openmoko.org>" LICENSE = "GPL" -PV = "0.1.0+svnr${SRCREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=s3c2410_boot_usb;proto=https" diff --git a/recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb b/recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb index 0a57d2c0e6..10ebf6b431 100644 --- a/recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb +++ b/recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3 SECTION = "console/utils" AUTHOR = "Werner Almesberger <werner@openmoko.org>" LICENSE = "GPL" -PV = "1.0+svnr${SRCREV}" +PV = "1.0+svnr${SRCPV}" PR = "r2" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http" diff --git a/recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb b/recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb index 92110691cf..473626fcdc 100644 --- a/recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb +++ b/recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "A user-space tool to show and modify the state of GPIOs on the S3 SECTION = "console/utils" AUTHOR = "Werner Almesberger <werner@openmoko.org>" LICENSE = "GPL" -PV = "1.0+svnr${SRCREV}" +PV = "1.0+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gpio;proto=http" diff --git a/recipes/samsung-soc-utils/sjf2410-linux-native_svn.bb b/recipes/samsung-soc-utils/sjf2410-linux-native_svn.bb index fcfbba923d..ab271223f8 100644 --- a/recipes/samsung-soc-utils/sjf2410-linux-native_svn.bb +++ b/recipes/samsung-soc-utils/sjf2410-linux-native_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "JTAG utility to interface w/ a S3C2410 device" SECTION = "devel" AUTHOR = "Harald Welte <laforge@openmoko.org>" LICENSE = "GPL" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=sjf2410-linux;proto=https" diff --git a/recipes/settings-daemon/settings-daemon_svn.bb b/recipes/settings-daemon/settings-daemon_svn.bb index 27931dcd32..de920532df 100644 --- a/recipes/settings-daemon/settings-daemon_svn.bb +++ b/recipes/settings-daemon/settings-daemon_svn.bb @@ -3,7 +3,7 @@ LICENSE = "GPL" DEPENDS = "gconf glib-2.0 gtk+" RDEPENDS = "xrdb" SECTION = "x11" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r2" diff --git a/recipes/smpeg/smpeg_svn.bb b/recipes/smpeg/smpeg_svn.bb index 656980f8cf..343e0bd2eb 100644 --- a/recipes/smpeg/smpeg_svn.bb +++ b/recipes/smpeg/smpeg_svn.bb @@ -4,7 +4,7 @@ LICENSE = "LGPL" SECTION = "libs/multimedia" DEPENDS = "virtual/libsdl" PROVIDES = "smpeg" -PV = "0.4.5+svnr${SRCREV}" +PV = "0.4.5+svnr${SRCPV}" PE = "1" SRCREV = "370" diff --git a/recipes/sms-sentry/sms-sentry.bb b/recipes/sms-sentry/sms-sentry.bb new file mode 100644 index 0000000000..be6c22c831 --- /dev/null +++ b/recipes/sms-sentry/sms-sentry.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "An SMS monitor to locate a Neo Freerunner" +SECTION = "console/network" +PRIORITY = "optional" +LICENSE = "GPL" +DEPENDS = "python" + +PR = "r1" + +SRC_URI = "http://www.handheldshell.com/software/fso/sms-sentry_1.01.tgz" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "sms-sentry.sh" +INITSCRIPT_PARAMS = "defaults 35" + +S = ${WORKDIR}/sms-sentry_1.01 + +do_install() { + install -d ${D}/${sysconfdir}/init.d + install -d ${D}/${sysconfdir}/default + install -d ${D}/usr/bin + install -m 0755 ${S}/sms-sentry.sh ${D}/${sysconfdir}/init.d/ + install -m 0755 ${S}/sms-sentry ${D}/usr/bin/ + install -m 0644 ${S}/sms-sentry.default ${D}/${sysconfdir}/default/sms-sentry.default +} + +do_configure() { + exit 0 +} + +do_compile() { + exit 0 +} + diff --git a/recipes/socketcan/socketcan-modules_svn.bb b/recipes/socketcan/socketcan-modules_svn.bb index 5bf1aff0ff..b24f45640f 100644 --- a/recipes/socketcan/socketcan-modules_svn.bb +++ b/recipes/socketcan/socketcan-modules_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://developer.berlios.de/projects/socketcan/" SECTION = "kernel/modules" LICENSE = "GPL" DEPENDS = "virtual/kernel" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.berlios.de/socketcan;module=trunk;proto=svn" diff --git a/recipes/socketcan/socketcan-utils-test_svn.bb b/recipes/socketcan/socketcan-utils-test_svn.bb index 23b1c5ad08..4a3d52dfca 100644 --- a/recipes/socketcan/socketcan-utils-test_svn.bb +++ b/recipes/socketcan/socketcan-utils-test_svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://developer.berlios.de/projects/socketcan/" SECTION = "console/utils" LICENSE = "GPL" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" SRC_URI = "svn://svn.berlios.de/socketcan;module=trunk;proto=svn \ file://autotoolize.patch;patch=1;pnum=0 \ diff --git a/recipes/sphyrna/sphyrna-python_svn.bb b/recipes/sphyrna/sphyrna-python_svn.bb index 011c496fe4..a78a1d1aba 100644 --- a/recipes/sphyrna/sphyrna-python_svn.bb +++ b/recipes/sphyrna/sphyrna-python_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Sphyrna - Hammerhead Reverse Engineering" HOMEPAGE = "http://projects.linuxtogo.org/projects/sphyrna" LICENSE = "GPLv2" DEPENDS = "readline" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://projects.linuxtogo.org/svn;module=sphyrna" diff --git a/recipes/tangogps/tangogps_0.9.9.bb b/recipes/tangogps/tangogps_0.9.9.bb new file mode 100644 index 0000000000..18f6acaa1b --- /dev/null +++ b/recipes/tangogps/tangogps_0.9.9.bb @@ -0,0 +1,2 @@ +require tangogps.inc +PR = "r0" diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb new file mode 100644 index 0000000000..08d15adbbe --- /dev/null +++ b/recipes/tasks/task-shr-feed.bb @@ -0,0 +1,242 @@ +DESCRIPTION = "SHR Feed" +PR = "r25" +PV = "1.0" +LICENSE = "GPL" + +inherit task + +RDEPENDS_${PN} += "\ + python-elementary \ + openmoko-agpsui \ + mc \ + mplayer \ + x11vnc \ + omview \ + openvpn \ + navit \ + pythm \ + fbreader \ + omoney \ + enotes \ + epdfview \ + pyphonelog \ + pingus \ + openmoocow \ + dosbox \ + vagalume \ + python-pygame \ + mokoko \ + exhibit \ + edje-viewer \ + obexpush \ + obexftp \ + mtpaint \ + telepathy-python \ + intone-video \ + ipkg-link \ + ipkg-utils \ + mysql \ + gpe-calendar \ + gpe-todo \ + gpe-scap \ + gpe-sketchbook \ + gpe-filemanager \ + gpe-gallery \ + gpe-timesheet \ + gpe-contacts \ + fltk-chess \ + remoko \ +# shr-config \ + shr-today \ + shr-theme-neo \ + shr-theme-niebiee \ + shr-theme-sixteen \ +# gry should be in image already +# shr-theme-gry \ + shr-splash \ + shr-splash-theme-simple \ + shr-splash-theme-dontpanic \ + shr-splash-theme-handy \ + openbmap-logger \ + pisi \ + ffalarms \ + libnotify \ + accelges \ + ebrainy \ + sms-sentry \ + cellhunter \ + dillo2 \ + usbmode \ + pyefl-sudoku \ + tasks \ + dates \ + omnewrotate \ + xchat \ + python-pyid3lib \ +# libframeworkd-phonegui-efl2 \ + intone \ + vim \ + vpnc \ + emacs \ + mcabber \ + gdb \ + oh-puzzles \ + links-x11 \ + e-wm-illume-dict-pl \ + callrec \ + dictator \ + midori \ + numptyphysics \ + pidgin \ + libpurple-protocol-msn \ + libpurple-protocol-icq \ + vagalume \ + ppp \ + bluez-hcidump \ + kbdd \ + kexec-tools \ + claws-mail \ + claws-plugin-mailmbox \ +# claws-plugin-gtkhtml2-viewer \ + claws-plugin-rssyl \ + mc \ + iotop \ + xprop \ + xev \ + xwininfo \ + tcpdump \ + lsof \ + zsh \ + gzip \ + zip \ + microcom \ + minicom \ + leafpad \ + abiword \ + aspell \ + enchant \ + joe \ + nano \ + ntpclient \ + ntp \ + tor \ + vnc \ +# gpsdrive \ + wxwidgets \ + x11vnc \ + xf86-video-glamo \ +# libswt3.4-gtk-java \ + cacao \ +# jamvm \ + dbus-x11 \ + bluez-utils-alsa \ + python-pybluez \ + xournal \ + evince \ +# asterisk \ + git \ + ruby \ + orrery \ + synergy \ + irssi \ + zhone \ + paroli \ + cu \ + net-tools \ + iproute2 \ + iputils \ + i2c-tools \ + psmisc \ + debianutils \ + tcptraceroute \ + task-proper-tools \ + wmiconfig \ + netkit-telnet \ + bind-utils \ + bubble-keyboard \ + intuition \ + gridpad \ +# essential-dialer \ + font-adobe-100dpi \ + font-adobe-75dpi \ + font-adobe-utopia-100dpi \ + font-adobe-utopia-75dpi \ +# font-adobe-utopia-type1 \ + font-arabic-misc \ + font-bh-100dpi \ + font-bh-75dpi \ + font-bh-lucidatypewriter-100dpi \ + font-bh-lucidatypewriter-75dpi \ +# font-bh-ttf \ +# font-bh-type1 \ + font-bitstream-100dpi \ + font-bitstream-75dpi \ + font-bitstream-speedo \ +# font-bitstream-type1 \ + font-cronyx-cyrillic \ + font-cursor-misc \ + font-daewoo-misc \ + font-dec-misc \ +# font-ibm-type1 \ + font-isas-misc \ + font-jis-misc \ + font-micro-misc \ + font-misc-cyrillic \ +# font-misc-ethiopic \ +# font-misc-meltho \ + font-misc-misc \ + font-mutt-misc \ + font-schumacher-misc \ + font-screen-cyrillic \ + font-sony-misc \ + font-sun-misc \ + font-winitzki-cyrillic \ +# font-xfree86-type1 \ +# msn-pecan \ + erminig \ + qwo \ + fso-apm \ + fso-abyss \ + fsousaged \ + fsodeviced \ + fsonetworkd \ + fsotimed \ + opimd-utils \ + omgps \ + shr-launcher \ + e-tasks \ + elmdentica \ + shr-installer \ + eject \ + illume-keyboard-german \ + illume-keyboard-arabic \ + illume-keyboard-browse \ + illume-keyboard-danish \ + illume-keyboard-default-alt \ + illume-keyboard-dutch \ + illume-keyboard-dvorak \ + illume-keyboard-french \ + illume-keyboard-hebrew \ + illume-keyboard-numeric-alt \ + illume-keyboard-russian-terminal \ + illume-keyboard-russian \ + python-xlib \ + xcompmgr \ + man \ + man-pages \ + aceofpenguins-launcher \ + om-neon \ + ipython \ + phoneme-advanced-foundation \ + eve \ + python-pybluez \ + x11perf \ + pyring \ + bt-configure \ + bt-gps \ + advancedcaching \ + glamo-dri-tests \ + reiserfsprogs \ + blipomoko \ + imagemagick \ +" diff --git a/recipes/tasks/task-shr-minimal.bb b/recipes/tasks/task-shr-minimal.bb new file mode 100644 index 0000000000..9b5ae8ccd7 --- /dev/null +++ b/recipes/tasks/task-shr-minimal.bb @@ -0,0 +1,149 @@ +DESCRIPTION = "SHR Lite Image Feed" +PR = "r15" +PV = "2.0" +LICENSE = "GPL" + +inherit task + +def get_rdepends(bb, d): + enabled = bb.data.getVar("ENABLE_BINARY_LOCALE_GENERATION", d, 1) + + # If locale is disabled, bail out + if not enabled: + return + + locales = bb.data.getVar("GLIBC_GENERATE_LOCALES", d, 1) + if not locales or locales == "all": + locales = bb.data.getVar("IMAGE_LINGUAS", d, 1); + + libc = bb.data.getVar('LIBC', d, 1) + import re + + rdepends = "" + if not locales or locales == "all": + # if locales aren't specified, or user has written "all" + import os + ipkdir = bb.data.getVar('DEPLOY_DIR_IPK', d, 1) + + regexp1 = re.compile(libc+"-binary-localedata-.*") # search pattern + regexp2 = re.compile("_.*") # we want to remove all version info and file extension + + for root, subFolders, files in os.walk(ipkdir): + for file in files: + if regexp1.search(file): + file = regexp2.sub("", file) + rdepends = "%s %s" % (rdepends, file) + + else: + # if locales are specified + regexp1 = re.compile("\\..*") # We want to turn en_US.UTF-8 into en_US + regexp2 = re.compile("_") # We want to turn en_US into en-US + + + for locale in locales.split(" "): + locale = regexp1.sub("", locale) + locale = regexp2.sub("-", locale) + locale = str.lower(locale) + rdepends = "%s %s-binary-localedata-%s" % (rdepends, libc, locale) + return rdepends + + + + +PACKAGES += "\ + ${PN}-base \ + ${PN}-cli \ + ${PN}-fso \ + ${PN}-audio \ + ${PN}-x \ + ${PN}-apps \ + ${PN}-gtk \ +" + + + +RDEPENDS_${PN}-base = "\ + netbase \ + sysfsutils \ + modutils-initscripts \ + module-init-tools-depmod \ + rsync \ + screen \ + fbset \ + fbset-modes \ + openssh-sftp-server \ + cron \ + logrotate\ + util-linux-ng-fdisk \ + shr-splash \ +" + +RDEPENDS_${PN}-cli = "\ + screen \ + nano \ + iptables \ + mtd-utils \ + s3c24xx-gpio \ + mickeydbus \ + mickeyterm \ +" + +RDEPENDS_${PN}-fso = "\ + fsoraw \ + opimd-utils-cli \ + python-codecs \ + python-gst \ +" + + +RDEPENDS_${PN}-audio = "\ + alsa-utils-aplay \ + alsa-utils-amixer \ +" + +RDEPENDS_${PN}-audio_append_om-gta01 = "\ + alsa-scenarii-shr \ +" + +RDEPENDS_${PN}-audio_append_om-gta02 = "\ + alsa-scenarii-shr \ +" + +RDEPENDS_${PN}-x = "\ + glibc-utils \ + glibc-charmap-utf-8 \ + e-wm-config-illume-shr \ + shr-theme-gry \ + etk-theme-shr \ + ${@get_rdepends(bb, d)} \ + libx11-locale \ + libmokoui2 \ + xcursor-transparent-theme \ +" + +RDEPENDS_${PN}-apps = "\ + fso-abyss \ + phoneui-apps-messages \ + phoneui-apps-contacts \ + phoneui-apps-dialer \ + phonefsod \ + phoneuid \ + libphone-ui \ + libphone-ui-shr \ + ffalarms \ + shr-settings \ + shr-theme \ + shr-today \ + calc \ +" + + +RDEPENDS_${PN}-gtk = "\ + openmoko-icon-theme-standard2 \ + shr-theme-gtk-e17lookalike \ + vala-terminal \ + tangogps \ + pyphonelog \ + matchbox-keyboard-im \ +" + diff --git a/recipes/tasks/task-shr.bb b/recipes/tasks/task-shr.bb new file mode 100644 index 0000000000..25e1b170c3 --- /dev/null +++ b/recipes/tasks/task-shr.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "SHR Fat Image Feed" +PR = "r3" +PV = "2.0" +LICENSE = "GPL" + +inherit task + +PACKAGES = "\ + ${PN}-gtk \ + ${PN}-apps \ + ${PN}-games \ +" + +RDEPENDS_${PN}-gtk = "\ + gpe-scap \ + pidgin \ + libpurple-protocol-msn \ + libpurple-protocol-icq \ + vagalume \ + gpe-sketchbook \ +" + +RDEPENDS_${PN}-apps += "\ + task-shr-minimal-apps \ + opimd-utils-notes \ + mokonnect \ + midori \ + intone \ +" + +RDEPENDS_${PN}-games += "\ + mokomaze \ + numptyphysics \ +" + diff --git a/recipes/ti/bitblit_svn.bb b/recipes/ti/bitblit_svn.bb index dc3722c008..f813b31f06 100644 --- a/recipes/ti/bitblit_svn.bb +++ b/recipes/ti/bitblit_svn.bb @@ -13,7 +13,7 @@ SRC_URI = "svn://gforge.ti.com/svn/${PN};module=trunk;proto=https;user=anonymous " # Again, no '.' in PWD allowed :( -PV = "0+svnr${SRCREV}" +PV = "0+svnr${SRCPV}" PR = "r1" S = "${WORKDIR}/trunk/bitblit" diff --git a/recipes/tinymail/libtinymail_svn.bb b/recipes/tinymail/libtinymail_svn.bb index 06cc447af5..1aa7931206 100644 --- a/recipes/tinymail/libtinymail_svn.bb +++ b/recipes/tinymail/libtinymail_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "TinyMail is an attempt to create an E-mail framework for mobile d SECTION = "x11/utils" LICENSE = "LGPL" DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf libgnomeui" -PV = "0.0.5+svnr${SRCREV}" +PV = "0.0.5+svnr${SRCPV}" PR = "r4" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/tinymail/tmut_svn.bb b/recipes/tinymail/tmut_svn.bb index 11fcb0a1f0..2eb7b8d69d 100644 --- a/recipes/tinymail/tmut_svn.bb +++ b/recipes/tinymail/tmut_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Tmut is a really small E-Mail client based on Tinymail" SECTION = "x11/utils" LICENSE = "LGPL" DEPENDS = "gtk+ glib-2.0 gnome-vfs gconf libtinymail" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r3" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/tslib/tslib_svn.bb b/recipes/tslib/tslib_svn.bb index e65f715110..77127c7fc1 100644 --- a/recipes/tslib/tslib_svn.bb +++ b/recipes/tslib/tslib_svn.bb @@ -1,6 +1,6 @@ SRC_URI = "svn://svn.berlios.de/tslib/trunk;module=tslib" S = "${WORKDIR}/tslib" -PV = "1.0+svnr${SRCREV}" +PV = "1.0+svnr${SRCPV}" PR = "${INC_PR}.1" DEFAULT_PREFERENCE = "-1" diff --git a/recipes/u-boot/u-boot-bug_svn.bb b/recipes/u-boot/u-boot-bug_svn.bb index c1930f4889..485cfd86b0 100644 --- a/recipes/u-boot/u-boot-bug_svn.bb +++ b/recipes/u-boot/u-boot-bug_svn.bb @@ -2,7 +2,7 @@ DESCRIPTION = "U-boot bootloader w/ BUG support" LICENSE = "GPL" SECTION = "bootloader" PRIORITY = "optional" -PV = "1.3.2+svnr${SRCREV}" +PV = "1.3.2+svnr${SRCPV}" SRCREV = "${AUTOREV}" PR = "r6" diff --git a/recipes/uclibc/bfin-uclibc_svn.bb b/recipes/uclibc/bfin-uclibc_svn.bb index e5123ad56e..80efd2610f 100644 --- a/recipes/uclibc/bfin-uclibc_svn.bb +++ b/recipes/uclibc/bfin-uclibc_svn.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.29" -PV = "${UCLIBC_BASE}+svnr${SRCREV}" +PV = "${UCLIBC_BASE}+svnr${SRCPV}" require uclibc.inc PR = "${INC_PR}.0" diff --git a/recipes/uclibc/elf2flt_svn.bb b/recipes/uclibc/elf2flt_svn.bb index 3af893a7a8..e16da367ae 100644 --- a/recipes/uclibc/elf2flt_svn.bb +++ b/recipes/uclibc/elf2flt_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Elf2flt is a wrapper around the linker for uclinux platforms" DEPENDS = "binutils-cross" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" inherit autotools cross diff --git a/recipes/usbpath/usbpath_svn.bb b/recipes/usbpath/usbpath_svn.bb index d21d320a7d..16e7b0e4ef 100644 --- a/recipes/usbpath/usbpath_svn.bb +++ b/recipes/usbpath/usbpath_svn.bb @@ -4,7 +4,7 @@ SECTION = "console/utils" LICENSE = "GPL" DEPENDS = "virtual/libusb0" -PV = "0.0+svnr${SRCREV}" +PV = "0.0+svnr${SRCPV}" SRC_URI = "svn://svn.openmoko.org/trunk/src/host;module=usbpath;proto=http" diff --git a/recipes/webif/webif_svn.bb b/recipes/webif/webif_svn.bb index 8e84293c2d..f5c8d8aa5d 100644 --- a/recipes/webif/webif_svn.bb +++ b/recipes/webif/webif_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Web interface" LICENSE = "GPL" -PV = "0.0.3+svnr${SRCREV}" +PV = "0.0.3+svnr${SRCPV}" SRCREV = "4737" SRC_URI = "svn://x-wrt.googlecode.com/svn;module=trunk;proto=http" diff --git a/recipes/webkit/webkit-efl_git.bb b/recipes/webkit/webkit-efl_git.bb new file mode 100644 index 0000000000..42d6fc8c4c --- /dev/null +++ b/recipes/webkit/webkit-efl_git.bb @@ -0,0 +1,23 @@ +DESCRIPTION = " Webkit browser engine, EFL edition" +LICENSE = "GPL" +PV="0.1+gitr${SRCREV}" +PR="r1" + +DEPENDS = "icu flex gst-plugins-base gstreamer jpeg libpng libxml2 pango \ + libsoup-2.4 eina ecore evas edje cairo fontconfig freetype curl \ + sqlite3 libxslt gperf-native libxt" + +SRC_URI = "git://gitorious.org/webkit-efl/webkit-efl.git;protocol=git;branch=master" + +S= "${WORKDIR}/git" + +inherit autotools lib_package pkgconfig + +EXTRA_OECONF = "--disable-video --host=${TARGET_SYS} --with-port=efl --enable-web-workers=no" + +do_stage() { + autotools_stage_all +} + +PACKAGES =+ "${PN}-webinspector" +FILES_${PN}-webinspector = "${datadir}/webkit-1.0/webinspector/" diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb index 48d1bd8aad..96f47f1663 100644 --- a/recipes/webkit/webkit-gtk_svn.bb +++ b/recipes/webkit/webkit-gtk_svn.bb @@ -4,7 +4,7 @@ DEPENDS = "enchant gtk-doc-native gtk-doc gnome-keyring libsoup-2.4 curl icu lib SRCREV_FORMAT = "webcore-rwebkit" SRCREV = "50081" -PV = "1.1.16+svnr${SRCREV}" +PV = "1.1.16+svnr${SRCPV}" SRC_URI = "\ svn://svn.webkit.org/repository/webkit/trunk/;module=JavaScriptCore;proto=http \ diff --git a/recipes/webkit/webkit.inc b/recipes/webkit/webkit.inc index 087115de09..de18cafecb 100644 --- a/recipes/webkit/webkit.inc +++ b/recipes/webkit/webkit.inc @@ -5,7 +5,7 @@ SRCREV_FORMAT = "webcore-rwebkit" PACKAGES =+ "${PN}launcher-dbg ${PN}launcher" # Yes, this is wrong... -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" inherit qmake2 pkgconfig diff --git a/recipes/wlan-ng/wlan-ng-modules_svn.bb b/recipes/wlan-ng/wlan-ng-modules_svn.bb index c455181c6b..f62ab3734a 100644 --- a/recipes/wlan-ng/wlan-ng-modules_svn.bb +++ b/recipes/wlan-ng/wlan-ng-modules_svn.bb @@ -2,7 +2,7 @@ require wlan-ng-modules.inc PR = "r0" -PV = "0.2.8+svnr${SRCREV}" +PV = "0.2.8+svnr${SRCPV}" SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk " diff --git a/recipes/wlan-ng/wlan-ng-utils_svn.bb b/recipes/wlan-ng/wlan-ng-utils_svn.bb index 096ac22055..bc02eb71a7 100644 --- a/recipes/wlan-ng/wlan-ng-utils_svn.bb +++ b/recipes/wlan-ng/wlan-ng-utils_svn.bb @@ -2,7 +2,7 @@ require wlan-ng-utils.inc PR = "r0" -PV = "0.2.8+svnr${SRCREV}" +PV = "0.2.8+svnr${SRCPV}" SRC_URI += "svn://svn.shaftnet.org/linux-wlan-ng;module=trunk \ file://scripts-makefile-hostcc.patch;patch=1 \ diff --git a/recipes/wmiconfig/wmiconfig_svn.bb b/recipes/wmiconfig/wmiconfig_svn.bb index 643b2a34aa..e1138adc4e 100644 --- a/recipes/wmiconfig/wmiconfig_svn.bb +++ b/recipes/wmiconfig/wmiconfig_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Atheros 6K Wifi configuration utility" LICENSE = "GPL" SECTION = "console/network" -PV = "0.0.0+svnr${SRCREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=AR6kSDK.build_sw.18;proto=http" diff --git a/recipes/xoo/xoo_svn.bb b/recipes/xoo/xoo_svn.bb index e9cd7ee9b7..efceab433a 100644 --- a/recipes/xoo/xoo_svn.bb +++ b/recipes/xoo/xoo_svn.bb @@ -4,7 +4,7 @@ It is intended for embedded developers that want to simulate a target device \ HOMEPAGE = "http://projects.o-hand.com/xoo" LICENSE = "GPL" DEPENDS = "virtual/libx11 libxtst gtk+ libglade expat" -PV = "0.7+svnr${SRCREV}" +PV = "0.7+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://svn.o-hand.com/repos/matchbox/trunk;module=Xoo;proto=http \ diff --git a/recipes/xorg-util/glamo-dri-tests/glamo-dri-tests_git.bb b/recipes/xorg-util/glamo-dri-tests/glamo-dri-tests_git.bb new file mode 100644 index 0000000000..0e6d731bb2 --- /dev/null +++ b/recipes/xorg-util/glamo-dri-tests/glamo-dri-tests_git.bb @@ -0,0 +1,17 @@ +DEPENDS = "libdrm virtual/libx11 libxext" + +PV = "1.0.0+gitr${SRCPV}" + +SRC_URI = "git://git.bitwiz.org.uk/glamo-dri-tests.git;protocol=git;branch=master" + +inherit pkgconfig + +do_compile_prepend() { + export CROSS_CFLAGS=`pkg-config --cflags libdrm_glamo` +} + +do_install() { + PREFIX=${D}/usr make install +} + +S = "${WORKDIR}/git" diff --git a/recipes/xorg-xserver/xserver-xorg-conf/bug/xorg.conf b/recipes/xorg-xserver/xserver-xorg-conf/bug/xorg.conf new file mode 100644 index 0000000000..8b6cd94ab6 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg-conf/bug/xorg.conf @@ -0,0 +1,65 @@ +# +# Initial version of X11 configuration for BugLabs BUG device. +# +# Up to 2 LCD modules are supported (as DISPLAY=0.0/0.1). +# Touchscreen on first screen works properly (req tslib 0.0.6 driver). +# +# By default software starts on 0.0 only. +# + +Section "Monitor" + Identifier "Monitor 1" +EndSection + +Section "Monitor" + Identifier "Monitor 2" +EndSection + +Section "Device" + Identifier "fbdev Device 2" + Driver "fbdev" + Option "fbdev" "/dev/fb2" + Option "shadowfb" "true" +EndSection + +Section "Device" + Identifier "fbdev Device 1" + Driver "fbdev" + Option "fbdev" "/dev/fb1" + Option "shadowfb" "true" +EndSection + +Section "Screen" + Identifier "fbdev Screen 2" + Device "fbdev Device 2" + Monitor "Monitor 2" +EndSection + +Section "Screen" + Identifier "fbdev Screen 1" + Device "fbdev Device 1" + Monitor "Monitor 1" +EndSection + +Section "ServerLayout" + Identifier "Layout" + Screen "fbdev Screen 1" + Screen "fbdev Screen 2" Below "fbdev Screen 1" + InputDevice "ts4" "CorePointer" +EndSection + +Section "InputDevice" + Identifier "ts5" + Driver "tslib" + Option "Device" "/dev/input/bmi_lcd_ts5" +EndSection + +Section "InputDevice" + Identifier "ts4" + Driver "tslib" + Option "Device" "/dev/input/bmi_lcd_ts4" +EndSection + +Section "ServerFlags" + Option "AutoAddDevices" "false" +EndSection diff --git a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb index 7a8e6e96c5..8945e1e8f1 100644 --- a/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb +++ b/recipes/xorg-xserver/xserver-xorg-conf_0.1.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Machine specific xorg.conf files" -PR = "r15" +PR = "r16" SRC_URI = "file://xorg.conf" |