classes: Only enable fakeroot on setscene tasks with packaging

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index feee524a6b24d681a207acd8b6a6bbb837f0ac61..2c71571b3f7e876f25b4e3fb4131e59dc684d771 100644 (file)
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -485,6 +485,7 @@ python () {
         deps.append('virtual/fakeroot-native:do_populate_sysroot')
         bb.data.setVarFlag('do_package', 'depends', " ".join(deps),d)
         bb.data.setVarFlag('do_package', 'fakeroot', 1, d)
+        bb.data.setVarFlag('do_package_setscene', 'fakeroot', 1, d)
     source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0)
     if not source_mirror_fetch:
         need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index a35fbb29efea89a251876cd9df362d42474ab708..b64ff5de58e5a922fbb60d227ec9563c2c123cc2 100644 (file)
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -1096,8 +1096,6 @@ python do_package_setscene () {
        sstate_setscene(d)
 }
 addtask do_package_setscene
-do_package_setscene[fakeroot] = "1"
-
 
 # Dummy task to mark when all packaging is complete
 do_package_write () {

diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 2f0d78ddb4f54303d5fc4ba8f55d1fa0f39b6027..71a58fb29443398650ae613768a2cb1417ca66ed 100644 (file)
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -273,7 +273,6 @@ python do_package_write_deb_setscene () {
     sstate_setscene(d)
 }
 addtask do_package_write_deb_setscene
-do_package_write_deb_setscene[fakeroot] = "1"
 
 python () {
     if bb.data.getVar('PACKAGES', d, True) != '':
@@ -282,6 +281,7 @@ python () {
         deps.append('virtual/fakeroot-native:do_populate_sysroot')
         bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d)
         bb.data.setVarFlag('do_package_write_deb', 'fakeroot', "1", d)
+        bb.data.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1", d)
 }
 
 python do_package_write_deb () {

diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index e93d7e2b169fdfa0d944e140cb1d5a36c36d7410..c1393fa764e931b56708c0c916fb2322492d55cc 100644 (file)
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -317,7 +317,6 @@ python do_package_write_ipk_setscene () {
        sstate_setscene(d)
 }
 addtask do_package_write_ipk_setscene
-do_package_write_ipk_setscene[fakeroot] = "1"
 
 python () {
     if bb.data.getVar('PACKAGES', d, True) != '':
@@ -326,6 +325,7 @@ python () {
         deps.append('virtual/fakeroot-native:do_populate_sysroot')
         bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
         bb.data.setVarFlag('do_package_write_ipk', 'fakeroot', "1", d)
+        bb.data.setVarFlag('do_package_write_ipk_setscene', 'fakeroot', "1", d)
 }
 
 python do_package_write_ipk () {

diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index 4ad97c35c5804f917fc86542c4188e4139cd4694..fbe0626d6e17387bc1635c2ba2637901ec16d686 100644 (file)
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -545,6 +545,7 @@ python () {
         deps.append('virtual/fakeroot-native:do_populate_sysroot')
         bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d)
         bb.data.setVarFlag('do_package_write_rpm', 'fakeroot', 1, d)
+        bb.data.setVarFlag('do_package_write_rpm_setscene', 'fakeroot', 1, d)
 }
 
 SSTATETASKS += "do_package_write_rpm"
@@ -556,7 +557,6 @@ python do_package_write_rpm_setscene () {
        sstate_setscene(d)
 }
 addtask do_package_write_rpm_setscene
-do_package_write_rpm_setscene[fakeroot] = "1"
 
 python do_package_write_rpm () {
        bb.build.exec_func("read_subpackage_metadata", d)