diff options
| author | Graeme Gregory <dp@xora.org.uk> | 2006-08-27 17:20:35 +0000 |
|---|---|---|
| committer | Graeme Gregory <dp@xora.org.uk> | 2006-08-27 17:20:35 +0000 |
| commit | 69383bc09ea895755f1ed236c686e5c6cdf9ced7 (patch) | |
| tree | 79debc84d115e3331af9e384af855e5dfdb25d2c /classes | |
| parent | b59ce10791fa913ef0915e48a514f04ca2815977 (diff) | |
| parent | 2ef9cf97f34b7ec69f1df908413afa462e09ba61 (diff) | |
merge of '31791b517fd0fdc4e50c48d20a836408a23727d3'
and 'ce3b6559d2cb3ba65a6dd0f69e76c890fe48f129'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/base.bbclass | 8 | ||||
| -rw-r--r-- | classes/package.bbclass | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/classes/base.bbclass b/classes/base.bbclass index 6f8468b119..e413afb2b3 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -50,7 +50,7 @@ def base_set_filespath(path, d): overrides = overrides + ":" for o in overrides.split(":"): filespath.append(os.path.join(p, o)) - bb.data.setVar("FILESPATH", ":".join(filespath), d) + return ":".join(filespath) FILESPATH = "${@base_set_filespath([ "${FILE_DIRNAME}/${PF}", "${FILE_DIRNAME}/${P}", "${FILE_DIRNAME}/${PN}", "${FILE_DIRNAME}/files", "${FILE_DIRNAME}" ], d)}" @@ -601,8 +601,6 @@ base_do_compile() { fi } - -addtask stage after do_compile base_do_stage () { : } @@ -614,13 +612,13 @@ do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${T ${STAGING_DATADIR} \ ${S} ${B}" -addtask populate_staging after do_compile +addtask populate_staging after do_package python do_populate_staging () { bb.build.exec_func('do_stage', d) } -addtask install after do_compile +addtask install after do_compile do_install[dirs] = "${S} ${B}" base_do_install() { diff --git a/classes/package.bbclass b/classes/package.bbclass index 0d6a7734af..9b913ecf82 100644 --- a/classes/package.bbclass +++ b/classes/package.bbclass @@ -725,7 +725,7 @@ python package_do_split_locales() { bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d) } -PACKAGEFUNCS ?= " do_install package_do_split_locales \ +PACKAGEFUNCS ?= " package_do_split_locales \ populate_packages package_do_shlibs \ package_do_pkgconfig read_shlibdeps" python package_do_package () { @@ -738,4 +738,4 @@ do_package[dirs] = "${D}" do_package[deptask] = "do_package" populate_packages[dirs] = "${D}" EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook -addtask package before do_build after do_populate_staging +addtask package before do_build after do_install |