Commit Graph

21 Commits

Author SHA1 Message Date
Richard Purdie 022a8b58c8 meta/scripts: Various getVar/getVarFlag expansion parameter fixes
There were a few straggling expansion parameter removals left for
getVar/getVarFlag where the odd whitespace meant they were missed
on previous passes. There were also some plain broken ussages such
as:

d.getVar('ALTERNATIVE_TARGET', old_name, True)
path = d.getVar('PATH', d, True)
d.getVar('IMAGE_ROOTFS', 'True')

which I've corrected (they happend to work by luck).

(From OE-Core rev: 688f7a64917a5ce5cbe12f8e5da4d47e265d240f)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2017-01-09 13:39:11 +00:00
Joshua Lock c4e2c59088 meta: remove True option to getVar calls
getVar() now defaults to expanding by default, thus remove the True
option from getVar() calls with a regex search and replace.

Search made with the following regex: getVar ?\(( ?[^,()]*), True\)

(From OE-Core rev: 7c552996597faaee2fbee185b250c0ee30ea3b5f)

Signed-off-by: Joshua Lock <joshua.g.lock@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-16 10:23:23 +00:00
Richard Purdie ace9e1d371 attr: Convert SSTATEPOSTINSTFUNCS to a do_install_append
A SSTATEPOSTINSTFUNCS function here is overkill, just do this in a
do_install_append_class-native and create relative symlinks rather
than absolute ones which would then have to be relocated.

(From OE-Core rev: 518e8d0216b0f42f574e42288804f553b9ff6f99)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-12-08 10:31:29 +00:00
Roy Li 97105c4b29 attr: narrow fix_symlink to populate_sysroot
fix_symlink will be called many times, like populate_sysroot and populate_lic;
which maybe lead to rpm-native building failure, due to the below error:
	".../usr/lib/libacl.so: No such file or directory"
since after acl/attr finished populate_sysroot task, rpm start to be compiled
but acl/attr populate_lic, which run fix_symlink, maybe remove the
.../usr/lib/libacl.so

In fact, fix_symlink only needs to be called after populate_sysroot

(From OE-Core rev: 6882b65489c74907709021532578270e8f7f03f0)

Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-08-16 09:24:54 +01:00
Robert Yang b515939bbe acl/attr: remove extra dev and staticdev from PACKAGES
There should be only one dev and dbg package.

(From OE-Core rev: 93afa6fcc0f84f305fad97407ef408e7a1e37652)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2015-04-13 22:33:20 +01:00
Ross Burton fcd72aab59 attr: use EXTRA_AUTORECONF to disable autoheader
Disable autoheader by setting EXTRA_AUTORECONF to --exclude=autoheader instead
of setting AUTOHEADER to true.

(From OE-Core rev: aa4c06ca7375faacd055ba98d59d48efadd87f59)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-12-03 12:24:00 +00:00
Richard Purdie 3189e74559 attr: Fix uclibc builds
attr needs libintl headers and libs. Add in the missing dependency and
ensure the linker flag gets passed in multilib builds by replacing the
PN == BPN check with a class-target override instead.

(From OE-Core rev: c19fb913006eb53025e5db1574d973c8d7ceec76)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-05-08 13:11:51 +01:00
Richard Purdie 069de520ec autotools-brokensep: Mark recipes with broken separate build dir support
This patch goes through the OE-Core recipes and marks those which use autotools
but don't support a separate build directory (${S} != ${B}). A new class,
autotools-brokensep is used for this purpose.

This doesn't introduce any change in behaviour in its own right.

(From OE-Core rev: 006b8a7808a58713af16c326dc37d07765334b12)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2014-02-28 14:01:16 +00:00
Robert Yang 5ddf8570a1 recipes-support: replace virtclass-native(sdk) with class-native(sdk)
The overrides virtclass-native and virtclass-nativesdk are deprecated,
which should be replaced by class-native and class-nativesdk.

NOTE:
There were 2 errors in libcap.inc, the BUILD_LDFLAGS_virtclass_native
should be BUILD_LDFLAGS_virtclass-native (the "_" should be "-"),
otherwise it doesn't work, and the value was: "-Wl,rpath=...", this is
incorrect, it shoudl be: "-Wl,-rpath=..." (lacked a - ), but we don't
need this line, since it is already in the default BUILD_LDFLAGS. Remove
it and we don't need to bump the PR since we just removed a unused line.

