diff options
| author |   Richard Purdie <richard@openedhand.com> | 2006-09-18 20:31:39 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2006-09-18 20:31:39 +0000 |
| commit | 04f695333350e31fa87b7822c17a073af73fcd84 (patch) | |
| tree | 93d7d304e502db5ab9a065ff81088f100c09c079 | |
| parent | 1f0424a2d3f1277a989d37c18d2630f9e03d8599 (diff) | |
| download | openembedded-core-contrib-04f695333350e31fa87b7822c17a073af73fcd84.tar.gz | |
classes: Reorder tasks so staging occurs after packaging. Add do_install into the task chain with dirs fix. Changes merged from OE
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@727 311d38ba-8fff-0310-9ca6-ca027cbcb966
| -rw-r--r-- | meta/classes/base.bbclass | 5 | ||||
| -rw-r--r-- | meta/classes/package.bbclass | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 6faeb979c5..a36829006e 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -548,7 +548,6 @@ base_do_compile() { } -addtask stage after do_compile base_do_stage () { : } @@ -560,14 +559,14 @@ 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 -do_install[dirs] = "${S} ${B}" +do_install[dirs] = "${D} ${S} ${B}" base_do_install() { : diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index c7f366e19b..8a7760724e 100644 --- a/meta/classes/package.bbclass +++ b/meta/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 |