sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

package_(ipk|deb).bbclass: Rename do_packages stamp to be clearer about what it does 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@2814 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2007-09-27 11:48:36 +00:00
parent 5c5c08405c
commit 8af3726ad5
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meta/classes/package_deb.bbclass
View File

@ -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)

10
meta/classes/package_ipk.bbclass
View File

@ -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")