diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-22 10:53:15 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-02-22 10:53:25 +0000 |
| commit | 9a28ad6b0291e0d4c4aae6ba25a9f7752d5c2e11 (patch) | |
| tree | 84d75faea46e044ba2c44855175879dd7fd5c3a0 | |
| parent | b43af1811a80a57634127fdc66b08dfeb66e1466 (diff) | |
| download | poky-9a28ad6b0291e0d4c4aae6ba25a9f7752d5c2e11.tar.gz | |
package_deb.bbclass: Place the whole task under fakeroot context to fix build failures
If we don't do this, the ipk/rpm backends can create temporary files and then
when the deb package creates new files, those inodes can be reused and permission
confusion results.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/package_deb.bbclass | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 52bd264ead..4faeb4a5f3 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass | |||
| @@ -394,7 +394,7 @@ python do_package_deb () { | |||
| 394 | conffiles.close() | 394 | conffiles.close() |
| 395 | 395 | ||
| 396 | os.chdir(basedir) | 396 | os.chdir(basedir) |
| 397 | 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)) | 397 | ret = os.system("PATH=\"%s\" dpkg-deb -b %s %s" % (bb.data.getVar("PATH", localdata, True), root, pkgoutdir)) |
| 398 | if ret != 0: | 398 | if ret != 0: |
| 399 | bb.utils.prunedir(controldir) | 399 | bb.utils.prunedir(controldir) |
| 400 | bb.utils.unlockfile(lf) | 400 | bb.utils.unlockfile(lf) |
| @@ -420,6 +420,8 @@ python () { | |||
| 420 | deps.append('dpkg-native:do_populate_sysroot') | 420 | deps.append('dpkg-native:do_populate_sysroot') |
| 421 | deps.append('virtual/fakeroot-native:do_populate_sysroot') | 421 | deps.append('virtual/fakeroot-native:do_populate_sysroot') |
| 422 | bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d) | 422 | bb.data.setVarFlag('do_package_write_deb', 'depends', " ".join(deps), d) |
| 423 | bb.data.setVarFlag('do_package_write_deb', 'fakeroot', "1", d) | ||
| 424 | bb.data.setVarFlag('do_package_write_deb_setscene', 'fakeroot', "1", d) | ||
| 423 | } | 425 | } |
| 424 | 426 | ||
| 425 | python do_package_write_deb () { | 427 | python do_package_write_deb () { |
