diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2017-06-26 08:52:54 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-04-05 15:13:47 +0100 |
commit | c9159f18ed7c7d7dca95d240a8548ab0d08a7bdb (patch) | |
tree | 742c9b69b4a03e0832f106106de5371185836221 /meta/lib | |
parent | 0652fb68b2b62a1f4800c4befdf92b896d3d9b43 (diff) | |
download | poky-c9159f18ed7c7d7dca95d240a8548ab0d08a7bdb.tar.gz |
package_manager: flush installed_pkgs file before oe-pkgdata-util uses it
* since this commit:
commit f5a1013ffa9815f22e13989e2bcb83f966e7ce2c
Author: Ross Burton <ross.burton@intel.com>
Date: Tue Apr 18 16:19:12 2017 +0100
package_manager: don't race on a file when installing complementary
packages
the file isn't closed before oe-pkgdata-util uses it and this
temporary file might look empty to oe-pkgdata-util, because it
wasn't flushed yet. Which resulted in almost empty debugfs tarballs
and no locale packages in regular rootfs.
* without this change:
124K May 30 07:41 core-image-full-cmdline-raspberrypi3-64-20170530054003-dbg.rootfs.tar.gz
* with this change:
173M May 30 07:29 core-image-full-cmdline-raspberrypi3-64-20170530052715-dbg.rootfs.tar.gz
(From OE-Core rev: 9b34200048b3d2b477a19b7ddc8d447f873adbb2)
(From OE-Core rev: 667c43354e38c2fec1829089de0b7de076498e85)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 877d38db08aa7060d16405443cf70539c559fe82)
Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/package_manager.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index a20bbd438a..b74c8599eb 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -592,6 +592,7 @@ class PackageManager(object, metaclass=ABCMeta): | |||
592 | pkgs = self.list_installed() | 592 | pkgs = self.list_installed() |
593 | output = oe.utils.format_pkg_list(pkgs, "arch") | 593 | output = oe.utils.format_pkg_list(pkgs, "arch") |
594 | installed_pkgs.write(output) | 594 | installed_pkgs.write(output) |
595 | installed_pkgs.flush() | ||
595 | 596 | ||
596 | cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), | 597 | cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), |
597 | "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs.name, | 598 | "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs.name, |