[oe-commits] org.oe.dev package_rpm/tar.bbclass: Don't clobber task depends, append to it. Also make tar packaging slightly less verbose (from poky)

[rpurdie commit]

package_rpm/tar.bbclass: Don't clobber task depends, append to it. Also make tar packaging slightly less verbose (from poky)

Author: rpurdie at openembedded.org
Branch: org.openembedded.dev
Revision: 7a8d9695cda685f2baec892f0841e134dbe841d1
ViewMTN: http://monotone.openembedded.org/revision/info/7a8d9695cda685f2baec892f0841e134dbe841d1
Files:
1
classes/package_rpm.bbclass
classes/package_tar.bbclass
Diffs:

#
# mt diff -rdaaf0b5a3ad36b1cae34325fabda80828d34672e -r7a8d9695cda685f2baec892f0841e134dbe841d1
#
# 
# 
# patch "classes/package_rpm.bbclass"
#  from [544d06eecdf8053fd26fb5ad0149bf70d704de12]
#    to [a1fb065dd1092df200d5baf08e48408748eea688]
# 
# patch "classes/package_tar.bbclass"
#  from [cb0aff337888acb90332c226a3b5ba7c508f5190]
#    to [890d4262a3d5d0dcbe7a0ed77680af01177555e8]
# 
============================================================
--- classes/package_rpm.bbclass	544d06eecdf8053fd26fb5ad0149bf70d704de12
+++ classes/package_rpm.bbclass	a1fb065dd1092df200d5baf08e48408748eea688
@@ -134,7 +134,10 @@ python () {
 python () {
     import bb
     if bb.data.getVar('PACKAGES', d, True) != '':
-        bb.data.setVarFlag('do_package_write_rpm', 'depends', 'rpm-native:do_populate_staging', d)
+        deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split()
+        deps.append('rpm-native:do_populate_staging')
+        deps.append('fakeroot-native:do_populate_staging')
+        bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d)
 }
 
 
============================================================
--- classes/package_tar.bbclass	cb0aff337888acb90332c226a3b5ba7c508f5190
+++ classes/package_tar.bbclass	890d4262a3d5d0dcbe7a0ed77680af01177555e8
@@ -83,15 +83,12 @@ python do_package_tar () {
 		bb.mkdirhier(pkgoutdir)
 		bb.build.exec_func('package_tar_fn', localdata)
 		tarfn = bb.data.getVar('PKGFN', localdata, 1)
-#		if os.path.exists(tarfn):
-#			del localdata
-#			continue
 		os.chdir(root)
 		from glob import glob
 		if not glob('*'):
 			bb.note("Not creating empty archive for %s-%s-%s" % (pkg, bb.data.getVar('PV', localdata, 1), bb.data.getVar('PR', localdata, 1)))
 			continue
-		ret = os.system("tar -czvf %s %s" % (tarfn, '.'))
+		ret = os.system("tar -czf %s %s" % (tarfn, '.'))
 		if ret != 0:
 			bb.error("Creation of tar %s failed." % tarfn)
 }
@@ -99,7 +96,10 @@ python () {
 python () {
     import bb
     if bb.data.getVar('PACKAGES', d, True) != '':
-        bb.data.setVarFlag('do_package_write_tar', 'depends', 'tar-native:do_populate_staging', d)
+        deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split()
+        deps.append('tar-native:do_populate_staging')
+        deps.append('fakeroot-native:do_populate_staging')
+        bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d)
 }