diff options
| author | Richard Purdie <richard@openedhand.com> | 2008-05-01 16:46:49 +0000 |
|---|---|---|
| committer | Richard Purdie <richard@openedhand.com> | 2008-05-01 16:46:49 +0000 |
| commit | 1122b0093f0871989abdad5c74a2af26d1af3c59 (patch) | |
| tree | a5f0b5ef5727ac898ee775bb6b3127e65faa53ba /meta | |
| parent | 97c2950928ed5a165dd14a1fdb55d9460422c800 (diff) | |
| download | poky-1122b0093f0871989abdad5c74a2af26d1af3c59.tar.gz | |
packaged-staging.bbclass: Fixup do_prepackaged_stage references
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@4402 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/packaged-staging.bbclass | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass index 2223ea18d1..66197b7e9c 100644 --- a/meta/classes/packaged-staging.bbclass +++ b/meta/classes/packaged-staging.bbclass | |||
| @@ -71,9 +71,9 @@ python () { | |||
| 71 | deps += " stagemanager-native:do_populate_staging" | 71 | deps += " stagemanager-native:do_populate_staging" |
| 72 | bb.data.setVarFlag('do_populate_staging', 'depends', deps, d) | 72 | bb.data.setVarFlag('do_populate_staging', 'depends', deps, d) |
| 73 | 73 | ||
| 74 | deps = bb.data.getVarFlag('do_prepackaged_stage', 'depends', d) or "" | 74 | deps = bb.data.getVarFlag('do_setscene', 'depends', d) or "" |
| 75 | deps += " opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" | 75 | deps += " opkg-native:do_populate_staging ipkg-utils-native:do_populate_staging" |
| 76 | bb.data.setVarFlag('do_prepackaged_stage', 'depends', deps, d) | 76 | bb.data.setVarFlag('do_setscene', 'depends', deps, d) |
| 77 | bb.data.setVar("PSTAGING_ACTIVE", "1", d) | 77 | bb.data.setVar("PSTAGING_ACTIVE", "1", d) |
| 78 | else: | 78 | else: |
| 79 | bb.data.setVar("PSTAGING_ACTIVE", "0", d) | 79 | bb.data.setVar("PSTAGING_ACTIVE", "0", d) |
| @@ -160,7 +160,6 @@ python packagestage_scenefunc () { | |||
| 160 | import os | 160 | import os |
| 161 | 161 | ||
| 162 | if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0": | 162 | if bb.data.getVar("PSTAGING_ACTIVE", d, 1) == "0": |
| 163 | bb.build.make_stamp("do_prepackaged_stage", d) | ||
| 164 | return | 163 | return |
| 165 | 164 | ||
| 166 | removepkg = bb.data.expand("${PSTAGE_PKGPN}", d) | 165 | removepkg = bb.data.expand("${PSTAGE_PKGPN}", d) |