[YOCTO #3297]

(From OE-Core rev: cafb550fe9034754933f1708446dde155dcc3d51)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-11-02 16:18:28 +00:00
Saul Wold b5dee63c2e attr/acl: refactor packages for staticdev
(From OE-Core rev: 7c124d7c359729d074a5a55bd3bf7415a0aacd51)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-01-19 13:26:10 +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
Richard Purdie b090fde5c1 gettext: Switch to disabling nls and reducing -native build dependencies to a set of pre built m4 macros
When analysing our build performance, its apparent that binutils-cross
takes an age to get built. This is due to its dependencies on
flex-native and bison-native which in turn depend on gettext-native.

gettext-native is problematic as it has a significant dependency chain
of its own and takes an age to build. What is worse is that we never
care about the native language support in -native and -cross packages
since we always force the C locale.

This patch therefore disables nls for all -native packages (its already
disabled for -cross) and adds a new gettext-minimal-native package which
contains the m4 macros to keep autoconf/automake happy.

This means we gain a significant build time speedup by the removal of
gettext-native from most dependency chains (only being part of gettext
for the target now).

For now the LICENCE field says GPLv3, the macros are actually under a
FSF MIT like licence so we need to update this part of the patch in due
course.

(From OE-Core rev: 01b2a16beb4a924077b74943ad4d6e7976563ff1)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-11-02 08:58:03 +00:00
Saul Wold 880a506117 acl/attr: don't make symlink if base_libdir = libdir
(From OE-Core rev: 46cd3527217821a7e9a8223dc45a43294b6c5e8d)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-10-07 11:35:49 +01:00
Saul Wold 118da1708c attr/acl: add SSTATEPOSTINSTFUNC
Added a native sstate post install function to fix the links
created between /lib and /usr/lib for the library files. These
links could point to an invalid build area when using shared state.

(From OE-Core rev: 8ab7b681cdb43c6c21c187b8cd01faa39727824a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-09-25 15:27:38 +01:00
Dongxiao Xu 3b387d7b63 ea-acl: Use BPN instead of PN for style like lib${PN}
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.

(From OE-Core rev: 2768b3b26d392d988d392c80e52e1f5e9da23c5c)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-19 09:29:20 -07:00
Dongxiao Xu 5fbac72eb8 multilib: Use BPN instead of PN for style like lib${PN}
When supporting multilib, ${PN} will be extended with MLPREFIX. However
if a package name contains ${PN} with styles like lib${PN}, such
extension will cause error. Use BPN in this case.

(From OE-Core rev: fbb734e5753655de30c82c0a036c9043820e02cb)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-08-03 18:07:25 +01:00
Khem Raj caf22e3ba2 acl,attr: Fix build failures when NLS is disabled on uclibc
Disable gettext support when NLS is not enabled

(From OE-Core rev: f7de0a4f02cfd021176759fc4ea7ebbc88da8ff8)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-07-20 15:27:37 +01:00
Qing He d41c3a8726 attr: upgrade to version 2.4.46
from 2.4.44
 - remove the backported patch that is now in the tarball
 - prog path issue has also been fixed in the upstream

(From OE-Core rev: b56ab842a8c0bc183f839edc035dc89399d783c3)

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-05-04 00:54:39 +01:00
Khem Raj 1ac90a3ba9 attr: Fix compilation on uclibc
It needs -lintl added to LDFLAGS for uclibc

inherit gettext class instead of adding gettext to DEPENDS directly

(From OE-Core rev: 53f421bd2a7dc4caf8cbf4ea1b04cf00ea158b2c)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2011-04-28 10:44:40 +01:00
Dexuan Cui 1d7c9a9828 attr: fix the hardcoded search path in the AC_PATH_PROG
We should respect $PATH.

The patch is from Qing.

Fixes [BUGID #369].
BTW: the bug was triggered on a build host that didn't install gettext.

Signed-off-by: Qing He <qing.he@intel.com>
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
2010-10-09 14:44:07 +01:00
Richard Purdie d62ee7eaf2 packages: Separate out most of the remaining packages into recipes
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
2010-09-01 19:09:57 +01:00