diff options
| author | Koen Kooi <koen@openembedded.org> | 2007-10-01 12:33:20 +0000 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2007-10-01 12:33:20 +0000 |
| commit | c6a46d9fc00dccc78b3543ee6c5b62f856bc4c86 (patch) | |
| tree | fa46636f8c4430d89af0ff3559a98d42345bd07c /classes/package_ipk.bbclass | |
| parent | 5aaaaa5942b4a928a34bf3804a3cf8cc302be4f8 (diff) | |
| parent | 0758358b14b63d166784e5163682f9dc72b49a0e (diff) | |
merge of 'e7fcaa386e6ece8257005e7222964138b4ee8773'
and 'f68cd62e66ec1f6d24dc3d4588abbc23993878da'
Diffstat (limited to 'classes/package_ipk.bbclass')
| -rw-r--r-- | classes/package_ipk.bbclass | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/classes/package_ipk.bbclass b/classes/package_ipk.bbclass index 0b7f274a96..a12899e2a1 100644 --- a/classes/package_ipk.bbclass +++ b/classes/package_ipk.bbclass @@ -49,11 +49,11 @@ python package_ipk_install () { if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or - not os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): + not os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),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(tmpdir, "stamps", "do_packages"),"w") + f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w") f.close() ret = os.system('ipkg-cl -o %s -f %s update' % (rootfs, conffile)) @@ -143,9 +143,9 @@ python do_package_ipk () { return tmpdir = bb.data.getVar('TMPDIR', d, 1) - # Invalidate the packages file - if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): - os.unlink(os.path.join(tmpdir, "stamps", "do_packages")) + + if os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"), os.R_OK): + os.unlink(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN")) if packages == []: bb.debug(1, "No packages; nothing to do") |