summaryrefslogtreecommitdiffstats
path: root/meta/classes/base.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/base.bbclass')
-rw-r--r--meta/classes/base.bbclass36
1 files changed, 9 insertions, 27 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index 39d3e78e9b..cab56deb39 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -308,9 +308,7 @@ python () {
308 if not appends: 308 if not appends:
309 return 309 return
310 varname = bb.data.expand(varname, d) 310 varname = bb.data.expand(varname, d)
311 content = d.getVar(varname, False) or "" 311 d.appendVar(varname, " " + " ".join(appends))
312 content = content + " " + " ".join(appends)
313 d.setVar(varname, content)
314 312
315 extradeps = [] 313 extradeps = []
316 extrardeps = [] 314 extrardeps = []
@@ -363,14 +361,10 @@ python () {
363 if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d): 361 if not bb.data.inherits_class('native', d) and not bb.data.inherits_class('cross', d):
364 d.setVarFlag('do_configure', 'umask', 022) 362 d.setVarFlag('do_configure', 'umask', 022)
365 d.setVarFlag('do_compile', 'umask', 022) 363 d.setVarFlag('do_compile', 'umask', 022)
366 deps = (d.getVarFlag('do_install', 'depends') or "").split() 364 d.appendVarFlag('do_install', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
367 deps.append('virtual/fakeroot-native:do_populate_sysroot')
368 d.setVarFlag('do_install', 'depends', " ".join(deps))
369 d.setVarFlag('do_install', 'fakeroot', 1) 365 d.setVarFlag('do_install', 'fakeroot', 1)
370 d.setVarFlag('do_install', 'umask', 022) 366 d.setVarFlag('do_install', 'umask', 022)
371 deps = (d.getVarFlag('do_package', 'depends') or "").split() 367 d.appendVarFlag('do_package', 'depends', ' virtual/fakeroot-native:do_populate_sysroot')
372 deps.append('virtual/fakeroot-native:do_populate_sysroot')
373 d.setVarFlag('do_package', 'depends', " ".join(deps))
374 d.setVarFlag('do_package', 'fakeroot', 1) 368 d.setVarFlag('do_package', 'fakeroot', 1)
375 d.setVarFlag('do_package', 'umask', 022) 369 d.setVarFlag('do_package', 'umask', 022)
376 d.setVarFlag('do_package_setscene', 'fakeroot', 1) 370 d.setVarFlag('do_package_setscene', 'fakeroot', 1)
@@ -408,40 +402,28 @@ python () {
408 srcuri = d.getVar('SRC_URI', 1) 402 srcuri = d.getVar('SRC_URI', 1)
409 # Svn packages should DEPEND on subversion-native 403 # Svn packages should DEPEND on subversion-native
410 if "svn://" in srcuri: 404 if "svn://" in srcuri:
411 depends = d.getVarFlag('do_fetch', 'depends') or "" 405 d.appendVarFlag('do_fetch', 'depends', ' subversion-native:do_populate_sysroot')
412 depends = depends + " subversion-native:do_populate_sysroot"
413 d.setVarFlag('do_fetch', 'depends', depends)
414 406
415 # Git packages should DEPEND on git-native 407 # Git packages should DEPEND on git-native
416 if "git://" in srcuri: 408 if "git://" in srcuri:
417 depends = d.getVarFlag('do_fetch', 'depends') or "" 409 d.appendVarFlag('do_fetch', 'depends', ' git-native:do_populate_sysroot')
418 depends = depends + " git-native:do_populate_sysroot"
419 d.setVarFlag('do_fetch', 'depends', depends)
420 410
421 # Mercurial packages should DEPEND on mercurial-native 411 # Mercurial packages should DEPEND on mercurial-native
422 elif "hg://" in srcuri: 412 elif "hg://" in srcuri:
423 depends = d.getVarFlag('do_fetch', 'depends') or "" 413 d.appendVarFlag('do_fetch', 'depends', ' mercurial-native:do_populate_sysroot')
424 depends = depends + " mercurial-native:do_populate_sysroot"
425 d.setVarFlag('do_fetch', 'depends', depends)
426 414
427 # OSC packages should DEPEND on osc-native 415 # OSC packages should DEPEND on osc-native
428 elif "osc://" in srcuri: 416 elif "osc://" in srcuri:
429 depends = d.getVarFlag('do_fetch', 'depends') or "" 417 d.appendVarFlag('do_fetch', 'depends', ' osc-native:do_populate_sysroot')
430 depends = depends + " osc-native:do_populate_sysroot"
431 d.setVarFlag('do_fetch', 'depends', depends)
432 418
433 # *.xz should depends on xz-native for unpacking 419 # *.xz should depends on xz-native for unpacking
434 # Not endswith because of "*.patch.xz;patch=1". Need bb.decodeurl in future 420 # Not endswith because of "*.patch.xz;patch=1". Need bb.decodeurl in future
435 if '.xz' in srcuri: 421 if '.xz' in srcuri:
436 depends = d.getVarFlag('do_unpack', 'depends') or "" 422 d.appendVarFlag('do_unpack', 'depends', ' xz-native:do_populate_sysroot')
437 depends = depends + " xz-native:do_populate_sysroot"
438 d.setVarFlag('do_unpack', 'depends', depends)
439 423
440 # unzip-native should already be staged before unpacking ZIP recipes 424 # unzip-native should already be staged before unpacking ZIP recipes
441 if ".zip" in srcuri: 425 if ".zip" in srcuri:
442 depends = d.getVarFlag('do_unpack', 'depends') or "" 426 d.appendVarFlag('do_unpack', 'depends', ' unzip-native:do_populate_sysroot')
443 depends = depends + " unzip-native:do_populate_sysroot"
444 d.setVarFlag('do_unpack', 'depends', depends)
445 427
446 # 'multimachine' handling 428 # 'multimachine' handling
447 mach_arch = d.getVar('MACHINE_ARCH', 1) 429 mach_arch = d.getVar('MACHINE_ARCH', 1)