From d762c7504032becb9d05cd48c86dabb1ec764911 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Nov 2009 10:21:30 +0000 Subject: gconf/gtk-icon-theme/mime: Really fix PKGDEST references Signed-off-by: Richard Purdie --- classes/gconf.bbclass | 3 +-- classes/gtk-icon-cache.bbclass | 3 +-- classes/mime.bbclass | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/classes/gconf.bbclass b/classes/gconf.bbclass index 9f51bc0cde..f55ae2c2ae 100644 --- a/classes/gconf.bbclass +++ b/classes/gconf.bbclass @@ -33,10 +33,9 @@ python populate_packages_append () { import os.path, re packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) - workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - schema_dir = '%s/%s/%s/etc/gconf/schemas' % (workdir, pkgdest, pkg) + schema_dir = '%s/%s/etc/gconf/schemas' % (pkgdest, pkg) schemas = [] schema_re = re.compile(".*\.schemas$") if os.path.exists(schema_dir): diff --git a/classes/gtk-icon-cache.bbclass b/classes/gtk-icon-cache.bbclass index ce78d1f7c9..d6c86a383e 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -30,10 +30,9 @@ python populate_packages_append () { import os.path packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) - workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - icon_dir = '%s/%s/%s/%s/icons' % (workdir, pkgdest, pkg, bb.data.getVar('datadir', d, 1)) + icon_dir = '%s/%s/%s/icons' % (pkgdest, pkg, bb.data.getVar('datadir', d, 1)) if not os.path.exists(icon_dir): continue diff --git a/classes/mime.bbclass b/classes/mime.bbclass index afba5e79a7..2416c1466f 100644 --- a/classes/mime.bbclass +++ b/classes/mime.bbclass @@ -28,10 +28,9 @@ python populate_packages_append () { import os.path, re packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) - workdir = bb.data.getVar('WORKDIR', d, 1) for pkg in packages: - mime_dir = '%s/%s/%s/usr/share/mime/packages' % (workdir, pkgdest, pkg) + mime_dir = '%s/%s/usr/share/mime/packages' % (pkgdest, pkg) mimes = [] mime_re = re.compile(".*\.xml$") if os.path.exists(mime_dir): -- cgit v1.2.3 From bc465d83ad8665211b6f9664b418f4eafcc5ca6c Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Nov 2009 10:45:23 +0000 Subject: classes: Drop a number of unneeded import calls (from Poky) Signed-off-by: Richard Purdie --- classes/autotools.bbclass | 3 --- classes/autotools_stage.bbclass | 1 - classes/base.bbclass | 1 - classes/cpan_build.bbclass | 1 - classes/gettext.bbclass | 2 -- classes/gtk-icon-cache.bbclass | 1 - classes/icecc.bbclass | 10 +++------- classes/insane.bbclass | 13 ------------- classes/kernel-arch.bbclass | 2 +- classes/kernel.bbclass | 11 ++++------- classes/linux-kernel-base.bbclass | 3 +-- classes/openmoko-base.bbclass | 1 - classes/openmoko2.bbclass | 2 -- classes/package.bbclass | 18 ++++-------------- classes/package_deb.bbclass | 8 +++----- classes/package_ipk.bbclass | 15 ++++++--------- classes/package_rpm.bbclass | 11 ++++------- classes/package_tar.bbclass | 6 +----- classes/packaged-staging.bbclass | 12 +----------- classes/packagehistory.bbclass | 6 +----- classes/patch.bbclass | 7 ++----- classes/pkgconfig.bbclass | 2 -- classes/rm_work.bbclass | 5 +---- classes/sanity.bbclass | 12 ++++-------- classes/siteinfo.bbclass | 4 ---- classes/sourcepkg.bbclass | 4 ---- classes/src_distribute.bbclass | 2 +- classes/task.bbclass | 1 - classes/tinderclient.bbclass | 4 +--- classes/update-alternatives.bbclass | 1 - classes/update-rc.d.bbclass | 1 - 31 files changed, 38 insertions(+), 132 deletions(-) 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/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 d6c86a383e..524c2f0c46 100644 --- a/classes/gtk-icon-cache.bbclass +++ b/classes/gtk-icon-cache.bbclass @@ -27,7 +27,6 @@ done } python populate_packages_append () { - import os.path packages = bb.data.getVar('PACKAGES', d, 1).split() pkgdest = bb.data.getVar('PKGDEST', d, 1) 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..49cfc095d3 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 @@ -464,7 +454,6 @@ def package_qa_walk(path, funcs, package,d): return sane def package_qa_check_rdepends(pkg, workdir, d): - import bb sane = True if not "-dbg" in pkg and not "task-" in pkg and not "-image" in pkg: # Copied from package_ipk.bbclass @@ -501,7 +490,6 @@ 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) packages = bb.data.getVar('PACKAGES',d, True) @@ -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..8714aed0fd 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) @@ -310,7 +307,7 @@ module_conf_rfcomm = "alias bt-proto-3 rfcomm" python populate_packages_prepend () { 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 +328,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 +382,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 +460,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 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/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..5de48d6bfb 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 workdir = bb.data.getVar('WORKDIR', d, True) outdir = bb.data.getVar('DEPLOY_DIR', d, True) @@ -595,7 +585,7 @@ fi SHLIBSDIR = "${STAGING_DIR_HOST}/shlibs" python package_do_shlibs() { - import os, re, os.path + import re exclude_shlibs = bb.data.getVar('EXCLUDE_FROM_SHLIBS', d, 0) if exclude_shlibs: @@ -768,7 +758,7 @@ python package_do_shlibs() { } python package_do_pkgconfig () { - import re, os + import re packages = bb.data.getVar('PACKAGES', d, True) workdir = bb.data.getVar('WORKDIR', d, True) diff --git a/classes/package_deb.bbclass b/classes/package_deb.bbclass index 4a17010538..2a9bf76a79 100644 --- a/classes/package_deb.bbclass +++ b/classes/package_deb.bbclass @@ -17,13 +17,11 @@ DPKG_ARCH_i686 ?= "i386" DPKG_ARCH_pentium ?= "i386" python package_deb_fn () { - from bb import data bb.data.setVar('PKGFN', bb.data.getVar('PKG',d), d) } addtask package_deb_install python do_package_deb_install () { - import os, sys pkg = bb.data.getVar('PKG', d, 1) pkgfn = bb.data.getVar('PKGFN', d, 1) rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) @@ -39,6 +37,7 @@ python do_package_deb_install () { os.makedirs(rootfs) os.chdir(rootfs) except OSError: + import sys raise bb.build.FuncFailed(str(sys.exc_value)) # update packages file @@ -69,14 +68,13 @@ python do_package_deb_install () { } python do_package_deb () { - import sys, re, copy + import re, copy workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined, unable to package") return - import os # path manipulations outdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1) if not outdir: bb.error("DEPLOY_DIR_DEB not defined, unable to package") @@ -188,6 +186,7 @@ python do_package_deb () { for (c, fs) in fields: ctrlfile.write(unicode(c % tuple(pullData(fs, localdata)))) except KeyError: + import sys (type, value, traceback) = sys.exc_info() bb.utils.unlockfile(lf) ctrlfile.close() @@ -261,7 +260,6 @@ python do_package_deb () { } python () { - import bb if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split() deps.append('dpkg-native:do_populate_staging') diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index b48f8781eb..3582195393 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -17,7 +17,6 @@ python package_ipk_install () { # Warning - this function is not multimachine safe (see stagingdir reference)! # - import os, sys, bb pkg = bb.data.getVar('PKG', d, 1) pkgfn = bb.data.getVar('PKGFN', d, 1) rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) @@ -31,6 +30,7 @@ python package_ipk_install () { bb.mkdirhier(rootfs) os.chdir(rootfs) except OSError: + import sys (type, value, traceback) = sys.exc_info() print value raise bb.build.FuncFailed @@ -135,14 +135,14 @@ package_generate_ipkg_conf () { } python do_package_ipk () { - import sys, re, copy, bb + import re, copy workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: bb.error("WORKDIR not defined, unable to package") return - import os # path manipulations + outdir = bb.data.getVar('DEPLOY_DIR_IPK', d, 1) if not outdir: bb.error("DEPLOY_DIR_IPK not defined, unable to package") @@ -174,10 +174,9 @@ python do_package_ipk () { pkgname = pkg bb.data.setVar('PKG', pkgname, localdata) - overrides = bb.data.getVar('OVERRIDES', localdata) + overrides = bb.data.getVar('OVERRIDES', localdata, True) if not overrides: raise bb.build.FuncFailed('OVERRIDES not defined') - overrides = bb.data.expand(overrides, localdata) bb.data.setVar('OVERRIDES', overrides + ':' + pkg, localdata) bb.data.update_data(localdata) @@ -194,8 +193,7 @@ python do_package_ipk () { except ValueError: pass if not g and bb.data.getVar('ALLOW_EMPTY', localdata) != "1": - from bb import note - note("Not creating empty archive for %s-%s" % (pkg, bb.data.expand('${PV}-${PR}${DISTRO_PR}', localdata, True))) + bb.note("Not creating empty archive for %s-%s" % (pkg, bb.data.expand('${PV}-${PR}${DISTRO_PR}', localdata, True))) bb.utils.unlockfile(lf) continue @@ -237,6 +235,7 @@ python do_package_ipk () { raise KeyError(f) ctrlfile.write(c % tuple(pullData(fs, localdata))) except KeyError: + import sys (type, value, traceback) = sys.exc_info() ctrlfile.close() bb.utils.unlockfile(lf) @@ -308,7 +307,6 @@ python do_package_ipk () { } python () { - import bb if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split() deps.append('ipkg-utils-native:do_populate_staging') @@ -317,7 +315,6 @@ python () { } python do_package_write_ipk () { - import bb packages = bb.data.getVar('PACKAGES', d, True) if not packages: bb.debug(1, "No PACKAGES defined, nothing to package") diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass index 13cb8773af..ab09bb24d3 100644 --- a/classes/package_rpm.bbclass +++ b/classes/package_rpm.bbclass @@ -10,9 +10,6 @@ RPMOPTS="--rcfile=${WORKDIR}/rpmrc --target ${TARGET_SYS}" RPM="rpm ${RPMOPTS}" python write_specfile() { - from bb import data, build - import sys - version = bb.data.getVar('PV', d, 1) version = version.replace('-', '+') bb.data.setVar('RPMPV', version, d) @@ -50,9 +47,9 @@ python write_specfile() { del files[files.index(r)] except ValueError: pass + if not files and bb.data.getVar('ALLOW_EMPTY', d) != "1": - from bb import note - note("Not creating empty archive for %s" % (bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}', d, True))) + bb.note("Not creating empty archive for %s" % (bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}', d, True))) return # output .spec using this metadata store @@ -154,7 +151,6 @@ python do_package_rpm () { bb.error("WORKDIR not defined, unable to package") return - import os # path manipulations outdir = bb.data.getVar('DEPLOY_DIR_RPM', d, 1) if not outdir: bb.error("DEPLOY_DIR_RPM not defined, unable to package") @@ -209,7 +205,6 @@ python do_package_rpm () { } python () { - import bb if bb.data.getVar('PACKAGES', d, True) != '' and \ not bb.data.inherits_class('native', d) and \ not bb.data.inherits_class('cross', d): @@ -225,5 +220,7 @@ python do_package_write_rpm () { bb.build.exec_func("rpm_prep", d) bb.build.exec_func("do_package_rpm", d) } + do_package_write_rpm[dirs] = "${D}" addtask package_write_rpm before do_package_write after do_package + diff --git a/classes/package_tar.bbclass b/classes/package_tar.bbclass index a0eacf27f5..9c9ae4ff0a 100644 --- a/classes/package_tar.bbclass +++ b/classes/package_tar.bbclass @@ -1,14 +1,11 @@ inherit package python package_tar_fn () { - import os - from bb import data fn = os.path.join(bb.data.getVar('DEPLOY_DIR_TAR', d, True), bb.data.expand('${PKG}-${PV}-${PR}${DISTRO_PR}.tar.gz', d, True)) bb.data.setVar('PKGFN', fn, d) } python package_tar_install () { - import os, sys pkg = bb.data.getVar('PKG', d, 1) pkgfn = bb.data.getVar('PKGFN', d, 1) rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) @@ -20,6 +17,7 @@ python package_tar_install () { bb.mkdirhier(rootfs) os.chdir(rootfs) except OSError: + import sys (type, value, traceback) = sys.exc_info() print value raise bb.build.FuncFailed @@ -39,7 +37,6 @@ python do_package_tar () { bb.error("WORKDIR not defined, unable to package") return - import os # path manipulations outdir = bb.data.getVar('DEPLOY_DIR_TAR', d, 1) if not outdir: bb.error("DEPLOY_DIR_TAR not defined, unable to package") @@ -91,7 +88,6 @@ python do_package_tar () { } python () { - import bb if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split() deps.append('tar-native:do_populate_staging') diff --git a/classes/packaged-staging.bbclass b/classes/packaged-staging.bbclass index d6e01da1ce..3b99e39ed9 100644 --- a/classes/packaged-staging.bbclass +++ b/classes/packaged-staging.bbclass @@ -80,8 +80,6 @@ PSTAGE_LIST_CMD = "${PSTAGE_PKGMANAGER} -f ${PSTAGE_MACHCONFIG} -o ${TMP PSTAGE_TMPDIR_STAGE = "${WORKDIR}/staging-pkg" def pstage_manualclean(srcname, destvarname, d): - import os, bb - src = os.path.join(bb.data.getVar('PSTAGE_TMPDIR_STAGE', d, True), srcname) dest = bb.data.getVar(destvarname, d, True) @@ -92,7 +90,6 @@ def pstage_manualclean(srcname, destvarname, d): os.system("rm %s" % filepath) def pstage_set_pkgmanager(d): - import bb path = bb.data.getVar("PATH", d, 1) pkgmanager = bb.which(path, 'opkg-cl') if pkgmanager == "": @@ -102,8 +99,6 @@ def pstage_set_pkgmanager(d): def pstage_cleanpackage(pkgname, d): - import os, bb - path = bb.data.getVar("PATH", d, 1) pstage_set_pkgmanager(d) list_cmd = bb.data.getVar("PSTAGE_LIST_CMD", d, True) @@ -164,8 +159,6 @@ PSTAGE_TASKS_COVERED = "fetch unpack munge patch configure qa_configure rig_loca SCENEFUNCS += "packagestage_scenefunc" python packagestage_scenefunc () { - import os - if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0": return @@ -243,10 +236,7 @@ packagestage_scenefunc[dirs] = "${STAGING_DIR}" addhandler packagedstage_stampfixing_eventhandler python packagedstage_stampfixing_eventhandler() { - from bb.event import getName - import os - - if getName(e) == "StampUpdate": + if bb.event.getName(e) == "StampUpdate": taskscovered = bb.data.getVar("PSTAGE_TASKS_COVERED", e.data, 1).split() for (fn, task) in e.targets: # strip off 'do_' diff --git a/classes/packagehistory.bbclass b/classes/packagehistory.bbclass index b435149d22..492bbac218 100644 --- a/classes/packagehistory.bbclass +++ b/classes/packagehistory.bbclass @@ -4,6 +4,7 @@ PACKAGEFUNCS += "emit_pkghistory" PKGHIST_DIR = "${TMPDIR}/pkghistory/${BASEPKG_TARGET_SYS}/" + # # Called during do_package to write out metadata about this package # for comparision when writing future packages @@ -60,8 +61,6 @@ python emit_pkghistory() { def check_pkghistory(pkg, pe, pv, pr, lastversion): - import bb - (last_pe, last_pv, last_pr) = lastversion bb.debug(2, "Checking package history") @@ -71,7 +70,6 @@ def check_pkghistory(pkg, pe, pv, pr, lastversion): def write_pkghistory(pkg, pe, pv, pr, d): - import bb, os bb.debug(2, "Writing package history") pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True) @@ -81,8 +79,6 @@ def write_pkghistory(pkg, pe, pv, pr, d): os.makedirs(verpath) def write_latestlink(pkg, pe, pv, pr, d): - import bb, os - pkghistdir = bb.data.getVar('PKGHIST_DIR', d, True) def rm_link(path): diff --git a/classes/patch.bbclass b/classes/patch.bbclass index bb49fed7a1..33184df0d0 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -4,8 +4,6 @@ QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc" def patch_init(d): - import os, sys - class NotFoundError(Exception): def __init__(self, path): self.path = path @@ -13,8 +11,6 @@ def patch_init(d): return "Error: %s not found." % self.path def md5sum(fname): - import sys - # when we move to Python 2.5 as minimal supported # we can kill that try/except as hashlib is 2.5+ try: @@ -251,6 +247,7 @@ def patch_init(d): try: output = runcmd(["quilt", "applied"], self.dir) except CmdError: + import sys if sys.exc_value.output.strip() == "No patches applied": return else: @@ -364,6 +361,7 @@ def patch_init(d): try: self.patchset.Push() except Exception: + import sys os.chdir(olddir) raise sys.exc_value @@ -454,7 +452,6 @@ PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_staging" do_patch[depends] = "${PATCHDEPENDENCY}" python patch_do_patch() { - import re patch_init(d) src_uri = (bb.data.getVar('SRC_URI', d, 1) or '').split() diff --git a/classes/pkgconfig.bbclass b/classes/pkgconfig.bbclass index de892b5413..5844461fb4 100644 --- a/classes/pkgconfig.bbclass +++ b/classes/pkgconfig.bbclass @@ -1,5 +1,3 @@ -inherit base - DEPENDS_prepend = "pkgconfig-native " do_install_prepend () { diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index 094f9167bb..a53d12baf3 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -35,10 +35,7 @@ addtask rm_work_all after do_rm_work addhandler rmwork_stampfixing_eventhandler python rmwork_stampfixing_eventhandler() { - from bb.event import getName - import os - - if getName(e) == "StampUpdate": + if bb.event.getName(e) == "StampUpdate": for (fn, task) in e.targets: if task == 'rm_work_all': continue diff --git a/classes/sanity.bbclass b/classes/sanity.bbclass index 83c03299bf..f65df61c1d 100644 --- a/classes/sanity.bbclass +++ b/classes/sanity.bbclass @@ -11,8 +11,6 @@ def raise_sanity_error(msg): %s""" % msg) def check_conf_exists(fn, data): - import bb, os - bbpath = [] fn = bb.data.expand(fn, data) vbbpath = bb.data.getVar("BBPATH", data) @@ -26,12 +24,12 @@ def check_conf_exists(fn, data): def check_sanity(e): from bb import note, error, data, __version__ - from bb.event import Handled, NotHandled, getName + try: from distutils.version import LooseVersion except ImportError: def LooseVersion(v): print "WARNING: sanity.bbclass can't compare versions without python-distutils"; return 1 - import os, commands + import commands # Check the bitbake version meets minimum requirements minversion = data.getVar('BB_MIN_VERSION', e.data , True) @@ -193,10 +191,8 @@ def check_sanity(e): addhandler check_sanity_eventhandler python check_sanity_eventhandler() { - from bb import note, error, data, __version__ - from bb.event import getName - - if getName(e) == "ConfigParsed": + from bb.event import Handled, NotHandled + if bb.event.getName(e) == "ConfigParsed": check_sanity(e) return NotHandled diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 5c929dffcd..93cee4f890 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -16,8 +16,6 @@ # If 'what' doesn't exist then an empty value is returned # def get_siteinfo_list(d): - import bb - target = bb.data.getVar('HOST_ARCH', d, 1) + "-" + bb.data.getVar('HOST_OS', d, 1) targetinfo = {\ @@ -86,8 +84,6 @@ def get_siteinfo_list(d): # 2) ${FILE_DIRNAME}/site-${PV} - app version specific # def siteinfo_get_files(d): - import bb, os - sitefiles = "" # Determine which site files to look for diff --git a/classes/sourcepkg.bbclass b/classes/sourcepkg.bbclass index 200ff8c228..5aacf92d10 100644 --- a/classes/sourcepkg.bbclass +++ b/classes/sourcepkg.bbclass @@ -5,8 +5,6 @@ EXCLUDE_FROM ?= ".pc autom4te.cache" DISTRO ?= "openembedded" def get_src_tree(d): - import bb - import os, os.path workdir = bb.data.getVar('WORKDIR', d, 1) if not workdir: @@ -56,8 +54,6 @@ sourcepkg_do_archive_bb() { } python sourcepkg_do_dumpdata() { - import os - import os.path workdir = bb.data.getVar('WORKDIR', d, 1) distro = bb.data.getVar('DISTRO', d, 1) diff --git a/classes/src_distribute.bbclass b/classes/src_distribute.bbclass index 7d75c9e16f..22044752ef 100644 --- a/classes/src_distribute.bbclass +++ b/classes/src_distribute.bbclass @@ -3,7 +3,7 @@ SRC_DISTRIBUTECOMMAND[func] = "1" addtask distribute_sources before do_build after do_fetch python do_distribute_sources () { - import os, re, bb + import re bb.build.exec_func("do_fetch", d) diff --git a/classes/task.bbclass b/classes/task.bbclass index f3287ebf73..4edd704829 100644 --- a/classes/task.bbclass +++ b/classes/task.bbclass @@ -17,7 +17,6 @@ PACKAGE_ARCH = "all" # to the list. Their dependencies (RRECOMMENDS) are handled as usual # by package_depchains in a following step. python () { - import bb packages = bb.data.getVar('PACKAGES', d, 1).split() genpackages = [] for pkg in packages: diff --git a/classes/tinderclient.bbclass b/classes/tinderclient.bbclass index d2b2b33898..6c86d44a21 100644 --- a/classes/tinderclient.bbclass +++ b/classes/tinderclient.bbclass @@ -1,6 +1,5 @@ def tinder_http_post(d, server, selector, content_type, body): import httplib - from bb import data # now post it for i in range(0,5): try: @@ -61,8 +60,7 @@ def tinder_format_http_post(d,status,log): for the tinderbox to be happy. """ - from bb import data, build - import os,random + import random # the variables we will need to send on this form post variables = { diff --git a/classes/update-alternatives.bbclass b/classes/update-alternatives.bbclass index c63581c5d1..ddbf4c1947 100644 --- a/classes/update-alternatives.bbclass +++ b/classes/update-alternatives.bbclass @@ -11,7 +11,6 @@ update-alternatives --remove ${ALTERNATIVE_NAME} ${ALTERNATIVE_PATH} } def update_alternatives_after_parse(d): - import bb if bb.data.getVar('ALTERNATIVE_NAME', d) == None: raise bb.build.FuncFailed, "%s inherits update-alternatives but doesn't set ALTERNATIVE_NAME" % bb.data.getVar('FILE', d) if bb.data.getVar('ALTERNATIVE_PATH', d) == None: diff --git a/classes/update-rc.d.bbclass b/classes/update-rc.d.bbclass index 00ec37cfb8..b6491ed9d6 100644 --- a/classes/update-rc.d.bbclass +++ b/classes/update-rc.d.bbclass @@ -41,7 +41,6 @@ fi def update_rc_after_parse(d): - import bb if bb.data.getVar('INITSCRIPT_PACKAGES', d) == None: if bb.data.getVar('INITSCRIPT_NAME', d) == None: raise bb.build.FuncFailed, "%s inherits update-rc.d but doesn't set INITSCRIPT_NAME" % bb.data.getVar('FILE', d) -- cgit v1.2.3 From 9cbd93cd04ffa16a6b9aee5b6d63751777b91b16 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Nov 2009 12:46:10 +0000 Subject: package.bbclass: Add back import os until further metadata cleanups happen Signed-off-by: Richard Purdie --- classes/package.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/classes/package.bbclass b/classes/package.bbclass index 5de48d6bfb..246ecd4ecc 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -338,7 +338,7 @@ python perform_packagecopy () { } python populate_packages () { - import 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) -- cgit v1.2.3 From 777b4f6c6bfd9e76016eac833918b92d48c4918d Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Nov 2009 12:57:39 +0000 Subject: insane.bbclass: Remove hardcoded path PKGDEST issue Signed-off-by: Richard Purdie --- classes/insane.bbclass | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 49cfc095d3..495c3a53aa 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -453,13 +453,13 @@ def package_qa_walk(path, funcs, package,d): return sane -def package_qa_check_rdepends(pkg, workdir, d): +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) @@ -491,7 +491,7 @@ def package_qa_check_rdepends(pkg, workdir, d): # The PACKAGE FUNC to scan each package python do_package_qa () { 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 @@ -510,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: -- cgit v1.2.3 From 740361d57e6fae0bef9021b873dd2e56461c1d25 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 16 Nov 2009 14:51:17 +0100 Subject: bug: ship SDIO firmware for WiFi --- conf/machine/bug.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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" -- cgit v1.2.3 From ed895c630f648d7c2aa261777c21088be7b2020a Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 16 Nov 2009 14:51:30 +0100 Subject: MAINTAINERS: added BUG to my devices --- MAINTAINERS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3 From d20b32225e301d40d609106d1c055ffc84527fed Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Mon, 16 Nov 2009 14:51:56 +0100 Subject: xserver-xorg-conf: added BUG support --- .../xorg-xserver/xserver-xorg-conf/bug/xorg.conf | 65 ++++++++++++++++++++++ recipes/xorg-xserver/xserver-xorg-conf_0.1.bb | 2 +- 2 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 recipes/xorg-xserver/xserver-xorg-conf/bug/xorg.conf 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" -- cgit v1.2.3 From 2eb99471ec5f9c49a99b7349395d7dda0aee6b91 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Mon, 16 Nov 2009 17:05:25 +0000 Subject: kernel.bbclass: Revert import os removal for now Signed-off-by: Richard Purdie --- classes/kernel.bbclass | 1 + 1 file changed, 1 insertion(+) diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 8714aed0fd..fe611ab087 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -306,6 +306,7 @@ 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, re tempfile.tempdir = bb.data.getVar("WORKDIR", d, 1) -- cgit v1.2.3 From 10e531444fa17532a20fc12e036e95e5eef813c7 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Mon, 16 Nov 2009 15:10:42 -0600 Subject: owfs: disable swig to prevent doomed attempt to build a perl module. Signed-off-by: Dirk Opfer --- recipes/owfs/owfs_2.7p24.bb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/recipes/owfs/owfs_2.7p24.bb b/recipes/owfs/owfs_2.7p24.bb index 44fc878d7b..0cfc36f4b5 100644 --- a/recipes/owfs/owfs_2.7p24.bb +++ b/recipes/owfs/owfs_2.7p24.bb @@ -5,6 +5,8 @@ PRIORITY = "optional" LICENSE = "GPLv2" DEPENDS += "fuse virtual/libusb0" +PR = "r1" + SRC_URI = "${SOURCEFORGE_MIRROR}/owfs/owfs-${PV}.tar.gz \ file://owhttpd \ file://owserver " @@ -15,6 +17,7 @@ EXTRA_OECONF = " \ --enable-owhttpd \ --enable-cache \ --enable-mt \ + --disable-swig \ " do_install_prepend() { -- cgit v1.2.3 From 3d48522d8463918b26e4992658f615660092fe12 Mon Sep 17 00:00:00 2001 From: Mike Westerhof Date: Mon, 16 Nov 2009 15:16:12 -0600 Subject: SlugOS: add owfs to the package feeds --- recipes/meta/slugos-packages.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes/meta/slugos-packages.bb b/recipes/meta/slugos-packages.bb index 0129ffce79..2218079369 100644 --- a/recipes/meta/slugos-packages.bb +++ b/recipes/meta/slugos-packages.bb @@ -5,7 +5,7 @@ DESCRIPTION = "Packages that are compatible with the SlugOS firmware" HOMEPAGE = "http://www.nslu2-linux.org" LICENSE = "MIT" -PR = "r64" +PR = "r65" CONFLICTS = "db3" COMPATIBLE_MACHINE = "nslu2|ixp4xx" @@ -177,6 +177,7 @@ SLUGOS_PACKAGES = "\ openobex \ openssh \ openvpn \ + owfs \ patch \ pciutils \ perl \ -- cgit v1.2.3 From 1c70f2139252b2334884a612522355e60335bd68 Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Sun, 15 Nov 2009 14:07:42 +0100 Subject: svn recipes: change +svnr${SRCREV} +svnr${SRCPV} * Just formal change * No need to bump PE or PR Signed-off-by: Martin Jansa --- recipes/accelges/accelges_svn.bb | 2 +- recipes/aircrack/aircrack-ng_1.0-svn.bb | 2 +- recipes/bootchart-lite/bootchart-lite_svn.bb | 2 +- recipes/chromium/chromium_svn.bb | 2 +- recipes/clutter/aaina_svn.bb | 2 +- recipes/clutter/clutter-box2d_svn.bb | 2 +- recipes/clutter/clutter-cairo_svn.bb | 2 +- recipes/clutter/clutter-gst_0.4svn.bb | 2 +- recipes/clutter/clutter-gst_svn.bb | 2 +- recipes/clutter/clutter_0.4svn.bb | 2 +- recipes/clutter/clutter_0.6svn.bb | 2 +- recipes/clutter/clutter_svn.bb | 2 +- recipes/clutter/table_svn.bb | 2 +- recipes/clutter/tidy_svn.bb | 2 +- recipes/cwiid/cwiid_svn.bb | 2 +- recipes/dasher/dasher-gpe_0.0-svn.bb | 2 +- recipes/detect-stylus/detect-stylus_svn.bb | 2 +- recipes/dfu-util/dfu-util_svn.bb | 2 +- recipes/duke3d/duke3d_svn.bb | 2 +- recipes/e17/bubble-keyboard_svn.bb | 2 +- recipes/e17/diskio_svn.bb | 2 +- recipes/e17/e-wm_svn.bb | 2 +- recipes/e17/edje-editor_svn.bb | 2 +- recipes/e17/edje-player_svn.bb | 2 +- recipes/e17/edje-viewer_svn.bb | 2 +- recipes/e17/elementary-alarm_svn.bb | 2 +- recipes/e17/elementary-sms_svn.bb | 2 +- recipes/e17/enna_svn.bb | 2 +- recipes/e17/essential-dialer_svn.bb | 2 +- recipes/e17/exalt-client_svn.bb | 2 +- recipes/e17/exalt_svn.bb | 2 +- recipes/e17/exhibit_svn.bb | 2 +- recipes/e17/expedite_svn.bb | 2 +- recipes/e17/exquisite-theme-illume.bb | 2 +- recipes/e17/exquisite_svn.bb | 2 +- recipes/e17/flame_svn.bb | 2 +- recipes/e17/gridpad_svn.bb | 2 +- recipes/e17/intuition_svn.bb | 2 +- recipes/e17/news_svn.bb | 2 +- recipes/e17/places_svn.bb | 2 +- recipes/e17/rage_svn.bb | 2 +- recipes/e17/rain_svn.bb | 2 +- recipes/e17/waker_svn.bb | 2 +- recipes/eds/eds-dbus_svn.bb | 2 +- recipes/efl1/ecore.inc | 2 +- recipes/efl1/edb_svn.bb | 2 +- recipes/efl1/edbus_svn.bb | 2 +- recipes/efl1/edje_svn.bb | 2 +- recipes/efl1/eet_svn.bb | 2 +- recipes/efl1/eflpp_svn.bb | 2 +- recipes/efl1/efreet_svn.bb | 2 +- recipes/efl1/eina_svn.bb | 2 +- recipes/efl1/elementary_svn.bb | 2 +- recipes/efl1/embryo_svn.bb | 2 +- recipes/efl1/emotion_svn.bb | 2 +- recipes/efl1/engrave_svn.bb | 2 +- recipes/efl1/enhance_svn.bb | 2 +- recipes/efl1/epdf_svn.bb | 2 +- recipes/efl1/epeg_svn.bb | 2 +- recipes/efl1/epsilon_svn.bb | 2 +- recipes/efl1/esmart_svn.bb | 2 +- recipes/efl1/etk_svn.bb | 2 +- recipes/efl1/evas.inc | 2 +- recipes/efl1/evolve_svn.bb | 2 +- recipes/efl1/ewl_svn.bb | 2 +- recipes/efl1/exml_svn.bb | 2 +- recipes/efl1/imlib2_svn.bb | 2 +- recipes/efl1/libefso_svn.bb | 2 +- recipes/eglibc/eglibc_svn.bb | 2 +- recipes/exmap-console/exmap-console_svn.bb | 2 +- recipes/ezx/ezx-boot-usb-native_svn.bb | 2 +- recipes/ezx/ezxd_svn.bb | 2 +- recipes/ffmpeg/ffmpeg_svn.bb | 2 +- recipes/flashrom/flashrom_svn.bb | 2 +- recipes/gabriel/gabriel_svn.bb | 2 +- recipes/gcc/gcc-svn.inc | 2 +- recipes/gimp/babl_svn.bb | 2 +- recipes/gimp/gegl_svn.bb | 2 +- recipes/gnet/gnet_svn.bb | 2 +- recipes/gnome/epiphany_svn.bb | 2 +- recipes/gnome/gconf-dbus_svn.bb | 2 +- recipes/gpe-conf/gpe-conf_svn.bb | 2 +- recipes/gpe-contacts/gpe-contacts_svn.bb | 2 +- recipes/gpe-gallery/gpe-gallery_svn.bb | 2 +- recipes/gpe-mini-browser/gpe-mini-browser2_svn.bb | 2 +- recipes/gpe-sketchbook/gpe-sketchbook_svn.bb | 2 +- recipes/gsm/gsmd.inc | 2 +- recipes/gtk-engines/gtk-sato-engine_svn.bb | 2 +- recipes/gtk-webcore/osb-browser_svn.bb | 2 +- recipes/gtk-webcore/osb-jscore_svn.bb | 2 +- recipes/gtk-webcore/osb-nrcit_svn.bb | 2 +- recipes/gtk-webcore/osb-nrcore_svn.bb | 2 +- recipes/gtkhtml2/gtkhtml2_svn.bb | 2 +- recipes/gypsy/gypsy_svn.bb | 2 +- recipes/irrlicht/irrlicht-examples-gles.bb | 2 +- recipes/kde4/kde4.inc | 2 +- recipes/kismet/kismet-newcore_svn.bb | 2 +- recipes/kismet/kismet_svn.bb | 2 +- recipes/libfakekey/libfakekey_svn.bb | 2 +- recipes/libowl/libowl_svn.bb | 2 +- recipes/librfid/librfid_svn.bb | 2 +- recipes/libw100/libw100_svn.bb | 2 +- recipes/libxosd/libxosd_svn.bb | 2 +- recipes/linux/linux-bfin_svn.bb | 2 +- recipes/linux/linux-ixp4xx_2.6.18.bb | 2 +- recipes/linux/linux-ixp4xx_2.6.19.bb | 2 +- recipes/linux/linux-ixp4xx_2.6.20.bb | 2 +- recipes/linux/linux-ixp4xx_2.6.21.7.bb | 2 +- recipes/linux/linux-ixp4xx_2.6.23.14.bb | 4 ++-- recipes/linux/linux-ixp4xx_2.6.24.7.bb | 4 ++-- recipes/linux/linux-ixp4xx_2.6.27.8.bb | 4 ++-- recipes/linux/linux-ixp4xx_2.6.29.bb | 4 ++-- recipes/llvm/llvm-gcc4-cross_svn.bb | 2 +- recipes/llvm/llvm-gcc4_svn.bb | 2 +- recipes/llvm/llvm2.7-native_2.6+svnr20090916.bb | 2 +- recipes/llvm/llvm2.7_2.6+svnr20090916.bb | 2 +- recipes/maemo-mapper/maemo-mapper_svn.bb | 2 +- recipes/matchbox-config-gtk/matchbox-config-gtk_svn.bb | 2 +- recipes/matchbox-desktop-sato/matchbox-desktop-sato_svn.bb | 2 +- recipes/matchbox-keyboard/matchbox-keyboard-inputmethod_svn.bb | 2 +- recipes/matchbox-keyboard/matchbox-keyboard_svn.bb | 2 +- recipes/matchbox-panel/matchbox-panel_svn.bb | 2 +- recipes/matchbox-stroke/matchbox-stroke_svn.bb | 2 +- recipes/matchbox-terminal/matchbox-terminal_svn.bb | 2 +- recipes/matchbox-themes-extra/matchbox-theme-sato_svn.bb | 2 +- recipes/matchbox2/matchbox-desktop-2_svn.bb | 2 +- recipes/matchbox2/matchbox-panel-2-icon-themes_0.0.1.bb | 2 +- recipes/matchbox2/matchbox-panel-2_svn.bb | 2 +- recipes/matchbox2/matchbox-wm-2_svn.bb | 2 +- recipes/mokoko/mokoko_svn.bb | 2 +- recipes/mono/mono_svn.inc | 2 +- recipes/mplayer/mplayer-maemo_svn.bb | 2 +- recipes/mplayer/mplayer_svn.bb | 2 +- recipes/multitap-pad/multitap-pad_svn.bb | 2 +- recipes/mythtv/mythtv_svn.bb | 2 +- recipes/netsurf/netsurf_svn.bb | 2 +- recipes/networkmanager/networkmanager-applet_svn.bb | 2 +- recipes/networkmanager/networkmanager_svn.bb | 2 +- recipes/numptyphysics/numptyphysics_svn.bb | 2 +- recipes/obsolete/wesnoth_svn.bb | 2 +- recipes/ogre/ogre-egl_svn.bb | 2 +- recipes/opencv/opencv-samples_svn.bb | 2 +- recipes/opencv/opencv_svn.bb | 2 +- recipes/openmoko-base/openmoko-common_svn.bb | 2 +- recipes/openmoko-base/openmoko-icon-theme-standard_svn.bb | 2 +- recipes/openmoko-base/openmoko-libs_svn.bb | 2 +- recipes/openmoko-base/openmoko-session_svn.bb | 2 +- recipes/openmoko-base/openmoko-sound-theme-standard_svn.bb | 2 +- recipes/openmoko-base/openmoko-theme-standard-qvga_svn.bb | 2 +- recipes/openmoko-base/openmoko-theme-standard_svn.bb | 2 +- recipes/openmoko-examples/openmoko-finger-demo_svn.bb | 2 +- recipes/openmoko-examples/openmoko-panel-demo-simple_svn.bb | 2 +- recipes/openmoko-examples/openmoko-panel-demo_svn.bb | 2 +- recipes/openmoko-examples/openmoko-stylus-demo-simple_svn.bb | 2 +- recipes/openmoko-examples/openmoko-stylus-demo_svn.bb | 2 +- recipes/openmoko-projects/assassin-thumbnail.bb | 2 +- recipes/openmoko-projects/assassin_svn.bb | 2 +- recipes/openmoko-projects/diversity-daemon_svn.bb | 2 +- recipes/openmoko-projects/diversity-radar_svn.bb | 2 +- recipes/openmoko-projects/enlazar_svn.bb | 2 +- recipes/openmoko-projects/etk-theme-ninja_svn.bb | 2 +- recipes/openmoko-projects/illume-theme-asu_svn.bb | 2 +- recipes/openmoko-projects/om-settings_svn.bb | 2 +- recipes/openmoko-projects/openmoko-agpsui_svn.bb | 2 +- recipes/openmoko-projects/pyefl-sudoku_svn.bb | 2 +- recipes/openmoko-system/ompower_svn.bb | 2 +- recipes/openmoko-tools/app-restarter_svn.bb | 2 +- recipes/openmoko-tools/openmoko-set-root-password.bb | 2 +- recipes/openmoko-tools/openmoko-toolchain-scripts_svn.bb | 2 +- recipes/openmoko2/libjana_svn.bb | 2 +- recipes/openmoko2/libmokogsmd2_svn.bb | 2 +- recipes/openmoko2/libmokojournal2_svn.bb | 2 +- recipes/openmoko2/libmokopanelui2_svn.bb | 2 +- recipes/openmoko2/libmokoui2_svn.bb | 2 +- recipes/openmoko2/moko-gtk-engine_svn.bb | 2 +- recipes/openmoko2/neod_svn.bb | 2 +- recipes/openmoko2/openmoko-alsa-scenarios.bb | 2 +- recipes/openmoko2/openmoko-appearance_svn.bb | 2 +- recipes/openmoko2/openmoko-appmanager2_svn.bb | 2 +- recipes/openmoko2/openmoko-browser2_svn.bb | 2 +- recipes/openmoko2/openmoko-calculator2_svn.bb | 2 +- recipes/openmoko2/openmoko-common2_svn.bb | 2 +- recipes/openmoko2/openmoko-contacts2_svn.bb | 2 +- recipes/openmoko2/openmoko-dates2_svn.bb | 2 +- recipes/openmoko2/openmoko-dialer2_svn.bb | 2 +- recipes/openmoko2/openmoko-feedreader2_svn.bb | 2 +- recipes/openmoko2/openmoko-firststart2_svn.bb | 2 +- recipes/openmoko2/openmoko-icon-theme-standard2-qvga_svn.bb | 2 +- recipes/openmoko2/openmoko-icon-theme-standard2_svn.bb | 2 +- recipes/openmoko2/openmoko-mediaplayer2_svn.bb | 2 +- recipes/openmoko2/openmoko-messages2_svn.bb | 2 +- recipes/openmoko2/openmoko-sample2_svn.bb | 2 +- recipes/openmoko2/openmoko-sound-theme-standard2_svn.bb | 2 +- recipes/openmoko2/openmoko-tasks2_svn.bb | 2 +- recipes/openmoko2/openmoko-theme-standard2-qvga_svn.bb | 2 +- recipes/openmoko2/openmoko-theme-standard2_svn.bb | 2 +- recipes/openmoko2/openmoko-today2-folders_svn.bb | 2 +- recipes/openmoko2/openmoko-today2_svn.bb | 2 +- recipes/openmoko2/openmoko-worldclock2_svn.bb | 2 +- recipes/openocd/openocd_svn.bb | 2 +- recipes/opkg/opkg.inc | 2 +- recipes/oprofile/oprofileui-svn.inc | 2 +- recipes/pimlico/contacts_svn.bb | 2 +- recipes/pimlico/dates_svn.bb | 2 +- recipes/pimlico/tasks_svn.bb | 2 +- recipes/portaudio/portaudio-v19_svn.bb | 2 +- recipes/psplash/psplash.inc | 2 +- recipes/puzzles/oh-puzzles_svn.bb | 2 +- recipes/python/python-coherence_svn.bb | 2 +- recipes/python/python-connexion_svn.bb | 2 +- recipes/python/python-efl.inc | 2 +- recipes/python/python-elementary_svn.bb | 2 +- recipes/python/python-etk_svn.bb | 2 +- recipes/python/python-pyyaml_svn.bb | 2 +- recipes/python/python-wpactrl_svn.bb | 2 +- recipes/qemu/qemu_svn.bb | 2 +- recipes/quake/ioquake3_svn.bb | 2 +- recipes/quake/quake2_svn.bb | 2 +- recipes/remoko/remoko-server_svn.bb | 2 +- recipes/remoko/remoko_svn.bb | 2 +- recipes/samsung-soc-utils/s3c2410-boot-usb-native_svn.bb | 2 +- recipes/samsung-soc-utils/s3c24xx-gpio_svn.bb | 2 +- recipes/samsung-soc-utils/s3c64xx-gpio_svn.bb | 2 +- recipes/samsung-soc-utils/sjf2410-linux-native_svn.bb | 2 +- recipes/settings-daemon/settings-daemon_svn.bb | 2 +- recipes/smpeg/smpeg_svn.bb | 2 +- recipes/socketcan/socketcan-modules_svn.bb | 2 +- recipes/socketcan/socketcan-utils-test_svn.bb | 2 +- recipes/sphyrna/sphyrna-python_svn.bb | 2 +- recipes/ti/bitblit_svn.bb | 2 +- recipes/tinymail/libtinymail_svn.bb | 2 +- recipes/tinymail/tmut_svn.bb | 2 +- recipes/tslib/tslib_svn.bb | 2 +- recipes/u-boot/u-boot-bug_svn.bb | 2 +- recipes/uclibc/bfin-uclibc_svn.bb | 2 +- recipes/uclibc/elf2flt_svn.bb | 2 +- recipes/usbpath/usbpath_svn.bb | 2 +- recipes/webif/webif_svn.bb | 2 +- recipes/webkit/webkit-gtk_svn.bb | 2 +- recipes/webkit/webkit.inc | 2 +- recipes/wlan-ng/wlan-ng-modules_svn.bb | 2 +- recipes/wlan-ng/wlan-ng-utils_svn.bb | 2 +- recipes/wmiconfig/wmiconfig_svn.bb | 2 +- recipes/xoo/xoo_svn.bb | 2 +- 244 files changed, 248 insertions(+), 248 deletions(-) diff --git a/recipes/accelges/accelges_svn.bb b/recipes/accelges/accelges_svn.bb index 838290bf0a..3c3c8ac898 100644 --- a/recipes/accelges/accelges_svn.bb +++ b/recipes/accelges/accelges_svn.bb @@ -4,7 +4,7 @@ AUTHOR = "Paul V. Borza" LICENSE = "GPL" SECTION = "openmoko/utilities" -PV = "0.2+svnr${SRCREV}" +PV = "0.2+svnr${SRCPV}" PR = "r2" PE = "1" DEPENDS = "dbus dbus-glib libxrandr libnotify notification-daemon curl gtk+" diff --git a/recipes/aircrack/aircrack-ng_1.0-svn.bb b/recipes/aircrack/aircrack-ng_1.0-svn.bb index 0f0f7f532d..37af3d5646 100644 --- a/recipes/aircrack/aircrack-ng_1.0-svn.bb +++ b/recipes/aircrack/aircrack-ng_1.0-svn.bb @@ -3,7 +3,7 @@ HOMEPAGE = "http://www.aircrack-ng.org/" SECTION = "console/network" LICENSE = "GPLv2" DEPENDS = "openssl zlib sqlite3" -PV = "0.9.99+svnr${SRCREV}" +PV = "0.9.99+svnr${SRCPV}" PR = "r1" SRC_URI = "svn://trac.aircrack-ng.org/svn/branch;module=1.0-dev;proto=http" diff --git a/recipes/bootchart-lite/bootchart-lite_svn.bb b/recipes/bootchart-lite/bootchart-lite_svn.bb index 092aee9dcd..2220560070 100644 --- a/recipes/bootchart-lite/bootchart-lite_svn.bb +++ b/recipes/bootchart-lite/bootchart-lite_svn.bb @@ -3,7 +3,7 @@ AUTHOR = "Fred Chien" LICENSE = "GPLv2" SECTION = "console/utils" HOMEPAGE = "http://code.google.com/p/bootchart-lite/" -PV = "0.1+svnr${SRCREV}" +PV = "0.1+svnr${SRCPV}" PR = "r0" SRC_URI = "svn://bootchart-lite.googlecode.com/svn/;module=t