diff options
132 files changed, 1018 insertions, 307 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 47df06329b..f55ae2c2ae 100644 --- a/classes/gconf.bbclass +++ b/classes/gconf.bbclass @@ -32,10 +32,10 @@ fi python populate_packages_append () { import os.path, re packages = bb.data.getVar('PACKAGES', d, 1).split() - workdir = bb.data.getVar('WORKDIR', d, 1) + pkgdest = bb.data.getVar('PKGDEST', d, 1) for pkg in packages: - schema_dir = '%s/install/%s/etc/gconf/schemas' % (workdir, 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 ea1fdff3dd..524c2f0c46 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -27,12 +27,11 @@ done } python populate_packages_append () { - import os.path packages = bb.data.getVar('PACKAGES', d, 1).split() - workdir = bb.data.getVar('WORKDIR', d, 1) + pkgdest = bb.data.getVar('PKGDEST', d, 1) for pkg in packages: - icon_dir = '%s/install/%s/%s/icons' % (workdir, 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 724fb23713..2416c1466f 100644 --- a/classes/mime.bbclass +++ b/classes/mime.bbclass @@ -27,10 +27,10 @@ fi python populate_packages_append () { import os.path, re packages = bb.data.getVar('PACKAGES', d, 1).split() - workdir = bb.data.getVar('WORKDIR', d, 1) + pkgdest = bb.data.getVar('PKGDEST', d, 1) for pkg in packages: - mime_dir = '%s/install/%s/usr/share/mime/packages' % (workdir, 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 013f22dead..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) @@ -151,12 +146,11 @@ staging_helper () { done echo "dest root /" >> $conffile fi - if [ ! -e ${TMPDIR}${libdir}/opkg/info/ ]; then - mkdir -p ${TMPDIR}${libdir}/opkg/info/ + if [ ! -e ${TMPDIR}${libdir_native}/opkg/info/ ]; then + mkdir -p ${TMPDIR}${libdir_native}/opkg/info/ fi - if [ ! -e ${TMPDIR}${libdir}/ipkg/ ]; then - cd ${TMPDIR}${libdir}/ - ln -sf opkg/ ipkg || true + if [ ! -e ${TMPDIR}${libdir_native}/ipkg/ ]; then + ln -sf opkg/ ${TMPDIR}${libdir_native}/ipkg || true fi } @@ -165,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 @@ -244,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_' @@ -337,20 +326,20 @@ staging_packager () { staging_package_installer () { #${PSTAGE_INSTALL_CMD} ${PSTAGE_PKG} - STATUSFILE=${TMPDIR}${libdir}/opkg/status + STATUSFILE=${TMPDIR}${libdir_native}/opkg/status echo "Package: ${PSTAGE_PKGPN}" >> $STATUSFILE echo "Version: ${PSTAGE_PKGVERSION}" >> $STATUSFILE echo "Status: install user installed" >> $STATUSFILE echo "Architecture: ${PSTAGE_PKGARCH}" >> $STATUSFILE echo "" >> $STATUSFILE - CTRLFILE=${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.control + CTRLFILE=${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.control echo "Package: ${PSTAGE_PKGPN}" > $CTRLFILE echo "Version: ${PSTAGE_PKGVERSION}" >> $CTRLFILE echo "Architecture: ${PSTAGE_PKGARCH}" >> $CTRLFILE cd ${PSTAGE_TMPDIR_STAGE} - find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir}/opkg/info/${PSTAGE_PKGPN}.list + find -type f | grep -v ./CONTROL | sed -e 's/^\.//' > ${TMPDIR}${libdir_native}/opkg/info/${PSTAGE_PKGPN}.list } python do_package_stage () { 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 de85d2b17b..8252329fd5 100644 --- a/conf/checksums.ini +++ b/conf/checksums.ini @@ -14582,6 +14582,10 @@ sha256=448a4e35a8685b60829d1b51b498e2a6e4107549fd0458fa17dcc801d29d5f72 md5=d8ca3192867c98669bd7d6a41ed26b09 sha256=2cbce6d32c31c53df3e3f6fdd9d74c81b02ca1295598acd56061effa2b299b65 +[http://launchpad.net/libfreespace/0.4/0.4/+download/libfreespace-0.4.tar.gz] +md5=96a081e3b7fe2337344b8adc61259eb4 +sha256=cc1e5f6751e27b2f403e85d394312c283b74f55e095c8ed8a3327a23549263de + [http://www.intra2net.com/de/produkte/opensource/ftdi/TGZ/libftdi-0.13.tar.gz] md5=7b4a660fd644980f3d45873d156d021a sha256=98ceb0a3174564f310c4ff1c021bdca52558bf693003a410cdb95c8388aa11f3 @@ -16346,6 +16350,10 @@ sha256=510b9c7339e878324066ec1cb74c0f67d5df858065155a3239999ff911257d45 md5=dc8865eaff167aabe78e5799762b8067 sha256=9f5737019f3e4c14f68a2f829deb690330e89b634d1337683e453b94137669f1 +[http://downloads.sourceforge.net/libusb/libusb-1.0.4.tar.bz2] +md5=a1f2206f1b4bd800e2461157faaa887f +sha256=6de182e93c946d432ed04362f0b93d889072438448dad20a21d4fcfa34cffa1d + [http://downloads.sourceforge.net/libusb/libusb-compat-0.1.0-beta1.tar.bz2] md5=3d9f7c3966d24c6e2d58becac96e4e27 sha256=9365108d71cecb78055de4df6eeb2fadf0fe9143ef105bcb6934dcf391983a49 @@ -18302,6 +18310,10 @@ sha256=3b0e4a2c5c3e4457ce8f44e6cbb9f14ddfb66a515017b430f4f4484893e8ce9d md5=805e2e59a93a0a4b7652d6547b2bd923 sha256=97c79d20807899bad4b241385c7cbf3a4f85d2673b1b6c12059878450e3e971a +[http://archive.xfce.org/src/apps/midori/0.2/midori-0.2.1.tar.bz2] +md5=3cee94c9a22316504a3ba99bc92e0245 +sha256=7d79a45331cfcf002ccd5a386b5597f91e0ee048b2b040a57c6faebc02bba79c + [http://git.xfce.org/kalikiana/midori/snapshot/midori-abbfc163a39d7f1f01725fe2cfe3df516f9fa0f4.tar.bz2] md5=d50f0a9683dee60685bcd48e04970949 sha256=c5eb824148935697cf4fc36f11cfd7a05fbe6a3392d8f32e296e2cdfd21de3ee diff --git a/conf/distro/include/slugos.inc b/conf/distro/include/slugos.inc index 903e5ed602..8a331ae7f2 100644 --- a/conf/distro/include/slugos.inc +++ b/conf/distro/include/slugos.inc @@ -143,6 +143,9 @@ SRCDATE_ipkg-utils-native ?= "20060106" SRCDATE_ipkg-link ?= "20060106" SRCDATE_irssi ?= "20050930" +# We want the newer util-linux package +PREFERRED_PROVIDER_util-linux ?= "util-linux-ng" + # we don't ship gtk-directfb by default PREFERRED_PROVIDER_gtk+ ?= "gtk+" PREFERRED_PROVIDER_gdk-pixbuf-loader-ani ?= "gtk+" 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/docs/usermanual/chapters/getting_oe.xml b/docs/usermanual/chapters/getting_oe.xml index 4ec5fecb1f..c71f32d5ae 100644 --- a/docs/usermanual/chapters/getting_oe.xml +++ b/docs/usermanual/chapters/getting_oe.xml @@ -31,7 +31,7 @@ $ <command>cd</command> $OEBASE</screen> </para> <para>The <varname>$OEBASE</varname> will also contain both of the - <literal>bitbake/<literal> and <literal>openembedded/</literal> directories. + <literal>bitbake/</literal> and <literal>openembedded/</literal> directories. These will be discussed in <xref linkend="gettingoe_getting_bitbake"/> and <xref linkend="gettingoe_getting_oe"/>. </para> diff --git a/recipes/efl1/illume-keyboard-arabic_git.bb b/recipes/efl1/illume-keyboard-arabic_git.bb index 41ea9e1cd4..900c745fe5 100644 --- a/recipes/efl1/illume-keyboard-arabic_git.bb +++ b/recipes/efl1/illume-keyboard-arabic_git.bb @@ -1,6 +1,7 @@ AUTHOR = "Mohammad Fahmi / Tom Hacohen" DESCRIPTION = "Illume keyboard with arabic layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "arabic" diff --git a/recipes/efl1/illume-keyboard-browse_git.bb b/recipes/efl1/illume-keyboard-browse_git.bb index 268140c75a..4eda497c4c 100644 --- a/recipes/efl1/illume-keyboard-browse_git.bb +++ b/recipes/efl1/illume-keyboard-browse_git.bb @@ -1,6 +1,7 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with a layout optimized for browsing" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "browse" diff --git a/recipes/efl1/illume-keyboard-danish_git.bb b/recipes/efl1/illume-keyboard-danish_git.bb index 21f8ff954a..5a042d9c6b 100644 --- a/recipes/efl1/illume-keyboard-danish_git.bb +++ b/recipes/efl1/illume-keyboard-danish_git.bb @@ -1,6 +1,7 @@ AUTHOR = "Esben Damgaard" DESCRIPTION = "Illume keyboard with danish layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "danish" diff --git a/recipes/efl1/illume-keyboard-default-alt_git.bb b/recipes/efl1/illume-keyboard-default-alt_git.bb index 34c3c299bb..f367f11f79 100644 --- a/recipes/efl1/illume-keyboard-default-alt_git.bb +++ b/recipes/efl1/illume-keyboard-default-alt_git.bb @@ -1,6 +1,7 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with an alternative default layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "default-alt" diff --git a/recipes/efl1/illume-keyboard-dutch_git.bb b/recipes/efl1/illume-keyboard-dutch_git.bb index 2300ac7101..2eb137db85 100644 --- a/recipes/efl1/illume-keyboard-dutch_git.bb +++ b/recipes/efl1/illume-keyboard-dutch_git.bb @@ -1,6 +1,7 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with dutch layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "dutch" diff --git a/recipes/efl1/illume-keyboard-dvorak_git.bb b/recipes/efl1/illume-keyboard-dvorak_git.bb index 795d78dcc7..dd6b96c31e 100644 --- a/recipes/efl1/illume-keyboard-dvorak_git.bb +++ b/recipes/efl1/illume-keyboard-dvorak_git.bb @@ -1,6 +1,7 @@ AUTHOR = "Gabor Adam TOTH" DESCRIPTION = "Illume keyboard with dvorak layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "dvorak" diff --git a/recipes/efl1/illume-keyboard-french_git.bb b/recipes/efl1/illume-keyboard-french_git.bb index 205a6ad991..8c8041a9b1 100644 --- a/recipes/efl1/illume-keyboard-french_git.bb +++ b/recipes/efl1/illume-keyboard-french_git.bb @@ -1,5 +1,6 @@ DESCRIPTION = "Illume keyboard with french layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "french" diff --git a/recipes/efl1/illume-keyboard-german_git.bb b/recipes/efl1/illume-keyboard-german_git.bb index 0252932116..a1ad5481df 100644 --- a/recipes/efl1/illume-keyboard-german_git.bb +++ b/recipes/efl1/illume-keyboard-german_git.bb @@ -1,6 +1,7 @@ AUTHOR = "Florian Hackenberger" DESCRIPTION = "Illume keyboard with german layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "german" diff --git a/recipes/efl1/illume-keyboard-hebrew_git.bb b/recipes/efl1/illume-keyboard-hebrew_git.bb index 8d408b4a91..e7cda399f2 100644 --- a/recipes/efl1/illume-keyboard-hebrew_git.bb +++ b/recipes/efl1/illume-keyboard-hebrew_git.bb @@ -1,6 +1,7 @@ AUTHOR = "Tom Hacohen" DESCRIPTION = "Illume keyboard with hebrew layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "hebrew" diff --git a/recipes/efl1/illume-keyboard-numeric-alt_git.bb b/recipes/efl1/illume-keyboard-numeric-alt_git.bb index f2d2487386..92090d925d 100644 --- a/recipes/efl1/illume-keyboard-numeric-alt_git.bb +++ b/recipes/efl1/illume-keyboard-numeric-alt_git.bb @@ -1,6 +1,7 @@ AUTHOR = "Pander" DESCRIPTION = "Illume keyboard with an alternative numeric layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "numeric-alt" diff --git a/recipes/efl1/illume-keyboard-russian-terminal_git.bb b/recipes/efl1/illume-keyboard-russian-terminal_git.bb index f0a4508d98..7b126bbf09 100644 --- a/recipes/efl1/illume-keyboard-russian-terminal_git.bb +++ b/recipes/efl1/illume-keyboard-russian-terminal_git.bb @@ -1,6 +1,7 @@ AUTHOR = "lucky" DESCRIPTION = "Illume keyboard with russian layout for the Terminal" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "russian-terminal" diff --git a/recipes/efl1/illume-keyboard-russian_git.bb b/recipes/efl1/illume-keyboard-russian_git.bb index 517956bb2b..c067871848 100644 --- a/recipes/efl1/illume-keyboard-russian_git.bb +++ b/recipes/efl1/illume-keyboard-russian_git.bb @@ -1,6 +1,7 @@ AUTHOR = "lucky" DESCRIPTION = "Illume keyboard with russian layout" -PV = "0.0-gitr${SRCREV}" +PV = "0.0+gitr${SRCPV}" +PE = "1" PR = "r0" BASEDIR = "russian" diff --git a/recipes/fbreader/fbreader_0.10.7.bb b/recipes/fbreader/fbreader_0.10.7.bb index 0dfea08479..986f21fbca 100644 --- a/recipes/fbreader/fbreader_0.10.7.bb +++ b/recipes/fbreader/fbreader_0.10.7.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.fbreader.org" SECTION = "x11/utils" PRIORITY = "optional" LICENSE = "GPLv2" -DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak" +DEPENDS = "gtk+ enca expat bzip2 libgpewidget virtual/libiconv liblinebreak libfribidi" SRC_URI = "http://www.fbreader.org/fbreader-sources-${PV}.tgz file://help.patch;patch=1" diff --git a/recipes/freespace/libfreespace_0.4.bb b/recipes/freespace/libfreespace_0.4.bb new file mode 100644 index 0000000000..bf9e70fbf7 --- /dev/null +++ b/recipes/freespace/libfreespace_0.4.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "The open-source libfreespace library provides an easy-to-use interface to Hillcrest Labs Freespace®-based devices such as in-air remote controls. " +LICENSE = "LGPLv2" +DEPENDS = "libusb1" + +SRC_URI = "http://launchpad.net/libfreespace/${PV}/${PV}/+download/libfreespace-${PV}.tar.gz" + +inherit autotools + + diff --git a/recipes/gtk-webcore/midori_0.2.1.bb b/recipes/gtk-webcore/midori_0.2.1.bb new file mode 100644 index 0000000000..7439a85e3e --- /dev/null +++ b/recipes/gtk-webcore/midori_0.2.1.bb @@ -0,0 +1,31 @@ +require midori.inc + +DEPENDS += "python-native python-docutils-native" + +SRC_URI = "http://archive.xfce.org/src/apps/midori/0.2/midori-${PV}.tar.bz2 \ + file://waf" + +do_configure() { + cp -f ${WORKDIR}/waf ${S}/ + sed -i -e 's:, shell=False::g' wscript + ./configure \ + --prefix=${prefix} \ + --bindir=${bindir} \ + --sbindir=${sbindir} \ + --libexecdir=${libexecdir} \ + --datadir=${datadir} \ + --sysconfdir=${sysconfdir} \ + --sharedstatedir=${sharedstatedir} \ + --localstatedir=${localstatedir} \ + --libdir=${libdir} \ + --includedir=${includedir} \ + --infodir=${infodir} \ + --mandir=${mandir} \ + ${EXTRA_OECONF} + + sed -i /LINK_CC/d ./_build_/c4che/default.cache.py + echo "LINK_CC = '${CXX}'" >> ./_build_/c4che/default.cache.py +} + + + diff --git a/recipes/libacpi/files/makefile-fix.patch b/recipes/libacpi/files/makefile-fix.patch new file mode 100644 index 0000000000..9193929767 --- /dev/null +++ b/recipes/libacpi/files/makefile-fix.patch @@ -0,0 +1,45 @@ +--- + Makefile | 6 +++--- + config.mk | 3 ++- + 2 files changed, 5 insertions(+), 4 deletions(-) + +Index: libacpi-0.2/Makefile +=================================================================== +--- libacpi-0.2.orig/Makefile 2007-07-29 14:09:34.000000000 +0200 ++++ libacpi-0.2/Makefile 2008-09-26 10:34:53.000000000 +0200 +@@ -25,16 +25,16 @@ ${OBJ}: config.mk libacpi.h + + libacpi.a: ${OBJ} + @echo AR $@ +- @${AR} $@ ${OBJ} ++ ${AR} ${ARFLAGS} $@ ${OBJ} + @${RANLIB} $@ + + libacpi.so: ${OBJ} + @echo LD $@ +- @${LD} ${SOFLAGS} -o $@.${SOVERSION} ${OBJ} ++ @${CC} ${SOFLAGS} -o $@.${SOVERSION} ${OBJ} + + test-libacpi: ${OBJ_test} + @echo LD $@ +- @${LD} -o $@ ${OBJ_test} ${LDFLAGS} ++ @${CC} -o $@ ${OBJ_test} ${LDFLAGS} + @strip $@ + + install: all +Index: libacpi-0.2/config.mk +=================================================================== +--- libacpi-0.2.orig/config.mk 2007-07-29 14:09:34.000000000 +0200 ++++ libacpi-0.2/config.mk 2008-09-26 10:34:33.000000000 +0200 +@@ -9,9 +9,10 @@ MANPREFIX = ${PREFIX}/share/man + # flags + SOFLAGS = -shared -Wl,-soname,${SONAME} + CFLAGS += -fPIC -g --pedantic -Wall -Wextra ++ARFLAGS = cr + + # Compiler and linker + CC = cc + LD = ${CC} +-AR = ar cr ++AR = ar + RANLIB = ranlib diff --git a/recipes/libacpi/libacpi_0.2.bb b/recipes/libacpi/libacpi_0.2.bb new file mode 100644 index 0000000000..f3990306b1 --- /dev/null +++ b/recipes/libacpi/libacpi_0.2.bb @@ -0,0 +1,24 @@ +DESCRIPTION = "ACPI data gathering library." +SECTION = "base" +HOMEPAGE = "http://www.ngolde.de/libacpi.html" +LICENSE = "MIT" +PR = "r1" + +SRC_URI = "http://www.ngolde.de/download/libacpi-${PV}.tar.gz \ + file://makefile-fix.patch;patch=1 " + +PACKAGES += "${PN}-bin" + +FILES_${PN} = "${libdir}/libacpi.so.*" +FILES_${PN}-bin = "${bindir}" + +COMPATIBLE_HOST = '(x86_64|i.86.*)-(linux|freebsd.*)' + +do_stage() { + install -m 0644 libacpi.h ${STAGING_INCDIR} + oe_libinstall -so libacpi ${STAGING_LIBDIR} +} + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${exec_prefix} +} diff --git a/recipes/libusb/libusb1_1.0.4.bb b/recipes/libusb/libusb1_1.0.4.bb new file mode 100644 index 0000000000..d2d4937f2c --- /dev/null +++ b/recipes/libusb/libusb1_1.0.4.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "library to provide userspace access to USB devices" +HOMEPAGE = "http://libusb.sf.net" +SECTION = "libs" +LICENSE = "LGPL" + +SRC_URI = "${SOURCEFORGE_MIRROR}/libusb/libusb-${PV}.tar.bz2" +S = "${WORKDIR}/libusb-${PV}" + +inherit autotools + +EXTRA_OECONF = "--disable-build-docs" diff --git a/recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch b/recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch index 0d0f5c42c0..447a7dc043 100644 --- a/recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch +++ b/recipes/linux/linux-2.6.31/boc01/005-091110-isl12024.patch @@ -500,7 +500,7 @@ Index: linux-2.6.31/drivers/rtc/rtc-isl12024.c + i2c_del_driver(&isl12024_driver); +} + -+MODULE_AUTHOR("Guillaume Ligneul <guillaume.ligneul@cenosys.com>"); ++MODULE_AUTHOR("Guillaume Ligneul <guillaume.ligneul@gmail.com>"); +MODULE_DESCRIPTION("Intersil ISL12024 driver"); +MODULE_LICENSE("GPL"); +MODULE_VERSION(DRV_VERSION); diff --git a/recipes/ltrace/files/ltrace-ppc.patch b/recipes/ltrace/files/ltrace-ppc.patch new file mode 100644 index 0000000000..d5ea0f0bfc --- /dev/null +++ b/recipes/ltrace/files/ltrace-ppc.patch @@ -0,0 +1,11 @@ +Index: ltrace-0.5.3/sysdeps/linux-gnu/ppc/plt.c +=================================================================== +--- ltrace-0.5.3.orig/sysdeps/linux-gnu/ppc/plt.c 2009-11-15 03:46:14.459233772 +0300 ++++ ltrace-0.5.3/sysdeps/linux-gnu/ppc/plt.c 2009-11-15 03:46:25.299232646 +0300 +@@ -1,5 +1,6 @@ + #include <gelf.h> + #include "common.h" ++#include "ptrace.h" + + GElf_Addr + arch_plt_sym_val(struct ltelf *lte, size_t ndx, GElf_Rela * rela) { diff --git a/recipes/ltrace/ltrace_0.4.bb b/recipes/ltrace/ltrace_0.4.bb deleted file mode 100644 index 9dc959e484..0000000000 --- a/recipes/ltrace/ltrace_0.4.bb +++ /dev/null @@ -1,65 +0,0 @@ -DESCRIPTION = "ltrace shows runtime library call information for dynamically linked executables." -HOMEPAGE = "http://packages.debian.org/unstable/utils/ltrace.html" -SECTION = "devel" -DEPENDS = "binutils libelf" -LICENSE = "GPL" -PR = "r3" - -SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_0.4-1.diff.gz;patch=1 \ - file://no-usr-include.patch;patch=1" - -inherit autotools - -PARALLEL_MAKE = "" -EXTRA_OEMAKE = "INSTALL_FILE='$(INSTALL) -p -m 0644' \ - INSTALL_PROGRAM='$(INSTALL) -p -m 0755' \ - INSTALL_SCRIPT='$(INSTALL) -p -m 0755' \ - INSTALL_DIR='$(INSTALL) -p -d -m 0755' " - -export TARGET_CFLAGS = "${SELECTED_OPTIMIZATION} -isystem ${STAGING_INCDIR}" -TARGET_CC_ARCH += "${LDFLAGS}" - -do_configure_prepend() { - ln -sf ./linux-gnu sysdeps/linux-gnueabi -} - -do_compile() { - case ${TARGET_ARCH} in - alpha*) LTRACE_ARCH=alpha ;; - arm*) LTRACE_ARCH=arm ;; - cris*) LTRACE_ARCH=cris ;; - hppa*) LTRACE_ARCH=parisc ;; - i*86*) LTRACE_ARCH=i386 ;; - ia64*) LTRACE_ARCH=ia64 ;; - mips*) LTRACE_ARCH=mips ;; - m68k*) LTRACE_ARCH=m68k ;; - powerpc*) LTRACE_ARCH=ppc ;; - s390*) LTRACE_ARCH=s390 ;; - sh*) LTRACE_ARCH=sh ;; - sparc64*) LTRACE_ARCH=sparc64 ;; - sparc*) LTRACE_ARCH=sparc ;; - x86_64*) LTRACE_ARCH=x86_64 ;; - esac - oe_runmake LDFLAGS=${TARGET_LDFLAGS} LIBS="-lsupc++ -liberty -Wl,-Bstatic -lelf -Wl,-Bdynamic" ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} -} - -do_install() { - case ${TARGET_ARCH} in - alpha*) LTRACE_ARCH=alpha ;; - arm*) LTRACE_ARCH=arm ;; - cris*) LTRACE_ARCH=cris ;; - hppa*) LTRACE_ARCH=parisc ;; - i*86*) LTRACE_ARCH=i386 ;; - ia64*) LTRACE_ARCH=ia64 ;; - mips*) LTRACE_ARCH=mips ;; - m68k*) LTRACE_ARCH=m68k ;; - powerpc*) LTRACE_ARCH=ppc ;; - s390*) LTRACE_ARCH=s390 ;; - sh*) LTRACE_ARCH=sh ;; - sparc64*) LTRACE_ARCH=sparc64 ;; - sparc*) LTRACE_ARCH=sparc ;; - x86_64*) LTRACE_ARCH=x86_64 ;; - esac - oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install DESTDIR=${D} -} diff --git a/recipes/ltrace/ltrace_0.5.3.bb b/recipes/ltrace/ltrace_0.5.3.bb index a6916be281..9296510f7d 100644 --- a/recipes/ltrace/ltrace_0.5.3.bb +++ b/recipes/ltrace/ltrace_0.5.3.bb @@ -1,16 +1,18 @@ DESCRIPTION = "ltrace shows runtime library call information for dynamically linked executables." HOMEPAGE = "http://ltrace.alioth.debian.org" SECTION = "devel" -DEPENDS = "libelf" +DEPENDS = "coreutils-native libelf" LICENSE = "GPLv2" -SRC_URI = "${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz \ - ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.diff.gz;patch=1 \ - file://add-sysdep.patch;patch=1 \ - file://ltrace-compile.patch;patch=1 \ - file://ltrace-mips-remove-CP.patch;patch=1 \ - file://ltrace-mips.patch;patch=1 \ - " +SRC_URI = "\ + ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}.orig.tar.gz \ + ${DEBIAN_MIRROR}/main/l/ltrace/ltrace_${PV}-2.diff.gz;patch=1 \ + file://add-sysdep.patch;patch=1 \ + file://ltrace-compile.patch;patch=1 \ + file://ltrace-mips-remove-CP.patch;patch=1 \ + file://ltrace-mips.patch;patch=1 \ + file://ltrace-ppc.patch;patch=1 \ +" inherit autotools PARALLEL_MAKE = "" @@ -69,5 +71,5 @@ do_install() { sparc*) LTRACE_ARCH=sparc ;; x86_64*) LTRACE_ARCH=x86_64 ;; esac - oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install DESTDIR=${D} + oe_runmake install ${EXTRA_OEMAKE} ARCH=${LTRACE_ARCH} INSTALL=${STAGING_BINDIR_NATIVE}/install.coreutils-native DESTDIR=${D} } diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb index 7f821a8343..f8ff8a3a93 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-battery_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Shows the battery/AC status in the Openmoko panel" DEPENDS = "apmd libnotify" -PV = "0.1.1+svn${SVNREV}" +PV = "0.1.1+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb index 336a7f8541..e823694f10 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-bt_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Shows the bluetooth status in the Openmoko panel" DEPENDS = "bluez-libs libnotify" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r1" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb index f5066b1c69..91316b8066 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-clock_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "Shows the current time in the Openmoko panel" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb index bf4eef5463..b28b670453 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-gps_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Shows the GPS status in the Openmoko panel" DEPENDS = "gpsd" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb index e8a5bc877d..00529ea360 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-gsm_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Shows the GSM / GPRS status in the Openmoko panel" DEPENDS = "libmokogsmd2 libnotify" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r2" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb index 19c278596d..7c0659ef51 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-mainmenu_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Main menu applet for the Openmoko panel" DEPENDS += "pulseaudio startup-notification" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCPV}" PR = "r1" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb index 2b1d2b03bd..0f0ca828d2 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-memory_svn.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Shows an out-of-memory warning in the Openmoko panel" DEPENDS = "libnotify" RDEPENDS = "openmoko-dialer2" -PV = "0.0.0+svn${SVNREV}" +PV = "0.0.0+svnr${SRCPV}" PR = "r0" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb index 5d00ab4b02..6af1b8c3f9 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-usb_svn.bb @@ -1,5 +1,5 @@ DESCRIPTION = "USB applet for the Openmoko panel" -PV = "0.1.0+svn${SVNREV}" +PV = "0.1.0+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb b/recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb index 0b7aac3d2a..4b8000adb0 100644 --- a/recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb +++ b/recipes/openmoko-panel-plugins/openmoko-panel-wifi_svn.bb @@ -1,6 +1,6 @@ DESCRIPTION = "Shows the wifi status in the Openmoko panel" DEPENDS = "libmokopanelui2" -PV = "0.0.0+svn${SVNREV}" +PV = "0.0.0+svnr${SRCPV}" inherit openmoko-panel-plugin diff --git a/recipes/python/python-native-2.6.1/debug.patch b/recipes/python/python-native-2.6.1/debug.patch new file mode 100644 index 0000000000..beb3adc6db --- /dev/null +++ b/recipes/python/python-native-2.6.1/debug.patch @@ -0,0 +1,27 @@ +Index: Python-2.6.1/Lib/distutils/unixccompiler.py +=================================================================== +--- Python-2.6.1.orig/Lib/distutils/unixccompiler.py 2009-11-13 16:04:54.000000000 +0000 ++++ Python-2.6.1/Lib/distutils/unixccompiler.py 2009-11-13 16:06:27.000000000 +0000 +@@ -300,6 +300,8 @@ + dylib_f = self.library_filename(lib, lib_type='dylib') + static_f = self.library_filename(lib, lib_type='static') + ++ print "Looking in %s for %s" % (lib, dirs) ++ + for dir in dirs: + shared = os.path.join(dir, shared_f) + dylib = os.path.join(dir, dylib_f) +@@ -309,10 +311,13 @@ + # assuming that *all* Unix C compilers do. And of course I'm + # ignoring even GCC's "-static" option. So sue me. + if os.path.exists(dylib): ++ print "Found %s" % (dylib) + return dylib + elif os.path.exists(shared): ++ print "Found %s" % (shared) + return shared + elif os.path.exists(static): ++ print "Found %s" % (static) + return static + + # Oops, didn't find it in *any* of 'dirs' diff --git a/recipes/python/python-native-2.6.1/nohostlibs.patch b/recipes/python/python-native-2.6.1/nohostlibs.patch new file mode 100644 index 0000000000..7020f3c2a9 --- /dev/null +++ b/recipes/python/python-native-2.6.1/nohostlibs.patch @@ -0,0 +1,53 @@ +Index: Python-2.6.1/setup.py +=================================================================== +--- Python-2.6.1.orig/setup.py 2009-11-13 16:20:47.000000000 +0000 ++++ Python-2.6.1/setup.py 2009-11-13 16:28:00.000000000 +0000 +@@ -310,8 +310,8 @@ + + def detect_modules(self): + # Ensure that /usr/local is always used +- add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') +- add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') ++ #add_dir_to_list(self.compiler.library_dirs, '/usr/local/lib') ++ #add_dir_to_list(self.compiler.include_dirs, '/usr/local/include') + + # Add paths specified in the environment variables LDFLAGS and + # CPPFLAGS for header and library files. +@@ -347,10 +347,10 @@ + for directory in reversed(options.dirs): + add_dir_to_list(dir_list, directory) + +- if os.path.normpath(sys.prefix) != '/usr': +- add_dir_to_list(self.compiler.library_dirs, ++ ++ add_dir_to_list(self.compiler.library_dirs, + sysconfig.get_config_var("LIBDIR")) +- add_dir_to_list(self.compiler.include_dirs, ++ add_dir_to_list(self.compiler.include_dirs, + sysconfig.get_config_var("INCLUDEDIR")) + + try: +@@ -361,11 +361,8 @@ + # lib_dirs and inc_dirs are used to search for files; + # if a file is found in one of those directories, it can + # be assumed that no additional -I,-L directives are needed. +- lib_dirs = self.compiler.library_dirs + [ +- '/lib64', '/usr/lib64', +- '/lib', '/usr/lib', +- ] +- inc_dirs = self.compiler.include_dirs + ['/usr/include'] ++ lib_dirs = self.compiler.library_dirs ++ inc_dirs = self.compiler.include_dirs + exts = [] + missing = [] + +@@ -583,8 +580,7 @@ + readline_libs.append('ncurses') + elif self.compiler.find_library_file(lib_dirs, 'curses'): + readline_libs.append('curses') +- elif self.compiler.find_library_file(lib_dirs + +- ['/usr/lib/termcap'], ++ elif self.compiler.find_library_file(lib_dirs, + 'termcap'): + readline_libs.append('termcap') + exts.append( Extension('readline', ['readline.c'], diff --git a/recipes/python/python-native_2.6.1.bb b/recipes/python/python-native_2.6.1.bb index 9d0b0c8268..9b59c1be65 100644 --- a/recipes/python/python-native_2.6.1.bb +++ b/recipes/python/python-native_2.6.1.bb @@ -10,6 +10,8 @@ SRC_URI = "\ file://10-distutils-fix-swig-parameter.patch;patch=1 \ file://11-distutils-never-modify-shebang-line.patch;patch=1 \ file://12-distutils-prefix-is-inside-staging-area.patch;patch=1 \ + file://debug.patch;patch=1 \ + file://nohostlibs.patch;patch=1 \ " S = "${WORKDIR}/Python-${PV}" diff --git a/recipes/shr/alsa-scenarii-shr_git.bb b/recipes/shr/alsa-scenarii-shr_git.bb index 97b4393459..97b84984b6 100644 --- a/recipes/shr/alsa-scenarii-shr_git.bb +++ b/recipes/shr/alsa-scenarii-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "Package for the different scenarios used by Openmoko" SECTION = "openmoko/base" -PV = "1.0+gitr${SRCREV}" -PR = "r1" +PV = "1.0+gitr${SRCPV}" +PR = "r2" COMPATIBLE_MACHINE = "(om-gta01|om-gta02|om-3d7k)" @@ -21,5 +21,5 @@ PACKAGE_ARCH_${PN} = "${MACHINE_ARCH}" FILES_${PN} += "${datadir}/shr" CONFFILES_${PN} += "${datadir}/shr/scenarii/*" -RPROVIDES_${PN} = "openmoko-alsa-scenarios" +RPROVIDES_${PN} = "openmoko-alsa-scenarios virtual/alsa-scenarios" diff --git a/recipes/shr/e-wm-config-illume-shr_git.bb b/recipes/shr/e-wm-config-illume-shr_git.bb index 64bd23fe90..36154cef8e 100644 --- a/recipes/shr/e-wm-config-illume-shr_git.bb +++ b/recipes/shr/e-wm-config-illume-shr_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR config" SECTION = "e/utils" DEPENDS = "eet" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r6" inherit e diff --git a/recipes/shr/e-wm-menu-shr_git.bb b/recipes/shr/e-wm-menu-shr_git.bb index 94529e335a..1deef919fd 100644 --- a/recipes/shr/e-wm-menu-shr_git.bb +++ b/recipes/shr/e-wm-menu-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "illume SHR applications.menu config" SECTION = "e/utils" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" RPROVIDES_${PN} = "e-wm-menu" RCONFLICTS_${PN} = "e-wm-menu" diff --git a/recipes/shr/e-wm-sysactions-shr_git.bb b/recipes/shr/e-wm-sysactions-shr_git.bb index 293edaeba3..07508c9fbb 100644 --- a/recipes/shr/e-wm-sysactions-shr_git.bb +++ b/recipes/shr/e-wm-sysactions-shr_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "illume SHR sysactions config" SECTION = "e/utils" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r3" RPROVIDES_${PN} = "e-wm-sysactions" diff --git a/recipes/shr/e-wm-theme-illume-gry_git.bb b/recipes/shr/e-wm-theme-illume-gry_git.bb new file mode 100644 index 0000000000..e993cb6e37 --- /dev/null +++ b/recipes/shr/e-wm-theme-illume-gry_git.bb @@ -0,0 +1,25 @@ +DESCRIPTION = "gry* illume theme - a fast, shiny illume theme" +SECTION = "e/utils" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +DEPENDS = "edje-native" +RRECOMMENDS = "elementary-theme-gry" +LICENCE = "unknown" + +PV = "0.3-${EFL_SRCREV}+gitr${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" + +S = "${WORKDIR}/git/e-wm/${PN}" + +do_compile() { + ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/gry.edc -o ${S}/gry.edj +} + +do_install() { + install -d ${D}${datadir}/enlightenment/data/themes/ + install -m 0644 ${S}/gry.edj ${D}${datadir}/enlightenment/data/themes/ +} + +FILES_${PN} = "${datadir}/enlightenment/data/themes/" diff --git a/recipes/shr/e-wm-theme-illume-neo_git.bb b/recipes/shr/e-wm-theme-illume-neo_git.bb new file mode 100644 index 0000000000..10a5016758 --- /dev/null +++ b/recipes/shr/e-wm-theme-illume-neo_git.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "nEo illume theme - a very fast, high contrast illume theme" +SECTION = "e/utils" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +DEPENDS = "edje-native" +RDEPENDS = "e-wm" +RRECOMMENDS = "elementary-theme-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" +LICENCE = "unknown" + +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" + +S = "${WORKDIR}/git/e-wm/${PN}" + +do_compile() { + ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/neo.edc -o ${S}/neo.edj +} + +do_install() { + install -d ${D}${datadir}/enlightenment/data/themes/ + install -m 0644 ${S}/neo.edj ${D}${datadir}/enlightenment/data/themes/ +} + +FILES_${PN} = "${datadir}/enlightenment/data/themes/" + +pkg_postinst() { + echo "To activate this theme make sure to set your enlightenment rendering engine to SOFTWARE or enlightenment will segfault." + echo "This theme also ships with an enlightenment bootscreen which can be activated by selecting it under STARTUP in the LOOK tab of enlightenment settings" + echo "After activating this theme be sure to switch to SOFTWARE_16 engine in enlightenment advanced settings to unleash the theme's full power ;-)" +} diff --git a/recipes/shr/e-wm-theme-illume-niebiee_git.bb b/recipes/shr/e-wm-theme-illume-niebiee_git.bb index bd3412d0ff..76aaf6d23b 100644 --- a/recipes/shr/e-wm-theme-illume-niebiee_git.bb +++ b/recipes/shr/e-wm-theme-illume-niebiee_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue Illume theme - Niebiee" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}-gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-shr_git.bb b/recipes/shr/e-wm-theme-illume-shr_git.bb index 0c59feb876..af126dc92e 100644 --- a/recipes/shr/e-wm-theme-illume-shr_git.bb +++ b/recipes/shr/e-wm-theme-illume-shr_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}" +PV = "1.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/e-wm-theme-illume-sixteen_git.bb b/recipes/shr/e-wm-theme-illume-sixteen_git.bb index 5c3d65825e..f164f0fc24 100644 --- a/recipes/shr/e-wm-theme-illume-sixteen_git.bb +++ b/recipes/shr/e-wm-theme-illume-sixteen_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "illume SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}-gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-gry_git.bb b/recipes/shr/elementary-theme-gry_git.bb new file mode 100644 index 0000000000..2b1dfaab3c --- /dev/null +++ b/recipes/shr/elementary-theme-gry_git.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "gry* elementary theme - a fast, shiny elementary theme" +SECTION = "e/utils" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +DEPENDS = "edje-native" +RRECOMMENDS = "e-wm-theme-illume-gry" +LICENSE = "unknown" + +PV = "0.8-${EFL_SRCREV}+gitr${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ + " + +S = "${WORKDIR}/git/elementary/${PN}" + +do_compile() { + ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/gry.edc -o ${S}/gry.edj +} + +do_install() { + install -d ${D}${datadir}/elementary/themes/ + install -m 0644 ${S}/gry.edj ${D}${datadir}/elementary/themes/ +} + +FILES_${PN} = "${datadir}/elementary/themes/" diff --git a/recipes/shr/elementary-theme-neo_git.bb b/recipes/shr/elementary-theme-neo_git.bb new file mode 100644 index 0000000000..4701c220c6 --- /dev/null +++ b/recipes/shr/elementary-theme-neo_git.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "nEo elementary theme - a very fast, high contrast etk theme" +SECTION = "e/utils" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +DEPENDS = "edje-native" +RRECOMMENDS = "e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" +LICENSE = "unknown" + +PV = "0.2.1-${EFL_SRCREV}+gitr${SRCPV}" +PR = "r3" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master \ + " + +S = "${WORKDIR}/git/elementary/${PN}" + +do_compile() { + ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/neo.edc -o ${S}/neo.edj +} + +do_install() { + install -d ${D}${datadir}/elementary/themes/ + install -m 0644 ${S}/neo.edj ${D}${datadir}/elementary/themes/ +} + +FILES_${PN} = "${datadir}/elementary/themes/" diff --git a/recipes/shr/elementary-theme-niebiee_git.bb b/recipes/shr/elementary-theme-niebiee_git.bb index f58257d48c..1736ad9a7a 100644 --- a/recipes/shr/elementary-theme-niebiee_git.bb +++ b/recipes/shr/elementary-theme-niebiee_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Extremely blue elementary theme - Niebiee" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}-gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/elementary-theme-sixteen_git.bb b/recipes/shr/elementary-theme-sixteen_git.bb index 48cbc615fa..4eb43af767 100644 --- a/recipes/shr/elementary-theme-sixteen_git.bb +++ b/recipes/shr/elementary-theme-sixteen_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "elementary SHR theme" SECTION = "e/utils" DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "0.1-${EFL_SRCREV}-gitr${SRCREV}" +PV = "0.1-${EFL_SRCREV}+gitr${SRCPV}" PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/etk-theme-neo_git.bb b/recipes/shr/etk-theme-neo_git.bb new file mode 100644 index 0000000000..2c68bd29da --- /dev/null +++ b/recipes/shr/etk-theme-neo_git.bb @@ -0,0 +1,12 @@ +DESCRIPTION = "nEo etk theme - a very fast, high contrast etk theme" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo gpe-theme-neo icon-theme-neo" +LICENSE = "unknown" + +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" +PR = "r2" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" + +require etk-theme.inc diff --git a/recipes/shr/etk-theme-shr_git.bb b/recipes/shr/etk-theme-shr_git.bb index d146765c94..3a324e9728 100644 --- a/recipes/shr/etk-theme-shr_git.bb +++ b/recipes/shr/etk-theme-shr_git.bb @@ -1,22 +1,8 @@ DESCRIPTION = "etk SHR theme" -SECTION = "e/utils" -DEPENDS = "edje-native" LICENSE = "MIT BSD" -PV = "1.1-${EFL_SRCREV}-gitr${SRCREV}" +PV = "1.1.1-${EFL_SRCREV}+gitr${SRCPV}" +PR = "r2" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" -S = "${WORKDIR}/git/etk/${PN}" - -do_compile() { - ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/default.edc -o ${S}/default.edj -} - -do_install() { - install -d ${D}${datadir}/etk/themes/ - install -m 0644 ${S}/default.edj ${D}${datadir}/etk/themes/ -} - -FILES_${PN} = "${datadir}/etk/themes/default.edj" - - +require etk-theme.inc diff --git a/recipes/shr/etk-theme.inc b/recipes/shr/etk-theme.inc new file mode 100644 index 0000000000..6e8b33db27 --- /dev/null +++ b/recipes/shr/etk-theme.inc @@ -0,0 +1,34 @@ +SECTION = "e/utils" +DEPENDS = "edje-native" +RDEPENDS = "etk" + +S = "${WORKDIR}/git/etk/${PN}/" + +do_compile() { + ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/. -fd ${S}/. ${S}/default.edc -o ${S}/default.edj +} + +do_install() { + install -d ${D}${datadir}/etk/themes.${PN}/ + install -m 0644 ${S}/default.edj ${D}${datadir}/etk/themes.${PN}/ +} + +FILES_${PN} = "${datadir}/etk/themes.${PN}" + +inherit update-alternatives + +ALTERNATIVE_NAME = "etk-theme" +ALTERNATIVE_LINK = "${datadir}/etk/themes" +ALTERNATIVE_PATH = "${datadir}/etk/themes.${PN}" +ALTERNATIVE_PRIORITY ?= 1 + +pkg_postinst() { + if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then + echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!" + echo "warn: It will be replaced with link managed by update-alternatives" + echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old." + echo "warn: It should be empty but probably isn't!" + echo "warn: Check what's left there and remove it manually." + mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old + fi +} diff --git a/recipes/shr/frameworkd-config-shr_git.bb b/recipes/shr/frameworkd-config-shr_git.bb index 0727091f0b..c1d15b18c3 100644 --- a/recipes/shr/frameworkd-config-shr_git.bb +++ b/recipes/shr/frameworkd-config-shr_git.bb @@ -4,8 +4,8 @@ AUTHOR = "Michael 'Mickey' Lauer <mlauer@vanille-media.de> et. al." SECTION = "console/network" DEPENDS = "python-cython-native python-pyrex-native" LICENSE = "GPL" -SRCREV_FORMAT = "gitrFSO_REV-SHR_REV" -PV = "0.9.5.9+${SRCREV}" +SRCREV_FORMAT = "FSO_REV-SHR_REV" +PV = "0.9.5.9+gitr${SRCPV}" PR = "r7" SRC_URI = "${FREESMARTPHONE_GIT}/framework.git;protocol=git;branch=master;name=FSO_REV \ diff --git a/recipes/shr/gtk-theme-neo_git.bb b/recipes/shr/gtk-theme-neo_git.bb new file mode 100644 index 0000000000..66caabf1cc --- /dev/null +++ b/recipes/shr/gtk-theme-neo_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "nEo GTK theme - a very fast, high contrast GTK theme" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +RDEPENDS += "icon-theme-neo" +RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" +LICENSE = "unknown" + +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" +PR = "r3" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" + +S = "${WORKDIR}/git/gtk/${PN}/" + +require gtk-theme.inc diff --git a/recipes/shr/gtk-theme.inc b/recipes/shr/gtk-theme.inc new file mode 100644 index 0000000000..449d0e0b28 --- /dev/null +++ b/recipes/shr/gtk-theme.inc @@ -0,0 +1,33 @@ +RPROVIDES_${PN} += "virtual/theme-gtk" +RDEPENDS = "gtk+" +SECTION = "gtk" + +inherit update-alternatives + +SRC_URI += "file://gtk-theme/gtkrc.${PN}" + +do_install() { + install -d "${D}${datadir}/themes/${PN}/gtk-2.0" + cp -r "${S}/./" "${D}${datadir}/themes/${PN}/gtk-2.0" + install -d ${D}${sysconfdir}/gtk-2.0/ + install -m 0644 ${WORKDIR}/gtk-theme/gtkrc.${PN} ${D}${sysconfdir}/gtk-2.0/gtkrc.${PN} +} + +FILES_${PN} = "${datadir}/themes/${PN}/ \ + ${sysconfdir}/gtk-2.0/gtkrc.${PN} \ + " + +ALTERNATIVE_NAME = "gtk-theme" +ALTERNATIVE_LINK = "${sysconfdir}/gtk-2.0/gtkrc" +ALTERNATIVE_PATH = "${sysconfdir}/gtk-2.0/gtkrc.${PN}" + +pkg_postinst() { + if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then + echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!" + echo "warn: It will be replaced with link managed by update-alternatives" + echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old." + echo "warn: It should be empty but probably isn't!" + echo "warn: Check what's left there and remove it manually." + mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old + fi +} diff --git a/recipes/shr/gtk-theme/gtkrc.gtk-theme-neo b/recipes/shr/gtk-theme/gtkrc.gtk-theme-neo new file mode 100644 index 0000000000..c27c4c44a2 --- /dev/null +++ b/recipes/shr/gtk-theme/gtkrc.gtk-theme-neo @@ -0,0 +1,3 @@ +gtk-font-name = "Sans 5" +gtk-theme-name = "gtk-theme-neo" +gtk-icon-theme-name = "nEo" diff --git a/recipes/shr/gtk-theme/gtkrc.shr-theme-gtk-e17lookalike b/recipes/shr/gtk-theme/gtkrc.shr-theme-gtk-e17lookalike new file mode 100644 index 0000000000..c63cd733fb --- /dev/null +++ b/recipes/shr/gtk-theme/gtkrc.shr-theme-gtk-e17lookalike @@ -0,0 +1,3 @@ +gtk-font-name = "Sans 5" +gtk-theme-name = "shr-theme-gtk-e17lookalike" +gtk-icon-theme-name = "openmoko-standard" diff --git a/recipes/shr/icon-theme-neo_git.bb b/recipes/shr/icon-theme-neo_git.bb new file mode 100644 index 0000000000..438ac238c9 --- /dev/null +++ b/recipes/shr/icon-theme-neo_git.bb @@ -0,0 +1,27 @@ +DESCRIPTION = "nEo icon theme - a high contrast icon theme which looks especially well when using all the other nEo themes" +SECTION = "e/utils" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +RDEPENDS = "e-wm" +RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo etk-theme-neo gpe-theme-neo" +LICENSE = "unknown" + +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" +PR = "r1" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" + +S = "${WORKDIR}/git/icons/icon-theme-neo" + +do_install() { + install -d ${D}${datadir}/icons/ + install -d ${D}${datadir}/icons/nEo/ + cp -r ${S}/* "${D}${datadir}/icons/nEo/" +} + +FILES_${PN} = "${datadir}/icons/nEo/" + +pkg_postinst() { + echo "To activate this theme select it under ICON THEME in the LOOK tab of enlightenment settings" + echo "Restart enlightenment for the changes to take affect" +} diff --git a/recipes/shr/initscripts-shr_git.bb b/recipes/shr/initscripts-shr_0.0.1.bb index 46ea6529ba..23fa05fd74 100644 --- a/recipes/shr/initscripts-shr_git.bb +++ b/recipes/shr/initscripts-shr_0.0.1.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "" RDEPENDS = "" LICENSE = "GPL" -PV = "0.0.1+${PR}-gitr${SRCREV}" +PV = "0.0.1" PR = "r11" RPROVIDES_${PN} = "initscripts" diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb new file mode 100644 index 0000000000..7f7f6b4fe1 --- /dev/null +++ b/recipes/shr/libframeworkd-phonegui-efl-theme-neo_git.bb @@ -0,0 +1,26 @@ +DESCRIPTION = "nEo libframeworkd-phonegui-efl - a very fast, high contrast etk theme" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +RDEPENDS = "libframeworkd-phonegui-efl" +RRECOMMENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo etk-theme-neo gpe-theme-neo icon-theme-neo" +LICENSE = "unknown" + +PV = "0.2-${EFL_SRCREV}+gitr${SRCPV}" +PR = "r2" + +require libframeworkd-phonegui-efl-theme.inc + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" + +S = "${WORKDIR}/git/libframeworkd-phonegui-efl/theme-neo" + +do_compile() { + for edc in call contacts dialer dialog elm-resizing-label incoming-message keypad messages sim-auth ussd ; do + ${STAGING_BINDIR_NATIVE}/edje_cc -id ${S}/${edc}/. -fd ${S}/${edc}. ${S}/${edc}/${edc}.edc -o ${S}/${edc}.edj + done +} + +do_install() { + install -d ${D}${datadir}/libframeworkd-phonegui-efl.${PN}/ + install -m 0644 ${S}/*.edj ${D}${datadir}/libframeworkd-phonegui-efl.${PN}/ +} diff --git a/recipes/shr/libframeworkd-phonegui-efl-theme.inc b/recipes/shr/libframeworkd-phonegui-efl-theme.inc new file mode 100644 index 0000000000..eab118f322 --- /dev/null +++ b/recipes/shr/libframeworkd-phonegui-efl-theme.inc @@ -0,0 +1,22 @@ +SECTION = "e/utils" +DEPENDS += "edje-native" + +FILES_${PN} += "${datadir}/libframeworkd-phonegui-efl.${PN}" + +inherit update-alternatives + +ALTERNATIVE_NAME = "libframeworkd-phonegui-efl-theme" +ALTERNATIVE_LINK = "${datadir}/libframeworkd-phonegui-efl" +ALTERNATIVE_PATH = "${datadir}/libframeworkd-phonegui-efl.${PN}" +ALTERNATIVE_PRIORITY ?= 1 + +pkg_postinst() { + if [[ -e ${ALTERNATIVE_LINK} && ! -h ${ALTERNATIVE_LINK} ]] ; then + echo "warn: ${ALTERNATIVE_LINK} exists and it's not a link!" + echo "warn: It will be replaced with link managed by update-alternatives" + echo "warn: Moving ${ALTERNATIVE_LINK} to ${ALTERNATIVE_LINK}.old." + echo "warn: It should be empty but probably isn't!" + echo "warn: Check what's left there and remove it manually." + mv -f ${ALTERNATIVE_LINK} ${ALTERNATIVE_LINK}.old + fi +} diff --git a/recipes/shr/libframeworkd-phonegui-efl2_git.bb b/recipes/shr/libframeworkd-phonegui-efl2_git.bb index 207658f807..cb1feade68 100644 --- a/recipes/shr/libframeworkd-phonegui-efl2_git.bb +++ b/recipes/shr/libframeworkd-phonegui-efl2_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "frameworkd EFL phonegui 2" SECTION = "e/apps" DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary" -PV = "0.0.1+gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r1" SRC_URI = "git://shr.bearstech.com/repo/libframeworkd-phonegui-efl2.git;protocol=http;branch=master" diff --git a/recipes/shr/libframeworkd-phonegui-efl_git.bb b/recipes/shr/libframeworkd-phonegui-efl_git.bb index f8adabf415..c4181cf345 100644 --- a/recipes/shr/libframeworkd-phonegui-efl_git.bb +++ b/recipes/shr/libframeworkd-phonegui-efl_git.bb @@ -3,8 +3,10 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "e/apps" DEPENDS += " dbus-glib libframeworkd-glib libframeworkd-phonegui etk evas ecore edje edje-native elementary" -PV = "0.0.2+gitr${SRCREV}" -PR = "r33" +PV = "0.0.3+gitr${SRCPV}" +PR = "r35" + +require libframeworkd-phonegui-efl-theme.inc inherit pkgconfig autotools autotools_stage @@ -14,6 +16,7 @@ S = "${WORKDIR}/git/${PN}" EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" do_configure_prepend() { + sed -i "s|^filesdir = \$(datadir)/libframeworkd-phonegui-efl/|filesdir = \$(datadir)/libframeworkd-phonegui-efl.${PN}|g" data/Makefile.am autopoint --force } diff --git a/recipes/shr/libframeworkd-phonegui_git.bb b/recipes/shr/libframeworkd-phonegui_git.bb index 50b546512a..aa1f107555 100644 --- a/recipes/shr/libframeworkd-phonegui_git.bb +++ b/recipes/shr/libframeworkd-phonegui_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Frameworkd phonegui library" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "libs" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r10" DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils" diff --git a/recipes/shr/libmodulo_git.bb b/recipes/shr/libmodulo_git.bb new file mode 100644 index 0000000000..029f928d53 --- /dev/null +++ b/recipes/shr/libmodulo_git.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "Modulo is a lightweight component container that supports Inversion Of Control, also commonly called Dependency Injection" +SECTION = "libs" +PV = "0.0.1+gitr${SRCPV}" +PR = "r1" + +inherit autotools autotools_stage pkgconfig vala + +DEPENDS = "glib-2.0 dbus-glib libxml2 libgee" + +SRC_URI = "git://git.shr-project.org/repo/libmodulo.git;protocol=http;branch=master" +S = "${WORKDIR}/git" + +LEAD_SONAME = "libmodulo.so.0" diff --git a/recipes/shr/libphone-ui-shr_git.bb b/recipes/shr/libphone-ui-shr_git.bb new file mode 100644 index 0000000000..240c7f2046 --- /dev/null +++ b/recipes/shr/libphone-ui-shr_git.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "SHR default module for the Phone UI daemon" +SECTION = "e/apps" +DEPENDS += " dbus-glib libframeworkd-glib libphone-ui etk evas ecore edje edje-native elementary" +PV = "0.0.0+gitr${SRCPV}" +PR = "r2" + +SRC_URI = "git://shr.bearstech.com/repo/libphone-ui-shr.git;protocol=http;branch=master" +S = "${WORKDIR}/git" + +inherit pkgconfig autotools autotools_stage + +EXTRA_OECONF = "--with-edje-cc=${STAGING_BINDIR_NATIVE}/edje_cc" + + +do_configure_prepend() { + autopoint --force +} + +FILES_${PN} += "${libdir}/phoneui/modules/*" +FILES_${PN}-dbg += "${libdir}/phoneui/modules/.debug"
\ No newline at end of file diff --git a/recipes/shr/libphone-ui_git.bb b/recipes/shr/libphone-ui_git.bb new file mode 100644 index 0000000000..84b04c5a60 --- /dev/null +++ b/recipes/shr/libphone-ui_git.bb @@ -0,0 +1,15 @@ +DESCRIPTION = "A generic framework for phone ui" +HOMEPAGE = "http://shr-project.org/" +LICENSE = "GPL" +SECTION = "libs" +PV = "0.0.0+gitr${SRCPV}" +PR = "r0" + +DEPENDS="glib-2.0 dbus-glib libframeworkd-glib libphone-utils alsa-lib" + +inherit pkgconfig autotools autotools_stage + +SRC_URI = "git://git.shr-project.org/repo/libphone-ui.git;protocol=http;branch=master" +S="${WORKDIR}/git" + +CONFFILES_${PN} = "${sysconfdir}/libphoneui.conf" diff --git a/recipes/shr/libphone-utils_git.bb b/recipes/shr/libphone-utils_git.bb index 7cf26ffec1..e0a2e2c110 100644 --- a/recipes/shr/libphone-utils_git.bb +++ b/recipes/shr/libphone-utils_git.bb @@ -1,6 +1,6 @@ DESCRIPTION = "phone-utils library" SECTION = "libs" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r2" DEPENDS="glib-2.0" diff --git a/recipes/shr/ologicd_git.bb b/recipes/shr/ologicd_git.bb new file mode 100644 index 0000000000..105199a582 --- /dev/null +++ b/recipes/shr/ologicd_git.bb @@ -0,0 +1,9 @@ +DESCRIPTION = "" +SECTION = "libs" +PV = "0.0.1+gitr${SRCPV}" +PR = "r0" + +inherit autotools + +SRC_URI = "git://shr.bearstech.com/repo/${PN}.git;protocol=http;branch=master" +S = "${WORKDIR}/git" diff --git a/recipes/shr/phonefsod_git.bb b/recipes/shr/phonefsod_git.bb new file mode 100644 index 0000000000..bc443a11a5 --- /dev/null +++ b/recipes/shr/phonefsod_git.bb @@ -0,0 +1,31 @@ +DESCRIPTION = "SHR Phone FSO Daemon" +HOMEPAGE = "http://shr-project.org/" +LICENSE = "GPL" +SECTION = "x11/applications" +DEPENDS += " dbus-glib libframeworkd-glib sqlite3 shr-specs" +PV = "0.0.0+gitr${SRCPV}" +PR = "r2" + +SRC_URI = "git://git.shr-project.org/repo/phonefsod.git;protocol=http;branch=master" +S = "${WORKDIR}/git" + +inherit autotools update-rc.d + +INITSCRIPT_NAME = "phonefsod" +INITSCRIPT_PARAMS = "defaults 75" + +EXTRA_OECONF = "\ + SPECS_PATH=${STAGING_DATADIR}/shr-specs \ +" + + +do_install_append() { + install -d ${D}${sysconfdir}/init.d/ + install -d ${D}${sysconfdir}/dbus-1/system.d/ + install -m 0755 ${S}/data/phonefsod.init ${D}${sysconfdir}/init.d/phonefsod + install -m 0644 ${S}/data/phonefsod.conf ${D}${sysconfdir}/dbus-1/system.d/ + install -m 0644 ${S}/data/etc-phonefsod.conf ${D}${sysconfdir}/phonefsod.conf +} + +FILES_${PN} += "${datadir} ${sysconfdir}" + diff --git a/recipes/shr/phoneui-apps_git.bb b/recipes/shr/phoneui-apps_git.bb new file mode 100644 index 0000000000..a1916df4a0 --- /dev/null +++ b/recipes/shr/phoneui-apps_git.bb @@ -0,0 +1,28 @@ +DESCRIPTION = "The PhoneUI app starters" +HOMEPAGE = "http://shr-project.org/" +LICENSE = "GPL" +SECTION = "x11/applications" +DEPENDS += "dbus-glib" +PV = "0.0.0+gitr${SRCPV}" +PR = "r0" + +inherit pkgconfig autotools + +SRC_URI = "git://git.shr-project.org/repo/phoneui-apps.git;protocol=http;branch=master" +S = "${WORKDIR}/git" + +PACKAGES = "${PN}-dialer ${PN}-messages ${PN}-contacts" + +FILES_${PN}-dialer = "\ + /usr/bin/phoneui-dialer \ + /usr/share/applications/phoneui-dialer.desktop \ +" +FILES_${PN}-messages = "\ + /usr/bin/phoneui-messages \ + /usr/share/applications/phoneui-messages.desktop \ +" +FILES_${PN}-contacts = "\ + /usr/bin/phoneui-contacts \ + /usr/share/applications/phoneui-contacts.desktop \ +" + diff --git a/recipes/shr/phoneuid_git.bb b/recipes/shr/phoneuid_git.bb new file mode 100644 index 0000000000..f86646275c --- /dev/null +++ b/recipes/shr/phoneuid_git.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "SHR Phone UI Daemon" +HOMEPAGE = "http://shr-project.org/" +LICENSE = "GPL" +SECTION = "x11/applications" +DEPENDS += " dbus-glib libframeworkd-glib libphone-ui sqlite3 shr-specs" +PV = "0.0.0+gitr${SRCPV}" +PR = "r2" + +SRC_URI = "git://git.shr-project.org/repo/phoneuid.git;protocol=http;branch=master" +S = "${WORKDIR}/git" + +inherit autotools + +EXTRA_OECONF = "\ + SPECS_PATH=${STAGING_DATADIR}/shr-specs \ +" + + +do_install_append() { + install -d ${D}${sysconfdir}/dbus-1/system.d/ + install -d ${D}${datadir}/dbus-1/system-services/ + install -d ${D}${sysconfdir}/X11/Xsession.d/ + install -m 0644 ${S}/data/phoneuid.conf ${D}${sysconfdir}/dbus-1/system.d/ + install -m 0644 ${S}/data/phoneuid-*.service ${D}${datadir}/dbus-1/system-services/ + install -m 0755 ${S}/data/80phoneuid ${D}${sysconfdir}/X11/Xsession.d/ + install -m 0755 ${S}/data/phoneui-wrapper.sh ${D}${bindir}/phoneui-wrapper.sh +} + +FILES_${PN} += "${datadir} ${sysconfdir}" + diff --git a/recipes/shr/shr-config_git.bb b/recipes/shr/shr-config_git.bb new file mode 100644 index 0000000000..cc8d685a27 --- /dev/null +++ b/recipes/shr/shr-config_git.bb @@ -0,0 +1,14 @@ +DESCRIPTION = "Central settings app for FSO/SHR distros" +HOMEPAGE = "http://git.freesmartphone.org" +AUTHOR = "Sebastian Spaeth (see AUTHORS)" +LICENSE = "GPLv2" +DEPENDS = "vala-native elementary libeflvala" +SECTION = "x11/application" +PV = "0.0.2+gitr${SRCPV}" +PR = "r4" + +EXTRA_OECONF="--enable-vapidir=${STAGING_DATADIR}/vala/vapi" +inherit autotools + +SRC_URI = "git://github.com/spaetz/shr-config.git;protocol=git;branch=master" +S = "${WORKDIR}/git" diff --git a/recipes/shr/shr-contacts_git.bb b/recipes/shr/shr-contacts_git.bb index 1b9a383130..6cfb87f43b 100644 --- a/recipes/shr/shr-contacts_git.bb +++ b/recipes/shr/shr-contacts_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r6" inherit pkgconfig autotools diff --git a/recipes/shr/shr-dialer_git.bb b/recipes/shr/shr-dialer_git.bb index 796b96592b..f4813141e4 100644 --- a/recipes/shr/shr-dialer_git.bb +++ b/recipes/shr/shr-dialer_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r9" inherit pkgconfig autotools diff --git a/recipes/shr/shr-installer_git.bb b/recipes/shr/shr-installer_git.bb index 1206d635d5..331c0f1e6a 100644 --- a/recipes/shr/shr-installer_git.bb +++ b/recipes/shr/shr-installer_git.bb @@ -5,7 +5,7 @@ LICENSE ?= "GPL" RDEPENDS = "python-elementary python-dbus python-core python-edbus packagekit" SECTION = "x11/application" -PV = "0.0.1-gitr${SRCREV}" +PV = "0.0.1+gitr${SRCPV}" PR = "r0" inherit setuptools diff --git a/recipes/shr/shr-launcher_svn.bb b/recipes/shr/shr-launcher_svn.bb new file mode 100644 index 0000000000..ffd6161586 --- /dev/null +++ b/recipes/shr/shr-launcher_svn.bb @@ -0,0 +1,21 @@ +DESCRIPTION = "shr-launcher is a home app/launcher for openmoko phones" +HOMEPAGE = "http://code.google.com/p/shr-launcher/" +AUTHOR = "cchandel" +LICENSE = "GPLv2" +SECTION = "e/apps" +DEPENDS = "elementary eina edbus" + +PV = "0.0.1+svnr${SRCPV}" +PR = "r0" + +SRC_URI = "svn://shr-launcher.googlecode.com/svn/trunk;module=.;proto=http" + +do_configure_prepend() { + rm -f ${S}/config.log + rm -f ${S}/config.status +} + +S = "${WORKDIR}" + +inherit autotools + diff --git a/recipes/shr/shr-messages_git.bb b/recipes/shr/shr-messages_git.bb index 6fc0694c29..b821545fac 100644 --- a/recipes/shr/shr-messages_git.bb +++ b/recipes/shr/shr-messages_git.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/applications" DEPENDS += "dbus-glib libframeworkd-glib libframeworkd-phonegui" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r8" inherit pkgconfig autotools diff --git a/recipes/shr/shr-settings_git.bb b/recipes/shr/shr-settings_git.bb new file mode 100644 index 0000000000..747f6d7df5 --- /dev/null +++ b/recipes/shr/shr-settings_git.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Modular settings application for SHR based on python-elementary" +HOMEPAGE = "http://shr-project.org" +SHR_RELEASE ?= "shr" +LICENSE ?= "GPL" +RDEPENDS = "python-elementary python-dbus python-codecs python-shell python-pyrtc python python-core python-edbus dbus-x11 frameworkd python-phoneutils" +SECTION = "x11/application" +PE = "1" +PV = "0.1.1+gitr${SRCPV}" +PR = "r7" + +inherit setuptools + +PACKAGES =+ "\ + ${PN}-addons-illume \ + ${PN}-backup-configuration \ +" + +RRECOMMENDS_${PN} = "\ + ${PN}-addons-illume \ + ${PN}-backup-configuration \ +" + +PACKAGE_ARCH_${PN}-addons-illume = "all" +PACKAGE_ARCH_${PN}-backup-configuration = "all" + +SRC_URI = "git://git.shr-project.org/repo/shr-settings.git;protocol=http;branch=master" +S = "${WORKDIR}/git" +FILES_${PN} += "${prefix}/share/pixmaps" +FILES_${PN} += "${prefix}/share/applications" +FILES_${PN}-addons-illume = "${prefix}/share/applications/shr-settings-addons-illume" +FILES_${PN}-backup-configuration = "${sysconfdir}/shr-settings/" +CONFFILES_${PN}-backup-configuration = "${sysconfdir}/shr-settings/*" diff --git a/recipes/shr/shr-specs_git.bb b/recipes/shr/shr-specs_git.bb new file mode 100644 index 0000000000..bc29ee5e27 --- /dev/null +++ b/recipes/shr/shr-specs_git.bb @@ -0,0 +1,22 @@ +DESCRIPTION = "The SHR DBus API Specification" +HOMEPAGE = "http://shr-project.org/" +LICENSE = "BSD" +SECTION = "devel/specifications" +PV = "0.0.0+gitr${SRCPV}" +PR = "r0" + +SRC_URI = "git://git.shr-project.org/repo/shr-specs.git;protocol=http;branch=master" +S = "${WORKDIR}/git" + +do_compile() { + make xml +} + +do_stage() { + install -d "${STAGING_DATADIR}/shr-specs" + install -m 0644 xml/* "${STAGING_DATADIR}/shr-specs" +} + +FILE_${PN}-dev += "${datadir}/shr-specs" + + diff --git a/recipes/shr/shr-splash-theme-dontpanic_git.bb b/recipes/shr/shr-splash-theme-dontpanic_git.bb index 4bf41fbd29..f80df61f67 100644 --- a/recipes/shr/shr-splash-theme-dontpanic_git.bb +++ b/recipes/shr/shr-splash-theme-dontpanic_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - DON'T PANIC theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2-gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-handy_git.bb b/recipes/shr/shr-splash-theme-handy_git.bb index 773d4f16db..3890a7f383 100644 --- a/recipes/shr/shr-splash-theme-handy_git.bb +++ b/recipes/shr/shr-splash-theme-handy_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - handy theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2-gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r3" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-logo_git.bb b/recipes/shr/shr-splash-theme-logo_git.bb new file mode 100644 index 0000000000..09ea014e79 --- /dev/null +++ b/recipes/shr/shr-splash-theme-logo_git.bb @@ -0,0 +1,13 @@ +DESCRIPTION = "SHR splash screen - SHR logo theme" +SECTION = "x11/data" +LICENSE = "MIT BSD" +PV = "0.1+gitr${SRCPV}" +PR = "r0" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" +S = "${WORKDIR}/git/shr-splash/${PN}" + +ALTERNATIVE_PRIORITY = 3 + +require shr-splash-theme.inc + diff --git a/recipes/shr/shr-splash-theme-niebiee_git.bb b/recipes/shr/shr-splash-theme-niebiee_git.bb index 40a0973f2b..e16cfa3fb4 100644 --- a/recipes/shr/shr-splash-theme-niebiee_git.bb +++ b/recipes/shr/shr-splash-theme-niebiee_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - extremely blue Niebiee theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2-gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r0" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-simple_git.bb b/recipes/shr/shr-splash-theme-simple_git.bb index 865e18fce7..97ef436e6c 100644 --- a/recipes/shr/shr-splash-theme-simple_git.bb +++ b/recipes/shr/shr-splash-theme-simple_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen - simple SHR theme" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2-gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r6" SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" diff --git a/recipes/shr/shr-splash-theme-tux_git.bb b/recipes/shr/shr-splash-theme-tux_git.bb new file mode 100644 index 0000000000..743dacd2b4 --- /dev/null +++ b/recipes/shr/shr-splash-theme-tux_git.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "SHR splash screen - SHR Tux theme" +SECTION = "x11/data" +LICENSE = "MIT BSD" +PV = "0.1+gitr${SRCPV}" +PR = "r0" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" +S = "${WORKDIR}/git/shr-splash/${PN}" + +require shr-splash-theme.inc + diff --git a/recipes/shr/shr-splash_git.bb b/recipes/shr/shr-splash_git.bb index 1ce7373e82..9bf4ca12df 100644 --- a/recipes/shr/shr-splash_git.bb +++ b/recipes/shr/shr-splash_git.bb @@ -1,7 +1,7 @@ DESCRIPTION = "SHR splash screen" SECTION = "x11/data" LICENSE = "MIT BSD" -PV = "1.2-gitr${SRCREV}" +PV = "1.2+gitr${SRCPV}" PR = "r4" RRECOMMENDS_${PN} += "\ virtual/shr-splash-theme" diff --git a/recipes/shr/shr-theme-gry.bb b/recipes/shr/shr-theme-gry.bb new file mode 100644 index 0000000000..7a2e6e1728 --- /dev/null +++ b/recipes/shr/shr-theme-gry.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "gry* - a fast, shiny theme" +SECTION = "x11/data" +RDEPENDS += "e-wm-theme-illume-gry elementary-theme-gry" +PV = "0.1" +PR = "r1" + +ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-theme-gtk-e17lookalike_git.bb b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb new file mode 100644 index 0000000000..04ab37dc63 --- /dev/null +++ b/recipes/shr/shr-theme-gtk-e17lookalike_git.bb @@ -0,0 +1,10 @@ +DESCRIPTION = "A gtk theme that looks like e17" +LICENSE = "MIT BSD" +PV = "0.1.1+gitr${SRCPV}" +PR = "r5" + +SRC_URI = "git://git.shr-project.org/repo/shr-themes.git;protocol=http;branch=master" + +S = "${WORKDIR}/git/gtk/${PN}" + +require gtk-theme.inc diff --git a/recipes/shr/shr-theme-neo.bb b/recipes/shr/shr-theme-neo.bb new file mode 100644 index 0000000000..20186ffe31 --- /dev/null +++ b/recipes/shr/shr-theme-neo.bb @@ -0,0 +1,11 @@ +DESCRIPTION = "nEo shr theme - a very fast, high contrast shr theme" +SECTION = "x11/data" +HOMEPAGE = "http://jmccloud.jm.funpic.de" +AUTHOR = "Jesus McCloud <bernd.pruenster@gmail.com" +RDEPENDS = "elementary-theme-neo e-wm-theme-illume-neo gtk-theme-neo libframeworkd-phonegui-efl-theme-neo gpe-theme-neo icon-theme-neo" +LICENSE = "unknown" + +PV = "0.2" +PR = "r1" + +ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-theme-sixteen.bb b/recipes/shr/shr-theme-sixteen.bb new file mode 100644 index 0000000000..d7b789239d --- /dev/null +++ b/recipes/shr/shr-theme-sixteen.bb @@ -0,0 +1,7 @@ +DESCRIPTION = "Sixteen SHR theme" +SECTION = "x11/data" +RDEPENDS += "e-wm-theme-illume-sixteen elementary-theme-sixteen" +PV = "0.1" +PR = "r1" + +ALLOW_EMPTY = "1" diff --git a/recipes/shr/shr-theme_git.bb b/recipes/shr/shr-theme_git.bb index 54803107a4..704072f8af 100644 --- a/recipes/shr/shr-theme_git.bb +++ b/recipes/shr/shr-theme_git.bb @@ -2,7 +2,7 @@ DESCRIPTION = "Standard icon theme for the SHR distribution" HOMEPAGE = "http://shr-project.org/" LICENSE = "GPL" SECTION = "x11/data" -PV = "0.0.2+gitr${SRCREV}" +PV = "0.0.2+gitr${SRCPV}" PR = "r2" inherit autotools diff --git a/recipes/shr/shr-today_git.bb b/recipes/shr/shr-today_git.bb index c6947cf3ca..65bea25739 100644 --- a/recipes/shr/shr-today_git.bb +++ b/recipes/shr/shr-today_git.bb @@ -2,13 +2,13 @@ DESCRIPTION = "python-elementary and opimd based lock and today screen for the S HOMEPAGE = "http://wiki.github.com/slyon/today" SHR_RELEASE ?= "shr" LICENSE ?= "GPL" -RDEPENDS = "python-elementary python-dbus python-edbus python-ecore" +RDEPENDS = "python-edje python-dbus python-edbus python-ecore" SECTION = "x11/applications" -PV = "0.0.1-gitr${SRCREV}" -PR = "r0" +PV = "0.0.1+gitr${SRCPV}" +PR = "r2" -inherit setuptools +inherit distutils SRC_URI = "git://github.com/slyon/today.git;protocol=http" S = "${WORKDIR}/git" diff --git a/recipes/webkit/webkit-gtk_svn.bb b/recipes/webkit/webkit-gtk_svn.bb index b2f2baaede..48d1bd8aad 100644 --- a/recipes/webkit/webkit-gtk_svn.bb +++ b/recipes/webkit/webkit-gtk_svn.bb @@ -24,7 +24,7 @@ SRC_URI = "\ S = "${WORKDIR}/" -inherit autotools pkgconfig lib_package +inherit autotools lib_package export BISON="${STAGING_BINDIR_NATIVE}/bison" ARM_INSTRUCTION_SET = "arm" @@ -60,10 +60,6 @@ do_compile_prepend() { cd ${S} } -do_stage() { - autotools_stage_all -} - PACKAGES =+ "${PN}-webinspector ${PN}launcher-dbg ${PN}launcher libjavascriptcore" FILES_${PN}launcher = "${bindir}/GtkLauncher" FILES_${PN}launcher-dbg = "${bindir}/.debug/GtkLauncher" 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" |