aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2014-01-27 14:36:25 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-02-11 11:50:30 +0000
commit41d6edab676277afbcaa6cf41cd64a5663f09dc7 (patch)
tree1d59624d7a137b17d916c2d868e4827db5450cb4
parent7858c8ac141a7bf66c65ddc7e4b39ad937a7e084 (diff)
downloadopenembedded-core-contrib-41d6edab676277afbcaa6cf41cd64a5663f09dc7.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; Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
-rw-r--r--meta/lib/oe/package_manager.py5
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):
break
bb.note(' * postponing %s' % new_pkg)
- saved_dir = self.image_rootfs + self.d.expand('${sysconfdir}/rpm-postinsts/') + new_pkg
+ saved_dir = self.target_rootfs + self.d.expand('${sysconfdir}/rpm-postinsts/') + new_pkg
+
cmd = self.rpm_cmd + ' -q --scripts --root ' + self.target_rootfs
cmd += ' --dbpath=/var/lib/rpm ' + new_pkg
cmd += ' | sed -n -e "/^postinstall scriptlet (using .*):$/,/^.* scriptlet (using .*):$/ {/.*/p}"'
- cmd += ' | sed -e "s/postinstall scriptlet (using \(.*\)):$/#!\1/"'
+ cmd += ' | sed -e "/postinstall scriptlet (using \(.*\)):$/d"'
cmd += ' -e "/^.* scriptlet (using .*):$/d" > %s' % saved_dir
try: