diff options
-rw-r--r-- | meta/classes/archiver.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index 858507b343..a3962306b1 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass | |||
@@ -118,7 +118,7 @@ python () { | |||
118 | d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_patched' % pn) | 118 | d.appendVarFlag('do_deploy_archives', 'depends', ' %s:do_ar_patched' % pn) |
119 | elif ar_src == "configured": | 119 | elif ar_src == "configured": |
120 | # We can't use "addtask do_ar_configured after do_configure" since it | 120 | # We can't use "addtask do_ar_configured after do_configure" since it |
121 | # will cause the deptask of do_populate_sysroot to run not matter what | 121 | # will cause the deptask of do_populate_sysroot to run no matter what |
122 | # archives we need, so we add the depends here. | 122 | # archives we need, so we add the depends here. |
123 | 123 | ||
124 | # There is a corner case with "gcc-source-${PV}" recipes, they don't have | 124 | # There is a corner case with "gcc-source-${PV}" recipes, they don't have |
@@ -163,7 +163,7 @@ python () { | |||
163 | d.appendVarFlag('do_package_write_rpm', 'depends', ' %s:do_ar_configured' % pn) | 163 | d.appendVarFlag('do_package_write_rpm', 'depends', ' %s:do_ar_configured' % pn) |
164 | } | 164 | } |
165 | 165 | ||
166 | # Take all the sources for a recipe and puts them in WORKDIR/archiver-work/. | 166 | # Take all the sources for a recipe and put them in WORKDIR/archiver-work/. |
167 | # Files in SRC_URI are copied directly, anything that's a directory | 167 | # Files in SRC_URI are copied directly, anything that's a directory |
168 | # (e.g. git repositories) is "unpacked" and then put into a tarball. | 168 | # (e.g. git repositories) is "unpacked" and then put into a tarball. |
169 | python do_ar_original() { | 169 | python do_ar_original() { |
@@ -463,7 +463,7 @@ python do_unpack_and_patch() { | |||
463 | ar_sysroot_native = d.getVar('STAGING_DIR_NATIVE') | 463 | ar_sysroot_native = d.getVar('STAGING_DIR_NATIVE') |
464 | pn = d.getVar('PN') | 464 | pn = d.getVar('PN') |
465 | 465 | ||
466 | # The kernel class functions require it to be on work-shared, so we dont change WORKDIR | 466 | # The kernel class functions require it to be on work-shared, so we don't change WORKDIR |
467 | if not is_work_shared(d): | 467 | if not is_work_shared(d): |
468 | # Change the WORKDIR to make do_unpack do_patch run in another dir. | 468 | # Change the WORKDIR to make do_unpack do_patch run in another dir. |
469 | d.setVar('WORKDIR', ar_workdir) | 469 | d.setVar('WORKDIR', ar_workdir) |
@@ -505,7 +505,7 @@ python do_unpack_and_patch() { | |||
505 | # of the output file ensures that we create it each time the recipe | 505 | # of the output file ensures that we create it each time the recipe |
506 | # gets rebuilt, at least as long as a PR server is used. We also rely | 506 | # gets rebuilt, at least as long as a PR server is used. We also rely |
507 | # on that mechanism to catch changes in the file content, because the | 507 | # on that mechanism to catch changes in the file content, because the |
508 | # file content is not part of of the task signature either. | 508 | # file content is not part of the task signature either. |
509 | do_ar_recipe[vardepsexclude] += "BBINCLUDED" | 509 | do_ar_recipe[vardepsexclude] += "BBINCLUDED" |
510 | python do_ar_recipe () { | 510 | python do_ar_recipe () { |
511 | """ | 511 | """ |