summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2006-09-18 20:31:39 +0000
committerRichard Purdie <richard@openedhand.com>2006-09-18 20:31:39 +0000
commit04f695333350e31fa87b7822c17a073af73fcd84 (patch)
tree93d7d304e502db5ab9a065ff81088f100c09c079
parent1f0424a2d3f1277a989d37c18d2630f9e03d8599 (diff)
downloadpoky-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.bbclass5
-rw-r--r--meta/classes/package.bbclass4
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() {
548} 548}
549 549
550 550
551addtask stage after do_compile
552base_do_stage () { 551base_do_stage () {
553 : 552 :
554} 553}
@@ -560,14 +559,14 @@ do_populate_staging[dirs] = "${STAGING_DIR}/${TARGET_SYS}/bin ${STAGING_DIR}/${T
560 ${STAGING_DATADIR} \ 559 ${STAGING_DATADIR} \
561 ${S} ${B}" 560 ${S} ${B}"
562 561
563addtask populate_staging after do_compile 562addtask populate_staging after do_package
564 563
565python do_populate_staging () { 564python do_populate_staging () {
566 bb.build.exec_func('do_stage', d) 565 bb.build.exec_func('do_stage', d)
567} 566}
568 567
569addtask install after do_compile 568addtask install after do_compile
570do_install[dirs] = "${S} ${B}" 569do_install[dirs] = "${D} ${S} ${B}"
571 570
572base_do_install() { 571base_do_install() {
573 : 572 :
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() {
725 bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d) 725 bb.data.setVar('RDEPENDS_%s' % mainpkg, ' '.join(rdep), d)
726} 726}
727 727
728PACKAGEFUNCS = "do_install package_do_split_locales \ 728PACKAGEFUNCS = "package_do_split_locales \
729 populate_packages package_do_shlibs \ 729 populate_packages package_do_shlibs \
730 package_do_pkgconfig read_shlibdeps" 730 package_do_pkgconfig read_shlibdeps"
731python package_do_package () { 731python package_do_package () {
@@ -738,4 +738,4 @@ do_package[dirs] = "${D}"
738do_package[deptask] = "do_package" 738do_package[deptask] = "do_package"
739populate_packages[dirs] = "${D}" 739populate_packages[dirs] = "${D}"
740EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook 740EXPORT_FUNCTIONS do_package do_shlibs do_split_locales mapping_rename_hook
741addtask package before do_build after do_populate_staging 741addtask package before do_build after do_install