[oe-commits] org.oe.dev package_(deb|ipk).bbclass: Rename package index stamp to make it more obvious what its for (from poky)

[rpurdie commit]

package_(deb|ipk).bbclass: Rename package index stamp to make it more obvious what its for (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 56fdbd9f76e6ed3f88b475fd44f1cb59d5e8ab57
ViewMTN: http://monotone.openembedded.org/revision/info/56fdbd9f76e6ed3f88b475fd44f1cb59d5e8ab57
Files:
1
classes/package_deb.bbclass
classes/package_ipk.bbclass
Diffs:

#
# mt diff -rd7765554c3e4f1e39d43d329e9c38943eb93901a -r56fdbd9f76e6ed3f88b475fd44f1cb59d5e8ab57
#
# 
# 
# patch "classes/package_deb.bbclass"
#  from [f46fb56c8a74106712e5cea2bf2e7b708be5e047]
#    to [a66d4de9c722f1036751451a493943d826067859]
# 
# patch "classes/package_ipk.bbclass"
#  from [55ae1d1bc1b49ed1ae4a1a93746b0063fda0d25b]
#    to [233f2e97aea453bf7350e317d172d0844ece5397]
# 
============================================================
--- classes/package_deb.bbclass	f46fb56c8a74106712e5cea2bf2e7b708be5e047
+++ classes/package_deb.bbclass	a66d4de9c722f1036751451a493943d826067859
@@ -46,7 +46,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
@@ -94,10 +94,10 @@ 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")
         return
============================================================
--- classes/package_ipk.bbclass	55ae1d1bc1b49ed1ae4a1a93746b0063fda0d25b
+++ classes/package_ipk.bbclass	233f2e97aea453bf7350e317d172d0844ece5397
@@ -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,10 +143,10 @@ 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")
 		return