diff options
author | Hongxu Jia <hongxu.jia@windriver.com> | 2014-01-27 16:22:05 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-11 11:53:43 +0000 |
commit | c8f41d7e48e6b299558add73e461d4f49a90e12a (patch) | |
tree | 89656099112a47ef912405e431c3b2cc7b109102 | |
parent | 9d3c187b1a3327d45b1e4b50fdf10ab9895087d4 (diff) | |
download | poky-c8f41d7e48e6b299558add73e461d4f49a90e12a.tar.gz |
package_manger.py/rootfs.py: rename save_rpmpostinist with save_rpmpostinst
The tweak made the code looks better.
(From OE-Core rev: 61981755b4738ccc49be0e790de828f4166ef0e8)
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 | 4 | ||||
-rw-r--r-- | meta/lib/oe/rootfs.py | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index ea7866fff7..811ad09e68 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -730,7 +730,7 @@ class RpmPM(PackageManager): | |||
730 | 730 | ||
731 | return | 731 | return |
732 | 732 | ||
733 | def save_rpmpostinist(self, pkg): | 733 | def save_rpmpostinst(self, pkg): |
734 | mlibs = self.d.getVar('MULTILIB_GLOBAL_VARIANTS').split() | 734 | mlibs = self.d.getVar('MULTILIB_GLOBAL_VARIANTS').split() |
735 | new_pkg = pkg | 735 | new_pkg = pkg |
736 | # Remove any multilib prefix from the package name | 736 | # Remove any multilib prefix from the package name |
@@ -755,7 +755,7 @@ class RpmPM(PackageManager): | |||
755 | os.chmod(saved_dir, 0755) | 755 | os.chmod(saved_dir, 0755) |
756 | self._unlock_rpm_db() | 756 | self._unlock_rpm_db() |
757 | except subprocess.CalledProcessError as e: | 757 | except subprocess.CalledProcessError as e: |
758 | bb.fatal("Invoke save_rpmpostinist failed. Command %s " | 758 | bb.fatal("Invoke save_rpmpostinst failed. Command %s " |
759 | "returned %d" % (cmd, e.returncode)) | 759 | "returned %d" % (cmd, e.returncode)) |
760 | 760 | ||
761 | '''Write common configuration for target usage''' | 761 | '''Write common configuration for target usage''' |
diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index db54e17b28..1f4cea68a8 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py | |||
@@ -378,7 +378,7 @@ class RpmRootfs(Rootfs): | |||
378 | 378 | ||
379 | # Save the package postinstalls in /etc/rpm-postinsts | 379 | # Save the package postinstalls in /etc/rpm-postinsts |
380 | for pkg in registered_pkgs.split(): | 380 | for pkg in registered_pkgs.split(): |
381 | self.pm.save_rpmpostinist(pkg) | 381 | self.pm.save_rpmpostinst(pkg) |
382 | 382 | ||
383 | 383 | ||
384 | class DpkgRootfs(Rootfs): | 384 | class DpkgRootfs(Rootfs): |