diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-01-27 14:36:25 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:53:42 +0000 |
commit | 9c71ee080dcc42cb9a604ba0f6cde168f620e593 (patch) | |
tree | b92bfeacaa7c1c6c8824202be97f19e3ed4e360a | |
parent | 4df92c634e2f509ba30d27ab774763a45f7189f7 (diff) | |
download | poky-9c71ee080dcc42cb9a604ba0f6cde168f620e593.tar.gz |
lib/oe/package_manager.py: fix invoking rpm save_rpmpostinist failed
- Use self.target_rootfs instead of self.image_rootfs as saved dir;
- Remove redundant comment line;
(From OE-Core rev: 41d6edab676277afbcaa6cf41cd64a5663f09dc7)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/lib/oe/package_manager.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 15e56b550d..ea7866fff7 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -740,11 +740,12 @@ class RpmPM(PackageManager): | |||
740 | break | 740 | break |
741 | 741 | ||
742 | bb.note(' * postponing %s' % new_pkg) | 742 | bb.note(' * postponing %s' % new_pkg) |
743 | saved_dir = self.image_rootfs + self.d.expand('${sysconfdir}/rpm-postinsts/') + new_pkg | 743 | saved_dir = self.target_rootfs + self.d.expand('${sysconfdir}/rpm-postinsts/') + new_pkg |
744 | |||
744 | cmd = self.rpm_cmd + ' -q --scripts --root ' + self.target_rootfs | 745 | cmd = self.rpm_cmd + ' -q --scripts --root ' + self.target_rootfs |
745 | cmd += ' --dbpath=/var/lib/rpm ' + new_pkg | 746 | cmd += ' --dbpath=/var/lib/rpm ' + new_pkg |
746 | cmd += ' | sed -n -e "/^postinstall scriptlet (using .*):$/,/^.* scriptlet (using .*):$/ {/.*/p}"' | 747 | cmd += ' | sed -n -e "/^postinstall scriptlet (using .*):$/,/^.* scriptlet (using .*):$/ {/.*/p}"' |
747 | cmd += ' | sed -e "s/postinstall scriptlet (using \(.*\)):$/#!\1/"' | 748 | cmd += ' | sed -e "/postinstall scriptlet (using \(.*\)):$/d"' |
748 | cmd += ' -e "/^.* scriptlet (using .*):$/d" > %s' % saved_dir | 749 | cmd += ' -e "/^.* scriptlet (using .*):$/d" > %s' % saved_dir |
749 | 750 | ||
750 | try: | 751 | try: |