summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/package_deb.bbclass9
-rw-r--r--meta/classes/package_ipk.bbclass10
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 () {
38 if (exitstatus != 0 ): 38 if (exitstatus != 0 ):
39 raise bb.build.FuncFailed(output) 39 raise bb.build.FuncFailed(output)
40 40
41 f = open(os.path.join(tmpdir, "stamps", "do_packages"), "w") 41 f = open(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"), "w")
42 f.close() 42 f.close()
43 43
44 # NOTE: this env stuff is racy at best, we need something more capable 44 # NOTE: this env stuff is racy at best, we need something more capable
@@ -86,9 +86,9 @@ python do_package_deb () {
86 return 86 return
87 87
88 tmpdir = bb.data.getVar('TMPDIR', d, 1) 88 tmpdir = bb.data.getVar('TMPDIR', d, 1)
89 # Invalidate the packages file 89
90 if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): 90 if os.access(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"),os.R_OK):
91 os.unlink(os.path.join(tmpdir, "stamps", "do_packages")) 91 os.unlink(os.path.join(tmpdir, "stamps", "DEB_PACKAGE_INDEX_CLEAN"))
92 92
93 if packages == []: 93 if packages == []:
94 bb.debug(1, "No packages; nothing to do") 94 bb.debug(1, "No packages; nothing to do")
@@ -141,6 +141,7 @@ python do_package_deb () {
141 note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1))) 141 note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
142 unlockfile(lf) 142 unlockfile(lf)
143 continue 143 continue
144
144 controldir = os.path.join(root, 'DEBIAN') 145 controldir = os.path.join(root, 'DEBIAN')
145 bb.mkdirhier(controldir) 146 bb.mkdirhier(controldir)
146 os.chmod(controldir, 0755) 147 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 () {
50 50
51 51
52 if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or 52 if (not os.access(os.path.join(ipkdir,"Packages"), os.R_OK) or
53 not os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): 53 not os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),os.R_OK):
54 ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir)) 54 ret = os.system('ipkg-make-index -p %s %s ' % (os.path.join(ipkdir, "Packages"), ipkdir))
55 if (ret != 0 ): 55 if (ret != 0 ):
56 raise bb.build.FuncFailed 56 raise bb.build.FuncFailed
57 f=open(os.path.join(tmpdir, "stamps", "do_packages"),"w") 57 f = open(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"),"w")
58 f.close() 58 f.close()
59 59
60 ret = os.system('ipkg-cl -o %s -f %s update' % (rootfs, conffile)) 60 ret = os.system('ipkg-cl -o %s -f %s update' % (rootfs, conffile))
@@ -144,9 +144,9 @@ python do_package_ipk () {
144 return 144 return
145 145
146 tmpdir = bb.data.getVar('TMPDIR', d, 1) 146 tmpdir = bb.data.getVar('TMPDIR', d, 1)
147 # Invalidate the packages file 147
148 if os.access(os.path.join(tmpdir, "stamps", "do_packages"),os.R_OK): 148 if os.access(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"), os.R_OK):
149 os.unlink(os.path.join(tmpdir, "stamps", "do_packages")) 149 os.unlink(os.path.join(tmpdir, "stamps", "IPK_PACKAGE_INDEX_CLEAN"))
150 150
151 if packages == []: 151 if packages == []:
152 bb.debug(1, "No packages; nothing to do") 152 bb.debug(1, "No packages; nothing to do")