summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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
-rw-r--r--meta/conf/bitbake.conf6
-rw-r--r--meta/packages/fakeroot/fakeroot_1.14.4.bb1
-rw-r--r--meta/packages/fuse/fuse.inc2
-rw-r--r--meta/packages/lirc/lirc-modules_0.8.3.bb2
-rw-r--r--meta/packages/meta/meta-toolchain.bb4
-rw-r--r--meta/packages/portmap/portmap.inc2
11 files changed, 18 insertions, 11 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
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index e54f7d6fa5..ab91b932c4 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -525,6 +525,12 @@ SRCPV = "${@bb.fetch.get_srcrev(d)}"
525 525
526SRC_URI = "file://${FILE}" 526SRC_URI = "file://${FILE}"
527 527
528# We can choose which provider of fake root privileges to use
529# default is fakeroot but in Poky we use pseudo
530FAKEROOT = "PSEUDO_PREFIX=${STAGING_DIR_NATIVE}${prefix_native} pseudo"
531PREFERRED_PROVIDER_virtual/fakeroot-native ?= "pseudo-native"
532
533
528################################################################## 534##################################################################
529# UI/Interaction Configuration 535# UI/Interaction Configuration
530################################################################## 536##################################################################
diff --git a/meta/packages/fakeroot/fakeroot_1.14.4.bb b/meta/packages/fakeroot/fakeroot_1.14.4.bb
index 11ae015a83..4edeccfe6d 100644
--- a/meta/packages/fakeroot/fakeroot_1.14.4.bb
+++ b/meta/packages/fakeroot/fakeroot_1.14.4.bb
@@ -6,6 +6,7 @@ LICENSE = "GPLv2"
6RDEPENDS = "util-linux" 6RDEPENDS = "util-linux"
7RDEPENDS_virtclass-native = "util-linux-native" 7RDEPENDS_virtclass-native = "util-linux-native"
8PR = "r0" 8PR = "r0"
9PROVIDES += "virtual/fakeroot"
9 10
10SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \ 11SRC_URI = "${DEBIAN_MIRROR}/main/f/fakeroot/fakeroot_${PV}.orig.tar.bz2 \
11 file://absolutepaths.patch" 12 file://absolutepaths.patch"
diff --git a/meta/packages/fuse/fuse.inc b/meta/packages/fuse/fuse.inc
index d9e7dd72cb..c6755ac7c7 100644
--- a/meta/packages/fuse/fuse.inc
+++ b/meta/packages/fuse/fuse.inc
@@ -1,7 +1,7 @@
1DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program" 1DESCRIPTION = "With FUSE it is possible to implement a fully functional filesystem in a userspace program"
2HOMEPAGE = "http://fuse.sf.net" 2HOMEPAGE = "http://fuse.sf.net"
3LICENSE = "GPL" 3LICENSE = "GPL"
4DEPENDS = "fakeroot-native" 4DEPENDS = "virtual/fakeroot-native"
5RRECOMMENDS_fuse = "${@base_contains("MACHINE_FEATURES","kernel26","kernel-module-fuse","fuse-module",d)}" 5RRECOMMENDS_fuse = "${@base_contains("MACHINE_FEATURES","kernel26","kernel-module-fuse","fuse-module",d)}"
6 6
7SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz" 7SRC_URI = "${SOURCEFORGE_MIRROR}/fuse/fuse-${PV}.tar.gz"
diff --git a/meta/packages/lirc/lirc-modules_0.8.3.bb b/meta/packages/lirc/lirc-modules_0.8.3.bb
index 1605e2d5c5..ee1de7194e 100644
--- a/meta/packages/lirc/lirc-modules_0.8.3.bb
+++ b/meta/packages/lirc/lirc-modules_0.8.3.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "LIRC is a package that allows you to decode and send infra-red si
2SECTION = "base" 2SECTION = "base"
3PRIORITY = "optional" 3PRIORITY = "optional"
4LICENSE = "GPL" 4LICENSE = "GPL"
5DEPENDS = "virtual/kernel fakeroot-native" 5DEPENDS = "virtual/kernel virtual/fakeroot-native"
6PR = "r2" 6PR = "r2"
7 7
8SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \ 8SRC_URI = "${SOURCEFORGE_MIRROR}/lirc/lirc-${PV}.tar.gz \
diff --git a/meta/packages/meta/meta-toolchain.bb b/meta/packages/meta/meta-toolchain.bb
index 43b4f027c4..7c39f5d854 100644
--- a/meta/packages/meta/meta-toolchain.bb
+++ b/meta/packages/meta/meta-toolchain.bb
@@ -1,6 +1,6 @@
1DESCRIPTION = "Meta package for building a installable toolchain" 1DESCRIPTION = "Meta package for building a installable toolchain"
2LICENSE = "MIT" 2LICENSE = "MIT"
3DEPENDS = "opkg-native opkg-utils-native fakeroot-native sed-native" 3DEPENDS = "opkg-native opkg-utils-native virtual/fakeroot-native sed-native"
4 4
5inherit meta 5inherit meta
6 6
@@ -109,7 +109,7 @@ do_populate_sdk() {
109 # Package it up 109 # Package it up
110 mkdir -p ${SDK_DEPLOY} 110 mkdir -p ${SDK_DEPLOY}
111 cd ${SDK_OUTPUT} 111 cd ${SDK_OUTPUT}
112 fakeroot tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 . 112 ${FAKEROOT} tar cfj ${SDK_DEPLOY}/${TOOLCHAIN_OUTPUTNAME}.tar.bz2 .
113} 113}
114 114
115do_populate_sdk[nostamp] = "1" 115do_populate_sdk[nostamp] = "1"
diff --git a/meta/packages/portmap/portmap.inc b/meta/packages/portmap/portmap.inc
index cda2fd14eb..d563ad5b5a 100644
--- a/meta/packages/portmap/portmap.inc
+++ b/meta/packages/portmap/portmap.inc
@@ -4,7 +4,7 @@ SECTION = "console/network"
4LICENSE = "BSD" 4LICENSE = "BSD"
5LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \ 5LIC_FILES_CHKSUM = "file://portmap.c;beginline=2;endline=31;md5=51ff67e66ec84b2009b017b1f94afbf4 \
6 file://from_local.c;beginline=9;endline=35;md5=1bec938a2268b8b423c58801ace3adc1" 6 file://from_local.c;beginline=9;endline=35;md5=1bec938a2268b8b423c58801ace3adc1"
7DEPENDS = "fakeroot-native" 7DEPENDS = "virtual/fakeroot-native"
8 8
9SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \ 9SRC_URI = "${DEBIAN_MIRROR}/main/p/portmap/portmap_5.orig.tar.gz \
10 ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \ 10 ${DEBIAN_MIRROR}/main/p/portmap/portmap_${PV}.diff.gz;patch=1 \