From 96695f2c855543628d5256c4a658e9fb0c8ef6e6 Mon Sep 17 00:00:00 2001 From: Hongxu Jia Date: Mon, 27 Jan 2014 14:36:25 +0800 Subject: [PATCH] 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 Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 15e56b5..ea7866f 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: -- 2.7.4