diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/package_deb.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/package_ipk.bbclass | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 4526ac156c..de93593c95 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
@@ -35,7 +35,7 @@ python do_package_deb_install () { | |||
35 | if (exitstatus != 0 ): | 35 | if (exitstatus != 0 ): |
36 | raise bb.build.FuncFailed(output) | 36 | raise bb.build.FuncFailed(output) |
37 | 37 | ||
38 | f = open(os.path.join(os.path.join(tmpdir, "stamps"), "do_packages"), "w") | 38 | f = open(os.path.join(tmpdir, "stamps", "do_packages"), "w") |
39 | f.close() | 39 | f.close() |
40 | 40 | ||
41 | # NOTE: this env stuff is racy at best, we need something more capable | 41 | # NOTE: this env stuff is racy at best, we need something more capable |
@@ -86,8 +86,8 @@ python do_package_deb () { | |||
86 | 86 | ||
87 | tmpdir = bb.data.getVar('TMPDIR', d, 1) | 87 | tmpdir = bb.data.getVar('TMPDIR', d, 1) |
88 | # Invalidate the packages file | 88 | # Invalidate the packages file |
89 | if os.access(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),os.R_OK): | 89 | if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): |
90 | os.unlink(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages")) | 90 | os.unlink(os.path.join(tmpdir, "stamps", "do_packages")) |
91 | 91 | ||
92 | if packages == []: | 92 | if packages == []: |
93 | bb.debug(1, "No packages; nothing to do") | 93 | bb.debug(1, "No packages; nothing to do") |
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index cb44484855..f297381f87 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass | |||
@@ -48,11 +48,11 @@ python package_ipk_install () { | |||
48 | 48 | ||
49 | 49 | ||
50 | if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or | 50 | if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or |
51 | not os.access(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),os.R_OK)): | 51 | not os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): |
52 | ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir)) | 52 | ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir)) |
53 | if (ret != 0 ): | 53 | if (ret != 0 ): |
54 | raise bb.build.FuncFailed | 54 | raise bb.build.FuncFailed |
55 | f=open(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),"w") | 55 | f=open(os.path.join(tmpdir, "stamps", "do_packages"),"w") |
56 | f.close() | 56 | f.close() |
57 | 57 | ||
58 | ret = os.system('ipkg-cl -o %s -f %s update' % (rootfs, conffile)) | 58 | ret = os.system('ipkg-cl -o %s -f %s update' % (rootfs, conffile)) |
@@ -91,8 +91,8 @@ python do_package_ipk () { | |||
91 | 91 | ||
92 | tmpdir = bb.data.getVar('TMPDIR', d, 1) | 92 | tmpdir = bb.data.getVar('TMPDIR', d, 1) |
93 | # Invalidate the packages file | 93 | # Invalidate the packages file |
94 | if os.access(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),os.R_OK): | 94 | if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): |
95 | os.unlink(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages")) | 95 | os.unlink(os.path.join(tmpdir, "stamps", "do_packages")) |
96 | 96 | ||
97 | if packages == []: | 97 | if packages == []: |
98 | bb.debug(1, "No packages; nothing to do") | 98 | bb.debug(1, "No packages; nothing to do") |