diff options
| author |   Richard Purdie <rpurdie@rpsys.net> | 2007-08-08 21:42:19 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2007-08-08 21:42:19 +0000 |
| commit | 525301d9a28061d71fb7e013759f3e5a185d2b46 (patch) | |
| tree | a8ee815dad56253239ea14ded895fb8c868fd830 /classes | |
| parent | 5644015c642b053c3614dada21895df95e9171bc (diff) | |
| download | openembedded-525301d9a28061d71fb7e013759f3e5a185d2b46.tar.gz | |
base.bbclass: Tweaks from Poky (extra comment, lib handling bugfix to not clobber a variable name and unset DISTRO (to unbreak setting DISTRO as an environment variable)
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 45a0282265..1294e41c65 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -82,6 +82,9 @@ def base_dep_prepend(d): if bb.data.getVar('PN', d, True) == "shasum-native": deps = "" + # INHIBIT_DEFAULT_DEPS doesn't apply to the patch command. Whether or not + # we need that built is the responsibility of the patch function / class, not + # the application. if not bb.data.getVar('INHIBIT_DEFAULT_DEPS', d): if (bb.data.getVar('HOST_SYS', d, 1) != bb.data.getVar('BUILD_SYS', d, 1)): @@ -272,8 +275,12 @@ oe_libinstall() { # If such file doesn't exist, try to cut version suffix if [ ! -f "$lafile" ]; then - libname=`echo "$libname" | sed 's/-[0-9.]*$//'` - lafile=$libname.la + libname1=`echo "$libname" | sed 's/-[0-9.]*$//'` + lafile1=$libname.la + if [ -f "$lafile1" ]; then + libname=$libname1 + lafile=$lafile1 + fi fi if [ -f "$lafile" ]; then @@ -807,6 +814,7 @@ def base_after_parse(d): pn = bb.data.getVar('PN', d, 1) + # OBSOLETE in bitbake 1.7.4 srcdate = bb.data.getVar('SRCDATE_%s' % pn, d, 1) if srcdate != None: @@ -816,9 +824,15 @@ def base_after_parse(d): if use_nls != None: bb.data.setVar('USE_NLS', use_nls, d) - # Make sure MACHINE *isn't* exported + # Make sure MACHINE isn't exported + # (breaks binutils at least) bb.data.delVarFlag('MACHINE', 'export', d) bb.data.setVarFlag('MACHINE', 'unexport', 1, d) + + # Make sure DISTRO isn't exported + # (breaks sysvinit at least) + bb.data.delVarFlag('DISTRO', 'export', d) + bb.data.setVarFlag('DISTRO', 'unexport', 1, d) # Git packages should DEPEND on git-native srcuri = bb.data.getVar('SRC_URI', d, 1) @@ -826,7 +840,6 @@ def base_after_parse(d): depends = bb.data.getVarFlag('do_fetch', 'depends', d) or "" depends = depends + " git-native:do_populate_staging" bb.data.setVarFlag('do_fetch', 'depends', depends, d) - mach_arch = bb.data.getVar('MACHINE_ARCH', d, 1) old_arch = bb.data.getVar('PACKAGE_ARCH', d, 1) |