summaryrefslogtreecommitdiff
path: root/meta/classes
Commit message (Collapse)AuthorAgeFilesLines
* blacklist: fix typo in nameMark Hatle2012-05-111-0/+20
| | | | | | | | Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Import directly from meta-openembedded commit: a63c374cdc785ade69d2998978d08280e671dc1f Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
* libc-package.bbclass: Add MLPREFIX while dynamically set RDEPENDSDongxiao Xu2012-05-091-5/+7
| | | | | | We need to add MLPREFIX when set RDEPENDS by setVar() function. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
* image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage siteinfoTing Liu2012-05-091-1/+6
| | | | Signed-off-by: Ting Liu <b28495@freescale.com>
* sanity.bbclass: Implement initial toolchain sanity checksPeter Seebach2012-05-091-0/+73
| | | | | | | | | | | | | | | | | This introduces a sanity check for the toolchain, which verifies each tuning (including any multilibs), producing meaningful diagnostics for problems, and also provides some higher-level tuning features. The TUNEVALID and TUNECONFLICT/TUNECONFLICTS settings were not implemented. Listed one or two missing features in TUNEVALID, also (in a previous patch) fixed the references to features which didn't exist. This patch also provides a whitelisting mechanism (which is completely unused) to allow vendors providing prebuilt toolchain components to restrict tunings to those based on or compatible with a particular ABI. Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
* linux-yocto: streamline support for multiple upstream repo typesBruce Ashfield2012-05-081-55/+60
| | | | | | | | | | | | | | | | | In order to support repositories of various types (with or without meta data, branched, pristine, custom, etc) information about the type of processing that is required was passed to the processing phases via variables. The combination of variables involved in coordinating the processing creates a learning curve and overly complicates recipe extensions. With minor tweaks to the kern-tools, adding flexibility and keying off the existence of the meta branch it is possible to remove all of the variables that were added to support different repository types. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
* image.bbclass,kernel.bbclass: Use kmod-native instead of module-init-tools-crossKhem Raj2012-05-062-5/+4
| | | | Signed-off-by: Khem Raj <raj.khem@gmail.com>
* terminal.bbclass, oe-buildenv-internal: pass SCREENDIR environment variableJason Wessel2012-05-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | Some versions of the screen utility provided from the host OS vendor write the socket directory to $HOME/.screen. When using a shared home directory across many servers, one sets the SCREENDIR environment variable to avoid collisions in the shared home directory. This results in problems launching a devshell where it is not entirely obvious what happened because the SCREENDIR environment variable got stripped from the environment prior to setting up the screen in detached mode. Example: % bitbake -c devshell busybox # ...Please connect in another terminal with "screen -r devshell" % screen -r devshell There is no screen to be resumed matching devshell. The temporary work around was to do something like: sh -c "unset SCREENDIR; screen -r devshell" This patch adds SCREENDIR to the white list to ensure screen works properly on systems where a developer needs to use the SCREENDIR with shared home directories. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* buildhistory: fix multiple commit of images and packages at the same timePaul Eggleton2012-05-041-1/+1
| | | | | | | | | | | | | The echo line here was merging multiple lines into one, and the result was that if both image and package changes had to be comitted then only the image changes were being committed and the package changes could potentially be merged into the next package change. Quoting the variable reference fixes this. Fixes [YOCTO #2411] Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel.bbclass: move kernel-vmlinux up in PACKAGESChristopher Larson2012-05-031-1/+1
| | | | | | | | | If KERNEL_IMAGETYPE is vmlinux, the expectation is most likely that there will be no kernel image package, but we still want a vmlinux package for debugging, so move kernel-vmlinux in front of kernel-image in PACKAGES. Signed-off-by: Christopher Larson <kergoth@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* libc-package: rework ''precompiled' locale handlingChristopher Larson2012-05-031-51/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There were a couple problems with the handling of precompiled locales. - it gathered the list of locales from the directories - this breaks due to the naming mismatch, e.g. en_US.UTF-8 vs en_US.utf8. - it retained its hardcoded assumption that the non-suffixed locale (en_US, as opposed to en_US.*) is UTF-8, while the others are otherwise. Hardcoding this is both inflexible and just plain wrong for some toolchains. It's most common in desktop distros for 'en_US' to be non-utf8, and ''en_US.UTF-8' is utf8, and this is the case in some external toolchains as well. The code now uses the SUPPORTED file to hold the knowledge it needs. This file not only holds the list of locales to generate, but also maps the locale names to the charsets they correspond to. The code now uses this to assemble its charset map, falling back to the '.' suffix as charset when the locale is not in the map. For precompiled, it now uses the locale->charset knowledge it has, thereby allowing non-utf8 non-suffixed locale names, whereas for non-precompiled, it reverts to the previous assumption, renaming the utf8 locale and forcibly suffixing the others. So, a person maintaining an external toolchain recipe is responsible for ensuring that the SUPPORTED file they provide matches up with the compiled locales in the toolchain, if they want to utilize precompiled locales. I believe in the long term the compiled case should do the same thing precompiled does, and use SUPPORTED or a similar mechanism to encode the knowledge, and if people want all the non-suffixed names to be utf8, they can change that file to do so. This would avoid the hardcoded assumption in the code, as well as consolidating the behavior between the compiled and precompiled cases. Signed-off-by: Christopher Larson <kergoth@gmail.com>
* base.bbclass: use isinstance for base_eventhandlerChristopher Larson2012-05-031-10/+6
| | | | Signed-off-by: Christopher Larson <kergoth@gmail.com>
* bitbake.conf: shift build config summary control to hereChristopher Larson2012-05-031-16/+34
| | | | Signed-off-by: Christopher Larson <kergoth@gmail.com>
* package_rpm: Only rebuild the indexes if the packages have changedRichard Purdie2012-04-271-14/+4
| | | | | | | | | | | | This change farms the solvedb creation out to a separate script which handles creation of the index, only if mtime of any of the packages has changed. For a core-image-minimal set of rpm's this saves ~20s of a 45s rootfs build. For core-image-sato it saves 1 minute of a 5 minute rootfs build. The more packages in the system, the bigger the saving will be. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: Replace shell provides/requires script with python versionRichard Purdie2012-04-261-9/+13
| | | | | | | | | | | | The existing shell script is a fork bomb and forks off hundreds of grep/cur/wc calls as it reads from its input stream and iterates over the file data table for each line of input. This patch replaces the shell code with python code which doesn't exec anything and hence runs much faster without the exec() overhead. This speeds up rpm packaging considerably, as can be measured simply by timing it, or watching the processor utilisation. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes: Add recipe class to overridesRichard Purdie2012-04-266-1/+6
| | | | | | | | | | | | | | | | | | | | | We have currently no override to detect a recipe being build cross, crosssdk or for target at times we can use virtclass-native and virtclass-nativesdk to override stuff in recipes but we dont have way to modify a variables based on recipe type always. This patch adds in such an override and in particular makes a target override class available. With this change now we can say: EXTRA_OECONF_class-target = "...." EXTRA_OECONF_class-native = "..." EXTRA_OECONF_class-nativesdk = "..." EXTRA_OECONF_class-crosssdk= "..." Based of an original patch by Khem Raj Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* {kernel, module}.bbclass: don't run depmod for module packages during do_rootfsAndreas Oberritter2012-04-242-7/+4
| | | | | | | | | | | | | | | * depmod already gets executed by pkg_postinst_kernel-image. * If you build a module using module.bbclass, pkg_postinst returns 1 in do_rootfs, causing pkg_postinst to run again on first boot. To improve this situation, I copied pkg_postinst from kernel.bbclass to module.bbclass. This was rejected by Koen, because he doesn't like the code from kernel.bblcass, which uses ${STAGING_DIR_KERNEL}. Richard then suggested that calling depmod during do_rootfs wasn't necessary at all, because it already gets done by kernel-image. Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel.bbclass: unify white spacesMartin Jansa2012-04-241-13/+13
| | | | | | | | | | * indentation was with spaces and tabs, unify to use tabs instead of spaces, for shell code and populate_packages_preppend, because "python populate_packages" expects tabs (or 8 spaces) * and use 4 spaces for anonymous python Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel.bbclass: merge uboot_mkimage improvements from meta-oeMartin Jansa2012-04-241-16/+25
| | | | | | | | * allows to detect ENTRYPOINT from kernel binary marked with UBOOT_ENTRYSYMBOL used e.g. by ben-nanonote Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: Testing via env in create_wrapper is a nice idea but breaks ↵Richard Purdie2012-04-241-3/+1
| | | | | | | | | | | | things For example, pseudo-native wants to set LD_LIBRBARY_PATH but setting this into the environment here causes the existing pseudo (running during do_install) to poke into paths in /opt and this breaks builds. The simplest fix is simply not to do this. Comments tweaks to match the code. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bootimg.bbclass: Tweak iso images to become hybrid imagesDamien Lespiau2012-04-241-0/+2
| | | | | | | | | | | This allows iso images to be written to usb keys and booted on systems which have a BIOS which support this. There is no real down side to tweaking the iso images in this way. [YOCTO #1763 partial] Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* kernel: Fix packaging issueSaul Wold2012-04-241-1/+1
| | | | | | | | | | | | Remove /etc since it is empty, when creating a machine that does not deliver any module config files, the /etc is empty and is then warned about not being shipped, so we remove it. This occurs in the routerstationpro with the following warning: WARNING: For recipe linux-yocto, the following files/directories were installed but not shipped in any package: WARNING: /etc Signed-off-by: Saul Wold <sgw@linux.intel.com>
* quilt: move empty quiltrc to native sysconfdirSaul Wold2012-04-241-1/+1
| | | | | | | | | | | | patch.bbclass orignally pointed at /usr/bin/quiltrc for an empty version to ensure that no user setting were picked up, change this to /etc/quiltrc in the Native sysroot since we now have a native sysconfdir. Make sure that the quiltrc is actually installed in the Native sysconfdir, not the target, so fix this after the recipe split. Signed-off-by: Saul Wold <sgw@linux.intel.com>
* sanity.bbclass: Add a new case to issue sanity_check()Dongxiao Xu2012-04-241-0/+3
| | | | | | | | Judge if "SanityCheck" event is received, it will issue the sanity_check() and send "SanityCheckPassed" back if succeeded. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sanity.bbclass: add variable to disable the sanity checksJoshua Lock2012-04-231-1/+1
| | | | | | | | | | | It's useful for Hob to be able to disable the sanity checks completely without marking them as passed so that the user can get into the GUI to configure their settings, etc. Add a variable, DISABLE_SANITY_CHECKS, to do so. Signed-off-by: Joshua Lock <josh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package.bbclass: Ensure kernel modules get strippedRichard Purdie2012-04-221-0/+8
| | | | | | | | Kernel modules are not marked as executable but we do expect to strip them. This patch adds in missing code to ensure we do this. Without this images are getting sigificantly bloated in size. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gettext.bbclass: Ensure we don't overwrite other DEPENDS_GETTEXT valuesRichard Purdie2012-04-221-1/+1
| | | | | | | | In particular, this overwrites the value from cross-canadian.bbclass in some cases which isn't the desired behaviour and unnecessarily complicates/breaks the dependency chain. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* packageinfo.bbclass: A workaround for RPM architecture renamingDongxiao Xu2012-04-181-1/+12
| | | | | | | | | | | For beagleboard platform, the PACKAGE_ARCH for certain recipes is "armv7a-vfp-neon", however, the architecture label in RPM file name is "armv7a" due to a potential bug in RPM backend. This commit is a workaround to make Hob work in this case. Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/sanity: import regular expression module in SuSE distro checkPaul Eggleton2012-04-181-0/+1
| | | | | | | | We call re.sub here, so we need to "import re" or an error occurs (tested on OpenSuSE 12.1). Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/sanity: trim trailing newline when reading /etc/redhat-releasePaul Eggleton2012-04-181-1/+1
| | | | | | | | Any trailing whitespace needs to be stripped before comparing it to the SANITY_TESTED_DISTROS list. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto: .diff is a valid patch extensionBruce Ashfield2012-04-171-1/+1
| | | | | | | | | | | | | | | In fixing an existing patch migration bug, the list of valid extensions got out of sync from the core patch class. As a result, valid patches were not being applied to the tree. Updating the tools to migrate .diff files fixes the issue. Also in this fix is the removal of .patch in the find_sccs() routine, since it will never be returned by patch.bbclass when all non-patches are requested, it is simply confusing. Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sanity.bbclass: If the sanity tests fail, don't mark them as completeRichard Purdie2012-04-171-1/+1
| | | | | | | | | If the sanity tests fail, we still were writing out the stamp which means they'd get skipped the next time we run bitbake. This is clearly wrong and we should only write out the stamp file if the sanity tests complete successfully. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* distrodata.bbclass: fix comment typoOtavio Salvador2012-04-161-1/+1
| | | | | | | | | | Fixes: - xf86-intput-synaptics-12.6.9.tar.gz + xf86-input-synaptics-12.6.9.tar.gz Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Multilib: Fix RDEPENDS in libc-package.bbclass, useradd.bbclass...Zhai Edwin2012-04-163-3/+4
| | | | | | | MLPREFIX is needed in RDEPENDS for multilib build Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* mulitlib.bbclass: Ensure correct value of ALL_MULTILIB_PACKAGE_ARCHS is ↵Richard Purdie2012-04-141-0/+3
| | | | | | | | | | | | | | | preserved The value of ALL_MULTILIB_PACKAGE_ARCHS needs to be consistent both in multilib extended recipes and in normal context. If this isn't the case it can lead to inconsistent configuration files at a minimum. This patch ensures the value is preserved during the class extension code since computing it after that point is hard. [YOCTO #2290] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* update-alternatives: Fix for compatibility with multilib recipesRichard Purdie2012-04-141-2/+3
| | | | | | | | | | The PN == BPN test was designed to exclude native/nativesdk but also unfortunately excludes multilib unintentionally. This change fixes this and allows multilib images with alternatives to funciton correctly. [YOCTO #2214] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* linux-yocto: allow .cfg, .scc, .patch and defconfigs to be processed in orderBruce Ashfield2012-04-131-67/+7
| | | | | | | | | | | | | | | | | | | | | | | | During testing/extension of the linux-yocto-tiny kernel it was found that defconfigs were not always properly applied. This was due to two issues: - not being able to fully control the order of objects applied to the git tree on the SRC_URI - defconfigs triggering --allnoconfig before being applied To fix this, the recipe space code that previously detected and generated automatic features moves back to the kernel tools (where it was before) and is updated to also process .cfg and defconfigs. Moving this back to the tools allow other recipes to automatically benefit from the additional support. The second issue is addressed by allowing configme to take --alldefconfig when a recipe wishes to pass a defconfig and override the default behaviour. Fixes [YOCTO: 2250] Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* base.bbclass: Fix PACKAGECONFIG issues with native and nativesdk ↵Richard Purdie2012-04-131-5/+31
| | | | | | | | | | | | | | | | | | | | | | | BBCLASSEXTEND recipes (and multilib) This patch fixes up the issues that were being seen where BBCLASSEXTEND and PACKAGECONFIG were interacting badly. It also ensures PACKAGECONFIG interacts properly with multilib builds. Ideally some of this code will be abstracted into lib/oe/classextend.py but at this point in release more invasive changes like this are inappropriate. This patch also removed empty strings from expressions rather than passing them around as this was complicating the additional code unnecessarily. The patch was verified against the OE-Core metadata where the return values of expandFilter() were sanity checked by hand for native/nativesdk and multilib combinations. [YOCTO #2225] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: Set tmppath for rpm to somewhere which won't conflict ↵Richard Purdie2012-04-121-0/+1
| | | | | | | | | | | | | | | with the rootfs If the rootfs has a specific layout in mind for /var/tmp, it should be free to create this. Preinst scripts trigger rpm to create its tmppath directory which could potentially conflict with this. We're seeing issues if the provider of the /var/tmp wants to use a symlink and a preinst script executes before it has been installed. This change places tmppath as used by rpm somewhere safe which is already automatically cleaned up too. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm.bbclass: Use the correct macros file to avoid empty solvedb path ↵Richard Purdie2012-04-121-2/+1
| | | | | | issues Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_rpm: Fix useradd preinst ordering issuesRichard Purdie2012-04-121-16/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | We were already having occasional ordering issues with package_rpm. Fixing the ldconfig postinstall issue pushed rpm over the cliff and totally broke rpm builds with the packages getting installed in effectively a random order and the useradd preinstalls getting executed out of order and breaking. The only explanation I can find for this is that rpm is special. It will happily run a preinst for a package without any of that package's dependencies being present regardless of whether there are any circular dependency issues or not. I attempted various ways of solving this such as ordering the total_solution.manifest in creative ways but the bottom line is RPM ignores this. It takes little account of any request to ignore /bin/sh dependencies for the purposes of constructing the final image. The end result is we're having to install the base-passwd, base-files and shadow packages first (if there is a request to install them), then install any other packages. It this wasn't in the middle of a release I'd be rewriting this bbclass file, its horrible. Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* insane.bbclass: Add missing variable bpnNoor Ahsan2012-04-111-0/+1
| | | | | | | * bpn variable was used but it was not defined. Add bpn to resolve that issue. Signed-off-by: Noor Ahsan <noor_ahsan@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* "The suite of statements in a function definition executes with a local ↵Andrei Gherzan2012-04-111-1/+4
| | | | | | | | | | | | | | | | | | namespace that is different from the global namespace. This means that all variables created within a function are local to that function. When the suite finishes, these working variables are discarded." In this way the needs_ldconfig variable in linux_so never gets True in the statements below this function. As global statement is generally discouraged, a return value would be a clean and fast way to solve this issue. [YOCTO #2205] RP: Added logic to ensure the value doesn't get overwritten once set Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>--- Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* archiver.bbclass: Amend the problem for moving tarballs in ${DL_DIR} to ↵Xiaofeng Yan2012-04-111-0/+1
| | | | | | | | | | | | | | | | | | ${DEPLOY_DIR}/source when enable archiver When running "bitbake core-imamge-minmal", the error information like the following will appear: ERROR: Error executing a python function in /buildarea2/yzhao-test/poky-test/meta/recipes-core/zlib/zlib_1.2.6.bb: IOError: [Errno 2] No such file or directory: '/buildarea2/yzhao-test/poky-test/build-archive/downloads/zlib-1.2.6.tar.bz2' An absolute path from variable "file" pointed to tarballs in ${DL_DIR} \ cause this problem. So return base-name of "file" for fixing this bug here. [YOCTO #2272] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* classes/package_deb: create .gz index instead of .bz2Paul Eggleton2012-04-111-1/+1
| | | | | | | | | | | | | | | apt is looking for Packages.gz files instead of the .bz2 files we are currently creating and failing when they cannot be found. It is not immediately obvious how to make the current version use the .bz2 indexes; thus create .gz indexes for now which allows us to successfully create images. Tested on both a Fedora 14 and an Ubuntu 11.10 host machine. Fixes [YOCTO #1858]. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* boot-directdisk: remove the default setting of SYSLINUXCFG and SYSLINUXMENUSaul Wold2012-04-111-3/+0
| | | | | | | | | These two should get setup in {S} and installed into {HDDDIR}, by having them defined with {HDDDIR} they try to get created when the directory does not exist yet. Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package_ipk.bbclass: fixing muttilib prefix extracting.Lianhao Lu2012-04-061-2/+2
| | | | | | Fixed an error in multilib prefix extracting. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
* package_ipk: don't generate Packages.filelistMartin Jansa2012-04-061-1/+1
| | | | | | | * it works only with 'new' packages and with fixed opkg-utils it will unpack *all* packages, because filelist doesn't support 'cache' like Packages does Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
* archive-patched-source.bbclass: Archive patched sourceXiaofeng Yan2012-04-041-0/+14
| | | | | | | | This bbclass inherits archiver.bbclass to archive patched source [YOCTO #1977] Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
* archiver.bbclass: enhance code readabilityXiaofeng Yan2012-04-041-119/+108
| | | | | | | | | The modification is as follow: - Modify some codes with more preferable readability and vague description. - Use existed functions instead of custom functions. Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
* eglibc packaging: locale packaging configurationNitin A Kamble2012-04-041-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The PACKAGE_NO_GCONV var manipulations ware happening in the eglibc-options.inc file, and the eglibc-locale recipe do not see it. Moving that into the libc-package.bbclass which is common to eglibc & eglibc-locale recipes. This fixes bug: [YOCTO #2089] This avoids this error for poky-tiny NOTE: package eglibc-locale-2.13-r19: task do_populate_sysroot: Started ERROR: Error executing a python function in /opt/poky.git/meta/recipes-core/eglibc/eglibc-locale_2.13.bb: OSError: [Errno 2] No such file or directory: '/home/rchatre/concordia/dev/ccd-distro-work/tmp/work/core2-poky-linux/eglibc-locale-2.13-r19/package/usr/lib/gconv' ERROR: The stack trace of python calls that resulted in this exception/failure was: ERROR: File "package_do_split_gconvs", line 264, in <module> ERROR:· ERROR: File "package_do_split_gconvs", line 45, in package_do_split_gconvs ERROR:· ERROR: File "package.bbclass", line 30, in do_split_packages ERROR:· ERROR: The code that was being executed was: ERROR: 0260:»------»-------bb.note("generation of binary locales disabled. this may break i18n!") ERROR: 0261: ERROR: 0262: ERROR: 0263: ERROR: *** 0264:package_do_split_gconvs(d) ERROR: 0265: ERROR: (file: 'package_do_split_gconvs', lineno: 264, function: <module>) ERROR: 0041:»------»-------»-------d.setVar('RPROVIDES_%s' % pkg, pkg.replace(bpn, 'glibc')) ERROR: 0042: ERROR: 0043:»------do_split_packages(d, gconv_libdir, file_regex='^(.*)\.so$', output_pattern=bpn+'-gconv-%s', \ ERROR: 0044:»------»-------description='gconv module for character set %s', hook=calc_gconv_deps, \ ERROR: *** 0045:»------»-------extra_depends=bpn+'-gconv') ERROR: 0046: ERROR: 0047:»------def calc_charmap_deps(fn, pkg, file_regex, output_pattern, group): ERROR: 0048:»------»-------deps = [] ERROR: 0049:»------»-------f = open(fn, "r") ERROR: (file: 'package_do_split_gconvs', lineno: 45, function: package_do_split_gconvs) ERROR: Function failed: package_do_split_gconvs ERROR: Logfile of failure stored in: /home/rchatre/concordia/dev/ccd-distro-work/tmp/work/core2-poky-linux/eglibc-locale-2.13-r19/temp/log.do_package.31042 NOTE: package eglibc-locale-2.13-r19: task do_package: Failed ERROR: Task 552 (/opt/poky.git/meta/recipes-core/eglibc/eglibc-locale_2.13.bb, do_package) failed with exit code '1' Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com>