summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/image.bbclass2
-rw-r--r--meta/classes/package_deb.bbclass4
-rw-r--r--meta/classes/package_ipk.bbclass2
-rw-r--r--meta/classes/package_rpm.bbclass2
-rw-r--r--meta/classes/package_tar.bbclass2
5 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 7318ba9a28..9f076a68e7 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -26,7 +26,7 @@ PID = "${@os.getpid()}"
26 26
27PACKAGE_ARCH = "${MACHINE_ARCH}" 27PACKAGE_ARCH = "${MACHINE_ARCH}"
28 28
29do_rootfs[depends] += "makedevs-native:do_populate_sysroot fakeroot-native:do_populate_sysroot ldconfig-native:do_populate_sysroot" 29do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ldconfig-native:do_populate_sysroot"
30 30
31python () { 31python () {
32 deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or "" 32 deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or ""
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 90ef272c24..38740f1cc9 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -240,7 +240,7 @@ python do_package_deb () {
240 conffiles.close() 240 conffiles.close()
241 241
242 os.chdir(basedir) 242 os.chdir(basedir)
243 ret = os.system("PATH=\"%s\" fakeroot dpkg-deb -b %s %s" % (bb.data.getVar("PATH", localdata, True), root, pkgoutdir)) 243 ret = os.system("PATH=\"%s\" %s dpkg-deb -b %s %s" % (bb.data.getVar("PATH", localdata, True), bb.data.getVar("FAKEROOT", localdata, True) or "fakeroot", root, pkgoutdir))
244 if ret != 0: 244 if ret != 0:
245 bb.utils.unlockfile(lf) 245 bb.utils.unlockfile(lf)
246 raise bb.build.FuncFailed("dpkg-deb execution failed") 246 raise bb.build.FuncFailed("dpkg-deb execution failed")
@@ -253,7 +253,7 @@ python () {
253 if bb.data.getVar('PACKAGES', d, True) != '': 253 if bb.data.getVar('PACKAGES', d, True) != '':
254 deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split() 254 deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split()
255 deps.append('dpkg-native:do_populate_sysroot') 255 deps.append('dpkg-native:do_populate_sysroot')
256 deps.append('fakeroot-native:do_populate_sysroot') 256 deps.append('virtual/fakeroot-native:do_populate_sysroot')
257 bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d) 257 bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d)
258} 258}
259 259
diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass
index 11b60b1563..bb71c9dd9a 100644
--- a/meta/classes/package_ipk.bbclass
+++ b/meta/classes/package_ipk.bbclass
@@ -309,7 +309,7 @@ python () {
309 if bb.data.getVar('PACKAGES', d, True) != '': 309 if bb.data.getVar('PACKAGES', d, True) != '':
310 deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split() 310 deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split()
311 deps.append('opkg-utils-native:do_populate_sysroot') 311 deps.append('opkg-utils-native:do_populate_sysroot')
312 deps.append('fakeroot-native:do_populate_sysroot') 312 deps.append('virtual/fakeroot-native:do_populate_sysroot')
313 bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d) 313 bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d)
314} 314}
315 315
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass
index da4f64cc91..4fdab34f67 100644
--- a/meta/classes/package_rpm.bbclass
+++ b/meta/classes/package_rpm.bbclass
@@ -207,7 +207,7 @@ python () {
207 if bb.data.getVar('PACKAGES', d, True) != '': 207 if bb.data.getVar('PACKAGES', d, True) != '':
208 deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split() 208 deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split()
209 deps.append('rpm-native:do_populate_sysroot') 209 deps.append('rpm-native:do_populate_sysroot')
210 deps.append('fakeroot-native:do_populate_sysroot') 210 deps.append('virtual/fakeroot-native:do_populate_sysroot')
211 bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d) 211 bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d)
212} 212}
213 213
diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass
index c63b6c9fa5..ea72d4d531 100644
--- a/meta/classes/package_tar.bbclass
+++ b/meta/classes/package_tar.bbclass
@@ -94,7 +94,7 @@ python () {
94 if bb.data.getVar('PACKAGES', d, True) != '': 94 if bb.data.getVar('PACKAGES', d, True) != '':
95 deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split() 95 deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split()
96 deps.append('tar-native:do_populate_sysroot') 96 deps.append('tar-native:do_populate_sysroot')
97 deps.append('fakeroot-native:do_populate_sysroot') 97 deps.append('virtual/fakeroot-native:do_populate_sysroot')
98 bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d) 98 bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d)
99} 99}
100 100