diff options
| author | Richard Purdie <rpurdie@rpsys.net> | 2006-11-20 14:33:19 +0000 |
|---|---|---|
| committer | Richard Purdie <rpurdie@rpsys.net> | 2006-11-20 14:33:19 +0000 |
| commit | 38712c59090394d295677f9a6d3fa019373f4ce5 (patch) | |
| tree | e56d8992a04be100c885287e9775d4272b5f49c2 /classes | |
| parent | 5f77fcad0da4f8ea03b920b912f730dbcabf7018 (diff) | |
| parent | 02f125e6a40c1978258f5a0ae2937d642b4d6705 (diff) | |
merge of '6b50eeffe6b0887666782f657e8f8fc694b7045c'
and 'c647d36367af59b2cc5bdd6d28a4c0a873539f76'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/package_ipk.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 02bac7d62b..278898444d 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -46,11 +46,11 @@ python package_ipk_install () { if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or - not os.access(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),os.R_OK)): + not os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK)): ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir)) if (ret != 0 ): raise bb.build.FuncFailed - f=open(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),"w") + f=open(os.path.join(tmpdir, "stamps" ,"do_packages"),"w") f.close() ret = os.system('ipkg-cl -o %s -f %s update' % (rootfs, conffile)) @@ -89,8 +89,8 @@ python do_package_ipk () { tmpdir = bb.data.getVar('TMPDIR', d, 1) # Invalidate the packages file - if os.access(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages"),os.R_OK): - os.unlink(os.path.join(os.path.join(tmpdir, "stamps"),"do_packages")) + if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): + os.unlink(os.path.join(tmpdir, "stamps" ,"do_packages")) if packages == []: bb.debug(1, "No packages; nothing to do") |