From 29d5edffb051df34317e588335c6a454bbb42765 Mon Sep 17 00:00:00 2001 From: Joshua Lock Date: Wed, 23 Jun 2010 15:19:06 +0100 Subject: Use pseudo rather than fakeroot for fake root privileges Make use of the ability to configure the fake root provider and use Wind River's pseudo utility. Signed-off-by: Joshua Lock --- meta/classes/image.bbclass | 2 +- meta/classes/package_deb.bbclass | 4 ++-- meta/classes/package_ipk.bbclass | 2 +- meta/classes/package_rpm.bbclass | 2 +- meta/classes/package_tar.bbclass | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) (limited to 'meta/classes') diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 7318ba9a2..9f076a68e 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -26,7 +26,7 @@ PID = "${@os.getpid()}" PACKAGE_ARCH = "${MACHINE_ARCH}" -do_rootfs[depends] += "makedevs-native:do_populate_sysroot fakeroot-native:do_populate_sysroot ldconfig-native:do_populate_sysroot" +do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-native:do_populate_sysroot ldconfig-native:do_populate_sysroot" python () { deps = bb.data.getVarFlag('do_rootfs', 'depends', d) or "" diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 90ef272c2..38740f1cc 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -240,7 +240,7 @@ python do_package_deb () { conffiles.close() os.chdir(basedir) - ret = os.system("PATH=\"%s\" fakeroot dpkg-deb -b %s %s" % (bb.data.getVar("PATH", localdata, True), root, pkgoutdir)) + 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)) if ret != 0: bb.utils.unlockfile(lf) raise bb.build.FuncFailed("dpkg-deb execution failed") @@ -253,7 +253,7 @@ python () { if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_deb', 'depends', d) or "").split() deps.append('dpkg-native:do_populate_sysroot') - deps.append('fakeroot-native:do_populate_sysroot') + deps.append('virtual/fakeroot-native:do_populate_sysroot') bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d) } diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index 11b60b156..bb71c9dd9 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -309,7 +309,7 @@ python () { if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_ipk', 'depends', d) or "").split() deps.append('opkg-utils-native:do_populate_sysroot') - deps.append('fakeroot-native:do_populate_sysroot') + deps.append('virtual/fakeroot-native:do_populate_sysroot') bb.data.setVarFlag('do_package_write_ipk', 'depends', " ".join(deps), d) } diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index da4f64cc9..4fdab34f6 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -207,7 +207,7 @@ python () { if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_rpm', 'depends', d) or "").split() deps.append('rpm-native:do_populate_sysroot') - deps.append('fakeroot-native:do_populate_sysroot') + deps.append('virtual/fakeroot-native:do_populate_sysroot') bb.data.setVarFlag('do_package_write_rpm', 'depends', " ".join(deps), d) } diff --git a/meta/classes/package_tar.bbclass b/meta/classes/package_tar.bbclass index c63b6c9fa..ea72d4d53 100644 --- a/meta/classes/package_tar.bbclass +++ b/meta/classes/package_tar.bbclass @@ -94,7 +94,7 @@ python () { if bb.data.getVar('PACKAGES', d, True) != '': deps = (bb.data.getVarFlag('do_package_write_tar', 'depends', d) or "").split() deps.append('tar-native:do_populate_sysroot') - deps.append('fakeroot-native:do_populate_sysroot') + deps.append('virtual/fakeroot-native:do_populate_sysroot') bb.data.setVarFlag('do_package_write_tar', 'depends', " ".join(deps), d) } -- cgit v1.2.3