summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core/meta/meta-environment.bb
Commit message (Collapse)AuthorAgeFilesLines
* meta-environment: Ensure we append to the default ↵Richard Purdie2015-06-231-1/+1
| | | | | | | | | | | | TOOLCHAIN_NEED_CONFIGSITE_CACHE The toolchain-scripts class was changed to assign to the variable using ??= which allows users to override it. We therefore need to _append instead of += to have the change take effect as intended. (From OE-Core rev: d589777a4d423b1f0c9953900bd79772d15ee4af) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* cross-canadian/meta-environment: Allow modification of TARGET_OS to be optionalRichard Purdie2015-01-161-3/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are some cases we want the manipulation cross-canadian performance on TARGET_OS, there are also cases like meta-environment where we do not want this manipulation. We did try and use immediate expansion to avoid this problem and it works in the non multilib case. If we have a multilib that used an extension, like for example: require conf/multilib.conf MULTILIBS = "multilib:lib32 multilib:lib64" DEFAULTTUNE = "mips32r2" DEFAULTTUNE_virtclass-multilib-lib32 = "mips64-n32" DEFAULTTUNE_virtclass-multilib-lib64 = "mips64" then the n32 extension case will be misconfigured. It turns out saving an unexpanded variable is hard. The best I could come up with was: SAVEDTOS := "${@d.getVar('TARGET_OS', False).replace("{", "*")}" and then localdata.setVar("TARGET_OS", d.getVar("SAVEDOS", False).replace('*','{')) which is rather evil, I'd challenge someone to come up with a nicer way of making it work though! Rather than the above madness, we modify cross-canadian to make the problamtic code conditional. This fixes the original issue (where a linux-gnuspe target was seeing 'linux') of http://cgit.openembedded.org/openembedded-core/commit/?id=0038634ee6e2b6035c023a2702547f20f67c103a but also fixes the multilib one. (From OE-Core rev: 85ff3d6491c54aa712ed238c561742cda4f4ba07) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: don't mark tasks as nostampPaul Eggleton2014-12-211-2/+0
| | | | | | | | | | | | | With siggen being changed to alter the signature of nostamp tasks on the fly, having these tasks as nostamp results in the SDK being rebuilt every time, which is not desirable. In any case this is just legacy from the days before we used signatures to take care of ensuring these tasks get re-run when they need to be. (From OE-Core rev: e9a211321b4570282d0d65a0bb519e05a3d477bb) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: Fix config-site with a multilib configMark Hatle2014-11-121-0/+1
| | | | | | | | | | | | | | | | | | | | [YOCTO #6951] The TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value was defaulting to the nativesdk path and not the associated target path. Set the value in toolchain-scripts to the target path. Be sure to set the MLPREFIX within the meta-environment script as multilibs are processed. Update the config_site file name to use -BPN- not PN. Otherwise the environment processing can't find the correct filename. (From OE-Core rev: 1f05aaa4944ddac6c2b3ba440effdf1eaf732656) Signed-off-by: Mark Hatle <mark.hatle@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: Deal with machines which change TARGET_OSRichard Purdie2014-10-061-1/+4
| | | | | | | | | | Some machines change TARGET_OS, cross-canadian resets this which is not what we want in this specific case. This fixes spe toolchains for example. (From OE-Core rev: 0038634ee6e2b6035c023a2702547f20f67c103a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: Set libdir correctly to fix PKGCONFIG entriesRichard Purdie2014-10-021-0/+1
| | | | | | | | | | Currently libdir is coming from cross-canadian which is incorrect. We need to reset this to target_libdir so that the toolchains contain the correct value. (From OE-Core rev: 41f8f32c8da705ead464ee69bc5a1e120b137693) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: Two critical fixes to unbreak toolchainsRichard Purdie2014-09-301-2/+2
| | | | | | | | | | | | | | | Firstly, when multilib builds were being used, the same output files were used in each case, being overwritten each time due to the fact that REAL_MULTIMACH_TARGET_SYS has been expanded. Instead of immediate expansion, just use assignment. This overrides the problematic define in toolchain-scripts.bbclass but allows the multilib code to work. Secondly, the target sysroot was being defined incorrectly which this patch fixes. This was breaking the toolchains. (From OE-Core rev: 17229152453a8633b2cd63b429f98cc7c192f300) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* populate_sdk_base/meta-environment: Remove overlap from the twoRichard Purdie2014-09-221-7/+28
| | | | | | | | | | | | | | | | | | | | Currently we have the horrible situation where meta-environment packages the toolchain environment files and they get included in the SDK but are broken, then, the SDK code overwrites them with good versions. This is suboptimal. This change fixes the code in meta-environment to create working files and adds in the multilib support from populate_sdk_base, then we remove the code in that base bbclass and rely on the packages being installed if/as/when needed. This removes the duplication and the broken versions of the files, hopefully making all well. [YOCTO #6608] [YOCTO #6613] (From OE-Core rev: 063355e5965439c7b3253d692d7ab0ed1189d123) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: Fix TARGET_OS problem for ppcRichard Purdie2014-09-221-1/+2
| | | | | | | | | | | | | | | | Due to the use of the cross-canadian inherit, TARGET_OS can be reset to values other than the correct one, leading to generation of the wrong files. By expanding REAL_MULTIMACH_TARGET_SYS before the inherit, the correct OS value is preserved and we generate the right environment files. [YOCTO #6608] [YOCTO #6613] (From OE-Core rev: ae265973c96ff4b8b5580436647fc361490e134c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Update after toplevel LICENSE file checksum changeRichard Purdie2014-01-021-1/+1
| | | | | | (From OE-Core rev: bbd88aebcabbb19c27a7d752d4a5b8ad9ff9412e) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Replace one-line DESCRIPTION with SUMMARYPaul Eggleton2014-01-021-1/+1
| | | | | | | | | | | | | | A lot of our recipes had short one-line DESCRIPTION values and no SUMMARY value set. In this case it's much better to just set SUMMARY since DESCRIPTION is defaulted from SUMMARY anyway and then the SUMMARY is at least useful. I also took the opportunity to fix up a lot of the new SUMMARY values, making them concisely explain the function of the recipe / package where possible. (From OE-Core rev: b8feee3cf21f70ba4ec3b822d2f596d4fc02a292) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* toolchain-scripts/meta-environment: Further cleanup code duplicationRichard Purdie2013-11-061-1/+1
| | | | | | | | | | | | | | There was still duplicated code in toolchain-scripts, this further cleans up the functions to remove it. The now unused includedir parameter is also dropped. The final scripts do end up reordered slightly and the sysroot is parametrised for the IDE scripts which is an improvement but should have no functional difference. (From OE-Core rev: 1dbd65b4d14319e784a66776c1e9943d0179d3ee) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* toolchain-scripts/meta-environment: Merge toolchain_create_sdk_env_script ↵Richard Purdie2013-11-061-1/+1
| | | | | | | | | | | | and the for_installer variant Having two scripts which do basically the same thing is a nightmare. This merges them together. It also makes the sysroot location a variable in its own right which may be more useful for end users wanting to change sysroot. (From OE-Core rev: 213e0c67e938b802e6bb2246f00b7343a6f77b99) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: change package name to include MACHINELaurentiu Palcu2013-09-101-1/+1
| | | | | | | | | | | | | | | | | Currently, the package name contains just the TRANSLATED_TARGET_ARCH. When compiling the toolchain for two machines, belonging to the same architecture (for example: qemuarm and beagleboard), this package gets overwritten and adt-installer repo will contain just one meta-environment package... This leads to situations like installing the toolchain for qemuarm and end up with meta-environment package with beagleboard cpu options. [YOCTO #4783] (From OE-Core rev: 09a2b158818e2ec3c3e3b53b6d14fd3527c32c99) Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-toolchain: Popluated the libc siteconfig files.Lianhao Lu2012-03-231-1/+1
| | | | | | | | | | Fixed bug [YOCTO #2159] by correctly populate the libc's siteconfig files. (From OE-Core rev: eeee4b8c097e60070e4654a223b41fea0c96a12b) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: Fix a typo in do_populate_sysroot[noexec]Darren Hart2011-11-301-1/+1
| | | | | | | | | | I noticed with while grepping for usage of noexec. Replace do_populage_sysroot with do_populate_sysroot. (From OE-Core rev: 278febfc6d8f35f00f770db519e5a5d4040ae39c) Signed-off-by: Darren Hart <dvhart@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-toolchain/environment: Collected site config files in runtime.Lianhao Lu2011-08-241-4/+3
| | | | | | | | | | | [YOCTO #892] Use the new cached site config files generation mechanism in toolchain-script.bbclass. (From OE-Core rev: 445d6426197579a9c0317498cc6919bb63e7f726) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* environment files: Added and unified version related variables.Lianhao Lu2011-08-041-1/+1
| | | | | | | | | | | | | [YOCTO #1306] Fixing. Added and unified version related variables in all environment files generated by package meta-toolchain, meta-ide-support, meta-environment-xxx. (From OE-Core rev: 5fbea0f2614d5bc9aec0819a337cdec9b5331f71) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: set correct *MULTIMACH_TARGET_SYS.Lianhao Lu2011-08-011-4/+5
| | | | | | | | | | Fixed [BUGID #1299]. OLD_MULTIMACH_TARGET_SYS is no longer available. Use new recipe-scope variable REAL_MULTIMACH_TARGET_SYS instead. (From OE-Core rev: b69a2be2f30dc633597399d42d6c87d9f0910c1a) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Replace POKYBASE with COREBASERichard Purdie2011-04-211-2/+2
| | | | | | (From OE-Core rev: 607a7657715f6fcba467a4e55ba64f41f4e13a15) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* toolchain-scripts.bbclass: Added --sysroot to CPPFLAGS.Lianhao Lu2011-03-181-1/+1
| | | | | | | | | | [YOCTO #908] Added CPPFLAGS into the environment file and added --sysroot to it. (From OE-Core rev: 360daf019101d9b4d08ab1e3d279b08c02e9749e) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* toolchain-script.bbclass: Added --sysroot to LDFLAGS.Lianhao Lu2011-03-061-1/+1
| | | | | | | | | | [YOCTO #808] Added --sysroot to LDFALGS in environment files. (From OE-Core rev: a3a7aed9cca5765f106762cbcd9efbf4f1fccf9f) Signed-off-by: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* toolchain-script/populate_sdk/meta-toolchain: moving common code.Lianhao Lu2011-02-171-13/+3
| | | | | | | moving common code between populate_sdk.bbclass and meta-environment.bb into toolchain-script.bbclass. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
* meta-environment: Remove the recursive dependency on do_compileDongxiao Xu2011-01-201-1/+0
| | | | | | | | | | | | | | | | | | It is not needed to have dependency on each do_compile of its recursive depend tasks. This problem is triggered by building meta-toolchain-sdk from prebuilt result. Some packages like quilt-native, which is already been populated and packaged by do_populate_sysroot_setscene and do_package_write_xxx_setscene, however this recursive dependency of do_compile triggers the tasks flow of "do_setscene --> do_fetch --> do_unpack --> ..." again and do_setscene removes all the quilt-native files, making the other recipes failed while do_patch. Thanks for Kevin's help in root causing this issue. CC: Lianhao Lu <lianhao.lu@intel.com> Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
* meta-environment.bb: fix comments typosOtavio Salvador2011-01-181-2/+2
| | | | | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* meta-environment: Remove c++ include dir from CXXFLAGS.Lianhao Lu2011-01-121-3/+1
| | | | | | | [BUGID #651]. c++ include dir is no longer needed in the environment files due to commit f13cb20. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
* meta-environment: Added package of meta-environment-${TARGET_ARCH} forLianhao Lu2010-12-211-0/+64
environment files. [BUGID #565] Fixing bug #565, added package of meta-environment-${TARGET_ARCH} for environment files used by cross-canadian toolchain. Also corrected the situation of empty config site file for target. Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>