summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/packaged-staging.bbclass10
1 files changed, 2 insertions, 8 deletions
diff --git a/meta/classes/packaged-staging.bbclass b/meta/classes/packaged-staging.bbclass
index 094aa5979f..9b9ba16bff 100644
--- a/meta/classes/packaged-staging.bbclass
+++ b/meta/classes/packaged-staging.bbclass
@@ -92,8 +92,7 @@ def pstage_manualclean(srcname, destvarname, d):
92 if (file == "staging.lock"): 92 if (file == "staging.lock"):
93 continue 93 continue
94 filepath = os.path.join(walkroot, file).replace(src, dest) 94 filepath = os.path.join(walkroot, file).replace(src, dest)
95 bb.note("rm %s" % filepath) 95 os.system("rm %s 2> /dev/null" % filepath)
96 os.system("rm %s" % filepath)
97 96
98def pstage_set_pkgmanager(d): 97def pstage_set_pkgmanager(d):
99 import bb 98 import bb
@@ -176,16 +175,11 @@ python packagestage_scenefunc () {
176 175
177 bb.build.exec_func("staging_helper", d) 176 bb.build.exec_func("staging_helper", d)
178 177
179 bb.note("Here 1\n")
180
181 removepkg = bb.data.expand("${PSTAGE_PKGPN}", d) 178 removepkg = bb.data.expand("${PSTAGE_PKGPN}", d)
182 179
183 bb.note("Here 1.1\n")
184 pstage_cleanpackage(removepkg, d) 180 pstage_cleanpackage(removepkg, d)
185 bb.note("Here 1.2\n")
186 stagepkg = bb.data.expand("${PSTAGE_PKG}", d)
187 181
188 bb.note("Here 2 %s\n"% stagepkg) 182 stagepkg = bb.data.expand("${PSTAGE_PKG}", d)
189 183
190 if os.path.exists(stagepkg): 184 if os.path.exists(stagepkg):
191 path = bb.data.getVar("PATH", d, 1) 185 path = bb.data.getVar("PATH", d, 1)