5 files changed, 4 insertions, 5 deletions
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index feee524a6..2c71571b3 100644
--- 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 a35fbb29e..b64ff5de5 100644
--- 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 2f0d78ddb..71a58fb29 100644
--- 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 e93d7e2b1..c1393fa76 100644
--- 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 4ad97c35c..fbe0626d6 100644
--- 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)