mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-04 22:39:49 +02:00
Code Issues Packages Projects Releases Wiki Activity

classes: Only enable fakeroot on setscene tasks with packaging

Browse Source 
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
This commit is contained in:
Richard Purdie
2010-10-22 16:34:06 +01:00
committed by Saul Wold
parent 59df74164d
commit 47cfaec4ea
5 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meta/classes/base.bbclass
View File

@@ -485,6 +485,7 @@ python () {
deps.append('virtual/fakeroot-native:do_populate_sysroot') deps.append('virtual/fakeroot-native:do_populate_sysroot')
bb.data.setVarFlag('do_package', 'depends', " ".join(deps),d) bb.data.setVarFlag('do_package', 'depends', " ".join(deps),d)
bb.data.setVarFlag('do_package', 'fakeroot', 1, 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) source_mirror_fetch = bb.data.getVar('SOURCE_MIRROR_FETCH', d, 0)
if not source_mirror_fetch: if not source_mirror_fetch:
need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1) need_host = bb.data.getVar('COMPATIBLE_HOST', d, 1)

2
meta/classes/package.bbclass
View File

@@ -1096,8 +1096,6 @@ python do_package_setscene () {
sstate_setscene(d) sstate_setscene(d)
} }
addtask do_package_setscene addtask do_package_setscene
do_package_setscene[fakeroot] = "1"
# Dummy task to mark when all packaging is complete # Dummy task to mark when all packaging is complete
do_package_write () { do_package_write () {

2
meta/classes/package_deb.bbclass
View File

@@ -273,7 +273,6 @@ python do_package_write_deb_setscene () {
sstate_setscene(d) sstate_setscene(d)
} }
addtask do_package_write_deb_setscene addtask do_package_write_deb_setscene
do_package_write_deb_setscene[fakeroot] = "1"
python () { python () {
if bb.data.getVar('PACKAGES', d, True) != '': if bb.data.getVar('PACKAGES', d, True) != '':
@@ -282,6 +281,7 @@ python () {
deps.append('virtual/fakeroot-native:do_populate_sysroot') 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', 'depends', " ".join(deps), d)
bb.data.setVarFlag('do_package_write_deb', 'fakeroot', "1", 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 () { python do_package_write_deb () {

2
meta/classes/package_ipk.bbclass
View File

@@ -317,7 +317,6 @@ python do_package_write_ipk_setscene () {
sstate_setscene(d) sstate_setscene(d)
} }
addtask do_package_write_ipk_setscene addtask do_package_write_ipk_setscene
do_package_write_ipk_setscene[fakeroot] = "1"
python () { python () {
if bb.data.getVar('PACKAGES', d, True) != '': if bb.data.getVar('PACKAGES', d, True) != '':
@@ -326,6 +325,7 @@ python () {
deps.append('virtual/fakeroot-native:do_populate_sysroot') 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', 'depends', " ".join(deps), d)
bb.data.setVarFlag('do_package_write_ipk', 'fakeroot', "1", 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 () { python do_package_write_ipk () {

2
meta/classes/package_rpm.bbclass
View File

@@ -545,6 +545,7 @@ python () {
deps.append('virtual/fakeroot-native:do_populate_sysroot') 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', 'depends', " ".join(deps), d)
bb.data.setVarFlag('do_package_write_rpm', 'fakeroot', 1, 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" SSTATETASKS += "do_package_write_rpm"
@@ -556,7 +557,6 @@ python do_package_write_rpm_setscene () {
sstate_setscene(d) sstate_setscene(d)
} }
addtask do_package_write_rpm_setscene addtask do_package_write_rpm_setscene
do_package_write_rpm_setscene[fakeroot] = "1"
python do_package_write_rpm () { python do_package_write_rpm () {
bb.build.exec_func("read_subpackage_metadata", d) bb.build.exec_func("read_subpackage_metadata", d)