2 files changed, 10 insertions, 9 deletions

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 2ab537f174..d94fae5c90 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -38,7 +38,7 @@ python do_package_deb_install () {
     if (exitstatus != 0 ):
         raise bb.build.FuncFailed(output)
 
-    f = open(os.path.join(tmpdir, "stamps", "do_packages"), "w")
+    f = open(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"), "w")
     f.close()
 
     # NOTE: this env stuff is racy at best, we need something more capable
@@ -86,9 +86,9 @@ python do_package_deb () {
         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", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
+        os.unlink(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"))
 
     if packages == []:
         bb.debug(1, "No packages; nothing to do")
@@ -141,6 +141,7 @@ python do_package_deb () {
             note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
             unlockfile(lf)
             continue
+
         controldir = os.path.join(root, 'DEBIAN')
         bb.mkdirhier(controldir)
         os.chmod(controldir, 0755)
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 4329d01b8f..be300e04b1 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -50,11 +50,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))
@@ -144,9 +144,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")