Commit Graph

42 Commits

Author SHA1 Message Date
Richard Purdie ee9a3c191c toolchain-scripts: Fix TARGET_SYS reference
There was a fix missing from a previous commit:

http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=20a86e16bc54b74fbdb2a3a407d54210ea262925

since there was another section of toolchain-scripts needing updating.
This patch fixes the missing reference and unbreaks the ADT toolchain.

[YOCTO #5340]

(From OE-Core rev: e1b8b4859f00b40fb941a07a394ed35e06541663)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-11 23:10:58 +01:00
Richard Purdie 20a86e16bc cross-canadian: Fix TUNE_PKGARCH references
The cross-canadian compilers are now build once per architecture but were being
installed into tune specific locations which is incorrect. This adjusts things
so they are make TARGET_ARCH specific. We gain the tune specific parts from the
target sysroot which remains tune specific, the compiler and tools are independent
ot that.

binutils/gcc require sysroot options but since we reset at runtime, these shouldn't
have dependencies in the sstate checksums. They are therefore also excluded.

With these patches, switching machines does not result in a rebuild of *-cross-canadian
and the compiler is correctly located and referenced in the target images.

(From OE-Core rev: f58acab6414fe96d9e07ebbe86b348d2ac2bed5f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-10-04 18:26:50 +01:00
Zongchun Yu 360bfe943a toolchain-scripts.bbclass:Add CROSS_COMPILE variable to environment-setup file
when compiling the linux kernel manually. users need to set CROSS_COMPILE separately.
adding the CROSS_COMPILE variable will be nice for using.

(From OE-Core rev: b66ec45e5dd9418a6568c04ef30854531a4b66f3)

Signed-off-by: Zongchun Yu <b40527@freescale.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-05-16 00:09:49 +03:00
Jessica Zhang 4926276d51 Add kernel arch variable in SDK environment variable list for supporting build external kernel module using SDK
(From OE-Core rev: 7fc7e98801bd72b9662528f94b315749e6075666)

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-28 23:15:46 +00:00
Laurentiu Palcu db0a02492c toolchain-scripts.bbclass: add PYTHONHOME variable to environment-setup
When relocating the SDK, applications using python will search for
python modules in the default location and will fail to start.
The below errors are thrown by gdb, for example:

Could not find platform independent libraries <prefix>
Could not find platform dependent libraries <exec_prefix>
Consider setting $PYTHONHOME to <prefix>[:<exec_prefix>]
ImportError: No module named site

In order to overcome this, add the PYTHONHOME variable to the
environment-setup script for both standalone toolchain and
adt-installer. No need to do that for meta-ide-support environment
script since this toolchain does not get relocated.

[YOCTO #3839]

(From OE-Core rev: e7a21cd69a326ab7e2d0e410db28f24956f61208)

Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2013-02-19 14:37:51 -08:00
Khem Raj 679d76e865 toolchain-scripts.bbclass: Export M4
some packages use M4 variable from environment and sometimes
its hardcoded to /usr/bin/m4 if not found in environment. Lets
define it such that it is picked from path

(From OE-Core rev: 06c5593d15f206458b9a5b45ed1229abfee16e95)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-10-05 14:49:54 +01:00
Richard Purdie 7b2c67874e toolchain-scripts: Remove extra - from ar/nm command names
TARGET_PREFIX already has the dash included.

(From OE-Core rev: ca30b6587841f5e9a42aaedb8e0b89ff5a4a6a37)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 11:44:16 +01:00
Martin Ertsaas 1063f45612 Remove the - between ${TARGET_PREFIX} and ar/nm for the env script, as this will make autotools look for arm-none-linux-gnueabi--ar instead of arm-none-linux-gnueabi-ar.
(From OE-Core rev: 6434fc102e73ed81d2092e4c4ba5f9fb806545c8)

Signed-off-by: Martin Ertsaas <mertsas@cisco.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-19 11:17:58 +01:00
Jessica Zhang 04c2ee40f6 meta-ide-support: Add native qemu support for meta-ide-support
[YOCTO #2761]

This patch fixed the issue that after "bitbake meta-ide-support" and try to start qemu and it will fail.  This is due to the meta-ide-support lacking dependency for qemu native and ended up using qemu under /usr/bin.  Fix the issue by adding dependency for qemu native in meta-ide-support and also add the path info in the environment-setup script.

(From OE-Core rev: 3ea597249c18d73417abe7d7a9d32bba00499914)

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-18 14:29:29 +01:00
Mark Hatle 5ed19a40f4 toolchain-scripts: Sync the SDK/ADT values to the build system
The build system passes specific TUNE (fundamental) flag values to various
tools instead of using a shell wrapper or similar.  It is important that the
build system and ADT/SDK match the behaviors exactly, or we are likely to
have differences in the way build-system and external components are built
leading to configuration, compilation and/or run-time problems.

(From OE-Core rev: 2bd0aaf98c5d586638d82f5f22c1c24122a889a3)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-17 18:02:55 +01:00
Mark Hatle 01e891ad71 populate_sdk: enable basic multilib support
In order to enable basic multilib support for the export of an SDK
image, a number of minor changes had to be made:

The value of MULTIMACH_TARGET_SYS needs to be variable.  This way we
can define the value to the appropriate multilib.  (Also in some cases
the default PACKAGE_ARCH is set to MACHINE_ARCH which is incorrect for
the SDK.)  Add a companion REAL_MULTIMACH_TARGET_SYS, based on code
from meta-environment, to allow for this.

We have to convert the do_populate_sdk into a python call, and then
break up the previous items into three parts.
  * Image construction
  * Setup of environment files
  * Generation of the tarball

Then we can iterate over the multilibs to populate the environment files.

Finally, matching changes were needed in the toolchain-scripts file.  And
what I presume is an optimization of immediate evaluation for
TOOLCHAIN_CONFIGSITE_NOCACHE and ..._SYSROOTCACHE needed to be done at
runtime, otherwise the wrong values may be used.

(From OE-Core rev: 42545ffbb37f2646a2a8c20999c21d3300e24f59)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-07-03 14:54:58 +01:00
Lianhao Lu 8447aa2fae meta-toolchain: Popluated the libc siteconfig files.
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>
2012-03-23 12:13:06 +00:00
Richard Purdie d01dadfb87 meta/classes: Convert to use appendVar and appendVarFlags
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-05 10:22:36 -08:00
Richard Purdie e682cdc10a toolchain-scripts: Exclude variables causing the recipe to become unecessarily machine specific
basehash changed from 30e97f9eeed1df8488b62b4fb47a3a0c to 72ea9a277e6599ae9052b169b9a94f1b
   Variable TOOLCHAIN_CONFIGSITE_SYSROOTCACHE value changed from
   /OE/oe-core/tmp-eglibc/sysroots/qemux86-64/usr/share/x86_64-oe-linux_config_site.d
   to
   /OE/oe-core/tmp-eglibc/sysroots/qemux86-64copy/usr/share/x86_64-oe-linux_config_site.d
   Variable TIME value changed from 084543 to 085638

(From OE-Core rev: 9a7895b24c09e347e3d708107fb24b9e42b1d9c5)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-01 15:56:50 +00:00
Koen Kooi ae3184c96e classes: replace 'Poky' with 'OE-core'
(From OE-Core rev: 1fdcd32520a05465b0d54c062f28bac9cdf74a20)

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-02-01 15:07:42 +00:00
Jessica Zhang 783c6ef46c add sysroot support for meta-ide-support which is the toolchain within build env case
(From OE-Core rev: 3b2bbbf965f31088bcb796e8a55966a2fc180349)

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-10 17:28:42 +00:00
Khem Raj fbdbe8d1ec toolchain-scripts.bbclass: Make it work when TCLIBC=uclibc
This class currently only works with eglibc. Since
it adds dependencies explicitly on eglibc when using
uclibc this creates problems. So we make sure that
it checks for TCLIBC to determine system C library
in use

(From OE-Core rev: 2278f891a9bd204d82abbd6998cf0921908f1d14)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-29 11:22:05 +00:00
Richard Purdie c8dee9b92d Convert to use direct access to the data store (instead of bb.data.*Var*())
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>
2011-11-10 11:51:19 +00:00
Jessica Zhang 997d9f44eb Fixed a typo for setting up OECORE_ACLOCAL_OPTS for adt-installer case
(From OE-Core rev: 8ecfa53a3f2e604dd1a0b91c9dd39a488861ab51)

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-28 21:27:35 +01:00
Lianhao Lu c6b808413d toolchain-script.bbclass: Collected cached site config in runtime.
[YOCTO #892]
Modify the function toolchain_create_sdk_siteconfig to collect the
cached site config files which are specified by
TOOLCHAIN_NEED_CONFIGSITE_CACHE in runtime.

Also added task dependency to ensure the cached site config files are
generated.

(From OE-Core rev: 9e87f1347788beed181476dc4563085db14a4729)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-24 19:26:08 -07:00
Otavio Salvador 505be75bbf Use OECORE_DISTRO_VERSION instead of POKY_DISTRO_VERSION
(From OE-Core rev: 6890c02ec4538b82b694deaba39e9921af4e3f47)

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-23 18:23:33 -07:00
Nitin A Kamble 17e8d8558d toolchain-scripts & other classes: add TARGET_LD_ARCH & TARGET_AS_ARCH vars
This is comming from x32 need to pass special parameters to ld & as.

(From OE-Core rev: 96931af89f9cc3056e413cff437a85eca85b3b75)

Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-05 17:15:59 +01:00
Lianhao Lu 9a78cb7980 environment files: Added and unified version related variables.
[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>
2011-08-04 15:04:32 +01:00
Lianhao Lu e464fb9a28 meta-environment: set correct *MULTIMACH_TARGET_SYS.
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>
2011-08-01 14:16:55 +01:00
Jessica Zhang b2a047d8db Add OECORE_ACLOCAL_OPTS to env setup scripts for autotool project using correct libtool 2.4
(From OE-Core rev: fd383ab8e0a8cc8098f557ffcb097190a495c45e)

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-06-30 20:57:07 +01:00
Jessica Zhang 725acfad7c Couple minor fixes for the OECORE rename
(From OE-Core rev: b5cfa911ed80a7e57ae1025b9e365f4678acf491)

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-18 14:32:46 +01:00
Richard Purdie 7469527855 POKY_NATIVE_SYSROOT -> OECORE_NATIVE_SYSROOT
(From OE-Core rev: c056aeaa13549b404088e3d465f3b03443e5ab88)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:30 +01:00
Lianhao Lu 97d3ddedcc toolchain-scripts.bbclass: Added --sysroot to CPPFLAGS.
[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>
2011-03-18 11:36:54 +00:00
Lianhao Lu b43e5d3029 toolchain-script.bbclass: Added --sysroot to LDFLAGS.
[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>
2011-03-06 08:56:25 -08:00
Lianhao Lu 6dc50b1736 toolchain-script/populate_sdk/meta-toolchain: moving common code.
moving common code between populate_sdk.bbclass and meta-environment.bb
into toolchain-script.bbclass.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
2011-02-17 17:25:21 -08:00
Lianhao Lu f09f8f4aa3 toolchain-scripts.bbclass: Added libtool sysroot support.
Added missing --with-libtool-sysroot and --sysroot in environment files.

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
2011-02-17 17:25:21 -08:00
Dongxiao Xu 7f41f1a888 bitbake: machine specific sysroots implementation
This commit changes the sysroots path to be machine specific.

Changes includes:

1) STAGING_DIR_TARGET and STRAGING_DIR_HOST points to machine specific
paths.

2) task stamp files. Adding ${MACHINE} info into stamp files for
do_populate_sysroots and do_package tasks. Add a BB_STAMPTASK_BLACKLIST
to keep native, nativesdk, crosssdk, and cross-canadian stamp unchanged.

3) siteconfig path. Separate the site config path for different machines
to avoid one machine adopting the cache file of another machine.

4) sstate. Add machine name to sstate manifest file.
Change relocation code for sstate paths since sysroot is machine.
Keep native, nativesdk, crosssdk, and cross-canadian unchanged.

5) toolchain scripts. Change the environment path to point to machine
specific sysroots in toolchain scripts bbclass.

6) Relocate la files when populating to a different machine of the same
architecture.

7) Exclude STAGING_DIR_TARGET and STAGING_DIR_HOST parameter from sstate
siginfo since they contain ${MACHINE} information.

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
2011-01-25 12:25:46 +00:00
Lianhao Lu f5a1f1d7f0 meta-environment: Remove c++ include dir from CXXFLAGS.
[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>
2011-01-12 11:17:47 +00:00
Lianhao Lu 6a31a2a89e meta-environment: Added package of meta-environment-${TARGET_ARCH} for
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>
2010-12-21 08:53:20 +00:00
Richard Purdie 9eb2de9163 Revert "meta-toolchain: Update the way ld.so.cache is handled"
This change didn't work as expected as ld.so.cache doesn't preseve any search
path ordering, therefore revert the change.

This reverts commit b2c3ce6d17.
2010-10-14 11:46:39 +01:00
Richard Purdie b2c3ce6d17 meta-toolchain: Update the way ld.so.cache is handled
Fix the library search path so that libs in the toolchain in /opt/
have priority over those in base system but ones from the base system
can still be found.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-13 17:41:29 +01:00
Dongxiao Xu b80483094f meta-ide-support: Fix PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_PATH
Fix PKG_CONFIG_SYSROOT_DIR and PKG_CONFIG_PATH to make them point
to the correct directory path.

This fixes [BUGID #340].

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
2010-09-22 09:52:41 -07:00
Richard Purdie d1ff9aa4f3 toolchain-scripts: Add POKY_TARGET_SYSROOT variable for SDK usage
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-16 15:35:28 +01:00
Richard Purdie f47ae202af toolchain-scripts: Export TARGET_PREFIX and GDB variables for SDK usage
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-16 15:16:01 +01:00
Joshua Lock c97f3a5df4 toolchain-scripts: export extra variables for use by scripts
Export the location of the native sysroot for use in the scripts to
determine the location of native binaries.

Also add a POKY_DISTRO_VERSION to the external toolchain environment as a
method of determining if we're running under a build directory or not
i.e. not if the variable is empty

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-09-07 11:22:54 +01:00
Kevin Tian c595743e3f toolchain-scripts.bbclass: inherit siteinfo
or else 'siteinfo_get_files undefined' error occurs

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
2010-08-31 16:38:40 +01:00
Joshua Lock f05fd8dc5c meta-ide-support: A dummy recipe to install everthing for target development
Move the environment-setup script generation into a separate class and adapt
meta-toolchain to use it.

Add a new dummy target, meta-ide-support, to install an appropriately
configured script to TMPDIR and ensure all of the required packages for target
development are available.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
2010-08-11 18:04:52 +01:00