Commit Graph

201 Commits

Author SHA1 Message Date
Martin Jansa 8bb06fd765 bitbake.conf: set TARGET_VENDOR to '-oe' and remove it from defaultsetup.conf
* -oecore was changed to -oe to be more consistent with SDK_VENDOR as we had -oesdk as SDK_VENDOR and not -oecoresdk

(From OE-Core rev: 7b3e1e0f8e31a1a20ba600bdc66fe4455e98c8f6)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-17 15:14:47 +01:00
Khem Raj 9248bf03d4 conf/bitbake.conf: Add MACHINEOVERRIDES variable
By defualt it points to $MACHINE but sometimes its desired
to have more than one overrides stemming out of a machine
then they can be added to MACHINEOVERRIDES.

e.g. MACHINEOVERRIDES = "${MACHINE}:nslu2"

Note that if you redefine MACHINEOVERRIDES then default
override for machine has to be added to it explicitly
otherwise it will get lost.

(From OE-Core rev: a16f793dd6b2b1b61704c6a7082b30abfca5fb4d)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-16 15:32:19 +01:00
Otavio Salvador bdc2e59d34 conf/bitbake.conf: use --no-check-certificate to avoid errors when wgetting from https
(From OE-Core rev: bc9c80307a0c2f9ad840b9181076f3824786c217)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-11 15:38:33 +01:00
Richard Purdie 0504d36646 bitbake.conf: Drop unused *GUI* and MACHINE_DISPLAY variables
(From OE-Core rev: baf136a9c95a94c5bf89c9a818960d616439682c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-11 15:38:33 +01:00
Richard Purdie e27f339a04 distro: Add defaultsetup.conf, a set of default configuration providing sane overrridable default for commonly used options
The intent is to allow distros to share common core config but still allow
customisations. The core should work with no distro set but users
can still customise in any ways needed.

(From OE-Core rev: c0a148077ae27a1ef57c55ac22953c68d001af57)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-11 15:24:22 +01:00
Richard Purdie 044853350b bitbake.conf: Include the new default-providers.inc and default-versions.inc files
These are the minimal defaults to allow OE-Core to function standalone with
no distro set and are constucted such that the distro can either override values,
or totally replace the include file entirely as needed.

(From OE-Core rev: b34d5e93fab4274e1a56f446e2ba4756d614cc47)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-11 15:22:54 +01:00
Khem Raj c08d4cfd41 gettext.bbclass, bitbake.conf: Append nls options to EXTRA_OECONF instead of +=
Some recipes do not defined EXTRA_OECONF in such cases += drops
the --enable|--disable-nls options. In another case where recipe
defines EXTRA_OECONF instead of adding/appending to it then
--enable|--disable-nls options are lost from EXTRA_OECONF

We define EXTRA_OECONF = "" in bitbake.conf so the variable exists
always.

We use _append instead of += so the option is added at very end
and not lost.

We only return empty gettext dependencies if its a target recipe
in case when USE_NLS is not set because the native/cross/nativesdk recipes still
need the gettext dependencies

(From OE-Core rev: c47c783ddca8427aa7381e1df254a8d29ff0fe78)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-09 14:09:10 +01:00
Richard Purdie 65f4b65410 Further cleanup of various poky references
(From OE-Core rev: fe73ea8c510877fe4e3c117985e8f3d0b79ddf1b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 12:56:16 +01:00
Richard Purdie b9fbc85938 bitbake.conf: Only very weakly assign SRCREV to the default of INVALID
This means it can easily be overridden by other points in the code,
such as a ?= assignment in recipes.

(From OE-Core rev: f370961b61be2e2be4e7b33c446d71c0693ca16b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 12:56:09 +01:00
Richard Purdie 1288b8d47b bitbake.conf: Set MAINTAINER to a non-poky default of the OE-Core mailing list
(From OE-Core rev: bb1442aaf089040312de383228bbf72c608ef02a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 12:56:08 +01:00
Richard Purdie c74a6886be bitbake.conf: Set SDK_VENDOR to -oesdk
(From OE-Core rev: 856a7fd944f2881b663a82556a990ea72010f2d7)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 12:56:04 +01:00
Richard Purdie 4d609d5021 Replace POKYBASE with COREBASE
(From OE-Core rev: 607a7657715f6fcba467a4e55ba64f41f4e13a15)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-21 00:29:29 +01:00
Richard Purdie 14f49185cb bitbake.conf: Drop FAKEROOT variable since its replaced with FAKEROOTENV
(From OE-Core rev: b73b1f264bda78cf5c22b29d3d13272fcc143743)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-12 10:12:20 -07:00
Saul Wold 309e6f74a6 bitbake.conf: fix PACKAGE_ARCH[vardepsexclude]
(From OE-Core rev: 4040031c79bd69c00982f7e32aa9710bdc2b9c23)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-08 09:40:29 -07:00
Qing He de3e3e25ea bitbake.conf: fix MACHINE_ARCH
Replaces all '-' in $MACHINE to '_', fixes [YOCTO #946]

(From OE-Core rev: 69b3a11d90579bca687ad3461e7a5cd325079fe6)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-04 17:28:04 +01:00
Richard Purdie 4d041557e7 bitbake.conf: Disable -feliminate-dwarf2-dups flag until it works with prelink and other issues are resolved
(From OE-Core rev: 43dd780ace029c231f70424a510c934f436e513c)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-29 14:01:48 +01:00
Richard Purdie fd42d1ca77 image_types.bbclass: Drop IMAGE_EXTRA_OPTION in favour of the more standard EXTRA_IMAGECMD
(From OE-Core rev: 3c534247e08700eb18b27886d80e874006ee0cb8)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-25 16:34:24 +00:00
Richard Purdie ed41be01dc bitbake.conf/image.bbclass: Move image type information into image_types.bbclass
Image generation code in .conf files is hard to read as it needs to be
single line. By moving this to a separate class, multiline functions
can be used instead improving readability. It also declutters
bitbake.conf.

There is no real functional change with this patch but it highlights
the need for improvements in places such as the IMAGE_EXTRA_OPTION
ext* specific variable which makes no sense.

(From OE-Core rev: a5c403f0fc71f38c0669691da7f637303ea09a27)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-25 16:34:23 +00:00
Khem Raj 5ea06dc295 bitbake.conf: Prune global OPTIMIZATION flags
-fexpensive-optimizations is enabled by default at -O2

-fomit-frame-pointer is enabled at -O2 selectively by gcc depending upon
  architecture if debug info is not hurt

-frename-registers - This might have some performance advantage on top
 of O2 on architectures which have more registers and registers are left
 after scheduling but it affects debuggability quite a bit so as a i
 tradeoff we do not use it.

-feliminate-dwarf2-dups - We use this option to reduce the size of debug
 information by removing duplicates this is only valid for dwarf2+ and we
 use dwarf2 by default

-pipe uses buffers instead of temporary files internally it can speed
 up compilation it has has issues with other assemblers but not
 with GNU assembler and we use gas.

Separate out debug information related flags into a separate variable
DEBUG_FLAGS so distros can use/notuse them as they like

(From OE-Core rev: 9cb7113790d716a4c5cf7d511535ba87fdecd1ac)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-24 12:33:35 +00:00
Tom Rini d56080ff06 Various: Update KERNELORG_MIRROR for consistency
In mirrors.bbclass we point into /pub but we don't in bitbake.conf.
All uses of KERNELORG_MIRROR look into /pub anyhow, so lets make
use of that.

(From OE-Core rev: 67a0c8f48b5ef2ae5fc712c9204e4e99818c8134)

Signed-off-by: Tom Rini <tom_rini@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-23 15:44:04 +00:00
Martin Jansa 2661565843 bitbake.conf: replace unused/broken E_CVS/E_URI with E_MIRROR/E_SVN used in OE
(From OE-Core rev: 66e6837b536859bcf940380cfcdf50670790d889)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-23 15:43:48 +00:00
Richard Purdie a295a0442e bitbake.conf/tune files: Adjust PACKAGE_EXTEA_ARCHS
There is a problem with the current PACKAGE_EXTRA_ARCHS implementation
since its impossible to control which extra architectures sort higher
than TARGET_ARCH and which sort lower. In the x86 case for example,
TARGET_ARCH might be "i586", i486 should be lower than this and i686 should
be higher. There are also complications where its easy to inject duplicate
entries into the variable.

I tried various versions of this patch and concluded that it was simplest
just to force the tune files to include TARGET_ARCH in the list in the
right place if they're planning to customise it themselves. Other approaches
with appends and prepends just complicated the code for no good reason.

The TARGET_ARCH definitions should also move to the tune files but I'll
leave this for a separate patch.

(From OE-Core rev: d492ebf8b1801da99c679f465be98ce54fd3061a)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-23 15:43:47 +00:00
Richard Purdie 75c5760fe8 bitbake.conf: Increase image overhead factor to account for rpm/zypper database size
(From OE-Core rev: f4305f960cb788d73c5132aa5a9f930e85c20385)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-18 16:50:24 +00:00
Kevin Tian 2a3ff59ef5 bitbake.conf: add POKYBASE to BB_HASHBASE_WHITELIST
or else do_populate_lic varies its checksum when using different source
directory, and thus further impact do_package sstate reuse.

Fix [YOCTO 894]
Possibly Fix [YOCTO 903]

(From OE-Core rev: 7a0922ba2e7a33005a8830ff8a4e6b1408b29aa5)

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-18 11:36:52 +00:00
Qing He 367db423a6 qemux86-64: set qemux86_64 as package arch name
thus allows rpmbuild to generated RPMs with the right architecture.

(From OE-Core rev: 73b27dc6c326c8465944f8b6397dc6b1ef647452)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-03-14 21:08:35 +00:00
Mark Hatle 16102e1890 Revise stripping and splitting of debug information
We now support two styles of debug information generation, the '.debug' style,
which is the same as previously implemented.  This style simply splits the
debug information and makes it available in the same general directory.

  /bin/foo -> /bin/.debug/foo

The new 'debug-file-directory' style splits the debug information and places
it into the single debug-file-directory, /usr/lib/debug:

  /bin/foo -> /usr/lib/debug/bin/foo.debug

Both also find and copy all referenced source code to a new /usr/src/debug
directory.  This allows the -dbg files to be used for stand-a-lone debugging
on or off the target device.

File stripping is now handled as a seperate operation from file splitting.
This allows us to split the debug information, but also leave it in the
original file -- or prevent the debug information from being split.

Also enhance the comments within local.conf.sample to provide a better
understanding of the control the user has over debug file generation.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2011-02-25 22:43:33 +00:00
Saul Wold 404afff810 bitbake.conf: Add DISTROOVERRIDES variable
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-02-23 15:12:50 -08:00
Saul Wold a26163b8f5 bitbake.conf: change revision fetching to use newer fetch2 code
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-02-14 05:33:19 -08:00
Koen Kooi a20600d4bb bitbake.conf: fix SDK_NAME
It was using a '/' in a name variable, subtly breaking things like this:

populate_sdk.bbclass:
   mkdir -p ${SDK_DEPLOY}
   cd ${SDK_OUTPUT}
   tar --owner=root --group=root -cj --file=${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .

Tar will error out since SDK_DEPLOY/DISTRO/ doesn't exist. Change the default to be more like the one from poky.conf, without the poky specific POKYLIBC.

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-09 11:07:37 +00:00
Richard Purdie b93683c910 bitbake.conf: Force git fetches to a new location after fetcher layout changes
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-07 00:58:44 +00:00
Mark Hatle 8a52fda62f bitbake.conf & package.bbclass: Use default SUMMARY and DESCRIPTION
A new default SUMMARY and DESCRIPTION was defined for any package that
previously did not contain one.  This value is based on the original
SUMMARY_${PN} value.

The new default SUMMARY and DESCRIPTION is used as a basis for all of
the automatic summary and descriptions for the various package splits,
include ${PN}, ${PN}-dbg, ${PN}-dev, ${PN}-doc, and locales.

A recipe may also override any of the automatic summaries by simply
specifying the value.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2011-02-03 11:48:48 -08:00
Mark Hatle 30f5eead40 bitbake.conf: Fix missing NM definition
The definition of NM was missing, causing certain configure calls to revert
to using the host system's version of NM.  This can cause problems on some
MIPS based targets, but is theoretically wrong everywhere.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
2011-02-03 08:49:22 -08:00
Richard Purdie f33685f111 bitbake.conf: Set LC_ALL instead of requring bitbake or env scripts to do this
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-02-02 11:55:34 +00: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
Richard Purdie c0e1272d15 gcc/libc: Change bootstrap to use an intermediate sysroot and hence no longer overwrite files
Based upon patches from Dexuan Cui <dexuan.cui@intel.com>

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-25 12:25:45 +00:00
Dongxiao Xu bc9d2fbfd4 staging: Use relative path in sysroot-destdir for target recipes
Original we used absolute path in sysroot-destdir for both native and
target recipes. This commit changes target recipes to use relative path
which is same as the image directory.

[sgw: merged with libtool sysroot work]
Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
2011-01-21 11:18:37 +00:00
Kevin Tian 6299e9664f bitbake.conf: add USERNAME to BB_HASHBASE_WHITELIST
previously only USER is in the whitelist, however both are possible on different distros

Signed-off-by: Kevin Tian <kevin.tian@intel.com>
2011-01-21 01:36:17 -08:00
Richard Purdie 17d13a5eef bitbake.conf: Whitelist FILESPATH as a variable not to include in taskhashes
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-12 16:04:32 +00:00
Richard Purdie 4988dd7281 bitbake.conf: Whitelist MACHINE variable in PACKAGE_ARCHS
PACKAGE_ARCHS represents all compatible architectures for a given machine.
It makes no sense for this variable to change any task checksums as it doesn't
inject any machine dependency into any known task. Multimachine means machine
specific packages will be detected through other variables.

Before this patch, even native packaging tasks were ending up being marked as
machine specific.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-12 16:00:57 +00:00
Yu Ke 1589a1172f Fetcher: break the "SRCREVINACTION" deadlock
Current fetcher has annoying "SRCREVINACTION" deadlock,
which occurs when SRCREV=${AUTOREV}=@bb.fetch.get_srcrev():
get_srcrev()->setup_localpath()->srcrev_internal_helper()
->evaluate SRCREV->get_srcrev()

current fetcher resolve the deadlock by introducing a
"SRCREVINACTION" condition check. Althoguh it works, it is
indeed not clean.

This patch use antoehr idea to break the deadlock: break
the dependency among SRCREV and get_srcrev(), i.e. assign
a specific keyword "AUTOINC" to AUTOREV. when Fetcher meet
this keyword, it will check and set the latest revision to
urldata.revision. get_srcrev later can use the urldata.revision
for value evaluation(SRCPV etc). In this case, SRCREV no longer
depends on get_srcrev, and there is not deadlock anymore.

Signed-off-by: Yu Ke <ke.yu@intel.com>
2011-01-10 20:24:33 +00:00
Richard Purdie f46cdcbbae bitbake/poky.conf: Add TARGET_LINK_HASH_STYLE option to TARGET_LDFLAGS as per OE.dev
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-01-10 13:24:05 +00:00
Richard Purdie b75330e99b bitbake.conf: Set a default hash policy globally, not just in the poky distro config
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-30 12:24:18 +00:00
Richard Purdie 3abc81b798 bitbake.conf/poky-env-internal: Adjust PSEUDO variables to match pseudo enabled/disabled modes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-17 16:14:07 +00:00
Richard Purdie f07b1a2756 Drop variables that do nothing
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-10 22:51:19 +00:00
Richard Purdie 88ee037741 task-cross-canadian: Ensure it reflects TARGET_ARCH in PN
If this recipe doesn't reflect TARGET_ARCH in its name, only
one flavour of cross toolchain can be installed at once.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-12-10 16:56:08 +00:00
Richard Purdie 724088189e Poky -> Yocto name change
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-27 07:54:03 +01:00
Richard Purdie 36f1ae42fe pseudo/fakeroot: Move the pseudo directory creation into bitbake
If sstate was used to accelerate a build, the pseudo directory might not have
been created leading to subsequent task failures.

Also, sstate packages were not being installed under pseudo context meaning
file permissions could have been lost.

Fix these problems by creating a FAKEROOTDIRS variable which bitbake ensures
exists before running tasks and running the appropriate setscene tasks under
fakeroot context.

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-10-22 13:00:40 +01:00
Richard Purdie e3d7890cac Make invalid LICENSE fields fatal
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-30 20:46:23 +01:00
Richard Purdie 97dec8410b sstate.bbclass: Update to use SSTATE variables everywhere and remove the now unneeded complicated paths from the sstate files
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-29 12:12:26 +01:00
Richard Purdie 3c5984a5ba bitbake.conf/documentation.conf: Start using SUMMARY variable and document it
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-21 23:53:07 +01:00