summaryrefslogtreecommitdiffstats
path: root/meta/classes/utils.bbclass
Commit message (Collapse)AuthorAgeFilesLines
* utils.bbclass: Fix override ordering for FILESPATHRichard Purdie2013-10-141-4/+5
| | | | | | | | | | | | | | | | | | | Currently the overrides are being applied backwards. This means something which is platform specific is overriding something which is machine specific which is clearly not intended. This patch corrects the ordering to match the normal expected behaviour of OVERRIDES. Secondly, all overrides are being searched for each path in turn. What should really happen is that we should look for the highest priority override (e.g. distro or machine) in each layer, then move on to platform/tune (e.g. armv7a) and then to arch (e.g. arm). This patch therefore also reverses the for loops to achieve this behaviour and give the result the user would expect. (From OE-Core rev: 92cbf7eeea553bfa24c7081473fa8bc4ebc1f552) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils: Update bb.which reference and other syntax cleanupRichard Purdie2013-09-171-5/+3
| | | | | | | | | | | * bb.which -> bb.utiis.which() * Use modern form of datastore access * Use True, not 1 * Drop pointless imports (From OE-Core rev: 106a4f5b41e5bdeabe588b9ba362f3693b1a9989) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: Tweak create_wrapperRichard Purdie2013-06-181-2/+2
| | | | | | | | | | | | Currently the full path is specified to exec however this may incorporate a build path which in the nativesdk case, is not transformed to a target system path. This leads to failures due to incorrect paths. This patch ensures the full build path is not encoded into the wrapper script. (From OE-Core rev: 4569d7403638e4c1f637e3a6adb8dea620dc8543) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: ensure $0 is correct in wrapper scriptsRoss Burton2013-05-301-4/+5
| | | | | | | | | | | | | | | Some packages (eg mesa) will invoke a tool with --version and do string matches on the output (i.e. mesa does $LEX --version |grep "^flex "). This doesn't work with the combination of wrapper scripts and binaries that use $0 as they output "flex.real". Luckily bash's exec lets you set $0. As we want to use this we can't use env, but using export appears to work just as well. (From OE-Core rev: e8d2a2a3646f964ec61ece62e14788cd7184dd01) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake.conf/utils: Drop some OVERRIDES from FILESPATHRichard Purdie2012-12-111-1/+1
| | | | | | | | | | | | | There are several overrides that don't make sense as part of FILESPATH. This introduces FILESOVERRIDES and allows us to drop some of the pointless ones, simplifying the files search path further and improving the user experience. If needed by specific recipes, other overrides can be added back in for specific cases. (From OE-Core rev: b8b1b39961332c99d62ee466f7859bd62a0f806f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils: Optimise looping in base_set_filespathRichard Purdie2012-11-211-2/+2
| | | | | | | | | | Calling split on the same expression, once per loop iteration is inefficent and pointless, particularly in a function called by every recipe during parsing. (From OE-Core rev: 566c0e874fc1610f3f97737b5601ef22026c918a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: Fix documentation of create_cmdline_wrapperRichard Purdie2012-11-141-5/+5
| | | | | | (From OE-Core rev: 56160ca49dd546b7db07ae2021eefef7279b0f10) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta/classes: Various python whitespace fixesRichard Purdie2012-08-211-26/+26
| | | | | | | | | | | It was pointed out we have a number of weird indentations in the python functions. This patch cleans up 3, 7 and other weird indentations for the core bbclass files. It also fixes some wierd (odd) shell function indentation which my searches picked up. (From OE-Core rev: 8385d6d74624000d68814f4e3266d47bc8885942) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Convert tab indentation in python functions into four-spaceRichard Purdie2012-07-191-63/+63
| | | | | | (From OE-Core rev: 604d46c686d06d62d5a07b9c7f4fa170f99307d8) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: add helper function to add all multilib variants of a ↵Richard Purdie2012-07-091-0/+9
| | | | | | | | | | | | specific package This is useful for the scenario where we want to add 'gcc' to the root file system for all multilib variants (From OE-Core rev: 7cd54693363882854cd026ebe071e9f2e03d364e) Signed-off-by: Matthew McClintock <msm@freescale.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: remove the unused oe_systemRobert Yang2012-05-251-26/+0
| | | | | | | | | | | | | | | | | | | | | | The following functions in meta/classes/utils.bbclass were not used by anyone, and they didn't work when I tried to use them: def oe_popen_env(d): def oe_run(d, cmd, **kwargs): def oe_popen(d, cmd, **kwargs): def oe_system(d, cmd, **kwargs): There error was: AttributeError: type object 'str' has no attribute 'getVar' We have bitbake/lib/bb/process.py to instead, so remove them. [YOCTO #2489] (From OE-Core rev: 15ad62ab1be060d8a7cdc2d28167ea3af4cfd5d5) Signed-off-by: Robert Yang <liezhi.yang@windriver.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-261-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. (From OE-Core rev: 1efa999ed02186c9c58cb48418e0c62ecdc82ac7) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta: Convert getVar/getVarFlag(xxx, 1) -> (xxx, True)Richard Purdie2012-03-051-1/+1
| | | | | | | | | | | | Using "1" with getVar is bad coding style and "True" is preferred. This patch is a sed over the meta directory of the form: sed \ -e 's:\(\.getVar([^,()]*, \)1 *):\1True):g' \ -e 's:\(\.getVarFlag([^,()]*, [^,()]*, \)1 *):\1True):g' \ -i `grep -ril getVar *` Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Convert to use direct access to the data store (instead of bb.data.*Var*())Richard Purdie2011-11-101-2/+2
| | | | | | | | | | | | | | | | | This is the result of running the following over the metadata: sed \ -e 's:bb.data.\(setVar([^,()]*,[^,()]*\), *\([^ )]*\) *):\2.\1):g' \ -e 's:bb.data.\(setVarFlag([^,()]*,[^,()]*,[^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^(), ]*\) *,\([^)]*\)):\2.\1,\3):g' \ -e 's:bb.data.\(getVarFlag([^,()]*,[^,()]*\), *\([^() ]*\) *):\2.\1):g' \ -e 's:bb.data.\(getVar([^,()]*\), *\([^) ]*\) *):\2.\1):g' \ -i `grep -ril bb.data *` (From OE-Core rev: b22831fd63164c4db9c0b72934d7d734a6585251) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: skip empty paths when handling FILESEXTRAPATHSMartin Jansa2011-08-231-2/+3
| | | | | | | | | | | | | * if there is multiple .bbappend files with FILESEXTRAPATHS_prepend := "/:" then the one parsed last is causing trailing ':' and that's causing empty element in path = extrapaths.split(:) + path * it's hard to keep all .bbappends from foreign layers to follow this rule, so it's better to be able to handle trailing ':' (From OE-Core rev: 3b5591d423324da076d038ad335af47b616a7903) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* package(_ipk).bbclass: opkg using ALL_MULTILIB_PACKAGE_ARCHSLianhao Lu2011-08-171-5/+19
| | | | | | | | | | | | | | [YOCTO #1345] The new variable ALL_MULTILIB_PACKAGE_ARCHS contains all the values of PACKAGE_ARCHS for each multilib variants. The opkg backend now uses this new value insteald of the PACKAGE_ARCHS to update the opkg indexes and to generate the opkg configuration files. This allows the normal packages and multilib packages may be installed into the same rootfs. (From OE-Core rev: b774bf44ef004276da12a83ebd69715c00b596ac) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass/multilib.class: Added misc supporting functions.Lianhao Lu2011-08-151-0/+29
| | | | | | | | | | | | | | | | 1. Added variable MULTILIB_VARIANTS to store all the instance variants for multilib extend. 2. Added function all_multilib_tune_values to collect the variable values for all multilib instance. 3. multilib bbclass handler will save the orignal value of all variables defined in MULTILIB_SAVE_VARNAME. (From OE-Core rev: 18bba910e04bff75460f408e4557d4bae21ad592) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: Don't forget to pass the cmdline optionsSaul Wold2011-07-271-1/+1
| | | | | | | | | | This ensure that the command line options from the creation of the wrapper are actaully passed into the wrapper. (From OE-Core rev: 190b4f17f5fc9879e680278dd0e31e26e5f5bca0) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: make FILESEXTRAPATHS colon delimitedDarren Hart2011-05-271-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes [YOCTO 1102] Path variables are typically : delimited. White space is allowed in paths, so is not a good choice for separating paths. Currently utils.bbclass performs the following: extrapaths = (bb.data.getVar("FILESEXTRAPATHS", d, True) or "").split() This splits FILESEXTRAPATHS on whitespace. It later splits overrides on : and reassembles them all together as : delimited. There is only one user of FILESEXTRAPATHS in oe-core (qt4-tools-native, which uses : anyway) and none in oe. Change the split() in utils.bbclass to split on : instead of whitespace. When splitting on a defined string (":") we must be careful to handle the empty string case which returns [''] instead of []. Tested building qt4-tools-native and core-image-minimal for surgarbay from meta-intel with a couple extra layers with FILESEXTRAPATHS modifications added. (From OE-Core rev: a6a892f520d22ef8020c98528d38ee08f6cda034) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Cc: Phil Blundell <pb@pbcl.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: modify create_wrapper to correctly follow symlinksSaul Wold2011-05-191-1/+2
| | | | | | | | | This ensures you look up the symbolic link to get the full path (From OE-Core rev: a10bd976f4cef54ac50b0c82f885c17a26e5989f) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: modify create_wrapper to correctly follow symlinksSaul Wold2011-05-191-1/+2
| | | | | | | | | This ensures you look up the symbolic link to get the full path (From OE-Core rev: 9215d23fd26c62d250749b8084a52f383cb16fba) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* logging: update existing oe* logging users to the bb* interfaceDarren Hart2011-05-041-10/+10
| | | | | | | | | | | | | | The new bash logging class provides bbnote, bbwarn, bbfatal, and bbdebug replacements (as well as bbplain and bberror) for the oe* equivalents. Use the new bb* API in preparation to delete the oe* logging API. This patch was automatically generated by a sed script. The result has been visually inspected and used to build core-image-sato for qemux86. (From OE-Core rev: a1f09fce5caba389d0484b169f0cde85d64514fa) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* utils.bbclass: add new wrapper scriptSaul Wold2011-02-251-0/+23
| | | | | | | | | Add a new create_cmdline_wrapper() function that takes cmdline options for commands that need different directories Related to [BUGID #775 Signed-off-by: Saul Wold <sgw@linux.intel.com>
* meta/classes: Update classes to use new fetcher APIRichard Purdie2011-02-071-5/+6
| | | | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* staging.bbclass, utils.bbclass: remove la mangling codeScott Garman2011-01-211-13/+2
| | | | | | | | | libtool v2.4 --with-libtool-sysroot eliminates the need for la mangling. Based on Khem Raj's OE commits. Signed-off-by: Scott Garman <scott.a.garman@intel.com>
* base/utils.bbclass: Drop former checksum code now bitbake is handling this ↵Richard Purdie2010-12-201-71/+0
| | | | | | for us Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
* base/utils.bbclass: Sync up overlapping functionsRichard Purdie2010-11-021-1/+2
| | | | Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
* utils.bbclass: Add functions from OE.devRichard Purdie2010-11-021-5/+92
| | | | Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
* Update classes to use lib/oeJoshua Lock2010-05-061-69/+38
| | | | | | | Adapt modifications from upstream to make Poky classes use lib/oe for the common Python functionality. Signed-off-by: Joshua Lock <josh@linux.intel.com>
* base.bbclass: Split up as per the patch in OE.dev by Chris Larson making ↵Richard Purdie2010-03-191-0/+340
code more readable and modularised Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>