diff options
Diffstat (limited to 'meta/classes/populate_sdk_ext.bbclass')
-rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 28 |
1 files changed, 27 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 800e1175d7..086f55df0c 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass | |||
@@ -20,6 +20,7 @@ SDK_EXT_task-populate-sdk-ext = "-ext" | |||
20 | SDK_EXT_TYPE ?= "full" | 20 | SDK_EXT_TYPE ?= "full" |
21 | SDK_INCLUDE_PKGDATA ?= "0" | 21 | SDK_INCLUDE_PKGDATA ?= "0" |
22 | SDK_INCLUDE_TOOLCHAIN ?= "${@'1' if d.getVar('SDK_EXT_TYPE') == 'full' else '0'}" | 22 | SDK_INCLUDE_TOOLCHAIN ?= "${@'1' if d.getVar('SDK_EXT_TYPE') == 'full' else '0'}" |
23 | SDK_INCLUDE_NATIVESDK ?= "0" | ||
23 | 24 | ||
24 | SDK_RECRDEP_TASKS ?= "" | 25 | SDK_RECRDEP_TASKS ?= "" |
25 | 26 | ||
@@ -401,9 +402,27 @@ python copy_buildsystem () { | |||
401 | excluded_targets = get_sdk_install_targets(d, images_only=True) | 402 | excluded_targets = get_sdk_install_targets(d, images_only=True) |
402 | sigfile = d.getVar('WORKDIR') + '/locked-sigs.inc' | 403 | sigfile = d.getVar('WORKDIR') + '/locked-sigs.inc' |
403 | lockedsigs_pruned = baseoutpath + '/conf/locked-sigs.inc' | 404 | lockedsigs_pruned = baseoutpath + '/conf/locked-sigs.inc' |
405 | #nativesdk-only sigfile to merge into locked-sigs.inc | ||
406 | sdk_include_nativesdk = (d.getVar("SDK_INCLUDE_NATIVESDK") == '1') | ||
407 | nativesigfile = d.getVar('WORKDIR') + '/locked-sigs_nativesdk.inc' | ||
408 | nativesigfile_pruned = d.getVar('WORKDIR') + '/locked-sigs_nativesdk_pruned.inc' | ||
409 | |||
410 | if sdk_include_nativesdk: | ||
411 | oe.copy_buildsystem.prune_lockedsigs([], | ||
412 | excluded_targets.split(), | ||
413 | nativesigfile, | ||
414 | True, | ||
415 | nativesigfile_pruned) | ||
416 | |||
417 | oe.copy_buildsystem.merge_lockedsigs([], | ||
418 | sigfile, | ||
419 | nativesigfile_pruned, | ||
420 | sigfile) | ||
421 | |||
404 | oe.copy_buildsystem.prune_lockedsigs([], | 422 | oe.copy_buildsystem.prune_lockedsigs([], |
405 | excluded_targets.split(), | 423 | excluded_targets.split(), |
406 | sigfile, | 424 | sigfile, |
425 | False, | ||
407 | lockedsigs_pruned) | 426 | lockedsigs_pruned) |
408 | 427 | ||
409 | sstate_out = baseoutpath + '/sstate-cache' | 428 | sstate_out = baseoutpath + '/sstate-cache' |
@@ -414,7 +433,7 @@ python copy_buildsystem () { | |||
414 | 433 | ||
415 | sdk_include_toolchain = (d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1') | 434 | sdk_include_toolchain = (d.getVar('SDK_INCLUDE_TOOLCHAIN') == '1') |
416 | sdk_ext_type = d.getVar('SDK_EXT_TYPE') | 435 | sdk_ext_type = d.getVar('SDK_EXT_TYPE') |
417 | if sdk_ext_type != 'minimal' or sdk_include_toolchain or derivative: | 436 | if (sdk_ext_type != 'minimal' or sdk_include_toolchain or derivative) and not sdk_include_nativesdk: |
418 | # Create the filtered task list used to generate the sstate cache shipped with the SDK | 437 | # Create the filtered task list used to generate the sstate cache shipped with the SDK |
419 | tasklistfn = d.getVar('WORKDIR') + '/tasklist.txt' | 438 | tasklistfn = d.getVar('WORKDIR') + '/tasklist.txt' |
420 | create_filtered_tasklist(d, baseoutpath, tasklistfn, conf_initpath) | 439 | create_filtered_tasklist(d, baseoutpath, tasklistfn, conf_initpath) |
@@ -657,9 +676,16 @@ fakeroot python do_populate_sdk_ext() { | |||
657 | d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}') | 676 | d.setVar('SDKDEPLOYDIR', '${SDKEXTDEPLOYDIR}') |
658 | # ESDKs have a libc from the buildtools so ensure we don't ship linguas twice | 677 | # ESDKs have a libc from the buildtools so ensure we don't ship linguas twice |
659 | d.delVar('SDKIMAGE_LINGUAS') | 678 | d.delVar('SDKIMAGE_LINGUAS') |
679 | if d.getVar("SDK_INCLUDE_NATIVESDK") == '1': | ||
680 | generate_nativesdk_lockedsigs(d) | ||
660 | populate_sdk_common(d) | 681 | populate_sdk_common(d) |
661 | } | 682 | } |
662 | 683 | ||
684 | def generate_nativesdk_lockedsigs(d): | ||
685 | import oe.copy_buildsystem | ||
686 | sigfile = d.getVar('WORKDIR') + '/locked-sigs_nativesdk.inc' | ||
687 | oe.copy_buildsystem.generate_locked_sigs(sigfile, d) | ||
688 | |||
663 | def get_ext_sdk_depends(d): | 689 | def get_ext_sdk_depends(d): |
664 | # Note: the deps varflag is a list not a string, so we need to specify expand=False | 690 | # Note: the deps varflag is a list not a string, so we need to specify expand=False |
665 | deps = d.getVarFlag('do_image_complete', 'deps', False) | 691 | deps = d.getVarFlag('do_image_complete', 'deps', False) |