[oe-commits] org.oe.dev classes: Convert to PKGDATA_DIR variable (from poky)

[rpurdie commit]

classes: Convert to PKGDATA_DIR variable (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 1550bfad87a21a83e99e0323cce51db13769f205
ViewMTN: http://monotone.openembedded.org/revision.psp?id=1550bfad87a21a83e99e0323cce51db13769f205
Files:
1
classes/base.bbclass
classes/package.bbclass
classes/package_ipk.bbclass
classes/package_tar.bbclass
Diffs:

#
# mt diff -r2db32af5a72c34de7ec04020535b02e343c170e3 -r1550bfad87a21a83e99e0323cce51db13769f205
#
# 
# 
# patch "classes/base.bbclass"
#  from [0b7bd90cd81cad21be3a5562472533d725e69760]
#    to [14a6946faa8339efe5e92a4643b930a954fcee1e]
# 
# patch "classes/package.bbclass"
#  from [549ba4f40e9037dbc77ce99399310cf46e33072b]
#    to [8214219f4cf766c4e5f3298b107e9215fe944e47]
# 
# patch "classes/package_ipk.bbclass"
#  from [115710babe1d2cc095e515f58f4593c548e5b72b]
#    to [54b39e5efba77c456870382c897602c36e8d5cfc]
# 
# patch "classes/package_tar.bbclass"
#  from [fcd7bc894001e323cb9cf5f5d1f547447e7b636e]
#    to [10aa1d1ddc7ffe939e5af5cd9118f366d4d4aba3]
# 
============================================================
--- classes/base.bbclass	0b7bd90cd81cad21be3a5562472533d725e69760
+++ classes/base.bbclass	14a6946faa8339efe5e92a4643b930a954fcee1e
@@ -724,7 +724,7 @@ def packaged(pkg, d):
 
 def packaged(pkg, d):
 	import os, bb
-	return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK)
+	return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
 
 def read_pkgdatafile(fn):
 	pkgdata = {}
@@ -750,23 +750,23 @@ def has_subpkgdata(pkg, d):
 
 def has_subpkgdata(pkg, d):
 	import bb, os
-	fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d)
+	fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
 	return os.access(fn, os.R_OK)
 
 def read_subpkgdata(pkg, d):
 	import bb, os
-	fn = bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s' % pkg, d)
+	fn = bb.data.expand('${PKGDATA_DIR}/runtime/%s' % pkg, d)
 	return read_pkgdatafile(fn)
 
 
 def has_pkgdata(pn, d):
 	import bb, os
-	fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d)
+	fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
 	return os.access(fn, os.R_OK)
 
 def read_pkgdata(pn, d):
 	import bb, os
-	fn = bb.data.expand('${STAGING_DIR}/pkgdata/%s' % pn, d)
+	fn = bb.data.expand('${PKGDATA_DIR}/%s' % pn, d)
 	return read_pkgdatafile(fn)
 
 python read_subpackage_metadata () {
============================================================
--- classes/package.bbclass	549ba4f40e9037dbc77ce99399310cf46e33072b
+++ classes/package.bbclass	8214219f4cf766c4e5f3298b107e9215fe944e47
@@ -503,13 +503,13 @@ python emit_pkgdata() {
 	if not packages:
 		return
 
-	data_file = bb.data.expand("${STAGING_DIR}/pkgdata/${PN}", d)
+	data_file = bb.data.expand("${PKGDATA_DIR}/${PN}", d)
 	f = open(data_file, 'w')
 	f.write("PACKAGES: %s\n" % packages)
 	f.close()
 
 	for pkg in packages.split():
-		subdata_file = bb.data.expand("${STAGING_DIR}/pkgdata/runtime/%s" % pkg, d)
+		subdata_file = bb.data.expand("${PKGDATA_DIR}/runtime/%s" % pkg, d)
 		sf = open(subdata_file, 'w')
 		write_if_exists(sf, pkg, 'DESCRIPTION')
 		write_if_exists(sf, pkg, 'RDEPENDS')
@@ -528,7 +528,7 @@ python emit_pkgdata() {
 		write_if_exists(sf, pkg, 'pkg_prerm')
 		sf.close()
 }
-emit_pkgdata[dirs] = "${STAGING_DIR}/pkgdata/runtime"
+emit_pkgdata[dirs] = "${PKGDATA_DIR}/runtime"
 
 ldconfig_postinst_fragment() {
 if [ x"$D" = "x" ]; then
@@ -830,7 +830,7 @@ python package_depchains() {
 
 	def pkg_addrrecs(pkg, base, suffix, getname, rdepends, d):
 		def packaged(pkg, d):
-			return os.access(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), os.R_OK)
+			return os.access(bb.data.expand('${PKGDATA_DIR}/runtime/%s.packaged' % pkg, d), os.R_OK)
 
                 #bb.note('rdepends for %s is %s' % (base, rdepends))
 
============================================================
--- classes/package_ipk.bbclass	115710babe1d2cc095e515f58f4593c548e5b72b
+++ classes/package_ipk.bbclass	54b39e5efba77c456870382c897602c36e8d5cfc
@@ -231,8 +231,6 @@ python do_package_ipk () {
 		if ret != 0:
 			raise bb.build.FuncFailed("ipkg-build execution failed")
 
-		file(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), 'w').close()
-
 		for script in ["preinst", "postinst", "prerm", "postrm", "control" ]:
 			scriptfile = os.path.join(controldir, script)
 			try:
@@ -243,5 +241,4 @@ python do_package_ipk () {
 			os.rmdir(controldir)
 		except OSError:
 			pass
-		del localdata
 }
============================================================
--- classes/package_tar.bbclass	fcd7bc894001e323cb9cf5f5d1f547447e7b636e
+++ classes/package_tar.bbclass	10aa1d1ddc7ffe939e5af5cd9118f366d4d4aba3
@@ -78,7 +78,7 @@ python do_package_tar () {
 		bb.data.setVar('OVERRIDES', '%s:%s' % (overrides, pkg), localdata)
 
 		bb.data.update_data(localdata)
-# stuff
+
 		root = bb.data.getVar('ROOT', localdata)
 		bb.mkdirhier(root)
 		basedir = os.path.dirname(root)
@@ -97,9 +97,4 @@ python do_package_tar () {
 		ret = os.system("tar -czvf %s %s" % (tarfn, '.'))
 		if ret != 0:
 			bb.error("Creation of tar %s failed." % tarfn)
-
-		file(bb.data.expand('${STAGING_DIR}/pkgdata/runtime/%s.packaged' % pkg, d), 'w').close()
-
-# end stuff
-		del localdata
 }